Skip to content
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

Update dependency and PHP version for enhanced compatibility #74

Merged
merged 10 commits into from
Jan 22, 2025
Merged

Update dependency and PHP version for enhanced compatibility #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
24e89ae
Update PHP version to 8.3 in GitHub workflows
koriym Oct 4, 2024
433444d
Update dependency constraints for compatibility
koriym Jan 22, 2025
a84999a
Add NamedArgumentConstructor to annotations
koriym Jan 22, 2025
d5002b7
Add missing PHPDoc for getConnection method parameter
koriym Jan 22, 2025
82641f9
Add return type to countQueryBuilderModifier closure
koriym Jan 22, 2025
f09de05
Update dependencies in composer.lock
koriym Jan 22, 2025
c8572dc
Add NamedArgumentConstructor attribute to Write class
koriym Jan 22, 2025
e025eca
Refactor annotations to align with updated syntax.
koriym Jan 22, 2025
b5d6bf2
Update Psalm command to disable info messages
koriym Jan 22, 2025
9f21e05
Remove unused NamedArgumentConstructorAnnotation imports
koriym Jan 22, 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
2 changes: 1 addition & 1 deletion .github/workflows/coding-standards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ jobs:
cs:
uses: ray-di/.github/.github/workflows/coding-standards.yml@v1
with:
php_version: 8.1
php_version: 8.3
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ jobs:
sa:
uses: ray-di/.github/.github/workflows/static-analysis.yml@v1
with:
php_version: 8.1
php_version: 8.3
koriym marked this conversation as resolved.
Show resolved Hide resolved
has_crc_config: false
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 @@ -15,8 +15,8 @@
"aura/sql": "^4.0 || ^5.0",
"aura/sqlquery": "^2.7.1 || 3.x-dev",
"pagerfanta/pagerfanta": "^3.5",
"rize/uri-template": "^0.3.4",
"doctrine/annotations": "^1.11",
"rize/uri-template": "^0.3.4 || ^0.4",
"doctrine/annotations": "^1.11 || ^2.0",
koriym marked this conversation as resolved.
Show resolved Hide resolved
"psr/log": "^1.1 || ^2.0 || ^3.0",
"symfony/polyfill-php81": "^1.24"
},
Expand Down Expand Up @@ -52,7 +52,7 @@
"cs": ["phpcs --standard=./phpcs.xml src tests"],
"cs-fix": ["./vendor/bin/phpcbf src tests"],
"clean": ["./vendor/bin/phpstan clear-result-cache", "./vendor/bin/psalm --clear-cache", "rm -rf tests/tmp/*.php"],
"sa": ["./vendor/bin/phpstan analyse -c phpstan.neon", "psalm --show-info=true"],
"sa": ["./vendor/bin/phpstan analyse -c phpstan.neon", "psalm --show-info=false"],
"metrics": ["./vendor/bin/phpmetrics --report-html=build/metrics --exclude=Exception --log-junit=build/junit.xml --junit=build/junit.xml src"],
"phpmd": ["./vendor/bin/phpmd src text ./phpmd.xml"],
"build": ["@cs", "@sa", "@pcov", "@metrics"]
Expand Down
4 changes: 2 additions & 2 deletions src-deprecated/Annotation/AuraSqlConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
namespace Ray\AuraSqlModule\Annotation;

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

/**
* @Annotation
* @Target("METHOD")
* @Qualifier
* @deprecated -- No one using?
* @NamedArgumentConstructor
*/
#[Attribute(Attribute::TARGET_METHOD), Qualifier]
final class AuraSqlConfig implements NamedArgumentConstructorAnnotation
final class AuraSqlConfig
{
/** @var ?array<string> */
public $value;
Expand Down
4 changes: 2 additions & 2 deletions src-deprecated/Annotation/Write.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
namespace Ray\AuraSqlModule\Annotation;

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

/**
* @Annotation
* @Target("METHOD")
* @Qualifier
* @deprecated -- No one using?
* @NamedArgumentConstructor
*/
#[Attribute(Attribute::TARGET_METHOD), Qualifier]
final class Write implements NamedArgumentConstructorAnnotation
final class Write
koriym marked this conversation as resolved.
Show resolved Hide resolved
{
/** @var string */
public $value;
Expand Down
5 changes: 3 additions & 2 deletions src/Annotation/AuraSqlQueryConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@
namespace Ray\AuraSqlModule\Annotation;

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

/**
* @Annotation
* @Target("METHOD")
* @Qualifier
* @NamedArgumentConstructor
*/
#[Attribute(Attribute::TARGET_METHOD), Qualifier]
final class AuraSqlQueryConfig implements NamedArgumentConstructorAnnotation
final class AuraSqlQueryConfig
{
/** @var ?array<string, string> */
public $value;
Expand Down
5 changes: 3 additions & 2 deletions src/Annotation/PagerViewOption.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@
namespace Ray\AuraSqlModule\Annotation;

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

/**
* @Annotation
* @Target("METHOD")
* @Qualifier
* @NamedArgumentConstructor()
*/
#[Attribute(Attribute::TARGET_METHOD), Qualifier]
final class PagerViewOption implements NamedArgumentConstructorAnnotation
final class PagerViewOption
{
/** @var string */
public $value;
Expand Down
5 changes: 3 additions & 2 deletions src/Annotation/Read.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@
namespace Ray\AuraSqlModule\Annotation;

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

/**
* @Annotation
* @Target("METHOD")
* @Qualifier
* @NamedArgumentConstructor
*/
#[Attribute(Attribute::TARGET_METHOD), Qualifier]
final class Read implements NamedArgumentConstructorAnnotation
final class Read
{
/** @var string */
public $value;
Expand Down
5 changes: 3 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,14 +5,15 @@
namespace Ray\AuraSqlModule\Annotation;

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

/**
* @Annotation
* @Target("METHOD")
* @NamedArgumentConstructor()
*/
#[Attribute(Attribute::TARGET_METHOD)]
final class Transactional implements NamedArgumentConstructorAnnotation
final class Transactional
{
/**
* @var ?array<string>
Expand Down
1 change: 1 addition & 0 deletions src/AuraSqlConnectionInterceptor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public function invoke(MethodInvocation $invocation)
return $invocation->proceed();
}

/** @param MethodInvocation<object> $invocation */
private function getConnection(MethodInvocation $invocation): ExtendedPdoInterface
{
$methodName = $invocation->getMethod()->name;
Expand Down
2 changes: 1 addition & 1 deletion src/Pagerfanta/AuraSqlQueryPager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public function offsetGet($page): Page
throw new NotInitialized();
}

$countQueryBuilderModifier = static function (Select $select) {
$countQueryBuilderModifier = static function (Select $select): Select {
foreach (array_keys($select->getCols()) as $key) {
$select->removeCol($key);
}
Expand Down
Loading
Loading