Merge pull request propelorm#1810 from propelorm/bugfix/cleanup

Fix some code smells reported by PHPStorm.
michbeck · Dec 7, 2021 · 4f4ef1b · 4f4ef1b
2 parents 7f5c1a3 + fd1eb6c
commit 4f4ef1b
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 23 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/phpstan.neon b/phpstan.neon
@@ -22,7 +22,6 @@ parameters:
         - '%rootDir%/../../../src/Propel/Generator/Command/InitCommand.php'
     ignoreErrors:
         - '#Call to an undefined method .+Collection::.+Array\(\)#'
-        - '#Return type \(void\) of method .+CollectionIterator::.+\(\) should be compatible with return type \(bool\) of method ArrayIterator<\(int\|string\),mixed>::.+\(\)#'
         -
         	message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\TreeBuilder\\:\\:root\\(\\)\\.$#"
         	path: src/Propel/Common/Config/PropelConfiguration.php
diff --git a/src/Propel/Generator/Builder/DataModelBuilder.php b/src/Propel/Generator/Builder/DataModelBuilder.php
@@ -8,6 +8,7 @@
 
 namespace Propel\Generator\Builder;
 
+use BadMethodCallException;
 use Propel\Generator\Config\GeneratorConfigInterface;
 use Propel\Generator\Model\Inheritance;
 use Propel\Generator\Model\Table;
@@ -443,10 +444,16 @@ public function setTable(Table $table)
     /**
      * Returns the current Table object.
      *
+     * @throws \BadMethodCallException
+     *
      * @return \Propel\Generator\Model\Table
      */
     public function getTable()
     {
+        if ($this->table === null) {
+            throw new BadMethodCallException('No $table set to return.');
+        }
+
         return $this->table;
     }
 
@@ -459,7 +466,7 @@ public function getPlatform()
     {
         if ($this->platform === null) {
             // try to load the platform from the table
-            $table = $this->getTable();
+            $table = $this->table;
             if ($table && $database = $table->getDatabase()) {
                 $this->setPlatform($database->getPlatform());
             }
@@ -507,9 +514,7 @@ public function quoteIdentifier($text)
      */
     public function getDatabase()
     {
-        if ($this->getTable()) {
-            return $this->getTable()->getDatabase();
-        }
+        return $this->getTable()->getDatabase();
     }
 
     /**

diff --git a/src/Propel/Runtime/ActiveQuery/InstancePoolTrait.php b/src/Propel/Runtime/ActiveQuery/InstancePoolTrait.php
@@ -41,7 +41,7 @@ public static function addInstanceToPool($object, $key = null)
     /**
      * @param mixed $value
      *
-     * @return string
+     * @return string|null
      */
     public static function getInstanceKey($value)
     {
@@ -61,6 +61,8 @@ public static function getInstanceKey($value)
             // assume we've been passed a primary key
             return (string)$value;
         }
+
+        return null;
     }
 
     /**

diff --git a/src/Propel/Runtime/Collection/OnDemandCollection.php b/src/Propel/Runtime/Collection/OnDemandCollection.php
@@ -22,7 +22,7 @@
 class OnDemandCollection extends Collection
 {
     /**
-     * @var \Iterator
+     * @var \Propel\Runtime\Collection\OnDemandIterator
      */
     private $lastIterator;
 

diff --git a/tests/Propel/Tests/Generator/Command/InitCommandTest.php b/tests/Propel/Tests/Generator/Command/InitCommandTest.php
@@ -29,11 +29,6 @@ class InitCommandTest extends TestCaseFixtures
      */
     private $dir;
 
-    /**
-     * @var string
-     */
-    private $currentDir;
-
     /**
      * @return void
      */
@@ -48,7 +43,6 @@ public function setUp(): void
         }
         $filesystem->mkdir($this->dir);
 
-        $this->currentDir = getcwd();
         chdir($this->dir);
     }
 

diff --git a/tests/Propel/Tests/Generator/Reverse/AbstractSchemaParserTest.php b/tests/Propel/Tests/Generator/Reverse/AbstractSchemaParserTest.php
@@ -78,8 +78,6 @@ protected function setUp(): void
         $currentDriverName = $this->con->getAttribute(PDO::ATTR_DRIVER_NAME);
         if ($currentDriverName !== $expectedDriverName) {
             $this->markTestSkipped("This test is designed for $expectedDriverName and cannot be run with $currentDriverName");
-
-            return;
         }
 
         if ($this->parser === null) {

diff --git a/tests/Propel/Tests/Runtime/Util/PropelDateTimeTest.php b/tests/Propel/Tests/Runtime/Util/PropelDateTimeTest.php
@@ -210,7 +210,7 @@ public function provideValidNewInstanceValues()
             'unix_timestamp' => ['1312960848', '2011-08-10 07:20:48'],
             'Y-m-d H:is' => ['2011-08-10 10:22:15', '2011-08-10 10:22:15'],
             'Ymd' => ['20110810', '2011-08-10 00:00:00'],
-            'Ymd' => ['20110720', '2011-07-20 00:00:00'],
+            'Ymd2' => ['20110720', '2011-07-20 00:00:00'],
             'datetime_object' => [new DateTime('2011-08-10 10:23:10'), '2011-08-10 10:23:10'],
             'datetimeimmutable_object' => [new DateTimeImmutable('2011-08-10 10:23:10'), '2011-08-10 10:23:10'],
         ];
@@ -224,7 +224,7 @@ public function provideValidNewInstanceValuesGmt1()
             'unix_timestamp' => ['1312960848', '2011-08-10 09:20:48'],
             // "1323517115" : Sat, 10 Dec 2011 11:38:35 GMT
             // "2011-12-10 12:38:35" : GMT +1
-            'unix_timestamp' => ['1323517115', '2011-12-10 12:38:35'],
+            'unix_timestamp2' => ['1323517115', '2011-12-10 12:38:35'],
         ];
     }