From d171a0590d958217af0f2c668bd487db7a5cb059 Mon Sep 17 00:00:00 2001 From: Ilhan Ates Date: Mon, 10 Oct 2022 19:49:02 +0000 Subject: [PATCH 1/6] feat: add xz compression --- Dockerfile | 24 +++++- composer.json | 1 + src/Storage/Compression/Algorithms/XZ.php | 40 ++++++++++ .../Storage/Compression/Algorithms/XZTest.php | 77 +++++++++++++++++++ 4 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 src/Storage/Compression/Algorithms/XZ.php create mode 100644 tests/Storage/Compression/Algorithms/XZTest.php diff --git a/Dockerfile b/Dockerfile index 47fbced9..04336307 100755 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,8 @@ RUN composer update \ FROM php:8.0-cli-alpine as compile -ENV PHP_ZSTD_VERSION="master" +ENV PHP_ZSTD_VERSION="master" \ + PHP_XZ_VERSION=5.2.7 RUN apk add --no-cache \ git \ @@ -34,6 +35,25 @@ RUN git clone --recursive --depth 1 --branch $PHP_ZSTD_VERSION https://github.co && ./configure --with-libzstd \ && make && make install +## Xz Extension +FROM compile as xz +RUN wget https://tukaani.org/xz/xz-${PHP_XZ_VERSION}.tar.xz -O xz.tar.xz \ + && tar -xJf xz.tar.xz \ + && rm xz.tar.xz \ + && ( \ + cd xz-${PHP_XZ_VERSION} \ + && ./configure \ + && make \ + && make install \ + ) \ + && rm -r xz-${PHP_XZ_VERSION} + +RUN git clone https://github.com/codemasher/php-ext-xz.git \ + && cd php-ext-xz \ + && phpize \ + && ./configure \ + && make && make install + FROM compile as final LABEL maintainer="team@appwrite.io" @@ -41,6 +61,7 @@ LABEL maintainer="team@appwrite.io" WORKDIR /usr/src/code RUN echo extension=zstd.so >> /usr/local/etc/php/conf.d/zstd.ini +RUN echo extension=xz.so >> /usr/local/etc/php/conf.d/xz.ini RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \ && echo "opcache.enable_cli=1" >> $PHP_INI_DIR/php.ini \ @@ -48,6 +69,7 @@ RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \ COPY --from=composer /usr/local/src/vendor /usr/src/code/vendor COPY --from=zstd /usr/local/lib/php/extensions/no-debug-non-zts-20200930/zstd.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/ +COPY --from=xz /usr/local/lib/php/extensions/no-debug-non-zts-20200930/xz.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/ # Add Source Code COPY . /usr/src/code diff --git a/composer.json b/composer.json index 5635eb96..ff85ce06 100644 --- a/composer.json +++ b/composer.json @@ -20,6 +20,7 @@ "ext-fileinfo": "*", "ext-zlib": "*", "ext-zstd": "*", + "ext-xz": "*", "php": ">=8.0", "utopia-php/framework": "0.*.*" }, diff --git a/src/Storage/Compression/Algorithms/XZ.php b/src/Storage/Compression/Algorithms/XZ.php new file mode 100644 index 00000000..3bd2c386 --- /dev/null +++ b/src/Storage/Compression/Algorithms/XZ.php @@ -0,0 +1,40 @@ +object = new XZ(); + } + + public function tearDown(): void + { + } + + public function testName() + { + $this->assertEquals($this->object->getName(), 'xz'); + } + + public function testCompressDecompressWithText() + { + $demo = 'This is a demo string'; + $demoSize = mb_strlen($demo, '8bit'); + + $data = $this->object->compress($demo); + $dataSize = mb_strlen($data, '8bit'); + + $this->assertEquals($demoSize, 21); + $this->assertEquals($dataSize, 80); + + $this->assertEquals($this->object->decompress($data), $demo); + } + + public function testCompressDecompressWithJPGImage() + { + $demo = \file_get_contents(__DIR__ . '/../../../resources/disk-a/kitten-1.jpg'); + $demoSize = mb_strlen($demo, '8bit'); + + $data = $this->object->compress($demo); + $dataSize = mb_strlen($data, '8bit'); + + $this->assertEquals($demoSize, 599639); + $this->assertEquals($dataSize, 599432); + + $this->assertGreaterThan($dataSize, $demoSize); + + $data = $this->object->decompress($data); + $dataSize = mb_strlen($data, '8bit'); + + $this->assertEquals($dataSize, 599639); + } + + public function testCompressDecompressWithPNGImage() + { + $demo = \file_get_contents(__DIR__ . '/../../../resources/disk-b/kitten-1.png'); + $demoSize = mb_strlen($demo, '8bit'); + + $data = $this->object->compress($demo); + $dataSize = mb_strlen($data, '8bit'); + + $this->assertEquals($demoSize, 3038056); + $this->assertEquals($dataSize, 2981000); + + $this->assertGreaterThan($dataSize, $demoSize); + + $data = $this->object->decompress($data); + $dataSize = mb_strlen($data, '8bit'); + + $this->assertEquals($dataSize, 3038056); + } +} From 56833a1bf44e5ba569138ff4d400763652f4d6ef Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 18 Oct 2022 07:09:56 +0300 Subject: [PATCH 2/6] Fix namespace --- tests/Storage/Compression/Algorithms/XZTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Storage/Compression/Algorithms/XZTest.php b/tests/Storage/Compression/Algorithms/XZTest.php index 5586687c..6fec876e 100644 --- a/tests/Storage/Compression/Algorithms/XZTest.php +++ b/tests/Storage/Compression/Algorithms/XZTest.php @@ -1,6 +1,6 @@ Date: Tue, 18 Oct 2022 07:10:17 +0300 Subject: [PATCH 3/6] Use 1.1.2 release of php-ext-xz --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 04336307..b0f3ef4f 100755 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,8 @@ RUN composer update \ FROM php:8.0-cli-alpine as compile ENV PHP_ZSTD_VERSION="master" \ - PHP_XZ_VERSION=5.2.7 + PHP_XZ_VERSION=5.2.7 \ + PHP_EXT_XZ_VERSION=1.1.2 RUN apk add --no-cache \ git \ @@ -48,7 +49,7 @@ RUN wget https://tukaani.org/xz/xz-${PHP_XZ_VERSION}.tar.xz -O xz.tar.xz \ ) \ && rm -r xz-${PHP_XZ_VERSION} -RUN git clone https://github.com/codemasher/php-ext-xz.git \ +RUN git clone https://github.com/codemasher/php-ext-xz.git --branch ${PHP_EXT_XZ_VERSION} \ && cd php-ext-xz \ && phpize \ && ./configure \ From 2ded401d72bb0b7a41626498d260ed87904251b1 Mon Sep 17 00:00:00 2001 From: Ilhan Ates Date: Tue, 25 Oct 2022 15:57:32 +0000 Subject: [PATCH 4/6] Merge branch 'main' into feat-4003-introduce-xz-compression-for-storage --- .gitignore | 3 +- composer.lock | 469 ++++++++++++---------------- tests/Storage/Device/WasabiTest.php | 2 +- 3 files changed, 211 insertions(+), 263 deletions(-) diff --git a/.gitignore b/.gitignore index cd44785a..3491b43d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ /.vscode/ .phpunit.result.cache tests/chunk.php -.idea/ \ No newline at end of file +.idea/ +.env \ No newline at end of file diff --git a/composer.lock b/composer.lock index a3a5d512..7f741458 100644 --- a/composer.lock +++ b/composer.lock @@ -4,28 +4,28 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1df212eaa94b7c555a893db0225a179b", + "content-hash": "e968ba6362f252d347db4f34b1515ca4", "packages": [ { "name": "utopia-php/framework", - "version": "0.19.7", + "version": "0.23.1", "source": { "type": "git", "url": "https://github.com/utopia-php/framework.git", - "reference": "f17afe77a21873b9be18ebc05283813468b4283a" + "reference": "d595df075aa9ee46147a388c63064b03aeeac466" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/framework/zipball/f17afe77a21873b9be18ebc05283813468b4283a", - "reference": "f17afe77a21873b9be18ebc05283813468b4283a", + "url": "https://api.github.com/repos/utopia-php/framework/zipball/d595df075aa9ee46147a388c63064b03aeeac466", + "reference": "d595df075aa9ee46147a388c63064b03aeeac466", "shasum": "" }, "require": { "php": ">=8.0.0" }, "require-dev": { - "phpunit/phpunit": "^9.5.10", - "vimeo/psalm": "4.13.1" + "phpunit/phpunit": "^9.5.25", + "vimeo/psalm": "^4.27.0" }, "type": "library", "autoload": { @@ -37,12 +37,6 @@ "license": [ "MIT" ], - "authors": [ - { - "name": "Eldad Fux", - "email": "eldad@appwrite.io" - } - ], "description": "A simple, light and advanced PHP framework", "keywords": [ "framework", @@ -51,9 +45,9 @@ ], "support": { "issues": "https://github.com/utopia-php/framework/issues", - "source": "https://github.com/utopia-php/framework/tree/0.19.7" + "source": "https://github.com/utopia-php/framework/tree/0.23.1" }, - "time": "2022-02-18T00:04:49+00:00" + "time": "2022-10-19T10:35:44+00:00" } ], "packages-dev": [ @@ -63,12 +57,12 @@ "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb" + "reference": "c5ea79065f98f93f7b16a4d5a504fe5d69451447" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", - "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", + "url": "https://api.github.com/repos/amphp/amp/zipball/c5ea79065f98f93f7b16a4d5a504fe5d69451447", + "reference": "c5ea79065f98f93f7b16a4d5a504fe5d69451447", "shasum": "" }, "require": { @@ -137,7 +131,7 @@ "support": { "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/amp/issues", - "source": "https://github.com/amphp/amp/tree/v2.6.2" + "source": "https://github.com/amphp/amp/tree/master" }, "funding": [ { @@ -145,7 +139,7 @@ "type": "github" } ], - "time": "2022-02-20T17:52:18+00:00" + "time": "2022-08-21T11:55:21+00:00" }, { "name": "amphp/byte-stream", @@ -153,12 +147,12 @@ "source": { "type": "git", "url": "https://github.com/amphp/byte-stream.git", - "reference": "10c420782bd805c4af634bab69b5dfdc14ab721c" + "reference": "18f86b65129d923e004df27e2a3d6f4159c3c743" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/byte-stream/zipball/10c420782bd805c4af634bab69b5dfdc14ab721c", - "reference": "10c420782bd805c4af634bab69b5dfdc14ab721c", + "url": "https://api.github.com/repos/amphp/byte-stream/zipball/18f86b65129d923e004df27e2a3d6f4159c3c743", + "reference": "18f86b65129d923e004df27e2a3d6f4159c3c743", "shasum": "" }, "require": { @@ -223,7 +217,7 @@ "type": "github" } ], - "time": "2021-12-03T13:49:59+00:00" + "time": "2022-06-21T18:19:50+00:00" }, { "name": "composer/package-versions-deprecated", @@ -305,12 +299,12 @@ "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "5d8e574bb0e69188786b8ef77d43341222a41a71" + "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/5d8e574bb0e69188786b8ef77d43341222a41a71", - "reference": "5d8e574bb0e69188786b8ef77d43341222a41a71", + "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", + "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", "shasum": "" }, "require": { @@ -363,7 +357,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.3.1" + "source": "https://github.com/composer/semver/tree/3.3.2" }, "funding": [ { @@ -379,7 +373,7 @@ "type": "tidelift" } ], - "time": "2022-03-16T11:22:07+00:00" + "time": "2022-04-01T19:23:25+00:00" }, { "name": "composer/xdebug-handler", @@ -603,12 +597,12 @@ "source": { "type": "git", "url": "https://github.com/felixfbecker/php-language-server-protocol.git", - "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842" + "reference": "ae4c490773bb0d21ca6f5e08a737506f44e175ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/6e82196ffd7c62f7794d778ca52b69feec9f2842", - "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842", + "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/ae4c490773bb0d21ca6f5e08a737506f44e175ea", + "reference": "ae4c490773bb0d21ca6f5e08a737506f44e175ea", "shasum": "" }, "require": { @@ -652,7 +646,7 @@ "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues", "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/master" }, - "time": "2022-03-02T22:36:06+00:00" + "time": "2022-06-19T17:15:06+00:00" }, { "name": "myclabs/deep-copy", @@ -767,16 +761,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.13.2", + "version": "4.x-dev", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "210577fe3cf7badcc5814d99455df46564f3c077" + "reference": "2f1fd784fe5560675722a1e5cbbcece5f43bf3a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077", - "reference": "210577fe3cf7badcc5814d99455df46564f3c077", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/2f1fd784fe5560675722a1e5cbbcece5f43bf3a0", + "reference": "2f1fd784fe5560675722a1e5cbbcece5f43bf3a0", "shasum": "" }, "require": { @@ -817,9 +811,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2" + "source": "https://github.com/nikic/PHP-Parser/tree/4.x" }, - "time": "2021-11-30T19:35:32+00:00" + "time": "2022-09-10T20:41:13+00:00" }, { "name": "openlss/lib-array2xml", @@ -1052,12 +1046,12 @@ "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "21481a5c97e8332f7279e31219c32faa2da21c79" + "reference": "203354b3c050367925c10e016b4e2e04755705ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/21481a5c97e8332f7279e31219c32faa2da21c79", - "reference": "21481a5c97e8332f7279e31219c32faa2da21c79", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/203354b3c050367925c10e016b4e2e04755705ce", + "reference": "203354b3c050367925c10e016b4e2e04755705ce", "shasum": "" }, "require": { @@ -1069,7 +1063,12 @@ }, "require-dev": { "mockery/mockery": "~1.3.5", - "psalm/phar": "^4.8" + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-mockery": "^1.1", + "phpstan/phpstan-webmozart-assert": "^1.2", + "phpunit/phpunit": "^9.5", + "vimeo/psalm": "^4.26" }, "default-branch": true, "type": "library", @@ -1102,7 +1101,7 @@ "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master" }, - "time": "2021-12-27T22:36:43+00:00" + "time": "2022-08-27T10:55:55+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -1110,21 +1109,26 @@ "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706" + "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706", - "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d", + "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", + "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.0" }, "require-dev": { "ext-tokenizer": "*", - "psalm/phar": "^4.8" + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpunit/phpunit": "^9.5", + "rector/rector": "^0.13.9", + "vimeo/psalm": "^4.25" }, "default-branch": true, "type": "library", @@ -1151,77 +1155,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2" }, - "time": "2022-01-04T19:58:01+00:00" - }, - { - "name": "phpspec/prophecy", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.2", - "php": "^7.2 || ~8.0, <8.2", - "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0", - "sebastian/recursion-context": "^3.0 || ^4.0" - }, - "require-dev": { - "phpspec/phpspec": "^6.0 || ^7.0", - "phpunit/phpunit": "^8.0 || ^9.0" - }, - "default-branch": true, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Prophecy\\": "src/Prophecy" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - }, - { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" - } - ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "https://github.com/phpspec/prophecy", - "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" - ], - "support": { - "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.15.0" - }, - "time": "2021-12-08T12:19:24+00:00" + "time": "2022-10-14T12:47:21+00:00" }, { "name": "phpunit/php-code-coverage", @@ -1229,19 +1165,19 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "9f4335cf4951de192c6aa763b19638bdc41a1290" + "reference": "74b7413e8d9788df77e296adabd7c1f6ca801a99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f4335cf4951de192c6aa763b19638bdc41a1290", - "reference": "9f4335cf4951de192c6aa763b19638bdc41a1290", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/74b7413e8d9788df77e296adabd7c1f6ca801a99", + "reference": "74b7413e8d9788df77e296adabd7c1f6ca801a99", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.13.0", + "nikic/php-parser": "^4.14", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -1298,7 +1234,7 @@ "type": "github" } ], - "time": "2022-03-03T16:15:10+00:00" + "time": "2022-10-21T12:10:51+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1547,12 +1483,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "5ff8c545a50226c569310a35f4fa89d79f1ddfdc" + "reference": "7847a4a920f686db261da1ccc92120800822661f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5ff8c545a50226c569310a35f4fa89d79f1ddfdc", - "reference": "5ff8c545a50226c569310a35f4fa89d79f1ddfdc", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7847a4a920f686db261da1ccc92120800822661f", + "reference": "7847a4a920f686db261da1ccc92120800822661f", "shasum": "" }, "require": { @@ -1567,7 +1503,6 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", - "phpspec/prophecy": "^1.12.1", "phpunit/php-code-coverage": "^9.2.13", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", @@ -1575,20 +1510,16 @@ "phpunit/php-timer": "^5.0.2", "sebastian/cli-parser": "^1.0.1", "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.5", + "sebastian/comparator": "^4.0.8", "sebastian/diff": "^4.0.3", "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.3", + "sebastian/exporter": "^4.0.5", "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.0", + "sebastian/type": "^3.2", "sebastian/version": "^3.0.2" }, - "require-dev": { - "ext-pdo": "*", - "phpspec/prophecy-phpunit": "^2.0.1" - }, "suggest": { "ext-soap": "*", "ext-xdebug": "*" @@ -1640,9 +1571,13 @@ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" } ], - "time": "2022-02-23T17:10:58+00:00" + "time": "2022-10-19T10:44:50+00:00" }, { "name": "psr/container", @@ -1650,12 +1585,12 @@ "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" + "reference": "90db7b9ac2a2c5b849fcb69dde58f3ae182c68f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", - "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "url": "https://api.github.com/repos/php-fig/container/zipball/90db7b9ac2a2c5b849fcb69dde58f3ae182c68f5", + "reference": "90db7b9ac2a2c5b849fcb69dde58f3ae182c68f5", "shasum": "" }, "require": { @@ -1694,9 +1629,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/2.0.2" + "source": "https://github.com/php-fig/container/tree/master" }, - "time": "2021-11-05T16:47:00+00:00" + "time": "2022-07-19T17:36:59+00:00" }, { "name": "psr/log", @@ -1917,16 +1852,16 @@ }, { "name": "sebastian/comparator", - "version": "4.0.6", + "version": "4.0.x-dev", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382" + "reference": "b247957a1c8dc81a671770f74b479c0a78a818f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/b247957a1c8dc81a671770f74b479c0a78a818f1", + "reference": "b247957a1c8dc81a671770f74b479c0a78a818f1", "shasum": "" }, "require": { @@ -1979,7 +1914,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6" + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0" }, "funding": [ { @@ -1987,7 +1922,7 @@ "type": "github" } ], - "time": "2020-10-26T15:49:45+00:00" + "time": "2022-09-14T12:46:14+00:00" }, { "name": "sebastian/complexity", @@ -2114,16 +2049,16 @@ }, { "name": "sebastian/environment", - "version": "5.1.3", + "version": "5.1.x-dev", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "388b6ced16caa751030f6a69e588299fa09200ac" + "reference": "3fade0c8462024d0426a00dc1ad0a2fda0df733f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac", - "reference": "388b6ced16caa751030f6a69e588299fa09200ac", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/3fade0c8462024d0426a00dc1ad0a2fda0df733f", + "reference": "3fade0c8462024d0426a00dc1ad0a2fda0df733f", "shasum": "" }, "require": { @@ -2165,7 +2100,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3" + "source": "https://github.com/sebastianbergmann/environment/tree/5.1" }, "funding": [ { @@ -2173,7 +2108,7 @@ "type": "github" } ], - "time": "2020-09-28T05:52:38+00:00" + "time": "2022-04-14T11:24:33+00:00" }, { "name": "sebastian/exporter", @@ -2181,12 +2116,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "428c31e2ea8b292aa814bc460cf28d58eba4d2ba" + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/428c31e2ea8b292aa814bc460cf28d58eba4d2ba", - "reference": "428c31e2ea8b292aa814bc460cf28d58eba4d2ba", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", "shasum": "" }, "require": { @@ -2250,7 +2185,7 @@ "type": "github" } ], - "time": "2022-03-06T06:59:32+00:00" + "time": "2022-09-14T06:03:37+00:00" }, { "name": "sebastian/global-state", @@ -2487,16 +2422,16 @@ }, { "name": "sebastian/recursion-context", - "version": "4.0.4", + "version": "4.0.x-dev", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172" + "reference": "e3a614438af7f71eaa6fc8e406be8a3aa5c34595" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e3a614438af7f71eaa6fc8e406be8a3aa5c34595", + "reference": "e3a614438af7f71eaa6fc8e406be8a3aa5c34595", "shasum": "" }, "require": { @@ -2535,10 +2470,10 @@ } ], "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0" }, "funding": [ { @@ -2546,20 +2481,20 @@ "type": "github" } ], - "time": "2020-10-26T13:17:30+00:00" + "time": "2022-07-30T08:13:09+00:00" }, { "name": "sebastian/resource-operations", - "version": "dev-master", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" + "reference": "b7a390ae3651f7ba3675d8364bff396e87931554" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/b7a390ae3651f7ba3675d8364bff396e87931554", + "reference": "b7a390ae3651f7ba3675d8364bff396e87931554", "shasum": "" }, "require": { @@ -2572,7 +2507,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "3.0-dev" } }, "autoload": { @@ -2593,7 +2528,7 @@ "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "support": { - "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" + "source": "https://github.com/sebastianbergmann/resource-operations/tree/main" }, "funding": [ { @@ -2601,20 +2536,20 @@ "type": "github" } ], - "time": "2020-09-28T06:45:17+00:00" + "time": "2022-06-14T05:05:56+00:00" }, { "name": "sebastian/type", - "version": "3.0.x-dev", + "version": "3.2.x-dev", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad" + "reference": "4d34b23933f255b0822758a44272222cac593eb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad", - "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/4d34b23933f255b0822758a44272222cac593eb4", + "reference": "4d34b23933f255b0822758a44272222cac593eb4", "shasum": "" }, "require": { @@ -2626,7 +2561,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -2649,7 +2584,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.0.0" + "source": "https://github.com/sebastianbergmann/type/tree/3.2" }, "funding": [ { @@ -2657,7 +2592,7 @@ "type": "github" } ], - "time": "2022-03-15T09:54:48+00:00" + "time": "2022-10-01T05:56:17+00:00" }, { "name": "sebastian/version", @@ -2718,12 +2653,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "d8111acc99876953f52fe16d4c50eb60940d49ad" + "reference": "ae0727b4b524bebd61096c967d130bd12d6c0f22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/d8111acc99876953f52fe16d4c50eb60940d49ad", - "reference": "d8111acc99876953f52fe16d4c50eb60940d49ad", + "url": "https://api.github.com/repos/symfony/console/zipball/ae0727b4b524bebd61096c967d130bd12d6c0f22", + "reference": "ae0727b4b524bebd61096c967d130bd12d6c0f22", "shasum": "" }, "require": { @@ -2761,7 +2696,6 @@ "symfony/lock": "", "symfony/process": "" }, - "default-branch": true, "type": "library", "autoload": { "psr-4": { @@ -2794,7 +2728,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.5" + "source": "https://github.com/symfony/console/tree/5.4" }, "funding": [ { @@ -2810,7 +2744,7 @@ "type": "tidelift" } ], - "time": "2022-02-24T12:45:35+00:00" + "time": "2022-10-18T13:11:10+00:00" }, { "name": "symfony/deprecation-contracts", @@ -2818,22 +2752,22 @@ "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "893fd20d9ae41a0bae2b9cbdd581ac0cf3917de3" + "reference": "4912000e79dc2d6df029d35d8755be1ed79b6691" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/893fd20d9ae41a0bae2b9cbdd581ac0cf3917de3", - "reference": "893fd20d9ae41a0bae2b9cbdd581ac0cf3917de3", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/4912000e79dc2d6df029d35d8755be1ed79b6691", + "reference": "4912000e79dc2d6df029d35d8755be1ed79b6691", "shasum": "" }, "require": { - "php": ">=8.0.2" + "php": ">=8.1" }, "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.1-dev" + "dev-main": "3.2-dev" }, "thanks": { "name": "symfony/contracts", @@ -2878,20 +2812,20 @@ "type": "tidelift" } ], - "time": "2021-11-29T18:10:03+00:00" + "time": "2022-05-20T13:56:22+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.24.0", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "30885182c981ab175d4d034db0f6f469898070ab" + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", - "reference": "30885182c981ab175d4d034db0f6f469898070ab", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", "shasum": "" }, "require": { @@ -2903,10 +2837,11 @@ "suggest": { "ext-ctype": "For best performance" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2944,7 +2879,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0" }, "funding": [ { @@ -2960,20 +2895,20 @@ "type": "tidelift" } ], - "time": "2021-10-20T20:35:02+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.24.0", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "81b86b50cf841a64252b439e738e97f4a34e2783" + "reference": "433d05519ce6990bf3530fba6957499d327395c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783", - "reference": "81b86b50cf841a64252b439e738e97f4a34e2783", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2", + "reference": "433d05519ce6990bf3530fba6957499d327395c2", "shasum": "" }, "require": { @@ -2982,10 +2917,11 @@ "suggest": { "ext-intl": "For best performance" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3025,7 +2961,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0" }, "funding": [ { @@ -3041,20 +2977,20 @@ "type": "tidelift" } ], - "time": "2021-11-23T21:10:46+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.24.0", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" + "reference": "219aa369ceff116e673852dce47c3a41794c14bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd", + "reference": "219aa369ceff116e673852dce47c3a41794c14bd", "shasum": "" }, "require": { @@ -3063,10 +2999,11 @@ "suggest": { "ext-intl": "For best performance" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3109,7 +3046,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0" }, "funding": [ { @@ -3125,20 +3062,20 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.24.0", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", "shasum": "" }, "require": { @@ -3150,10 +3087,11 @@ "suggest": { "ext-mbstring": "For best performance" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3192,7 +3130,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" }, "funding": [ { @@ -3208,29 +3146,30 @@ "type": "tidelift" } ], - "time": "2021-11-30T18:21:41+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.24.0", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5" + "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5", - "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85", + "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85", "shasum": "" }, "require": { "php": ">=7.1" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3271,7 +3210,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.26.0" }, "funding": [ { @@ -3287,29 +3226,30 @@ "type": "tidelift" } ], - "time": "2021-06-05T21:20:04+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.24.0", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c" + "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c", - "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace", + "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace", "shasum": "" }, "require": { "php": ">=7.1" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3354,7 +3294,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0" }, "funding": [ { @@ -3370,7 +3310,7 @@ "type": "tidelift" } ], - "time": "2022-03-04T08:16:47+00:00" + "time": "2022-05-10T07:21:04+00:00" }, { "name": "symfony/service-contracts", @@ -3378,16 +3318,16 @@ "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "bc0a2247c72d29241b5a06fb60dc1c9d9acf2a3a" + "reference": "cb82f217a2029131afbcbd220c511d0d77ebed19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bc0a2247c72d29241b5a06fb60dc1c9d9acf2a3a", - "reference": "bc0a2247c72d29241b5a06fb60dc1c9d9acf2a3a", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/cb82f217a2029131afbcbd220c511d0d77ebed19", + "reference": "cb82f217a2029131afbcbd220c511d0d77ebed19", "shasum": "" }, "require": { - "php": ">=8.0.2", + "php": ">=8.1", "psr/container": "^2.0" }, "conflict": { @@ -3400,7 +3340,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.1-dev" + "dev-main": "3.2-dev" }, "thanks": { "name": "symfony/contracts", @@ -3410,7 +3350,10 @@ "autoload": { "psr-4": { "Symfony\\Contracts\\Service\\": "" - } + }, + "exclude-from-classmap": [ + "/Test/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3453,24 +3396,24 @@ "type": "tidelift" } ], - "time": "2021-11-29T18:10:03+00:00" + "time": "2022-05-30T19:19:18+00:00" }, { "name": "symfony/string", - "version": "6.0.x-dev", + "version": "6.2.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "522144f0c4c004c80d56fa47e40e17028e2eefc2" + "reference": "5d8211c95d9a0d913a0ccb02e932c8268ae9d3d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/522144f0c4c004c80d56fa47e40e17028e2eefc2", - "reference": "522144f0c4c004c80d56fa47e40e17028e2eefc2", + "url": "https://api.github.com/repos/symfony/string/zipball/5d8211c95d9a0d913a0ccb02e932c8268ae9d3d3", + "reference": "5d8211c95d9a0d913a0ccb02e932c8268ae9d3d3", "shasum": "" }, "require": { - "php": ">=8.0.2", + "php": ">=8.1", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", @@ -3482,6 +3425,7 @@ "require-dev": { "symfony/error-handler": "^5.4|^6.0", "symfony/http-client": "^5.4|^6.0", + "symfony/intl": "^6.2", "symfony/translation-contracts": "^2.0|^3.0", "symfony/var-exporter": "^5.4|^6.0" }, @@ -3522,7 +3466,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/6.0" + "source": "https://github.com/symfony/string/tree/6.2" }, "funding": [ { @@ -3538,7 +3482,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:55:41+00:00" + "time": "2022-10-17T20:01:40+00:00" }, { "name": "theseer/tokenizer", @@ -3750,21 +3694,20 @@ }, { "name": "webmozart/glob", - "version": "4.5.x-dev", + "version": "4.7.x-dev", "source": { "type": "git", "url": "https://github.com/webmozarts/glob.git", - "reference": "539b5dbc10021d3f9242e7a9e9b6b37843179e83" + "reference": "3c17f7dec3d9d0e87b575026011f2e75a56ed655" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/glob/zipball/539b5dbc10021d3f9242e7a9e9b6b37843179e83", - "reference": "539b5dbc10021d3f9242e7a9e9b6b37843179e83", + "url": "https://api.github.com/repos/webmozarts/glob/zipball/3c17f7dec3d9d0e87b575026011f2e75a56ed655", + "reference": "3c17f7dec3d9d0e87b575026011f2e75a56ed655", "shasum": "" }, "require": { - "php": "^7.3 || ^8.0.0", - "webmozart/path-util": "^2.2" + "php": "^7.3 || ^8.0.0" }, "require-dev": { "phpunit/phpunit": "^9.5", @@ -3795,32 +3738,33 @@ "description": "A PHP implementation of Ant's glob.", "support": { "issues": "https://github.com/webmozarts/glob/issues", - "source": "https://github.com/webmozarts/glob/tree/4.4.0" + "source": "https://github.com/webmozarts/glob/tree/4.6.0" }, - "time": "2021-10-07T16:13:08+00:00" + "time": "2022-05-24T19:45:58+00:00" }, { "name": "webmozart/path-util", - "version": "2.3.0", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/webmozart/path-util.git", - "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725" + "reference": "6099b5238073f87f246863fd58c2e447acfc0d24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/path-util/zipball/d939f7edc24c9a1bb9c0dee5cb05d8e859490725", - "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725", + "url": "https://api.github.com/repos/webmozart/path-util/zipball/6099b5238073f87f246863fd58c2e447acfc0d24", + "reference": "6099b5238073f87f246863fd58c2e447acfc0d24", "shasum": "" }, "require": { - "php": ">=5.3.3", + "php": "^5.3.3|^7.0", "webmozart/assert": "~1.0" }, "require-dev": { "phpunit/phpunit": "^4.6", "sebastian/version": "^1.0.1" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -3845,10 +3789,10 @@ "description": "A robust cross-platform utility for normalizing, comparing and modifying file paths.", "support": { "issues": "https://github.com/webmozart/path-util/issues", - "source": "https://github.com/webmozart/path-util/tree/2.3.0" + "source": "https://github.com/webmozart/path-util/tree/master" }, "abandoned": "symfony/filesystem", - "time": "2015-12-17T08:42:14+00:00" + "time": "2021-11-08T08:17:20+00:00" } ], "aliases": [], @@ -3857,6 +3801,9 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { + "ext-fileinfo": "*", + "ext-zlib": "*", + "ext-zstd": "*", "php": ">=8.0" }, "platform-dev": [], diff --git a/tests/Storage/Device/WasabiTest.php b/tests/Storage/Device/WasabiTest.php index 4cf40653..264ee3c9 100644 --- a/tests/Storage/Device/WasabiTest.php +++ b/tests/Storage/Device/WasabiTest.php @@ -12,7 +12,7 @@ protected function init(): void $this->root = 'root'; $key = $_SERVER['WASABI_ACCESS_KEY'] ?? ''; $secret = $_SERVER['WASABI_SECRET'] ?? ''; - $bucket = 'utopia-php-storage-tests'; + $bucket = 'utopia-storage-tests'; $this->object = new Wasabi($this->root, $key, $secret, $bucket, Wasabi::EU_CENTRAL_1, WASABI::ACL_PRIVATE); } From 5b74b3c63ba38da366d9052ca182f77bec5ee5e7 Mon Sep 17 00:00:00 2001 From: Ilhan Date: Thu, 22 Dec 2022 12:26:13 +0300 Subject: [PATCH 5/6] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5234fbc1..08c85479 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ FROM php:8.0-cli-alpine as compile ENV PHP_ZSTD_VERSION="master" \ PHP_XZ_VERSION=5.2.7 \ - PHP_EXT_XZ_VERSION=1.1.2 + PHP_EXT_XZ_VERSION=1.1.2 \ PHP_SNAPPY_VERSION=bfefe4906e0abb1f6cc19005b35f9af5240d9025 RUN apk add --no-cache \ From 4e53f3f33f65c3e32491336e2e23fe7fca607b80 Mon Sep 17 00:00:00 2001 From: Ilhan Ates Date: Sat, 28 Jan 2023 22:33:08 +0300 Subject: [PATCH 6/6] Fix merge mess-up --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 08c85479..4b9f2264 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,6 +52,9 @@ RUN wget https://tukaani.org/xz/xz-${PHP_XZ_VERSION}.tar.xz -O xz.tar.xz \ RUN git clone https://github.com/codemasher/php-ext-xz.git --branch ${PHP_EXT_XZ_VERSION} \ && cd php-ext-xz \ + && phpize \ + && ./configure \ + && make && make install ## Snappy Extension FROM compile AS snappy