Merge pull request #52 from pagemachine/phpstan-1.x

Prepare for PHPStan 1.x
pagemachine · Nov 22, 2021 · 3b0ad9e · 3b0ad9e
2 parents aeac39c + 4a0075e
commit 3b0ad9e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/Classes/DataCollector/PagesDataCollector.php b/Classes/DataCollector/PagesDataCollector.php
@@ -98,7 +98,7 @@ public function getRecords()
     /**
      *
      *
-     * @return \Generator
+     * @return \Generator|null
      */
     protected function getPageRecords($pid = null)
     {

diff --git a/Classes/DataCollector/TCA/FormDataRecord.php b/Classes/DataCollector/TCA/FormDataRecord.php
@@ -66,6 +66,10 @@ public function getRecord($uid, $table, $fieldlist)
         ];
 
         try {
+            /**
+             * @throws DatabaseRecordException
+             * @throws DatabaseDefaultLanguageException
+             */
             $data = $this->formDataCompiler->compile($formDataCompilerInput);
         //Be nice and catch all errors related to inconsistent data (sometimes strange things happen with extbase relations)
         } catch (DatabaseRecordException $e) {

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -100,7 +100,7 @@
         } catch (\TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationExtensionNotConfiguredException $e) {
             $extensionConfiguration = [];
         }
-    } elseif (!empty($_EXTCONF)) {
+    } else {
         $extensionConfiguration = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\TypoScript\TypoScriptService::class)
             ->convertTypoScriptArrayToPlainArray(unserialize($_EXTCONF));
     }

diff --git a/phpstan.neon b/phpstan.neon
@@ -6,8 +6,7 @@ parameters:
     - ext_localconf.php
     - ext_tables.php
     - Classes
-
-  excludes_analyse:
+  excludePaths:
     - Classes/Command/SearchableCommandController.php
 
   ignoreErrors:
-Original file line number
+Diff line change
@@ Expand Up / @@ -98,7 +98,7 @@ public function getRecords() @@
         /**
          *
          *
-         * @return \Generator
+         * @return \Generator|null
          */
         protected function getPageRecords($pid = null)
         {
@@ Expand Down @@