Merge 3.x into 4.x

sonata-project · Feb 3, 2023 · 944a129 · 944a129
2 parents d9af19b + 0690087
commit 944a129
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -49,6 +49,9 @@
     'phpdoc_separation' => ['groups' => [
         ['phpstan-template', 'phpstan-template-covariant', 'phpstan-extends', 'phpstan-implements', 'phpstan-var', 'psalm-var', 'phpstan-param', 'psalm-param', 'phpstan-return', 'psalm-return'],
         ['psalm-suppress', 'phpstan-ignore-next-line'],
+        ['Assert\\*'],
+        ['ODM\\*'],
+        ['ORM\\*'],
     ]],
     'php_unit_strict' => true,
     'php_unit_test_case_static_method_calls' => true,

diff --git a/composer.json b/composer.json
@@ -51,7 +51,7 @@
         "phpstan/phpstan-symfony": "^1.0",
         "phpunit/phpunit": "^9.5",
         "psalm/plugin-phpunit": "^0.17",
-        "psalm/plugin-symfony": "^3.0",
+        "psalm/plugin-symfony": "^4.0",
         "rector/rector": "^0.15",
         "sonata-project/doctrine-orm-admin-bundle": "^4.0",
         "symfony/browser-kit": "^4.4 || ^5.4 || ^6.0",

diff --git a/tests/App/Entity/GedmoCategory.php b/tests/App/Entity/GedmoCategory.php
@@ -33,6 +33,7 @@ class GedmoCategory implements Translatable
 
     /**
      * @Gedmo\Translatable(fallback=true)
+     *
      * @ORM\Column(type="string")
      */
     private string $name;

diff --git a/tests/Fixtures/Traits/ORM/ArticlePersonalTranslatable.php b/tests/Fixtures/Traits/ORM/ArticlePersonalTranslatable.php
@@ -20,6 +20,7 @@
 
 /**
  * @Gedmo\TranslationEntity(class="Sonata\TranslationBundle\Tests\Fixtures\Traits\ORM\ArticlePersonalTranslation")
+ *
  * @ORM\Table(name="article")
  * @ORM\Entity
  */
@@ -50,6 +51,7 @@ class ArticlePersonalTranslatable
 
     /**
      * @Gedmo\Translatable
+     *
      * @ORM\Column(length=128)
      */
     private ?string $title = null;