Merge pull request #44 from php-casbin/develop

Develop
php-casbin · Oct 17, 2023 · e9af573 · e9af573
2 parents 1ab1d35 + 405ed65
commit e9af573
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -21,8 +21,6 @@ jobs:
       matrix:
         include:
           # ThinkPHP 6.*
-          - php: 7.1
-            thinkphp: 6.*
           - php: 7.2
             thinkphp: 6.*
           - php: 7.4
@@ -37,6 +35,8 @@ jobs:
             thinkphp: 8.*
           - php: 8.1
             thinkphp: 8.*
+          - php: 8.2
+            thinkphp: 8.*
 
     name: ThinkPHP${{ matrix.thinkphp }}-PHP${{ matrix.php }}
 

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     "require": {
         "casbin/casbin": "~3.0",
         "topthink/framework": "~6.0|~8.0",
-        "topthink/think-migration": "^3.0.6",
+        "topthink/think-migration": "^3.1.0",
         "casbin/psr3-bridge": "^1.1"
     },
     "require-dev": {

diff --git a/database/migrations/20181113071924_create_rules_table.php b/database/migrations/20181113071924_create_rules_table.php
@@ -1,6 +1,7 @@
 <?php
 
 use think\migration\Migrator;
+use Phinx\Config\Config;
 use Phinx\Db\Adapter\AdapterFactory;
 
 class CreateRulesTable extends Migrator
@@ -10,17 +11,19 @@ class CreateRulesTable extends Migrator
      *
      * @return void
      */
-    protected function init()
+    public function init()
     {
         $options = $this->getDbConfig();
-    
+
         $adapter = AdapterFactory::instance()->getAdapter($options['adapter'], $options);
-    
+
         if ($adapter->hasOption('table_prefix') || $adapter->hasOption('table_suffix')) {
             $adapter = AdapterFactory::instance()->getWrapper('prefix', $adapter);
         }
 
-        $this->setAdapter( $adapter);    
+        $adapter->connect();
+
+        $this->setAdapter($adapter);    
     }
 
     /**
@@ -43,6 +46,7 @@ protected function getDbConfig(): array
                 'pass'         => $config['password'],
                 'port'         => $config['hostport'],
                 'charset'      => $config['charset'],
+                'suffix'       => $config['suffix'] ?? '',
                 'table_prefix' => $config['prefix'],
             ];
         } else {
@@ -54,13 +58,15 @@ protected function getDbConfig(): array
                 'pass'         => explode(',', $config['password'])[0],
                 'port'         => explode(',', $config['hostport'])[0],
                 'charset'      => explode(',', $config['charset'])[0],
+                'suffix'       => explode(',', $config['suffix'] ?? '')[0],
                 'table_prefix' => explode(',', $config['prefix'])[0],
             ];
         }
 
         $table = config('database.migration_table', 'migrations');
 
-        $dbConfig['default_migration_table'] = $dbConfig['table_prefix'] . $table;
+        $dbConfig['migration_table'] = $dbConfig['table_prefix'] . $table;
+        $dbConfig['version_order']   = Config::VERSION_ORDER_CREATION_TIME;
 
         return $dbConfig;
     }
@@ -104,6 +110,6 @@ public function down()
     {
         $default = config('tauthz.default');
         $table = $this->table(config('tauthz.enforcers.'.$default.'.database.rules_name'));
-        $table->drop();
+        $table->drop()->save();
     }
 }