Merge pull request #14 from php-casbin/develop

BREAKING CHANGE: change namespace to Cake\Permission and support cakephp 5.0

Author: leeqvip

.github/workflows/build.yml renamed to .github/workflows/test.yml

@@ -1,4 +1,4 @@
-name: build
+name: test
 
 on:
   push:
@@ -15,22 +15,22 @@ jobs:
         image: mysql:5.7
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
-          MYSQL_DATABASE: cake_adapter
+          MYSQL_DATABASE: cake-permission
         ports:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     strategy:
       fail-fast: true
       matrix:
-        php: [ 7.3, 7.4 ]
-        stability: [ prefer-lowest, prefer-stable ]
+        php: [7.3, 7.4, 8.0, 8.1, 8.2]
+        stability: [prefer-stable]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -73,10 +73,10 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ test, upload-coverage ]
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: '14.17'
+          node-version: 'lts/*'
 
       - name: Run semantic-release
         env:

.gitignore

@@ -7,4 +7,6 @@ composer.lock
 *.iml
 
 # coverage report
-/build
+/build
+
+.phpunit.result.cache

README.md

@@ -1,8 +1,10 @@
-# Cake-Casbin
+# Cake-Permission
 
-[![Latest Stable Version](https://poser.pugx.org/casbin/cake-adapter/v/stable)](https://packagist.org/packages/casbin/cake-adapter)
-[![Total Downloads](https://poser.pugx.org/casbin/cake-adapter/downloads)](https://packagist.org/packages/casbin/cake-adapter)
-[![License](https://poser.pugx.org/casbin/cake-adapter/license)](https://packagist.org/packages/casbin/cake-adapter)
+[![Test](https://github.com/php-casbin/cake-permission/workflows/build/badge.svg?branch=master)](https://github.com/php-casbin/cake-permission/actions)
+[![Coverage Status](https://coveralls.io/repos/github/php-casbin/cake-permission/badge.svg)](https://coveralls.io/github/php-casbin/cake-permission)
+[![Latest Stable Version](https://poser.pugx.org/casbin/cake-adapter/v/stable)](https://packagist.org/packages/casbin/cake-permission)
+[![Total Downloads](https://poser.pugx.org/casbin/cake-adapter/downloads)](https://packagist.org/packages/casbin/cake-permission)
+[![License](https://poser.pugx.org/casbin/cake-adapter/license)](https://packagist.org/packages/casbin/cake-permission)
 
 Use Casbin in CakePHP Framework, Casbin is a powerful and efficient open-source access control library.
 
@@ -11,7 +13,7 @@ Use Casbin in CakePHP Framework, Casbin is a powerful and efficient open-source
 Require this package in the `composer.json` of your CakePHP project. This will download the package.
 
 ```
-composer require casbin/cake-adapter
+composer require casbin/cake-permission
 ```
 
 create config file `config/casbin.php` for Casbin:
@@ -32,7 +34,7 @@ return [
         ],
 
         // Cake-casbin adapter .
-        'adapter' => '\CasbinAdapter\Cake\Adapter',
+        'adapter' => '\Cake\Permission\Adapter',
 
         /*
          * Cake-casbin database setting.
@@ -72,7 +74,7 @@ $sub = 'alice'; // the user that wants to access a resource.
 $obj = 'data1'; // the resource that is going to be accessed.
 $act = 'read'; // the operation that the user performs on the resource.
 
-$casbin = new \CasbinAdapter\Cake\Casbin();
+$casbin = new \Cake\Permission\Casbin();
 
 if (true === $casbin->enforce($sub, $obj, $act)) {
     // permit alice to read data1

composer.json

@@ -4,22 +4,22 @@
     "description": "Use casbin in CakePHP. ",
     "authors": [
         {
-            "name": "TechLee",
-            "email": "techlee@qq.com"
+            "name": "JonLee",
+            "email": "leeqvip@gmail.com"
         }
     ],
     "license": "Apache-2.0",
     "require": {
         "php": ">=7.2.0",
-        "cakephp/cakephp": "~4.0",
+        "cakephp/cakephp": "~4.0|~5.0",
         "casbin/casbin": "~3.1"
     },
     "require-dev": {
         "phpunit/phpunit": "~8.5.0 || ^9.3"
     },
     "autoload": {
         "psr-4": {
-            "CasbinAdapter\\Cake\\": "src/"
+            "Cake\\Permission\\": "src/"
         }
     }
 }

composer.lock

@@ -12,7 +12,7 @@
     ],
 
     // Cake-casbin adapter .
-    'adapter' => '\CasbinAdapter\Cake\Adapter',
+    'adapter' => '\Cake\Permission\Adapter',
 
     /*
      * Cake-casbin database setting.

config/casbin.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace CasbinAdapter\Cake;
+namespace Cake\Permission;
 
 use Casbin\Exceptions\CasbinException;
 use Casbin\Persist\Adapter as AdapterContract;
@@ -12,7 +12,7 @@
 use Casbin\Exceptions\InvalidFilterTypeException;
 use Casbin\Persist\AdapterHelper;
 use Cake\ORM\TableRegistry;
-use CasbinAdapter\Cake\Model\Table\CasbinRuleTable;
+use Cake\Permission\Model\Table\CasbinRuleTable;
 
 /**
  * Adapter.

src/Adapter.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace CasbinAdapter\Cake;
+namespace Cake\Permission;
 
 use Casbin\Model\Model;
 use Casbin\Enforcer;

src/Casbin.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace CasbinAdapter\Cake\Model\Entity;
+namespace Cake\Permission\Model\Entity;
 
 use Cake\ORM\Entity;
 

src/Model/Entity/CasbinRule.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace CasbinAdapter\Cake\Model\Table;
+namespace Cake\Permission\Model\Table;
 
 use Cake\ORM\Table;
-use CasbinAdapter\Cake\Model\Entity\CasbinRule;
+use Cake\Permission\Model\Entity\CasbinRule;
 
 class CasbinRuleTable extends Table
 {

src/Model/Table/CasbinRuleTable.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace CasbinAdapter\Cake\Tests;
+namespace Cake\Permission\Tests;
 
 use PHPUnit\Framework\TestCase;
 use \Cake\ORM\TableRegistry;
 use Cake\Datasource\ConnectionManager;
-use CasbinAdapter\Cake\Casbin;
+use Cake\Permission\Casbin;
 use Casbin\Persist\Adapters\Filter;
 use Casbin\Exceptions\InvalidFilterTypeException;
 use Cake\Core\Configure;
@@ -39,11 +39,11 @@ protected function initConfig()
             'className' => 'Cake\Database\Connection',
             'driver' => 'Cake\Database\Driver\Mysql',
             'persistent' => false,
-            'host' => '127.0.0.1',
-            'username' => 'root',
-            'password' => '',
-            'port' => '3306',
-            'database' => 'cake_adapter',
+            'host' => getenv('DB_HOST') ? getenv('DB_HOST') : '127.0.0.1',
+            'username' => getenv('DB_USERNAME') ? getenv('DB_USERNAME') : 'root',
+            'password' => getenv('DB_PASSWORD') ? getenv('DB_PASSWORD') : '',
+            'port' => getenv('DB_PORT') ? getenv('DB_PORT') : '3306',
+            'database' => getenv('DB_DATABASE') ? getenv('DB_DATABASE') : 'cake-permission',
             'encoding' => 'utf8mb4',
             'timezone' => 'UTC',
             'cacheMetadata' => false,

tests/DatabaseAdapterTest.php

@@ -13,7 +13,7 @@
         ],
 
         // Cake-casbin adapter .
-        'adapter' => '\CasbinAdapter\Cake\Adapter',
+        'adapter' => '\Cake\Permission\Adapter',
 
         /*
          * Cake-casbin database setting.