Merge pull request #89 from samsonasik/drop-php80

[v5] Drop php <8.0 support

Author: samsonasik

.github/workflows/rector_check.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.3']
+        php-versions: ['8.1']
     steps:
       - name: Setup PHP Action
         uses: shivammathur/setup-php@v2

README.md

@@ -18,7 +18,9 @@ It is a Laminas module as session toolbar for [LaminasDeveloperTools](https://gi
 
 You can reload, clear, add, update, and remove your sessions data.
 
-> This is README for version ^4.0 which only support Laminas 3 with php ^7.3|~8.0.
+> This is README for version ^5.0 which only support Laminas 3 with php ^8.1
+
+> For version ^4.0, you can read at [version 4.x.x readme](https://github.com/samsonasik/SanSessionToolbar/blob/4.x.x/README.md) which support Laminas 3 and php ^7.3|~8.0.
 
 > For version ^3.0, you can read at [version 3.x.x readme](https://github.com/samsonasik/SanSessionToolbar/blob/3.x.x/README.md) which support Laminas 3 and php ^7.2.
 

composer.json

@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": "^7.3|~8.0",
+        "php": "^8.1",
         "laminas/laminas-json": "^2.5 || ^3.0",
         "laminas/laminas-mvc": "^3.0",
         "laminas/laminas-session": "^2.8.4"
@@ -30,9 +30,9 @@
         "laminas/laminas-mvc-plugin-flashmessenger": "^1.0",
         "laminas/laminas-router": "^3.0",
         "laminas/laminas-serializer": "^2.5",
-        "laminas/laminas-test": "^4.0",
+        "laminas/laminas-test": "^4.10",
         "phpspec/prophecy-phpunit": "^2.0",
-        "phpunit/phpunit": "^9.4",
+        "phpunit/phpunit": "^10.4",
         "rector/rector": "dev-main"
     },
     "conflict": {

rector.php

@@ -1,7 +1,8 @@
 <?php
 
 use Rector\Config\RectorConfig;
-use Rector\CodeQuality\Rector\Array_\CallableThisArrayToAnonymousFunctionRector;
+use Rector\Php81\Rector\Array_\FirstClassCallableRector;
+use Rector\PHPUnit\Set\PHPUnitSetList;
 
 return RectorConfig::configure()
     ->withPreparedSets(
@@ -13,16 +14,14 @@
         true, // naming
     )
     ->withPhpSets(
-        false,
-        false,
-        false,
-        false,
-        false,
-        true, // php73
+        php81: true
     )
+    ->withSets([
+        PHPUnitSetList::PHPUNIT_100
+    ])
     ->withPaths([__DIR__ . '/config', __DIR__ . '/src', __DIR__ . '/test'])
     ->withRootFiles()
-    ->withImportNames()
+    ->withImportNames(removeUnusedImports: true)
     ->withSkip([
-        CallableThisArrayToAnonymousFunctionRector::class,
+        FirstClassCallableRector::class
     ]);

src/Collector/SessionCollector.php

@@ -66,7 +66,7 @@ public function getPriority()
      */
     public function collect(MvcEvent $mvcEvent)
     {
-        $this->data['san-session'] = $this->data['san-session'] ?? [];
+        $this->data['san-session'] ??= [];
     }
 
     /**

src/Controller/SessionToolbarController.php

@@ -35,23 +35,11 @@
  */
 final class SessionToolbarController extends AbstractActionController
 {
-    /**
-     * @var RendererInterface
-     */
-    private $viewRenderer;
-
-    /**
-     * @var SessionManagerInterface
-     */
-    private $sessionManager;
-
     /**
      * Construct.
      */
-    public function __construct(RendererInterface $viewRenderer, SessionManagerInterface $sessionManager)
+    public function __construct(private readonly RendererInterface $viewRenderer, private readonly SessionManagerInterface $sessionManager)
     {
-        $this->viewRenderer = $viewRenderer;
-        $this->sessionManager = $sessionManager;
     }
 
     /**

test/Collector/SessionCollectorTest.php

@@ -19,6 +19,7 @@
 
 namespace SanSessionToolbarTest\Collector;
 
+use PHPUnit\Framework\Attributes\RunInSeparateProcess;
 use Laminas\Mvc\MvcEvent;
 use Laminas\Session\Container;
 use PHPUnit\Framework\TestCase;
@@ -66,9 +67,7 @@ public function testGetPriority()
         $this->assertEquals(10, $this->sessionCollector->getPriority());
     }
 
-    /**
-     * @runInSeparateProcess
-     */
+    #[RunInSeparateProcess]
     public function testGetSessionData()
     {
         $this->sessionContainer->word = 'zaf8go6i';
@@ -100,9 +99,7 @@ public function testGetSessionData()
         ], $this->sessionCollector->getSessionData());
     }
 
-    /**
-     * @runInSeparateProcess
-     */
+    #[RunInSeparateProcess]
     public function testGetSessionDataForEmpty()
     {
         $this->sessionContainer->offsetUnset('word');

test/Manager/SessionMangerTest.php

@@ -19,6 +19,8 @@
 
 namespace SanSessionToolbarTest\Manager;
 
+use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Laminas\Session\Container;
 use PHPUnit\Framework\TestCase;
 use SanSessionToolbar\Manager\SessionManager;
@@ -43,9 +45,7 @@ protected function setUp(): void
         $this->manager = new SessionManager();
     }
 
-    /**
-     * @runInSeparateProcess
-     */
+    #[RunInSeparateProcess]
     public function testSessionIsNotStartedAlready()
     {
         $sessionManager = new SessionManager();
@@ -71,9 +71,7 @@ public function testGetSessionData()
         $this->assertEquals($sessionData, $this->manager->getSessionData());
     }
 
-    /**
-     * @dataProvider provideClearSession
-     */
+    #[DataProvider('provideClearSession')]
     public function testClearSession($byContainer, $result)
     {
         $fooContainer = new Container('Foo');
@@ -83,17 +81,15 @@ public function testClearSession($byContainer, $result)
         $this->assertEquals($result, $this->manager->getSessionData());
     }
 
-    public function provideClearSession()
+    public static function provideClearSession()
     {
         return [
             ['Default', ['Foo' => ['foo' => 'fooValue']]],
             [null, []],
         ];
     }
 
-    /**
-     * @dataProvider provideSessionSettingData
-     */
+    #[DataProvider('provideSessionSettingData')]
     public function testSessionSetting($container, $keysession, $value, $options, $result)
     {
         $fooContainer = new Container('Foo');
@@ -102,7 +98,7 @@ public function testSessionSetting($container, $keysession, $value, $options, $r
         $this->assertEquals($result, $this->manager->sessionSetting($container, $keysession, $value, $options));
     }
 
-    public function provideSessionSettingData()
+    public static function provideSessionSettingData()
     {
         return [
             ['Default', 'foo', null, [], false],

test/ModuleTest.php

@@ -19,6 +19,8 @@
 
 namespace SanSessionToolbarTest;
 
+use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Laminas\Mvc\MvcEvent;
 use Laminas\Mvc\Application;
 use Laminas\EventManager\EventManager;
@@ -49,27 +51,23 @@ protected function setUp(): void
         $this->module = new Module();
     }
 
-    /**
-     * @runInSeparateProcess
-     */
+    #[RunInSeparateProcess]
     public function testOnBootstrapOnSessionNotExists()
     {
         $objectProphecy = $this->prophesize(MvcEvent::class);
         $this->assertNull($this->module->onBootstrap($objectProphecy->reveal()));
     }
 
-    public function provideHasMessages()
+    public static function provideHasMessages()
     {
         return [
             [false],
             [true],
         ];
     }
 
-    /**
-     * @dataProvider provideHasMessages
-     * @runInSeparateProcess
-     */
+    #[DataProvider('provideHasMessages')]
+    #[RunInSeparateProcess]
     public function testOnBootstrap($hasMessages)
     {
         $objectProphecy = $this->prophesize(MvcEvent::class);