Merge pull request #3037 from acrobat/use-phpstan-stable

[AllBundles] Upgrade phpstan to stable release
Kunstmaan · Nov 18, 2021 · e9e82ee · e9e82ee
2 parents 21c113d + 1cb6aab
commit e9e82ee
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
@@ -13,7 +13,7 @@ jobs:
 
             -   uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 7.4
+                    php-version: 8.0
                     coverage: none
 
             -   name: Install Composer Dependencies

diff --git a/composer.json b/composer.json
@@ -90,8 +90,8 @@
         "symfony/phpunit-bridge": "^5.2",
         "phpunit/phpunit": "^8.5|^9.5",
         "friendsofphp/php-cs-fixer": "^2.13",
-        "phpstan/phpstan": "^0.12.18",
-        "phpstan/phpstan-doctrine": "^0.12.10"
+        "phpstan/phpstan": "^1.1",
+        "phpstan/phpstan-doctrine": "^1.0"
     },
     "replace": {
         "kunstmaan/admin-bundle": "self.version",

diff --git a/phpstan.neon b/phpstan.neon
@@ -9,7 +9,7 @@ parameters:
         - .build/stubs/RoleInterface.php
         - .build/stubs/MailerInterface.php
 
-    excludes_analyse:
+    excludePaths:
         - src/Kunstmaan/*/Tests/*
         - src/Kunstmaan/*/vendor/*
         - src/Kunstmaan/BehatBundle

diff --git a/src/Kunstmaan/AdminBundle/Helper/FormWidgets/Tabs/TabPane.php b/src/Kunstmaan/AdminBundle/Helper/FormWidgets/Tabs/TabPane.php
@@ -116,7 +116,7 @@ private function generateIdentifier(TabInterface $tab): string
     public function addTab(TabInterface $tab, $position = null)
     {
         $identifier = $tab->getIdentifier();
-        if (!$identifier || empty($identifier)) {
+        if (empty($identifier)) {
             $tab->setIdentifier($this->generateIdentifier($tab));
         }
 

diff --git a/src/Kunstmaan/AdminListBundle/Controller/AbstractAdminListController.php b/src/Kunstmaan/AdminListBundle/Controller/AbstractAdminListController.php
@@ -94,22 +94,22 @@ protected function doExportAction(AbstractAdminListConfigurator $configurator, $
      * Creates and processes the form to add a new Entity
      *
      * @param AbstractAdminListConfigurator $configurator The adminlist configurator
-     * @param string                        $type         The type to add
+     * @param string|null                   $type         The type to add
      * @param Request|null                  $request
      *
      * @throws AccessDeniedHttpException
      *
      * @return Response
      */
-    protected function doAddAction(AbstractAdminListConfigurator $configurator, $type = null, Request $request)
+    protected function doAddAction(AbstractAdminListConfigurator $configurator, $type, Request $request)
     {
         if (!$configurator->canAdd()) {
             throw $this->createAccessDeniedException('You do not have sufficient rights to access this page.');
         }
 
         /* @var EntityManager $em */
         $em = $this->getEntityManager();
-        $entityName = isset($type) ? $type : $configurator->getRepositoryName();
+        $entityName = $type ?? $configurator->getRepositoryName();
 
         $classMetaData = $em->getClassMetadata($entityName);
         // Creates a new instance of the mapped class, without invoking the constructor.

diff --git a/src/Kunstmaan/DashboardBundle/Widget/DashboardWidget.php b/src/Kunstmaan/DashboardBundle/Widget/DashboardWidget.php
@@ -68,7 +68,7 @@ public function resolvedController()
         $methodAnnotations = $annotationReader->getMethodAnnotations($reflectionMethod);
         foreach ($methodAnnotations as $annotation) {
             if ($annotation instanceof Route) {
-                if (empty($annotation)) {
+                if (null === $annotation->getName()) {
                     throw new \Exception('The name is not configured in the annotation');
                 }
 

diff --git a/src/Kunstmaan/MediaBundle/Form/Type/IdToMediaTransformer.php b/src/Kunstmaan/MediaBundle/Form/Type/IdToMediaTransformer.php
@@ -44,7 +44,7 @@ public function __construct(ObjectManager $objectManager, CurrentValueContainer
      */
     public function transform($entity)
     {
-        if (empty($entity)) {
+        if (null === $entity) {
             return '';
         }
         if (!\is_object($entity)) {

diff --git a/src/Kunstmaan/PagePartBundle/Repository/PagePartRefRepository.php b/src/Kunstmaan/PagePartBundle/Repository/PagePartRefRepository.php
@@ -185,9 +185,9 @@ public function hasPageParts(HasPagePartsInterface $page, $context = 'main')
     }
 
     /**
-     * @param int    $id             The id
-     * @param string $context        The context
-     * @param int    $sequenceNumber The sequence number
+     * @param int         $id             The id
+     * @param string|null $context        The context
+     * @param int         $sequenceNumber The sequence number
      *
      * @return PagePartInterface
      */