Skip to content

Commit

Permalink
compat fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
priyadi committed Mar 30, 2024
1 parent c1bc29f commit 5e155c3
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
8 changes: 5 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"require": {
"php": "^8.1",
"doctrine/collections": "^2.0",
"doctrine/collections": "^2.2",
"doctrine/orm": "^2.14 || ^3.0",
"psr/container": "^2.0",
"spomky-labs/base64url": "^2.0",
Expand All @@ -38,20 +38,22 @@
"symfony/http-kernel": "^6.4 || ^7.0",
"symfony/routing": "^6.4 || ^7.0",
"symfony/serializer": "^6.4 || ^7.0",
"twig/twig": "^3.5"
"twig/twig": "^3.8"
},
"require-dev": {
"bnf/phpstan-psr-container": "^1.0",
"doctrine/doctrine-bundle": "^2.11.3",
"doctrine/doctrine-fixtures-bundle": "^3.5",
"doctrine/persistence": "^3.1",
"ekino/phpstan-banned-code": "^1.0",
"phpstan/phpstan": "^1.10",
"fakerphp/faker":"^1.23",
"phpstan/phpstan": "^1.10.66 || ^1.11",
"phpstan/phpstan-deprecation-rules": "^1.1",
"phpstan/phpstan-phpunit": "^1.3",
"phpunit/phpunit": "^10.1",
"psalm/plugin-phpunit": "^0.18.4",
"psalm/plugin-symfony": "^5.1",
"psr/log": "^2.0",
"ramsey/uuid": "^4.7",
"symfony/debug-bundle": "^6.4 || ^7.0",
"symfony/doctrine-bridge": "^6.4 || ^7.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ private function getQueryBuilder(
$queryBuilder->setParameter(
"rekapager_where_{$z}",
$excludeProperty['value'],
// @phpstan-ignore-next-line ORM 2 compatibility
$this->getType($excludeProperty['property'])

Check failure on line 126 in packages/rekapager-doctrine-orm-adapter/src/QueryBuilderAdapter.php

View workflow job for this annotation

GitHub Actions / Symfony 6.*, highest deps, PHP 8.1, ubuntu-latest

No error to ignore is reported on line 126.

Check failure on line 126 in packages/rekapager-doctrine-orm-adapter/src/QueryBuilderAdapter.php

View workflow job for this annotation

GitHub Actions / Symfony 6.*, highest deps, PHP 8.2, ubuntu-latest

No error to ignore is reported on line 126.

Check failure on line 126 in packages/rekapager-doctrine-orm-adapter/src/QueryBuilderAdapter.php

View workflow job for this annotation

GitHub Actions / Symfony 7.*, highest deps, PHP 8.2, ubuntu-latest

No error to ignore is reported on line 126.

Check failure on line 126 in packages/rekapager-doctrine-orm-adapter/src/QueryBuilderAdapter.php

View workflow job for this annotation

GitHub Actions / Symfony 6.*, highest deps, PHP 8.3, ubuntu-latest

No error to ignore is reported on line 126.
);

Expand All @@ -137,6 +138,7 @@ private function getQueryBuilder(
$queryBuilder->setParameter(
"rekapager_where_{$z}",
$property['value'],
// @phpstan-ignore-next-line ORM 2 compatibility
$this->getType($property['property'])

Check failure on line 142 in packages/rekapager-doctrine-orm-adapter/src/QueryBuilderAdapter.php

View workflow job for this annotation

GitHub Actions / Symfony 6.*, highest deps, PHP 8.1, ubuntu-latest

No error to ignore is reported on line 142.

Check failure on line 142 in packages/rekapager-doctrine-orm-adapter/src/QueryBuilderAdapter.php

View workflow job for this annotation

GitHub Actions / Symfony 6.*, highest deps, PHP 8.2, ubuntu-latest

No error to ignore is reported on line 142.

Check failure on line 142 in packages/rekapager-doctrine-orm-adapter/src/QueryBuilderAdapter.php

View workflow job for this annotation

GitHub Actions / Symfony 7.*, highest deps, PHP 8.2, ubuntu-latest

No error to ignore is reported on line 142.

Check failure on line 142 in packages/rekapager-doctrine-orm-adapter/src/QueryBuilderAdapter.php

View workflow job for this annotation

GitHub Actions / Symfony 6.*, highest deps, PHP 8.3, ubuntu-latest

No error to ignore is reported on line 142.
);

Expand All @@ -150,6 +152,7 @@ private function getQueryBuilder(
$queryBuilder->setParameter(
"rekapager_where_{$z}",
$property['value'],
// @phpstan-ignore-next-line ORM 2 compatibility
$this->getType($property['property'])

Check failure on line 156 in packages/rekapager-doctrine-orm-adapter/src/QueryBuilderAdapter.php

View workflow job for this annotation

GitHub Actions / Symfony 6.*, highest deps, PHP 8.1, ubuntu-latest

No error to ignore is reported on line 156.

Check failure on line 156 in packages/rekapager-doctrine-orm-adapter/src/QueryBuilderAdapter.php

View workflow job for this annotation

GitHub Actions / Symfony 6.*, highest deps, PHP 8.2, ubuntu-latest

No error to ignore is reported on line 156.

Check failure on line 156 in packages/rekapager-doctrine-orm-adapter/src/QueryBuilderAdapter.php

View workflow job for this annotation

GitHub Actions / Symfony 7.*, highest deps, PHP 8.2, ubuntu-latest

No error to ignore is reported on line 156.

Check failure on line 156 in packages/rekapager-doctrine-orm-adapter/src/QueryBuilderAdapter.php

View workflow job for this annotation

GitHub Actions / Symfony 6.*, highest deps, PHP 8.3, ubuntu-latest

No error to ignore is reported on line 156.
);

Expand Down
5 changes: 5 additions & 0 deletions psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@
<directory name="tests/src/IntegrationTests/" />
</errorLevel>
</MissingConstructor>
<PossiblyInvalidArgument>
<errorLevel type="suppress">
<file name="packages/rekapager-doctrine-orm-adapter/src/QueryBuilderAdapter.php" />
</errorLevel>
</PossiblyInvalidArgument>
</issueHandlers>

<plugins>
Expand Down

0 comments on commit 5e155c3

Please sign in to comment.