From 360af7aa8cb61345dd560c2b63ce3efe0d28a737 Mon Sep 17 00:00:00 2001 From: Igor Mukhin Date: Tue, 21 Dec 2021 23:29:53 +0200 Subject: [PATCH 1/5] Allowed: SF5.3 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 36ffba4..4ece23a 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "doctrine/dbal": "^2.10.2", "doctrine/orm": "^2.6", "facebook/php-business-sdk": "^12.0", - "fzaninotto/faker": "^1.6", + "fakerphp/faker": "^1.6", "knplabs/knp-menu": "^3.0", "psr/log": "^1.1", "setono/bot-detection-bundle": "^1.1", @@ -30,7 +30,7 @@ "symfony/dependency-injection": "^4.4 || ^5.0", "symfony/event-dispatcher": "^4.4 || ^5.0", "symfony/form": "^4.4 || ^5.0", - "symfony/http-client": "^5.3", + "symfony/http-client": "^4.4 || ^5.3", "symfony/http-client-contracts": "^2.4", "symfony/http-foundation": "^4.4 || ^5.0.7", "symfony/http-kernel": "^4.4 || ^5.1.5", From af013715d9441bbc6faf92fbf536ee60fa1ea311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20L=C3=B8vgaard?= Date: Mon, 24 Jan 2022 14:02:57 +0100 Subject: [PATCH 2/5] Remove symfony/security --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 4ece23a..453551d 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,6 @@ "symfony/lock": "^4.4 || ^5.0", "symfony/options-resolver": "^4.4 || ^5.0", "symfony/routing": "^4.4 || ^5.0", - "symfony/security": "^4.4 || ^5.0", "symfony/security-bundle": "^4.4 || ^5.0", "symfony/uid": "^4.4 || ^5.0", "symfony/workflow": "^4.4 || ^5.0", From 3f0b6975a3657b21b9f772d7167167ea9d36bcff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20L=C3=B8vgaard?= Date: Mon, 24 Jan 2022 14:03:55 +0100 Subject: [PATCH 3/5] Fix more deps --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 453551d..5ea1680 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "setono/sylius-facebook-plugin", - "type": "symfony-bundle", + "type": "sylius-plugin", "description": "Sylius plugin that tracks visitors and sends the data to Facebook", "keywords": [ "sylius", @@ -30,7 +30,7 @@ "symfony/dependency-injection": "^4.4 || ^5.0", "symfony/event-dispatcher": "^4.4 || ^5.0", "symfony/form": "^4.4 || ^5.0", - "symfony/http-client": "^4.4 || ^5.3", + "symfony/http-client": "^4.4 || ^5.0", "symfony/http-client-contracts": "^2.4", "symfony/http-foundation": "^4.4 || ^5.0.7", "symfony/http-kernel": "^4.4 || ^5.1.5", From 93271146cdacd3e976ed89f30680689d89d10084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20L=C3=B8vgaard?= Date: Mon, 24 Jan 2022 14:06:11 +0100 Subject: [PATCH 4/5] Fix direct deps --- composer-require-checker.json | 82 ++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/composer-require-checker.json b/composer-require-checker.json index 2e8c30b..c124c66 100644 --- a/composer-require-checker.json +++ b/composer-require-checker.json @@ -1,42 +1,44 @@ { - "symbol-whitelist": [ - "array", - "bool", - "callable", - "false", - "float", - "int", - "iterable", - "null", - "object", - "parent", - "self", - "static", - "string", - "true", - "void", - "Sylius\\Bundle\\CoreBundle\\Application\\SyliusPluginTrait", - "Sylius\\Bundle\\ChannelBundle\\Form\\Type\\ChannelChoiceType", - "Sylius\\Bundle\\CoreBundle\\Fixture\\AbstractResourceFixture", - "Sylius\\Bundle\\CoreBundle\\Fixture\\Factory\\AbstractExampleFactory", - "Sylius\\Bundle\\CoreBundle\\Fixture\\OptionsResolver\\LazyOption", - "Sylius\\Bundle\\UiBundle\\Menu\\Event\\MenuBuilderEvent", - "Sylius\\Component\\Channel\\Context\\ChannelContextInterface", - "Sylius\\Component\\Channel\\Model\\ChannelInterface", - "Sylius\\Component\\Channel\\Model\\ChannelsAwareInterface", - "Sylius\\Component\\Channel\\Repository\\ChannelRepositoryInterface", - "Sylius\\Component\\Customer\\Model\\CustomerInterface", - "Sylius\\Component\\Core\\Model\\CustomerInterface", - "Sylius\\Component\\Core\\Model\\OrderInterface", - "Sylius\\Component\\Core\\Model\\OrderItemInterface", - "Sylius\\Component\\Core\\Model\\ProductInterface", - "Sylius\\Component\\Core\\Model\\TaxonInterface", - "Sylius\\Component\\Locale\\Context\\LocaleContextInterface", - "Sylius\\Component\\Order\\Context\\CartContextInterface", - "Sylius\\Component\\Order\\Model\\OrderInterface", - "Sylius\\Component\\Order\\Repository\\OrderRepositoryInterface", - "Sylius\\Component\\Product\\Model\\ProductInterface", - "Sylius\\Component\\Taxonomy\\Model\\TaxonInterface", - "Sylius\\Component\\Taxonomy\\Repository\\TaxonRepositoryInterface" - ] + "symbol-whitelist": [ + "array", + "bool", + "callable", + "false", + "float", + "int", + "iterable", + "null", + "object", + "parent", + "self", + "static", + "string", + "true", + "void", + "Sylius\\Bundle\\ChannelBundle\\Form\\Type\\ChannelChoiceType", + "Sylius\\Bundle\\CoreBundle\\Application\\SyliusPluginTrait", + "Sylius\\Bundle\\CoreBundle\\Fixture\\AbstractResourceFixture", + "Sylius\\Bundle\\CoreBundle\\Fixture\\Factory\\AbstractExampleFactory", + "Sylius\\Bundle\\CoreBundle\\Fixture\\OptionsResolver\\LazyOption", + "Sylius\\Bundle\\UiBundle\\Menu\\Event\\MenuBuilderEvent", + "Sylius\\Component\\Channel\\Context\\ChannelContextInterface", + "Sylius\\Component\\Channel\\Model\\ChannelInterface", + "Sylius\\Component\\Channel\\Model\\ChannelsAwareInterface", + "Sylius\\Component\\Channel\\Repository\\ChannelRepositoryInterface", + "Sylius\\Component\\Core\\Model\\CustomerInterface", + "Sylius\\Component\\Core\\Model\\OrderInterface", + "Sylius\\Component\\Core\\Model\\OrderItemInterface", + "Sylius\\Component\\Core\\Model\\ProductInterface", + "Sylius\\Component\\Core\\Model\\TaxonInterface", + "Sylius\\Component\\Customer\\Model\\CustomerInterface", + "Sylius\\Component\\Locale\\Context\\LocaleContextInterface", + "Sylius\\Component\\Order\\Context\\CartContextInterface", + "Sylius\\Component\\Order\\Model\\OrderInterface", + "Sylius\\Component\\Order\\Repository\\OrderRepositoryInterface", + "Sylius\\Component\\Product\\Model\\ProductInterface", + "Sylius\\Component\\Taxonomy\\Model\\TaxonInterface", + "Sylius\\Component\\Taxonomy\\Repository\\TaxonRepositoryInterface", + "Symfony\\Component\\Security\\Csrf\\CsrfToken", + "Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface" + ] } From c3b5f05f5f29912f35d3ee807b29a90f72823658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20L=C3=B8vgaard?= Date: Mon, 24 Jan 2022 14:07:15 +0100 Subject: [PATCH 5/5] Normalize --- composer.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 5ea1680..f50ecce 100644 --- a/composer.json +++ b/composer.json @@ -1,14 +1,14 @@ { "name": "setono/sylius-facebook-plugin", - "type": "sylius-plugin", "description": "Sylius plugin that tracks visitors and sends the data to Facebook", + "license": "MIT", + "type": "sylius-plugin", "keywords": [ "sylius", "sylius-plugin", "setono", "facebook" ], - "license": "MIT", "require": { "php": ">=7.4", "ext-json": "*", @@ -61,14 +61,7 @@ "symfony/intl": "^4.4 || ^5.0", "symfony/web-profiler-bundle": "^5.0" }, - "config": { - "sort-packages": true - }, - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, + "prefer-stable": true, "autoload": { "psr-4": { "Setono\\SyliusFacebookPlugin\\": "src/" @@ -82,7 +75,14 @@ "tests/Application/Kernel.php" ] }, - "prefer-stable": true, + "config": { + "sort-packages": true + }, + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, "scripts": { "analyse": [ "@ensure-test-container-exists",