Merge pull request #1632 from spryker/bugfix/phpstan-level5

Bugfix/phpstan level5

Author: dereuromark

composer.json

@@ -29,7 +29,8 @@
     "require-dev": {
         "monolog/monolog": "^1.3",
         "phpstan/phpstan": "^0.12.4",
-        "phpunit/phpunit": "^7.5.15"
+        "phpunit/phpunit": "^7.5.15",
+        "spryker/code-sniffer": "^0.15.4"
     },
     "suggest": {
         "monolog/monolog": "The recommended logging library to use with Propel."
@@ -43,6 +44,8 @@
         "bin/propel"
     ],
     "scripts": {
+        "cs-check": "phpcs -p -s --standard=vendor/spryker/code-sniffer/Spryker/ruleset.xml src/",
+        "cs-fix": "phpcbf -p --standard=vendor/spryker/code-sniffer/Spryker/ruleset.xml src/",
         "stan": [
             "vendor/bin/phpstan analyze"
         ]

phpstan-baseline.neon

@@ -2,6 +2,8 @@ includes:
     - phpstan-baseline.neon
 parameters:
     level: 5
+    checkGenericClassInNonGenericObjectType: false
+    checkMissingIterableValueType: false
     paths:
         - '%rootDir%/../../../src/'
     excludes_analyse:
@@ -20,4 +22,7 @@ parameters:
     ignoreErrors:
         - '#Call to an undefined method .+Collection::.+Array\(\)#'
         - '#Class .+TreeBuilder constructor invoked with 0 parameters, 1-3 required#'
+        -
+        	message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\TreeBuilder\\:\\:root\\(\\)\\.$#"
+        	path: src/Propel/Common/Config/PropelConfiguration.php
         - '#PHPDoc tag @throws with type .+FileLoaderLoadException|.+LoaderLoadException is not subtype of Throwable#'

phpstan.neon

@@ -134,6 +134,7 @@ public function getConnectionParametersArray($section = 'runtime')
      *
      * @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.
+     * @return void
      */
     protected function load($fileName, $extraConf)
     {
@@ -180,11 +181,12 @@ protected function load($fileName, $extraConf)
      * @param array $extraConf Extra configuration to merge before processing. It's useful when a child class overwrite
      *                         the constructor to pass a built-in array of configuration, without load it from file. I.e.
      *                         Propel\Generator\Config\QuickGeneratorConfig class.
+     * @return void
      */
     protected function process($extraConf = null)
     {
         if (null === $extraConf && count($this->config) <= 0) {
-            return null;
+            return;
         }
 
         $processor = new Processor();
@@ -278,6 +280,8 @@ private function getDirs($fileName)
 
     /**
      * Remove empty `slaves` array from configured connections.
+     *
+     * @return void
      */
     private function cleanupSlaveConnections()
     {
@@ -291,6 +295,8 @@ private function cleanupSlaveConnections()
     /**
      * If not defined, set `runtime` and `generator` connections, based on `database.connections` property.
      * Check if runtime and generator connections are correctly defined.
+     *
+     * @return void
      */
     private function cleanupConnections()
     {

src/Propel/Common/Config/ConfigurationManager.php

@@ -46,7 +46,7 @@ abstract class FileLoader extends BaseFileLoader
     /**
      * Constructor.
      *
-     * @param FileLocatorInterface $locator A FileLocator instance
+     * @param FileLocatorInterface|null $locator A FileLocator instance
      */
     public function __construct(FileLocatorInterface $locator = null)
     {
@@ -61,11 +61,12 @@ public function __construct(FileLocatorInterface $locator = null)
      * Replaces parameter placeholders (%name%) by their values for all parameters.
      *
      * @param array $configuration The configuration array to resolve
+     * @return array
      */
     public function resolveParams(array $configuration)
     {
         if ($this->resolved) {
-            return;
+            return [];
         }
 
         $this->config = $configuration;
@@ -84,7 +85,7 @@ public function resolveParams(array $configuration)
     /**
      * Get the pathof a given resource
      *
-     * @param mixed $file The resource
+     * @param string $file The resource
      *
      * @return array|string
      * @throws \InvalidArgumentException                            If the file is not found
@@ -106,6 +107,7 @@ protected function getPath($file)
      *
      * @param string|string[] $ext An extension or an array of extensions
      * @param string|false $resource A resource
+     * @return bool
      */
     protected function checkSupports($ext, $resource)
     {
@@ -140,9 +142,12 @@ protected function checkSupports($ext, $resource)
         return $supported;
     }
 
+    /**
+     * @return bool
+     */
     private function isResolved()
     {
-        return ($this->resolved);
+        return $this->resolved;
     }
 
     /**

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

@@ -47,12 +47,10 @@ public function supports($resource, $type = null)
     /**
      * Loads a resource, merge it with the default configuration array and resolve its parameters.
      *
-     * @param  mixed  $file The resource
-     * @param  string $type The resource type
+     * @param  string  $file The resource
+     * @param  string|null $type The resource type
      * @return array  The configuration array
      *
-     * @return array
-     *
      * @throws \InvalidArgumentException                                if configuration file not found
      * @throws \Propel\Common\Config\Exception\InvalidArgumentException When ini file is not valid
      * @throws \Propel\Common\Config\Exception\InputOutputException     if configuration file is not readable
@@ -143,6 +141,8 @@ private function parseSection(array $section)
      * @param array  $config
      *
      * @throws \Propel\Common\Config\Exception\IniParseException
+     *
+     * @return void
      */
     private function parseKey($key, $value, array &$config)
     {

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

@@ -22,8 +22,8 @@ class JsonFileLoader extends FileLoader
     /**
      * Loads an Json file.
      *
-     * @param mixed  $file The resource
-     * @param string $type The resource type
+     * @param string  $file The resource
+     * @param string|null $type The resource type
      *
      * @return array
      *

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

@@ -31,8 +31,8 @@ class PhpFileLoader extends FileLoader
     /**
      * Loads a PHP file.
      *
-     * @param mixed  $file The resource
-     * @param string $type The resource type
+     * @param string  $file The resource
+     * @param string|null $type The resource type
      *
      * @return array
      *

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

@@ -22,8 +22,8 @@ class XmlFileLoader extends FileLoader
     /**
      * Loads an Xml file.
      *
-     * @param mixed  $file The resource
-     * @param string $type The resource type
+     * @param string  $file The resource
+     * @param string|null $type The resource type
      *
      * @return array
      *

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

@@ -24,8 +24,8 @@ class YamlFileLoader extends FileLoader
     /**
      * Loads a Yaml file.
      *
-     * @param mixed  $file The resource
-     * @param string $type The resource type
+     * @param string  $file The resource
+     * @param string|null $type The resource type
      *
      * @return array
      *