Fix static analysis (#8087)

sonata-project · Jul 22, 2023 · 18227f8 · 18227f8
1 parent d81d26c
commit 18227f8
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 15 deletions.
diff --git a/src/Block/AdminPreviewBlockService.php b/src/Block/AdminPreviewBlockService.php
@@ -39,7 +39,6 @@ public function __construct(
     public function execute(BlockContextInterface $blockContext, ?Response $response = null): Response
     {
         $template = $blockContext->getTemplate();
-        \assert(\is_string($template));
 
         $admin = $this->getAdmin($blockContext->getSetting('code'));
         $this->handleFilters($admin, $blockContext);

diff --git a/src/Block/AdminStatsBlockService.php b/src/Block/AdminStatsBlockService.php
@@ -36,7 +36,6 @@ public function __construct(
     public function execute(BlockContextInterface $blockContext, ?Response $response = null): Response
     {
         $template = $blockContext->getTemplate();
-        \assert(null !== $template);
 
         $admin = $this->pool->getAdminByAdminCode($blockContext->getSetting('code'));
 

diff --git a/src/Twig/CanonicalizeRuntime.php b/src/Twig/CanonicalizeRuntime.php
@@ -17,6 +17,7 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 use Twig\Extension\RuntimeExtensionInterface;
 
+/** @psalm-suppress UndefinedClass */
 final class CanonicalizeRuntime implements RuntimeExtensionInterface
 {
     /**
@@ -26,7 +27,7 @@ final class CanonicalizeRuntime implements RuntimeExtensionInterface
      */
     public function __construct(
         private RequestStack $requestStack,
-        private ?SonataFormCanonicalizeRuntime $canonicalizeRuntime
+        private ?SonataFormCanonicalizeRuntime $canonicalizeRuntime = null // @phpstan-ignore-line
     ) {
     }
 
@@ -42,6 +43,7 @@ public function getCanonicalizedLocaleForMoment(): ?string
             return null;
         }
 
+        // @phpstan-ignore-next-line
         return $this->canonicalizeRuntime->getCanonicalizedLocaleForMoment();
     }
 

diff --git a/tests/App/AppKernel.php b/tests/App/AppKernel.php
@@ -108,10 +108,8 @@ protected function configureContainer(ContainerBuilder $containerBuilder, Loader
 
         $loader->load(sprintf('%s/config/services.yml', $this->getProjectDir()));
 
-        /**
+        /*
          * TODO: Remove when support for SonataBlockBundle 4 is dropped.
-         *
-         * @psalm-suppress DeprecatedClass
          */
         $containerBuilder->loadFromExtension('sonata_block', class_exists(HttpCacheHandler::class) ? ['http_cache' => false] : []);
     }

diff --git a/tests/DependencyInjection/Compiler/AddDependencyCallsCompilerPassTest.php b/tests/DependencyInjection/Compiler/AddDependencyCallsCompilerPassTest.php
@@ -832,10 +832,8 @@ private function setUpContainer(): void
         $this->container->setAlias('translator', 'translator.default');
 
         $blockExtension = new SonataBlockExtension();
-        /**
+        /*
          * TODO: remove "http_cache" parameter when support for SonataBlockBundle 4 is dropped.
-         *
-         * @psalm-suppress DeprecatedClass
          */
         $blockExtension->load(
             [

diff --git a/tests/DependencyInjection/Compiler/ExtensionCompilerPassTest.php b/tests/DependencyInjection/Compiler/ExtensionCompilerPassTest.php
@@ -565,10 +565,8 @@ private function getContainer(): ContainerBuilder
             ->setClass(FileLocatorInterface::class);
 
         $blockExtension = new SonataBlockExtension();
-        /**
+        /*
          * TODO: remove "http_cache" parameter when support for SonataBlockBundle 4 is dropped.
-         *
-         * @psalm-suppress DeprecatedClass
          */
         $blockExtension->load(
             [

diff --git a/tests/Show/ShowMapperTest.php b/tests/Show/ShowMapperTest.php
@@ -57,12 +57,12 @@ final class ShowMapperTest extends TestCase
     /**
      * @var array<string, array<string, mixed>>
      */
-    private array $groups;
+    private array $groups = [];
 
     /**
      * @var array<string, bool>
      */
-    private array $listShowFields;
+    private array $listShowFields = [];
 
     protected function setUp(): void
     {

diff --git a/tests/Translator/Extractor/AdminExtractorTest.php b/tests/Translator/Extractor/AdminExtractorTest.php
@@ -32,7 +32,7 @@ final class AdminExtractorTest extends TestCase
     /**
      * @var AdminInterface<object>&MockObject
      */
-    private AdminInterface$fooAdmin;
+    private AdminInterface $fooAdmin;
 
     /**
      * @var AdminInterface<object>&MockObject