From f8e26ff713ca305e1e855bccd26c0707345f5ae6 Mon Sep 17 00:00:00 2001 From: Akihito Koriyama Date: Wed, 12 Nov 2025 00:33:16 +0900 Subject: [PATCH 1/8] Remove Doctrine annotations in favor of PHP 8 attributes --- src/Annotation/Cookie.php | 4 ---- src/Annotation/DeleteCookie.php | 4 ---- src/AuraSessionInject.php | 3 --- 3 files changed, 11 deletions(-) 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; From 0704d8c050e154a0a23adb82ee203f99c28d0564 Mon Sep 17 00:00:00 2001 From: Akihito Koriyama Date: Wed, 12 Nov 2025 00:34:15 +0900 Subject: [PATCH 2/8] Update copyright year to 2025 --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 99acfdca1ed0824a385711cbcaf796d60f9b6157 Mon Sep 17 00:00:00 2001 From: Akihito Koriyama Date: Wed, 12 Nov 2025 00:35:28 +0900 Subject: [PATCH 3/8] Update minimum PHP version to 8.2 --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index aed1bcd..ec9beb0 100644 --- a/composer.json +++ b/composer.json @@ -7,15 +7,15 @@ "session" ], "require": { - "php": "^7.2 || ^8.0", + "php": "^8.2", "ray/di": "^2.5.3", "aura/session": "^2.1", "ircmaxell/random-lib": "^1.1" }, "require-dev": { - "phpunit/phpunit": "^8.5.29 || ^9" + "phpunit/phpunit": "^11.5" }, - "license": "MIT", + "license": "MIT", "autoload":{ "psr-4":{ "Ray\\AuraSessionModule\\": "src/" From 46d1a286aabbfbc510846563c2ffef4e765f76dc Mon Sep 17 00:00:00 2001 From: Akihito Koriyama Date: Wed, 12 Nov 2025 00:37:42 +0900 Subject: [PATCH 4/8] Migrate phpunit.xml to PHPUnit 11.5 format --- .gitignore | 2 ++ phpunit.xml.dist | 33 ++++++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 9 deletions(-) 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/phpunit.xml.dist b/phpunit.xml.dist index 68b862b..677e19d 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,11 +1,26 @@ - - - - tests - - + + + + tests + + + + + src + + From 12b2d2c3c9df86cce32632273020bbd5924d323f Mon Sep 17 00:00:00 2001 From: Akihito Koriyama Date: Wed, 12 Nov 2025 00:50:14 +0900 Subject: [PATCH 5/8] Update PHP requirement to ^8.0 and refine keywords --- composer.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/composer.json b/composer.json index ec9beb0..e6f3756 100644 --- a/composer.json +++ b/composer.json @@ -2,12 +2,10 @@ "name": "ray/aura-session-module", "description":"Aura Session module for Ray.Di", "keywords":[ - "Ray.Di", - "aura", "session" ], "require": { - "php": "^8.2", + "php": "^8.0", "ray/di": "^2.5.3", "aura/session": "^2.1", "ircmaxell/random-lib": "^1.1" From b3632a45aa7263b47042ee4d7e27e6774da5b279 Mon Sep 17 00:00:00 2001 From: Akihito Koriyama Date: Wed, 12 Nov 2025 00:50:14 +0900 Subject: [PATCH 6/8] Update CI to test PHP 8.0-8.5 --- .github/workflows/continuous-integration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 11707e2312217a185b4fe2e1ee75ae06e12e56b9 Mon Sep 17 00:00:00 2001 From: Akihito Koriyama Date: Wed, 12 Nov 2025 00:59:24 +0900 Subject: [PATCH 7/8] Downgrade to PHPUnit 9.6 for PHP 8.0 compatibility --- composer.json | 2 +- phpunit.xml.dist | 24 ++++++++++-------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index e6f3756..59c652f 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "ircmaxell/random-lib": "^1.1" }, "require-dev": { - "phpunit/phpunit": "^11.5" + "phpunit/phpunit": "^9.6" }, "license": "MIT", "autoload":{ diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 677e19d..17b4329 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,26 +1,22 @@ + failOnWarning="true" + verbose="true"> tests - + - src + src - + From 2c1b7dc5912a1a85fce561e6799b5100277c058f Mon Sep 17 00:00:00 2001 From: Akihito Koriyama Date: Wed, 12 Nov 2025 01:02:50 +0900 Subject: [PATCH 8/8] Update ray/di minimum version to ^2.14 for PHP 8.0 compatibility --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 59c652f..cd62840 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ ], "require": { "php": "^8.0", - "ray/di": "^2.5.3", + "ray/di": "^2.14", "aura/session": "^2.1", "ircmaxell/random-lib": "^1.1" },