Merge 3.x into 4.x

sonata-project · Jan 9, 2023 · d9af19b · d9af19b
2 parents 1f6a0ce + 515e2cb
commit d9af19b
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 8 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -63,6 +63,11 @@ jobs:
                       allowed-to-fail: false
                       symfony-require: 6.1.*
                       variant: symfony/symfony:"6.1.*"
+                    - php-version: '8.1'
+                      dependencies: highest
+                      allowed-to-fail: false
+                      symfony-require: 6.2.*
+                      variant: symfony/symfony:"6.2.*"
 
         steps:
             - name: Checkout

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

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,10 +1,19 @@
+# DO NOT EDIT THIS FILE!
+#
+# It's auto-generated by sonata-project/dev-kit package.
+
+includes:
+    - vendor/phpstan/phpstan/conf/bleedingEdge.neon
+
 parameters:
     level: 8
     doctrine:
-        objectManagerLoader: phpstan-object-manager.php
+        allowNullablePropertyForRequiredField: true
     paths:
         - src
         - tests
+    scanFiles:
+        - vendor/symfony/dependency-injection/Loader/Configurator/ContainerConfigurator.php
     treatPhpDocTypesAsCertain: false
     checkGenericClassInNonGenericObjectType: true
     checkInternalClassCaseSensitivity: true

diff --git a/tests/Fixtures/Traits/ORM/ArticlePersonalTranslatable.php b/tests/Fixtures/Traits/ORM/ArticlePersonalTranslatable.php
@@ -17,7 +17,6 @@
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
-use Gedmo\Translatable\Entity\MappedSuperclass\AbstractPersonalTranslation;
 
 /**
  * @Gedmo\TranslationEntity(class="Sonata\TranslationBundle\Tests\Fixtures\Traits\ORM\ArticlePersonalTranslation")
@@ -39,7 +38,7 @@ class ArticlePersonalTranslatable
     public ?string $locale = null;
 
     /**
-     * @var ArrayCollection<array-key, AbstractPersonalTranslation>
+     * @var Collection<array-key, ArticlePersonalTranslation>
      *
      * @ORM\OneToMany(
      *     targetEntity="Sonata\TranslationBundle\Tests\Fixtures\Traits\ORM\ArticlePersonalTranslation",
@@ -76,7 +75,7 @@ public function getTitle(): ?string
     }
 
     /**
-     * @phpstan-return Collection<array-key, AbstractPersonalTranslation>
+     * @phpstan-return Collection<array-key, ArticlePersonalTranslation>
      */
     public function getTranslations(): Collection
     {
@@ -94,7 +93,7 @@ public function getTranslation(string $field, string $locale): ?string
         return null;
     }
 
-    public function addTranslation(AbstractPersonalTranslation $translation): self
+    public function addTranslation(ArticlePersonalTranslation $translation): self
     {
         if (!$this->translations->contains($translation)) {
             $translation->setObject($this);

diff --git a/tests/Fixtures/Traits/ORM/Knplabs/Article.php b/tests/Fixtures/Traits/ORM/Knplabs/Article.php
@@ -21,7 +21,7 @@
  * @ORM\Table(name="article")
  * @ORM\Entity
  */
-final class Article extends TranslatableEntity
+class Article extends TranslatableEntity
 {
     /**
      * @ORM\Id

diff --git a/tests/Fixtures/Traits/ORM/Knplabs/ArticleTranslation.php b/tests/Fixtures/Traits/ORM/Knplabs/ArticleTranslation.php
@@ -21,7 +21,7 @@
  * @ORM\Table(name="article_translation")
  * @ORM\Entity
  */
-final class ArticleTranslation extends AbstractArticleTranslation implements TranslationInterface
+class ArticleTranslation extends AbstractArticleTranslation implements TranslationInterface
 {
     use TranslationTrait;
 

diff --git a/tests/Traits/DoctrineOrmTestCase.php b/tests/Traits/DoctrineOrmTestCase.php
@@ -38,6 +38,8 @@ abstract class DoctrineOrmTestCase extends TestCase
      * EntityManager mock object together with
      * annotation mapping driver and pdo_sqlite
      * database in memory.
+     *
+     * @psalm-suppress DeprecatedMethod
      */
     final protected function getMockSqliteEntityManager(?EventManager $evm = null, ?Configuration $config = null): EntityManager
     {