From a051f2fe919ca4657340c2ba8d7dcbbfda933a15 Mon Sep 17 00:00:00 2001 From: Seth Date: Mon, 15 Apr 2019 13:02:47 -0400 Subject: [PATCH] Update libs --- composer.lock | 46 +++++----- vendor/autoload.php | 2 +- vendor/clue/stream-filter/.travis.yml | 1 + vendor/clue/stream-filter/CHANGELOG.md | 9 ++ vendor/clue/stream-filter/README.md | 24 ++--- vendor/clue/stream-filter/composer.json | 2 +- .../stream-filter/src/functions_include.php | 5 ++ vendor/clue/stream-filter/tests/FunTest.php | 17 ++++ vendor/composer/autoload_files.php | 2 +- vendor/composer/autoload_real.php | 14 +-- vendor/composer/autoload_static.php | 14 +-- vendor/composer/installed.json | 58 ++++++------- .../deep-copy/src/DeepCopy/DeepCopy.php | 8 ++ vendor/pear/archive_tar/.travis.yml | 2 +- vendor/pear/archive_tar/Archive/Tar.php | 87 ++++++++++++------- vendor/pear/archive_tar/package.xml | 23 ++++- .../Fixtures/YtsSpecificationExamples.yml | 2 +- 17 files changed, 200 insertions(+), 116 deletions(-) create mode 100644 vendor/clue/stream-filter/src/functions_include.php diff --git a/composer.lock b/composer.lock index 701b533df1..3d2fdd62c4 100644 --- a/composer.lock +++ b/composer.lock @@ -9,16 +9,16 @@ "packages-dev": [ { "name": "clue/stream-filter", - "version": "v1.4.0", + "version": "v1.4.1", "source": { "type": "git", "url": "https://github.com/clue/php-stream-filter.git", - "reference": "d80fdee9b3a7e0d16fc330a22f41f3ad0eeb09d0" + "reference": "5a58cc30a8bd6a4eb8f856adf61dd3e013f53f71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/clue/php-stream-filter/zipball/d80fdee9b3a7e0d16fc330a22f41f3ad0eeb09d0", - "reference": "d80fdee9b3a7e0d16fc330a22f41f3ad0eeb09d0", + "url": "https://api.github.com/repos/clue/php-stream-filter/zipball/5a58cc30a8bd6a4eb8f856adf61dd3e013f53f71", + "reference": "5a58cc30a8bd6a4eb8f856adf61dd3e013f53f71", "shasum": "" }, "require": { @@ -33,7 +33,7 @@ "Clue\\StreamFilter\\": "src/" }, "files": [ - "src/functions.php" + "src/functions_include.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -57,7 +57,7 @@ "stream_filter_append", "stream_filter_register" ], - "time": "2017-08-18T09:54:01+00:00" + "time": "2019-04-09T12:31:48+00:00" }, { "name": "collectiveaccess/service-wrapper", @@ -1687,16 +1687,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.8.1", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8" + "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", - "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72", + "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72", "shasum": "" }, "require": { @@ -1731,7 +1731,7 @@ "object", "object graph" ], - "time": "2018-06-11T23:09:50+00:00" + "time": "2019-04-07T13:18:21+00:00" }, { "name": "pclzip/pclzip", @@ -1772,16 +1772,16 @@ }, { "name": "pear/archive_tar", - "version": "1.4.6", + "version": "1.4.7", "source": { "type": "git", "url": "https://github.com/pear/Archive_Tar.git", - "reference": "b8e33f9063a7cd1d20f079014f8382b3a7aee47e" + "reference": "7e48add6f8edc3027dd98ad15964b1a28fd0c845" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/b8e33f9063a7cd1d20f079014f8382b3a7aee47e", - "reference": "b8e33f9063a7cd1d20f079014f8382b3a7aee47e", + "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/7e48add6f8edc3027dd98ad15964b1a28fd0c845", + "reference": "7e48add6f8edc3027dd98ad15964b1a28fd0c845", "shasum": "" }, "require": { @@ -1834,7 +1834,7 @@ "archive", "tar" ], - "time": "2019-02-01T11:10:38+00:00" + "time": "2019-04-08T13:15:55+00:00" }, { "name": "pear/console_getopt", @@ -4290,7 +4290,7 @@ }, { "name": "symfony/options-resolver", - "version": "v4.2.4", + "version": "v4.2.5", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -4516,7 +4516,7 @@ }, { "name": "symfony/var-dumper", - "version": "v4.2.4", + "version": "v4.2.5", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", @@ -4592,16 +4592,16 @@ }, { "name": "symfony/yaml", - "version": "v3.4.23", + "version": "v3.4.24", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "57f1ce82c997f5a8701b89ef970e36bb657fd09c" + "reference": "212a27b731e5bfb735679d1ffaac82bd6a1dc996" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/57f1ce82c997f5a8701b89ef970e36bb657fd09c", - "reference": "57f1ce82c997f5a8701b89ef970e36bb657fd09c", + "url": "https://api.github.com/repos/symfony/yaml/zipball/212a27b731e5bfb735679d1ffaac82bd6a1dc996", + "reference": "212a27b731e5bfb735679d1ffaac82bd6a1dc996", "shasum": "" }, "require": { @@ -4647,7 +4647,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2019-02-23T15:06:07+00:00" + "time": "2019-03-25T07:48:46+00:00" }, { "name": "tedivm/stash", diff --git a/vendor/autoload.php b/vendor/autoload.php index 0dfe6859c4..b628d8d78e 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInite74cd27e1feadfb3f0d642944080e956::getLoader(); +return ComposerAutoloaderInitd0a456687b3dab21148a043296334846::getLoader(); diff --git a/vendor/clue/stream-filter/.travis.yml b/vendor/clue/stream-filter/.travis.yml index a71864a38f..398a5442aa 100644 --- a/vendor/clue/stream-filter/.travis.yml +++ b/vendor/clue/stream-filter/.travis.yml @@ -7,6 +7,7 @@ php: - 5.6 - 7.0 - 7.1 + - 7.2 - hhvm # ignore errors, see below # lock distro so new future defaults will not break the build diff --git a/vendor/clue/stream-filter/CHANGELOG.md b/vendor/clue/stream-filter/CHANGELOG.md index 9d53cd83d4..563ba3f9c3 100644 --- a/vendor/clue/stream-filter/CHANGELOG.md +++ b/vendor/clue/stream-filter/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## 1.4.1 (2019-04-09) + +* Fix: Check if the function is declared before declaring it. + (#23 by @Niko9911) + +* Improve test suite to also test against PHP 7.2 and + add test for base64 encoding and decoding filters. + (#22 by @arubacao and #25 by @Nyholm and @clue) + ## 1.4.0 (2017-08-18) * Feature / Fix: The `fun()` function does not pass filter parameter `null` diff --git a/vendor/clue/stream-filter/README.md b/vendor/clue/stream-filter/README.md index d46c2b5714..e9c6fc9e6e 100644 --- a/vendor/clue/stream-filter/README.md +++ b/vendor/clue/stream-filter/README.md @@ -27,13 +27,13 @@ These filters can be used to easily and efficiently perform various transformati * and much more. But let's face it: -Its API is [*difficult to work with*](http://php.net/manual/en/php-user-filter.filter.php) -and its documentation is [*subpar*](http://stackoverflow.com/questions/27103269/what-is-a-bucket-brigade). +Its API is [*difficult to work with*](https://www.php.net/manual/en/php-user-filter.filter.php) +and its documentation is [*subpar*](https://stackoverflow.com/questions/27103269/what-is-a-bucket-brigade). This combined means its powerful features are often neglected. This project aims to make these features more accessible to a broader audience. * **Lightweight, SOLID design** - - Provides a thin abstraction that is [*just good enough*](http://en.wikipedia.org/wiki/Principle_of_good_enough) + Provides a thin abstraction that is [*just good enough*](https://en.wikipedia.org/wiki/Principle_of_good_enough) and does not get in your way. Custom filters require trivial effort. * **Good test coverage** - @@ -141,7 +141,7 @@ Filter\append($stream, function ($chunk) { ``` > Note that once a filter has been added to stream, the stream can no longer be passed to -> [`stream_select()`](http://php.net/manual/en/function.stream-select.php) +> [`stream_select()`](https://www.php.net/manual/en/function.stream-select.php) > (and family). > > > Warning: stream_select(): cannot cast a filtered stream on this system in {file} on line {line} @@ -178,7 +178,7 @@ For more details about its behavior, see also the [`append()`](#append) function The `fun($filter, $parameters = null)` function can be used to create a filter function which uses the given built-in `$filter`. -PHP comes with a useful set of [built-in filters](http://php.net/manual/en/filters.php). +PHP comes with a useful set of [built-in filters](https://www.php.net/manual/en/filters.php). Using `fun()` makes accessing these as easy as passing an input string to filter and getting the filtered output string. @@ -191,7 +191,7 @@ assert('test' === $fun($fun('test')); Please note that not all filter functions may be available depending on installed PHP extensions and the PHP version in use. -In particular, [HHVM](http://hhvm.com/) may not offer the same filter functions +In particular, [HHVM](https://hhvm.com/) may not offer the same filter functions or parameters as Zend PHP. Accessing an unknown filter function will result in a `RuntimeException`: @@ -218,7 +218,7 @@ assert('hi' === $ret); Under the hood, this function allocates a temporary memory stream, so it's recommended to clean up the filter function after use. Also, some filter functions (in particular the -[zlib compression filters](http://php.net/manual/en/filters.compression.php)) +[zlib compression filters](https://www.php.net/manual/en/filters.compression.php)) may use internal buffers and may emit a final data chunk on close. The filter function can be closed by invoking without any arguments: @@ -263,10 +263,11 @@ Filter\remove($filter); The recommended way to install this library is [through Composer](https://getcomposer.org). [New to Composer?](https://getcomposer.org/doc/00-intro.md) +This project follows [SemVer](https://semver.org/). This will install the latest supported version: ```bash -$ composer require clue/stream-filter:^1.4 +$ composer require clue/stream-filter:^1.4.1 ``` See also the [CHANGELOG](CHANGELOG.md) for details about version upgrades. @@ -280,7 +281,7 @@ Older PHP versions may suffer from a number of inconsistencies documented above. ## Tests To run the test suite, you first need to clone this repo and then install all -dependencies [through Composer](http://getcomposer.org): +dependencies [through Composer](https://getcomposer.org): ```bash $ composer install @@ -294,4 +295,7 @@ $ php vendor/bin/phpunit ## License -MIT +This project is released under the permissive [MIT license](LICENSE). + +> Did you know that I offer custom development services and issuing invoices for + sponsorships of releases and for contributions? Contact me (@clue) for details. diff --git a/vendor/clue/stream-filter/composer.json b/vendor/clue/stream-filter/composer.json index f871053185..834f2d48d1 100644 --- a/vendor/clue/stream-filter/composer.json +++ b/vendor/clue/stream-filter/composer.json @@ -18,6 +18,6 @@ }, "autoload": { "psr-4": { "Clue\\StreamFilter\\": "src/" }, - "files": [ "src/functions.php" ] + "files": [ "src/functions_include.php" ] } } diff --git a/vendor/clue/stream-filter/src/functions_include.php b/vendor/clue/stream-filter/src/functions_include.php new file mode 100644 index 0000000000..346a91bb09 --- /dev/null +++ b/vendor/clue/stream-filter/src/functions_include.php @@ -0,0 +1,5 @@ +assertEquals(base64_encode($string), $encode($string) . $encode()); + $this->assertEquals($string, $decode(base64_encode($string))); + + $encode = Filter\fun('convert.base64-encode'); + $decode = Filter\fun('convert.base64-decode'); + $this->assertEquals($string, $decode($encode($string) . $encode())); + + $encode = Filter\fun('convert.base64-encode'); + $this->assertEquals(null, $encode()); + } } diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php index 3d5c6a5305..0212e83d33 100644 --- a/vendor/composer/autoload_files.php +++ b/vendor/composer/autoload_files.php @@ -11,7 +11,7 @@ '3e76f7f02b41af8cea96018933f6b7e3' => $vendorDir . '/hoa/protocol/Wrapper.php', '7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php', 'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php', - 'ddc0a4d7e61c0286f0f8593b1903e894' => $vendorDir . '/clue/stream-filter/src/functions.php', + '9c67151ae59aff4788964ce8eb2a0f43' => $vendorDir . '/clue/stream-filter/src/functions_include.php', '8cff32064859f4559445b89279f3199c' => $vendorDir . '/php-http/message/src/filters.php', 'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php', '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php', diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index e487b44014..a16f95f3f6 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInite74cd27e1feadfb3f0d642944080e956 +class ComposerAutoloaderInitd0a456687b3dab21148a043296334846 { private static $loader; @@ -19,9 +19,9 @@ public static function getLoader() return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInite74cd27e1feadfb3f0d642944080e956', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitd0a456687b3dab21148a043296334846', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInite74cd27e1feadfb3f0d642944080e956', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitd0a456687b3dab21148a043296334846', 'loadClassLoader')); $includePaths = require __DIR__ . '/include_paths.php'; $includePaths[] = get_include_path(); @@ -31,7 +31,7 @@ public static function getLoader() if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInite74cd27e1feadfb3f0d642944080e956::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitd0a456687b3dab21148a043296334846::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -52,19 +52,19 @@ public static function getLoader() $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInite74cd27e1feadfb3f0d642944080e956::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitd0a456687b3dab21148a043296334846::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequiree74cd27e1feadfb3f0d642944080e956($fileIdentifier, $file); + composerRequired0a456687b3dab21148a043296334846($fileIdentifier, $file); } return $loader; } } -function composerRequiree74cd27e1feadfb3f0d642944080e956($fileIdentifier, $file) +function composerRequired0a456687b3dab21148a043296334846($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 6ee0ad2dd0..2550d5059b 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInite74cd27e1feadfb3f0d642944080e956 +class ComposerStaticInitd0a456687b3dab21148a043296334846 { public static $files = array ( 'e88992873b7765f9b5710cab95ba5dd7' => __DIR__ . '/..' . '/hoa/consistency/Prelude.php', @@ -12,7 +12,7 @@ class ComposerStaticInite74cd27e1feadfb3f0d642944080e956 '3e76f7f02b41af8cea96018933f6b7e3' => __DIR__ . '/..' . '/hoa/protocol/Wrapper.php', '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php', 'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php', - 'ddc0a4d7e61c0286f0f8593b1903e894' => __DIR__ . '/..' . '/clue/stream-filter/src/functions.php', + '9c67151ae59aff4788964ce8eb2a0f43' => __DIR__ . '/..' . '/clue/stream-filter/src/functions_include.php', '8cff32064859f4559445b89279f3199c' => __DIR__ . '/..' . '/php-http/message/src/filters.php', 'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php', '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php', @@ -884,11 +884,11 @@ class ComposerStaticInite74cd27e1feadfb3f0d642944080e956 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInite74cd27e1feadfb3f0d642944080e956::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInite74cd27e1feadfb3f0d642944080e956::$prefixDirsPsr4; - $loader->prefixesPsr0 = ComposerStaticInite74cd27e1feadfb3f0d642944080e956::$prefixesPsr0; - $loader->fallbackDirsPsr0 = ComposerStaticInite74cd27e1feadfb3f0d642944080e956::$fallbackDirsPsr0; - $loader->classMap = ComposerStaticInite74cd27e1feadfb3f0d642944080e956::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitd0a456687b3dab21148a043296334846::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitd0a456687b3dab21148a043296334846::$prefixDirsPsr4; + $loader->prefixesPsr0 = ComposerStaticInitd0a456687b3dab21148a043296334846::$prefixesPsr0; + $loader->fallbackDirsPsr0 = ComposerStaticInitd0a456687b3dab21148a043296334846::$fallbackDirsPsr0; + $loader->classMap = ComposerStaticInitd0a456687b3dab21148a043296334846::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 19085a01ce..aaaf88469b 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1,17 +1,17 @@ [ { "name": "clue/stream-filter", - "version": "v1.4.0", - "version_normalized": "1.4.0.0", + "version": "v1.4.1", + "version_normalized": "1.4.1.0", "source": { "type": "git", "url": "https://github.com/clue/php-stream-filter.git", - "reference": "d80fdee9b3a7e0d16fc330a22f41f3ad0eeb09d0" + "reference": "5a58cc30a8bd6a4eb8f856adf61dd3e013f53f71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/clue/php-stream-filter/zipball/d80fdee9b3a7e0d16fc330a22f41f3ad0eeb09d0", - "reference": "d80fdee9b3a7e0d16fc330a22f41f3ad0eeb09d0", + "url": "https://api.github.com/repos/clue/php-stream-filter/zipball/5a58cc30a8bd6a4eb8f856adf61dd3e013f53f71", + "reference": "5a58cc30a8bd6a4eb8f856adf61dd3e013f53f71", "shasum": "" }, "require": { @@ -20,7 +20,7 @@ "require-dev": { "phpunit/phpunit": "^5.0 || ^4.8" }, - "time": "2017-08-18T09:54:01+00:00", + "time": "2019-04-09T12:31:48+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -28,7 +28,7 @@ "Clue\\StreamFilter\\": "src/" }, "files": [ - "src/functions.php" + "src/functions_include.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -1737,17 +1737,17 @@ }, { "name": "myclabs/deep-copy", - "version": "1.8.1", - "version_normalized": "1.8.1.0", + "version": "1.9.1", + "version_normalized": "1.9.1.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8" + "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", - "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72", + "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72", "shasum": "" }, "require": { @@ -1761,7 +1761,7 @@ "doctrine/common": "^2.6", "phpunit/phpunit": "^7.1" }, - "time": "2018-06-11T23:09:50+00:00", + "time": "2019-04-07T13:18:21+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -1826,17 +1826,17 @@ }, { "name": "pear/archive_tar", - "version": "1.4.6", - "version_normalized": "1.4.6.0", + "version": "1.4.7", + "version_normalized": "1.4.7.0", "source": { "type": "git", "url": "https://github.com/pear/Archive_Tar.git", - "reference": "b8e33f9063a7cd1d20f079014f8382b3a7aee47e" + "reference": "7e48add6f8edc3027dd98ad15964b1a28fd0c845" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/b8e33f9063a7cd1d20f079014f8382b3a7aee47e", - "reference": "b8e33f9063a7cd1d20f079014f8382b3a7aee47e", + "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/7e48add6f8edc3027dd98ad15964b1a28fd0c845", + "reference": "7e48add6f8edc3027dd98ad15964b1a28fd0c845", "shasum": "" }, "require": { @@ -1851,7 +1851,7 @@ "ext-xz": "Lzma2 compression support.", "ext-zlib": "Gzip compression support." }, - "time": "2019-02-01T11:10:38+00:00", + "time": "2019-04-08T13:15:55+00:00", "type": "library", "extra": { "branch-alias": { @@ -4438,8 +4438,8 @@ }, { "name": "symfony/options-resolver", - "version": "v4.2.4", - "version_normalized": "4.2.4.0", + "version": "v4.2.5", + "version_normalized": "4.2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -4672,8 +4672,8 @@ }, { "name": "symfony/var-dumper", - "version": "v4.2.4", - "version_normalized": "4.2.4.0", + "version": "v4.2.5", + "version_normalized": "4.2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", @@ -4750,17 +4750,17 @@ }, { "name": "symfony/yaml", - "version": "v3.4.23", - "version_normalized": "3.4.23.0", + "version": "v3.4.24", + "version_normalized": "3.4.24.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "57f1ce82c997f5a8701b89ef970e36bb657fd09c" + "reference": "212a27b731e5bfb735679d1ffaac82bd6a1dc996" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/57f1ce82c997f5a8701b89ef970e36bb657fd09c", - "reference": "57f1ce82c997f5a8701b89ef970e36bb657fd09c", + "url": "https://api.github.com/repos/symfony/yaml/zipball/212a27b731e5bfb735679d1ffaac82bd6a1dc996", + "reference": "212a27b731e5bfb735679d1ffaac82bd6a1dc996", "shasum": "" }, "require": { @@ -4776,7 +4776,7 @@ "suggest": { "symfony/console": "For validating YAML files using the lint command" }, - "time": "2019-02-23T15:06:07+00:00", + "time": "2019-03-25T07:48:46+00:00", "type": "library", "extra": { "branch-alias": { diff --git a/vendor/myclabs/deep-copy/src/DeepCopy/DeepCopy.php b/vendor/myclabs/deep-copy/src/DeepCopy/DeepCopy.php index d461ff6d42..2e53cf3dfb 100644 --- a/vendor/myclabs/deep-copy/src/DeepCopy/DeepCopy.php +++ b/vendor/myclabs/deep-copy/src/DeepCopy/DeepCopy.php @@ -99,6 +99,14 @@ public function addFilter(Filter $filter, Matcher $matcher) ]; } + public function prependFilter(Filter $filter, Matcher $matcher) + { + array_unshift($this->filters, [ + 'matcher' => $matcher, + 'filter' => $filter, + ]); + } + public function addTypeFilter(TypeFilter $filter, TypeMatcher $matcher) { $this->typeFilters[] = [ diff --git a/vendor/pear/archive_tar/.travis.yml b/vendor/pear/archive_tar/.travis.yml index f12ff15ae2..a0af9f106e 100644 --- a/vendor/pear/archive_tar/.travis.yml +++ b/vendor/pear/archive_tar/.travis.yml @@ -21,7 +21,7 @@ matrix: - php: 7.3 dist: trusty install: - - pear upgrade --force --alldeps pear/pear +# - pear upgrade --force --alldeps pear/pear - pear install -f package.xml script: - pear run-tests -qr tests/ diff --git a/vendor/pear/archive_tar/Archive/Tar.php b/vendor/pear/archive_tar/Archive/Tar.php index ad1a14fb39..53966c255d 100644 --- a/vendor/pear/archive_tar/Archive/Tar.php +++ b/vendor/pear/archive_tar/Archive/Tar.php @@ -124,7 +124,13 @@ class Archive_Tar extends PEAR * * @var string */ - public $_fmt =''; + public $_fmt = ''; + + /** + * @var int Length of the read buffer in bytes + */ + protected $buffer_length; + /** * Archive_Tar Class constructor. This flavour of the constructor only * declare a new Archive_Tar object, identifying it by the name of the @@ -137,10 +143,11 @@ class Archive_Tar extends PEAR * parameter indicates if gzip, bz2 or lzma2 compression * is required. For compatibility reason the * boolean value 'true' means 'gz'. + * @param int $buffer_length Length of the read buffer in bytes * * @return bool */ - public function __construct($p_tarname, $p_compress = null) + public function __construct($p_tarname, $p_compress = null, $buffer_length = 512) { parent::__construct(); @@ -234,15 +241,16 @@ public function __construct($p_tarname, $p_compress = null) if (version_compare(PHP_VERSION, "5.5.0-dev") < 0) { $this->_fmt = "a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/" . - "a8checksum/a1typeflag/a100link/a6magic/a2version/" . - "a32uname/a32gname/a8devmajor/a8devminor/a131prefix"; + "a8checksum/a1typeflag/a100link/a6magic/a2version/" . + "a32uname/a32gname/a8devmajor/a8devminor/a131prefix"; } else { $this->_fmt = "Z100filename/Z8mode/Z8uid/Z8gid/Z12size/Z12mtime/" . - "Z8checksum/Z1typeflag/Z100link/Z6magic/Z2version/" . - "Z32uname/Z32gname/Z8devmajor/Z8devminor/Z131prefix"; + "Z8checksum/Z1typeflag/Z100link/Z6magic/Z2version/" . + "Z32uname/Z32gname/Z8devmajor/Z8devminor/Z131prefix"; } + $this->buffer_length = $buffer_length; } public function __destruct() @@ -1257,8 +1265,15 @@ public function _addFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir, $v_ return false; } - while (($v_buffer = fread($v_file, 512)) != '') { - $v_binary_data = pack("a512", "$v_buffer"); + while (($v_buffer = fread($v_file, $this->buffer_length)) != '') { + $buffer_length = strlen("$v_buffer"); + if ($buffer_length != $this->buffer_length) { + $pack_size = ((int)($buffer_length / 512) + 1) * 512; + $pack_format = sprintf('a%d', $pack_size); + } else { + $pack_format = sprintf('a%d', $this->buffer_length); + } + $v_binary_data = pack($pack_format, "$v_buffer"); $this->_writeBlock($v_binary_data); } @@ -1463,7 +1478,8 @@ public function _writeHeaderBlock( $p_type = '', $p_uid = 0, $p_gid = 0 - ) { + ) + { $p_filename = $this->_pathReduction($p_filename); if (strlen($p_filename) > 99) { @@ -1771,7 +1787,7 @@ private function _maliciousFilename($file) return true; } if (strpos($file, '../') !== false || strpos($file, '..\\') !== false) { - return true; + return true; } return false; } @@ -1836,19 +1852,23 @@ private function _extractInString($p_filename) } switch ($v_header['typeflag']) { - case 'L': { - if (!$this->_readLongHeader($v_header)) { - return null; + case 'L': + { + if (!$this->_readLongHeader($v_header)) { + return null; + } } - } break; + break; - case 'K': { - $v_link_header = $v_header; - if (!$this->_readLongHeader($v_link_header)) { - return null; + case 'K': + { + $v_link_header = $v_header; + if (!$this->_readLongHeader($v_link_header)) { + return null; + } + $v_header['link'] = $v_link_header['filename']; } - $v_header['link'] = $v_link_header['filename']; - } break; + break; } if ($v_header['filename'] == $p_filename) { @@ -1897,7 +1917,8 @@ public function _extractList( $p_file_list, $p_remove_path, $p_preserve = false - ) { + ) + { $v_result = true; $v_nb = 0; $v_extract_all = true; @@ -1950,19 +1971,23 @@ public function _extractList( } switch ($v_header['typeflag']) { - case 'L': { - if (!$this->_readLongHeader($v_header)) { - return null; + case 'L': + { + if (!$this->_readLongHeader($v_header)) { + return null; + } } - } break; + break; - case 'K': { - $v_link_header = $v_header; - if (!$this->_readLongHeader($v_link_header)) { - return null; + case 'K': + { + $v_link_header = $v_header; + if (!$this->_readLongHeader($v_link_header)) { + return null; + } + $v_header['link'] = $v_link_header['filename']; } - $v_header['link'] = $v_link_header['filename']; - } break; + break; } // ignore extended / pax headers diff --git a/vendor/pear/archive_tar/package.xml b/vendor/pear/archive_tar/package.xml index 2127dbcd56..3e3448a953 100644 --- a/vendor/pear/archive_tar/package.xml +++ b/vendor/pear/archive_tar/package.xml @@ -32,10 +32,10 @@ Also Lzma2 compressed archives are supported with xz extension. stig@php.net no - 2019-02-01 - + 2019-04-08 + - 1.4.6 + 1.4.7 1.4.0 @@ -44,7 +44,7 @@ Also Lzma2 compressed archives are supported with xz extension. New BSD License -* Improve path traversal detection for forward and backward slashes +* Improved performance by increasing read buffer size @@ -74,6 +74,21 @@ Also Lzma2 compressed archives are supported with xz extension. + + + 1.4.6 + 1.4.0 + + + stable + stable + + 2019-02-01 + New BSD License + +* Improve path traversal detection for forward and backward slashes + + 1.4.5 diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsSpecificationExamples.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsSpecificationExamples.yml index 4ecd828f01..dd2d776fa2 100644 --- a/vendor/symfony/yaml/Tests/Fixtures/YtsSpecificationExamples.yml +++ b/vendor/symfony/yaml/Tests/Fixtures/YtsSpecificationExamples.yml @@ -72,7 +72,7 @@ yaml: | - 2001-07-23 perl-busted: > YAML.pm will be able to emulate this behavior soon. In this regard - it may be somewhat more correct than Python's native behaviour which + it may be somewhat more correct than Python's native behavior which can only use tuples as mapping keys. PyYAML will also need to figure out some clever way to roundtrip structured keys. python: |