Raise minimum PHP version to 8.0, add type for $userId parameter (#37)

.github/workflows/build.yml

@@ -28,4 +28,4 @@ jobs:
       os: >-
         ['ubuntu-latest', 'windows-latest']
       php: >-
-        ['7.4', '8.0', '8.1']
+        ['8.0', '8.1', '8.2']

.github/workflows/composer-require-checker.yml

@@ -30,4 +30,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['7.4', '8.0', '8.1', '8.2']
+        ['8.0', '8.1', '8.2']

.github/workflows/static.yml

@@ -28,4 +28,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['7.4', '8.0', '8.1']
+        ['8.0', '8.1', '8.2']

CHANGELOG.md

@@ -1,16 +1,17 @@
 # Yii Access
 
-## 1.1.2 under development
+## 2.0.0 under development
 
-- no changes in this release.
+- Chg #37: Raise minimum PHP version to 8.0, add type for `$userId` parameter of
+  `AccessCheckerInterface::userHasPermission()` method (@vjik)
 
 ## 1.1.1 April 05, 2022
 
-- Bug #18: Add missing `\Stringable` to `$userId` of `AccessCheckerInterface::userHasPermission()` (samdark)
+- Bug #18: Add missing `\Stringable` to `$userId` of `AccessCheckerInterface::userHasPermission()` (@samdark)
 
 ## 1.1.0 January 14, 2022
 
-- New #15: Add `DenyAll` and `AllowAll` access checkers (vjik)
+- New #15: Add `DenyAll` and `AllowAll` access checkers (@vjik)
 
 ## 1.0.0 August 24, 2020
 

README.md

@@ -20,14 +20,14 @@ for fine-grained access checks. Additionally, `DenyAll` and `AllowAll` implement
 
 ## Requirements
 
-- PHP 7.4 or higher.
+- PHP 8.0 or higher.
 
 ## Installation
 
 The package could be installed with composer:
 
 ```shell
-composer require yiisoft/access --prefer-dist
+composer require yiisoft/access
 ```
 
 ## General usage

composer.json

@@ -29,13 +29,13 @@
         }
     ],
     "require": {
-        "php": "^7.4|^8.0"
+        "php": "^8.0"
     },
     "require-dev": {
-        "maglnet/composer-require-checker": "^3.8|^4.2",
-        "phpunit/phpunit": "^9.5",
+        "maglnet/composer-require-checker": "^4.4",
+        "phpunit/phpunit": "^9.6",
         "rector/rector": "^0.17.0",
-        "roave/infection-static-analysis-plugin": "^1.16",
+        "roave/infection-static-analysis-plugin": "^1.25",
         "spatie/phpunit-watcher": "^1.23",
         "vimeo/psalm": "^4.30|^5.3"
     },

src/AccessCheckerInterface.php

@@ -5,6 +5,7 @@
 namespace Yiisoft\Access;
 
 use InvalidArgumentException;
+use Stringable;
 
 /**
  * The interface defines checking if certain user has certain permission. Optional parameters could be passed
@@ -15,8 +16,8 @@ interface AccessCheckerInterface
     /**
      * Checks if the user with the ID given has the specified permission.
      *
-     * @param int|string|\Stringable|null $userId The user ID representing the unique identifier of a user. If ID is null,
-     * it means user is a guest.
+     * @param int|string|Stringable|null $userId The user ID representing the unique identifier of a user.
+     * If ID is null, it means user is a guest.
      * @param string $permissionName The name of the permission to be checked against.
      * @param array $parameters Name-value pairs that will be used to determine if access is granted.
      *
@@ -25,5 +26,5 @@ interface AccessCheckerInterface
      *
      * @return bool Whether the user has the specified permission.
      */
-    public function userHasPermission($userId, string $permissionName, array $parameters = []): bool;
+    public function userHasPermission(int|string|Stringable|null $userId, string $permissionName, array $parameters = []): bool;
 }

src/AllowAll.php

@@ -4,12 +4,14 @@
 
 namespace Yiisoft\Access;
 
+use Stringable;
+
 /**
  * Allow all access.
  */
 final class AllowAll implements AccessCheckerInterface
 {
-    public function userHasPermission($userId, string $permissionName, array $parameters = []): bool
+    public function userHasPermission(int|string|Stringable|null $userId, string $permissionName, array $parameters = []): bool
     {
         return true;
     }

src/DenyAll.php

@@ -4,12 +4,14 @@
 
 namespace Yiisoft\Access;
 
+use Stringable;
+
 /**
  * Deny all access.
  */
 final class DenyAll implements AccessCheckerInterface
 {
-    public function userHasPermission($userId, string $permissionName, array $parameters = []): bool
+    public function userHasPermission(int|string|Stringable|null $userId, string $permissionName, array $parameters = []): bool
     {
         return false;
     }

tests/AllowAllTest.php

@@ -6,13 +6,27 @@
 
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Access\AllowAll;
+use Yiisoft\Access\Tests\Support\StringableObject;
 
 final class AllowAllTest extends TestCase
 {
-    public function testBase(): void
+    public function dataBase(): array
+    {
+        return [
+            [null],
+            [7],
+            ['hello'],
+            [new StringableObject('test')],
+        ];
+    }
+
+    /**
+     * @dataProvider dataBase
+     */
+    public function testBase(mixed $userId): void
     {
         $accessChecker = new AllowAll();
 
-        $this->assertTrue($accessChecker->userHasPermission(null, 'test'));
+        $this->assertTrue($accessChecker->userHasPermission($userId, 'test'));
     }
 }

tests/Support/StringableObject.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Access\Tests\Support;
+
+use Stringable;
+
+final class StringableObject implements Stringable
+{
+    public function __construct(
+        private string $string,
+    ) {
+    }
+
+    public function __toString(): string
+    {
+        return $this->string;
+    }
+}