diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 2ffa22c..5871ccd 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -9,5 +9,5 @@ jobs: ci: uses: ray-di/.github/.github/workflows/continuous-integration.yml@v1 with: - old_stable: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"]' - current_stable: 8.4 + old_stable: '["8.0", "8.1", "8.2", "8.3", "8.4"]' + current_stable: 8.5 diff --git a/.gitignore b/.gitignore index 59370d4..97100f6 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ build vendor/ composer.phar composer.lock +.phpunit.cache +.phpunit.result.cache diff --git a/LICENSE b/LICENSE index 635542c..69cf659 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2024 Akihito Koriyama +Copyright (c) 2015-2025 Akihito Koriyama Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/composer.json b/composer.json index 048ffac..ae913b6 100644 --- a/composer.json +++ b/composer.json @@ -2,20 +2,18 @@ "name": "ray/aura-session-module", "description":"Aura Session module for Ray.Di", "keywords":[ - "Ray.Di", - "aura", "session" ], "require": { - "php": "^7.2 || ^8.0", - "ray/di": "^2.5.3", + "php": "^8.0", + "ray/di": "^2.14", "aura/session": "^4.0", "ircmaxell/random-lib": "^1.1" }, "require-dev": { - "phpunit/phpunit": "^8.5.29 || ^9" + "phpunit/phpunit": "^9.6" }, - "license": "MIT", + "license": "MIT", "autoload":{ "psr-4":{ "Ray\\AuraSessionModule\\": "src/" diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 68b862b..17b4329 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,11 +1,22 @@ - - - - tests - - + + + + tests + + + + + src + + diff --git a/src/Annotation/Cookie.php b/src/Annotation/Cookie.php index 40959a0..1565f7a 100644 --- a/src/Annotation/Cookie.php +++ b/src/Annotation/Cookie.php @@ -7,10 +7,6 @@ use Attribute; use Ray\Di\Di\Qualifier; -/** - * @Annotation - * @Qualifier - */ #[Attribute, Qualifier] final class Cookie { diff --git a/src/Annotation/DeleteCookie.php b/src/Annotation/DeleteCookie.php index c153ed3..4d411a9 100644 --- a/src/Annotation/DeleteCookie.php +++ b/src/Annotation/DeleteCookie.php @@ -7,10 +7,6 @@ use Attribute; use Ray\Di\Di\Qualifier; -/** - * @Annotation - * @Qualifier - */ #[Attribute, Qualifier] final class DeleteCookie { diff --git a/src/AuraSessionInject.php b/src/AuraSessionInject.php index 62a33b9..d64c78a 100644 --- a/src/AuraSessionInject.php +++ b/src/AuraSessionInject.php @@ -14,9 +14,6 @@ trait AuraSessionInject /** @var Session */ protected $session; - /** - * @\Ray\Di\Di\Inject - */ public function setSession(Session $session) { $this->session = $session;