fixes for latest PHPStan strict rules

nextras · Jul 1, 2023 · e8397bd · e8397bd
1 parent d7735d5
commit e8397bd
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 18 deletions.
diff --git a/src/Mapper/Dbal/RelationshipMapperManyHasMany.php b/src/Mapper/Dbal/RelationshipMapperManyHasMany.php
@@ -123,7 +123,6 @@ protected function execute(DbalCollection $collection, IEntity $parent): MultiEn
 		$builder = $collection->getQueryBuilder();
 
 		$cacheKey = $this->calculateCacheKey($builder, $values);
-		/** @var MultiEntityIterator|null $data */
 		$data = &$this->cacheEntityIterators[$cacheKey];
 
 		if ($data !== null) {
@@ -217,13 +216,13 @@ protected function executeCounts(DbalCollection $collection, IEntity $parent): a
 		$builder = $collection->getQueryBuilder();
 
 		$cacheKey = $this->calculateCacheKey($builder, $values);
-		/** @var array<int>|null $data */
 		$data = &$this->cacheCounts[$cacheKey];
 
 		if ($data !== null) {
 			return $data;
 		}
 
+		/** @noinspection PhpUnnecessaryLocalVariableInspection */
 		$data = $this->fetchCounts($builder, $values);
 		return $data;
 	}

diff --git a/src/Mapper/Dbal/RelationshipMapperManyHasOne.php b/src/Mapper/Dbal/RelationshipMapperManyHasOne.php
@@ -76,13 +76,13 @@ protected function execute(DbalCollection $collection, IEntity $parent): MultiEn
 		$builder = $collection->getQueryBuilder();
 
 		$cacheKey = $this->calculateCacheKey($builder, $values);
-		/** @var MultiEntityIterator|null $data */
 		$data = &$this->cacheEntityIterators[$cacheKey];
 
 		if ($data !== null) {
 			return $data;
 		}
 
+		/** @noinspection PhpUnnecessaryLocalVariableInspection */
 		$data = $this->fetch(clone $builder, $values);
 		return $data;
 	}

diff --git a/src/Mapper/Dbal/RelationshipMapperOneHasMany.php b/src/Mapper/Dbal/RelationshipMapperOneHasMany.php
@@ -104,7 +104,6 @@ protected function execute(DbalCollection $collection, IEntity $parent): MultiEn
 		$builder = $collection->getQueryBuilder();
 
 		$cacheKey = $this->calculateCacheKey($builder, $values);
-		/** @var MultiEntityIterator|null $data */
 		$data = &$this->cacheEntityIterators[$cacheKey];
 
 		if ($data !== null) {
@@ -236,13 +235,13 @@ protected function executeCounts(DbalCollection $collection, IEntity $parent): a
 		$builder = $collection->getQueryBuilder();
 
 		$cacheKey = $this->calculateCacheKey($builder, $values);
-		/** @var array<int|string, int>|null $data */
 		$data = &$this->cacheCounts[$cacheKey];
 
 		if ($data !== null) {
 			return $data;
 		}
 
+		/** @noinspection PhpUnnecessaryLocalVariableInspection */
 		$data = $this->fetchCounts($builder, $values);
 		return $data;
 	}

diff --git a/tests/cases/integration/Mapper/DbalPersistAutoupdateMapperTest.phpt b/tests/cases/integration/Mapper/DbalPersistAutoupdateMapperTest.phpt
@@ -54,9 +54,8 @@ class DbalPersistAutoupdateMapperTest extends DataTestCase
 		Assert::same('Test Collection 11', $bookCollection->name);
 		Assert::type(DateTimeImmutable::class, $bookCollection->updatedAt);
 		$new = $bookCollection->updatedAt;
-		Assert::notEqual($old->format(DateTime::ISO8601), $new->format(DateTime::ISO8601));
+		Assert::notEqual($old->format(DateTime::ATOM), $new->format(DateTime::ATOM));
 
-		/** @var IConnection $connection */
 		$connection = $this->container->getByType(Connection::class);
 		$connection->query('DELETE FROM book_collections WHERE id = %i', $bookCollection->id);
 

diff --git a/tests/cases/integration/Relationships/relationships.manyHasMany.phpt b/tests/cases/integration/Relationships/relationships.manyHasMany.phpt
@@ -48,7 +48,6 @@ class RelationshipManyHasManyTest extends DataTestCase
 		$book->tags->add(3);
 		$this->orm->books->persistAndFlush($book);
 
-		/** @var Book[] $books */
 		$books = $this->orm->books->findAll()->orderBy('id');
 
 		$tags = [];
@@ -71,7 +70,6 @@ class RelationshipManyHasManyTest extends DataTestCase
 
 	public function testEmptyPreloadContainer(): void
 	{
-		/** @var Book[] $books */
 		$books = $this->orm->books->findAll()->orderBy('id');
 		$tags = [];
 

diff --git a/tests/cases/integration/Relationships/relationships.manyHasOne.phpt b/tests/cases/integration/Relationships/relationships.manyHasOne.phpt
@@ -22,7 +22,6 @@ class RelationshipManyHasOneTest extends DataTestCase
 
 	public function testBasics(): void
 	{
-		/** @var Book[] $books */
 		$books = $this->orm->books->findAll()->orderBy('id');
 		$authors = [];
 
@@ -63,7 +62,6 @@ class RelationshipManyHasOneTest extends DataTestCase
 
 	public function testEmptyEntityPreloadContainer(): void
 	{
-		/** @var Book[] $books */
 		$books = $this->orm->books->findAll()->orderBy('id');
 		$authors = [];
 

diff --git a/tests/cases/integration/Relationships/relationships.oneHasMany.compositePK.phpt b/tests/cases/integration/Relationships/relationships.oneHasMany.compositePK.phpt
@@ -37,7 +37,6 @@ class RelationshipOneHasManyCompositePkTest extends DataTestCase
 		$this->orm->tagFollowers->persistAndFlush($tagFollower);
 
 		$tagFollowers = [];
-		/** @var Author[] $authors */
 		$authors = $this->orm->authors->findAll()->orderBy('id');
 
 		foreach ($authors as $author) {

diff --git a/tests/cases/integration/Relationships/relationships.oneHasMany.phpt b/tests/cases/integration/Relationships/relationships.oneHasMany.phpt
@@ -185,7 +185,6 @@ class RelationshipOneHasManyTest extends DataTestCase
 		$book->publisher = 1;
 		$this->orm->books->persistAndFlush($book);
 
-		/** @var Author[] $authors */
 		$authors = $this->orm->authors->findAll()->orderBy('id');
 
 		$books = [];
@@ -211,7 +210,6 @@ class RelationshipOneHasManyTest extends DataTestCase
 	{
 		$books = [];
 
-		/** @var Author[] $authors */
 		$authors = $this->orm->authors->findAll()->orderBy('id');
 		foreach ($authors as $author) {
 			$author->setPreloadContainer(null);

diff --git a/tests/cases/unit/Entity/AbstractEntity.repository.phpt b/tests/cases/unit/Entity/AbstractEntity.repository.phpt
@@ -28,7 +28,6 @@ class AbstractEntityRepositoryTest extends TestCase
 		$repository = Mockery::mock(IRepository::class);
 		$metadata = Mockery::mock(EntityMetadata::class);
 
-		/** @var IEntity $entity */
 		$entity = Mockery::mock(AbstractEntity::class)->makePartial();
 		$entity->onAttach($repository, $metadata);
 
@@ -41,7 +40,6 @@ class AbstractEntityRepositoryTest extends TestCase
 		$repository = Mockery::mock(IRepository::class);
 		$metadata = Mockery::mock(EntityMetadata::class);
 
-		/** @var IEntity $entity */
 		$entity = Mockery::mock(AbstractEntity::class)->makePartial();
 		$entity->onAttach($repository, $metadata);
 		Assert::same($repository, $entity->getRepository());

diff --git a/tests/cases/unit/Mapper/Dbal/DbalMapperTest.phpt b/tests/cases/unit/Mapper/Dbal/DbalMapperTest.phpt
@@ -44,7 +44,6 @@ class DbalMapperTest extends TestCase
 		$repository->shouldReceive('hydrateEntity')->once()->with(['id' => 2])->andReturn($b = new Author());
 		$repository->shouldReceive('hydrateEntity')->once()->with(['id' => 3])->andReturn($c = new Author());
 
-		/** @var ArrayCollection<Author> $collection */
 		$collection = $mapper->toCollection([
 			['id' => 1],
 			['id' => 2],
@@ -93,7 +92,6 @@ class DbalMapperTest extends TestCase
 		$result->shouldReceive('next')->times(3);
 		$result->shouldReceive('valid')->once()->andReturn(false);
 
-		/** @var ArrayCollection<Author> $collection */
 		$collection = $mapper->toCollection($result);
 
 		Assert::type(ArrayCollection::class, $collection);