Skip to content

Add support for aura/sql 6.0 and PHP 8.4 and drop PHP <8.4 support #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Feb 1, 2025
Merged

Add support for aura/sql 6.0 and PHP 8.4 and drop PHP <8.4 support #75

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
191bbb8
Remove `NamedArgumentConstructorAnnotation` implementation
koriym Jan 31, 2025
c252043
Update supported PHP versions in CI workflow
koriym Jan 31, 2025
1b5cf4f
Update composer.json to support aura/sql version 6.0
koriym Jan 31, 2025
45a86c9
Add aura/sqlquery dependency to composer.json
koriym Jan 31, 2025
def34ab
Merge branch '1.x' into php8.4
koriym Jan 31, 2025
3fafcf9
Update PHP and dependencies to latest supported versions
koriym Feb 1, 2025
ebd2072
Refactor for PHP8.4+ only
koriym Feb 1, 2025
a26fd9f
Deprecate injection traits and move to src-deprecated folder
koriym Feb 1, 2025
2f4d32b
Soothe phpstan
koriym Feb 1, 2025
b9a3091
Add Psalm suppression for missing dependency annotation
koriym Feb 1, 2025
b778c8d
Update dependencies to latest versions in composer.lock
koriym Feb 1, 2025
9fa6872
Remove composer-require-checker from dev dependencies
koriym Feb 1, 2025
e2762b5
Set suppressions for unused code issues in Psalm config
koriym Feb 1, 2025
f1c16e6
Update CI workflows to use PHP 8.4
koriym Feb 1, 2025
6d75d7d
Add missing return type annotation in AuraSqlQueryPager
koriym Feb 1, 2025
3c581e7
Update composer.json dependencies
koriym Feb 1, 2025
d50103d
"Remove Scrutinizer configuration file"
koriym Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ jobs:
ci:
uses: ray-di/.github/.github/workflows/continuous-integration.yml@v1
with:
old_stable: '["7.4", "8.0", "8.1", "8.2"]'
current_stable: 8.3
old_stable: '["7.4", "8.0", "8.1", "8.2", "8.3"]'
current_stable: 8.4
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"ext-pdo": "*",
"ray/di": "^2.13.1",
"ray/aop": "^2.10.4",
"aura/sql": "^4.0 || ^5.0",
"aura/sqlquery": "^2.7.1 || 3.x-dev",
"aura/sql": "^4.0 || ^5.0 || ^6.0",
"pagerfanta/pagerfanta": "^3.5",
"rize/uri-template": "^0.3.4 || ^0.4",
"doctrine/annotations": "^1.11 || ^2.0",
"psr/log": "^1.1 || ^2.0 || ^3.0",
"symfony/polyfill-php81": "^1.24"
"symfony/polyfill-php81": "^1.24",
"aura/sqlquery": "^3.0"
},
"require-dev": {
"phpunit/phpunit": "^9.5",
Expand Down
2 changes: 1 addition & 1 deletion src/Annotation/PagerViewOption.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* @Annotation
* @Target("METHOD")
* @Qualifier
* @NamedArgumentConstructor()
* @NamedArgumentConstructor
*/
#[Attribute(Attribute::TARGET_METHOD), Qualifier]
final class PagerViewOption
Expand Down
2 changes: 1 addition & 1 deletion src/Annotation/Read.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace Ray\AuraSqlModule\Annotation;

use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\NamedArgumentConstructorAnnotation;
use Ray\Di\Di\Qualifier;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/Annotation/Transactional.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
namespace Ray\AuraSqlModule\Annotation;

use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\NamedArgumentConstructorAnnotation;

/**
* @Annotation
* @Target("METHOD")
* @NamedArgumentConstructor()
* @NamedArgumentConstructor
*/
#[Attribute(Attribute::TARGET_METHOD)]
final class Transactional
Expand Down
Loading