From 6968d86dc42fb50acbb3d050d9dc000c26983686 Mon Sep 17 00:00:00 2001 From: Priyadi Iman Nurcahyo <1102197+priyadi@users.noreply.github.com> Date: Sun, 1 Sep 2024 16:48:02 +0700 Subject: [PATCH] deps: bump rekapager to 0.17 --- CHANGELOG.md | 4 ++ composer.json | 64 ++++++++++---------- packages/collections-common/composer.json | 2 +- packages/collections-contracts/composer.json | 2 +- packages/collections-domain/composer.json | 6 +- packages/collections-orm/composer.json | 6 +- phpstan.neon.dist | 3 + tests/src/App/DataFixtures/AppFixtures.php | 3 + tests/src/App/Factory/CitizenFactory.php | 1 + 9 files changed, 51 insertions(+), 40 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95b4883..44b46ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.11.3 + +* deps: bump rekapager to 0.17 + ## 0.11.2 * fix: `PrecountingStrategy` now accepts null as the underlying data diff --git a/composer.json b/composer.json index 1a9f6e3..2fa6fbd 100644 --- a/composer.json +++ b/composer.json @@ -9,54 +9,40 @@ "email": "priyadi@rekalogika.com" } ], - "autoload": { - "psr-4": { - "Rekalogika\\Collections\\ORM\\": "packages/collections-orm/src/", - "Rekalogika\\Contracts\\Collections\\": "packages/collections-contracts/src/", - "Rekalogika\\Domain\\Collections\\": "packages/collections-domain/src/", - "Rekalogika\\Domain\\Collections\\Common\\": "packages/collections-common/src/" - } - }, - "autoload-dev": { - "psr-4": { - "Doctrine\\Tests\\Common\\Collections\\": "tests/doctrine/", - "Rekalogika\\Collections\\Tests\\": "tests/src/" - } - }, "require": { "doctrine/collections": "^2.2.2 || ^2.3", "doctrine/orm": "^2.14 || ^3.0", "php": "^8.2", - "rekalogika/rekapager-contracts": "^0.15", - "rekalogika/rekapager-doctrine-collections-adapter": "^0.15", - "rekalogika/rekapager-doctrine-orm-adapter": "^0.15", - "rekalogika/rekapager-keyset-pagination": "^0.15" + "rekalogika/rekapager-contracts": "^0.17", + "rekalogika/rekapager-doctrine-collections-adapter": "^0.17", + "rekalogika/rekapager-doctrine-orm-adapter": "^0.17", + "rekalogika/rekapager-keyset-pagination": "^0.17" }, "require-dev": { + "bnf/phpstan-psr-container": "^1.0", + "dama/doctrine-test-bundle": "^8.2", + "doctrine/doctrine-bundle": "^2.11", + "doctrine/doctrine-fixtures-bundle": "^3.6", + "doctrine/persistence": "^3.1", "ekino/phpstan-banned-code": "^1.0 || ^2.0", "phpstan/phpstan": "^1.10.66 || ^1.11", "phpstan/phpstan-deprecation-rules": "^1.1", "phpstan/phpstan-phpunit": "^1.4", "phpunit/phpunit": "^10.1", "psalm/plugin-phpunit": "^0.18.4 || ^0.19.0", - "symfony/var-dumper": "^6.4 || ^7.1", - "symplify/monorepo-builder": "^11.2.20 || ^11.3", - "vimeo/psalm": "^5.15", - "symfony/http-kernel": "^6.4 || ^7.1", + "psalm/plugin-symfony": "^5.2", + "rector/rector": "^1.2", + "symfony/debug-bundle": "^7.1", "symfony/framework-bundle": "^6.4 || ^7.1", - "doctrine/doctrine-bundle": "^2.11", + "symfony/http-kernel": "^6.4 || ^7.1", + "symfony/maker-bundle": "^1.60", "symfony/runtime": "^6.4 || ^7.1", "symfony/uid": "^7.1", - "zenstruck/foundry": "^2.0", - "symfony/maker-bundle": "^1.60", - "doctrine/doctrine-fixtures-bundle": "^3.6", + "symfony/var-dumper": "^6.4 || ^7.1", "symfony/yaml": "^6.4 || ^7.1", - "doctrine/persistence": "^3.1", - "bnf/phpstan-psr-container": "^1.0", - "psalm/plugin-symfony": "^5.2", - "symfony/debug-bundle": "^7.1", - "dama/doctrine-test-bundle": "^8.2", - "rector/rector": "^1.2" + "symplify/monorepo-builder": "^11.2.20 || ^11.3", + "vimeo/psalm": "^5.15", + "zenstruck/foundry": "^2.0" }, "replace": { "rekalogika/collections-common": "0.11.2", @@ -64,6 +50,20 @@ "rekalogika/collections-domain": "0.11.2", "rekalogika/collections-orm": "0.11.2" }, + "autoload": { + "psr-4": { + "Rekalogika\\Collections\\ORM\\": "packages/collections-orm/src/", + "Rekalogika\\Contracts\\Collections\\": "packages/collections-contracts/src/", + "Rekalogika\\Domain\\Collections\\": "packages/collections-domain/src/", + "Rekalogika\\Domain\\Collections\\Common\\": "packages/collections-common/src/" + } + }, + "autoload-dev": { + "psr-4": { + "Doctrine\\Tests\\Common\\Collections\\": "tests/doctrine/", + "Rekalogika\\Collections\\Tests\\": "tests/src/" + } + }, "config": { "allow-plugins": { "symfony/runtime": true diff --git a/packages/collections-common/composer.json b/packages/collections-common/composer.json index adc44a5..92e069a 100644 --- a/packages/collections-common/composer.json +++ b/packages/collections-common/composer.json @@ -35,6 +35,6 @@ "require": { "php": "^8.2", "doctrine/collections": "^2.2.2 || ^2.3", - "rekalogika/rekapager-contracts": "^0.15" + "rekalogika/rekapager-contracts": "^0.17" } } diff --git a/packages/collections-contracts/composer.json b/packages/collections-contracts/composer.json index 43a185d..63ace0a 100644 --- a/packages/collections-contracts/composer.json +++ b/packages/collections-contracts/composer.json @@ -35,6 +35,6 @@ "require": { "php": "^8.2", "doctrine/collections": "^2.2.2 || ^2.3", - "rekalogika/rekapager-contracts": "^0.15" + "rekalogika/rekapager-contracts": "^0.17" } } diff --git a/packages/collections-domain/composer.json b/packages/collections-domain/composer.json index 7ecb8f2..2c0278f 100644 --- a/packages/collections-domain/composer.json +++ b/packages/collections-domain/composer.json @@ -37,8 +37,8 @@ "doctrine/collections": "^2.2.2 || ^2.3", "rekalogika/collections-common": "^0.11.2", "rekalogika/collections-contracts": "^0.11.2", - "rekalogika/rekapager-contracts": "^0.15", - "rekalogika/rekapager-doctrine-collections-adapter": "^0.15", - "rekalogika/rekapager-keyset-pagination": "^0.15" + "rekalogika/rekapager-contracts": "^0.17", + "rekalogika/rekapager-doctrine-collections-adapter": "^0.17", + "rekalogika/rekapager-keyset-pagination": "^0.17" } } diff --git a/packages/collections-orm/composer.json b/packages/collections-orm/composer.json index a49f358..70c4805 100644 --- a/packages/collections-orm/composer.json +++ b/packages/collections-orm/composer.json @@ -39,8 +39,8 @@ "rekalogika/collections-common": "^0.11.2", "rekalogika/collections-contracts": "^0.11.2", "rekalogika/collections-domain": "^0.11.2", - "rekalogika/rekapager-contracts": "^0.15", - "rekalogika/rekapager-doctrine-orm-adapter": "^0.15", - "rekalogika/rekapager-keyset-pagination": "^0.15" + "rekalogika/rekapager-contracts": "^0.17", + "rekalogika/rekapager-doctrine-orm-adapter": "^0.17", + "rekalogika/rekapager-keyset-pagination": "^0.17" } } diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 25df295..3deb62c 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -15,6 +15,9 @@ parameters: - tests/var/* - packages/collections-domain/src/Internal/DirectClosureExpressionVisitor.php ignoreErrors: + - + message: '#Property .* is never assigned .+ so it can be removed from the property type.#' + reportUnmatched: false includes: - vendor/phpstan/phpstan-phpunit/extension.neon diff --git a/tests/src/App/DataFixtures/AppFixtures.php b/tests/src/App/DataFixtures/AppFixtures.php index e250f63..0f730fc 100644 --- a/tests/src/App/DataFixtures/AppFixtures.php +++ b/tests/src/App/DataFixtures/AppFixtures.php @@ -31,6 +31,7 @@ public function load(ObjectManager $manager): void // large set + /** @psalm-suppress InvalidArgument */ $countrySy = CountryFactory::createOne([ 'name' => 'Syldavia', 'code' => 'SY', @@ -53,6 +54,7 @@ public function load(ObjectManager $manager): void // medium set + /** @psalm-suppress InvalidArgument */ $countrySt = CountryFactory::createOne([ 'name' => 'San Theodoros', 'code' => 'ST', @@ -75,6 +77,7 @@ public function load(ObjectManager $manager): void // small set + /** @psalm-suppress InvalidArgument */ $countrySd = CountryFactory::createOne([ 'name' => 'Sondonesia', 'code' => 'SD', diff --git a/tests/src/App/Factory/CitizenFactory.php b/tests/src/App/Factory/CitizenFactory.php index 79e0302..f22e2a9 100644 --- a/tests/src/App/Factory/CitizenFactory.php +++ b/tests/src/App/Factory/CitizenFactory.php @@ -44,6 +44,7 @@ public static function class(): string #[\Override] protected function defaults(): array { + /** @psalm-suppress TooManyTemplateParams */ return [ 'country' => CountryFactory::new(), 'name' => self::faker()->name(),