Merge pull request #1624 from spryker/bugfix/phpstan-lev4

Prepare for phpstan level 4

Author: dereuromark

phpstan-baseline.neon

@@ -37,7 +37,7 @@ class ConfigurationManager
     /**
      * Load and validate configuration values from a file.
      *
-     * @param string $filename  Configuration file name or directory in which resides the configuration file.
+     * @param string|null $filename  Configuration file name or directory in which resides the configuration file.
      * @param array  $extraConf Array of configuration properties, to be merged with those loaded from file.
      *                          It's useful when passing configuration parameters from command line.
      */
@@ -132,22 +132,22 @@ public function getConnectionParametersArray($section = 'runtime')
      * Only one configuration file is supposed to be found.
      * This method also looks for a '.dist' configuration file and loads it.
      *
-     * @param string $fileName  Configuration file name or directory in which resides the configuration file.
-     * @param array  $extraConf Array of configuration properties, to be merged with those loaded from file.
+     * @param string|null $fileName  Configuration file name or directory in which resides the configuration file.
+     * @param array|null $extraConf Array of configuration properties, to be merged with those loaded from file.
      */
     protected function load($fileName, $extraConf)
     {
         $dirs = $this->getDirs($fileName);
 
-        if ((null === $fileName) || (is_dir($fileName))) {
+        if (!$fileName || is_dir($fileName)) {
             $fileName = self::CONFIG_FILE_NAME;
         }
 
         if (null === $extraConf) {
             $extraConf = [];
         }
 
-        if (self::CONFIG_FILE_NAME === $fileName) {
+        if (static::CONFIG_FILE_NAME === $fileName) {
             $files = $this->getFiles($dirs, $fileName);
             $distFiles = $this->getFiles($dirs, $fileName, true);
 
@@ -250,18 +250,18 @@ private function loadFile($fileName)
     /**
      * Return the directories where to find the configuration file.
      *
-     * @param  string $fileName
+     * @param  string|null $fileName
      * @return array
      */
     private function getDirs($fileName)
     {
-        if (is_file($fileName)) {
+        if ($fileName && is_file($fileName)) {
             return [];
         }
 
         $currentDir = getcwd();
 
-        if (is_dir($fileName)) {
+        if ($fileName && is_dir($fileName)) {
             $currentDir = $fileName;
         }
 

src/Propel/Common/Config/ConfigurationManager.php

@@ -124,20 +124,20 @@ protected function checkSupports($ext, $resource)
             return ($ext === $extension);
         }
 
-        if (is_array($ext)) {
-            $supported = false;
+        if (!is_array($ext)) {
+            throw new \InvalidArgumentException('$ext must be string or string[]');
+        }
 
-            foreach ($ext as $value) {
-                if ($value === $extension) {
-                    $supported = true;
-                    break;
-                }
-            }
+        $supported = false;
 
-            return $supported;
+        foreach ($ext as $value) {
+            if ($value === $extension) {
+                $supported = true;
+                break;
+            }
         }
 
-        return false;
+        return $supported;
     }
 
     private function isResolved()
@@ -279,7 +279,7 @@ private function get($property_key)
      * Scan recursively an array to find a value of a given key.
      *
      * @param string  $property_key The array key
-     * @param array   $config       The array to scan
+     * @param array|null   $config       The array to scan
      * @param boolean $found        if the key was found
      *
      * @return mixed The value or null if not found

src/Propel/Common/Config/Loader/FileLoader.php

@@ -35,6 +35,9 @@ class ArchivableBehavior extends Behavior
         'archive_on_delete'   => 'true',
     ];
 
+    /**
+     * @var Table|null
+     */
     protected $archiveTable;
     protected $objectBuilderModifier;
     protected $queryBuilderModifier;
@@ -130,7 +133,7 @@ protected function addArchiveTable()
     }
 
     /**
-     * @return Table
+     * @return Table|null
      */
     public function getArchiveTable()
     {

src/Propel/Generator/Behavior/Archivable/ArchivableBehavior.php

@@ -7,7 +7,7 @@
  *
  * @throws PropelException If the object has no corresponding archive.
  *
- * @return $this|<?php echo $objectClassName ?> The current object (for fluent API support)
+ * @return $this The current object (for fluent API support)
  */
 public function restoreFromArchive(ConnectionInterface $con = null)
 {

src/Propel/Generator/Behavior/Archivable/templates/objectRestoreFromArchive.php

@@ -5,7 +5,7 @@
  * @param     string $locale Locale to use for the translation, e.g. 'fr_FR'
  * @param     ConnectionInterface $con an optional connection object
  *
- * @return    $this|<?php echo $objectClassName ?> The current object (for fluent API support)
+ * @return    $this The current object (for fluent API support)
  */
 public function removeTranslation($locale = '<?php echo $defaultLocale ?>', ConnectionInterface $con = null)
 {

src/Propel/Generator/Behavior/I18n/templates/objectRemoveTranslation.php

@@ -4,7 +4,7 @@
  *
  * @param     string $locale Locale to use for the translation, e.g. 'fr_FR'
  *
- * @return    $this|<?php echo $objectClassName ?> The current object (for fluent API support)
+ * @return    $this The current object (for fluent API support)
  */
 public function set<?php echo $localeColumnName ?>($locale = '<?php echo $defaultLocale ?>')
 {

src/Propel/Generator/Behavior/I18n/templates/objectSetLocale.php

@@ -5,7 +5,7 @@
  * @param     <?php echo $i18nTablePhpName ?> $translation The translation object
  * @param     string $locale Locale to use for the translation, e.g. 'fr_FR'
  *
- * @return    $this|<?php echo $objectClassName ?> The current object (for fluent API support)
+ * @return    $this The current object (for fluent API support)
  */
 public function setTranslation($translation, $locale = '<?php echo $defaultLocale ?>')
 {

src/Propel/Generator/Behavior/I18n/templates/objectSetTranslation.php

@@ -6,7 +6,7 @@
  * @param     string $locale Locale to use for the join condition, e.g. 'fr_FR'
  * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join.
  *
- * @return    $this|<?php echo $queryClass ?> The current query, for fluid interface
+ * @return    $this The current query, for fluid interface
  */
 public function joinWithI18n($locale = '<?php echo $defaultLocale ?>', $joinType = Criteria::LEFT_JOIN)
 {

src/Propel/Generator/Behavior/I18n/templates/queryJoinWithI18n.php

@@ -27,7 +27,7 @@ class SluggableBehavior extends Behavior
      * @var ObjectBuilder
      */
     private $builder;
-    
+
     /**
      * @var array
      */
@@ -63,15 +63,15 @@ public function modifyTable()
             }
         }
     }
-    
+
     /**
      * Adds a unique constraint to the table to enforce uniqueness of the slug_column
      *
      * @param Table $table
      */
     protected function addUniqueConstraint(Table $table)
     {
-        $unique = new Unique($this->getColumnForParameter('slug_column'));
+        $unique = new Unique();
         $unique->setName($table->getCommonName() . '_slug');
         $unique->addColumn($table->getColumn($this->getParameter('slug_column')));
         if ($this->getParameter('scope_column')) {