From 1376307bcf196860fbeb5dad555b22d48c591f41 Mon Sep 17 00:00:00 2001 From: Kamil Kokot Date: Mon, 31 Dec 2018 13:49:05 +0100 Subject: [PATCH 1/7] Update PhpSpec to ^5.0 --- composer.json | 4 ++-- phpstan.neon | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 55a49340bff..47d5bbb0bb4 100644 --- a/composer.json +++ b/composer.json @@ -71,7 +71,7 @@ "zendframework/zend-stdlib": "^3.1" }, "require-dev": { - "akeneo/phpspec-skip-example-extension": "^3.0", + "akeneo/phpspec-skip-example-extension": "^4.0", "behat/behat": "^3.2", "behat/mink": "^1.7@dev", "behat/mink-browserkit-driver": "^1.3", @@ -90,7 +90,7 @@ "matthiasnoback/symfony-dependency-injection-test": "^2.0", "mikey179/vfsStream": "^1.6", "pamil/prophecy-common": "^0.1", - "phpspec/phpspec": "^4.0", + "phpspec/phpspec": "^5.0", "phpstan/phpstan-doctrine": "^0.10", "phpstan/phpstan-shim": "^0.10", "phpstan/phpstan-symfony": "^0.10", diff --git a/phpstan.neon b/phpstan.neon index 88debf497a5..b20cc6443c2 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -7,14 +7,13 @@ parameters: reportUnmatchedIgnoredErrors: false symfony: - container_xml_path: var/cache/dev/appDevDebugProjectContainer.xml + container_xml_path: var/cache/dev/appAppKernelDevDebugContainer.xml excludes_analyse: # Makes PHPStan crash - '**/DependencyInjection/Configuration.php' # Test dependencies - - '**/spec/**.php' - '**/Bundle/*/test/app/**.php' - '**/Bundle/*/test/src/**.php' From 7913eeb3c99f2ec41f6db68762ad87f41afe7115 Mon Sep 17 00:00:00 2001 From: Kamil Kokot Date: Mon, 31 Dec 2018 13:49:36 +0100 Subject: [PATCH 2/7] Setup spec paths in autoload-dev in the main package --- composer.json | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 47d5bbb0bb4..f57c451d049 100644 --- a/composer.json +++ b/composer.json @@ -190,7 +190,57 @@ }, "autoload-dev": { "psr-4": { - "Sylius\\Tests\\": "tests/" + "Sylius\\Tests\\": "tests/", + "spec\\Sylius\\Behat\\": "src/Sylius/Behat/spec/", + "spec\\Sylius\\Component\\Addressing\\": "src/Sylius/Component/Addressing/spec/", + "spec\\Sylius\\Component\\Attribute\\": "src/Sylius/Component/Attribute/spec/", + "spec\\Sylius\\Component\\Channel\\": "src/Sylius/Component/Channel/spec/", + "spec\\Sylius\\Component\\Core\\": "src/Sylius/Component/Core/spec/", + "spec\\Sylius\\Component\\Currency\\": "src/Sylius/Component/Currency/spec/", + "spec\\Sylius\\Component\\Customer\\": "src/Sylius/Component/Customer/spec/", + "spec\\Sylius\\Component\\Grid\\": "src/Sylius/Component/Grid/spec/", + "spec\\Sylius\\Component\\Inventory\\": "src/Sylius/Component/Inventory/spec/", + "spec\\Sylius\\Component\\Locale\\": "src/Sylius/Component/Locale/spec/", + "spec\\Sylius\\Component\\Mailer\\": "src/Sylius/Component/Mailer/spec/", + "spec\\Sylius\\Component\\Order\\": "src/Sylius/Component/Order/spec/", + "spec\\Sylius\\Component\\Payment\\": "src/Sylius/Component/Payment/spec/", + "spec\\Sylius\\Component\\Product\\": "src/Sylius/Component/Product/spec/", + "spec\\Sylius\\Component\\Promotion\\": "src/Sylius/Component/Promotion/spec/", + "spec\\Sylius\\Component\\Registry\\": "src/Sylius/Component/Registry/spec/", + "spec\\Sylius\\Component\\Resource\\": "src/Sylius/Component/Resource/spec/", + "spec\\Sylius\\Component\\Review\\": "src/Sylius/Component/Review/spec/", + "spec\\Sylius\\Component\\Shipping\\": "src/Sylius/Component/Shipping/spec/", + "spec\\Sylius\\Component\\Taxation\\": "src/Sylius/Component/Taxation/spec/", + "spec\\Sylius\\Component\\Taxonomy\\": "src/Sylius/Component/Taxonomy/spec/", + "spec\\Sylius\\Component\\User\\": "src/Sylius/Component/User/spec/", + "spec\\Sylius\\Bundle\\AddressingBundle\\": "src/Sylius/Bundle/AddressingBundle/spec/", + "spec\\Sylius\\Bundle\\AdminApiBundle\\": "src/Sylius/Bundle/AdminApiBundle/spec/", + "spec\\Sylius\\Bundle\\AdminBundle\\": "src/Sylius/Bundle/AdminBundle/spec/", + "spec\\Sylius\\Bundle\\AttributeBundle\\": "src/Sylius/Bundle/AttributeBundle/spec/", + "spec\\Sylius\\Bundle\\ChannelBundle\\": "src/Sylius/Bundle/ChannelBundle/spec/", + "spec\\Sylius\\Bundle\\CoreBundle\\": "src/Sylius/Bundle/CoreBundle/spec/", + "spec\\Sylius\\Bundle\\CurrencyBundle\\": "src/Sylius/Bundle/CurrencyBundle/spec/", + "spec\\Sylius\\Bundle\\CustomerBundle\\": "src/Sylius/Bundle/CustomerBundle/spec/", + "spec\\Sylius\\Bundle\\FixturesBundle\\": "src/Sylius/Bundle/FixturesBundle/spec/", + "spec\\Sylius\\Bundle\\GridBundle\\": "src/Sylius/Bundle/GridBundle/spec/", + "spec\\Sylius\\Bundle\\InventoryBundle\\": "src/Sylius/Bundle/InventoryBundle/spec/", + "spec\\Sylius\\Bundle\\LocaleBundle\\": "src/Sylius/Bundle/LocaleBundle/spec/", + "spec\\Sylius\\Bundle\\MailerBundle\\": "src/Sylius/Bundle/MailerBundle/spec/", + "spec\\Sylius\\Bundle\\MoneyBundle\\": "src/Sylius/Bundle/MoneyBundle/spec/", + "spec\\Sylius\\Bundle\\OrderBundle\\": "src/Sylius/Bundle/OrderBundle/spec/", + "spec\\Sylius\\Bundle\\PaymentBundle\\": "src/Sylius/Bundle/PaymentBundle/spec/", + "spec\\Sylius\\Bundle\\PayumBundle\\": "src/Sylius/Bundle/PayumBundle/spec/", + "spec\\Sylius\\Bundle\\ProductBundle\\": "src/Sylius/Bundle/ProductBundle/spec/", + "spec\\Sylius\\Bundle\\PromotionBundle\\": "src/Sylius/Bundle/PromotionBundle/spec/", + "spec\\Sylius\\Bundle\\ResourceBundle\\": "src/Sylius/Bundle/ResourceBundle/spec/", + "spec\\Sylius\\Bundle\\ReviewBundle\\": "src/Sylius/Bundle/ReviewBundle/spec/", + "spec\\Sylius\\Bundle\\ShippingBundle\\": "src/Sylius/Bundle/ShippingBundle", + "spec\\Sylius\\Bundle\\ShopBundle\\": "src/Sylius/Bundle/ShopBundle/spec/", + "spec\\Sylius\\Bundle\\TaxationBundle\\": "src/Sylius/Bundle/TaxationBundle/spec/", + "spec\\Sylius\\Bundle\\TaxonomyBundle\\": "src/Sylius/Bundle/TaxonomyBundle/spec/", + "spec\\Sylius\\Bundle\\ThemeBundle\\": "src/Sylius/Bundle/ThemeBundle/spec/", + "spec\\Sylius\\Bundle\\UiBundle\\": "src/Sylius/Bundle/UiBundle/spec/", + "spec\\Sylius\\Bundle\\UserBundle\\": "src/Sylius/Bundle/UserBundle/spec/" }, "classmap": ["app/AppKernel.php", "app/AppCache.php", "app/TestAppKernel.php"] }, From 6b9357d467d3e9d7fb32b8d3feee1851937342d8 Mon Sep 17 00:00:00 2001 From: Kamil Kokot Date: Mon, 31 Dec 2018 13:57:05 +0100 Subject: [PATCH 3/7] Fix spec classnames / filenames mismatches --- src/Sylius/Behat/spec/Service/Mocker/MockerSpec.php | 2 +- .../Behat/spec/Service/Setter/ChannelContextSetterSpec.php | 2 +- .../{AddCartItemCommandSpec.php => AddToCartCommandSpec.php} | 0 .../Provider/Loader/TranslatorLoaderProviderSpec.php | 2 +- .../Resource/CompositeTranslatorResourceProviderSpec.php | 2 +- .../Provider/Resource/ThemeTranslatorResourceProviderSpec.php | 2 +- .../Provider/Resource/TranslatorResourceProviderSpec.php | 2 +- .../spec/Translation/Resource/ThemeTranslationResourceSpec.php | 2 +- .../spec/Translation/Resource/TranslationResourceSpec.php | 2 +- .../Core/spec/Locale/Context/StorageBasedLocaleContextSpec.php | 2 +- ...solverSpecSpec.php => DefaultShippingMethodResolverSpec.php} | 0 11 files changed, 9 insertions(+), 9 deletions(-) rename src/Sylius/Bundle/OrderBundle/spec/Controller/{AddCartItemCommandSpec.php => AddToCartCommandSpec.php} (100%) rename src/Sylius/Component/Core/spec/Resolver/{DefaultShippingMethodResolverSpecSpec.php => DefaultShippingMethodResolverSpec.php} (100%) diff --git a/src/Sylius/Behat/spec/Service/Mocker/MockerSpec.php b/src/Sylius/Behat/spec/Service/Mocker/MockerSpec.php index 5c6f551371b..983c1cb4784 100644 --- a/src/Sylius/Behat/spec/Service/Mocker/MockerSpec.php +++ b/src/Sylius/Behat/spec/Service/Mocker/MockerSpec.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace spec\Sylius\Behat; +namespace spec\Sylius\Behat\Service\Mocker; use Mockery\MockInterface; use Payum\Core\Bridge\Guzzle\HttpClient; diff --git a/src/Sylius/Behat/spec/Service/Setter/ChannelContextSetterSpec.php b/src/Sylius/Behat/spec/Service/Setter/ChannelContextSetterSpec.php index e89f23677ac..501daac1597 100644 --- a/src/Sylius/Behat/spec/Service/Setter/ChannelContextSetterSpec.php +++ b/src/Sylius/Behat/spec/Service/Setter/ChannelContextSetterSpec.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace spec\Sylius\Behat; +namespace spec\Sylius\Behat\Service\Setter; use PhpSpec\ObjectBehavior; use Sylius\Behat\Service\Setter\ChannelContextSetter; diff --git a/src/Sylius/Bundle/OrderBundle/spec/Controller/AddCartItemCommandSpec.php b/src/Sylius/Bundle/OrderBundle/spec/Controller/AddToCartCommandSpec.php similarity index 100% rename from src/Sylius/Bundle/OrderBundle/spec/Controller/AddCartItemCommandSpec.php rename to src/Sylius/Bundle/OrderBundle/spec/Controller/AddToCartCommandSpec.php diff --git a/src/Sylius/Bundle/ThemeBundle/spec/Translation/Provider/Loader/TranslatorLoaderProviderSpec.php b/src/Sylius/Bundle/ThemeBundle/spec/Translation/Provider/Loader/TranslatorLoaderProviderSpec.php index 3ab52f48224..2330727a8ee 100644 --- a/src/Sylius/Bundle/ThemeBundle/spec/Translation/Provider/Loader/TranslatorLoaderProviderSpec.php +++ b/src/Sylius/Bundle/ThemeBundle/spec/Translation/Provider/Loader/TranslatorLoaderProviderSpec.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace spec\Sylius\Bundle\ThemeBundle\Translation\Provider; +namespace spec\Sylius\Bundle\ThemeBundle\Translation\Provider\Loader; use PhpSpec\ObjectBehavior; use Sylius\Bundle\ThemeBundle\Translation\Provider\Loader\TranslatorLoaderProviderInterface; diff --git a/src/Sylius/Bundle/ThemeBundle/spec/Translation/Provider/Resource/CompositeTranslatorResourceProviderSpec.php b/src/Sylius/Bundle/ThemeBundle/spec/Translation/Provider/Resource/CompositeTranslatorResourceProviderSpec.php index 192178752fd..141df150af9 100644 --- a/src/Sylius/Bundle/ThemeBundle/spec/Translation/Provider/Resource/CompositeTranslatorResourceProviderSpec.php +++ b/src/Sylius/Bundle/ThemeBundle/spec/Translation/Provider/Resource/CompositeTranslatorResourceProviderSpec.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace spec\Sylius\Bundle\ThemeBundle\Translation\Provider; +namespace spec\Sylius\Bundle\ThemeBundle\Translation\Provider\Resource; use PhpSpec\ObjectBehavior; use Sylius\Bundle\ThemeBundle\Translation\Provider\Resource\TranslatorResourceProviderInterface; diff --git a/src/Sylius/Bundle/ThemeBundle/spec/Translation/Provider/Resource/ThemeTranslatorResourceProviderSpec.php b/src/Sylius/Bundle/ThemeBundle/spec/Translation/Provider/Resource/ThemeTranslatorResourceProviderSpec.php index ecebc367094..6efcdd6596b 100644 --- a/src/Sylius/Bundle/ThemeBundle/spec/Translation/Provider/Resource/ThemeTranslatorResourceProviderSpec.php +++ b/src/Sylius/Bundle/ThemeBundle/spec/Translation/Provider/Resource/ThemeTranslatorResourceProviderSpec.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace spec\Sylius\Bundle\ThemeBundle\Translation\Provider; +namespace spec\Sylius\Bundle\ThemeBundle\Translation\Provider\Resource; use PhpSpec\ObjectBehavior; use Sylius\Bundle\ThemeBundle\HierarchyProvider\ThemeHierarchyProviderInterface; diff --git a/src/Sylius/Bundle/ThemeBundle/spec/Translation/Provider/Resource/TranslatorResourceProviderSpec.php b/src/Sylius/Bundle/ThemeBundle/spec/Translation/Provider/Resource/TranslatorResourceProviderSpec.php index 18d28edc49b..2c078c06b2b 100644 --- a/src/Sylius/Bundle/ThemeBundle/spec/Translation/Provider/Resource/TranslatorResourceProviderSpec.php +++ b/src/Sylius/Bundle/ThemeBundle/spec/Translation/Provider/Resource/TranslatorResourceProviderSpec.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace spec\Sylius\Bundle\ThemeBundle\Translation\Provider; +namespace spec\Sylius\Bundle\ThemeBundle\Translation\Provider\Resource; use PhpSpec\ObjectBehavior; use Sylius\Bundle\ThemeBundle\Translation\Provider\Resource\TranslatorResourceProviderInterface; diff --git a/src/Sylius/Bundle/ThemeBundle/spec/Translation/Resource/ThemeTranslationResourceSpec.php b/src/Sylius/Bundle/ThemeBundle/spec/Translation/Resource/ThemeTranslationResourceSpec.php index d898557fd0a..aab7ca9bf76 100644 --- a/src/Sylius/Bundle/ThemeBundle/spec/Translation/Resource/ThemeTranslationResourceSpec.php +++ b/src/Sylius/Bundle/ThemeBundle/spec/Translation/Resource/ThemeTranslationResourceSpec.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace spec\Sylius\Bundle\ThemeBundle\Translation\Provider; +namespace spec\Sylius\Bundle\ThemeBundle\Translation\Resource; use PhpSpec\ObjectBehavior; use Sylius\Bundle\ThemeBundle\Model\ThemeInterface; diff --git a/src/Sylius/Bundle/ThemeBundle/spec/Translation/Resource/TranslationResourceSpec.php b/src/Sylius/Bundle/ThemeBundle/spec/Translation/Resource/TranslationResourceSpec.php index b347c5c2582..4af4311cedb 100644 --- a/src/Sylius/Bundle/ThemeBundle/spec/Translation/Resource/TranslationResourceSpec.php +++ b/src/Sylius/Bundle/ThemeBundle/spec/Translation/Resource/TranslationResourceSpec.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace spec\Sylius\Bundle\ThemeBundle\Translation\Provider; +namespace spec\Sylius\Bundle\ThemeBundle\Translation\Resource; use PhpSpec\ObjectBehavior; use Sylius\Bundle\ThemeBundle\Translation\Resource\TranslationResourceInterface; diff --git a/src/Sylius/Component/Core/spec/Locale/Context/StorageBasedLocaleContextSpec.php b/src/Sylius/Component/Core/spec/Locale/Context/StorageBasedLocaleContextSpec.php index 875b3a52175..d2e7bddefb2 100644 --- a/src/Sylius/Component/Core/spec/Locale/Context/StorageBasedLocaleContextSpec.php +++ b/src/Sylius/Component/Core/spec/Locale/Context/StorageBasedLocaleContextSpec.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace spec\Sylius\Component\Core\Context; +namespace spec\Sylius\Component\Core\Locale\Context; use PhpSpec\ObjectBehavior; use Sylius\Component\Channel\Context\ChannelContextInterface; diff --git a/src/Sylius/Component/Core/spec/Resolver/DefaultShippingMethodResolverSpecSpec.php b/src/Sylius/Component/Core/spec/Resolver/DefaultShippingMethodResolverSpec.php similarity index 100% rename from src/Sylius/Component/Core/spec/Resolver/DefaultShippingMethodResolverSpecSpec.php rename to src/Sylius/Component/Core/spec/Resolver/DefaultShippingMethodResolverSpec.php From 8994f2c6be6d7cad579a3f57799ce64645d8cede Mon Sep 17 00:00:00 2001 From: Kamil Kokot Date: Mon, 31 Dec 2018 14:14:47 +0100 Subject: [PATCH 4/7] Make PHPStan for specs passing --- phpstan.neon | 5 +++++ .../Constraints/ValidAttributeValueValidatorSpec.php | 2 +- .../LocalesAwareValidAttributeValueValidatorSpec.php | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/phpstan.neon b/phpstan.neon index b20cc6443c2..a3cb5fc0d63 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -34,6 +34,11 @@ parameters: - '/Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeParentInterface/' - '/Call to an undefined method Mockery\\ExpectationInterface|Mockery\\HigherOrderMessage::/' + # PhpSpec related errors + - '/Access to an undefined property spec\\/' + - '/Call to an undefined method spec\\/' + - '/Call to an undefined static method spec\\/' + # These packages aren't in require-dev of the global package - '/Class Doctrine\\Bundle\\MongoDBBundle/' - '/Class Doctrine\\Bundle\\PHPCRBundle/' diff --git a/src/Sylius/Bundle/AttributeBundle/spec/Validator/Constraints/ValidAttributeValueValidatorSpec.php b/src/Sylius/Bundle/AttributeBundle/spec/Validator/Constraints/ValidAttributeValueValidatorSpec.php index 56703531951..8b8e0380e25 100644 --- a/src/Sylius/Bundle/AttributeBundle/spec/Validator/Constraints/ValidAttributeValueValidatorSpec.php +++ b/src/Sylius/Bundle/AttributeBundle/spec/Validator/Constraints/ValidAttributeValueValidatorSpec.php @@ -56,7 +56,7 @@ function it_validates_attribute_value_based_on_their_type( $attributeValue->getAttribute()->willReturn($attribute); $attribute->getConfiguration()->willReturn(['min' => 2, 'max' => 255]); - $attributeType->validate($attributeValue, Argument::any(ExecutionContextInterface::class), ['min' => 2, 'max' => 255])->shouldBeCalled(); + $attributeType->validate($attributeValue, Argument::type(ExecutionContextInterface::class), ['min' => 2, 'max' => 255])->shouldBeCalled(); $this->validate($attributeValue, $attributeValueConstraint); } diff --git a/src/Sylius/Bundle/CoreBundle/spec/Validator/Constraints/LocalesAwareValidAttributeValueValidatorSpec.php b/src/Sylius/Bundle/CoreBundle/spec/Validator/Constraints/LocalesAwareValidAttributeValueValidatorSpec.php index ec1f79b6173..632fa195f20 100644 --- a/src/Sylius/Bundle/CoreBundle/spec/Validator/Constraints/LocalesAwareValidAttributeValueValidatorSpec.php +++ b/src/Sylius/Bundle/CoreBundle/spec/Validator/Constraints/LocalesAwareValidAttributeValueValidatorSpec.php @@ -54,7 +54,7 @@ function it_validates_attribute_based_on_its_type_and_set_it_as_required_if_its_ $localeProvider->getDefaultLocaleCode()->willReturn('en_US'); $attributeValue->getLocaleCode()->willReturn('pl'); - $attributeType->validate($attributeValue, Argument::any(ExecutionContextInterface::class), ['min' => 2, 'max' => 255])->shouldBeCalled(); + $attributeType->validate($attributeValue, Argument::type(ExecutionContextInterface::class), ['min' => 2, 'max' => 255])->shouldBeCalled(); $this->validate($attributeValue, $attributeValueConstraint); } @@ -75,7 +75,7 @@ function it_validates_attribute_value_based_on_its_type_and_do_not_set_it_as_req $localeProvider->getDefaultLocaleCode()->willReturn('en_US'); $attributeValue->getLocaleCode()->willReturn('en_US'); - $attributeType->validate($attributeValue, Argument::any(ExecutionContextInterface::class), ['min' => 2, 'max' => 255, 'required' => true])->shouldBeCalled(); + $attributeType->validate($attributeValue, Argument::type(ExecutionContextInterface::class), ['min' => 2, 'max' => 255, 'required' => true])->shouldBeCalled(); $this->validate($attributeValue, $attributeValueConstraint); } From 6cee10bc420b46db1a23b96cde05562ac8a0a30f Mon Sep 17 00:00:00 2001 From: Kamil Kokot Date: Mon, 31 Dec 2018 14:16:14 +0100 Subject: [PATCH 5/7] Make PhpSpec passing after fixing PHPStan warnings --- .../Bundle/OrderBundle/spec/Controller/AddToCartCommandSpec.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Sylius/Bundle/OrderBundle/spec/Controller/AddToCartCommandSpec.php b/src/Sylius/Bundle/OrderBundle/spec/Controller/AddToCartCommandSpec.php index bc222aa3c77..4c00bd3b5c9 100644 --- a/src/Sylius/Bundle/OrderBundle/spec/Controller/AddToCartCommandSpec.php +++ b/src/Sylius/Bundle/OrderBundle/spec/Controller/AddToCartCommandSpec.php @@ -22,7 +22,7 @@ final class AddToCartCommandSpec extends ObjectBehavior { function let(OrderInterface $order, OrderItemInterface $orderItem): void { - $this->beConstructedThrough('createWithCartAndCartItem', [$order, $orderItem]); + $this->beConstructedWith($order, $orderItem); } function it_is_add_cart_item_command(): void From a007c90c05f4c73d62bcaed705788e74182a1b13 Mon Sep 17 00:00:00 2001 From: Kamil Kokot Date: Mon, 31 Dec 2018 15:28:59 +0100 Subject: [PATCH 6/7] Remove PHPStan extension for Symfony --- composer.json | 1 - phpstan.neon | 4 ---- 2 files changed, 5 deletions(-) diff --git a/composer.json b/composer.json index f57c451d049..26613b7b085 100644 --- a/composer.json +++ b/composer.json @@ -93,7 +93,6 @@ "phpspec/phpspec": "^5.0", "phpstan/phpstan-doctrine": "^0.10", "phpstan/phpstan-shim": "^0.10", - "phpstan/phpstan-symfony": "^0.10", "phpstan/phpstan-webmozart-assert": "^0.10", "phpunit/phpunit": "^6.5", "stripe/stripe-php": "^4.1", diff --git a/phpstan.neon b/phpstan.neon index a3cb5fc0d63..15316e7db5e 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,14 +1,10 @@ includes: - vendor/phpstan/phpstan-doctrine/extension.neon - - vendor/phpstan/phpstan-symfony/extension.neon - vendor/phpstan/phpstan-webmozart-assert/extension.neon parameters: reportUnmatchedIgnoredErrors: false - symfony: - container_xml_path: var/cache/dev/appAppKernelDevDebugContainer.xml - excludes_analyse: # Makes PHPStan crash - '**/DependencyInjection/Configuration.php' From f1b9d1397eb847ece55c8edcca59b7fbd964e35e Mon Sep 17 00:00:00 2001 From: filipcro Date: Thu, 27 Dec 2018 14:39:28 +0100 Subject: [PATCH 7/7] Fixed sorting path while sorting by position --- .../ShopBundle/Resources/views/Product/Index/_sorting.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Sylius/Bundle/ShopBundle/Resources/views/Product/Index/_sorting.html.twig b/src/Sylius/Bundle/ShopBundle/Resources/views/Product/Index/_sorting.html.twig index 685bdf4aaa3..63f3f45aea5 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/views/Product/Index/_sorting.html.twig +++ b/src/Sylius/Bundle/ShopBundle/Resources/views/Product/Index/_sorting.html.twig @@ -7,7 +7,7 @@ {% set criteria = app.request.query.get('criteria', {}) %} -{% set default_path = path(route, route_parameters|merge({'criteria': criteria})) %} +{% set default_path = path(route, route_parameters|merge({'sorting': null, 'criteria': criteria})) %} {% set from_a_to_z_path = path(route, route_parameters|merge({'sorting': {'name': 'asc'}, 'criteria': criteria})) %} {% set from_z_to_a_path = path(route, route_parameters|merge({'sorting': {'name': 'desc'}, 'criteria': criteria})) %} {% set oldest_first_path = path(route, route_parameters|merge({'sorting': {'createdAt': 'asc'}, 'criteria': criteria})) %}