From ebaf0e70e6f28d7f3a7bc1aa9d173a6e426dbb83 Mon Sep 17 00:00:00 2001 From: tarlepp Date: Sun, 6 Feb 2022 13:36:40 +0200 Subject: [PATCH 1/2] Added `symfony/string` component --- composer.json | 1 + composer.lock | 2 +- tools/01_phpunit/composer.lock | 36 ++++++++++++------------ tools/02_phpstan/composer.lock | 10 +++---- tools/03_psalm/composer.lock | 30 ++++++++++---------- tools/04_symplify/composer.lock | 36 ++++++++++++------------ tools/05_infection/composer.lock | 32 ++++++++++----------- tools/06_php-coveralls/composer.lock | 30 ++++++++++---------- tools/07_phpinsights/composer.lock | 42 ++++++++++++++-------------- tools/08_phpmetrics/composer.lock | 10 +++---- tools/09_rector/composer.lock | 10 +++---- tools/10_composer/composer.lock | 24 ++++++++-------- 12 files changed, 132 insertions(+), 131 deletions(-) diff --git a/composer.json b/composer.json index 106efbe2e..c32ce6bf7 100644 --- a/composer.json +++ b/composer.json @@ -54,6 +54,7 @@ "symfony/runtime": "6.0.3", "symfony/security-bundle": "6.0.3", "symfony/serializer": "6.0.3", + "symfony/string": "6.0.3", "symfony/translation": "6.0.3", "symfony/twig-bundle": "6.0.3", "symfony/validator": "6.0.3", diff --git a/composer.lock b/composer.lock index 8663fdb9f..d6cef5d74 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "de9c74b0a5b45bb5660c5041268a813e", + "content-hash": "02ff5debffa22915c5ed2cd7e5067ce6", "packages": [ { "name": "behat/transliterator", diff --git a/tools/01_phpunit/composer.lock b/tools/01_phpunit/composer.lock index 09e01264d..7ea456a04 100644 --- a/tools/01_phpunit/composer.lock +++ b/tools/01_phpunit/composer.lock @@ -1199,12 +1199,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "8ba45c14eb7b79db601052ba90c2811d9b028d7a" + "reference": "2ec9ad634c459ee60c42d99390be37c8a3c6e8e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/8ba45c14eb7b79db601052ba90c2811d9b028d7a", - "reference": "8ba45c14eb7b79db601052ba90c2811d9b028d7a", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/2ec9ad634c459ee60c42d99390be37c8a3c6e8e5", + "reference": "2ec9ad634c459ee60c42d99390be37c8a3c6e8e5", "shasum": "" }, "conflict": { @@ -1350,7 +1350,7 @@ "klaviyo/magento2-extension": ">=1,<3", "kreait/firebase-php": ">=3.2,<3.8.1", "la-haute-societe/tcpdf": "<6.2.22", - "laminas/laminas-form": "<2.17.2|>=3,<3.0.2|>=3.1,<3.1.1", + "laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1", "laminas/laminas-http": "<2.14.2", "laravel/framework": "<6.20.42|>=7,<7.30.6|>=8,<8.75", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", @@ -1639,7 +1639,7 @@ "type": "tidelift" } ], - "time": "2022-02-04T09:12:31+00:00" + "time": "2022-02-05T03:12:57+00:00" }, { "name": "sebastian/cli-parser", @@ -3111,12 +3111,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3192,12 +3192,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -3356,12 +3356,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -3435,12 +3435,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, "classmap": [ "Resources/stubs" ] diff --git a/tools/02_phpstan/composer.lock b/tools/02_phpstan/composer.lock index 55baad079..48f8ebf90 100644 --- a/tools/02_phpstan/composer.lock +++ b/tools/02_phpstan/composer.lock @@ -204,12 +204,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "8ba45c14eb7b79db601052ba90c2811d9b028d7a" + "reference": "2ec9ad634c459ee60c42d99390be37c8a3c6e8e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/8ba45c14eb7b79db601052ba90c2811d9b028d7a", - "reference": "8ba45c14eb7b79db601052ba90c2811d9b028d7a", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/2ec9ad634c459ee60c42d99390be37c8a3c6e8e5", + "reference": "2ec9ad634c459ee60c42d99390be37c8a3c6e8e5", "shasum": "" }, "conflict": { @@ -355,7 +355,7 @@ "klaviyo/magento2-extension": ">=1,<3", "kreait/firebase-php": ">=3.2,<3.8.1", "la-haute-societe/tcpdf": "<6.2.22", - "laminas/laminas-form": "<2.17.2|>=3,<3.0.2|>=3.1,<3.1.1", + "laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1", "laminas/laminas-http": "<2.14.2", "laravel/framework": "<6.20.42|>=7,<7.30.6|>=8,<8.75", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", @@ -644,7 +644,7 @@ "type": "tidelift" } ], - "time": "2022-02-04T09:12:31+00:00" + "time": "2022-02-05T03:12:57+00:00" } ], "aliases": [], diff --git a/tools/03_psalm/composer.lock b/tools/03_psalm/composer.lock index 3126f6bc6..b2ecb1813 100644 --- a/tools/03_psalm/composer.lock +++ b/tools/03_psalm/composer.lock @@ -1254,12 +1254,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "8ba45c14eb7b79db601052ba90c2811d9b028d7a" + "reference": "2ec9ad634c459ee60c42d99390be37c8a3c6e8e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/8ba45c14eb7b79db601052ba90c2811d9b028d7a", - "reference": "8ba45c14eb7b79db601052ba90c2811d9b028d7a", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/2ec9ad634c459ee60c42d99390be37c8a3c6e8e5", + "reference": "2ec9ad634c459ee60c42d99390be37c8a3c6e8e5", "shasum": "" }, "conflict": { @@ -1405,7 +1405,7 @@ "klaviyo/magento2-extension": ">=1,<3", "kreait/firebase-php": ">=3.2,<3.8.1", "la-haute-societe/tcpdf": "<6.2.22", - "laminas/laminas-form": "<2.17.2|>=3,<3.0.2|>=3.1,<3.1.1", + "laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1", "laminas/laminas-http": "<2.14.2", "laravel/framework": "<6.20.42|>=7,<7.30.6|>=8,<8.75", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", @@ -1694,7 +1694,7 @@ "type": "tidelift" } ], - "time": "2022-02-04T09:12:31+00:00" + "time": "2022-02-05T03:12:57+00:00" }, { "name": "sebastian/diff", @@ -3063,12 +3063,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3144,12 +3144,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -3308,12 +3308,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php81\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, "classmap": [ "Resources/stubs" ] diff --git a/tools/04_symplify/composer.lock b/tools/04_symplify/composer.lock index 7e9ceefcc..2988db980 100644 --- a/tools/04_symplify/composer.lock +++ b/tools/04_symplify/composer.lock @@ -722,12 +722,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "8ba45c14eb7b79db601052ba90c2811d9b028d7a" + "reference": "2ec9ad634c459ee60c42d99390be37c8a3c6e8e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/8ba45c14eb7b79db601052ba90c2811d9b028d7a", - "reference": "8ba45c14eb7b79db601052ba90c2811d9b028d7a", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/2ec9ad634c459ee60c42d99390be37c8a3c6e8e5", + "reference": "2ec9ad634c459ee60c42d99390be37c8a3c6e8e5", "shasum": "" }, "conflict": { @@ -873,7 +873,7 @@ "klaviyo/magento2-extension": ">=1,<3", "kreait/firebase-php": ">=3.2,<3.8.1", "la-haute-societe/tcpdf": "<6.2.22", - "laminas/laminas-form": "<2.17.2|>=3,<3.0.2|>=3.1,<3.1.1", + "laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1", "laminas/laminas-http": "<2.14.2", "laravel/framework": "<6.20.42|>=7,<7.30.6|>=8,<8.75", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", @@ -1162,7 +1162,7 @@ "type": "tidelift" } ], - "time": "2022-02-04T09:12:31+00:00" + "time": "2022-02-05T03:12:57+00:00" }, { "name": "symfony/console", @@ -1792,12 +1792,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1873,12 +1873,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -2037,12 +2037,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -2120,12 +2120,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php81\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, "classmap": [ "Resources/stubs" ] diff --git a/tools/05_infection/composer.lock b/tools/05_infection/composer.lock index 7ccf9460c..0b2bca7ea 100644 --- a/tools/05_infection/composer.lock +++ b/tools/05_infection/composer.lock @@ -754,12 +754,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "8ba45c14eb7b79db601052ba90c2811d9b028d7a" + "reference": "2ec9ad634c459ee60c42d99390be37c8a3c6e8e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/8ba45c14eb7b79db601052ba90c2811d9b028d7a", - "reference": "8ba45c14eb7b79db601052ba90c2811d9b028d7a", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/2ec9ad634c459ee60c42d99390be37c8a3c6e8e5", + "reference": "2ec9ad634c459ee60c42d99390be37c8a3c6e8e5", "shasum": "" }, "conflict": { @@ -905,7 +905,7 @@ "klaviyo/magento2-extension": ">=1,<3", "kreait/firebase-php": ">=3.2,<3.8.1", "la-haute-societe/tcpdf": "<6.2.22", - "laminas/laminas-form": "<2.17.2|>=3,<3.0.2|>=3.1,<3.1.1", + "laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1", "laminas/laminas-http": "<2.14.2", "laravel/framework": "<6.20.42|>=7,<7.30.6|>=8,<8.75", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", @@ -1194,7 +1194,7 @@ "type": "tidelift" } ], - "time": "2022-02-04T09:12:31+00:00" + "time": "2022-02-05T03:12:57+00:00" }, { "name": "sanmai/later", @@ -1224,12 +1224,12 @@ }, "type": "library", "autoload": { - "psr-4": { - "Later\\": "src/" - }, "files": [ "src/functions.php" - ] + ], + "psr-4": { + "Later\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1780,12 +1780,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1861,12 +1861,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] diff --git a/tools/06_php-coveralls/composer.lock b/tools/06_php-coveralls/composer.lock index b71d752d0..a54951e00 100644 --- a/tools/06_php-coveralls/composer.lock +++ b/tools/06_php-coveralls/composer.lock @@ -726,12 +726,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "8ba45c14eb7b79db601052ba90c2811d9b028d7a" + "reference": "2ec9ad634c459ee60c42d99390be37c8a3c6e8e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/8ba45c14eb7b79db601052ba90c2811d9b028d7a", - "reference": "8ba45c14eb7b79db601052ba90c2811d9b028d7a", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/2ec9ad634c459ee60c42d99390be37c8a3c6e8e5", + "reference": "2ec9ad634c459ee60c42d99390be37c8a3c6e8e5", "shasum": "" }, "conflict": { @@ -877,7 +877,7 @@ "klaviyo/magento2-extension": ">=1,<3", "kreait/firebase-php": ">=3.2,<3.8.1", "la-haute-societe/tcpdf": "<6.2.22", - "laminas/laminas-form": "<2.17.2|>=3,<3.0.2|>=3.1,<3.1.1", + "laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1", "laminas/laminas-http": "<2.14.2", "laravel/framework": "<6.20.42|>=7,<7.30.6|>=8,<8.75", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", @@ -1166,7 +1166,7 @@ "type": "tidelift" } ], - "time": "2022-02-04T09:12:31+00:00" + "time": "2022-02-05T03:12:57+00:00" }, { "name": "symfony/config", @@ -1584,12 +1584,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1665,12 +1665,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -1829,12 +1829,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php81\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, "classmap": [ "Resources/stubs" ] diff --git a/tools/07_phpinsights/composer.lock b/tools/07_phpinsights/composer.lock index 30e74b968..30101a685 100644 --- a/tools/07_phpinsights/composer.lock +++ b/tools/07_phpinsights/composer.lock @@ -1709,12 +1709,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "8ba45c14eb7b79db601052ba90c2811d9b028d7a" + "reference": "2ec9ad634c459ee60c42d99390be37c8a3c6e8e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/8ba45c14eb7b79db601052ba90c2811d9b028d7a", - "reference": "8ba45c14eb7b79db601052ba90c2811d9b028d7a", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/2ec9ad634c459ee60c42d99390be37c8a3c6e8e5", + "reference": "2ec9ad634c459ee60c42d99390be37c8a3c6e8e5", "shasum": "" }, "conflict": { @@ -1860,7 +1860,7 @@ "klaviyo/magento2-extension": ">=1,<3", "kreait/firebase-php": ">=3.2,<3.8.1", "la-haute-societe/tcpdf": "<6.2.22", - "laminas/laminas-form": "<2.17.2|>=3,<3.0.2|>=3.1,<3.1.1", + "laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1", "laminas/laminas-http": "<2.14.2", "laravel/framework": "<6.20.42|>=7,<7.30.6|>=8,<8.75", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", @@ -2149,7 +2149,7 @@ "type": "tidelift" } ], - "time": "2022-02-04T09:12:31+00:00" + "time": "2022-02-05T03:12:57+00:00" }, { "name": "sebastian/cli-parser", @@ -3454,12 +3454,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3535,12 +3535,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -3699,12 +3699,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -3778,12 +3778,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -3861,12 +3861,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php81\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, "classmap": [ "Resources/stubs" ] diff --git a/tools/08_phpmetrics/composer.lock b/tools/08_phpmetrics/composer.lock index 373e53b63..9f2997ca6 100644 --- a/tools/08_phpmetrics/composer.lock +++ b/tools/08_phpmetrics/composer.lock @@ -136,12 +136,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "8ba45c14eb7b79db601052ba90c2811d9b028d7a" + "reference": "2ec9ad634c459ee60c42d99390be37c8a3c6e8e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/8ba45c14eb7b79db601052ba90c2811d9b028d7a", - "reference": "8ba45c14eb7b79db601052ba90c2811d9b028d7a", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/2ec9ad634c459ee60c42d99390be37c8a3c6e8e5", + "reference": "2ec9ad634c459ee60c42d99390be37c8a3c6e8e5", "shasum": "" }, "conflict": { @@ -287,7 +287,7 @@ "klaviyo/magento2-extension": ">=1,<3", "kreait/firebase-php": ">=3.2,<3.8.1", "la-haute-societe/tcpdf": "<6.2.22", - "laminas/laminas-form": "<2.17.2|>=3,<3.0.2|>=3.1,<3.1.1", + "laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1", "laminas/laminas-http": "<2.14.2", "laravel/framework": "<6.20.42|>=7,<7.30.6|>=8,<8.75", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", @@ -576,7 +576,7 @@ "type": "tidelift" } ], - "time": "2022-02-04T09:12:31+00:00" + "time": "2022-02-05T03:12:57+00:00" } ], "aliases": [], diff --git a/tools/09_rector/composer.lock b/tools/09_rector/composer.lock index c1a59796f..77f04de79 100644 --- a/tools/09_rector/composer.lock +++ b/tools/09_rector/composer.lock @@ -137,12 +137,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "8ba45c14eb7b79db601052ba90c2811d9b028d7a" + "reference": "2ec9ad634c459ee60c42d99390be37c8a3c6e8e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/8ba45c14eb7b79db601052ba90c2811d9b028d7a", - "reference": "8ba45c14eb7b79db601052ba90c2811d9b028d7a", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/2ec9ad634c459ee60c42d99390be37c8a3c6e8e5", + "reference": "2ec9ad634c459ee60c42d99390be37c8a3c6e8e5", "shasum": "" }, "conflict": { @@ -288,7 +288,7 @@ "klaviyo/magento2-extension": ">=1,<3", "kreait/firebase-php": ">=3.2,<3.8.1", "la-haute-societe/tcpdf": "<6.2.22", - "laminas/laminas-form": "<2.17.2|>=3,<3.0.2|>=3.1,<3.1.1", + "laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1", "laminas/laminas-http": "<2.14.2", "laravel/framework": "<6.20.42|>=7,<7.30.6|>=8,<8.75", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", @@ -577,7 +577,7 @@ "type": "tidelift" } ], - "time": "2022-02-04T09:12:31+00:00" + "time": "2022-02-05T03:12:57+00:00" } ], "aliases": [], diff --git a/tools/10_composer/composer.lock b/tools/10_composer/composer.lock index 74c1c005e..2ef0c19e8 100644 --- a/tools/10_composer/composer.lock +++ b/tools/10_composer/composer.lock @@ -444,12 +444,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "8ba45c14eb7b79db601052ba90c2811d9b028d7a" + "reference": "2ec9ad634c459ee60c42d99390be37c8a3c6e8e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/8ba45c14eb7b79db601052ba90c2811d9b028d7a", - "reference": "8ba45c14eb7b79db601052ba90c2811d9b028d7a", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/2ec9ad634c459ee60c42d99390be37c8a3c6e8e5", + "reference": "2ec9ad634c459ee60c42d99390be37c8a3c6e8e5", "shasum": "" }, "conflict": { @@ -595,7 +595,7 @@ "klaviyo/magento2-extension": ">=1,<3", "kreait/firebase-php": ">=3.2,<3.8.1", "la-haute-societe/tcpdf": "<6.2.22", - "laminas/laminas-form": "<2.17.2|>=3,<3.0.2|>=3.1,<3.1.1", + "laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1", "laminas/laminas-http": "<2.14.2", "laravel/framework": "<6.20.42|>=7,<7.30.6|>=8,<8.75", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", @@ -884,7 +884,7 @@ "type": "tidelift" } ], - "time": "2022-02-04T09:12:31+00:00" + "time": "2022-02-05T03:12:57+00:00" }, { "name": "symfony/console", @@ -1155,12 +1155,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1236,12 +1236,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] From 8dc53dbdb7aeda5c9508dd40046021a9839ea2e8 Mon Sep 17 00:00:00 2001 From: tarlepp Date: Sun, 6 Feb 2022 13:37:04 +0200 Subject: [PATCH 2/2] Refactored `ApiKey` entity to use `symfony/string` component --- src/Entity/ApiKey.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/Entity/ApiKey.php b/src/Entity/ApiKey.php index 72832de68..a45b68779 100644 --- a/src/Entity/ApiKey.php +++ b/src/Entity/ApiKey.php @@ -23,13 +23,13 @@ use Ramsey\Uuid\UuidInterface; use Symfony\Bridge\Doctrine\Validator\Constraints as AssertCollection; use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\String\ByteString; use Symfony\Component\Validator\Constraints as Assert; use Throwable; use function array_map; use function array_merge; use function array_unique; use function array_values; -use function random_int; /** * Class ApiKey @@ -165,14 +165,7 @@ public function setToken(string $token): self */ public function generateToken(): self { - $random = ''; - $chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; - - for ($i = 0; $i < 40; $i++) { - $random .= $chars[random_int(0, 61)]; - } - - return $this->setToken($random); + return $this->setToken(ByteString::fromRandom(40)->toString()); } public function getDescription(): string