From ab3b818d29ee34ffb43178ce35aa80b4a7e2bb17 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Tue, 21 Nov 2023 17:42:24 +0100 Subject: [PATCH] More updates and fixed PHPStan issues --- composer.lock | 72 ++++++++++++++++++------------------ src/Pagination/Paginator.php | 3 +- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/composer.lock b/composer.lock index 98fdfe348a..b515a97d63 100644 --- a/composer.lock +++ b/composer.lock @@ -353,16 +353,16 @@ }, { "name": "doctrine/dbal", - "version": "3.7.1", + "version": "3.7.2", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "5b7bd66c9ff58c04c5474ab85edce442f8081cb2" + "reference": "0ac3c270590e54910715e9a1a044cc368df282b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/5b7bd66c9ff58c04c5474ab85edce442f8081cb2", - "reference": "5b7bd66c9ff58c04c5474ab85edce442f8081cb2", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/0ac3c270590e54910715e9a1a044cc368df282b2", + "reference": "0ac3c270590e54910715e9a1a044cc368df282b2", "shasum": "" }, "require": { @@ -378,7 +378,7 @@ "doctrine/coding-standard": "12.0.0", "fig/log-test": "^1", "jetbrains/phpstorm-stubs": "2023.1", - "phpstan/phpstan": "1.10.35", + "phpstan/phpstan": "1.10.42", "phpstan/phpstan-strict-rules": "^1.5", "phpunit/phpunit": "9.6.13", "psalm/plugin-phpunit": "0.18.4", @@ -446,7 +446,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.7.1" + "source": "https://github.com/doctrine/dbal/tree/3.7.2" }, "funding": [ { @@ -462,7 +462,7 @@ "type": "tidelift" } ], - "time": "2023-10-06T05:06:20+00:00" + "time": "2023-11-19T08:06:58+00:00" }, { "name": "doctrine/deprecations", @@ -1054,16 +1054,16 @@ }, { "name": "doctrine/migrations", - "version": "3.7.0", + "version": "3.7.1", "source": { "type": "git", "url": "https://github.com/doctrine/migrations.git", - "reference": "282661f27129232e94e5e4dd5cb89a95c796bec2" + "reference": "e4e0855ea993d169c8adb50e19b014e64bbdda46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/migrations/zipball/282661f27129232e94e5e4dd5cb89a95c796bec2", - "reference": "282661f27129232e94e5e4dd5cb89a95c796bec2", + "url": "https://api.github.com/repos/doctrine/migrations/zipball/e4e0855ea993d169c8adb50e19b014e64bbdda46", + "reference": "e4e0855ea993d169c8adb50e19b014e64bbdda46", "shasum": "" }, "require": { @@ -1136,7 +1136,7 @@ ], "support": { "issues": "https://github.com/doctrine/migrations/issues", - "source": "https://github.com/doctrine/migrations/tree/3.7.0" + "source": "https://github.com/doctrine/migrations/tree/3.7.1" }, "funding": [ { @@ -1152,20 +1152,20 @@ "type": "tidelift" } ], - "time": "2023-11-13T12:31:07+00:00" + "time": "2023-11-19T06:55:22+00:00" }, { "name": "doctrine/orm", - "version": "2.17.0", + "version": "2.17.1", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "e8afa9f80ce66ac728f63325d102adda01cbd6ff" + "reference": "1a4fe6e0bb67762370937a7e6cee3da40a9122d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/e8afa9f80ce66ac728f63325d102adda01cbd6ff", - "reference": "e8afa9f80ce66ac728f63325d102adda01cbd6ff", + "url": "https://api.github.com/repos/doctrine/orm/zipball/1a4fe6e0bb67762370937a7e6cee3da40a9122d1", + "reference": "1a4fe6e0bb67762370937a7e6cee3da40a9122d1", "shasum": "" }, "require": { @@ -1251,9 +1251,9 @@ ], "support": { "issues": "https://github.com/doctrine/orm/issues", - "source": "https://github.com/doctrine/orm/tree/2.17.0" + "source": "https://github.com/doctrine/orm/tree/2.17.1" }, - "time": "2023-11-15T23:04:41+00:00" + "time": "2023-11-17T06:25:40+00:00" }, { "name": "doctrine/persistence", @@ -8172,18 +8172,18 @@ "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", - "reference": "fab410f6d8c367422c2c932176cf5138850a5183" + "reference": "1c382abf2c3707252b14f73c4af06f0b95b38159" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/fab410f6d8c367422c2c932176cf5138850a5183", - "reference": "fab410f6d8c367422c2c932176cf5138850a5183", + "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/1c382abf2c3707252b14f73c4af06f0b95b38159", + "reference": "1c382abf2c3707252b14f73c4af06f0b95b38159", "shasum": "" }, "require": { "doctrine/data-fixtures": "^1.3", "doctrine/doctrine-bundle": "^2.2", - "doctrine/orm": "^2.14.0", + "doctrine/orm": "^2.14.0 || ^3.0", "doctrine/persistence": "^2.4|^3.0", "php": "^8.1", "symfony/config": "^5.4|^6.0|^7.0", @@ -8201,7 +8201,7 @@ "phpstan/phpstan": "^1.10.39", "phpunit/phpunit": "^9.6.13", "symfony/phpunit-bridge": "^6.3.6", - "vimeo/psalm": "^4.30" + "vimeo/psalm": "^5.15" }, "type": "symfony-bundle", "autoload": { @@ -8251,7 +8251,7 @@ "type": "tidelift" } ], - "time": "2023-11-15T19:59:53+00:00" + "time": "2023-11-19T12:52:46+00:00" }, { "name": "nikic/php-parser", @@ -8355,16 +8355,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.41", + "version": "1.10.43", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "c6174523c2a69231df55bdc65b61655e72876d76" + "reference": "2c4129f6ca8c7cfa870098884b8869b410a5a361" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c6174523c2a69231df55bdc65b61655e72876d76", - "reference": "c6174523c2a69231df55bdc65b61655e72876d76", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2c4129f6ca8c7cfa870098884b8869b410a5a361", + "reference": "2c4129f6ca8c7cfa870098884b8869b410a5a361", "shasum": "" }, "require": { @@ -8413,20 +8413,20 @@ "type": "tidelift" } ], - "time": "2023-11-05T12:57:57+00:00" + "time": "2023-11-19T19:55:25+00:00" }, { "name": "phpstan/phpstan-doctrine", - "version": "1.3.48", + "version": "1.3.53", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-doctrine.git", - "reference": "b0e0c32e261ba0b9c0d4128a3cbbb21a3c7655eb" + "reference": "85def57e5db6ac6c8a512200c0cfadf7b6621b10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/b0e0c32e261ba0b9c0d4128a3cbbb21a3c7655eb", - "reference": "b0e0c32e261ba0b9c0d4128a3cbbb21a3c7655eb", + "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/85def57e5db6ac6c8a512200c0cfadf7b6621b10", + "reference": "85def57e5db6ac6c8a512200c0cfadf7b6621b10", "shasum": "" }, "require": { @@ -8481,9 +8481,9 @@ "description": "Doctrine extensions for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-doctrine/issues", - "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.48" + "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.53" }, - "time": "2023-11-15T13:05:32+00:00" + "time": "2023-11-21T10:31:58+00:00" }, { "name": "phpstan/phpstan-symfony", diff --git a/src/Pagination/Paginator.php b/src/Pagination/Paginator.php index 12e65c300e..f745bbd174 100644 --- a/src/Pagination/Paginator.php +++ b/src/Pagination/Paginator.php @@ -32,7 +32,7 @@ final class Paginator private int $numResults; /** - * @var \Traversable + * @var \Traversable */ private \Traversable $results; @@ -59,6 +59,7 @@ public function paginate(int $page = 1): self $query->setHint(CountWalker::HINT_DISTINCT, false); } + /** @var DoctrinePaginator $paginator */ $paginator = new DoctrinePaginator($query, true); /** @var array $havingDqlParts */