From 05c284971de6b95e73e5d487b46ad0ea7df4e891 Mon Sep 17 00:00:00 2001 From: Spryker Bot Date: Fri, 3 Jan 2025 12:35:52 +0000 Subject: [PATCH 1/5] Update composer lock file. --- composer.lock | 254 +++++++++++++++++++++++++------------------------- 1 file changed, 126 insertions(+), 128 deletions(-) diff --git a/composer.lock b/composer.lock index 673f28b3ae..5cf950fd03 100644 --- a/composer.lock +++ b/composer.lock @@ -246,16 +246,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.336.3", + "version": "3.336.7", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "b863c7953ebeeae191c3835bb5413f872cfbb753" + "reference": "3ebc383239f93d6f1e74573112c9d179070d2620" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b863c7953ebeeae191c3835bb5413f872cfbb753", - "reference": "b863c7953ebeeae191c3835bb5413f872cfbb753", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3ebc383239f93d6f1e74573112c9d179070d2620", + "reference": "3ebc383239f93d6f1e74573112c9d179070d2620", "shasum": "" }, "require": { @@ -338,9 +338,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.336.3" + "source": "https://github.com/aws/aws-sdk-php/tree/3.336.7" }, - "time": "2024-12-23T19:13:29+00:00" + "time": "2025-01-02T19:07:47+00:00" }, { "name": "brick/math", @@ -3849,16 +3849,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.3.1", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b" + "reference": "447a020a1f875a434d62f2a401f53b82a396e494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b", - "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494", + "reference": "447a020a1f875a434d62f2a401f53b82a396e494", "shasum": "" }, "require": { @@ -3901,9 +3901,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0" }, - "time": "2024-10-08T18:51:32+00:00" + "time": "2024-12-30T11:07:19+00:00" }, { "name": "nyholm/dsn", @@ -5507,16 +5507,16 @@ }, { "name": "spomky-labs/pki-framework", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/Spomky-Labs/pki-framework.git", - "reference": "0b10c8b53366729417d6226ae89a665f9e2d61b6" + "reference": "5ac374c3e295c8b917208ff41b4d30f76668478c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/0b10c8b53366729417d6226ae89a665f9e2d61b6", - "reference": "0b10c8b53366729417d6226ae89a665f9e2d61b6", + "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/5ac374c3e295c8b917208ff41b4d30f76668478c", + "reference": "5ac374c3e295c8b917208ff41b4d30f76668478c", "shasum": "" }, "require": { @@ -5525,21 +5525,19 @@ "php": ">=8.1" }, "require-dev": { - "ekino/phpstan-banned-code": "^1.0", + "ekino/phpstan-banned-code": "^1.0|^2.0|^3.0", "ext-gmp": "*", "ext-openssl": "*", - "infection/infection": "^0.28", + "infection/infection": "^0.28|^0.29", "php-parallel-lint/php-parallel-lint": "^1.3", - "phpstan/extension-installer": "^1.3", - "phpstan/phpstan": "^1.8", - "phpstan/phpstan-beberlei-assert": "^1.0", - "phpstan/phpstan-deprecation-rules": "^1.0", - "phpstan/phpstan-phpunit": "^1.1", - "phpstan/phpstan-strict-rules": "^1.3", + "phpstan/extension-installer": "^1.3|^2.0", + "phpstan/phpstan": "^1.8|^2.0", + "phpstan/phpstan-deprecation-rules": "^1.0|^2.0", + "phpstan/phpstan-phpunit": "^1.1|^2.0", + "phpstan/phpstan-strict-rules": "^1.3|^2.0", "phpunit/phpunit": "^10.1|^11.0", - "rector/rector": "^1.0", + "rector/rector": "^1.0|^2.0", "roave/security-advisories": "dev-latest", - "symfony/phpunit-bridge": "^6.4|^7.0", "symfony/string": "^6.4|^7.0", "symfony/var-dumper": "^6.4|^7.0", "symplify/easy-coding-standard": "^12.0" @@ -5602,7 +5600,7 @@ ], "support": { "issues": "https://github.com/Spomky-Labs/pki-framework/issues", - "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.2.1" + "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.2.2" }, "funding": [ { @@ -5614,7 +5612,7 @@ "type": "patreon" } ], - "time": "2024-03-30T18:03:49+00:00" + "time": "2025-01-03T09:35:48+00:00" }, { "name": "spryker-eco/loggly", @@ -6343,7 +6341,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "90f1b66bbf677033fd4d3047cf9738bd8239099a" + "reference": "4e08e626860d2c443a0a0172f7fc2d84f144d6ec" }, "require": { "php": ">=8.1" @@ -7474,7 +7472,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2024-12-26T14:23:31+00:00" + "time": "2025-01-03T12:33:25+00:00" }, { "name": "spryker/spryker-shop", @@ -8162,12 +8160,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -8369,16 +8367,16 @@ }, { "name": "symfony/console", - "version": "v6.4.15", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd" + "reference": "799445db3f15768ecc382ac5699e6da0520a0a04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/f1fc6f47283e27336e7cebb9e8946c8de7bff9bd", - "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd", + "url": "https://api.github.com/repos/symfony/console/zipball/799445db3f15768ecc382ac5699e6da0520a0a04", + "reference": "799445db3f15768ecc382ac5699e6da0520a0a04", "shasum": "" }, "require": { @@ -8443,7 +8441,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.15" + "source": "https://github.com/symfony/console/tree/v6.4.17" }, "funding": [ { @@ -8459,7 +8457,7 @@ "type": "tidelift" } ], - "time": "2024-11-06T14:19:14+00:00" + "time": "2024-12-07T12:07:30+00:00" }, { "name": "symfony/debug", @@ -8629,12 +8627,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -8753,16 +8751,16 @@ }, { "name": "symfony/error-handler", - "version": "v6.4.14", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "9e024324511eeb00983ee76b9aedc3e6ecd993d9" + "reference": "37ad2380e8c1a8cf62a1200a5c10080b679b446c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/9e024324511eeb00983ee76b9aedc3e6ecd993d9", - "reference": "9e024324511eeb00983ee76b9aedc3e6ecd993d9", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/37ad2380e8c1a8cf62a1200a5c10080b679b446c", + "reference": "37ad2380e8c1a8cf62a1200a5c10080b679b446c", "shasum": "" }, "require": { @@ -8808,7 +8806,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v6.4.14" + "source": "https://github.com/symfony/error-handler/tree/v6.4.17" }, "funding": [ { @@ -8824,7 +8822,7 @@ "type": "tidelift" } ], - "time": "2024-11-05T15:34:40+00:00" + "time": "2024-12-06T13:30:51+00:00" }, { "name": "symfony/event-dispatcher", @@ -8926,12 +8924,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -9047,16 +9045,16 @@ }, { "name": "symfony/finder", - "version": "v6.4.13", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958" + "reference": "1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/daea9eca0b08d0ed1dc9ab702a46128fd1be4958", - "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958", + "url": "https://api.github.com/repos/symfony/finder/zipball/1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7", + "reference": "1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7", "shasum": "" }, "require": { @@ -9091,7 +9089,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.4.13" + "source": "https://github.com/symfony/finder/tree/v6.4.17" }, "funding": [ { @@ -9107,7 +9105,7 @@ "type": "tidelift" } ], - "time": "2024-10-01T08:30:56+00:00" + "time": "2024-12-29T13:51:37+00:00" }, { "name": "symfony/flex", @@ -9423,23 +9421,23 @@ }, { "name": "symfony/http-client", - "version": "v6.4.16", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "60a113666fa67e598abace38e5f46a0954d8833d" + "reference": "88898d842eb29d7e1a903724c94e90a6ca9c0509" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/60a113666fa67e598abace38e5f46a0954d8833d", - "reference": "60a113666fa67e598abace38e5f46a0954d8833d", + "url": "https://api.github.com/repos/symfony/http-client/zipball/88898d842eb29d7e1a903724c94e90a6ca9c0509", + "reference": "88898d842eb29d7e1a903724c94e90a6ca9c0509", "shasum": "" }, "require": { "php": ">=8.1", "psr/log": "^1|^2|^3", "symfony/deprecation-contracts": "^2.5|^3", - "symfony/http-client-contracts": "~3.4.3|^3.5.1", + "symfony/http-client-contracts": "~3.4.4|^3.5.2", "symfony/service-contracts": "^2.5|^3" }, "conflict": { @@ -9496,7 +9494,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v6.4.16" + "source": "https://github.com/symfony/http-client/tree/v6.4.17" }, "funding": [ { @@ -9512,7 +9510,7 @@ "type": "tidelift" } ], - "time": "2024-11-27T11:52:33+00:00" + "time": "2024-12-18T12:18:31+00:00" }, { "name": "symfony/http-client-contracts", @@ -9671,16 +9669,16 @@ }, { "name": "symfony/http-kernel", - "version": "v6.4.16", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "8838b5b21d807923b893ccbfc2cbeda0f1bc00f0" + "reference": "c5647393c5ce11833d13e4b70fff4b571d4ac710" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8838b5b21d807923b893ccbfc2cbeda0f1bc00f0", - "reference": "8838b5b21d807923b893ccbfc2cbeda0f1bc00f0", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/c5647393c5ce11833d13e4b70fff4b571d4ac710", + "reference": "c5647393c5ce11833d13e4b70fff4b571d4ac710", "shasum": "" }, "require": { @@ -9765,7 +9763,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.4.16" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.17" }, "funding": [ { @@ -9781,7 +9779,7 @@ "type": "tidelift" } ], - "time": "2024-11-27T12:49:36+00:00" + "time": "2024-12-31T14:49:31+00:00" }, { "name": "symfony/intl", @@ -10035,16 +10033,16 @@ }, { "name": "symfony/mime", - "version": "v6.4.13", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "1de1cf14d99b12c7ebbb850491ec6ae3ed468855" + "reference": "ea87c8850a54ff039d3e0ab4ae5586dd4e6c0232" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/1de1cf14d99b12c7ebbb850491ec6ae3ed468855", - "reference": "1de1cf14d99b12c7ebbb850491ec6ae3ed468855", + "url": "https://api.github.com/repos/symfony/mime/zipball/ea87c8850a54ff039d3e0ab4ae5586dd4e6c0232", + "reference": "ea87c8850a54ff039d3e0ab4ae5586dd4e6c0232", "shasum": "" }, "require": { @@ -10100,7 +10098,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.4.13" + "source": "https://github.com/symfony/mime/tree/v6.4.17" }, "funding": [ { @@ -10116,7 +10114,7 @@ "type": "tidelift" } ], - "time": "2024-10-25T15:07:50+00:00" + "time": "2024-12-02T11:09:41+00:00" }, { "name": "symfony/monolog-bridge", @@ -11350,22 +11348,22 @@ }, { "name": "symfony/property-info", - "version": "v7.2.1", + "version": "v7.2.2", "source": { "type": "git", "url": "https://github.com/symfony/property-info.git", - "reference": "65fb9be15380f949d72ff405473cce733364b8b4" + "reference": "1dfeb0dac7a99f7b3be42db9ccc299c5a6483fcf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-info/zipball/65fb9be15380f949d72ff405473cce733364b8b4", - "reference": "65fb9be15380f949d72ff405473cce733364b8b4", + "url": "https://api.github.com/repos/symfony/property-info/zipball/1dfeb0dac7a99f7b3be42db9ccc299c5a6483fcf", + "reference": "1dfeb0dac7a99f7b3be42db9ccc299c5a6483fcf", "shasum": "" }, "require": { "php": ">=8.2", "symfony/string": "^6.4|^7.0", - "symfony/type-info": "^7.1" + "symfony/type-info": "~7.1.9|^7.2.2" }, "conflict": { "phpdocumentor/reflection-docblock": "<5.2", @@ -11413,7 +11411,7 @@ "validator" ], "support": { - "source": "https://github.com/symfony/property-info/tree/v7.2.1" + "source": "https://github.com/symfony/property-info/tree/v7.2.2" }, "funding": [ { @@ -11429,7 +11427,7 @@ "type": "tidelift" } ], - "time": "2024-12-07T08:50:44+00:00" + "time": "2024-12-31T11:04:50+00:00" }, { "name": "symfony/routing", @@ -12024,12 +12022,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -12346,12 +12344,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -12407,16 +12405,16 @@ }, { "name": "symfony/twig-bridge", - "version": "v6.4.16", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "32ec012ed4f6426441a66014471bdb26674744be" + "reference": "238e1aac992b5231c66faf10131ace7bdba97065" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/32ec012ed4f6426441a66014471bdb26674744be", - "reference": "32ec012ed4f6426441a66014471bdb26674744be", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/238e1aac992b5231c66faf10131ace7bdba97065", + "reference": "238e1aac992b5231c66faf10131ace7bdba97065", "shasum": "" }, "require": { @@ -12496,7 +12494,7 @@ "description": "Provides integration for Twig with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/twig-bridge/tree/v6.4.16" + "source": "https://github.com/symfony/twig-bridge/tree/v6.4.17" }, "funding": [ { @@ -12512,20 +12510,20 @@ "type": "tidelift" } ], - "time": "2024-11-25T11:59:11+00:00" + "time": "2024-12-19T14:08:41+00:00" }, { "name": "symfony/type-info", - "version": "v7.2.1", + "version": "v7.2.2", "source": { "type": "git", "url": "https://github.com/symfony/type-info.git", - "reference": "4f402070b08ad0b87e9cadbb07b87fb36061e6e4" + "reference": "3b5a17470fff0034f25fd4287cbdaa0010d2f749" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/type-info/zipball/4f402070b08ad0b87e9cadbb07b87fb36061e6e4", - "reference": "4f402070b08ad0b87e9cadbb07b87fb36061e6e4", + "url": "https://api.github.com/repos/symfony/type-info/zipball/3b5a17470fff0034f25fd4287cbdaa0010d2f749", + "reference": "3b5a17470fff0034f25fd4287cbdaa0010d2f749", "shasum": "" }, "require": { @@ -12571,7 +12569,7 @@ "type" ], "support": { - "source": "https://github.com/symfony/type-info/tree/v7.2.1" + "source": "https://github.com/symfony/type-info/tree/v7.2.2" }, "funding": [ { @@ -12587,7 +12585,7 @@ "type": "tidelift" } ], - "time": "2024-12-11T07:49:41+00:00" + "time": "2024-12-20T13:38:37+00:00" }, { "name": "symfony/uid", @@ -12665,16 +12663,16 @@ }, { "name": "symfony/validator", - "version": "v6.4.16", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "9b0d1988b56511706bc91d96ead39acd77aaf34d" + "reference": "a3c19a0e542d427c207e22242043ef35b5b99a2c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/9b0d1988b56511706bc91d96ead39acd77aaf34d", - "reference": "9b0d1988b56511706bc91d96ead39acd77aaf34d", + "url": "https://api.github.com/repos/symfony/validator/zipball/a3c19a0e542d427c207e22242043ef35b5b99a2c", + "reference": "a3c19a0e542d427c207e22242043ef35b5b99a2c", "shasum": "" }, "require": { @@ -12742,7 +12740,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v6.4.16" + "source": "https://github.com/symfony/validator/tree/v6.4.17" }, "funding": [ { @@ -12758,7 +12756,7 @@ "type": "tidelift" } ], - "time": "2024-11-27T09:48:51+00:00" + "time": "2024-12-29T12:50:19+00:00" }, { "name": "symfony/var-dumper", @@ -12993,16 +12991,16 @@ }, { "name": "twig/twig", - "version": "v3.17.1", + "version": "v3.18.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "677ef8da6497a03048192aeeb5aa3018e379ac71" + "reference": "acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/677ef8da6497a03048192aeeb5aa3018e379ac71", - "reference": "677ef8da6497a03048192aeeb5aa3018e379ac71", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50", + "reference": "acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50", "shasum": "" }, "require": { @@ -13057,7 +13055,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.17.1" + "source": "https://github.com/twigphp/Twig/tree/v3.18.0" }, "funding": [ { @@ -13069,7 +13067,7 @@ "type": "tidelift" } ], - "time": "2024-12-12T09:58:10+00:00" + "time": "2024-12-29T10:51:50+00:00" }, { "name": "voku/anti-xss", @@ -16680,22 +16678,22 @@ }, { "name": "roave/better-reflection", - "version": "6.49.0", + "version": "6.51.0", "source": { "type": "git", "url": "https://github.com/Roave/BetterReflection.git", - "reference": "4241b212140e4689d904bc80c1582f6f83b5dbf0" + "reference": "54c3dfb4fe48711b28f36927af21288681c1bedb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/BetterReflection/zipball/4241b212140e4689d904bc80c1582f6f83b5dbf0", - "reference": "4241b212140e4689d904bc80c1582f6f83b5dbf0", + "url": "https://api.github.com/repos/Roave/BetterReflection/zipball/54c3dfb4fe48711b28f36927af21288681c1bedb", + "reference": "54c3dfb4fe48711b28f36927af21288681c1bedb", "shasum": "" }, "require": { "ext-json": "*", "jetbrains/phpstorm-stubs": "2024.3", - "nikic/php-parser": "^5.3.1", + "nikic/php-parser": "^5.4.0", "php": "~8.2.0 || ~8.3.2 || ~8.4.1" }, "conflict": { @@ -16703,7 +16701,7 @@ }, "require-dev": { "phpbench/phpbench": "^1.3.1", - "phpunit/phpunit": "^11.5.1" + "phpunit/phpunit": "^11.5.2" }, "suggest": { "composer/composer": "Required to use the ComposerSourceLocator" @@ -16743,9 +16741,9 @@ "description": "Better Reflection - an improved code reflection API", "support": { "issues": "https://github.com/Roave/BetterReflection/issues", - "source": "https://github.com/Roave/BetterReflection/tree/6.49.0" + "source": "https://github.com/Roave/BetterReflection/tree/6.51.0" }, - "time": "2024-12-20T18:46:27+00:00" + "time": "2024-12-30T13:22:31+00:00" }, { "name": "sebastian/cli-parser", @@ -18654,7 +18652,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/robotframework-suite-tests.git", - "reference": "dd5c6196ee59078d9f40df932066fa5f4e0ab195" + "reference": "2f2430ac46bbfb933f96fdf57ec4b4b4a586ab12" }, "default-branch": true, "type": "library", @@ -18662,7 +18660,7 @@ "MIT" ], "description": "Automated tests for the Robot Framework", - "time": "2024-12-23T08:27:13+00:00" + "time": "2025-01-03T08:15:29+00:00" }, { "name": "squizlabs/php_codesniffer", From c23e0b0e14b8d3a5acf7d747fdc49e74f4b2674a Mon Sep 17 00:00:00 2001 From: Spryker Bot Date: Tue, 7 Jan 2025 10:31:43 +0000 Subject: [PATCH 2/5] Update composer lock file. --- composer.lock | 85 ++++++++++++++++++++++++++------------------------- 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/composer.lock b/composer.lock index 5cf950fd03..33bd4e5522 100644 --- a/composer.lock +++ b/composer.lock @@ -246,16 +246,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.336.7", + "version": "3.336.9", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "3ebc383239f93d6f1e74573112c9d179070d2620" + "reference": "bbc76138ed66f593dc2ae529c95fe1f794e6d77f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3ebc383239f93d6f1e74573112c9d179070d2620", - "reference": "3ebc383239f93d6f1e74573112c9d179070d2620", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/bbc76138ed66f593dc2ae529c95fe1f794e6d77f", + "reference": "bbc76138ed66f593dc2ae529c95fe1f794e6d77f", "shasum": "" }, "require": { @@ -338,9 +338,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.336.7" + "source": "https://github.com/aws/aws-sdk-php/tree/3.336.9" }, - "time": "2025-01-02T19:07:47+00:00" + "time": "2025-01-06T19:06:42+00:00" }, { "name": "brick/math", @@ -1836,16 +1836,16 @@ }, { "name": "laminas/laminas-filter", - "version": "2.39.0", + "version": "2.40.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-filter.git", - "reference": "515f081cdbea90721bfbffdd15184564b256478e" + "reference": "9b32ba7c45a302ed349bf42061308e854d56e75b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/515f081cdbea90721bfbffdd15184564b256478e", - "reference": "515f081cdbea90721bfbffdd15184564b256478e", + "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/9b32ba7c45a302ed349bf42061308e854d56e75b", + "reference": "9b32ba7c45a302ed349bf42061308e854d56e75b", "shasum": "" }, "require": { @@ -1911,7 +1911,7 @@ "type": "community_bridge" } ], - "time": "2024-10-31T21:18:49+00:00" + "time": "2025-01-06T21:36:57+00:00" }, { "name": "laminas/laminas-servicemanager", @@ -5947,12 +5947,12 @@ "source": { "type": "git", "url": "https://github.com/spryker/composer-merge-plugin.git", - "reference": "70c9edd0895b5f8409085a3bf73365196bfc50f7" + "reference": "81719beed8a8af255100e805e5ebfd33a1ba64d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/composer-merge-plugin/zipball/70c9edd0895b5f8409085a3bf73365196bfc50f7", - "reference": "70c9edd0895b5f8409085a3bf73365196bfc50f7", + "url": "https://api.github.com/repos/spryker/composer-merge-plugin/zipball/81719beed8a8af255100e805e5ebfd33a1ba64d5", + "reference": "81719beed8a8af255100e805e5ebfd33a1ba64d5", "shasum": "" }, "require": { @@ -5990,7 +5990,7 @@ "issues": "https://github.com/spryker/composer-merge-plugin/issues", "source": "https://github.com/spryker/composer-merge-plugin/tree/master" }, - "time": "2024-10-07T23:23:02+00:00" + "time": "2025-01-03T17:41:31+00:00" }, { "name": "spryker/decimal-object", @@ -6341,7 +6341,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "4e08e626860d2c443a0a0172f7fc2d84f144d6ec" + "reference": "596e1b12c4da5eeeec060da4c0d6f066596f63e1" }, "require": { "php": ">=8.1" @@ -7472,7 +7472,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2025-01-03T12:33:25+00:00" + "time": "2025-01-07T10:29:19+00:00" }, { "name": "spryker/spryker-shop", @@ -13399,7 +13399,7 @@ }, { "name": "web-token/jwt-library", - "version": "3.4.6", + "version": "3.4.7", "source": { "type": "git", "url": "https://github.com/web-token/jwt-library.git", @@ -13481,7 +13481,7 @@ ], "support": { "issues": "https://github.com/web-token/jwt-library/issues", - "source": "https://github.com/web-token/jwt-library/tree/3.4.6" + "source": "https://github.com/web-token/jwt-library/tree/3.4.7" }, "funding": [ { @@ -16678,16 +16678,16 @@ }, { "name": "roave/better-reflection", - "version": "6.51.0", + "version": "6.52.0", "source": { "type": "git", "url": "https://github.com/Roave/BetterReflection.git", - "reference": "54c3dfb4fe48711b28f36927af21288681c1bedb" + "reference": "9a39c1f7b03116c553a9e7569e8d0f29fe3d72ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/BetterReflection/zipball/54c3dfb4fe48711b28f36927af21288681c1bedb", - "reference": "54c3dfb4fe48711b28f36927af21288681c1bedb", + "url": "https://api.github.com/repos/Roave/BetterReflection/zipball/9a39c1f7b03116c553a9e7569e8d0f29fe3d72ba", + "reference": "9a39c1f7b03116c553a9e7569e8d0f29fe3d72ba", "shasum": "" }, "require": { @@ -16741,9 +16741,9 @@ "description": "Better Reflection - an improved code reflection API", "support": { "issues": "https://github.com/Roave/BetterReflection/issues", - "source": "https://github.com/Roave/BetterReflection/tree/6.51.0" + "source": "https://github.com/Roave/BetterReflection/tree/6.52.0" }, - "time": "2024-12-30T13:22:31+00:00" + "time": "2025-01-06T21:36:16+00:00" }, { "name": "sebastian/cli-parser", @@ -16917,16 +16917,16 @@ }, { "name": "sebastian/comparator", - "version": "6.2.1", + "version": "6.3.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "43d129d6a0f81c78bee378b46688293eb7ea3739" + "reference": "d4e47a769525c4dd38cea90e5dcd435ddbbc7115" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/43d129d6a0f81c78bee378b46688293eb7ea3739", - "reference": "43d129d6a0f81c78bee378b46688293eb7ea3739", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/d4e47a769525c4dd38cea90e5dcd435ddbbc7115", + "reference": "d4e47a769525c4dd38cea90e5dcd435ddbbc7115", "shasum": "" }, "require": { @@ -16939,6 +16939,9 @@ "require-dev": { "phpunit/phpunit": "^11.4" }, + "suggest": { + "ext-bcmath": "For comparing BcMath\\Number objects" + }, "type": "library", "extra": { "branch-alias": { @@ -16982,7 +16985,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/6.2.1" + "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.0" }, "funding": [ { @@ -16990,7 +16993,7 @@ "type": "github" } ], - "time": "2024-10-31T05:30:08+00:00" + "time": "2025-01-06T10:28:19+00:00" }, { "name": "sebastian/complexity", @@ -18339,12 +18342,12 @@ "source": { "type": "git", "url": "https://github.com/spryker/code-sniffer.git", - "reference": "55ae652f0e3b6ba5a0dc739651243b7b57ebf91a" + "reference": "be31dad00da0af2417a775b1d545c87cb058f2e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/code-sniffer/zipball/55ae652f0e3b6ba5a0dc739651243b7b57ebf91a", - "reference": "55ae652f0e3b6ba5a0dc739651243b7b57ebf91a", + "url": "https://api.github.com/repos/spryker/code-sniffer/zipball/be31dad00da0af2417a775b1d545c87cb058f2e8", + "reference": "be31dad00da0af2417a775b1d545c87cb058f2e8", "shasum": "" }, "require": { @@ -18390,7 +18393,7 @@ "issues": "https://github.com/spryker/code-sniffer/issues", "source": "https://github.com/spryker/code-sniffer" }, - "time": "2024-10-07T04:46:13+00:00" + "time": "2025-01-03T17:43:12+00:00" }, { "name": "spryker/commerce-k6-performance-tests", @@ -18398,7 +18401,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/commerce-k6-performance-tests.git", - "reference": "92b97b10d88a3d1409ff332725d356e36d160172" + "reference": "8721ae68e1a0e4bb17ac664d93c30792083ea827" }, "default-branch": true, "type": "library", @@ -18406,7 +18409,7 @@ "MIT" ], "description": "K6 performance tests", - "time": "2024-12-16T11:15:22+00:00" + "time": "2025-01-06T14:56:47+00:00" }, { "name": "spryker/cypress-tests", @@ -18414,7 +18417,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/cypress-tests.git", - "reference": "8b6cb07dffb30e9767a236f99eafe635b5cfc40f" + "reference": "9804c6002b2e1cedf78027b3540fd0b57cca9856" }, "default-branch": true, "type": "library", @@ -18422,7 +18425,7 @@ "MIT" ], "description": "This repository is dedicated to housing an extensive collection of UI end-to-end tests, meticulously crafted using Cypress for Spryker applications. These tests are designed to thoroughly evaluate the user interface, ensuring that all interactions and visual elements function as intended in real-world scenarios. By leveraging Cypress's advanced browser automation capabilities, this suite provides an efficient and effective means of validating the user experience, confirming the seamless operation and aesthetic integrity of Spryker's front-end components. Our commitment to rigorous UI testing helps maintain the high standard of quality and reliability that Spryker users expect.", - "time": "2024-12-17T09:44:32+00:00" + "time": "2025-01-06T13:29:24+00:00" }, { "name": "spryker/development-core", @@ -18652,7 +18655,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/robotframework-suite-tests.git", - "reference": "2f2430ac46bbfb933f96fdf57ec4b4b4a586ab12" + "reference": "4c9edc1e92d8b904fecb256a0e128cd2c5c124ba" }, "default-branch": true, "type": "library", @@ -18660,7 +18663,7 @@ "MIT" ], "description": "Automated tests for the Robot Framework", - "time": "2025-01-03T08:15:29+00:00" + "time": "2025-01-03T18:54:36+00:00" }, { "name": "squizlabs/php_codesniffer", From df1a0d1a32359a3d7b1f67864f4d76b122fcac66 Mon Sep 17 00:00:00 2001 From: Spryker Bot Date: Tue, 7 Jan 2025 10:53:46 +0000 Subject: [PATCH 3/5] Update composer lock file. --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 33bd4e5522..1ee35cc6fc 100644 --- a/composer.lock +++ b/composer.lock @@ -6341,7 +6341,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "596e1b12c4da5eeeec060da4c0d6f066596f63e1" + "reference": "f1a336bc572acfed3b8f168c74ff2c288f96a8ba" }, "require": { "php": ">=8.1" @@ -7472,7 +7472,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2025-01-07T10:29:19+00:00" + "time": "2025-01-07T10:51:37+00:00" }, { "name": "spryker/spryker-shop", From 978604b0ec331ba43dda3623bbcfa1809c47337d Mon Sep 17 00:00:00 2001 From: Anna Kotiuk <79214317+annakotiuk@users.noreply.github.com> Date: Tue, 7 Jan 2025 17:10:42 +0100 Subject: [PATCH 4/5] FRW-9645 Enable feature development. (#9282) FRW-9645 Enable feature development. --- buddy.yml | 6 +- composer.lock | 4 +- config/Shared/config_default.php | 1 + src/Pyz/Yves/Twig/TwigConfig.php | 1 + ...ntationGeneratorRestApiBusinessFactory.php | 32 +++++++ .../Business/Finder/GlueControllerFinder.php | 93 +++++++++++++++++++ .../DocumentationGeneratorRestApiConfig.php | 3 +- src/Pyz/Zed/Glossary/GlossaryConfig.php | 1 + src/Pyz/Zed/Router/RouterConfig.php | 2 + .../SearchElasticsearchConfig.php | 9 +- src/Pyz/Zed/Transfer/TransferConfig.php | 2 + src/Pyz/Zed/Translator/TranslatorConfig.php | 1 + src/Pyz/Zed/Twig/TwigConfig.php | 23 +++-- .../Zed/ZedNavigation/ZedNavigationConfig.php | 1 + .../PyzTest/Yves/Application/codeception.yml | 2 +- .../config/Shared/config_default.php | 1 + ...modules.sh => ci_check_touched_modules.sh} | 8 +- ...eck_untracked.sh => ci_check_untracked.sh} | 0 tests/touched_modules_list.sh | 12 ++- 19 files changed, 184 insertions(+), 18 deletions(-) create mode 100644 src/Pyz/Zed/DocumentationGeneratorRestApi/Business/DocumentationGeneratorRestApiBusinessFactory.php create mode 100644 src/Pyz/Zed/DocumentationGeneratorRestApi/Business/Finder/GlueControllerFinder.php rename tests/{travis_check_touched_modules.sh => ci_check_touched_modules.sh} (96%) rename tests/{travis_check_untracked.sh => ci_check_untracked.sh} (100%) diff --git a/buddy.yml b/buddy.yml index a8c2401778..4ffc3ea849 100644 --- a/buddy.yml +++ b/buddy.yml @@ -142,8 +142,8 @@ - '.ci/snippet/RUN vendor/bin/phpstan analyze' - '.ci/snippet/RUN vendor/bin/console dev:dependency:find' - '.ci/snippet/RUN vendor/bin/spryker-dev-console dev:deprecation-links:check' - - '.ci/snippet/RUN tests/travis_check_untracked.sh' - - '.ci/snippet/RUN tests/travis_check_touched_modules.sh' + - '.ci/snippet/RUN tests/ci_check_untracked.sh' + - '.ci/snippet/RUN tests/ci_check_touched_modules.sh' - '.ci/snippet/FINISH' shell: 'BASH' run_next_parallel: true @@ -197,6 +197,7 @@ - '.ci/snippet/FINISH' shell: 'BASH' run_next_parallel: true + - action: 'PHP 8.3 PHPStan spryker/spryker-shop' type: 'BUILD' docker_image_name: 'spryker/php' @@ -324,6 +325,7 @@ - '.ci/snippet/FINISH' shell: 'BASH' run_next_parallel: true + - action: 'PHP 8.2 PHPStan spryker/spryker-shop' type: 'BUILD' docker_image_name: 'spryker/php' diff --git a/composer.lock b/composer.lock index 1ee35cc6fc..1721b25252 100644 --- a/composer.lock +++ b/composer.lock @@ -6341,7 +6341,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "f1a336bc572acfed3b8f168c74ff2c288f96a8ba" + "reference": "7d492386fe3db0d90adba5b90457f9389c76cd00" }, "require": { "php": ">=8.1" @@ -7472,7 +7472,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2025-01-07T10:51:37+00:00" + "time": "2025-01-07T16:05:54+00:00" }, { "name": "spryker/spryker-shop", diff --git a/config/Shared/config_default.php b/config/Shared/config_default.php index 5dda6130ad..b56c0d6916 100644 --- a/config/Shared/config_default.php +++ b/config/Shared/config_default.php @@ -166,6 +166,7 @@ ]; $config[KernelConstants::CORE_NAMESPACES] = [ 'SprykerShop', + 'SprykerFeature', 'SprykerEco', 'Spryker', 'SprykerSdk', diff --git a/src/Pyz/Yves/Twig/TwigConfig.php b/src/Pyz/Yves/Twig/TwigConfig.php index af7a8b81f5..e7abb8f9e1 100644 --- a/src/Pyz/Yves/Twig/TwigConfig.php +++ b/src/Pyz/Yves/Twig/TwigConfig.php @@ -25,6 +25,7 @@ protected function addCoreTemplatePaths(array $paths): array $paths = parent::addCoreTemplatePaths($paths); $paths[] = APPLICATION_VENDOR_DIR . '/spryker/spryker/Bundles/%1$s/src/Spryker/Yves/%1$s/Theme/' . $this->getThemeNameDefault(); + $paths[] = APPLICATION_VENDOR_DIR . '/spryker/spryker/Features/%1$s/src/SprykerFeature/Yves/%1$s/Theme/' . $this->getThemeNameDefault(); $paths[] = APPLICATION_VENDOR_DIR . '/spryker/spryker-shop/Bundles/%1$s/src/SprykerShop/Yves/%1$s/Theme/' . $this->getThemeNameDefault(); $paths[] = APPLICATION_VENDOR_DIR . '/spryker-eco/%1$s/src/SprykerEco/Yves/%1$s/Theme/' . $this->getThemeNameDefault(); diff --git a/src/Pyz/Zed/DocumentationGeneratorRestApi/Business/DocumentationGeneratorRestApiBusinessFactory.php b/src/Pyz/Zed/DocumentationGeneratorRestApi/Business/DocumentationGeneratorRestApiBusinessFactory.php new file mode 100644 index 0000000000..11bfb7eca0 --- /dev/null +++ b/src/Pyz/Zed/DocumentationGeneratorRestApi/Business/DocumentationGeneratorRestApiBusinessFactory.php @@ -0,0 +1,32 @@ +getFinder(), + $this->getTextInflector(), + $this->getConfig()->getAnnotationSourceDirectories(), + ); + } +} diff --git a/src/Pyz/Zed/DocumentationGeneratorRestApi/Business/Finder/GlueControllerFinder.php b/src/Pyz/Zed/DocumentationGeneratorRestApi/Business/Finder/GlueControllerFinder.php new file mode 100644 index 0000000000..36b8aa1c57 --- /dev/null +++ b/src/Pyz/Zed/DocumentationGeneratorRestApi/Business/Finder/GlueControllerFinder.php @@ -0,0 +1,93 @@ + + */ + public function getGlueControllerFilesFromPlugin(ResourceRoutePluginInterface $plugin): array + { + $controllerNamespace = $this->getPluginControllerClass($plugin); + $controllerNamespaceExploded = explode('\\', $controllerNamespace); + + $moduleName = array_slice($controllerNamespaceExploded, -3)[0]; + $existingDirectories = $this->getMonoRepositoryControllerSourceDirectories($moduleName, $moduleName); + if (!$existingDirectories) { + $existingDirectories = $this->getMonoRepositoryControllerSourceDirectories( + $this->toSingular($this->removeRestApiSuffix($moduleName)), + $moduleName, + ); + } + + if (!$existingDirectories) { + return []; + } + + $finder = clone $this->finder; + $finder->in($existingDirectories)->name(sprintf(static::PATTERN_CONTROLLER_FILENAME, end($controllerNamespaceExploded))); + + return iterator_to_array($finder); + } + + /** + * @param string $moduleDirectory + * @param string $moduleName + * + * @return array + */ + protected function getMonoRepositoryControllerSourceDirectories(string $moduleDirectory, string $moduleName): array + { + $directories = array_map(function ($directory) use ($moduleDirectory, $moduleName) { + return sprintf($directory, $moduleDirectory, $moduleName); + }, $this->sourceDirectories); + + return $this->getExistingSourceDirectories($directories); + } + + /** + * @param string $moduleName + * + * @return string + */ + protected function removeRestApiSuffix(string $moduleName): string + { + return str_replace('RestApi', '', $moduleName); + } + + /** + * @param string $moduleName + * + * @return string + */ + protected function toSingular(string $moduleName): string + { + $rules = [ + '/(s|x|z|ch|sh)es$/i' => '$1', + '/ies$/i' => 'y', + '/ves$/i' => 'f', + '/s$/i' => '', + ]; + + foreach ($rules as $pattern => $replacement) { + if (preg_match($pattern, $moduleName)) { + return preg_replace($pattern, $replacement, $moduleName); + } + } + + return $moduleName; + } +} diff --git a/src/Pyz/Zed/DocumentationGeneratorRestApi/DocumentationGeneratorRestApiConfig.php b/src/Pyz/Zed/DocumentationGeneratorRestApi/DocumentationGeneratorRestApiConfig.php index f7d5fc62c9..71eced66f3 100644 --- a/src/Pyz/Zed/DocumentationGeneratorRestApi/DocumentationGeneratorRestApiConfig.php +++ b/src/Pyz/Zed/DocumentationGeneratorRestApi/DocumentationGeneratorRestApiConfig.php @@ -21,7 +21,8 @@ class DocumentationGeneratorRestApiConfig extends SprykerDocumentationGeneratorR protected function getCoreAnnotationSourceDirectoryPatterns(): array { return [ - APPLICATION_VENDOR_DIR . '/spryker/spryker/Bundles/%1$s/src/Spryker/Glue/%1$s/Controller/', + APPLICATION_VENDOR_DIR . '/spryker/spryker/Bundles/%1$s/src/Spryker/Glue/%2$s/Controller/', + APPLICATION_VENDOR_DIR . '/spryker/spryker/Features/%1$s/src/SprykerFeature/Glue/%2$s/Controller/', ]; } diff --git a/src/Pyz/Zed/Glossary/GlossaryConfig.php b/src/Pyz/Zed/Glossary/GlossaryConfig.php index 0cd52c8ca8..3495aafc5e 100644 --- a/src/Pyz/Zed/Glossary/GlossaryConfig.php +++ b/src/Pyz/Zed/Glossary/GlossaryConfig.php @@ -36,6 +36,7 @@ private function addSprykerFilePath(array $paths): array $paths = array_merge( $paths, glob(APPLICATION_VENDOR_DIR . '/spryker/spryker/Bundles/*/src/Spryker/*/*/Resources/glossary.yml') ?: [], + glob(APPLICATION_VENDOR_DIR . '/spryker/spryker/Features/*/src/SprykerFeature/*/*/Resources/glossary.yml') ?: [], ); return $paths; diff --git a/src/Pyz/Zed/Router/RouterConfig.php b/src/Pyz/Zed/Router/RouterConfig.php index 72d7626417..3f30066923 100644 --- a/src/Pyz/Zed/Router/RouterConfig.php +++ b/src/Pyz/Zed/Router/RouterConfig.php @@ -35,6 +35,8 @@ public function getControllerDirectories(): array $controllerDirectories[] = sprintf('%s/spryker/%s/Bundles/*/src/%s/Zed/*/Communication/Controller/', APPLICATION_VENDOR_DIR, $filterChain->filter($coreNamespace), $coreNamespace); } + $controllerDirectories[] = sprintf('%s/spryker/spryker/Features/*/src/SprykerFeature/Zed/*/Communication/Controller/', APPLICATION_VENDOR_DIR); + return array_filter($controllerDirectories, 'glob'); } diff --git a/src/Pyz/Zed/SearchElasticsearch/SearchElasticsearchConfig.php b/src/Pyz/Zed/SearchElasticsearch/SearchElasticsearchConfig.php index 44bdab8066..ebe2d891ee 100644 --- a/src/Pyz/Zed/SearchElasticsearch/SearchElasticsearchConfig.php +++ b/src/Pyz/Zed/SearchElasticsearch/SearchElasticsearchConfig.php @@ -21,7 +21,14 @@ class SearchElasticsearchConfig extends SprykerSearchElasticsearchConfig public function getJsonSchemaDefinitionDirectories(): array { $directories = parent::getJsonSchemaDefinitionDirectories(); - $directories[] = sprintf('%s/vendor/spryker/spryker/Bundles/*/src/*/Shared/*/Schema/', APPLICATION_ROOT_DIR); + + if (glob(sprintf('%s/vendor/spryker/spryker/Bundles/*/src/*/Shared/*/Schema/', APPLICATION_ROOT_DIR), GLOB_NOSORT | GLOB_ONLYDIR)) { + $directories[] = sprintf('%s/vendor/spryker/spryker/Bundles/*/src/*/Shared/*/Schema/', APPLICATION_ROOT_DIR); + } + + if (glob(sprintf('%s/vendor/spryker/spryker/Features/*/src/*/Shared/*/Schema/', APPLICATION_ROOT_DIR))) { + $directories[] = sprintf('%s/vendor/spryker/spryker/Features/*/src/*/Shared/*/Schema/', APPLICATION_ROOT_DIR); + } return $directories; } diff --git a/src/Pyz/Zed/Transfer/TransferConfig.php b/src/Pyz/Zed/Transfer/TransferConfig.php index ca1b42299b..1c14c28c00 100644 --- a/src/Pyz/Zed/Transfer/TransferConfig.php +++ b/src/Pyz/Zed/Transfer/TransferConfig.php @@ -23,6 +23,7 @@ protected function getCoreSourceDirectoryGlobPatterns(): array { $directoryGlobPatterns = parent::getCoreSourceDirectoryGlobPatterns(); $directoryGlobPatterns[] = APPLICATION_VENDOR_DIR . '/spryker/spryker/Bundles/*/src/Spryker/Shared/*/Transfer/'; + $directoryGlobPatterns[] = APPLICATION_VENDOR_DIR . '/spryker/spryker/Features/*/src/SprykerFeature/Shared/*/Transfer/'; $directoryGlobPatterns[] = APPLICATION_VENDOR_DIR . '/spryker/spryker-shop/Bundles/*/src/SprykerShop/Shared/*/Transfer/'; $directoryGlobPatterns[] = APPLICATION_VENDOR_DIR . '/spryker/rabbit-mq/src/*/Shared/*/Transfer/'; $directoryGlobPatterns[] = APPLICATION_VENDOR_DIR . '/spryker-eco/*/src/*/Shared/*/Transfer/'; @@ -40,6 +41,7 @@ public function getDataBuilderSourceDirectories(): array { $globPatterns = parent::getDataBuilderSourceDirectories(); $globPatterns[] = APPLICATION_VENDOR_DIR . '/spryker/spryker/Bundles/*/tests/_data/'; + $globPatterns[] = APPLICATION_VENDOR_DIR . '/spryker/spryker/Features/*/tests/_data/'; return $globPatterns; } diff --git a/src/Pyz/Zed/Translator/TranslatorConfig.php b/src/Pyz/Zed/Translator/TranslatorConfig.php index 8569384bfb..6f59f451ad 100644 --- a/src/Pyz/Zed/Translator/TranslatorConfig.php +++ b/src/Pyz/Zed/Translator/TranslatorConfig.php @@ -22,6 +22,7 @@ public function getCoreTranslationFilePathPatterns(): array { $coreTranslationFilePathPatterns = parent::getCoreTranslationFilePathPatterns(); $coreTranslationFilePathPatterns[] = APPLICATION_VENDOR_DIR . '/spryker/spryker/Bundles/*/data/translation/Zed/[a-z][a-z]_[A-Z][A-Z].csv'; + $coreTranslationFilePathPatterns[] = APPLICATION_VENDOR_DIR . '/spryker/spryker/Features/*/data/translation/Zed/[a-z][a-z]_[A-Z][A-Z].csv'; return $coreTranslationFilePathPatterns; } diff --git a/src/Pyz/Zed/Twig/TwigConfig.php b/src/Pyz/Zed/Twig/TwigConfig.php index 4a178ba1b5..ec2ffe9307 100644 --- a/src/Pyz/Zed/Twig/TwigConfig.php +++ b/src/Pyz/Zed/Twig/TwigConfig.php @@ -37,6 +37,7 @@ public function getZedDirectoryPathPatterns(): array { $directories = array_merge( glob('vendor/spryker/spryker/Bundles/*/src/*/Zed/*/Presentation', GLOB_NOSORT | GLOB_ONLYDIR) ?: [], + glob('vendor/spryker/spryker/Features/*/src/*/Zed/*/Presentation', GLOB_NOSORT | GLOB_ONLYDIR) ?: [], glob('vendor/spryker/spryker-shop/Bundles/*/src/*/Zed/*/Presentation', GLOB_NOSORT | GLOB_ONLYDIR) ?: [], ); @@ -57,14 +58,24 @@ public function getZedDirectoryPathPatterns(): array */ public function getYvesDirectoryPathPatterns(): array { - $themeNameDefault = $this->getSharedConfig()->getYvesThemeNameDefault(); - $directories = glob(APPLICATION_VENDOR_DIR . '/*/*/Bundles/*/src/*/Yves/*/Theme/' . $themeNameDefault, GLOB_NOSORT | GLOB_ONLYDIR) ?: []; - - $directories = array_merge( - $directories, + return array_merge( + $this->getPyzYvesDirectoryPathPatterns(), parent::getYvesDirectoryPathPatterns(), ); + } - return $directories; + /** + * @project Only needed in Project, not in demoshop + * + * @return array + */ + protected function getPyzYvesDirectoryPathPatterns(): array + { + $themeNameDefault = $this->getSharedConfig()->getYvesThemeNameDefault(); + + $bundleDirectories = glob(APPLICATION_VENDOR_DIR . '/*/*/Bundles/*/src/*/Yves/*/Theme/' . $themeNameDefault, GLOB_NOSORT | GLOB_ONLYDIR) ?: []; + $featuresDirectories = glob(APPLICATION_VENDOR_DIR . '/*/*/Features/*/src/*/Yves/*/Theme/' . $themeNameDefault, GLOB_NOSORT | GLOB_ONLYDIR) ?: []; + + return array_merge($bundleDirectories, $featuresDirectories); } } diff --git a/src/Pyz/Zed/ZedNavigation/ZedNavigationConfig.php b/src/Pyz/Zed/ZedNavigation/ZedNavigationConfig.php index 2ac1572799..a1de3725e8 100644 --- a/src/Pyz/Zed/ZedNavigation/ZedNavigationConfig.php +++ b/src/Pyz/Zed/ZedNavigation/ZedNavigationConfig.php @@ -50,6 +50,7 @@ public function getNavigationSchemaPathPattern(): array private function addSprykerFilePath(array $paths): array { $paths[] = APPLICATION_VENDOR_DIR . '/spryker/spryker/Bundles/*/src/*/Zed/*/Communication'; + $paths[] = APPLICATION_VENDOR_DIR . '/spryker/spryker/Features/*/src/*/Zed/*/Communication'; return $paths; } diff --git a/tests/PyzTest/Yves/Application/codeception.yml b/tests/PyzTest/Yves/Application/codeception.yml index 8d13cfec57..3a0e6c34fd 100644 --- a/tests/PyzTest/Yves/Application/codeception.yml +++ b/tests/PyzTest/Yves/Application/codeception.yml @@ -30,6 +30,6 @@ suites: - \SprykerTest\Shared\Testify\Helper\ConfigHelper - \SprykerTest\Shared\Testify\Helper\LocatorHelper: projectNamespaces: ['Pyz'] - coreNamespaces: ['SprykerShop', 'Spryker', 'SprykerEco', 'SprykerSdk'] + coreNamespaces: ['SprykerShop', 'Spryker', 'SprykerEco', 'SprykerSdk', 'SprykerFeature'] - \SprykerTest\Shared\Testify\Helper\DependencyHelper - \SprykerTest\Shared\Propel\Helper\TransactionHelper diff --git a/tests/PyzTest/Zed/Console/_data/cli_sandbox/config/Shared/config_default.php b/tests/PyzTest/Zed/Console/_data/cli_sandbox/config/Shared/config_default.php index 2f75a682e3..432835e2a0 100644 --- a/tests/PyzTest/Zed/Console/_data/cli_sandbox/config/Shared/config_default.php +++ b/tests/PyzTest/Zed/Console/_data/cli_sandbox/config/Shared/config_default.php @@ -43,6 +43,7 @@ 'SprykerShop', 'SprykerEco', 'Spryker', + 'SprykerFeature', ]; $config[KernelConstants::PROJECT_NAMESPACE] = 'Pyz'; diff --git a/tests/travis_check_touched_modules.sh b/tests/ci_check_touched_modules.sh similarity index 96% rename from tests/travis_check_touched_modules.sh rename to tests/ci_check_touched_modules.sh index 64e94d026a..3c7e61fc41 100755 --- a/tests/travis_check_touched_modules.sh +++ b/tests/ci_check_touched_modules.sh @@ -34,8 +34,8 @@ validateModuleTransfers() { let "TRANSFER_TOTAL_MODULES_PROCESSED_COUNT+=1" - echo $2.$module - output=$(vendor/bin/spryker-dev-console dev:validate-module-transfers -v -m $2.$module) + echo $module + output=$(vendor/bin/spryker-dev-console dev:validate-module-transfers -v -m $module) if [ $? -ne 0 ]; then echo $output EXITCODE=1 @@ -63,8 +63,8 @@ validateModuleArchitecture() { let "ARCHITECTURE_TOTAL_MODULES_PROCESSED_COUNT+=1" - echo $2.$module - output=$(vendor/bin/console code:sniff:architecture -v -m $2.$module) + echo $module + output=$(vendor/bin/console code:sniff:architecture -v -m $module) if [ $? -ne 0 ]; then echo $output EXITCODE=1 diff --git a/tests/travis_check_untracked.sh b/tests/ci_check_untracked.sh similarity index 100% rename from tests/travis_check_untracked.sh rename to tests/ci_check_untracked.sh diff --git a/tests/touched_modules_list.sh b/tests/touched_modules_list.sh index cf8a71aa27..a66570dfd3 100755 --- a/tests/touched_modules_list.sh +++ b/tests/touched_modules_list.sh @@ -1 +1,11 @@ -echo $(git -C vendor/spryker/$1 diff --name-only --diff-filter=ACMRTUXB master... | grep "^Bundles\/" | cut -d "/" -f2- | cut -d "/" -f1 | sort | uniq) +modules=$(git -C vendor/spryker/$1 diff --name-only --diff-filter=ACMRTUXB master... | grep -E "^Bundles\/|^Features\/" | cut -d "/" -f2- | cut -d "/" -f1 | sort | uniq) + +for module in $modules; do + if git -C vendor/spryker/$1 diff --name-only --diff-filter=ACMRTUXB master... | grep -q "^Bundles\/$module"; then + echo "Spryker.$module" + elif git -C vendor/spryker/$1 diff --name-only --diff-filter=ACMRTUXB master... | grep -q "^Features\/$module"; then + if [[ -d "Features/$module/src/" || -d "Features/$module/tests/" ]]; then + echo "SprykerFeature.$module" + fi + fi +done From 954c0a83a3779c67649c8665d3b4cfecd12cb264 Mon Sep 17 00:00:00 2001 From: Spryker Bot Date: Tue, 7 Jan 2025 16:18:23 +0000 Subject: [PATCH 5/5] FRW-9645 Merge nonsplit/master. --- composer.lock | 74 +++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/composer.lock b/composer.lock index 96aca5605b..b354639895 100644 --- a/composer.lock +++ b/composer.lock @@ -18796,16 +18796,16 @@ }, { "name": "spryker/application", - "version": "3.36.0", + "version": "3.36.1", "source": { "type": "git", "url": "https://github.com/spryker/application.git", - "reference": "05f84ec7998d359c04294ae54fca6fa9b8d9f6be" + "reference": "d783bfe7cb378129fe20d423e0138b94c3042664" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/application/zipball/05f84ec7998d359c04294ae54fca6fa9b8d9f6be", - "reference": "05f84ec7998d359c04294ae54fca6fa9b8d9f6be", + "url": "https://api.github.com/repos/spryker/application/zipball/d783bfe7cb378129fe20d423e0138b94c3042664", + "reference": "d783bfe7cb378129fe20d423e0138b94c3042664", "shasum": "" }, "require": { @@ -18858,9 +18858,9 @@ ], "description": "Application module", "support": { - "source": "https://github.com/spryker/application/tree/3.36.0" + "source": "https://github.com/spryker/application/tree/3.36.1" }, - "time": "2024-11-04T14:07:47+00:00" + "time": "2025-01-07T16:05:54+00:00" }, { "name": "spryker/application-extension", @@ -43072,20 +43072,20 @@ }, { "name": "spryker/module-finder", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/spryker/module-finder.git", - "reference": "ee25ba055d2b4af7c80b2c7d3d8800c7d21a78fa" + "reference": "3ee68a0b38e18182647841664c242e86ebab9151" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/module-finder/zipball/ee25ba055d2b4af7c80b2c7d3d8800c7d21a78fa", - "reference": "ee25ba055d2b4af7c80b2c7d3d8800c7d21a78fa", + "url": "https://api.github.com/repos/spryker/module-finder/zipball/3ee68a0b38e18182647841664c242e86ebab9151", + "reference": "3ee68a0b38e18182647841664c242e86ebab9151", "shasum": "" }, "require": { - "php": ">=7.4", + "php": ">=8.2", "spryker/kernel": "^3.33.0", "spryker/laminas": "^1.0.0", "spryker/symfony": "^3.2.0" @@ -43111,9 +43111,9 @@ ], "description": "ModuleFinder module", "support": { - "source": "https://github.com/spryker/module-finder/tree/1.2.0" + "source": "https://github.com/spryker/module-finder/tree/1.3.0" }, - "time": "2021-10-21T12:10:34+00:00" + "time": "2025-01-07T16:05:54+00:00" }, { "name": "spryker/money", @@ -61236,16 +61236,16 @@ }, { "name": "spryker/router", - "version": "1.22.0", + "version": "1.23.0", "source": { "type": "git", "url": "https://github.com/spryker/router.git", - "reference": "fac365d14ce148c643241d4852d7264444926c76" + "reference": "884dbda6c5e728980b97390975c256d3517db598" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/router/zipball/fac365d14ce148c643241d4852d7264444926c76", - "reference": "fac365d14ce148c643241d4852d7264444926c76", + "url": "https://api.github.com/repos/spryker/router/zipball/884dbda6c5e728980b97390975c256d3517db598", + "reference": "884dbda6c5e728980b97390975c256d3517db598", "shasum": "" }, "require": { @@ -61292,9 +61292,9 @@ ], "description": "Router module", "support": { - "source": "https://github.com/spryker/router/tree/1.22.0" + "source": "https://github.com/spryker/router/tree/1.23.0" }, - "time": "2024-11-28T15:34:08+00:00" + "time": "2025-01-07T16:05:54+00:00" }, { "name": "spryker/router-extension", @@ -70803,16 +70803,16 @@ }, { "name": "spryker/testify", - "version": "3.57.0", + "version": "3.58.0", "source": { "type": "git", "url": "https://github.com/spryker/testify.git", - "reference": "ce3236d47e23d427e6e4972bcd93b998f1e8e829" + "reference": "124f9090c9d819d579793794ebe70b322d75e8c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/testify/zipball/ce3236d47e23d427e6e4972bcd93b998f1e8e829", - "reference": "ce3236d47e23d427e6e4972bcd93b998f1e8e829", + "url": "https://api.github.com/repos/spryker/testify/zipball/124f9090c9d819d579793794ebe70b322d75e8c8", + "reference": "124f9090c9d819d579793794ebe70b322d75e8c8", "shasum": "" }, "require": { @@ -70874,9 +70874,9 @@ ], "description": "Testify module", "support": { - "source": "https://github.com/spryker/testify/tree/3.57.0" + "source": "https://github.com/spryker/testify/tree/3.58.0" }, - "time": "2024-11-18T13:28:47+00:00" + "time": "2025-01-07T16:05:54+00:00" }, { "name": "spryker/testify-async-api", @@ -71188,16 +71188,16 @@ }, { "name": "spryker/twig", - "version": "3.25.1", + "version": "3.26.0", "source": { "type": "git", "url": "https://github.com/spryker/twig.git", - "reference": "211af00512f740341689cfd09f842a3042ca26b8" + "reference": "3fbfeb4b5a38bbdfe9fb3ed235a0462e7807ea40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/twig/zipball/211af00512f740341689cfd09f842a3042ca26b8", - "reference": "211af00512f740341689cfd09f842a3042ca26b8", + "url": "https://api.github.com/repos/spryker/twig/zipball/3fbfeb4b5a38bbdfe9fb3ed235a0462e7807ea40", + "reference": "3fbfeb4b5a38bbdfe9fb3ed235a0462e7807ea40", "shasum": "" }, "require": { @@ -71243,9 +71243,9 @@ ], "description": "Twig module", "support": { - "source": "https://github.com/spryker/twig/tree/3.25.1" + "source": "https://github.com/spryker/twig/tree/3.26.0" }, - "time": "2024-12-12T18:25:19+00:00" + "time": "2025-01-07T16:05:54+00:00" }, { "name": "spryker/twig-extension", @@ -82984,16 +82984,16 @@ }, { "name": "spryker/development", - "version": "3.40.1", + "version": "3.41.0", "source": { "type": "git", "url": "https://github.com/spryker/development.git", - "reference": "2123aa9425ac84ac24510603de64fc148a687883" + "reference": "6e85228bc1e95a625c4dc5fe4d71ea0112d52f35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/development/zipball/2123aa9425ac84ac24510603de64fc148a687883", - "reference": "2123aa9425ac84ac24510603de64fc148a687883", + "url": "https://api.github.com/repos/spryker/development/zipball/6e85228bc1e95a625c4dc5fe4d71ea0112d52f35", + "reference": "6e85228bc1e95a625c4dc5fe4d71ea0112d52f35", "shasum": "" }, "require": { @@ -83040,9 +83040,9 @@ ], "description": "Development module", "support": { - "source": "https://github.com/spryker/development/tree/3.40.1" + "source": "https://github.com/spryker/development/tree/3.41.0" }, - "time": "2024-11-11T15:26:08+00:00" + "time": "2025-01-07T16:05:54+00:00" }, { "name": "spryker/docker-chromedriver",