More PHPStan fixes.

Author: dereuromark

composer.json

@@ -48,9 +48,8 @@
     "scripts": {
         "cs-check": "phpcs -p -s --standard=config/phpcs.xml src/",
         "cs-fix": "phpcbf -p --standard=config/phpcs.xml src/",
-        "stan": [
-            "vendor/bin/phpstan analyze"
-        ]
+        "stan": "vendor/bin/phpstan analyze",
+        "stan-baseline": "vendor/bin/phpstan analyze --generate-baseline"
     },
     "extra": {
         "branch-alias": {

phpstan-baseline.neon

@@ -90,11 +90,14 @@ public function resolveParams(array $configuration)
      *
      * @throws \Propel\Common\Config\Exception\InputOutputException If the path isnot readable
      *
-     * @return array|string
+     * @return string
      */
     protected function getPath($file)
     {
         $path = $this->locator->locate($file);
+        if (!is_string($path)) {
+            throw new InputOutputException("$file must return a single path.");
+        }
 
         if (!is_readable($path)) {
             throw new InputOutputException("You don't have permissions to access configuration file $file.");

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

@@ -290,7 +290,7 @@ public function syncParentToChild($parentClass \$parent)
         if ($columns === true) {
             $columns = $parentTable->getColumns();
         } else {
-            $columnNames = $columns;
+            $columnNames = $columns ?: [];
             $columns = [];
             foreach ($columnNames as $columnName) {
                 $column = $this->getTable()->getColumn($columnName);

src/Propel/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehavior.php

@@ -198,9 +198,9 @@ protected function getDefaultValueString(Column $column)
             if (!in_array($val, $valueSet)) {
                 throw new EngineException(sprintf('Default Value "%s" is not among the enumerated values', $val));
             }
-            $defaultValue = array_search($val, $valueSet);
+            $defaultValue = (string)array_search($val, $valueSet);
         } elseif ($column->isSetType()) {
-            $defaultValue = SetColumnConverter::convertToInt($val, $column->getValueSet());
+            $defaultValue = (string)SetColumnConverter::convertToInt($val, $column->getValueSet());
         } elseif ($column->isPhpPrimitiveType()) {
             settype($val, $column->getPhpType());
             $defaultValue = var_export($val, true);
@@ -4186,9 +4186,9 @@ protected function addFKAccessor(&$script, ForeignKey $fk)
             if ($rightValueOrColumn instanceof Column) {
                 $localColumns[$rightValueOrColumn->getPosition()] = '$this->' . $clo;
 
-                if ($cptype == 'int' || $cptype == 'float' || $cptype == 'double') {
+                if ($cptype === 'int' || $cptype === 'float' || $cptype === 'double') {
                     $conditional .= $and . '$this->' . $clo . ' != 0';
-                } elseif ($cptype == 'string') {
+                } elseif ($cptype === 'string') {
                     $conditional .= $and . '($this->' . $clo . ' !== "" && $this->' . $clo . ' !== null)';
                 } else {
                     $conditional .= $and . '$this->' . $clo . ' !== null';
@@ -6510,7 +6510,7 @@ protected function addDoInsertBodyRaw()
         }
 
         // if non auto-increment but using sequence, get the id first
-        if (!$platform->isNativeIdMethodAutoIncrement() && $table->getIdMethod() == 'native') {
+        if (!$platform->isNativeIdMethodAutoIncrement() && $table->getIdMethod() === 'native') {
             $column = $table->getFirstPrimaryKeyColumn();
             if (!$column) {
                 throw new PropelException('Cannot find primary key column in table `' . $table->getName() . '`.');
@@ -6571,7 +6571,7 @@ protected function addDoInsertBodyRaw()
 ";
 
         // if auto-increment, get the id after
-        if ($platform->isNativeIdMethodAutoIncrement() && $table->getIdMethod() == 'native') {
+        if ($platform->isNativeIdMethodAutoIncrement() && $table->getIdMethod() === 'native') {
             $script .= "
         try {";
             $script .= $platform->getIdentifierPhp('$pk', '$con', $primaryKeyMethodInfo);

src/Propel/Generator/Builder/Om/ObjectBuilder.php

@@ -517,7 +517,7 @@ public function initialize()
         \$this->setIdentifierQuoting(" . ($table->isIdentifierQuotingEnabled() ? 'true' : 'false') . ");
         \$this->setClassName('" . addslashes($this->getStubObjectBuilder()->getFullyQualifiedClassName()) . "');
         \$this->setPackage('" . parent::getPackage() . "');";
-        if ($table->getIdMethod() == 'native') {
+        if ($table->getIdMethod() === 'native') {
             $script .= "
         \$this->setUseIdGenerator(true);";
         } else {
@@ -696,7 +696,7 @@ public function getBehaviors()
     /**
      * Adds the PHP code to return a instance pool key for the passed-in primary key variable names.
      *
-     * @param array $pkphp An array of PHP var names / method calls representing complete pk.
+     * @param string[]|string $pkphp An array of PHP var names / method calls representing complete pk.
      *
      * @return string
      */

src/Propel/Generator/Builder/Om/TableMapBuilder.php

@@ -21,12 +21,12 @@
 class PropelTemplate
 {
     /**
-     * @var string
+     * @var string|null
      */
     protected $template;
 
     /**
-     * @var string
+     * @var string|null
      */
     protected $templateFile;
 
@@ -75,7 +75,7 @@ public function setTemplateFile($filePath)
      *
      * @param array $vars An associative array of arguments to be rendered
      *
-     * @throws InvalidArgumentException
+     * @throws \Propel\Generator\Exception\InvalidArgumentException
      *
      * @return string The rendered template
      */

src/Propel/Generator/Builder/Util/PropelTemplate.php

@@ -35,7 +35,9 @@ abstract class AbstractCommand extends Command
     protected $filesystem;
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
+     *
+     * @return void
      */
     protected function configure()
     {

src/Propel/Generator/Command/AbstractCommand.php

@@ -133,7 +133,9 @@ public function __toString()
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
+     *
+     * @return void
      */
     protected function parse()
     {
@@ -177,6 +179,7 @@ private function addShortOption(string $shortcut, $value)
      * @param mixed|null $value
      *
      * @throws \Symfony\Component\Console\Exception\InvalidOptionException When a required value is missing
+     *
      * @return void
      */
     private function addLongOption(string $name, $value)

src/Propel/Generator/Command/Console/Input/ArrayInput.php

@@ -56,7 +56,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $configOptions = [];
 
-        $connection = $input->getArgument('connection');
+        $connection = (string)$input->getArgument('connection');
         if (strpos($connection, ':') === false) {
             //treat it as connection name
             $configOptions['propel']['reverse']['connection'] = $connection;