Merge pull request #14 from ray-di/remove-doctrine-annotations

Remove Doctrine annotations in favor of PHP 8 attributes

Author: koriym

.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

.gitignore

@@ -11,3 +11,5 @@ build
 vendor/
 composer.phar
 composer.lock
+.phpunit.cache
+.phpunit.result.cache

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

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/"

phpunit.xml.dist

@@ -1,11 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-        bootstrap="vendor/autoload.php">
-  <testsuites>
-    <testsuite name="Ray.AuraSessionModule test suite" >
-      <directory>tests</directory>
-    </testsuite>
-  </testsuites>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         cacheResultFile=".phpunit.cache/test-results"
+         executionOrder="depends,defects"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         verbose="true">
+    <testsuites>
+        <testsuite name="Ray.AuraSessionModule test suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
 </phpunit>

src/Annotation/Cookie.php

@@ -7,10 +7,6 @@
 use Attribute;
 use Ray\Di\Di\Qualifier;
 
-/**
- * @Annotation
- * @Qualifier
- */
 #[Attribute, Qualifier]
 final class Cookie
 {

src/Annotation/DeleteCookie.php

@@ -7,10 +7,6 @@
 use Attribute;
 use Ray\Di\Di\Qualifier;
 
-/**
- * @Annotation
- * @Qualifier
- */
 #[Attribute, Qualifier]
 final class DeleteCookie
 {

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;