Merge pull request #108 from visto9259/fix-zfr-rbac

Fix issues with PHP 8

.github/workflows/build_test.yml

@@ -16,11 +16,11 @@ jobs:
   build:
     strategy:
       matrix:
-        php_version: ['8.0']
+        php_version: ['8.0', '8.1', '8.2', '8.3']
         deps: ['--prefer-lowest --prefer-dist', '']
         include:
           - code-coverage: 'yes'
-            php_version: '8.0'
+            php_version: '8.2'
             deps: ''
     runs-on: ubuntu-latest
 

composer.json

@@ -7,6 +7,7 @@
         "module",
         "laminas",
         "rbac",
+        "zfr",
         "permissions"
     ],
     "homepage": "http://www.github.com/Laminas-Commons/LmcRbacMvc",
@@ -24,19 +25,25 @@
         {
             "name": "Jean-Marie Leroux",
             "email": "[email protected]"
+        },
+        {
+            "name": "Eric Richer",
+            "email": "[email protected]"
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
         "laminas/laminas-config": "^3.1",
         "laminas/laminas-eventmanager": "^3.0",
         "laminas/laminas-mvc": "^3.0",
         "laminas/laminas-servicemanager": "^3.0",
-        "zfr/rbac": "~1.2",
-        "doctrine/persistence": "^2.1"
+        "lm-commons/rbac": "^1.2",
+        "doctrine/persistence": "^2.1 || ^3.0"
     },
     "require-dev": {
         "laminas/laminas-authentication": "^2.2",
+        "laminas/laminas-cache-storage-adapter-filesystem": "^2.0",
+        "laminas/laminas-cache-storage-adapter-memory": "^2.0",
         "laminas/laminas-developer-tools": "^2.1",
         "laminas/laminas-log": "^2.2",
         "laminas/laminas-http": "^2.2",
@@ -47,7 +54,7 @@
         "squizlabs/php_codesniffer": "^3.5.5",
         "php-coveralls/php-coveralls": "^2.2",
         "phpspec/prophecy-phpunit": "^2.0",
-        "doctrine/doctrine-orm-module": "^4.1"
+        "doctrine/doctrine-orm-module": "^5.0 || ^6.0"
     },
     "suggest": {
         "laminas/laminas-developer-tools": "if you want to show information about the roles",

docs/docs/installation.md

@@ -5,8 +5,8 @@ sidebar_label: Requirements and Installation
 # Requirements and Installation
 ## Requirements
 
-- PHP 7.4 or higher
-- [Zf-fr/Rbac component v1](https://github.com/zf-fr/rbac): this is actually a prototype for the ZF3 Rbac component.
+- PHP 8.0 or higher
+- [lm-commons/rbac component v1](https://github.com/zf-fr/rbac): this is actually a prototype for the ZF3 Rbac component.
 - [Laminas Components 2.x | 3.x or higher](http://www.github.com/laminas)
 
 
@@ -37,6 +37,6 @@ LmcRbacMvc introduces breaking changes from zfcrbac v2:
 - [BC] The namespace has been changed from `ZfcRbac` to `LmcRbacMvc`.
 - [BC] The key `zfc_rbac` in autoload and module config files has been replaced
   by the `lmc_rbac` key.
-- Requires PHP 7.4 or later
+- Requires PHP 8.0 or later
 - Requires Laminas MVC components 3.x or later
 - Uses PSR-4 autoload

docs/package.json

@@ -14,8 +14,8 @@
     "write-heading-ids": "docusaurus write-heading-ids"
   },
   "dependencies": {
-    "@docusaurus/core": "3.3.2",
-    "@docusaurus/preset-classic": "3.3.2",
+    "@docusaurus/core": "3.4.0",
+    "@docusaurus/preset-classic": "3.4.0",
     "@mdx-js/react": "^3.0.0",
     "clsx": "^2.0.0",
     "prism-react-renderer": "^2.3.0",