Merge pull request Sylius#9540 from pamil/1.1-phpstan-fixes

PHPStan 0.10 upgrade & road to level 2 checks
pamil · Jul 3, 2018 · 7757de9 · 7757de9
2 parents 69c8941 + f0a8921
commit 7757de9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/Form/Type/ThemeChoiceType.php b/Form/Type/ThemeChoiceType.php
@@ -45,7 +45,7 @@ public function configureOptions(OptionsResolver $resolver): void
                 return $this->themeRepository->findAll();
             },
             'choice_label' => function (ThemeInterface $theme): string {
-                return (string) $theme;
+                return $theme->getTitle() ?: $theme->getName();
             },
         ]);
     }

diff --git a/Form/Type/ThemeNameChoiceType.php b/Form/Type/ThemeNameChoiceType.php
@@ -45,7 +45,7 @@ public function configureOptions(OptionsResolver $resolver): void
 
                 $choices = [];
                 foreach ($themes as $theme) {
-                    $choices[(string) $theme] = $theme->getName();
+                    $choices[$theme->getTitle() ?: $theme->getName()] = $theme->getName();
                 }
 
                 return $choices;

diff --git a/Tests/Functional/TestBundle/Listener/RequestListener.php b/Tests/Functional/TestBundle/Listener/RequestListener.php
@@ -14,7 +14,6 @@
 namespace Sylius\Bundle\ThemeBundle\Tests\Functional\TestBundle\Listener;
 
 use Sylius\Bundle\ThemeBundle\Context\SettableThemeContext;
-use Sylius\Bundle\ThemeBundle\Context\ThemeContextInterface;
 use Sylius\Bundle\ThemeBundle\Repository\ThemeRepositoryInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -27,7 +26,7 @@ final class RequestListener
     private $themeRepository;
 
     /**
-     * @var ThemeContextInterface
+     * @var SettableThemeContext
      */
     private $themeContext;
 

diff --git a/Twig/ThemeFilesystemLoader.php b/Twig/ThemeFilesystemLoader.php
@@ -115,8 +115,10 @@ private function findTemplate(string $logicalName): string
         }
 
         $template = $this->templateNameParser->parse($logicalName);
+
+        /** @var string $file */
         $file = $this->templateLocator->locate($template);
 
-        return (string) $this->cache[$logicalName] = $file;
+        return $this->cache[$logicalName] = $file;
     }
 }