SA

ro0NL · ro0NL · commit d247ef7786b5 · 2020-03-08T15:38:20.000+01:00
diff --git a/GenericDomainCollection.php b/GenericDomainCollection.php
@@ -89,8 +89,11 @@ public function containsKey($key): bool
         }
 
         if ($this->elements instanceof \Traversable) {
+            /** @psalm-suppress InvalidCast */
+            $key = \is_int($key) ? (string) $key : $key;
             foreach ($this->elements as $knownKey => $element) {
-                if ((string) $key === (string) $knownKey) {
+                /** @psalm-suppress InvalidCast */
+                if ($key === (\is_int($knownKey) ? (string) $knownKey : $knownKey)) {
                     return true;
                 }
             }
@@ -156,8 +159,11 @@ public function get($key)
         }
 
         if ($this->elements instanceof \Traversable) {
+            /** @psalm-suppress InvalidCast */
+            $key = \is_int($key) ? (string) $key : $key;
             foreach ($this->elements as $knownKey => $element) {
-                if ((string) $key === (string) $knownKey) {
+                /** @psalm-suppress InvalidCast */
+                if ($key === (\is_int($knownKey) ? (string) $knownKey : $knownKey)) {
                     return $element;
                 }
             }
diff --git a/Infrastructure/Config/TreeBuilderHelper.php b/Infrastructure/Config/TreeBuilderHelper.php
@@ -21,9 +21,12 @@ public static function root(string $name, &$treeBuilder = null): ArrayNodeDefini
 
         /**
          * @psalm-suppress RedundantCondition
+         * @psalm-suppress UndefinedMethod
          *
          * @var ArrayNodeDefinition
          */
-        return method_exists($treeBuilder, 'getRootNode') ? $treeBuilder->getRootNode() : $treeBuilder->root($name, 'array', $builder);
+        return method_exists($treeBuilder, 'getRootNode')
+            ? $treeBuilder->getRootNode()
+            : $treeBuilder->root($name, 'array', $builder);
     }
 }
diff --git a/Tests/Infrastructure/Doctrine/DomainEntityRepositoryTraitTest.php b/Tests/Infrastructure/Doctrine/DomainEntityRepositoryTraitTest.php
@@ -48,9 +48,11 @@ public function testAddFieldParameter(): void
 
         $parameters = $qb->getParameters();
 
-        /** @psalm-suppress DeprecatedConstant */
+        /** @psalm-suppress PossiblyNullReference */
         self::assertSame(Type::INTEGER, $parameters->get(0)->getType());
+        /** @psalm-suppress PossiblyNullReference */
         self::assertSame(\PDO::PARAM_STR, $parameters->get(1)->getType());
+        /** @psalm-suppress PossiblyNullReference */
         self::assertSame(TestDomainIdType::NAME, $parameters->get(2)->getType());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -89,8 +89,11 @@ public function containsKey($key): bool`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`if ($this->elements instanceof \Traversable) {`
	`92`	`+ /** @psalm-suppress InvalidCast */`
	`93`	`+ $key = \is_int($key) ? (string) $key : $key;`
`92`	`94`	`foreach ($this->elements as $knownKey => $element) {`
`93`		`- if ((string) $key === (string) $knownKey) {`
	`95`	`+ /** @psalm-suppress InvalidCast */`
	`96`	`+ if ($key === (\is_int($knownKey) ? (string) $knownKey : $knownKey)) {`
`94`	`97`	`return true;`
`95`	`98`	`}`
`96`	`99`	`}`
`@@ -156,8 +159,11 @@ public function get($key)`
`156`	`159`	`}`
`157`	`160`
`158`	`161`	`if ($this->elements instanceof \Traversable) {`
	`162`	`+ /** @psalm-suppress InvalidCast */`
	`163`	`+ $key = \is_int($key) ? (string) $key : $key;`
`159`	`164`	`foreach ($this->elements as $knownKey => $element) {`
`160`		`- if ((string) $key === (string) $knownKey) {`
	`165`	`+ /** @psalm-suppress InvalidCast */`
	`166`	`+ if ($key === (\is_int($knownKey) ? (string) $knownKey : $knownKey)) {`
`161`	`167`	`return $element;`
`162`	`168`	`}`
`163`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,12 @@ public static function root(string $name, &$treeBuilder = null): ArrayNodeDefini`
`21`	`21`
`22`	`22`	`/**`
`23`	`23`	`* @psalm-suppress RedundantCondition`
	`24`	`+ * @psalm-suppress UndefinedMethod`
`24`	`25`	`*`
`25`	`26`	`* @var ArrayNodeDefinition`
`26`	`27`	`*/`
`27`		`- return method_exists($treeBuilder, 'getRootNode') ? $treeBuilder->getRootNode() : $treeBuilder->root($name, 'array', $builder);`
	`28`	`+ return method_exists($treeBuilder, 'getRootNode')`
	`29`	`+ ? $treeBuilder->getRootNode()`
	`30`	`+ : $treeBuilder->root($name, 'array', $builder);`
`28`	`31`	`}`
`29`	`32`	`}`