BH-681: Fix migrations tests

akeneo · Sep 3, 2021 · 248a594 · 248a594
1 parent ce13cac
commit 248a594
Show file tree

Hide file tree

Showing 8 changed files with 662 additions and 692 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/phpstan.neon b/phpstan.neon
@@ -3,7 +3,6 @@ includes:
     - vendor/phpstan/phpstan-webmozart-assert/extension.neon
 parameters:
     reportUnmatchedIgnoredErrors: false
-    checkGenericClassInNonGenericObjectType: false
     symfony:
         container_xml_path: %rootDir%/../../../var/cache/dev/srcKernelDevDebugContainer.xml
     ignoreErrors:

diff --git a/src/Akeneo/Connectivity/Connection/back/Application/Webhook/WebhookUserAuthenticator.php b/src/Akeneo/Connectivity/Connection/back/Application/Webhook/WebhookUserAuthenticator.php
@@ -4,7 +4,7 @@
 
 namespace Akeneo\Connectivity\Connection\Application\Webhook;
 
-use Doctrine\Persistence\ObjectRepository;
+use Akeneo\UserManagement\Component\Repository\UserRepositoryInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -15,11 +15,11 @@
  */
 class WebhookUserAuthenticator
 {
-    private ObjectRepository $userRepository;
+    private UserRepositoryInterface $userRepository;
 
     private TokenStorageInterface $tokenStorage;
 
-    public function __construct(ObjectRepository $userRepository, TokenStorageInterface $tokenStorage)
+    public function __construct(UserRepositoryInterface $userRepository, TokenStorageInterface $tokenStorage)
     {
         $this->userRepository = $userRepository;
         $this->tokenStorage = $tokenStorage;

diff --git a/src/Akeneo/Pim/Enrichment/Bundle/Doctrine/ReferenceDataRepositoryResolver.php b/src/Akeneo/Pim/Enrichment/Bundle/Doctrine/ReferenceDataRepositoryResolver.php
@@ -5,6 +5,7 @@
 use Akeneo\Pim\Enrichment\Component\Product\Repository\ReferenceDataRepositoryResolverInterface;
 use Akeneo\Pim\Structure\Component\ReferenceData\ConfigurationRegistryInterface;
 use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ObjectRepository;
 
 /**
  * Resolves the repository given a reference data type
@@ -29,7 +30,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function resolve($referenceDataType)
+    public function resolve(string $referenceDataType): ObjectRepository
     {
         $referenceDataConf = $this->configurationRegistry->get($referenceDataType);
         $referenceDataClass = $referenceDataConf->getClass();

diff --git a/.../Pim/Enrichment/Component/Product/Repository/ReferenceDataRepositoryResolverInterface.php b/.../Pim/Enrichment/Component/Product/Repository/ReferenceDataRepositoryResolverInterface.php
@@ -13,10 +13,5 @@
  */
 interface ReferenceDataRepositoryResolverInterface
 {
-    /**
-     * @param string $referenceDataType
-     *
-     * @return ObjectRepository
-     */
-    public function resolve($referenceDataType);
+    public function resolve(string $referenceDataType): ObjectRepository;
 }
diff --git a/symfony.lock b/symfony.lock
@@ -102,9 +102,6 @@
             "src/Repository/.gitignore"
         ]
     },
-    "doctrine/doctrine-cache-bundle": {
-        "version": "1.4.0"
-    },
     "doctrine/doctrine-fixtures-bundle": {
         "version": "3.0",
         "recipe": {
@@ -151,9 +148,6 @@
     "doctrine/persistence": {
         "version": "v1.1.0"
     },
-    "doctrine/reflection": {
-        "version": "v1.0.0"
-    },
     "doctrine/sql-formatter": {
         "version": "1.1.1"
     },
@@ -217,9 +211,6 @@
             "ref": "370bcf99b04c0dfd0b545745aad622d757af5e1b"
         }
     },
-    "friendsofsymfony/oauth-server-bundle": {
-        "version": "1.6.2"
-    },
     "friendsofsymfony/oauth2-php": {
         "version": "1.2.3"
     },
@@ -280,9 +271,6 @@
     "instaclick/php-webdriver": {
         "version": "1.4.6"
     },
-    "jdorn/sql-formatter": {
-        "version": "v1.2.17"
-    },
     "justinrainbow/json-schema": {
         "version": "5.2.9"
     },

diff --git a/upgrades/schema/Version_4_1_20200127171059_unauthorized_view_all_jobs_permission.php b/upgrades/schema/Version_4_1_20200127171059_unauthorized_view_all_jobs_permission.php
@@ -2,6 +2,7 @@
 
 namespace Pim\Upgrade\Schema;
 
+use Akeneo\UserManagement\Component\Model\Role;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
@@ -22,6 +23,7 @@ final class Version_4_1_20200127171059_unauthorized_view_all_jobs_permission ext
     public function up(Schema $schema) : void
     {
         $aclManager = $this->container->get('oro_security.acl.manager');
+        /** @var Role[] $roles */
         $roles = $this->container->get('pim_user.repository.role')->findAll();
 
         foreach ($roles as $role) {
@@ -32,7 +34,7 @@ public function up(Schema $schema) : void
                 ->addPermission(new AclPermission('EXECUTE', 0));
 
             $aclManager->getPrivilegeRepository()
-                ->savePrivileges(new RoleSecurityIdentity($role), new ArrayCollection([$privilege]));
+                ->savePrivileges(new RoleSecurityIdentity($role->getRole()), new ArrayCollection([$privilege]));
         }
 
         $aclManager->flush();

diff --git a/...t_schema/Version_4_1_20200127171059_unauthorized_view_all_jobs_permission_Integration.php b/...t_schema/Version_4_1_20200127171059_unauthorized_view_all_jobs_permission_Integration.php
@@ -105,7 +105,8 @@ public function testItForbidToViewAllJobsForAllRoles()
 
     private function findAccessLevelForRole(Role $role): ?int
     {
-        $aclPrivileges = $this->aclManager->getPrivilegeRepository()->getPrivileges(new RoleSecurityIdentity($role));
+        $aclPrivileges = $this->aclManager->getPrivilegeRepository()
+            ->getPrivileges(new RoleSecurityIdentity($role->getRole()));
         foreach ($aclPrivileges as $aclPrivilege) {
             if ($aclPrivilege->getIdentity()->getId() === static::PRIVILEGE_ID) {
                 return $aclPrivilege->getPermissions()->get('EXECUTE')->getAccessLevel();
@@ -126,7 +127,7 @@ private function authorizedPermission(Role $role): void
         $this
             ->aclManager
             ->getPrivilegeRepository()
-            ->savePrivileges(new RoleSecurityIdentity($role), new ArrayCollection([$privilege]));
+            ->savePrivileges(new RoleSecurityIdentity($role->getRole()), new ArrayCollection([$privilege]));
     }
 
     private function getMigrationLabel(): string