Raise PHPStan level to 8 (#1409)

doctrine · Mar 11, 2024 · 6458e87 · 6458e87
1 parent 7767cf4
commit 6458e87
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,5 +1,5 @@
 parameters:
-    level: 7
+    level: 8
     paths:
         - src
         - tests

diff --git a/src/DependencyFactory.php b/src/DependencyFactory.php
@@ -145,7 +145,7 @@ public function getConfiguration(): Configuration
     {
         if ($this->configuration === null) {
             $this->configuration = $this->configurationLoader->getConfiguration();
-            $this->freeze();
+            $this->frozen = true;
         }
 
         return $this->configuration;
@@ -157,7 +157,7 @@ public function getConnection(): Connection
             $this->connection = $this->hasEntityManager()
                 ? $this->getEntityManager()->getConnection()
                 : $this->connectionLoader->getConnection($this->getConfiguration()->getConnectionName());
-            $this->freeze();
+            $this->frozen = true;
         }
 
         return $this->connection;
@@ -171,7 +171,7 @@ public function getEntityManager(): EntityManagerInterface
             }
 
             $this->em = $this->emLoader->getEntityManager($this->getConfiguration()->getEntityManagerName());
-            $this->freeze();
+            $this->frozen = true;
         }
 
         return $this->em;
@@ -222,7 +222,7 @@ public function getSchemaDumper(): SchemaDumper
 
     private function getEmptySchemaProvider(): SchemaProvider
     {
-        return $this->getDependency(EmptySchemaProvider::class, fn (): SchemaProvider => new EmptySchemaProvider($this->connection->createSchemaManager()));
+        return $this->getDependency(EmptySchemaProvider::class, fn (): SchemaProvider => new EmptySchemaProvider($this->getConnection()->createSchemaManager()));
     }
 
     public function hasSchemaProvider(): bool

diff --git a/src/Tools/Console/Command/DoctrineCommand.php b/src/Tools/Console/Command/DoctrineCommand.php
@@ -88,16 +88,17 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
             $configurationLoader = new ConfigurationFileWithFallback($configurationParameter);
             $this->dependencyFactory->setConfigurationLoader($configurationLoader);
         }
+        $dependencyFactory = $this->dependencyFactory;
 
         $this->setNamedEmOrConnection($input);
 
-        if ($this->dependencyFactory->isFrozen()) {
+        if ($dependencyFactory->isFrozen()) {
             return;
         }
 
         $logger = new ConsoleLogger($output);
-        $this->dependencyFactory->setService(LoggerInterface::class, $logger);
-        $this->dependencyFactory->freeze();
+        $dependencyFactory->setService(LoggerInterface::class, $logger);
+        $dependencyFactory->freeze();
     }
 
     protected function getDependencyFactory(): DependencyFactory
@@ -116,6 +117,7 @@ protected function canExecute(string $question, InputInterface $input): bool
 
     private function setNamedEmOrConnection(InputInterface $input): void
     {
+        assert($this->dependencyFactory !== null);
         $emName   = $input->getOption('em');
         $connName = $input->getOption('conn');
         if ($emName !== null && $connName !== null) {