Merge pull request #746 from malarzm/composer-plugins

Explicit allow for composer plugins
doctrine · Sep 18, 2022 · c1c31fa · c1c31fa
2 parents f5ca283 + 6e2fc50
commit c1c31fa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -89,7 +89,7 @@ jobs:
           ini-values: "zend.assertions=1"
 
       - name: "Globally install symfony/flex"
-        run: "composer global require --no-progress --no-scripts --no-plugins symfony/flex"
+        run: "composer global require --no-progress --no-scripts --no-plugins symfony/flex && composer global config --no-plugins allow-plugins.symfony/flex true"
 
       - name: "Set minimum-stability to stable in Composer"
         run: "composer config minimum-stability ${{ matrix.stability }}"

diff --git a/Repository/ContainerRepositoryFactory.php b/Repository/ContainerRepositoryFactory.php
@@ -24,7 +24,7 @@
  */
 final class ContainerRepositoryFactory implements RepositoryFactory
 {
-    /** @var ObjectRepository[] */
+    /** @var array<string, ObjectRepository> */
     private $managedRepositories = [];
 
     /** @var ContainerInterface|null */
@@ -89,6 +89,7 @@ private function getOrCreateRepository(DocumentManager $documentManager, ClassMe
     {
         $repositoryHash = $metadata->getName() . spl_object_hash($documentManager);
         if (isset($this->managedRepositories[$repositoryHash])) {
+            /** @psalm-var ObjectRepository<T> */
             return $this->managedRepositories[$repositoryHash];
         }
 

diff --git a/composer.json b/composer.json
@@ -61,6 +61,9 @@
         }
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }