diff --git a/composer.json b/composer.json index 79003508c142f..4e42f73fc2c24 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "joomla/event": "~1.1", "joomla/filter": "^1.3.2", "joomla/image": "~1.4", - "joomla/ldap": "~1.1", + "joomla/ldap": "~1.2", "joomla/registry": "^1.4.5", "joomla/session": "~1.3", "joomla/string": "~1.3", diff --git a/composer.lock b/composer.lock index 16f3063b45149..ac93d84690a64 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "c4363e7c59ded73c712bfdee79b2e093", + "content-hash": "7df3275195712f2be8cdf526269d16a1", "packages": [ { "name": "ircmaxell/password-compat", @@ -244,23 +244,23 @@ }, { "name": "joomla/di", - "version": "1.3.1", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/joomla-framework/di.git", - "reference": "4991f57e2af628a87e43493b9b92dc8e3048da63" + "reference": "756c6eb4554b9007f69da66cf488a05308251ed8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/di/zipball/4991f57e2af628a87e43493b9b92dc8e3048da63", - "reference": "4991f57e2af628a87e43493b9b92dc8e3048da63", + "url": "https://api.github.com/repos/joomla-framework/di/zipball/756c6eb4554b9007f69da66cf488a05308251ed8", + "reference": "756c6eb4554b9007f69da66cf488a05308251ed8", "shasum": "" }, "require": { - "php": ">=5.3.10" + "php": "^5.3.10|~7.0" }, "require-dev": { - "phpunit/phpunit": "4.*", + "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0", "squizlabs/php_codesniffer": "1.*" }, "type": "joomla-package", @@ -271,8 +271,7 @@ }, "autoload": { "psr-4": { - "Joomla\\DI\\": "src/", - "Joomla\\DI\\Tests\\": "Tests/" + "Joomla\\DI\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -289,7 +288,7 @@ "ioc", "joomla" ], - "time": "2015-04-02T16:30:40+00:00" + "time": "2017-11-12T15:35:19+00:00" }, { "name": "joomla/event", @@ -534,26 +533,30 @@ }, { "name": "joomla/ldap", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/joomla-framework/ldap.git", - "reference": "2d82a7e9ad0aa1091e8121ab8e194ff0e9d14208" + "reference": "4dce2db6a3d6d2b8c7847651ad011bb3ed7ba978" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/ldap/zipball/2d82a7e9ad0aa1091e8121ab8e194ff0e9d14208", - "reference": "2d82a7e9ad0aa1091e8121ab8e194ff0e9d14208", + "url": "https://api.github.com/repos/joomla-framework/ldap/zipball/4dce2db6a3d6d2b8c7847651ad011bb3ed7ba978", + "reference": "4dce2db6a3d6d2b8c7847651ad011bb3ed7ba978", "shasum": "" }, "require": { "ext-ldap": "*", - "php": "^5.3.10|~7.0", - "symfony/polyfill-php56": "~1.0" + "php": "^5.3.10|~7.0" }, "require-dev": { + "joomla/registry": "^1.4.5|~2.0", "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0", - "squizlabs/php_codesniffer": "1.*" + "squizlabs/php_codesniffer": "1.*", + "symfony/polyfill-php56": "~1.0" + }, + "suggest": { + "symfony/polyfill-php56": "If using PHP 5.5 or earlier to use ldap_escape() function" }, "type": "joomla-package", "extra": { @@ -577,7 +580,7 @@ "joomla", "ldap" ], - "time": "2017-07-27T13:13:55+00:00" + "time": "2017-10-21T15:41:55+00:00" }, { "name": "joomla/registry", @@ -922,16 +925,16 @@ }, { "name": "paragonie/sodium_compat", - "version": "v1.2.0", + "version": "v1.3.1", "source": { "type": "git", "url": "https://github.com/paragonie/sodium_compat.git", - "reference": "110b1707f45e3b59311bb488b3af7251673de9b7" + "reference": "6b3a59ef127445564a00e261eb1e960b6292f494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/110b1707f45e3b59311bb488b3af7251673de9b7", - "reference": "110b1707f45e3b59311bb488b3af7251673de9b7", + "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/6b3a59ef127445564a00e261eb1e960b6292f494", + "reference": "6b3a59ef127445564a00e261eb1e960b6292f494", "shasum": "" }, "require": { @@ -999,20 +1002,20 @@ "secret-key cryptography", "side-channel resistant" ], - "time": "2017-09-01T01:19:04+00:00" + "time": "2017-09-29T21:27:52+00:00" }, { "name": "phpmailer/phpmailer", - "version": "v5.2.24", + "version": "v5.2.26", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "22d04c6a58145a244696f3f254c1875aa653b26a" + "reference": "70362997bda4376378be7d92d81e2200550923f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/22d04c6a58145a244696f3f254c1875aa653b26a", - "reference": "22d04c6a58145a244696f3f254c1875aa653b26a", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/70362997bda4376378be7d92d81e2200550923f7", + "reference": "70362997bda4376378be7d92d81e2200550923f7", "shasum": "" }, "require": { @@ -1076,7 +1079,7 @@ } ], "description": "PHPMailer is a full-featured email creation and transfer class for PHP", - "time": "2017-07-26T21:00:20+00:00" + "time": "2017-11-04T09:26:05+00:00" }, { "name": "psr/log", @@ -1181,16 +1184,16 @@ }, { "name": "symfony/polyfill-php55", - "version": "v1.4.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php55.git", - "reference": "94566239a7720cde0820f15f0cc348ddb51ba51d" + "reference": "b64e7f0c37ecf144ecc16668936eef94e628fbfd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/94566239a7720cde0820f15f0cc348ddb51ba51d", - "reference": "94566239a7720cde0820f15f0cc348ddb51ba51d", + "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/b64e7f0c37ecf144ecc16668936eef94e628fbfd", + "reference": "b64e7f0c37ecf144ecc16668936eef94e628fbfd", "shasum": "" }, "require": { @@ -1200,7 +1203,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.6-dev" } }, "autoload": { @@ -1233,20 +1236,20 @@ "portable", "shim" ], - "time": "2017-06-09T08:25:21+00:00" + "time": "2017-10-11T12:05:26+00:00" }, { "name": "symfony/polyfill-php56", - "version": "v1.4.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929" + "reference": "265fc96795492430762c29be291a371494ba3a5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/bc0b7d6cb36b10cfabb170a3e359944a95174929", - "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/265fc96795492430762c29be291a371494ba3a5b", + "reference": "265fc96795492430762c29be291a371494ba3a5b", "shasum": "" }, "require": { @@ -1256,7 +1259,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.6-dev" } }, "autoload": { @@ -1289,20 +1292,20 @@ "portable", "shim" ], - "time": "2017-06-09T08:25:21+00:00" + "time": "2017-10-11T12:05:26+00:00" }, { "name": "symfony/polyfill-util", - "version": "v1.4.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d" + "reference": "6e719200c8e540e0c0effeb31f96bdb344b94176" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ebccbde4aad410f6438d86d7d261c6b4d2b9a51d", - "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/6e719200c8e540e0c0effeb31f96bdb344b94176", + "reference": "6e719200c8e540e0c0effeb31f96bdb344b94176", "shasum": "" }, "require": { @@ -1311,7 +1314,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.6-dev" } }, "autoload": { @@ -1341,20 +1344,20 @@ "polyfill", "shim" ], - "time": "2017-06-09T08:25:21+00:00" + "time": "2017-10-11T12:05:26+00:00" }, { "name": "symfony/yaml", - "version": "v2.8.26", + "version": "v2.8.29", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "4c29dec8d489c4e37cf87ccd7166cd0b0e6a45c5" + "reference": "d819bf267e901727141fe828ae888486fd21236e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/4c29dec8d489c4e37cf87ccd7166cd0b0e6a45c5", - "reference": "4c29dec8d489c4e37cf87ccd7166cd0b0e6a45c5", + "url": "https://api.github.com/repos/symfony/yaml/zipball/d819bf267e901727141fe828ae888486fd21236e", + "reference": "d819bf267e901727141fe828ae888486fd21236e", "shasum": "" }, "require": { @@ -1390,7 +1393,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-06-01T20:52:29+00:00" + "time": "2017-11-05T15:25:56+00:00" } ], "packages-dev": [ @@ -1450,16 +1453,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v1.13.1", + "version": "v1.13.3", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "0ea4f7ed06ca55da1d8fc45da26ff87f261c4088" + "reference": "387e4c86c9dc0e1e4c475291fc114ec45b98e624" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/0ea4f7ed06ca55da1d8fc45da26ff87f261c4088", - "reference": "0ea4f7ed06ca55da1d8fc45da26ff87f261c4088", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/387e4c86c9dc0e1e4c475291fc114ec45b98e624", + "reference": "387e4c86c9dc0e1e4c475291fc114ec45b98e624", "shasum": "" }, "require": { @@ -1504,7 +1507,7 @@ } ], "description": "A tool to automatically fix PHP code style", - "time": "2016-12-01T00:05:05+00:00" + "time": "2017-09-11T14:11:16+00:00" }, { "name": "pear/cache_lite", @@ -1607,22 +1610,22 @@ }, { "name": "phpspec/prophecy", - "version": "v1.7.0", + "version": "v1.7.2", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "93d39f1f7f9326d746203c7c056f300f7f126073" + "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073", - "reference": "93d39f1f7f9326d746203c7c056f300f7f126073", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", + "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", "sebastian/comparator": "^1.1|^2.0", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, @@ -1633,7 +1636,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6.x-dev" + "dev-master": "1.7.x-dev" } }, "autoload": { @@ -1666,7 +1669,7 @@ "spy", "stub" ], - "time": "2017-03-02T20:05:34+00:00" + "time": "2017-09-04T11:05:03+00:00" }, { "name": "phpunit/dbunit", @@ -2552,16 +2555,16 @@ }, { "name": "symfony/console", - "version": "v2.8.26", + "version": "v2.8.29", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "32a3c6b3398de5db8ed381f4ef92970c59c2fcdd" + "reference": "89143ce2b463515a75b5f5e9650e6ecfb2684158" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/32a3c6b3398de5db8ed381f4ef92970c59c2fcdd", - "reference": "32a3c6b3398de5db8ed381f4ef92970c59c2fcdd", + "url": "https://api.github.com/repos/symfony/console/zipball/89143ce2b463515a75b5f5e9650e6ecfb2684158", + "reference": "89143ce2b463515a75b5f5e9650e6ecfb2684158", "shasum": "" }, "require": { @@ -2609,20 +2612,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-07-29T21:26:04+00:00" + "time": "2017-11-07T14:08:47+00:00" }, { "name": "symfony/debug", - "version": "v2.8.26", + "version": "v2.8.29", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "236ca98a425758cc8c2ff2db423bfe4d1a736b8c" + "reference": "a0a29e9867debabdace779a20a9385c623a23bbd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/236ca98a425758cc8c2ff2db423bfe4d1a736b8c", - "reference": "236ca98a425758cc8c2ff2db423bfe4d1a736b8c", + "url": "https://api.github.com/repos/symfony/debug/zipball/a0a29e9867debabdace779a20a9385c623a23bbd", + "reference": "a0a29e9867debabdace779a20a9385c623a23bbd", "shasum": "" }, "require": { @@ -2666,20 +2669,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-07-28T15:21:22+00:00" + "time": "2017-10-24T13:48:52+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v2.8.26", + "version": "v2.8.29", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "1377400fd641d7d1935981546aaef780ecd5bf6d" + "reference": "b59aacf238fadda50d612c9de73b74751872a903" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1377400fd641d7d1935981546aaef780ecd5bf6d", - "reference": "1377400fd641d7d1935981546aaef780ecd5bf6d", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b59aacf238fadda50d612c9de73b74751872a903", + "reference": "b59aacf238fadda50d612c9de73b74751872a903", "shasum": "" }, "require": { @@ -2726,20 +2729,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-06-02T07:47:27+00:00" + "time": "2017-11-05T15:25:56+00:00" }, { "name": "symfony/filesystem", - "version": "v2.8.26", + "version": "v2.8.29", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "714b1036010c354ae2b25d7f9ca27e14e265e9f2" + "reference": "10507c5f24577b0ad971b0d22097c823b2b45dd3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/714b1036010c354ae2b25d7f9ca27e14e265e9f2", - "reference": "714b1036010c354ae2b25d7f9ca27e14e265e9f2", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/10507c5f24577b0ad971b0d22097c823b2b45dd3", + "reference": "10507c5f24577b0ad971b0d22097c823b2b45dd3", "shasum": "" }, "require": { @@ -2775,20 +2778,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-07-11T07:12:11+00:00" + "time": "2017-11-07T14:08:47+00:00" }, { "name": "symfony/finder", - "version": "v2.8.26", + "version": "v2.8.29", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "4f4e84811004e065a3bb5ceeb1d9aa592630f9ad" + "reference": "efeceae6a05a9b2fcb3391333f1d4a828ff44ab8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/4f4e84811004e065a3bb5ceeb1d9aa592630f9ad", - "reference": "4f4e84811004e065a3bb5ceeb1d9aa592630f9ad", + "url": "https://api.github.com/repos/symfony/finder/zipball/efeceae6a05a9b2fcb3391333f1d4a828ff44ab8", + "reference": "efeceae6a05a9b2fcb3391333f1d4a828ff44ab8", "shasum": "" }, "require": { @@ -2824,20 +2827,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-06-01T20:52:29+00:00" + "time": "2017-11-05T15:25:56+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.4.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "f29dca382a6485c3cbe6379f0c61230167681937" + "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f29dca382a6485c3cbe6379f0c61230167681937", - "reference": "f29dca382a6485c3cbe6379f0c61230167681937", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296", + "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296", "shasum": "" }, "require": { @@ -2849,7 +2852,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.6-dev" } }, "autoload": { @@ -2883,20 +2886,20 @@ "portable", "shim" ], - "time": "2017-06-09T14:24:12+00:00" + "time": "2017-10-11T12:05:26+00:00" }, { "name": "symfony/process", - "version": "v2.8.26", + "version": "v2.8.29", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "57e52a0a6a80ea0aec4fc1b785a7920a95cb88a8" + "reference": "d25449e031f600807949aab7cadbf267712f4eee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/57e52a0a6a80ea0aec4fc1b785a7920a95cb88a8", - "reference": "57e52a0a6a80ea0aec4fc1b785a7920a95cb88a8", + "url": "https://api.github.com/repos/symfony/process/zipball/d25449e031f600807949aab7cadbf267712f4eee", + "reference": "d25449e031f600807949aab7cadbf267712f4eee", "shasum": "" }, "require": { @@ -2932,20 +2935,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-07-03T08:04:30+00:00" + "time": "2017-11-05T15:25:56+00:00" }, { "name": "symfony/stopwatch", - "version": "v2.8.26", + "version": "v2.8.29", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "e02577b841394a78306d7b547701bb7bb705bad5" + "reference": "533bb9d7c2da1c6d2da163ecf0f22043ea98f59b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/e02577b841394a78306d7b547701bb7bb705bad5", - "reference": "e02577b841394a78306d7b547701bb7bb705bad5", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/533bb9d7c2da1c6d2da163ecf0f22043ea98f59b", + "reference": "533bb9d7c2da1c6d2da163ecf0f22043ea98f59b", "shasum": "" }, "require": { @@ -2981,7 +2984,7 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2017-04-12T14:07:15+00:00" + "time": "2017-11-10T18:59:36+00:00" } ], "aliases": [], diff --git a/libraries/vendor/composer/autoload_classmap.php b/libraries/vendor/composer/autoload_classmap.php index f6b5443aa5966..c769ac2a9cdde 100644 --- a/libraries/vendor/composer/autoload_classmap.php +++ b/libraries/vendor/composer/autoload_classmap.php @@ -35,6 +35,11 @@ 'Joomla\\Data\\DataObject' => $vendorDir . '/joomla/data/src/DataObject.php', 'Joomla\\Data\\DataSet' => $vendorDir . '/joomla/data/src/DataSet.php', 'Joomla\\Data\\DumpableInterface' => $vendorDir . '/joomla/data/src/DumpableInterface.php', + 'Joomla\\Data\\Tests\\DataObjectTest' => $vendorDir . '/joomla/data/Tests/DataObjectTest.php', + 'Joomla\\Data\\Tests\\DataSetTest' => $vendorDir . '/joomla/data/Tests/DataSetTest.php', + 'Joomla\\Data\\Tests\\JDataBuran' => $vendorDir . '/joomla/data/Tests/Stubs/buran.php', + 'Joomla\\Data\\Tests\\JDataCapitaliser' => $vendorDir . '/joomla/data/Tests/Stubs/capitaliser.php', + 'Joomla\\Data\\Tests\\JDataVostok' => $vendorDir . '/joomla/data/Tests/Stubs/vostok.php', 'Joomla\\Event\\AbstractEvent' => $vendorDir . '/joomla/event/src/AbstractEvent.php', 'Joomla\\Event\\DelegatingDispatcher' => $vendorDir . '/joomla/event/src/DelegatingDispatcher.php', 'Joomla\\Event\\Dispatcher' => $vendorDir . '/joomla/event/src/Dispatcher.php', @@ -46,6 +51,17 @@ 'Joomla\\Event\\EventInterface' => $vendorDir . '/joomla/event/src/EventInterface.php', 'Joomla\\Event\\ListenersPriorityQueue' => $vendorDir . '/joomla/event/src/ListenersPriorityQueue.php', 'Joomla\\Event\\Priority' => $vendorDir . '/joomla/event/src/Priority.php', + 'Joomla\\Event\\Tests\\AbstractEventTest' => $vendorDir . '/joomla/event/Tests/AbstractEventTest.php', + 'Joomla\\Event\\Tests\\DelegatingDispatcherTest' => $vendorDir . '/joomla/event/Tests/DelegatingDispatcherTest.php', + 'Joomla\\Event\\Tests\\DispatcherTest' => $vendorDir . '/joomla/event/Tests/DispatcherTest.php', + 'Joomla\\Event\\Tests\\EventImmutableTest' => $vendorDir . '/joomla/event/Tests/EventImmutableTest.php', + 'Joomla\\Event\\Tests\\EventTest' => $vendorDir . '/joomla/event/Tests/EventTest.php', + 'Joomla\\Event\\Tests\\ListenersPriorityQueueTest' => $vendorDir . '/joomla/event/Tests/ListenersPriorityQueueTest.php', + 'Joomla\\Event\\Tests\\Stubs\\EmptyListener' => $vendorDir . '/joomla/event/Tests/Stubs/EmptyListener.php', + 'Joomla\\Event\\Tests\\Stubs\\FirstListener' => $vendorDir . '/joomla/event/Tests/Stubs/FirstListener.php', + 'Joomla\\Event\\Tests\\Stubs\\SecondListener' => $vendorDir . '/joomla/event/Tests/Stubs/SecondListener.php', + 'Joomla\\Event\\Tests\\Stubs\\SomethingListener' => $vendorDir . '/joomla/event/Tests/Stubs/SomethingListener.php', + 'Joomla\\Event\\Tests\\Stubs\\ThirdListener' => $vendorDir . '/joomla/event/Tests/Stubs/ThirdListener.php', 'Joomla\\Filesystem\\Buffer' => $vendorDir . '/joomla/filesystem/src/Buffer.php', 'Joomla\\Filesystem\\Clients\\FtpClient' => $vendorDir . '/joomla/filesystem/src/Clients/FtpClient.php', 'Joomla\\Filesystem\\Exception\\FilesystemException' => $vendorDir . '/joomla/filesystem/src/Exception/FilesystemException.php', @@ -95,11 +111,23 @@ 'Joomla\\Session\\Storage\\None' => $vendorDir . '/joomla/session/Joomla/Session/Storage/None.php', 'Joomla\\Session\\Storage\\Wincache' => $vendorDir . '/joomla/session/Joomla/Session/Storage/Wincache.php', 'Joomla\\Session\\Storage\\Xcache' => $vendorDir . '/joomla/session/Joomla/Session/Storage/Xcache.php', + 'Joomla\\Session\\Tests\\Handler\\ApcuHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/ApcuHandlerTest.php', + 'Joomla\\Session\\Tests\\Handler\\DatabaseHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/DatabaseHandlerTest.php', + 'Joomla\\Session\\Tests\\Handler\\FilesystemHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/FilesystemHandlerTest.php', + 'Joomla\\Session\\Tests\\Handler\\MemcachedHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/MemcachedHandlerTest.php', + 'Joomla\\Session\\Tests\\Handler\\NativeStorageTest' => $vendorDir . '/joomla/session/tests/Storage/NativeStorageTest.php', + 'Joomla\\Session\\Tests\\Handler\\RedisHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/RedisHandlerTest.php', + 'Joomla\\Session\\Tests\\Handler\\WincacheHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/WincacheHandlerTest.php', + 'Joomla\\Session\\Tests\\Handler\\XCacheHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/XCacheHandlerTest.php', + 'Joomla\\Session\\Tests\\SessionTest' => $vendorDir . '/joomla/session/tests/SessionTest.php', 'Joomla\\String\\Inflector' => $vendorDir . '/joomla/string/src/Inflector.php', 'Joomla\\String\\Normalise' => $vendorDir . '/joomla/string/src/Normalise.php', 'Joomla\\String\\String' => $vendorDir . '/joomla/string/src/String.php', 'Joomla\\String\\StringHelper' => $vendorDir . '/joomla/string/src/StringHelper.php', 'Joomla\\Uri\\AbstractUri' => $vendorDir . '/joomla/uri/src/AbstractUri.php', + 'Joomla\\Uri\\Tests\\UriHelperTest' => $vendorDir . '/joomla/uri/Tests/UriHelperTest.php', + 'Joomla\\Uri\\Tests\\UriImmuteableTest' => $vendorDir . '/joomla/uri/Tests/UriImmutableTest.php', + 'Joomla\\Uri\\Tests\\UriTest' => $vendorDir . '/joomla/uri/Tests/UriTest.php', 'Joomla\\Uri\\Uri' => $vendorDir . '/joomla/uri/src/Uri.php', 'Joomla\\Uri\\UriHelper' => $vendorDir . '/joomla/uri/src/UriHelper.php', 'Joomla\\Uri\\UriImmutable' => $vendorDir . '/joomla/uri/src/UriImmutable.php', @@ -118,6 +146,8 @@ 'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php', 'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php', 'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php', + 'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php', + 'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php', 'SMTP' => $vendorDir . '/phpmailer/phpmailer/class.smtp.php', 'SimplePie' => $vendorDir . '/simplepie/simplepie/library/SimplePie.php', 'SimplePie_Author' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Author.php', @@ -168,6 +198,7 @@ 'Symfony\\Polyfill\\Util\\Binary' => $vendorDir . '/symfony/polyfill-util/Binary.php', 'Symfony\\Polyfill\\Util\\BinaryNoFuncOverload' => $vendorDir . '/symfony/polyfill-util/BinaryNoFuncOverload.php', 'Symfony\\Polyfill\\Util\\BinaryOnFuncOverload' => $vendorDir . '/symfony/polyfill-util/BinaryOnFuncOverload.php', + 'Symfony\\Polyfill\\Util\\TestListener' => $vendorDir . '/symfony/polyfill-util/TestListener.php', 'lessc' => $vendorDir . '/leafo/lessphp/lessc.inc.php', 'lessc_formatter_classic' => $vendorDir . '/leafo/lessphp/lessc.inc.php', 'lessc_formatter_compressed' => $vendorDir . '/leafo/lessphp/lessc.inc.php', diff --git a/libraries/vendor/composer/autoload_files.php b/libraries/vendor/composer/autoload_files.php index fb46f771b9ea3..2702ae9181742 100644 --- a/libraries/vendor/composer/autoload_files.php +++ b/libraries/vendor/composer/autoload_files.php @@ -21,8 +21,8 @@ '05d739a990f75f0c44ebe1f032b33148' => $vendorDir . '/joomla/string/src/phputf8/ucwords.php', '4292e2fa66516089e6006723267587b4' => $vendorDir . '/joomla/string/src/phputf8/utils/ascii.php', '87465e33b7551b401bf051928f220e9a' => $vendorDir . '/joomla/string/src/phputf8/utils/validation.php', - '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php', 'e40631d46120a9c38ea139981f8dab26' => $vendorDir . '/ircmaxell/password-compat/lib/password.php', + '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php', 'edc6464955a37aa4d5fbf39d40fb6ee7' => $vendorDir . '/symfony/polyfill-php55/bootstrap.php', 'bd9634f2d41831496de0d3dfe4c94881' => $vendorDir . '/symfony/polyfill-php56/bootstrap.php', '3109cb1a231dcd04bee1f9f620d46975' => $vendorDir . '/paragonie/sodium_compat/autoload.php', diff --git a/libraries/vendor/composer/autoload_psr4.php b/libraries/vendor/composer/autoload_psr4.php index b39b29ee7c834..012682e2bf817 100644 --- a/libraries/vendor/composer/autoload_psr4.php +++ b/libraries/vendor/composer/autoload_psr4.php @@ -26,7 +26,6 @@ 'Joomla\\Event\\' => array($vendorDir . '/joomla/event/src'), 'Joomla\\Data\\Tests\\' => array($vendorDir . '/joomla/data/Tests'), 'Joomla\\Data\\' => array($vendorDir . '/joomla/data/src'), - 'Joomla\\DI\\Tests\\' => array($vendorDir . '/joomla/di/Tests'), 'Joomla\\DI\\' => array($vendorDir . '/joomla/di/src'), 'Joomla\\Archive\\' => array($vendorDir . '/joomla/archive/src'), 'Joomla\\Application\\' => array($vendorDir . '/joomla/application/src'), diff --git a/libraries/vendor/composer/autoload_static.php b/libraries/vendor/composer/autoload_static.php index 360c68f2399e5..4d463ce3d9797 100644 --- a/libraries/vendor/composer/autoload_static.php +++ b/libraries/vendor/composer/autoload_static.php @@ -22,8 +22,8 @@ class ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe '05d739a990f75f0c44ebe1f032b33148' => __DIR__ . '/..' . '/joomla/string/src/phputf8/ucwords.php', '4292e2fa66516089e6006723267587b4' => __DIR__ . '/..' . '/joomla/string/src/phputf8/utils/ascii.php', '87465e33b7551b401bf051928f220e9a' => __DIR__ . '/..' . '/joomla/string/src/phputf8/utils/validation.php', - '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php', 'e40631d46120a9c38ea139981f8dab26' => __DIR__ . '/..' . '/ircmaxell/password-compat/lib/password.php', + '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php', 'edc6464955a37aa4d5fbf39d40fb6ee7' => __DIR__ . '/..' . '/symfony/polyfill-php55/bootstrap.php', 'bd9634f2d41831496de0d3dfe4c94881' => __DIR__ . '/..' . '/symfony/polyfill-php56/bootstrap.php', '3109cb1a231dcd04bee1f9f620d46975' => __DIR__ . '/..' . '/paragonie/sodium_compat/autoload.php', @@ -58,7 +58,6 @@ class ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe 'Joomla\\Event\\' => 13, 'Joomla\\Data\\Tests\\' => 18, 'Joomla\\Data\\' => 12, - 'Joomla\\DI\\Tests\\' => 16, 'Joomla\\DI\\' => 10, 'Joomla\\Archive\\' => 15, 'Joomla\\Application\\' => 19, @@ -146,10 +145,6 @@ class ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe array ( 0 => __DIR__ . '/..' . '/joomla/data/src', ), - 'Joomla\\DI\\Tests\\' => - array ( - 0 => __DIR__ . '/..' . '/joomla/di/Tests', - ), 'Joomla\\DI\\' => array ( 0 => __DIR__ . '/..' . '/joomla/di/src', @@ -211,6 +206,11 @@ class ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe 'Joomla\\Data\\DataObject' => __DIR__ . '/..' . '/joomla/data/src/DataObject.php', 'Joomla\\Data\\DataSet' => __DIR__ . '/..' . '/joomla/data/src/DataSet.php', 'Joomla\\Data\\DumpableInterface' => __DIR__ . '/..' . '/joomla/data/src/DumpableInterface.php', + 'Joomla\\Data\\Tests\\DataObjectTest' => __DIR__ . '/..' . '/joomla/data/Tests/DataObjectTest.php', + 'Joomla\\Data\\Tests\\DataSetTest' => __DIR__ . '/..' . '/joomla/data/Tests/DataSetTest.php', + 'Joomla\\Data\\Tests\\JDataBuran' => __DIR__ . '/..' . '/joomla/data/Tests/Stubs/buran.php', + 'Joomla\\Data\\Tests\\JDataCapitaliser' => __DIR__ . '/..' . '/joomla/data/Tests/Stubs/capitaliser.php', + 'Joomla\\Data\\Tests\\JDataVostok' => __DIR__ . '/..' . '/joomla/data/Tests/Stubs/vostok.php', 'Joomla\\Event\\AbstractEvent' => __DIR__ . '/..' . '/joomla/event/src/AbstractEvent.php', 'Joomla\\Event\\DelegatingDispatcher' => __DIR__ . '/..' . '/joomla/event/src/DelegatingDispatcher.php', 'Joomla\\Event\\Dispatcher' => __DIR__ . '/..' . '/joomla/event/src/Dispatcher.php', @@ -222,6 +222,17 @@ class ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe 'Joomla\\Event\\EventInterface' => __DIR__ . '/..' . '/joomla/event/src/EventInterface.php', 'Joomla\\Event\\ListenersPriorityQueue' => __DIR__ . '/..' . '/joomla/event/src/ListenersPriorityQueue.php', 'Joomla\\Event\\Priority' => __DIR__ . '/..' . '/joomla/event/src/Priority.php', + 'Joomla\\Event\\Tests\\AbstractEventTest' => __DIR__ . '/..' . '/joomla/event/Tests/AbstractEventTest.php', + 'Joomla\\Event\\Tests\\DelegatingDispatcherTest' => __DIR__ . '/..' . '/joomla/event/Tests/DelegatingDispatcherTest.php', + 'Joomla\\Event\\Tests\\DispatcherTest' => __DIR__ . '/..' . '/joomla/event/Tests/DispatcherTest.php', + 'Joomla\\Event\\Tests\\EventImmutableTest' => __DIR__ . '/..' . '/joomla/event/Tests/EventImmutableTest.php', + 'Joomla\\Event\\Tests\\EventTest' => __DIR__ . '/..' . '/joomla/event/Tests/EventTest.php', + 'Joomla\\Event\\Tests\\ListenersPriorityQueueTest' => __DIR__ . '/..' . '/joomla/event/Tests/ListenersPriorityQueueTest.php', + 'Joomla\\Event\\Tests\\Stubs\\EmptyListener' => __DIR__ . '/..' . '/joomla/event/Tests/Stubs/EmptyListener.php', + 'Joomla\\Event\\Tests\\Stubs\\FirstListener' => __DIR__ . '/..' . '/joomla/event/Tests/Stubs/FirstListener.php', + 'Joomla\\Event\\Tests\\Stubs\\SecondListener' => __DIR__ . '/..' . '/joomla/event/Tests/Stubs/SecondListener.php', + 'Joomla\\Event\\Tests\\Stubs\\SomethingListener' => __DIR__ . '/..' . '/joomla/event/Tests/Stubs/SomethingListener.php', + 'Joomla\\Event\\Tests\\Stubs\\ThirdListener' => __DIR__ . '/..' . '/joomla/event/Tests/Stubs/ThirdListener.php', 'Joomla\\Filesystem\\Buffer' => __DIR__ . '/..' . '/joomla/filesystem/src/Buffer.php', 'Joomla\\Filesystem\\Clients\\FtpClient' => __DIR__ . '/..' . '/joomla/filesystem/src/Clients/FtpClient.php', 'Joomla\\Filesystem\\Exception\\FilesystemException' => __DIR__ . '/..' . '/joomla/filesystem/src/Exception/FilesystemException.php', @@ -271,11 +282,23 @@ class ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe 'Joomla\\Session\\Storage\\None' => __DIR__ . '/..' . '/joomla/session/Joomla/Session/Storage/None.php', 'Joomla\\Session\\Storage\\Wincache' => __DIR__ . '/..' . '/joomla/session/Joomla/Session/Storage/Wincache.php', 'Joomla\\Session\\Storage\\Xcache' => __DIR__ . '/..' . '/joomla/session/Joomla/Session/Storage/Xcache.php', + 'Joomla\\Session\\Tests\\Handler\\ApcuHandlerTest' => __DIR__ . '/..' . '/joomla/session/tests/Handler/ApcuHandlerTest.php', + 'Joomla\\Session\\Tests\\Handler\\DatabaseHandlerTest' => __DIR__ . '/..' . '/joomla/session/tests/Handler/DatabaseHandlerTest.php', + 'Joomla\\Session\\Tests\\Handler\\FilesystemHandlerTest' => __DIR__ . '/..' . '/joomla/session/tests/Handler/FilesystemHandlerTest.php', + 'Joomla\\Session\\Tests\\Handler\\MemcachedHandlerTest' => __DIR__ . '/..' . '/joomla/session/tests/Handler/MemcachedHandlerTest.php', + 'Joomla\\Session\\Tests\\Handler\\NativeStorageTest' => __DIR__ . '/..' . '/joomla/session/tests/Storage/NativeStorageTest.php', + 'Joomla\\Session\\Tests\\Handler\\RedisHandlerTest' => __DIR__ . '/..' . '/joomla/session/tests/Handler/RedisHandlerTest.php', + 'Joomla\\Session\\Tests\\Handler\\WincacheHandlerTest' => __DIR__ . '/..' . '/joomla/session/tests/Handler/WincacheHandlerTest.php', + 'Joomla\\Session\\Tests\\Handler\\XCacheHandlerTest' => __DIR__ . '/..' . '/joomla/session/tests/Handler/XCacheHandlerTest.php', + 'Joomla\\Session\\Tests\\SessionTest' => __DIR__ . '/..' . '/joomla/session/tests/SessionTest.php', 'Joomla\\String\\Inflector' => __DIR__ . '/..' . '/joomla/string/src/Inflector.php', 'Joomla\\String\\Normalise' => __DIR__ . '/..' . '/joomla/string/src/Normalise.php', 'Joomla\\String\\String' => __DIR__ . '/..' . '/joomla/string/src/String.php', 'Joomla\\String\\StringHelper' => __DIR__ . '/..' . '/joomla/string/src/StringHelper.php', 'Joomla\\Uri\\AbstractUri' => __DIR__ . '/..' . '/joomla/uri/src/AbstractUri.php', + 'Joomla\\Uri\\Tests\\UriHelperTest' => __DIR__ . '/..' . '/joomla/uri/Tests/UriHelperTest.php', + 'Joomla\\Uri\\Tests\\UriImmuteableTest' => __DIR__ . '/..' . '/joomla/uri/Tests/UriImmutableTest.php', + 'Joomla\\Uri\\Tests\\UriTest' => __DIR__ . '/..' . '/joomla/uri/Tests/UriTest.php', 'Joomla\\Uri\\Uri' => __DIR__ . '/..' . '/joomla/uri/src/Uri.php', 'Joomla\\Uri\\UriHelper' => __DIR__ . '/..' . '/joomla/uri/src/UriHelper.php', 'Joomla\\Uri\\UriImmutable' => __DIR__ . '/..' . '/joomla/uri/src/UriImmutable.php', @@ -294,6 +317,8 @@ class ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe 'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php', 'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php', 'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php', + 'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php', + 'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php', 'SMTP' => __DIR__ . '/..' . '/phpmailer/phpmailer/class.smtp.php', 'SimplePie' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie.php', 'SimplePie_Author' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Author.php', @@ -344,6 +369,7 @@ class ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe 'Symfony\\Polyfill\\Util\\Binary' => __DIR__ . '/..' . '/symfony/polyfill-util/Binary.php', 'Symfony\\Polyfill\\Util\\BinaryNoFuncOverload' => __DIR__ . '/..' . '/symfony/polyfill-util/BinaryNoFuncOverload.php', 'Symfony\\Polyfill\\Util\\BinaryOnFuncOverload' => __DIR__ . '/..' . '/symfony/polyfill-util/BinaryOnFuncOverload.php', + 'Symfony\\Polyfill\\Util\\TestListener' => __DIR__ . '/..' . '/symfony/polyfill-util/TestListener.php', 'lessc' => __DIR__ . '/..' . '/leafo/lessphp/lessc.inc.php', 'lessc_formatter_classic' => __DIR__ . '/..' . '/leafo/lessphp/lessc.inc.php', 'lessc_formatter_compressed' => __DIR__ . '/..' . '/leafo/lessphp/lessc.inc.php', diff --git a/libraries/vendor/composer/installed.json b/libraries/vendor/composer/installed.json index a3cbc82a8416d..401f84f789f53 100644 --- a/libraries/vendor/composer/installed.json +++ b/libraries/vendor/composer/installed.json @@ -171,57 +171,6 @@ "joomla" ] }, - { - "name": "joomla/di", - "version": "1.3.1", - "version_normalized": "1.3.1.0", - "source": { - "type": "git", - "url": "https://github.com/joomla-framework/di.git", - "reference": "4991f57e2af628a87e43493b9b92dc8e3048da63" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/di/zipball/4991f57e2af628a87e43493b9b92dc8e3048da63", - "reference": "4991f57e2af628a87e43493b9b92dc8e3048da63", - "shasum": "" - }, - "require": { - "php": ">=5.3.10" - }, - "require-dev": { - "phpunit/phpunit": "4.*", - "squizlabs/php_codesniffer": "1.*" - }, - "time": "2015-04-02T16:30:40+00:00", - "type": "joomla-package", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Joomla\\DI\\": "src/", - "Joomla\\DI\\Tests\\": "Tests/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0+" - ], - "description": "Joomla DI Package", - "homepage": "https://github.com/joomla-framework/di", - "keywords": [ - "container", - "dependency injection", - "di", - "framework", - "ioc", - "joomla" - ] - }, { "name": "leafo/lessphp", "version": "v0.5.0", @@ -897,64 +846,6 @@ "joomla" ] }, - { - "name": "symfony/polyfill-php55", - "version": "v1.4.0", - "version_normalized": "1.4.0.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php55.git", - "reference": "94566239a7720cde0820f15f0cc348ddb51ba51d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/94566239a7720cde0820f15f0cc348ddb51ba51d", - "reference": "94566239a7720cde0820f15f0cc348ddb51ba51d", - "shasum": "" - }, - "require": { - "ircmaxell/password-compat": "~1.0", - "php": ">=5.3.3" - }, - "time": "2017-06-09T08:25:21+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php55\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ] - }, { "name": "joomla/filter", "version": "1.3.3", @@ -1066,107 +957,222 @@ ] }, { - "name": "phpmailer/phpmailer", - "version": "v5.2.24", - "version_normalized": "5.2.24.0", + "name": "joomla/ldap", + "version": "1.3.0", + "version_normalized": "1.3.0.0", "source": { "type": "git", - "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "22d04c6a58145a244696f3f254c1875aa653b26a" + "url": "https://github.com/joomla-framework/ldap.git", + "reference": "4dce2db6a3d6d2b8c7847651ad011bb3ed7ba978" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/22d04c6a58145a244696f3f254c1875aa653b26a", - "reference": "22d04c6a58145a244696f3f254c1875aa653b26a", + "url": "https://api.github.com/repos/joomla-framework/ldap/zipball/4dce2db6a3d6d2b8c7847651ad011bb3ed7ba978", + "reference": "4dce2db6a3d6d2b8c7847651ad011bb3ed7ba978", "shasum": "" }, "require": { - "ext-ctype": "*", - "php": ">=5.0.0" + "ext-ldap": "*", + "php": "^5.3.10|~7.0" }, "require-dev": { - "doctrine/annotations": "1.2.*", - "jms/serializer": "0.16.*", - "phpdocumentor/phpdocumentor": "2.*", - "phpunit/phpunit": "4.8.*", - "symfony/debug": "2.8.*", - "symfony/filesystem": "2.8.*", - "symfony/translation": "2.8.*", - "symfony/yaml": "2.8.*", - "zendframework/zend-cache": "2.5.1", - "zendframework/zend-config": "2.5.1", - "zendframework/zend-eventmanager": "2.5.1", - "zendframework/zend-filter": "2.5.1", - "zendframework/zend-i18n": "2.5.1", - "zendframework/zend-json": "2.5.1", - "zendframework/zend-math": "2.5.1", - "zendframework/zend-serializer": "2.5.*", - "zendframework/zend-servicemanager": "2.5.*", - "zendframework/zend-stdlib": "2.5.1" + "joomla/registry": "^1.4.5|~2.0", + "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0", + "squizlabs/php_codesniffer": "1.*", + "symfony/polyfill-php56": "~1.0" }, "suggest": { - "league/oauth2-google": "Needed for Google XOAUTH2 authentication" + "symfony/polyfill-php56": "If using PHP 5.5 or earlier to use ldap_escape() function" + }, + "time": "2017-10-21T15:41:55+00:00", + "type": "joomla-package", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Joomla\\Ldap\\": "src/" + } }, - "time": "2017-07-26T21:00:20+00:00", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+" + ], + "description": "Joomla LDAP Package", + "homepage": "https://github.com/joomla-framework/ldap", + "keywords": [ + "framework", + "joomla", + "ldap" + ] + }, + { + "name": "paragonie/sodium_compat", + "version": "v1.3.1", + "version_normalized": "1.3.1.0", + "source": { + "type": "git", + "url": "https://github.com/paragonie/sodium_compat.git", + "reference": "6b3a59ef127445564a00e261eb1e960b6292f494" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/6b3a59ef127445564a00e261eb1e960b6292f494", + "reference": "6b3a59ef127445564a00e261eb1e960b6292f494", + "shasum": "" + }, + "require": { + "paragonie/random_compat": "^1|^2", + "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7" + }, + "require-dev": { + "phpunit/phpunit": "^3|^4|^5" + }, + "suggest": { + "ext-libsodium": "Better performance, password hashing (Argon2i), secure memory management (memzero), and better security." + }, + "time": "2017-09-29T21:27:52+00:00", "type": "library", "installation-source": "dist", "autoload": { - "classmap": [ - "class.phpmailer.php", - "class.phpmaileroauth.php", - "class.phpmaileroauthgoogle.php", - "class.smtp.php", - "class.pop3.php", - "extras/EasyPeasyICS.php", - "extras/ntlm_sasl_client.php" + "files": [ + "autoload.php" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL-2.1" + "ISC" ], "authors": [ { - "name": "Jim Jagielski", - "email": "jimjag@gmail.com" + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com" }, { - "name": "Marcus Bointon", - "email": "phpmailer@synchromedia.co.uk" + "name": "Frank Denis", + "email": "jedisct1@pureftpd.org" + } + ], + "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists", + "keywords": [ + "Authentication", + "BLAKE2b", + "ChaCha20", + "ChaCha20-Poly1305", + "Chapoly", + "Curve25519", + "Ed25519", + "EdDSA", + "Edwards-curve Digital Signature Algorithm", + "Elliptic Curve Diffie-Hellman", + "Poly1305", + "Pure-PHP cryptography", + "RFC 7748", + "RFC 8032", + "Salpoly", + "Salsa20", + "X25519", + "XChaCha20-Poly1305", + "XSalsa20-Poly1305", + "Xchacha20", + "Xsalsa20", + "aead", + "cryptography", + "ecdh", + "elliptic curve", + "elliptic curve cryptography", + "encryption", + "libsodium", + "php", + "public-key cryptography", + "secret-key cryptography", + "side-channel resistant" + ] + }, + { + "name": "symfony/polyfill-php55", + "version": "v1.6.0", + "version_normalized": "1.6.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php55.git", + "reference": "b64e7f0c37ecf144ecc16668936eef94e628fbfd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/b64e7f0c37ecf144ecc16668936eef94e628fbfd", + "reference": "b64e7f0c37ecf144ecc16668936eef94e628fbfd", + "shasum": "" + }, + "require": { + "ircmaxell/password-compat": "~1.0", + "php": ">=5.3.3" + }, + "time": "2017-10-11T12:05:26+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php55\\": "" }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ { - "name": "Andy Prevost", - "email": "codeworxtech@users.sourceforge.net" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { - "name": "Brent R. Matzelle" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "PHPMailer is a full-featured email creation and transfer class for PHP" + "description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ] }, { "name": "symfony/polyfill-util", - "version": "v1.4.0", - "version_normalized": "1.4.0.0", + "version": "v1.6.0", + "version_normalized": "1.6.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d" + "reference": "6e719200c8e540e0c0effeb31f96bdb344b94176" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ebccbde4aad410f6438d86d7d261c6b4d2b9a51d", - "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/6e719200c8e540e0c0effeb31f96bdb344b94176", + "reference": "6e719200c8e540e0c0effeb31f96bdb344b94176", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2017-06-09T08:25:21+00:00", + "time": "2017-10-11T12:05:26+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.6-dev" } }, "installation-source": "dist", @@ -1200,28 +1206,28 @@ }, { "name": "symfony/polyfill-php56", - "version": "v1.4.0", - "version_normalized": "1.4.0.0", + "version": "v1.6.0", + "version_normalized": "1.6.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929" + "reference": "265fc96795492430762c29be291a371494ba3a5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/bc0b7d6cb36b10cfabb170a3e359944a95174929", - "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/265fc96795492430762c29be291a371494ba3a5b", + "reference": "265fc96795492430762c29be291a371494ba3a5b", "shasum": "" }, "require": { "php": ">=5.3.3", "symfony/polyfill-util": "~1.0" }, - "time": "2017-06-09T08:25:21+00:00", + "time": "2017-10-11T12:05:26+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.6-dev" } }, "installation-source": "dist", @@ -1257,164 +1263,158 @@ ] }, { - "name": "symfony/yaml", - "version": "v2.8.26", - "version_normalized": "2.8.26.0", + "name": "phpmailer/phpmailer", + "version": "v5.2.26", + "version_normalized": "5.2.26.0", "source": { "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "4c29dec8d489c4e37cf87ccd7166cd0b0e6a45c5" + "url": "https://github.com/PHPMailer/PHPMailer.git", + "reference": "70362997bda4376378be7d92d81e2200550923f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/4c29dec8d489c4e37cf87ccd7166cd0b0e6a45c5", - "reference": "4c29dec8d489c4e37cf87ccd7166cd0b0e6a45c5", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/70362997bda4376378be7d92d81e2200550923f7", + "reference": "70362997bda4376378be7d92d81e2200550923f7", "shasum": "" }, "require": { - "php": ">=5.3.9" + "ext-ctype": "*", + "php": ">=5.0.0" }, - "time": "2017-06-01T20:52:29+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8-dev" - } + "require-dev": { + "doctrine/annotations": "1.2.*", + "jms/serializer": "0.16.*", + "phpdocumentor/phpdocumentor": "2.*", + "phpunit/phpunit": "4.8.*", + "symfony/debug": "2.8.*", + "symfony/filesystem": "2.8.*", + "symfony/translation": "2.8.*", + "symfony/yaml": "2.8.*", + "zendframework/zend-cache": "2.5.1", + "zendframework/zend-config": "2.5.1", + "zendframework/zend-eventmanager": "2.5.1", + "zendframework/zend-filter": "2.5.1", + "zendframework/zend-i18n": "2.5.1", + "zendframework/zend-json": "2.5.1", + "zendframework/zend-math": "2.5.1", + "zendframework/zend-serializer": "2.5.*", + "zendframework/zend-servicemanager": "2.5.*", + "zendframework/zend-stdlib": "2.5.1" + }, + "suggest": { + "league/oauth2-google": "Needed for Google XOAUTH2 authentication" }, + "time": "2017-11-04T09:26:05+00:00", + "type": "library", "installation-source": "dist", "autoload": { - "psr-4": { - "Symfony\\Component\\Yaml\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "class.phpmailer.php", + "class.phpmaileroauth.php", + "class.phpmaileroauthgoogle.php", + "class.smtp.php", + "class.pop3.php", + "extras/EasyPeasyICS.php", + "extras/ntlm_sasl_client.php" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "LGPL-2.1" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Jim Jagielski", + "email": "jimjag@gmail.com" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Marcus Bointon", + "email": "phpmailer@synchromedia.co.uk" + }, + { + "name": "Andy Prevost", + "email": "codeworxtech@users.sourceforge.net" + }, + { + "name": "Brent R. Matzelle" } ], - "description": "Symfony Yaml Component", - "homepage": "https://symfony.com" + "description": "PHPMailer is a full-featured email creation and transfer class for PHP" }, { - "name": "paragonie/sodium_compat", - "version": "v1.2.0", - "version_normalized": "1.2.0.0", + "name": "symfony/yaml", + "version": "v2.8.29", + "version_normalized": "2.8.29.0", "source": { "type": "git", - "url": "https://github.com/paragonie/sodium_compat.git", - "reference": "110b1707f45e3b59311bb488b3af7251673de9b7" + "url": "https://github.com/symfony/yaml.git", + "reference": "d819bf267e901727141fe828ae888486fd21236e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/110b1707f45e3b59311bb488b3af7251673de9b7", - "reference": "110b1707f45e3b59311bb488b3af7251673de9b7", + "url": "https://api.github.com/repos/symfony/yaml/zipball/d819bf267e901727141fe828ae888486fd21236e", + "reference": "d819bf267e901727141fe828ae888486fd21236e", "shasum": "" }, "require": { - "paragonie/random_compat": "^1|^2", - "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7" - }, - "require-dev": { - "phpunit/phpunit": "^3|^4|^5" - }, - "suggest": { - "ext-libsodium": "Better performance, password hashing (Argon2i), secure memory management (memzero), and better security." + "php": ">=5.3.9" }, - "time": "2017-09-01T01:19:04+00:00", + "time": "2017-11-05T15:25:56+00:00", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" + } + }, "installation-source": "dist", "autoload": { - "files": [ - "autoload.php" + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "ISC" + "MIT" ], "authors": [ { - "name": "Paragon Initiative Enterprises", - "email": "security@paragonie.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { - "name": "Frank Denis", - "email": "jedisct1@pureftpd.org" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists", - "keywords": [ - "Authentication", - "BLAKE2b", - "ChaCha20", - "ChaCha20-Poly1305", - "Chapoly", - "Curve25519", - "Ed25519", - "EdDSA", - "Edwards-curve Digital Signature Algorithm", - "Elliptic Curve Diffie-Hellman", - "Poly1305", - "Pure-PHP cryptography", - "RFC 7748", - "RFC 8032", - "Salpoly", - "Salsa20", - "X25519", - "XChaCha20-Poly1305", - "XSalsa20-Poly1305", - "Xchacha20", - "Xsalsa20", - "aead", - "cryptography", - "ecdh", - "elliptic curve", - "elliptic curve cryptography", - "encryption", - "libsodium", - "php", - "public-key cryptography", - "secret-key cryptography", - "side-channel resistant" - ] + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com" }, { - "name": "joomla/ldap", - "version": "1.2.0", - "version_normalized": "1.2.0.0", + "name": "joomla/di", + "version": "1.4.0", + "version_normalized": "1.4.0.0", "source": { "type": "git", - "url": "https://github.com/joomla-framework/ldap.git", - "reference": "2d82a7e9ad0aa1091e8121ab8e194ff0e9d14208" + "url": "https://github.com/joomla-framework/di.git", + "reference": "756c6eb4554b9007f69da66cf488a05308251ed8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/ldap/zipball/2d82a7e9ad0aa1091e8121ab8e194ff0e9d14208", - "reference": "2d82a7e9ad0aa1091e8121ab8e194ff0e9d14208", + "url": "https://api.github.com/repos/joomla-framework/di/zipball/756c6eb4554b9007f69da66cf488a05308251ed8", + "reference": "756c6eb4554b9007f69da66cf488a05308251ed8", "shasum": "" }, "require": { - "ext-ldap": "*", - "php": "^5.3.10|~7.0", - "symfony/polyfill-php56": "~1.0" + "php": "^5.3.10|~7.0" }, "require-dev": { "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0", "squizlabs/php_codesniffer": "1.*" }, - "time": "2017-07-27T13:13:55+00:00", + "time": "2017-11-12T15:35:19+00:00", "type": "joomla-package", "extra": { "branch-alias": { @@ -1424,19 +1424,22 @@ "installation-source": "dist", "autoload": { "psr-4": { - "Joomla\\Ldap\\": "src/" + "Joomla\\DI\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "GPL-2.0+" ], - "description": "Joomla LDAP Package", - "homepage": "https://github.com/joomla-framework/ldap", + "description": "Joomla DI Package", + "homepage": "https://github.com/joomla-framework/di", "keywords": [ + "container", + "dependency injection", + "di", "framework", - "joomla", - "ldap" + "ioc", + "joomla" ] } ] diff --git a/libraries/vendor/joomla/di/src/Container.php b/libraries/vendor/joomla/di/src/Container.php index 2673f97273d35..cd3bfbf2625c6 100644 --- a/libraries/vendor/joomla/di/src/Container.php +++ b/libraries/vendor/joomla/di/src/Container.php @@ -2,7 +2,7 @@ /** * Part of the Joomla Framework DI Package * - * @copyright Copyright (C) 2013 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2013 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ @@ -109,8 +109,8 @@ protected function resolveAlias($key) * @param string $key The class name to build. * @param boolean $shared True to create a shared resource. * - * @return mixed Instance of class specified by $key with all dependencies injected. - * Returns an object if the class exists and false otherwise + * @return object|false Instance of class specified by $key with all dependencies injected. + * Returns an object if the class exists and false otherwise * * @since 1.0 */ @@ -128,7 +128,7 @@ public function buildObject($key, $shared = false) $constructor = $reflection->getConstructor(); // If there are no parameters, just return a new object. - if (is_null($constructor)) + if ($constructor === null) { $callback = function () use ($key) { return new $key; @@ -152,7 +152,8 @@ public function buildObject($key, $shared = false) * * @param string $key The class name to build. * - * @return object Instance of class specified by $key with all dependencies injected. + * @return object|false Instance of class specified by $key with all dependencies injected. + * Returns an object if the class exists and false otherwise * * @since 1.0 */ @@ -192,7 +193,7 @@ public function extend($key, \Closure $callable) $key = $this->resolveAlias($key); $raw = $this->getRaw($key); - if (is_null($raw)) + if ($raw === null) { throw new \InvalidArgumentException(sprintf('The requested key %s does not exist to extend.', $key)); } @@ -224,7 +225,7 @@ protected function getMethodArgs(\ReflectionMethod $method) $dependencyVarName = $param->getName(); // If we have a dependency, that means it has been type-hinted. - if (!is_null($dependency)) + if ($dependency !== null) { $dependencyClassName = $dependency->getName(); @@ -345,14 +346,14 @@ public function get($key, $forceNew = false) $key = $this->resolveAlias($key); $raw = $this->getRaw($key); - if (is_null($raw)) + if ($raw === null) { throw new \InvalidArgumentException(sprintf('Key %s has not been registered with the container.', $key)); } if ($raw['shared']) { - if (!isset($this->instances[$key]) || $forceNew) + if ($forceNew || !isset($this->instances[$key])) { $this->instances[$key] = $raw['callback']($this); } @@ -397,7 +398,7 @@ protected function getRaw($key) $aliasKey = $this->resolveAlias($key); - if ($aliasKey != $key && isset($this->dataStore[$aliasKey])) + if ($aliasKey !== $key && isset($this->dataStore[$aliasKey])) { return $this->dataStore[$aliasKey]; } diff --git a/libraries/vendor/joomla/di/src/ContainerAwareInterface.php b/libraries/vendor/joomla/di/src/ContainerAwareInterface.php index e567be7efbc9e..e6b284b386f64 100644 --- a/libraries/vendor/joomla/di/src/ContainerAwareInterface.php +++ b/libraries/vendor/joomla/di/src/ContainerAwareInterface.php @@ -2,7 +2,7 @@ /** * Part of the Joomla Framework DI Package * - * @copyright Copyright (C) 2013 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2013 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ @@ -21,8 +21,8 @@ interface ContainerAwareInterface * @return Container * * @since 1.0 - * * @throws \UnexpectedValueException May be thrown if the container has not been set. + * @deprecated 2.0 The getter will no longer be part of the interface. */ public function getContainer(); diff --git a/libraries/vendor/joomla/di/src/ContainerAwareTrait.php b/libraries/vendor/joomla/di/src/ContainerAwareTrait.php index 451a48e18a190..b6b21aa6aee9b 100644 --- a/libraries/vendor/joomla/di/src/ContainerAwareTrait.php +++ b/libraries/vendor/joomla/di/src/ContainerAwareTrait.php @@ -2,19 +2,16 @@ /** * Part of the Joomla Framework DI Package * - * @copyright Copyright (C) 2013 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2013 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ namespace Joomla\DI; -use Joomla\DI\Container; - /** * Defines the trait for a Container Aware Class. * * @since 1.2 - * * @note Traits are available in PHP 5.4+ */ trait ContainerAwareTrait @@ -33,8 +30,8 @@ trait ContainerAwareTrait * @return Container * * @since 1.2 - * * @throws \UnexpectedValueException May be thrown if the container has not been set. + * @note As of 2.0 this method will be protected. */ public function getContainer() { diff --git a/libraries/vendor/joomla/di/src/Exception/DependencyResolutionException.php b/libraries/vendor/joomla/di/src/Exception/DependencyResolutionException.php index ac5121f4dbe59..d39763c894b18 100644 --- a/libraries/vendor/joomla/di/src/Exception/DependencyResolutionException.php +++ b/libraries/vendor/joomla/di/src/Exception/DependencyResolutionException.php @@ -2,7 +2,7 @@ /** * Part of the Joomla Framework DI Package * - * @copyright Copyright (C) 2013 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2013 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/libraries/vendor/joomla/di/src/ServiceProviderInterface.php b/libraries/vendor/joomla/di/src/ServiceProviderInterface.php index 5e932643fee4d..f4ef4ca3599e2 100644 --- a/libraries/vendor/joomla/di/src/ServiceProviderInterface.php +++ b/libraries/vendor/joomla/di/src/ServiceProviderInterface.php @@ -2,7 +2,7 @@ /** * Part of the Joomla Framework DI Package * - * @copyright Copyright (C) 2013 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2013 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/libraries/vendor/joomla/ldap/src/LdapClient.php b/libraries/vendor/joomla/ldap/src/LdapClient.php index 8ac6fcd50b721..4e407d63cc071 100644 --- a/libraries/vendor/joomla/ldap/src/LdapClient.php +++ b/libraries/vendor/joomla/ldap/src/LdapClient.php @@ -1,8 +1,8 @@ close(); + } + + /** + * Connect to an LDAP server + * + * @return boolean * * @since 1.0 */ @@ -137,37 +179,29 @@ public function connect() return false; } - $this->resource = @ ldap_connect($this->host, $this->port); + $this->resource = ldap_connect($this->host, $this->port); - if ($this->resource) + if (!$this->resource) { - if ($this->use_ldapV3) - { - if (!@ldap_set_option($this->resource, LDAP_OPT_PROTOCOL_VERSION, 3)) - { - return false; - } - } - - if (!@ldap_set_option($this->resource, LDAP_OPT_REFERRALS, (int) $this->no_referrals)) - { - return false; - } + return false; + } - if ($this->negotiate_tls) - { - if (!@ldap_start_tls($this->resource)) - { - return false; - } - } + if ($this->use_ldapV3 && !ldap_set_option($this->resource, LDAP_OPT_PROTOCOL_VERSION, 3)) + { + return false; + } - return true; + if (!ldap_set_option($this->resource, LDAP_OPT_REFERRALS, (int) $this->no_referrals)) + { + return false; } - else + + if ($this->negotiate_tls && !ldap_start_tls($this->resource)) { return false; } + + return true; } /** @@ -179,7 +213,12 @@ public function connect() */ public function close() { - @ ldap_close($this->resource); + if ($this->isConnected()) + { + $this->unbind(); + } + + $this->resource = null; } /** @@ -209,9 +248,9 @@ public function setDn($username, $nosub = 0) } /** - * Get the DN + * Get the configured DN * - * @return string The current dn + * @return string * * @since 1.0 */ @@ -223,15 +262,23 @@ public function getDn() /** * Anonymously binds to LDAP directory * - * @return array + * @return boolean * * @since 1.0 */ public function anonymous_bind() { - $bindResult = @ldap_bind($this->resource); + if (!$this->isConnected()) + { + if (!$this->connect()) + { + return false; + } + } - return $bindResult; + $this->isBound = ldap_bind($this->resource); + + return $this->isBound; } /** @@ -247,6 +294,14 @@ public function anonymous_bind() */ public function bind($username = null, $password = null, $nosub = 0) { + if (!$this->isConnected()) + { + if (!$this->connect()) + { + return false; + } + } + if (is_null($username)) { $username = $this->username; @@ -258,9 +313,27 @@ public function bind($username = null, $password = null, $nosub = 0) } $this->setDn($username, $nosub); - $bindResult = @ldap_bind($this->resource, $this->getDn(), $password); - return $bindResult; + $this->isBound = ldap_bind($this->resource, $this->getDn(), $password); + + return $this->isBound; + } + + /** + * Unbinds from the LDAP directory + * + * @return boolean + * + * @since 1.3.0 + */ + public function unbind() + { + if ($this->isBound && $this->resource && is_resource($this->resource)) + { + return ldap_unbind($this->resource); + } + + return true; } /** @@ -270,7 +343,7 @@ public function bind($username = null, $password = null, $nosub = 0) * * @return array Search results * - * @since 1.0 + * @since 1.0 */ public function simple_search($search) { @@ -299,6 +372,11 @@ public function search(array $filters, $dnoverride = null, array $attributes = a { $result = array(); + if (!$this->isBound || !$this->isConnected()) + { + return $result; + } + if ($dnoverride) { $dn = $dnoverride; @@ -308,13 +386,11 @@ public function search(array $filters, $dnoverride = null, array $attributes = a $dn = $this->base_dn; } - $resource = $this->resource; - foreach ($filters as $search_filter) { - $search_result = @ldap_search($resource, $dn, $search_filter, $attributes); + $search_result = ldap_search($this->resource, $dn, $search_filter, $attributes); - if ($search_result && ($count = @ldap_count_entries($resource, $search_result)) > 0) + if ($search_result && ($count = ldap_count_entries($this->resource, $search_result)) > 0) { for ($i = 0; $i < $count; $i++) { @@ -322,15 +398,15 @@ public function search(array $filters, $dnoverride = null, array $attributes = a if (!$i) { - $firstentry = @ldap_first_entry($resource, $search_result); + $firstentry = ldap_first_entry($this->resource, $search_result); } else { - $firstentry = @ldap_next_entry($resource, $firstentry); + $firstentry = ldap_next_entry($this->resource, $firstentry); } // Load user-specified attributes - $result_array = @ldap_get_attributes($resource, $firstentry); + $result_array = ldap_get_attributes($this->resource, $firstentry); // LDAP returns an array of arrays, fit this into attributes result array foreach ($result_array as $ki => $ai) @@ -347,7 +423,7 @@ public function search(array $filters, $dnoverride = null, array $attributes = a } } - $result[$i]['dn'] = @ldap_get_dn($resource, $firstentry); + $result[$i]['dn'] = ldap_get_dn($this->resource, $firstentry); } } } @@ -356,153 +432,193 @@ public function search(array $filters, $dnoverride = null, array $attributes = a } /** - * Replace an entry and return a true or false result + * Replace attribute values with new ones * * @param string $dn The DN which contains the attribute you want to replace * @param string $attribute The attribute values you want to replace * - * @return mixed result of comparison (true, false, -1 on error) + * @return boolean * * @since 1.0 */ public function replace($dn, $attribute) { - return @ldap_mod_replace($this->resource, $dn, $attribute); + if (!$this->isBound || !$this->isConnected()) + { + return false; + } + + return ldap_mod_replace($this->resource, $dn, $attribute); } /** - * Modifies an entry and return a true or false result + * Modify an LDAP entry * * @param string $dn The DN which contains the attribute you want to modify * @param string $attribute The attribute values you want to modify * - * @return mixed result of comparison (true, false, -1 on error) + * @return boolean * * @since 1.0 */ public function modify($dn, $attribute) { - return @ldap_modify($this->resource, $dn, $attribute); + if (!$this->isBound || !$this->isConnected()) + { + return false; + } + + return ldap_modify($this->resource, $dn, $attribute); } /** - * Removes attribute value from given dn and return a true or false result + * Delete attribute values from current attributes * * @param string $dn The DN which contains the attribute you want to remove * @param string $attribute The attribute values you want to remove * - * @return mixed result of comparison (true, false, -1 on error) + * @return boolean * * @since 1.0 */ public function remove($dn, $attribute) { - $resource = $this->resource; + if (!$this->isBound || !$this->isConnected()) + { + return false; + } - return @ldap_mod_del($resource, $dn, $attribute); + return ldap_mod_del($this->resource, $dn, $attribute); } /** - * Compare an entry and return a true or false result + * Compare value of attribute found in entry specified with DN * * @param string $dn The DN which contains the attribute you want to compare * @param string $attribute The attribute whose value you want to compare * @param string $value The value you want to check against the LDAP attribute * - * @return mixed result of comparison (true, false, -1 on error) + * @return boolean|integer Boolean result of the comparison or -1 on error * * @since 1.0 */ public function compare($dn, $attribute, $value) { - return @ldap_compare($this->resource, $dn, $attribute, $value); + if (!$this->isBound || !$this->isConnected()) + { + return false; + } + + return ldap_compare($this->resource, $dn, $attribute, $value); } /** - * Read all or specified attributes of given dn + * Read attributes of a given DN * * @param string $dn The DN of the object you want to read * - * @return mixed array of attributes or -1 on error + * @return array|boolean Array of attributes for the given DN or boolean false on failure * * @since 1.0 */ public function read($dn) { + if (!$this->isBound || !$this->isConnected()) + { + return false; + } + $base = substr($dn, strpos($dn, ',') + 1); $cn = substr($dn, 0, strpos($dn, ',')); - $result = @ldap_read($this->resource, $base, $cn); + $result = ldap_read($this->resource, $base, $cn); - if ($result) + if ($result === false) { - return @ldap_get_entries($this->resource, $result); - } - else - { - return $result; + return false; } + + return ldap_get_entries($this->resource, $result); } /** - * Deletes a given DN from the tree + * Delete an entry from a directory * * @param string $dn The DN of the object you want to delete * - * @return boolean Result of operation + * @return boolean * * @since 1.0 */ public function delete($dn) { - return @ldap_delete($this->resource, $dn); + if (!$this->isBound || !$this->isConnected()) + { + return false; + } + + return ldap_delete($this->resource, $dn); } /** - * Create a new DN + * Add entries to LDAP directory * * @param string $dn The DN where you want to put the object * @param array $entries An array of arrays describing the object to add * - * @return boolean Result of operation + * @return boolean * * @since 1.0 */ public function create($dn, array $entries) { - return @ldap_add($this->resource, $dn, $entries); + if (!$this->isBound || !$this->isConnected()) + { + return false; + } + + return ldap_add($this->resource, $dn, $entries); } /** - * Add an attribute to the given DN - * Note: DN has to exist already + * Add attribute values to current attributes * * @param string $dn The DN of the entry to add the attribute * @param array $entry An array of arrays with attributes to add * - * @return boolean Result of operation + * @return boolean * * @since 1.0 */ public function add($dn, array $entry) { - return @ldap_mod_add($this->resource, $dn, $entry); + if (!$this->isBound || !$this->isConnected()) + { + return false; + } + + return ldap_mod_add($this->resource, $dn, $entry); } /** - * Rename the entry + * Modify the name of an entry * * @param string $dn The DN of the entry at the moment * @param string $newdn The DN of the entry should be (only cn=newvalue) * @param string $newparent The full DN of the parent (null by default) * @param boolean $deleteolddn Delete the old values (default) * - * @return boolean Result of operation + * @return boolean * * @since 1.0 */ public function rename($dn, $newdn, $newparent, $deleteolddn) { - return @ldap_rename($this->resource, $dn, $newdn, $newparent, $deleteolddn); + if (!$this->isBound || !$this->isConnected()) + { + return false; + } + + return ldap_rename($this->resource, $dn, $newdn, $newparent, $deleteolddn); } /** @@ -518,19 +634,36 @@ public function rename($dn, $newdn, $newparent, $deleteolddn) */ public function escape($value, $ignore = '', $flags = 0) { - return @ldap_escape($value, $ignore, $flags); + return ldap_escape($value, $ignore, $flags); } /** - * Returns the error message + * Return the LDAP error message of the last LDAP command * - * @return string error message + * @return string * * @since 1.0 */ public function getErrorMsg() { - return @ldap_error($this->resource); + if (!$this->isBound || !$this->isConnected()) + { + return ''; + } + + return ldap_error($this->resource); + } + + /** + * Check if the connection is established + * + * @return boolean + * + * @since 1.3.0 + */ + public function isConnected() + { + return $this->resource && is_resource($this->resource); } /** @@ -538,7 +671,7 @@ public function getErrorMsg() * * @param string $ip IP Address (e.g. xxx.xxx.xxx.xxx) * - * @return string Net address + * @return string * * @since 1.0 */ @@ -615,7 +748,9 @@ public static function LdapNetAddr($networkaddress) 'TCP6', 'Reserved (12)', 'URL', - 'Count'); + 'Count' + ); + $len = strlen($networkaddress); if ($len > 0) @@ -652,7 +787,7 @@ public static function LdapNetAddr($networkaddress) * @param string $password Clear text password to encrypt * @param string $type Type of password hash, either md5 or SHA * - * @return string Encrypted password + * @return string * * @since 1.0 */ @@ -661,15 +796,11 @@ public static function generatePassword($password, $type = 'md5') switch (strtolower($type)) { case 'sha': - $userpassword = '{SHA}' . base64_encode(pack('H*', sha1($password))); - break; + return '{SHA}' . base64_encode(pack('H*', sha1($password))); case 'md5': default: - $userpassword = '{MD5}' . base64_encode(pack('H*', md5($password))); - break; + return '{MD5}' . base64_encode(pack('H*', md5($password))); } - - return $userpassword; } } diff --git a/libraries/vendor/paragonie/sodium_compat/lib/php72compat.php b/libraries/vendor/paragonie/sodium_compat/lib/php72compat.php index 167fbccdadf98..1f0906e3b73fd 100644 --- a/libraries/vendor/paragonie/sodium_compat/lib/php72compat.php +++ b/libraries/vendor/paragonie/sodium_compat/lib/php72compat.php @@ -94,7 +94,13 @@ function sodium_compare($a, $b) */ function sodium_crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key) { - return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key); + try { + return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key); + } catch (Error $ex) { + return false; + } catch (Exception $ex) { + return false; + } } } if (!is_callable('sodium_crypto_aead_chacha20poly1305_encrypt')) { @@ -120,7 +126,13 @@ function sodium_crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonc */ function sodium_crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key) { - return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key); + try { + return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key); + } catch (Error $ex) { + return false; + } catch (Exception $ex) { + return false; + } } } if (!is_callable('sodium_crypto_aead_chacha20poly1305_ietf_encrypt')) { @@ -136,6 +148,38 @@ function sodium_crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key); } } +if (!is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_decrypt')) { + /** + * @param string $message + * @param string $assocData + * @param string $nonce + * @param string $key + * @return string + */ + function sodium_crypto_aead_xchacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key) + { + try { + return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key); + } catch (Error $ex) { + return false; + } catch (Exception $ex) { + return false; + } + } +} +if (!is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_encrypt')) { + /** + * @param string $message + * @param string $assocData + * @param string $nonce + * @param string $key + * @return string + */ + function sodium_crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key) + { + return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key); + } +} if (!is_callable('sodium_crypto_auth')) { /** * @param string $message @@ -196,11 +240,17 @@ function sodium_crypto_box_keypair_from_secretkey_and_publickey($sk, $pk) * @param string $message * @param string $nonce * @param string $kp - * @return string + * @return string|bool */ function sodium_crypto_box_open($message, $nonce, $kp) { - return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp); + try { + return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp); + } catch (Error $ex) { + return false; + } catch (Exception $ex) { + return false; + } } } if (!is_callable('sodium_crypto_box_publickey')) { @@ -238,11 +288,17 @@ function sodium_crypto_box_seal($message, $publicKey) /** * @param string $message * @param string $kp - * @return string + * @return string|bool */ function sodium_crypto_box_seal_open($message, $kp) { - return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp); + try { + return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp); + } catch (Error $ex) { + return false; + } catch (Exception $ex) { + return false; + } } } if (!is_callable('sodium_crypto_box_secretkey')) { @@ -440,11 +496,17 @@ function sodium_crypto_secretbox($message, $nonce, $key) * @param string $message * @param string $nonce * @param string $key - * @return string + * @return string|bool */ function sodium_crypto_secretbox_open($message, $nonce, $key) { - return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key); + try { + return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key); + } catch (Error $ex) { + return false; + } catch (Exception $ex) { + return false; + } } } if (!is_callable('sodium_crypto_shorthash')) { @@ -493,11 +555,17 @@ function sodium_crypto_sign_keypair() /** * @param string $signedMessage * @param string $pk - * @return string + * @return string|bool */ function sodium_crypto_sign_open($signedMessage, $pk) { - return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk); + try { + return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk); + } catch (Error $ex) { + return false; + } catch (Exception $ex) { + return false; + } } } if (!is_callable('sodium_crypto_sign_publickey')) { diff --git a/libraries/vendor/paragonie/sodium_compat/lib/sodium_compat.php b/libraries/vendor/paragonie/sodium_compat/lib/sodium_compat.php index 003647d9f552c..5124853d5c0d6 100644 --- a/libraries/vendor/paragonie/sodium_compat/lib/sodium_compat.php +++ b/libraries/vendor/paragonie/sodium_compat/lib/sodium_compat.php @@ -37,11 +37,17 @@ function compare($a, $b) * @param string $assocData * @param string $nonce * @param string $key - * @return string + * @return string|bool */ function crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key) { - return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key); + try { + return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key); + } catch (Error $ex) { + return false; + } catch (Exception $ex) { + return false; + } } } if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_encrypt')) { @@ -63,11 +69,17 @@ function crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key * @param string $assocData * @param string $nonce * @param string $key - * @return string + * @return string|bool */ function crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key) { - return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key); + try { + return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key); + } catch (Error $ex) { + return false; + } catch (Exception $ex) { + return false; + } } } if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_ietf_encrypt')) { @@ -143,11 +155,17 @@ function crypto_box_keypair_from_secretkey_and_publickey($sk, $pk) * @param string $message * @param string $nonce * @param string $kp - * @return string + * @return string|bool */ function crypto_box_open($message, $nonce, $kp) { - return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp); + try { + return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp); + } catch (Error $ex) { + return false; + } catch (Exception $ex) { + return false; + } } } if (!is_callable('\\Sodium\\crypto_box_publickey')) { @@ -185,11 +203,17 @@ function crypto_box_seal($message, $publicKey) /** * @param string $message * @param string $kp - * @return string + * @return string|bool */ function crypto_box_seal_open($message, $kp) { - return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp); + try { + return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp); + } catch (\Error $ex) { + return false; + } catch (\Exception $ex) { + return false; + } } } if (!is_callable('\\Sodium\\crypto_box_secretkey')) { @@ -377,11 +401,17 @@ function crypto_secretbox($message, $nonce, $key) * @param string $message * @param string $nonce * @param string $key - * @return string + * @return string|bool */ function crypto_secretbox_open($message, $nonce, $key) { - return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key); + try { + return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key); + } catch (Error $ex) { + return false; + } catch (Exception $ex) { + return false; + } } } if (!is_callable('\\Sodium\\crypto_shorthash')) { @@ -430,11 +460,17 @@ function crypto_sign_keypair() /** * @param string $signedMessage * @param string $pk - * @return string + * @return string|bool */ function crypto_sign_open($signedMessage, $pk) { - return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk); + try { + return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk); + } catch (\Error $ex) { + return false; + } catch (\Exception $ex) { + return false; + } } } if (!is_callable('\\Sodium\\crypto_sign_publickey')) { diff --git a/libraries/vendor/paragonie/sodium_compat/src/Compat.php b/libraries/vendor/paragonie/sodium_compat/src/Compat.php index 642adaa8dfc96..064d7e7db8b4a 100644 --- a/libraries/vendor/paragonie/sodium_compat/src/Compat.php +++ b/libraries/vendor/paragonie/sodium_compat/src/Compat.php @@ -725,7 +725,7 @@ public static function crypto_box_seal($plaintext, $publicKey) * This validates ciphertext integrity. * * @param string $ciphertext Sealed message to be opened - * @param string $keypair Your crypto_box keypair + * @param string $keypair Your crypto_box keypair * @return string The original plaintext message * @throws Error * @throws TypeError @@ -1160,12 +1160,14 @@ public static function crypto_kx($my_secret, $their_public, $client_public, $ser } if (self::isPhp72OrGreater()) { - return sodium_crypto_kx( - $my_secret, - $their_public, - $client_public, - $server_public - ); + if (is_callable('sodium_crypto_kx')) { + return sodium_crypto_kx( + $my_secret, + $their_public, + $client_public, + $server_public + ); + } } if (self::use_fallback('crypto_kx')) { return call_user_func( @@ -1978,7 +1980,9 @@ public static function crypto_sign_ed25519_sk_to_curve25519($sk) throw new Error('Argument 1 must be at least CRYPTO_SIGN_SEEDBYTES long.'); } if (self::isPhp72OrGreater()) { - return sodium_crypto_sign_ed25519_sk_to_curve25519($sk); + if (is_callable('crypto_sign_ed25519_sk_to_curve25519')) { + return sodium_crypto_sign_ed25519_sk_to_curve25519($sk); + } } if (self::use_fallback('crypto_sign_ed25519_sk_to_curve25519')) { return call_user_func('\\Sodium\\crypto_sign_ed25519_sk_to_curve25519', $sk); @@ -2018,7 +2022,7 @@ public static function hex2bin($string) /** * Increase a string (little endian) * - * @param &string $var + * @param string $var * * @return void * @throws Error (Unless libsodium is installed) @@ -2108,7 +2112,7 @@ public static function memcmp($left, $right) * It's actually not possible to zero memory buffers in PHP. You need the * native library for that. * - * @param &string $var + * @param string|null $var * * @return void * @throws Error (Unless libsodium is installed) diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519.php b/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519.php index e6770aca5858b..022c2801dc83c 100644 --- a/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519.php +++ b/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519.php @@ -128,36 +128,36 @@ public static function fe_frombytes($s) $h9 = (self::load_3(self::substr($s, 29, 3)) & 8388607) << 2; $carry9 = ($h9 + (1 << 24)) >> 25; - $h0 += self::mul($carry9, 19); - $h9 -= self::mul($carry9, 1 << 25); + $h0 += self::mul($carry9, 19, 5); + $h9 -= $carry9 << 25; $carry1 = ($h1 + (1 << 24)) >> 25; $h2 += $carry1; - $h1 -= self::mul($carry1, 1 << 25); + $h1 -= $carry1 << 25; $carry3 = ($h3 + (1 << 24)) >> 25; $h4 += $carry3; - $h3 -= self::mul($carry3, 1 << 25); + $h3 -= $carry3 << 25; $carry5 = ($h5 + (1 << 24)) >> 25; $h6 += $carry5; - $h5 -= self::mul($carry5, 1 << 25); + $h5 -= $carry5 << 25; $carry7 = ($h7 + (1 << 24)) >> 25; $h8 += $carry7; - $h7 -= self::mul($carry7, 1 << 25); + $h7 -= $carry7 << 25; $carry0 = ($h0 + (1 << 25)) >> 26; $h1 += $carry0; - $h0 -= self::mul($carry0, 1 << 26); + $h0 -= $carry0 << 26; $carry2 = ($h2 + (1 << 25)) >> 26; $h3 += $carry2; - $h2 -= self::mul($carry2, 1 << 26); + $h2 -= $carry2 << 26; $carry4 = ($h4 + (1 << 25)) >> 26; $h5 += $carry4; - $h4 -= self::mul($carry4, 1 << 26); + $h4 -= $carry4 << 26; $carry6 = ($h6 + (1 << 25)) >> 26; $h7 += $carry6; - $h6 -= self::mul($carry6, 1 << 26); + $h6 -= $carry6 << 26; $carry8 = ($h8 + (1 << 25)) >> 26; $h9 += $carry8; - $h8 -= self::mul($carry8, 1 << 26); + $h8 -= $carry8 << 26; return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( array( @@ -196,7 +196,7 @@ public static function fe_tobytes(ParagonIE_Sodium_Core_Curve25519_Fe $h) $h[8] = (int) $h[8]; $h[9] = (int) $h[9]; - $q = (self::mul(19, $h[9]) + (1 << 24)) >> 25; + $q = (self::mul($h[9], 19, 5) + (1 << 24)) >> 25; $q = ($h[0] + $q) >> 26; $q = ($h[1] + $q) >> 25; $q = ($h[2] + $q) >> 26; @@ -208,7 +208,7 @@ public static function fe_tobytes(ParagonIE_Sodium_Core_Curve25519_Fe $h) $q = ($h[8] + $q) >> 26; $q = ($h[9] + $q) >> 25; - $h[0] += self::mul(19, $q); + $h[0] += self::mul($q, 19, 5); $carry0 = $h[0] >> 26; $h[1] += $carry0; @@ -350,15 +350,15 @@ public static function fe_mul( $g7 = $g[7]; $g8 = $g[8]; $g9 = $g[9]; - $g1_19 = self::mul(19, $g1); - $g2_19 = self::mul(19, $g2); - $g3_19 = self::mul(19, $g3); - $g4_19 = self::mul(19, $g4); - $g5_19 = self::mul(19, $g5); - $g6_19 = self::mul(19, $g6); - $g7_19 = self::mul(19, $g7); - $g8_19 = self::mul(19, $g8); - $g9_19 = self::mul(19, $g9); + $g1_19 = self::mul($g1, 19, 5); + $g2_19 = self::mul($g2, 19, 5); + $g3_19 = self::mul($g3, 19, 5); + $g4_19 = self::mul($g4, 19, 5); + $g5_19 = self::mul($g5, 19, 5); + $g6_19 = self::mul($g6, 19, 5); + $g7_19 = self::mul($g7, 19, 5); + $g8_19 = self::mul($g8, 19, 5); + $g9_19 = self::mul($g9, 19, 5); $f1_2 = $f1 << 1; $f3_2 = $f3 << 1; $f5_2 = $f5 << 1; @@ -511,7 +511,7 @@ public static function fe_mul( $h8 -= $carry8 << 26; $carry9 = ($h9 + (1 << 24)) >> 25; - $h0 += self::mul($carry9, 19); + $h0 += self::mul($carry9, 19, 5); $h9 -= $carry9 << 25; $carry0 = ($h0 + (1 << 25)) >> 26; @@ -584,11 +584,11 @@ public static function fe_sq(ParagonIE_Sodium_Core_Curve25519_Fe $f) $f5_2 = $f5 << 1; $f6_2 = $f6 << 1; $f7_2 = $f7 << 1; - $f5_38 = self::mul(38, $f5); - $f6_19 = self::mul(19, $f6); - $f7_38 = self::mul(38, $f7); - $f8_19 = self::mul(19, $f8); - $f9_38 = self::mul(38, $f9); + $f5_38 = self::mul($f5, 38, 6); + $f6_19 = self::mul($f6, 19, 5); + $f7_38 = self::mul($f7, 38, 6); + $f8_19 = self::mul($f8, 19, 5); + $f9_38 = self::mul($f9, 38, 6); $f0f0 = self::mul($f0, $f0); $f0f1_2 = self::mul($f0_2, $f1); $f0f2_2 = self::mul($f0_2, $f2); @@ -691,7 +691,7 @@ public static function fe_sq(ParagonIE_Sodium_Core_Curve25519_Fe $f) $h8 -= $carry8 << 26; $carry9 = ($h9 + (1 << 24)) >> 25; - $h0 += self::mul($carry9, 19); + $h0 += self::mul($carry9, 19, 5); $h9 -= $carry9 << 25; $carry0 = ($h0 + (1 << 25)) >> 26; @@ -746,11 +746,11 @@ public static function fe_sq2(ParagonIE_Sodium_Core_Curve25519_Fe $f) $f5_2 = $f5 << 1; $f6_2 = $f6 << 1; $f7_2 = $f7 << 1; - $f5_38 = self::mul(38, $f5); /* 1.959375*2^30 */ - $f6_19 = self::mul(19, $f6); /* 1.959375*2^30 */ - $f7_38 = self::mul(38, $f7); /* 1.959375*2^30 */ - $f8_19 = self::mul(19, $f8); /* 1.959375*2^30 */ - $f9_38 = self::mul(38, $f9); /* 1.959375*2^30 */ + $f5_38 = self::mul($f5, 38, 6); /* 1.959375*2^30 */ + $f6_19 = self::mul($f6, 19, 5); /* 1.959375*2^30 */ + $f7_38 = self::mul($f7, 38, 6); /* 1.959375*2^30 */ + $f8_19 = self::mul($f8, 19, 5); /* 1.959375*2^30 */ + $f9_38 = self::mul($f9, 38, 6); /* 1.959375*2^30 */ $f0f0 = self::mul($f0, (int) $f0); $f0f1_2 = self::mul($f0_2, (int) $f1); $f0f2_2 = self::mul($f0_2, (int) $f2); @@ -865,7 +865,7 @@ public static function fe_sq2(ParagonIE_Sodium_Core_Curve25519_Fe $f) $h8 -= $carry8 << 26; $carry9 = ($h9 + (1 << 24)) >> 25; - $h0 += self::mul($carry9, 19); + $h0 += self::mul($carry9, 19, 5); $h9 -= $carry9 << 25; $carry0 = ($h0 + (1 << 25)) >> 26; @@ -1892,320 +1892,318 @@ public static function sc_muladd($a, $b, $c) $carry0 = ($s0 + (1 << 20)) >> 21; $s1 += $carry0; - $s0 -= self::mul($carry0, 1 << 21); + $s0 -= $carry0 << 21; $carry2 = ($s2 + (1 << 20)) >> 21; $s3 += $carry2; - $s2 -= self::mul($carry2, 1 << 21); + $s2 -= $carry2 << 21; $carry4 = ($s4 + (1 << 20)) >> 21; $s5 += $carry4; - $s4 -= self::mul($carry4, 1 << 21); + $s4 -= $carry4 << 21; $carry6 = ($s6 + (1 << 20)) >> 21; $s7 += $carry6; - $s6 -= self::mul($carry6, 1 << 21); + $s6 -= $carry6 << 21; $carry8 = ($s8 + (1 << 20)) >> 21; $s9 += $carry8; - $s8 -= self::mul($carry8, 1 << 21); + $s8 -= $carry8 << 21; $carry10 = ($s10 + (1 << 20)) >> 21; $s11 += $carry10; - $s10 -= self::mul($carry10, 1 << 21); + $s10 -= $carry10 << 21; $carry12 = ($s12 + (1 << 20)) >> 21; $s13 += $carry12; - $s12 -= self::mul($carry12, 1 << 21); + $s12 -= $carry12 << 21; $carry14 = ($s14 + (1 << 20)) >> 21; $s15 += $carry14; - $s14 -= self::mul($carry14, 1 << 21); + $s14 -= $carry14 << 21; $carry16 = ($s16 + (1 << 20)) >> 21; $s17 += $carry16; - $s16 -= self::mul($carry16, 1 << 21); + $s16 -= $carry16 << 21; $carry18 = ($s18 + (1 << 20)) >> 21; $s19 += $carry18; - $s18 -= self::mul($carry18, 1 << 21); + $s18 -= $carry18 << 21; $carry20 = ($s20 + (1 << 20)) >> 21; $s21 += $carry20; - $s20 -= self::mul($carry20, 1 << 21); + $s20 -= $carry20 << 21; $carry22 = ($s22 + (1 << 20)) >> 21; $s23 += $carry22; - $s22 -= self::mul($carry22, 1 << 21); + $s22 -= $carry22 << 21; $carry1 = ($s1 + (1 << 20)) >> 21; $s2 += $carry1; - $s1 -= self::mul($carry1, 1 << 21); + $s1 -= $carry1 << 21; $carry3 = ($s3 + (1 << 20)) >> 21; $s4 += $carry3; - $s3 -= self::mul($carry3, 1 << 21); + $s3 -= $carry3 << 21; $carry5 = ($s5 + (1 << 20)) >> 21; $s6 += $carry5; - $s5 -= self::mul($carry5, 1 << 21); + $s5 -= $carry5 << 21; $carry7 = ($s7 + (1 << 20)) >> 21; $s8 += $carry7; - $s7 -= self::mul($carry7, 1 << 21); + $s7 -= $carry7 << 21; $carry9 = ($s9 + (1 << 20)) >> 21; $s10 += $carry9; - $s9 -= self::mul($carry9, 1 << 21); + $s9 -= $carry9 << 21; $carry11 = ($s11 + (1 << 20)) >> 21; $s12 += $carry11; - $s11 -= self::mul($carry11, 1 << 21); + $s11 -= $carry11 << 21; $carry13 = ($s13 + (1 << 20)) >> 21; $s14 += $carry13; - $s13 -= self::mul($carry13, 1 << 21); + $s13 -= $carry13 << 21; $carry15 = ($s15 + (1 << 20)) >> 21; $s16 += $carry15; - $s15 -= self::mul($carry15, 1 << 21); + $s15 -= $carry15 << 21; $carry17 = ($s17 + (1 << 20)) >> 21; $s18 += $carry17; - $s17 -= self::mul($carry17, 1 << 21); + $s17 -= $carry17 << 21; $carry19 = ($s19 + (1 << 20)) >> 21; $s20 += $carry19; - $s19 -= self::mul($carry19, 1 << 21); + $s19 -= $carry19 << 21; $carry21 = ($s21 + (1 << 20)) >> 21; $s22 += $carry21; - $s21 -= self::mul($carry21, 1 << 21); - - $s11 += self::mul($s23, 666643); - $s12 += self::mul($s23, 470296); - $s13 += self::mul($s23, 654183); - $s14 -= self::mul($s23, 997805); - $s15 += self::mul($s23, 136657); - $s16 -= self::mul($s23, 683901); - - $s10 += self::mul($s22, 666643); - $s11 += self::mul($s22, 470296); - $s12 += self::mul($s22, 654183); - $s13 -= self::mul($s22, 997805); - $s14 += self::mul($s22, 136657); - $s15 -= self::mul($s22, 683901); - - $s9 += self::mul($s21, 666643); - $s10 += self::mul($s21, 470296); - $s11 += self::mul($s21, 654183); - $s12 -= self::mul($s21, 997805); - $s13 += self::mul($s21, 136657); - $s14 -= self::mul($s21, 683901); - - $s8 += self::mul($s20, 666643); - $s9 += self::mul($s20, 470296); - $s10 += self::mul($s20, 654183); - $s11 -= self::mul($s20, 997805); - $s12 += self::mul($s20, 136657); - $s13 -= self::mul($s20, 683901); - - $s7 += self::mul($s19, 666643); - $s8 += self::mul($s19, 470296); - $s9 += self::mul($s19, 654183); - $s10 -= self::mul($s19, 997805); - $s11 += self::mul($s19, 136657); - $s12 -= self::mul($s19, 683901); - - $s6 += self::mul($s18, 666643); - $s7 += self::mul($s18, 470296); - $s8 += self::mul($s18, 654183); - $s9 -= self::mul($s18, 997805); - $s10 += self::mul($s18, 136657); - $s11 -= self::mul($s18, 683901); + $s21 -= $carry21 << 21; + + $s11 += self::mul($s23, 666643, 20); + $s12 += self::mul($s23, 470296, 19); + $s13 += self::mul($s23, 654183, 20); + $s14 -= self::mul($s23, 997805, 20); + $s15 += self::mul($s23, 136657, 18); + $s16 -= self::mul($s23, 683901, 20); + + $s10 += self::mul($s22, 666643, 20); + $s11 += self::mul($s22, 470296, 19); + $s12 += self::mul($s22, 654183, 20); + $s13 -= self::mul($s22, 997805, 20); + $s14 += self::mul($s22, 136657, 18); + $s15 -= self::mul($s22, 683901, 20); + + $s9 += self::mul($s21, 666643, 20); + $s10 += self::mul($s21, 470296, 19); + $s11 += self::mul($s21, 654183, 20); + $s12 -= self::mul($s21, 997805, 20); + $s13 += self::mul($s21, 136657, 18); + $s14 -= self::mul($s21, 683901, 20); + + $s8 += self::mul($s20, 666643, 20); + $s9 += self::mul($s20, 470296, 19); + $s10 += self::mul($s20, 654183, 20); + $s11 -= self::mul($s20, 997805, 20); + $s12 += self::mul($s20, 136657, 18); + $s13 -= self::mul($s20, 683901, 20); + + $s7 += self::mul($s19, 666643, 20); + $s8 += self::mul($s19, 470296, 19); + $s9 += self::mul($s19, 654183, 20); + $s10 -= self::mul($s19, 997805, 20); + $s11 += self::mul($s19, 136657, 18); + $s12 -= self::mul($s19, 683901, 20); + + $s6 += self::mul($s18, 666643, 20); + $s7 += self::mul($s18, 470296, 19); + $s8 += self::mul($s18, 654183, 20); + $s9 -= self::mul($s18, 997805, 20); + $s10 += self::mul($s18, 136657, 18); + $s11 -= self::mul($s18, 683901, 20); $carry6 = ($s6 + (1 << 20)) >> 21; $s7 += $carry6; - $s6 -= self::mul($carry6, 1 << 21); + $s6 -= $carry6 << 21; $carry8 = ($s8 + (1 << 20)) >> 21; $s9 += $carry8; - $s8 -= self::mul($carry8, 1 << 21); + $s8 -= $carry8 << 21; $carry10 = ($s10 + (1 << 20)) >> 21; $s11 += $carry10; - $s10 -= self::mul($carry10, 1 << 21); + $s10 -= $carry10 << 21; $carry12 = ($s12 + (1 << 20)) >> 21; $s13 += $carry12; - $s12 -= self::mul($carry12, 1 << 21); + $s12 -= $carry12 << 21; $carry14 = ($s14 + (1 << 20)) >> 21; $s15 += $carry14; - $s14 -= self::mul($carry14, 1 << 21); + $s14 -= $carry14 << 21; $carry16 = ($s16 + (1 << 20)) >> 21; $s17 += $carry16; - $s16 -= self::mul($carry16, 1 << 21); + $s16 -= $carry16 << 21; $carry7 = ($s7 + (1 << 20)) >> 21; $s8 += $carry7; - $s7 -= self::mul($carry7, 1 << 21); + $s7 -= $carry7 << 21; $carry9 = ($s9 + (1 << 20)) >> 21; $s10 += $carry9; - $s9 -= self::mul($carry9, 1 << 21); + $s9 -= $carry9 << 21; $carry11 = ($s11 + (1 << 20)) >> 21; $s12 += $carry11; - $s11 -= self::mul($carry11, 1 << 21); + $s11 -= $carry11 << 21; $carry13 = ($s13 + (1 << 20)) >> 21; $s14 += $carry13; - $s13 -= self::mul($carry13, 1 << 21); + $s13 -= $carry13 << 21; $carry15 = ($s15 + (1 << 20)) >> 21; $s16 += $carry15; - $s15 -= self::mul($carry15, 1 << 21); - - $s5 += self::mul($s17, 666643); - $s6 += self::mul($s17, 470296); - $s7 += self::mul($s17, 654183); - $s8 -= self::mul($s17, 997805); - $s9 += self::mul($s17, 136657); - $s10 -= self::mul($s17, 683901); - - $s4 += self::mul($s16, 666643); - $s5 += self::mul($s16, 470296); - $s6 += self::mul($s16, 654183); - $s7 -= self::mul($s16, 997805); - $s8 += self::mul($s16, 136657); - $s9 -= self::mul($s16, 683901); - - $s3 += self::mul($s15, 666643); - $s4 += self::mul($s15, 470296); - $s5 += self::mul($s15, 654183); - $s6 -= self::mul($s15, 997805); - $s7 += self::mul($s15, 136657); - $s8 -= self::mul($s15, 683901); - - $s2 += self::mul($s14, 666643); - $s3 += self::mul($s14, 470296); - $s4 += self::mul($s14, 654183); - $s5 -= self::mul($s14, 997805); - $s6 += self::mul($s14, 136657); - $s7 -= self::mul($s14, 683901); - - $s1 += self::mul($s13, 666643); - $s2 += self::mul($s13, 470296); - $s3 += self::mul($s13, 654183); - $s4 -= self::mul($s13, 997805); - $s5 += self::mul($s13, 136657); - $s6 -= self::mul($s13, 683901); - - $s0 += self::mul($s12, 666643); - $s1 += self::mul($s12, 470296); - $s2 += self::mul($s12, 654183); - $s3 -= self::mul($s12, 997805); - $s4 += self::mul($s12, 136657); - $s5 -= self::mul($s12, 683901); + $s15 -= $carry15 << 21; + + $s5 += self::mul($s17, 666643, 20); + $s6 += self::mul($s17, 470296, 19); + $s7 += self::mul($s17, 654183, 20); + $s8 -= self::mul($s17, 997805, 20); + $s9 += self::mul($s17, 136657, 18); + $s10 -= self::mul($s17, 683901, 20); + + $s4 += self::mul($s16, 666643, 20); + $s5 += self::mul($s16, 470296, 19); + $s6 += self::mul($s16, 654183, 20); + $s7 -= self::mul($s16, 997805, 20); + $s8 += self::mul($s16, 136657, 18); + $s9 -= self::mul($s16, 683901, 20); + + $s3 += self::mul($s15, 666643, 20); + $s4 += self::mul($s15, 470296, 19); + $s5 += self::mul($s15, 654183, 20); + $s6 -= self::mul($s15, 997805, 20); + $s7 += self::mul($s15, 136657, 18); + $s8 -= self::mul($s15, 683901, 20); + + $s2 += self::mul($s14, 666643, 20); + $s3 += self::mul($s14, 470296, 19); + $s4 += self::mul($s14, 654183, 20); + $s5 -= self::mul($s14, 997805, 20); + $s6 += self::mul($s14, 136657, 18); + $s7 -= self::mul($s14, 683901, 20); + + $s1 += self::mul($s13, 666643, 20); + $s2 += self::mul($s13, 470296, 19); + $s3 += self::mul($s13, 654183, 20); + $s4 -= self::mul($s13, 997805, 20); + $s5 += self::mul($s13, 136657, 18); + $s6 -= self::mul($s13, 683901, 20); + + $s0 += self::mul($s12, 666643, 20); + $s1 += self::mul($s12, 470296, 19); + $s2 += self::mul($s12, 654183, 20); + $s3 -= self::mul($s12, 997805, 20); + $s4 += self::mul($s12, 136657, 18); + $s5 -= self::mul($s12, 683901, 20); $s12 = 0; $carry0 = ($s0 + (1 << 20)) >> 21; $s1 += $carry0; - $s0 -= self::mul($carry0, 1 << 21); + $s0 -= $carry0 << 21; $carry2 = ($s2 + (1 << 20)) >> 21; $s3 += $carry2; - $s2 -= self::mul($carry2, 1 << 21); + $s2 -= $carry2 << 21; $carry4 = ($s4 + (1 << 20)) >> 21; $s5 += $carry4; - $s4 -= self::mul($carry4, 1 << 21); + $s4 -= $carry4 << 21; $carry6 = ($s6 + (1 << 20)) >> 21; $s7 += $carry6; - $s6 -= self::mul($carry6, 1 << 21); + $s6 -= $carry6 << 21; $carry8 = ($s8 + (1 << 20)) >> 21; $s9 += $carry8; - $s8 -= self::mul($carry8, 1 << 21); + $s8 -= $carry8 << 21; $carry10 = ($s10 + (1 << 20)) >> 21; $s11 += $carry10; - $s10 -= self::mul($carry10, 1 << 21); + $s10 -= $carry10 << 21; $carry1 = ($s1 + (1 << 20)) >> 21; $s2 += $carry1; - $s1 -= self::mul($carry1, 1 << 21); + $s1 -= $carry1 << 21; $carry3 = ($s3 + (1 << 20)) >> 21; $s4 += $carry3; - $s3 -= self::mul($carry3, 1 << 21); + $s3 -= $carry3 << 21; $carry5 = ($s5 + (1 << 20)) >> 21; $s6 += $carry5; - $s5 -= self::mul($carry5, 1 << 21); + $s5 -= $carry5 << 21; $carry7 = ($s7 + (1 << 20)) >> 21; $s8 += $carry7; - $s7 -= self::mul($carry7, 1 << 21); + $s7 -= $carry7 << 21; $carry9 = ($s9 + (1 << 20)) >> 21; $s10 += $carry9; - $s9 -= self::mul($carry9, 1 << 21); + $s9 -= $carry9 << 21; $carry11 = ($s11 + (1 << 20)) >> 21; $s12 += $carry11; - $s11 -= self::mul($carry11, 1 << 21); - - $s0 += self::mul($s12, 666643); - $s1 += self::mul($s12, 470296); - $s2 += self::mul($s12, 654183); - $s3 -= self::mul($s12, 997805); - $s4 += self::mul($s12, 136657); - $s5 -= self::mul($s12, 683901); + $s11 -= $carry11 << 21; + + $s0 += self::mul($s12, 666643, 20); + $s1 += self::mul($s12, 470296, 19); + $s2 += self::mul($s12, 654183, 20); + $s3 -= self::mul($s12, 997805, 20); + $s4 += self::mul($s12, 136657, 18); + $s5 -= self::mul($s12, 683901, 20); $s12 = 0; $carry0 = $s0 >> 21; $s1 += $carry0; - $s0 -= self::mul($carry0, 1 << 21); + $s0 -= $carry0 << 21; $carry1 = $s1 >> 21; $s2 += $carry1; - $s1 -= self::mul($carry1, 1 << 21); + $s1 -= $carry1 << 21; $carry2 = $s2 >> 21; $s3 += $carry2; - $s2 -= self::mul($carry2, 1 << 21); + $s2 -= $carry2 << 21; $carry3 = $s3 >> 21; $s4 += $carry3; - $s3 -= self::mul($carry3, 1 << 21); + $s3 -= $carry3 << 21; $carry4 = $s4 >> 21; $s5 += $carry4; - $s4 -= self::mul($carry4, 1 << 21); + $s4 -= $carry4 << 21; $carry5 = $s5 >> 21; $s6 += $carry5; - $s5 -= self::mul($carry5, 1 << 21); + $s5 -= $carry5 << 21; $carry6 = $s6 >> 21; $s7 += $carry6; - $s6 -= self::mul($carry6, 1 << 21); + $s6 -= $carry6 << 21; $carry7 = $s7 >> 21; $s8 += $carry7; - $s7 -= self::mul($carry7, 1 << 21); + $s7 -= $carry7 << 21; $carry8 = $s8 >> 21; $s9 += $carry8; - $s8 -= self::mul($carry8, 1 << 21); + $s8 -= $carry8 << 21; $carry9 = $s9 >> 21; $s10 += $carry9; - $s9 -= self::mul($carry9, 1 << 21); + $s9 -= $carry9 << 21; $carry10 = $s10 >> 21; $s11 += $carry10; - $s10 -= self::mul($carry10, 1 << 21); + $s10 -= $carry10 << 21; $carry11 = $s11 >> 21; $s12 += $carry11; - $s11 -= self::mul($carry11, 1 << 21); - + $s11 -= $carry11 << 21; - $s0 += self::mul($s12, 666643); - $s1 += self::mul($s12, 470296); - $s2 += self::mul($s12, 654183); - $s3 -= self::mul($s12, 997805); - $s4 += self::mul($s12, 136657); - $s5 -= self::mul($s12, 683901); + $s0 += self::mul($s12, 666643, 20); + $s1 += self::mul($s12, 470296, 19); + $s2 += self::mul($s12, 654183, 20); + $s3 -= self::mul($s12, 997805, 20); + $s4 += self::mul($s12, 136657, 18); + $s5 -= self::mul($s12, 683901, 20); $carry0 = $s0 >> 21; $s1 += $carry0; - $s0 -= self::mul($carry0, 1 << 21); + $s0 -= $carry0 << 21; $carry1 = $s1 >> 21; $s2 += $carry1; - $s1 -= self::mul($carry1, 1 << 21); + $s1 -= $carry1 << 21; $carry2 = $s2 >> 21; $s3 += $carry2; - $s2 -= self::mul($carry2, 1 << 21); + $s2 -= $carry2 << 21; $carry3 = $s3 >> 21; $s4 += $carry3; - $s3 -= self::mul($carry3, 1 << 21); + $s3 -= $carry3 << 21; $carry4 = $s4 >> 21; $s5 += $carry4; - $s4 -= self::mul($carry4, 1 << 21); + $s4 -= $carry4 << 21; $carry5 = $s5 >> 21; $s6 += $carry5; - $s5 -= self::mul($carry5, 1 << 21); + $s5 -= $carry5 << 21; $carry6 = $s6 >> 21; $s7 += $carry6; - $s6 -= self::mul($carry6, 1 << 21); + $s6 -= $carry6 << 21; $carry7 = $s7 >> 21; $s8 += $carry7; - $s7 -= self::mul($carry7, 1 << 21); + $s7 -= $carry7 << 21; $carry8 = $s8 >> 21; $s9 += $carry8; - $s8 -= self::mul($carry8, 1 << 21); + $s8 -= $carry8 << 21; $carry9 = $s9 >> 21; $s10 += $carry9; - $s9 -= self::mul($carry9, 1 << 21); + $s9 -= $carry9 << 21; $carry10 = $s10 >> 21; $s11 += $carry10; - $s10 -= self::mul($carry10, 1 << 21); - + $s10 -= $carry10 << 21; /** * @var array @@ -2213,33 +2211,33 @@ public static function sc_muladd($a, $b, $c) $arr = array( (int) (0xff & ($s0 >> 0)), (int) (0xff & ($s0 >> 8)), - (int) (0xff & (($s0 >> 16) | self::mul($s1, 1 << 5))), + (int) (0xff & (($s0 >> 16) | $s1 << 5)), (int) (0xff & ($s1 >> 3)), (int) (0xff & ($s1 >> 11)), - (int) (0xff & (($s1 >> 19) | self::mul($s2, 1 << 2))), + (int) (0xff & (($s1 >> 19) | $s2 << 2)), (int) (0xff & ($s2 >> 6)), - (int) (0xff & (($s2 >> 14) | self::mul($s3, 1 << 7))), + (int) (0xff & (($s2 >> 14) | $s3 << 7)), (int) (0xff & ($s3 >> 1)), (int) (0xff & ($s3 >> 9)), - (int) (0xff & (($s3 >> 17) | self::mul($s4, 1 << 4))), + (int) (0xff & (($s3 >> 17) | $s4 << 4)), (int) (0xff & ($s4 >> 4)), (int) (0xff & ($s4 >> 12)), - (int) (0xff & (($s4 >> 20) | self::mul($s5, 1 << 1))), + (int) (0xff & (($s4 >> 20) | $s5 << 1)), (int) (0xff & ($s5 >> 7)), - (int) (0xff & (($s5 >> 15) | self::mul($s6, 1 << 6))), + (int) (0xff & (($s5 >> 15) | $s6 << 6)), (int) (0xff & ($s6 >> 2)), (int) (0xff & ($s6 >> 10)), - (int) (0xff & (($s6 >> 18) | self::mul($s7, 1 << 3))), + (int) (0xff & (($s6 >> 18) | $s7 << 3)), (int) (0xff & ($s7 >> 5)), (int) (0xff & ($s7 >> 13)), (int) (0xff & ($s8 >> 0)), (int) (0xff & ($s8 >> 8)), - (int) (0xff & (($s8 >> 16) | self::mul($s9, 1 << 5))), + (int) (0xff & (($s8 >> 16) | $s9 << 5)), (int) (0xff & ($s9 >> 3)), (int) (0xff & ($s9 >> 11)), - (int) (0xff & (($s9 >> 19) | self::mul($s10, 1 << 2))), + (int) (0xff & (($s9 >> 19) | $s10 << 2)), (int) (0xff & ($s10 >> 6)), - (int) (0xff & (($s10 >> 14) | self::mul($s11, 1 << 7))), + (int) (0xff & (($s10 >> 14) | $s11 << 7)), (int) (0xff & ($s11 >> 1)), (int) (0xff & ($s11 >> 9)), 0xff & ($s11 >> 17) @@ -2280,170 +2278,170 @@ public static function sc_reduce($s) $s22 = 2097151 & (self::load_4(self::substr($s, 57, 4)) >> 6); $s23 = (self::load_4(self::substr($s, 60, 4)) >> 3); - $s11 += self::mul($s23, 666643); - $s12 += self::mul($s23, 470296); - $s13 += self::mul($s23, 654183); - $s14 -= self::mul($s23, 997805); - $s15 += self::mul($s23, 136657); - $s16 -= self::mul($s23, 683901); - - $s10 += self::mul($s22, 666643); - $s11 += self::mul($s22, 470296); - $s12 += self::mul($s22, 654183); - $s13 -= self::mul($s22, 997805); - $s14 += self::mul($s22, 136657); - $s15 -= self::mul($s22, 683901); - - $s9 += self::mul($s21, 666643); - $s10 += self::mul($s21, 470296); - $s11 += self::mul($s21, 654183); - $s12 -= self::mul($s21, 997805); - $s13 += self::mul($s21, 136657); - $s14 -= self::mul($s21, 683901); - - $s8 += self::mul($s20, 666643); - $s9 += self::mul($s20, 470296); - $s10 += self::mul($s20, 654183); - $s11 -= self::mul($s20, 997805); - $s12 += self::mul($s20, 136657); - $s13 -= self::mul($s20, 683901); - - $s7 += self::mul($s19, 666643); - $s8 += self::mul($s19, 470296); - $s9 += self::mul($s19, 654183); - $s10 -= self::mul($s19, 997805); - $s11 += self::mul($s19, 136657); - $s12 -= self::mul($s19, 683901); - - $s6 += self::mul($s18, 666643); - $s7 += self::mul($s18, 470296); - $s8 += self::mul($s18, 654183); - $s9 -= self::mul($s18, 997805); - $s10 += self::mul($s18, 136657); - $s11 -= self::mul($s18, 683901); + $s11 += self::mul($s23, 666643, 20); + $s12 += self::mul($s23, 470296, 19); + $s13 += self::mul($s23, 654183, 20); + $s14 -= self::mul($s23, 997805, 20); + $s15 += self::mul($s23, 136657, 18); + $s16 -= self::mul($s23, 683901, 20); + + $s10 += self::mul($s22, 666643, 20); + $s11 += self::mul($s22, 470296, 19); + $s12 += self::mul($s22, 654183, 20); + $s13 -= self::mul($s22, 997805, 20); + $s14 += self::mul($s22, 136657, 18); + $s15 -= self::mul($s22, 683901, 20); + + $s9 += self::mul($s21, 666643, 20); + $s10 += self::mul($s21, 470296, 19); + $s11 += self::mul($s21, 654183, 20); + $s12 -= self::mul($s21, 997805, 20); + $s13 += self::mul($s21, 136657, 18); + $s14 -= self::mul($s21, 683901, 20); + + $s8 += self::mul($s20, 666643, 20); + $s9 += self::mul($s20, 470296, 19); + $s10 += self::mul($s20, 654183, 20); + $s11 -= self::mul($s20, 997805, 20); + $s12 += self::mul($s20, 136657, 18); + $s13 -= self::mul($s20, 683901, 20); + + $s7 += self::mul($s19, 666643, 20); + $s8 += self::mul($s19, 470296, 19); + $s9 += self::mul($s19, 654183, 20); + $s10 -= self::mul($s19, 997805, 20); + $s11 += self::mul($s19, 136657, 18); + $s12 -= self::mul($s19, 683901, 20); + + $s6 += self::mul($s18, 666643, 20); + $s7 += self::mul($s18, 470296, 19); + $s8 += self::mul($s18, 654183, 20); + $s9 -= self::mul($s18, 997805, 20); + $s10 += self::mul($s18, 136657, 18); + $s11 -= self::mul($s18, 683901, 20); $carry6 = ($s6 + (1 << 20)) >> 21; $s7 += $carry6; - $s6 -= self::mul($carry6, 1 << 21); + $s6 -= $carry6 << 21; $carry8 = ($s8 + (1 << 20)) >> 21; $s9 += $carry8; - $s8 -= self::mul($carry8, 1 << 21); + $s8 -= $carry8 << 21; $carry10 = ($s10 + (1 << 20)) >> 21; $s11 += $carry10; - $s10 -= self::mul($carry10, 1 << 21); + $s10 -= $carry10 << 21; $carry12 = ($s12 + (1 << 20)) >> 21; $s13 += $carry12; - $s12 -= self::mul($carry12, 1 << 21); + $s12 -= $carry12 << 21; $carry14 = ($s14 + (1 << 20)) >> 21; $s15 += $carry14; - $s14 -= self::mul($carry14, 1 << 21); + $s14 -= $carry14 << 21; $carry16 = ($s16 + (1 << 20)) >> 21; $s17 += $carry16; - $s16 -= self::mul($carry16, 1 << 21); + $s16 -= $carry16 << 21; $carry7 = ($s7 + (1 << 20)) >> 21; $s8 += $carry7; - $s7 -= self::mul($carry7, 1 << 21); + $s7 -= $carry7 << 21; $carry9 = ($s9 + (1 << 20)) >> 21; $s10 += $carry9; - $s9 -= self::mul($carry9, 1 << 21); + $s9 -= $carry9 << 21; $carry11 = ($s11 + (1 << 20)) >> 21; $s12 += $carry11; - $s11 -= self::mul($carry11, 1 << 21); + $s11 -= $carry11 << 21; $carry13 = ($s13 + (1 << 20)) >> 21; $s14 += $carry13; - $s13 -= self::mul($carry13, 1 << 21); + $s13 -= $carry13 << 21; $carry15 = ($s15 + (1 << 20)) >> 21; $s16 += $carry15; - $s15 -= self::mul($carry15, 1 << 21); - - $s5 += self::mul($s17, 666643); - $s6 += self::mul($s17, 470296); - $s7 += self::mul($s17, 654183); - $s8 -= self::mul($s17, 997805); - $s9 += self::mul($s17, 136657); - $s10 -= self::mul($s17, 683901); - - $s4 += self::mul($s16, 666643); - $s5 += self::mul($s16, 470296); - $s6 += self::mul($s16, 654183); - $s7 -= self::mul($s16, 997805); - $s8 += self::mul($s16, 136657); - $s9 -= self::mul($s16, 683901); - - $s3 += self::mul($s15, 666643); - $s4 += self::mul($s15, 470296); - $s5 += self::mul($s15, 654183); - $s6 -= self::mul($s15, 997805); - $s7 += self::mul($s15, 136657); - $s8 -= self::mul($s15, 683901); - - $s2 += self::mul($s14, 666643); - $s3 += self::mul($s14, 470296); - $s4 += self::mul($s14, 654183); - $s5 -= self::mul($s14, 997805); - $s6 += self::mul($s14, 136657); - $s7 -= self::mul($s14, 683901); - - $s1 += self::mul($s13, 666643); - $s2 += self::mul($s13, 470296); - $s3 += self::mul($s13, 654183); - $s4 -= self::mul($s13, 997805); - $s5 += self::mul($s13, 136657); - $s6 -= self::mul($s13, 683901); - - $s0 += self::mul($s12, 666643); - $s1 += self::mul($s12, 470296); - $s2 += self::mul($s12, 654183); - $s3 -= self::mul($s12, 997805); - $s4 += self::mul($s12, 136657); - $s5 -= self::mul($s12, 683901); + $s15 -= $carry15 << 21; + + $s5 += self::mul($s17, 666643, 20); + $s6 += self::mul($s17, 470296, 19); + $s7 += self::mul($s17, 654183, 20); + $s8 -= self::mul($s17, 997805, 20); + $s9 += self::mul($s17, 136657, 18); + $s10 -= self::mul($s17, 683901, 20); + + $s4 += self::mul($s16, 666643, 20); + $s5 += self::mul($s16, 470296, 19); + $s6 += self::mul($s16, 654183, 20); + $s7 -= self::mul($s16, 997805, 20); + $s8 += self::mul($s16, 136657, 18); + $s9 -= self::mul($s16, 683901, 20); + + $s3 += self::mul($s15, 666643, 20); + $s4 += self::mul($s15, 470296, 19); + $s5 += self::mul($s15, 654183, 20); + $s6 -= self::mul($s15, 997805, 20); + $s7 += self::mul($s15, 136657, 18); + $s8 -= self::mul($s15, 683901, 20); + + $s2 += self::mul($s14, 666643, 20); + $s3 += self::mul($s14, 470296, 19); + $s4 += self::mul($s14, 654183, 20); + $s5 -= self::mul($s14, 997805, 20); + $s6 += self::mul($s14, 136657, 18); + $s7 -= self::mul($s14, 683901, 20); + + $s1 += self::mul($s13, 666643, 20); + $s2 += self::mul($s13, 470296, 19); + $s3 += self::mul($s13, 654183, 20); + $s4 -= self::mul($s13, 997805, 20); + $s5 += self::mul($s13, 136657, 18); + $s6 -= self::mul($s13, 683901, 20); + + $s0 += self::mul($s12, 666643, 20); + $s1 += self::mul($s12, 470296, 19); + $s2 += self::mul($s12, 654183, 20); + $s3 -= self::mul($s12, 997805, 20); + $s4 += self::mul($s12, 136657, 18); + $s5 -= self::mul($s12, 683901, 20); $s12 = 0; $carry0 = ($s0 + (1 << 20)) >> 21; $s1 += $carry0; - $s0 -= self::mul($carry0, 1 << 21); + $s0 -= $carry0 << 21; $carry2 = ($s2 + (1 << 20)) >> 21; $s3 += $carry2; - $s2 -= self::mul($carry2, 1 << 21); + $s2 -= $carry2 << 21; $carry4 = ($s4 + (1 << 20)) >> 21; $s5 += $carry4; - $s4 -= self::mul($carry4, 1 << 21); + $s4 -= $carry4 << 21; $carry6 = ($s6 + (1 << 20)) >> 21; $s7 += $carry6; - $s6 -= self::mul($carry6, 1 << 21); + $s6 -= $carry6 << 21; $carry8 = ($s8 + (1 << 20)) >> 21; $s9 += $carry8; - $s8 -= self::mul($carry8, 1 << 21); + $s8 -= $carry8 << 21; $carry10 = ($s10 + (1 << 20)) >> 21; $s11 += $carry10; - $s10 -= self::mul($carry10, 1 << 21); + $s10 -= $carry10 << 21; $carry1 = ($s1 + (1 << 20)) >> 21; $s2 += $carry1; - $s1 -= self::mul($carry1, 1 << 21); + $s1 -= $carry1 << 21; $carry3 = ($s3 + (1 << 20)) >> 21; $s4 += $carry3; - $s3 -= self::mul($carry3, 1 << 21); + $s3 -= $carry3 << 21; $carry5 = ($s5 + (1 << 20)) >> 21; $s6 += $carry5; - $s5 -= self::mul($carry5, 1 << 21); + $s5 -= $carry5 << 21; $carry7 = ($s7 + (1 << 20)) >> 21; $s8 += $carry7; - $s7 -= self::mul($carry7, 1 << 21); + $s7 -= $carry7 << 21; $carry9 = ($s9 + (1 << 20)) >> 21; $s10 += $carry9; - $s9 -= self::mul($carry9, 1 << 21); + $s9 -= $carry9 << 21; $carry11 = ($s11 + (1 << 20)) >> 21; $s12 += $carry11; - $s11 -= self::mul($carry11, 1 << 21); - - $s0 += self::mul($s12, 666643); - $s1 += self::mul($s12, 470296); - $s2 += self::mul($s12, 654183); - $s3 -= self::mul($s12, 997805); - $s4 += self::mul($s12, 136657); - $s5 -= self::mul($s12, 683901); + $s11 -= $carry11 << 21; + + $s0 += self::mul($s12, 666643, 20); + $s1 += self::mul($s12, 470296, 19); + $s2 += self::mul($s12, 654183, 20); + $s3 -= self::mul($s12, 997805, 20); + $s4 += self::mul($s12, 136657, 18); + $s5 -= self::mul($s12, 683901, 20); $s12 = 0; $carry0 = $s0 >> 21; @@ -2483,12 +2481,12 @@ public static function sc_reduce($s) $s12 += $carry11; $s11 -= $carry11 << 21; - $s0 += self::mul($s12, 666643); - $s1 += self::mul($s12, 470296); - $s2 += self::mul($s12, 654183); - $s3 -= self::mul($s12, 997805); - $s4 += self::mul($s12, 136657); - $s5 -= self::mul($s12, 683901); + $s0 += self::mul($s12, 666643, 20); + $s1 += self::mul($s12, 470296, 19); + $s2 += self::mul($s12, 654183, 20); + $s3 -= self::mul($s12, 997805, 20); + $s4 += self::mul($s12, 136657, 18); + $s5 -= self::mul($s12, 683901, 20); $carry0 = $s0 >> 21; $s1 += $carry0; @@ -2530,33 +2528,33 @@ public static function sc_reduce($s) $arr = array( (int) ($s0 >> 0), (int) ($s0 >> 8), - (int) (($s0 >> 16) | self::mul($s1, 1 << 5)), + (int) (($s0 >> 16) | $s1 << 5), (int) ($s1 >> 3), (int) ($s1 >> 11), - (int) (($s1 >> 19) | self::mul($s2, 1 << 2)), + (int) (($s1 >> 19) | $s2 << 2), (int) ($s2 >> 6), - (int) (($s2 >> 14) | self::mul($s3, 1 << 7)), + (int) (($s2 >> 14) | $s3 << 7), (int) ($s3 >> 1), (int) ($s3 >> 9), - (int) (($s3 >> 17) | self::mul($s4, 1 << 4)), + (int) (($s3 >> 17) | $s4 << 4), (int) ($s4 >> 4), (int) ($s4 >> 12), - (int) (($s4 >> 20) | self::mul($s5, 1 << 1)), + (int) (($s4 >> 20) | $s5 << 1), (int) ($s5 >> 7), - (int) (($s5 >> 15) | self::mul($s6, 1 << 6)), + (int) (($s5 >> 15) | $s6 << 6), (int) ($s6 >> 2), (int) ($s6 >> 10), - (int) (($s6 >> 18) | self::mul($s7, 1 << 3)), + (int) (($s6 >> 18) | $s7 << 3), (int) ($s7 >> 5), (int) ($s7 >> 13), (int) ($s8 >> 0), (int) ($s8 >> 8), - (int) (($s8 >> 16) | self::mul($s9, 1 << 5)), + (int) (($s8 >> 16) | $s9 << 5), (int) ($s9 >> 3), (int) ($s9 >> 11), - (int) (($s9 >> 19) | self::mul($s10, 1 << 2)), + (int) (($s9 >> 19) | $s10 << 2), (int) ($s10 >> 6), - (int) (($s10 >> 14) | self::mul($s11, 1 << 7)), + (int) (($s10 >> 14) | $s11 << 7), (int) ($s11 >> 1), (int) ($s11 >> 9), (int) $s11 >> 17 diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/Poly1305/State.php b/libraries/vendor/paragonie/sodium_compat/src/Core/Poly1305/State.php index 40367bd520e10..33c459323aa48 100644 --- a/libraries/vendor/paragonie/sodium_compat/src/Core/Poly1305/State.php +++ b/libraries/vendor/paragonie/sodium_compat/src/Core/Poly1305/State.php @@ -157,10 +157,10 @@ public function blocks($message, $bytes) $r3 = (int) $this->r[3]; $r4 = (int) $this->r[4]; - $s1 = self::mul($r1, 5); - $s2 = self::mul($r2, 5); - $s3 = self::mul($r3, 5); - $s4 = self::mul($r4, 5); + $s1 = self::mul($r1, 5, 3); + $s2 = self::mul($r2, 5, 3); + $s3 = self::mul($r3, 5, 3); + $s4 = self::mul($r4, 5, 3); $h0 = $this->h[0]; $h1 = $this->h[1]; @@ -232,7 +232,7 @@ public function blocks($message, $bytes) $d4 += $c; $c = $d4 >> 26; $h4 = $d4 & 0x3ffffff; - $h0 += (int) self::mul($c, 5); + $h0 += (int) self::mul($c, 5, 3); $c = $h0 >> 26; $h0 &= 0x3ffffff; $h1 += $c; @@ -297,7 +297,7 @@ public function finish() $h4 += $c; $c = $h4 >> 26; $h4 &= 0x3ffffff; - $h0 += self::mul($c, 5); + $h0 += self::mul($c, 5, 3); $c = $h0 >> 26; $h0 &= 0x3ffffff; $h1 += $c; diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/Util.php b/libraries/vendor/paragonie/sodium_compat/src/Core/Util.php index b23b65de27dbc..e18851efd27ff 100644 --- a/libraries/vendor/paragonie/sodium_compat/src/Core/Util.php +++ b/libraries/vendor/paragonie/sodium_compat/src/Core/Util.php @@ -463,17 +463,22 @@ public static function memcmp($left, $right) * * @param int $a * @param int $b + * @param int $size Limits the number of operations (useful for small, + * constant operands) * @return int */ - public static function mul($a, $b) + public static function mul($a, $b, $size = 0) { if (ParagonIE_Sodium_Compat::$fastMult) { return (int) ($a * $b); } - static $size = null; - if (!$size) { - $size = (PHP_INT_SIZE << 3) - 1; + static $defaultSize = null; + if (!$defaultSize) { + $defaultSize = (PHP_INT_SIZE << 3) - 1; + } + if ($size < 1) { + $size = $defaultSize; } $c = 0; diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/X25519.php b/libraries/vendor/paragonie/sodium_compat/src/Core/X25519.php index c33f15d4037fa..70de64c33617b 100644 --- a/libraries/vendor/paragonie/sodium_compat/src/Core/X25519.php +++ b/libraries/vendor/paragonie/sodium_compat/src/Core/X25519.php @@ -86,20 +86,20 @@ public static function fe_cswap( public static function fe_mul121666(ParagonIE_Sodium_Core_Curve25519_Fe $f) { $h = array( - self::mul($f[0], 121666), - self::mul($f[1], 121666), - self::mul($f[2], 121666), - self::mul($f[3], 121666), - self::mul($f[4], 121666), - self::mul($f[5], 121666), - self::mul($f[6], 121666), - self::mul($f[7], 121666), - self::mul($f[8], 121666), - self::mul($f[9], 121666) + self::mul($f[0], 121666, 17), + self::mul($f[1], 121666, 17), + self::mul($f[2], 121666, 17), + self::mul($f[3], 121666, 17), + self::mul($f[4], 121666, 17), + self::mul($f[5], 121666, 17), + self::mul($f[6], 121666, 17), + self::mul($f[7], 121666, 17), + self::mul($f[8], 121666, 17), + self::mul($f[9], 121666, 17) ); $carry9 = ($h[9] + (1 << 24)) >> 25; - $h[0] += self::mul($carry9, 19); + $h[0] += self::mul($carry9, 19, 5); $h[9] -= $carry9 << 25; $carry1 = ($h[1] + (1 << 24)) >> 25; $h[2] += $carry1; diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core32/Int32.php b/libraries/vendor/paragonie/sodium_compat/src/Core32/Int32.php index 7c7e170be49e5..db92970fd9d24 100644 --- a/libraries/vendor/paragonie/sodium_compat/src/Core32/Int32.php +++ b/libraries/vendor/paragonie/sodium_compat/src/Core32/Int32.php @@ -22,9 +22,16 @@ class ParagonIE_Sodium_Core32_Int32 */ public $overflow = 0; + /** + * ParagonIE_Sodium_Core32_Int32 constructor. + * @param array $array + */ public function __construct($array = array(0, 0)) { - $this->limbs = $array; + $this->limbs = array( + (int) $array[0], + (int) $array[1] + ); $this->overflow = 0; } @@ -102,8 +109,8 @@ public function mask($m = 0) $lo = ($m & 0xffff); return new ParagonIE_Sodium_Core32_Int32( array( - $this->limbs[0] & $hi, - $this->limbs[1] & $lo + (int) ($this->limbs[0] & $hi), + (int) ($this->limbs[1] & $lo) ) ); } @@ -304,6 +311,9 @@ public function shiftRight($c = 0) } elseif ($c < 0) { return $this->shiftLeft(-$c); } else { + if (is_null($c)) { + throw new TypeError(); + } $carryRight = (int) ($this->limbs[0] & ((1 << ($c + 1)) - 1)); $return->limbs[0] = (int) (($this->limbs[0] >> $c) & 0xffff); $return->limbs[1] = (int) ((($this->limbs[1] >> $c) | ($carryRight << (16 - $c))) & 0xffff); diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core32/Int64.php b/libraries/vendor/paragonie/sodium_compat/src/Core32/Int64.php index f312e78399a5a..ecaf2632a2228 100644 --- a/libraries/vendor/paragonie/sodium_compat/src/Core32/Int64.php +++ b/libraries/vendor/paragonie/sodium_compat/src/Core32/Int64.php @@ -19,9 +19,18 @@ class ParagonIE_Sodium_Core32_Int64 */ public $overflow = 0; + /** + * ParagonIE_Sodium_Core32_Int64 constructor. + * @param array $array + */ public function __construct($array = array(0, 0, 0, 0)) { - $this->limbs = $array; + $this->limbs = array( + (int) $array[0], + (int) $array[1], + (int) $array[2], + (int) $array[3] + ); $this->overflow = 0; } @@ -281,6 +290,7 @@ public function rotateRight($c = 0) /** * @param int $c * @return ParagonIE_Sodium_Core32_Int64 + * @throws TypeError */ public function shiftLeft($c = 0) { @@ -309,6 +319,9 @@ public function shiftLeft($c = 0) } elseif ($c < 0) { return $this->shiftRight(-$c); } else { + if (is_null($c)) { + throw new TypeError(); + } $carry = 0; for ($i = 3; $i >= 0; --$i) { $tmp = ($this->limbs[$i] << $c) | ($carry & 0xffff); @@ -322,6 +335,7 @@ public function shiftLeft($c = 0) /** * @param int $c * @return ParagonIE_Sodium_Core32_Int64 + * @throws TypeError */ public function shiftRight($c = 0) { @@ -361,6 +375,9 @@ public function shiftRight($c = 0) } elseif ($c < 0) { return $this->shiftLeft(-$c); } else { + if (is_null($c)) { + throw new TypeError(); + } $carryRight = ($negative & 0xffff); $mask = (int) (((1 << ($c + 1)) - 1) & 0xffff); for ($i = 0; $i < 4; ++$i) { diff --git a/libraries/vendor/phpmailer/phpmailer/VERSION b/libraries/vendor/phpmailer/phpmailer/VERSION index 6ca8e95fce140..f0fb1a22adcab 100644 --- a/libraries/vendor/phpmailer/phpmailer/VERSION +++ b/libraries/vendor/phpmailer/phpmailer/VERSION @@ -1 +1 @@ -5.2.24 +5.2.26 diff --git a/libraries/vendor/phpmailer/phpmailer/class.phpmailer.php b/libraries/vendor/phpmailer/phpmailer/class.phpmailer.php index acc006d6b8ba2..99f9092c08032 100644 --- a/libraries/vendor/phpmailer/phpmailer/class.phpmailer.php +++ b/libraries/vendor/phpmailer/phpmailer/class.phpmailer.php @@ -31,7 +31,7 @@ class PHPMailer * The PHPMailer Version number. * @var string */ - public $Version = '5.2.24'; + public $Version = '5.2.26'; /** * Email priority. @@ -659,6 +659,8 @@ public function __construct($exceptions = null) if ($exceptions !== null) { $this->exceptions = (boolean)$exceptions; } + //Pick an appropriate debug output format automatically + $this->Debugoutput = (strpos(PHP_SAPI, 'cli') !== false ? 'echo' : 'html'); } /** diff --git a/libraries/vendor/phpmailer/phpmailer/class.pop3.php b/libraries/vendor/phpmailer/phpmailer/class.pop3.php index 330c73a13f1de..f833ac615daf1 100644 --- a/libraries/vendor/phpmailer/phpmailer/class.pop3.php +++ b/libraries/vendor/phpmailer/phpmailer/class.pop3.php @@ -34,7 +34,7 @@ class POP3 * @var string * @access public */ - public $Version = '5.2.24'; + public $Version = '5.2.26'; /** * Default POP3 port number. diff --git a/libraries/vendor/phpmailer/phpmailer/class.smtp.php b/libraries/vendor/phpmailer/phpmailer/class.smtp.php index 79c762be8afea..be6ddce4bdb3b 100644 --- a/libraries/vendor/phpmailer/phpmailer/class.smtp.php +++ b/libraries/vendor/phpmailer/phpmailer/class.smtp.php @@ -30,7 +30,7 @@ class SMTP * The PHPMailer SMTP version number. * @var string */ - const VERSION = '5.2.24'; + const VERSION = '5.2.26'; /** * SMTP line break constant. @@ -81,7 +81,7 @@ class SMTP * @deprecated Use the `VERSION` constant instead * @see SMTP::VERSION */ - public $Version = '5.2.24'; + public $Version = '5.2.26'; /** * SMTP server port number. @@ -151,9 +151,8 @@ class SMTP public $Timelimit = 300; /** - * @var array patterns to extract smtp transaction id from smtp reply - * Only first capture group will be use, use non-capturing group to deal with it - * Extend this class to override this property to fulfil your needs. + * @var array Patterns to extract an SMTP transaction id from reply to a DATA command. + * The first capture group in each regex will be used as the ID. */ protected $smtp_transaction_id_patterns = array( 'exim' => '/[0-9]{3} OK id=(.*)/', @@ -161,6 +160,12 @@ class SMTP 'postfix' => '/[0-9]{3} 2.0.0 Ok: queued as (.*)/' ); + /** + * @var string The last transaction ID issued in response to a DATA command, + * if one was detected + */ + protected $last_smtp_transaction_id; + /** * The socket for the server connection. * @var resource @@ -709,6 +714,7 @@ public function data($msg_data) $savetimelimit = $this->Timelimit; $this->Timelimit = $this->Timelimit * 2; $result = $this->sendCommand('DATA END', '.', 250); + $this->recordLastTransactionID(); //Restore timelimit $this->Timelimit = $savetimelimit; return $result; @@ -1231,26 +1237,40 @@ protected function errorHandler($errno, $errmsg, $errfile = '', $errline = 0) } /** - * Will return the ID of the last smtp transaction based on a list of patterns provided - * in SMTP::$smtp_transaction_id_patterns. + * Extract and return the ID of the last SMTP transaction based on + * a list of patterns provided in SMTP::$smtp_transaction_id_patterns. + * Relies on the host providing the ID in response to a DATA command. * If no reply has been received yet, it will return null. - * If no pattern has been matched, it will return false. + * If no pattern was matched, it will return false. * @return bool|null|string */ - public function getLastTransactionID() + protected function recordLastTransactionID() { $reply = $this->getLastReply(); if (empty($reply)) { - return null; - } - - foreach ($this->smtp_transaction_id_patterns as $smtp_transaction_id_pattern) { - if (preg_match($smtp_transaction_id_pattern, $reply, $matches)) { - return $matches[1]; + $this->last_smtp_transaction_id = null; + } else { + $this->last_smtp_transaction_id = false; + foreach ($this->smtp_transaction_id_patterns as $smtp_transaction_id_pattern) { + if (preg_match($smtp_transaction_id_pattern, $reply, $matches)) { + $this->last_smtp_transaction_id = $matches[1]; + } } } - return false; + return $this->last_smtp_transaction_id; + } + + /** + * Get the queue/transaction ID of the last SMTP transaction + * If no reply has been received yet, it will return null. + * If no pattern was matched, it will return false. + * @return bool|null|string + * @see recordLastTransactionID() + */ + public function getLastTransactionID() + { + return $this->last_smtp_transaction_id; } } diff --git a/libraries/vendor/symfony/yaml/Dumper.php b/libraries/vendor/symfony/yaml/Dumper.php index 05817f5d73063..96da91e551959 100644 --- a/libraries/vendor/symfony/yaml/Dumper.php +++ b/libraries/vendor/symfony/yaml/Dumper.php @@ -45,8 +45,8 @@ public function setIndentation($num) * @param mixed $input The PHP value * @param int $inline The level where you switch to inline YAML * @param int $indent The level of indentation (used internally) - * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise - * @param bool $objectSupport true if object support is enabled, false otherwise + * @param bool $exceptionOnInvalidType True if an exception must be thrown on invalid types (a PHP resource or object), false otherwise + * @param bool $objectSupport True if object support is enabled, false otherwise * * @return string The YAML representation of the PHP value */ diff --git a/libraries/vendor/symfony/yaml/Exception/ParseException.php b/libraries/vendor/symfony/yaml/Exception/ParseException.php index ef36cfbadd35c..60802b6d701b5 100644 --- a/libraries/vendor/symfony/yaml/Exception/ParseException.php +++ b/libraries/vendor/symfony/yaml/Exception/ParseException.php @@ -24,8 +24,6 @@ class ParseException extends RuntimeException private $rawMessage; /** - * Constructor. - * * @param string $message The error message * @param int $parsedLine The line where the error occurred * @param string|null $snippet The snippet of code near the problem diff --git a/libraries/vendor/symfony/yaml/Inline.php b/libraries/vendor/symfony/yaml/Inline.php index dade755e6d9cf..a10c0e4194a8a 100644 --- a/libraries/vendor/symfony/yaml/Inline.php +++ b/libraries/vendor/symfony/yaml/Inline.php @@ -31,9 +31,9 @@ class Inline * Converts a YAML string to a PHP value. * * @param string $value A YAML string - * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise - * @param bool $objectSupport true if object support is enabled, false otherwise - * @param bool $objectForMap true if maps should return a stdClass instead of array() + * @param bool $exceptionOnInvalidType True if an exception must be thrown on invalid types (a PHP resource or object), false otherwise + * @param bool $objectSupport True if object support is enabled, false otherwise + * @param bool $objectForMap True if maps should return a stdClass instead of array() * @param array $references Mapping of variable names to values * * @return mixed A PHP value @@ -87,8 +87,8 @@ public static function parse($value, $exceptionOnInvalidType = false, $objectSup * Dumps a given PHP variable to a YAML string. * * @param mixed $value The PHP variable to convert - * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise - * @param bool $objectSupport true if object support is enabled, false otherwise + * @param bool $exceptionOnInvalidType True if an exception must be thrown on invalid types (a PHP resource or object), false otherwise + * @param bool $objectSupport True if object support is enabled, false otherwise * * @return string The YAML string representing the PHP value * @@ -183,8 +183,8 @@ public static function isHash(array $value) * Dumps a PHP array to a YAML string. * * @param array $value The PHP array to dump - * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise - * @param bool $objectSupport true if object support is enabled, false otherwise + * @param bool $exceptionOnInvalidType True if an exception must be thrown on invalid types (a PHP resource or object), false otherwise + * @param bool $objectSupport True if object support is enabled, false otherwise * * @return string The YAML string representing the PHP array */ @@ -491,7 +491,7 @@ private static function evaluateScalar($scalar, $references = array()) case 'false' === $scalarLower: return false; // Optimise for returning strings. - case $scalar[0] === '+' || $scalar[0] === '-' || $scalar[0] === '.' || $scalar[0] === '!' || is_numeric($scalar[0]): + case '+' === $scalar[0] || '-' === $scalar[0] || '.' === $scalar[0] || '!' === $scalar[0] || is_numeric($scalar[0]): switch (true) { case 0 === strpos($scalar, '!str'): return (string) substr($scalar, 5); @@ -547,6 +547,7 @@ private static function evaluateScalar($scalar, $references = array()) return $time; } + // no break default: return (string) $scalar; } diff --git a/libraries/vendor/symfony/yaml/Parser.php b/libraries/vendor/symfony/yaml/Parser.php index 96a85a8fe7c9b..d043dd7d558d3 100644 --- a/libraries/vendor/symfony/yaml/Parser.php +++ b/libraries/vendor/symfony/yaml/Parser.php @@ -34,8 +34,6 @@ class Parser private $locallySkippedLineNumbers = array(); /** - * Constructor. - * * @param int $offset The offset of YAML document (used for line numbers in error messages) * @param int|null $totalNumberOfLines The overall number of lines being parsed * @param int[] $skippedLineNumbers Number of comment lines that have been skipped by the parser @@ -51,9 +49,9 @@ public function __construct($offset = 0, $totalNumberOfLines = null, array $skip * Parses a YAML string to a PHP value. * * @param string $value A YAML string - * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise - * @param bool $objectSupport true if object support is enabled, false otherwise - * @param bool $objectForMap true if maps should return a stdClass instead of array() + * @param bool $exceptionOnInvalidType True if an exception must be thrown on invalid types (a PHP resource or object), false otherwise + * @param bool $objectSupport True if object support is enabled, false otherwise + * @param bool $objectForMap True if maps should return a stdClass instead of array() * * @return mixed A PHP value * @@ -183,7 +181,7 @@ private function doParse($value, $exceptionOnInvalidType = false, $objectSupport $key = (string) $key; } - if ('<<' === $key) { + if ('<<' === $key && (!isset($values['value']) || !self::preg_match('#^&(?P[^ ]+)#u', $values['value'], $refMatches))) { $mergeNode = true; $allowOverwrite = true; if (isset($values['value']) && 0 === strpos($values['value'], '*')) { @@ -200,7 +198,7 @@ private function doParse($value, $exceptionOnInvalidType = false, $objectSupport $data += $refValue; // array union } else { - if (isset($values['value']) && $values['value'] !== '') { + if (isset($values['value']) && '' !== $values['value']) { $value = $values['value']; } else { $value = $this->getNextEmbedBlock(); @@ -228,14 +226,14 @@ private function doParse($value, $exceptionOnInvalidType = false, $objectSupport $data += $parsed; // array union } } - } elseif (isset($values['value']) && self::preg_match('#^&(?P[^ ]+) *(?P.*)#u', $values['value'], $matches)) { + } elseif ('<<' !== $key && isset($values['value']) && self::preg_match('#^&(?P[^ ]+) *(?P.*)#u', $values['value'], $matches)) { $isRef = $matches['ref']; $values['value'] = $matches['value']; } if ($mergeNode) { // Merge keys - } elseif (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) { + } elseif (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#') || '<<' === $key) { // hash // if next line is less indented or equal, then it means that the current value is null if (!$this->isNextLineIndented() && !$this->isNextLineUnIndentedCollection()) { @@ -246,9 +244,13 @@ private function doParse($value, $exceptionOnInvalidType = false, $objectSupport } } else { $value = $this->parseBlock($this->getRealCurrentLineNb() + 1, $this->getNextEmbedBlock(), $exceptionOnInvalidType, $objectSupport, $objectForMap); - // Spec: Keys MUST be unique; first one wins. - // But overwriting is allowed when a merge node is used in current block. - if ($allowOverwrite || !isset($data[$key])) { + + if ('<<' === $key) { + $this->refs[$refMatches['ref']] = $value; + $data += $value; + } elseif ($allowOverwrite || !isset($data[$key])) { + // Spec: Keys MUST be unique; first one wins. + // But overwriting is allowed when a merge node is used in current block. $data[$key] = $value; } } @@ -412,7 +414,7 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false) $indent = $this->getCurrentLineIndentation(); // terminate all block scalars that are more indented than the current line - if (!empty($blockScalarIndentations) && $indent < $previousLineIndentation && trim($this->currentLine) !== '') { + if (!empty($blockScalarIndentations) && $indent < $previousLineIndentation && '' !== trim($this->currentLine)) { foreach ($blockScalarIndentations as $key => $blockScalarIndentation) { if ($blockScalarIndentation >= $this->getCurrentLineIndentation()) { unset($blockScalarIndentations[$key]); @@ -501,7 +503,7 @@ private function moveToPreviousLine() * @param string $value A YAML value * @param bool $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise * @param bool $objectSupport True if object support is enabled, false otherwise - * @param bool $objectForMap true if maps should return a stdClass instead of array() + * @param bool $objectForMap True if maps should return a stdClass instead of array() * @param string $context The parser context (either sequence or mapping) * * @return mixed A PHP value @@ -715,7 +717,7 @@ private function isCurrentLineComment() //checking explicitly the first char of the trim is faster than loops or strpos $ltrimmedLine = ltrim($this->currentLine, ' '); - return '' !== $ltrimmedLine && $ltrimmedLine[0] === '#'; + return '' !== $ltrimmedLine && '#' === $ltrimmedLine[0]; } private function isCurrentLineLastLineInDocument() @@ -741,7 +743,7 @@ private function cleanup($value) // remove leading comments $trimmedValue = preg_replace('#^(\#.*?\n)+#s', '', $value, -1, $count); - if ($count == 1) { + if (1 == $count) { // items have been removed, update the offset $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n"); $value = $trimmedValue; @@ -749,7 +751,7 @@ private function cleanup($value) // remove start of the document marker (---) $trimmedValue = preg_replace('#^\-\-\-.*?\n#s', '', $value, -1, $count); - if ($count == 1) { + if (1 == $count) { // items have been removed, update the offset $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n"); $value = $trimmedValue; diff --git a/libraries/vendor/symfony/yaml/Yaml.php b/libraries/vendor/symfony/yaml/Yaml.php index 6fc4e9273d50b..7a579432ac09b 100644 --- a/libraries/vendor/symfony/yaml/Yaml.php +++ b/libraries/vendor/symfony/yaml/Yaml.php @@ -48,7 +48,7 @@ public static function parse($input, $exceptionOnInvalidType = false, $objectSup { // if input is a file, process it $file = ''; - if (strpos($input, "\n") === false && is_file($input)) { + if (false === strpos($input, "\n") && is_file($input)) { @trigger_error('The ability to pass file names to the '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Pass the YAML contents of the file instead.', E_USER_DEPRECATED); if (false === is_readable($input)) { @@ -81,8 +81,8 @@ public static function parse($input, $exceptionOnInvalidType = false, $objectSup * @param mixed $input The PHP value * @param int $inline The level where you switch to inline YAML * @param int $indent The amount of spaces to use for indentation of nested nodes - * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise - * @param bool $objectSupport true if object support is enabled, false otherwise + * @param bool $exceptionOnInvalidType True if an exception must be thrown on invalid types (a PHP resource or object), false otherwise + * @param bool $objectSupport True if object support is enabled, false otherwise * * @return string A YAML string representing the original PHP value */