Merge pull request #1954 from michbeck/bugfix/fix-cs-redundant-type-casts

dereuromark · web-flow · commit 011aaa77d09f · 2023-01-25T15:47:29.000+01:00
Fix up redundant type casts
diff --git a/src/Propel/Generator/Builder/Om/ObjectBuilder.php b/src/Propel/Generator/Builder/Om/ObjectBuilder.php
@@ -200,7 +200,7 @@ protected function getDefaultValueString(Column $column): string
             }
             $defaultValue = (string)array_search($val, $valueSet);
         } elseif ($column->isSetType()) {
-            $defaultValue = (string)SetColumnConverter::convertToInt($val, $column->getValueSet());
+            $defaultValue = SetColumnConverter::convertToInt($val, $column->getValueSet());
         } elseif ($column->isPhpPrimitiveType()) {
             settype($val, $column->getPhpType());
             $defaultValue = var_export($val, true);
diff --git a/src/Propel/Generator/Command/TestPrepareCommand.php b/src/Propel/Generator/Command/TestPrepareCommand.php
@@ -151,7 +151,7 @@ protected function buildFixtures(string $fixturesDir, array $connections, InputI
             $command->run($in, $output);
         }
 
-        if (0 < count((array)$this->getSchemas('.'))) {
+        if (0 < count($this->getSchemas('.'))) {
             $in = new ArrayInput([
                 'command' => 'model:build',
                 '--schema-dir' => '.',
diff --git a/src/Propel/Generator/Manager/AbstractManager.php b/src/Propel/Generator/Manager/AbstractManager.php
@@ -235,7 +235,7 @@ public function getDatabase(string $name): ?Database
      */
     public function setValidate(bool $validate): void
     {
-        $this->validate = (bool)$validate;
+        $this->validate = $validate;
     }
 
     /**
diff --git a/src/Propel/Generator/Manager/ReverseManager.php b/src/Propel/Generator/Manager/ReverseManager.php
@@ -150,7 +150,7 @@ public function setDatabaseName(string $databaseName): void
      */
     public function setSamePhpName(bool $samePhpName): void
     {
-        $this->samePhpName = (bool)$samePhpName;
+        $this->samePhpName = $samePhpName;
     }
 
     /**
@@ -162,7 +162,7 @@ public function setSamePhpName(bool $samePhpName): void
      */
     public function setAddVendorInfo(bool $addVendorInfo): void
     {
-        $this->addVendorInfo = (bool)$addVendorInfo;
+        $this->addVendorInfo = $addVendorInfo;
     }
 
     /**
diff --git a/src/Propel/Generator/Manager/SqlManager.php b/src/Propel/Generator/Manager/SqlManager.php
@@ -80,7 +80,7 @@ public function isOverwriteSqlMap(): bool
      */
     public function setOverwriteSqlMap(bool $overwriteSqlMap): void
     {
-        $this->overwriteSqlMap = (bool)$overwriteSqlMap;
+        $this->overwriteSqlMap = $overwriteSqlMap;
     }
 
     /**
diff --git a/src/Propel/Generator/Model/Column.php b/src/Propel/Generator/Model/Column.php
@@ -928,7 +928,7 @@ public function getNotNullString(): string
      */
     public function setPrimaryString(bool $isPrimaryString): void
     {
-        $this->isPrimaryString = (bool)$isPrimaryString;
+        $this->isPrimaryString = $isPrimaryString;
     }
 
     /**
@@ -973,7 +973,7 @@ public function isPrimaryKey(): bool
      */
     public function setNodeKey(bool $isNodeKey): void
     {
-        $this->isNodeKey = (bool)$isNodeKey;
+        $this->isNodeKey = $isNodeKey;
     }
 
     /**
@@ -995,7 +995,7 @@ public function isNodeKey(): bool
      */
     public function setNodeKeySep(string $sep): void
     {
-        $this->nodeKeySep = (string)$sep;
+        $this->nodeKeySep = $sep;
     }
 
     /**
@@ -1017,7 +1017,7 @@ public function getNodeKeySep(): string
      */
     public function setNestedSetLeftKey(bool $isNestedSetLeftKey): void
     {
-        $this->isNestedSetLeftKey = (bool)$isNestedSetLeftKey;
+        $this->isNestedSetLeftKey = $isNestedSetLeftKey;
     }
 
     /**
@@ -1039,7 +1039,7 @@ public function isNestedSetLeftKey(): bool
      */
     public function setNestedSetRightKey(bool $isNestedSetRightKey): void
     {
-        $this->isNestedSetRightKey = (bool)$isNestedSetRightKey;
+        $this->isNestedSetRightKey = $isNestedSetRightKey;
     }
 
     /**
@@ -1061,7 +1061,7 @@ public function isNestedSetRightKey(): bool
      */
     public function setTreeScopeKey(bool $isTreeScopeKey): void
     {
-        $this->isTreeScopeKey = (bool)$isTreeScopeKey;
+        $this->isTreeScopeKey = $isTreeScopeKey;
     }
 
     /**
diff --git a/src/Propel/Generator/Model/ForeignKey.php b/src/Propel/Generator/Model/ForeignKey.php
@@ -1025,7 +1025,7 @@ public function isLocalPrimaryKey(): bool
      */
     public function setSkipSql(bool $skip): void
     {
-        $this->skipSql = (bool)$skip;
+        $this->skipSql = $skip;
     }
 
     /**
diff --git a/src/Propel/Generator/Model/Index.php b/src/Propel/Generator/Model/Index.php
@@ -190,7 +190,7 @@ public function addColumn($data): void
     {
         if ($data instanceof Column) {
             $column = $data;
-            $this->columns[] = (string)$column->getName();
+            $this->columns[] = $column->getName();
             if ($column->getSize()) {
                 $this->columnsSize[$column->getName()] = (int)$column->getSize();
             }
diff --git a/src/Propel/Generator/Model/Table.php b/src/Propel/Generator/Model/Table.php
@@ -205,7 +205,7 @@ public function setupObject(): void
         // retrieves the method for converting from specified name to a PHP name.
         $this->phpNamingMethod = $this->getAttribute('phpNamingMethod', $this->database->getDefaultPhpNamingMethod());
 
-        $this->phpName = $this->getAttribute('phpName', $this->buildPhpName((string)$this->getStdSeparatedName()));
+        $this->phpName = $this->getAttribute('phpName', $this->buildPhpName($this->getStdSeparatedName()));
 
         if ($this->database->getTablePrefix()) {
             $this->commonName = $this->database->getTablePrefix() . $this->commonName;
@@ -944,7 +944,7 @@ public function getOtherRequiredPrimaryKeys(array $primaryKeys): array
      */
     public function setContainsForeignPK(bool $containsForeignPK): void
     {
-        $this->containsForeignPK = (bool)$containsForeignPK;
+        $this->containsForeignPK = $containsForeignPK;
     }
 
     /**
@@ -1248,7 +1248,7 @@ public function setDescription(string $description): void
     public function getPhpName(): string
     {
         if ($this->phpName === null) {
-            $this->phpName = $this->buildPhpName((string)$this->getStdSeparatedName());
+            $this->phpName = $this->buildPhpName($this->getStdSeparatedName());
         }
 
         return $this->phpName;
@@ -1416,7 +1416,7 @@ public function isSkipSql(): bool
      */
     public function setSkipSql(bool $skip): void
     {
-        $this->skipSql = (bool)$skip;
+        $this->skipSql = $skip;
     }
 
     /**
diff --git a/src/Propel/Runtime/ActiveQuery/Criteria.php b/src/Propel/Runtime/ActiveQuery/Criteria.php
@@ -652,7 +652,7 @@ public function hasWhereClause(): bool
      */
     public function setUseTransaction(bool $v)
     {
-        $this->useTransaction = (bool)$v;
+        $this->useTransaction = $v;
 
         return $this;
     }
@@ -1444,7 +1444,7 @@ public function withoutLock()
      */
     public function setIgnoreCase(bool $b)
     {
-        $this->ignoreCase = (bool)$b;
+        $this->ignoreCase = $b;
 
         return $this;
     }
@@ -1474,7 +1474,7 @@ public function isIgnoreCase(): bool
      */
     public function setSingleRecord(bool $b)
     {
-        $this->singleRecord = (bool)$b;
+        $this->singleRecord = $b;
 
         return $this;
     }
diff --git a/src/Propel/Runtime/ActiveQuery/Criterion/BasicCriterion.php b/src/Propel/Runtime/ActiveQuery/Criterion/BasicCriterion.php
@@ -44,7 +44,7 @@ public function __construct(Criteria $outer, $column, $value, ?string $compariso
      */
     public function setIgnoreCase(bool $b)
     {
-        $this->ignoreStringCase = (bool)$b;
+        $this->ignoreStringCase = $b;
 
         return $this;
     }
diff --git a/src/Propel/Runtime/ActiveQuery/Criterion/CustomCriterion.php b/src/Propel/Runtime/ActiveQuery/Criterion/CustomCriterion.php
@@ -38,7 +38,7 @@ public function __construct(Criteria $outer, string $value)
     protected function appendPsForUniqueClauseTo(string &$sb, array &$params): void
     {
         if ($this->value !== '') {
-            $sb .= (string)$this->value;
+            $sb .= $this->value;
         }
     }
 }
diff --git a/src/Propel/Runtime/ActiveQuery/Criterion/LikeCriterion.php b/src/Propel/Runtime/ActiveQuery/Criterion/LikeCriterion.php
@@ -44,7 +44,7 @@ public function __construct(Criteria $outer, $column, $value, string $comparison
      */
     public function setIgnoreCase(bool $b)
     {
-        $this->ignoreStringCase = (bool)$b;
+        $this->ignoreStringCase = $b;
 
         return $this;
     }
diff --git a/src/Propel/Runtime/ActiveQuery/Criterion/LikeModelCriterion.php b/src/Propel/Runtime/ActiveQuery/Criterion/LikeModelCriterion.php
@@ -31,7 +31,7 @@ class LikeModelCriterion extends BasicModelCriterion
      */
     public function setIgnoreCase(bool $b)
     {
-        $this->ignoreStringCase = (bool)$b;
+        $this->ignoreStringCase = $b;
 
         return $this;
     }
diff --git a/src/Propel/Runtime/Adapter/Pdo/MysqlAdapter.php b/src/Propel/Runtime/Adapter/Pdo/MysqlAdapter.php
@@ -128,9 +128,6 @@ public function quoteIdentifierTable(string $table): string
      */
     public function applyLimit(string &$sql, int $offset, int $limit, ?Criteria $criteria = null): void
     {
-        $offset = (int)$offset;
-        $limit = (int)$limit;
-
         if ($limit >= 0) {
             $sql .= ' LIMIT ' . ($offset > 0 ? $offset . ', ' : '') . $limit;
         } elseif ($offset > 0) {
diff --git a/src/Propel/Runtime/Collection/Collection.php b/src/Propel/Runtime/Collection/Collection.php
@@ -648,7 +648,7 @@ public function __call(string $name, $params)
      */
     public function __toString(): string
     {
-        return (string)$this->exportTo($this->getTableMapClass()::DEFAULT_STRING_FORMAT, false);
+        return $this->exportTo($this->getTableMapClass()::DEFAULT_STRING_FORMAT, false);
     }
 
     /**
diff --git a/src/Propel/Runtime/Collection/OnDemandIterator.php b/src/Propel/Runtime/Collection/OnDemandIterator.php
@@ -166,6 +166,6 @@ public function rewind(): void
      */
     public function valid(): bool
     {
-        return (bool)$this->isValid;
+        return $this->isValid;
     }
 }
diff --git a/src/Propel/Runtime/Connection/ConnectionManagerPrimaryReplica.php b/src/Propel/Runtime/Connection/ConnectionManagerPrimaryReplica.php
@@ -90,7 +90,7 @@ public function isForcePrimaryConnection(): bool
      */
     public function setForcePrimaryConnection(bool $isForceMasterConnection): void
     {
-        $this->isForcePrimaryConnection = (bool)$isForceMasterConnection;
+        $this->isForcePrimaryConnection = $isForceMasterConnection;
     }
 
     /**
diff --git a/src/Propel/Runtime/Connection/ConnectionWrapper.php b/src/Propel/Runtime/Connection/ConnectionWrapper.php
@@ -326,7 +326,7 @@ public function forceRollBack(): bool
      */
     public function inTransaction(): bool
     {
-        return (bool)$this->connection->inTransaction();
+        return $this->connection->inTransaction();
     }
 
     /**
diff --git a/src/Propel/Runtime/Map/ColumnMap.php b/src/Propel/Runtime/Map/ColumnMap.php
@@ -335,7 +335,7 @@ public function getSize(): int
      */
     public function setPrimaryKey(bool $pk): void
     {
-        $this->pk = (bool)$pk;
+        $this->pk = $pk;
     }
 
     /**
@@ -357,7 +357,7 @@ public function isPrimaryKey(): bool
      */
     public function setNotNull(bool $nn): void
     {
-        $this->notNull = (bool)$nn;
+        $this->notNull = $nn;
     }
 
     /**
@@ -592,7 +592,7 @@ public static function normalizeName(string $name): string
      */
     public function setPrimaryString(bool $pkString): void
     {
-        $this->isPkString = (bool)$pkString;
+        $this->isPkString = $pkString;
     }
 
     /**
diff --git a/src/Propel/Runtime/Map/TableMap.php b/src/Propel/Runtime/Map/TableMap.php
@@ -401,7 +401,7 @@ public function getPackage(): ?string
      */
     public function setUseIdGenerator(bool $bit): void
     {
-        $this->useIdGenerator = (bool)$bit;
+        $this->useIdGenerator = $bit;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ protected function getDefaultValueString(Column $column): string`
`200`	`200`	`}`
`201`	`201`	`$defaultValue = (string)array_search($val, $valueSet);`
`202`	`202`	`} elseif ($column->isSetType()) {`
`203`		`- $defaultValue = (string)SetColumnConverter::convertToInt($val, $column->getValueSet());`
	`203`	`+ $defaultValue = SetColumnConverter::convertToInt($val, $column->getValueSet());`
`204`	`204`	`} elseif ($column->isPhpPrimitiveType()) {`
`205`	`205`	`settype($val, $column->getPhpType());`
`206`	`206`	`$defaultValue = var_export($val, true);`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ protected function buildFixtures(string $fixturesDir, array $connections, InputI`
`151`	`151`	`$command->run($in, $output);`
`152`	`152`	`}`
`153`	`153`
`154`		`- if (0 < count((array)$this->getSchemas('.'))) {`
	`154`	`+ if (0 < count($this->getSchemas('.'))) {`
`155`	`155`	`$in = new ArrayInput([`
`156`	`156`	`'command' => 'model:build',`
`157`	`157`	`'--schema-dir' => '.',`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ public function getDatabase(string $name): ?Database`
`235`	`235`	`*/`
`236`	`236`	`public function setValidate(bool $validate): void`
`237`	`237`	`{`
`238`		`- $this->validate = (bool)$validate;`
	`238`	`+ $this->validate = $validate;`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ public function setDatabaseName(string $databaseName): void`
`150`	`150`	`*/`
`151`	`151`	`public function setSamePhpName(bool $samePhpName): void`
`152`	`152`	`{`
`153`		`- $this->samePhpName = (bool)$samePhpName;`
	`153`	`+ $this->samePhpName = $samePhpName;`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`/**`
`@@ -162,7 +162,7 @@ public function setSamePhpName(bool $samePhpName): void`
`162`	`162`	`*/`
`163`	`163`	`public function setAddVendorInfo(bool $addVendorInfo): void`
`164`	`164`	`{`
`165`		`- $this->addVendorInfo = (bool)$addVendorInfo;`
	`165`	`+ $this->addVendorInfo = $addVendorInfo;`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public function isOverwriteSqlMap(): bool`
`80`	`80`	`*/`
`81`	`81`	`public function setOverwriteSqlMap(bool $overwriteSqlMap): void`
`82`	`82`	`{`
`83`		`- $this->overwriteSqlMap = (bool)$overwriteSqlMap;`
	`83`	`+ $this->overwriteSqlMap = $overwriteSqlMap;`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -928,7 +928,7 @@ public function getNotNullString(): string`
`928`	`928`	`*/`
`929`	`929`	`public function setPrimaryString(bool $isPrimaryString): void`
`930`	`930`	`{`
`931`		`- $this->isPrimaryString = (bool)$isPrimaryString;`
	`931`	`+ $this->isPrimaryString = $isPrimaryString;`
`932`	`932`	`}`
`933`	`933`
`934`	`934`	`/**`
`@@ -973,7 +973,7 @@ public function isPrimaryKey(): bool`
`973`	`973`	`*/`
`974`	`974`	`public function setNodeKey(bool $isNodeKey): void`
`975`	`975`	`{`
`976`		`- $this->isNodeKey = (bool)$isNodeKey;`
	`976`	`+ $this->isNodeKey = $isNodeKey;`
`977`	`977`	`}`
`978`	`978`
`979`	`979`	`/**`
`@@ -995,7 +995,7 @@ public function isNodeKey(): bool`
`995`	`995`	`*/`
`996`	`996`	`public function setNodeKeySep(string $sep): void`
`997`	`997`	`{`
`998`		`- $this->nodeKeySep = (string)$sep;`
	`998`	`+ $this->nodeKeySep = $sep;`
`999`	`999`	`}`
`1000`	`1000`
`1001`	`1001`	`/**`
`@@ -1017,7 +1017,7 @@ public function getNodeKeySep(): string`
`1017`	`1017`	`*/`
`1018`	`1018`	`public function setNestedSetLeftKey(bool $isNestedSetLeftKey): void`
`1019`	`1019`	`{`
`1020`		`- $this->isNestedSetLeftKey = (bool)$isNestedSetLeftKey;`
	`1020`	`+ $this->isNestedSetLeftKey = $isNestedSetLeftKey;`
`1021`	`1021`	`}`
`1022`	`1022`
`1023`	`1023`	`/**`
`@@ -1039,7 +1039,7 @@ public function isNestedSetLeftKey(): bool`
`1039`	`1039`	`*/`
`1040`	`1040`	`public function setNestedSetRightKey(bool $isNestedSetRightKey): void`
`1041`	`1041`	`{`
`1042`		`- $this->isNestedSetRightKey = (bool)$isNestedSetRightKey;`
	`1042`	`+ $this->isNestedSetRightKey = $isNestedSetRightKey;`
`1043`	`1043`	`}`
`1044`	`1044`
`1045`	`1045`	`/**`
`@@ -1061,7 +1061,7 @@ public function isNestedSetRightKey(): bool`
`1061`	`1061`	`*/`
`1062`	`1062`	`public function setTreeScopeKey(bool $isTreeScopeKey): void`
`1063`	`1063`	`{`
`1064`		`- $this->isTreeScopeKey = (bool)$isTreeScopeKey;`
	`1064`	`+ $this->isTreeScopeKey = $isTreeScopeKey;`
`1065`	`1065`	`}`
`1066`	`1066`
`1067`	`1067`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1025,7 +1025,7 @@ public function isLocalPrimaryKey(): bool`
`1025`	`1025`	`*/`
`1026`	`1026`	`public function setSkipSql(bool $skip): void`
`1027`	`1027`	`{`
`1028`		`- $this->skipSql = (bool)$skip;`
	`1028`	`+ $this->skipSql = $skip;`
`1029`	`1029`	`}`
`1030`	`1030`
`1031`	`1031`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ public function addColumn($data): void`
`190`	`190`	`{`
`191`	`191`	`if ($data instanceof Column) {`
`192`	`192`	`$column = $data;`
`193`		`- $this->columns[] = (string)$column->getName();`
	`193`	`+ $this->columns[] = $column->getName();`
`194`	`194`	`if ($column->getSize()) {`
`195`	`195`	`$this->columnsSize[$column->getName()] = (int)$column->getSize();`
`196`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ public function setupObject(): void`
`205`	`205`	`// retrieves the method for converting from specified name to a PHP name.`
`206`	`206`	`$this->phpNamingMethod = $this->getAttribute('phpNamingMethod', $this->database->getDefaultPhpNamingMethod());`
`207`	`207`
`208`		`- $this->phpName = $this->getAttribute('phpName', $this->buildPhpName((string)$this->getStdSeparatedName()));`
	`208`	`+ $this->phpName = $this->getAttribute('phpName', $this->buildPhpName($this->getStdSeparatedName()));`
`209`	`209`
`210`	`210`	`if ($this->database->getTablePrefix()) {`
`211`	`211`	`$this->commonName = $this->database->getTablePrefix() . $this->commonName;`
`@@ -944,7 +944,7 @@ public function getOtherRequiredPrimaryKeys(array $primaryKeys): array`
`944`	`944`	`*/`
`945`	`945`	`public function setContainsForeignPK(bool $containsForeignPK): void`
`946`	`946`	`{`
`947`		`- $this->containsForeignPK = (bool)$containsForeignPK;`
	`947`	`+ $this->containsForeignPK = $containsForeignPK;`
`948`	`948`	`}`
`949`	`949`
`950`	`950`	`/**`
`@@ -1248,7 +1248,7 @@ public function setDescription(string $description): void`
`1248`	`1248`	`public function getPhpName(): string`
`1249`	`1249`	`{`
`1250`	`1250`	`if ($this->phpName === null) {`
`1251`		`- $this->phpName = $this->buildPhpName((string)$this->getStdSeparatedName());`
	`1251`	`+ $this->phpName = $this->buildPhpName($this->getStdSeparatedName());`
`1252`	`1252`	`}`
`1253`	`1253`
`1254`	`1254`	`return $this->phpName;`
`@@ -1416,7 +1416,7 @@ public function isSkipSql(): bool`
`1416`	`1416`	`*/`
`1417`	`1417`	`public function setSkipSql(bool $skip): void`
`1418`	`1418`	`{`
`1419`		`- $this->skipSql = (bool)$skip;`
	`1419`	`+ $this->skipSql = $skip;`
`1420`	`1420`	`}`
`1421`	`1421`
`1422`	`1422`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -652,7 +652,7 @@ public function hasWhereClause(): bool`
`652`	`652`	`*/`
`653`	`653`	`public function setUseTransaction(bool $v)`
`654`	`654`	`{`
`655`		`- $this->useTransaction = (bool)$v;`
	`655`	`+ $this->useTransaction = $v;`
`656`	`656`
`657`	`657`	`return $this;`
`658`	`658`	`}`
`@@ -1444,7 +1444,7 @@ public function withoutLock()`
`1444`	`1444`	`*/`
`1445`	`1445`	`public function setIgnoreCase(bool $b)`
`1446`	`1446`	`{`
`1447`		`- $this->ignoreCase = (bool)$b;`
	`1447`	`+ $this->ignoreCase = $b;`
`1448`	`1448`
`1449`	`1449`	`return $this;`
`1450`	`1450`	`}`
`@@ -1474,7 +1474,7 @@ public function isIgnoreCase(): bool`
`1474`	`1474`	`*/`
`1475`	`1475`	`public function setSingleRecord(bool $b)`
`1476`	`1476`	`{`
`1477`		`- $this->singleRecord = (bool)$b;`
	`1477`	`+ $this->singleRecord = $b;`
`1478`	`1478`
`1479`	`1479`	`return $this;`
`1480`	`1480`	`}`