Merge branch 'master' into feature/pagerfanta-3

Sylius · Jun 25, 2021 · 14f0726 · 14f0726
2 parents a51e1a2 + cfc6582
commit 14f0726
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 ## CHANGELOG
 
+### v1.8.2 (2021-04-08)
+
+#### Details
+
+- [#304](https://github.com/Sylius/SyliusResourceBundle/issues/304) Fix doctrine extensions version on component ([@loic425](https://github.com/loic425))
+- [#303](https://github.com/Sylius/SyliusResourceBundle/issues/303) fix namespace of `ConfigurationTest` ([@bendavies](https://github.com/bendavies))
+- [#302](https://github.com/Sylius/SyliusResourceBundle/issues/302) Fix namespace of `WinzouStateMachinePassTest` ([@bendavies](https://github.com/bendavies))
+- [#301](https://github.com/Sylius/SyliusResourceBundle/issues/301) Update phpstan/phpstan requirement from 0.12.82 to 0.12.83 ([@dependabot-preview](https://github.com/dependabot-preview)[[@bot](https://github.com/bot)])
+- [#300](https://github.com/Sylius/SyliusResourceBundle/issues/300) Update vimeo/psalm requirement from 4.6.4 to 4.7.0 ([@dependabot-preview](https://github.com/dependabot-preview)[[@bot](https://github.com/bot)])
+
 ### v1.8.1 (2021-03-19)
 
 #### Details

diff --git a/composer.json b/composer.json
@@ -60,7 +60,7 @@
         "pamil/phpspec-skip-example-extension": "^4.2",
         "phpspec/phpspec": "^7.0",
         "phpspec/prophecy-phpunit": "^2.0",
-        "phpstan/phpstan": "0.12.82",
+        "phpstan/phpstan": "0.12.83",
         "phpstan/phpstan-phpunit": "0.12.18",
         "phpstan/phpstan-webmozart-assert": "0.12.12",
         "phpunit/phpunit": "^9.5",
@@ -70,7 +70,7 @@
         "symfony/dotenv": "^4.4 || ^5.2",
         "symplify/easy-coding-standard": "^8.3",
         "twig/twig": "^2.12 || ^3.0",
-        "vimeo/psalm": "4.6.4"
+        "vimeo/psalm": "4.7.0"
     },
     "suggest": {
         "doctrine/orm": "^2.5",

diff --git a/src/Bundle/Tests/Configuration/ConfigurationTest.php b/src/Bundle/Tests/Configuration/ConfigurationTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ResourceBundle\Tests;
+namespace Sylius\Bundle\ResourceBundle\Tests\Configuration;
 
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
 use PHPUnit\Framework\TestCase;

diff --git a/src/Bundle/Tests/DependencyInjection/Compiler/WinzouStateMachinePassTest.php b/src/Bundle/Tests/DependencyInjection/Compiler/WinzouStateMachinePassTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ResourceBundle\test\src\Tests\DependencyInjection\Compiler;
+namespace Sylius\Bundle\ResourceBundle\Tests\DependencyInjection\Compiler;
 
 use PHPUnit\Framework\Assert;
 use SM\Callback\CallbackFactoryInterface;

diff --git a/src/Component/composer.json b/src/Component/composer.json
@@ -30,7 +30,7 @@
         "php": "^7.4 || ^8.0",
         "doctrine/collections": "^1.6",
         "doctrine/inflector": "^1.4 || ^2.0",
-        "gedmo/doctrine-extensions": "^2.4",
+        "gedmo/doctrine-extensions": "^2.4.12 || ^3.0",
         "pagerfanta/core": "^2.4 || ^3.0",
         "symfony/event-dispatcher": "^4.4 || ^5.2",
         "symfony/property-access": "^4.4 || ^5.2",