refactor: Change the field ptype to p_type

Author: leeqvip

database/migrations/2019_03_01_000000_create_rules_table.php

@@ -13,7 +13,7 @@ public function up()
         $connection = config('lauthz.basic.database.connection') ?: config('database.default');
         Schema::connection($connection)->create(config('lauthz.basic.database.rules_table'), function (Blueprint $table) {
             $table->increments('id');
-            $table->string('ptype')->nullable();
+            $table->string('p_type')->nullable();
             $table->string('v0')->nullable();
             $table->string('v1')->nullable();
             $table->string('v2')->nullable();

src/Adapters/DatabaseAdapter.php

@@ -43,7 +43,7 @@ public function __construct(Rule $eloquent)
      */
     public function savePolicyLine(string $ptype, array $rule): void
     {
-        $col['ptype'] = $ptype;
+        $col['p_type'] = $ptype;
         foreach ($rule as $key => $value) {
             $col['v'.strval($key)] = $value;
         }
@@ -112,7 +112,7 @@ public function removePolicy(string $sec, string $ptype, array $rule): void
     {
         $count = 0;
 
-        $instance = $this->eloquent->where('ptype', $ptype);
+        $instance = $this->eloquent->where('p_type', $ptype);
 
         foreach ($rule as $key => $value) {
             $instance->where('v'.strval($key), $value);
@@ -138,7 +138,7 @@ public function removeFilteredPolicy(string $sec, string $ptype, int $fieldIndex
     {
         $count = 0;
 
-        $instance = $this->eloquent->where('ptype', $ptype);
+        $instance = $this->eloquent->where('p_type', $ptype);
         foreach (range(0, 5) as $value) {
             if ($fieldIndex <= $value && $value < $fieldIndex + count($fieldValues)) {
                 if ('' != $fieldValues[$value - $fieldIndex]) {

src/Models/Rule.php

@@ -29,7 +29,7 @@ class Rule extends Model
      *
      * @var array
      */
-    protected $fillable = ['ptype', 'v0', 'v1', 'v2', 'v3', 'v4', 'v5'];
+    protected $fillable = ['p_type', 'v0', 'v1', 'v2', 'v3', 'v4', 'v5'];
 
     /**
      * Create a new Eloquent model instance.
@@ -62,7 +62,7 @@ public function __construct(array $attributes = [], $guard = '')
     public function getAllFromCache()
     {
         $get = function () {
-            return $this->select('ptype', 'v0', 'v1', 'v2', 'v3', 'v4', 'v5')->get()->toArray();
+            return $this->select('p_type', 'v0', 'v1', 'v2', 'v3', 'v4', 'v5')->get()->toArray();
         };
         if (!$this->config('cache.enabled', false)) {
             return $get();

tests/RequestMiddlewareTest.php

@@ -68,11 +68,11 @@ protected function initTable()
     {
         Rule::truncate();
 
-        Rule::create(['ptype' => 'p', 'v0' => 'alice', 'v1' => '/foo', 'v2' => 'GET']);
-        Rule::create(['ptype' => 'p', 'v0' => 'alice', 'v1' => '/foo/:id', 'v2' => 'GET']);
-        Rule::create(['ptype' => 'p', 'v0' => 'alice', 'v1' => '/foo', 'v2' => 'POST']);
-        Rule::create(['ptype' => 'p', 'v0' => 'alice', 'v1' => '/foo/:id', 'v2' => 'PUT']);
-        Rule::create(['ptype' => 'p', 'v0' => 'alice', 'v1' => '/foo/:id', 'v2' => 'DELETE']);
-        Rule::create(['ptype' => 'p', 'v0' => 'alice', 'v1' => '/foo1/*', 'v2' => '(GET)|(POST)']);
+        Rule::create(['p_type' => 'p', 'v0' => 'alice', 'v1' => '/foo', 'v2' => 'GET']);
+        Rule::create(['p_type' => 'p', 'v0' => 'alice', 'v1' => '/foo/:id', 'v2' => 'GET']);
+        Rule::create(['p_type' => 'p', 'v0' => 'alice', 'v1' => '/foo', 'v2' => 'POST']);
+        Rule::create(['p_type' => 'p', 'v0' => 'alice', 'v1' => '/foo/:id', 'v2' => 'PUT']);
+        Rule::create(['p_type' => 'p', 'v0' => 'alice', 'v1' => '/foo/:id', 'v2' => 'DELETE']);
+        Rule::create(['p_type' => 'p', 'v0' => 'alice', 'v1' => '/foo1/*', 'v2' => '(GET)|(POST)']);
     }
 }

tests/RuleCacheTest.php

@@ -28,7 +28,7 @@ public function testEnableCache()
         app(Rule::class)->getAllFromCache();
         $this->assertCount(0, DB::getQueryLog());
 
-        $rule = Rule::create(['ptype' => 'p', 'v0' => 'alice', 'v1' => 'data1', 'v2' => 'read']);
+        $rule = Rule::create(['p_type' => 'p', 'v0' => 'alice', 'v1' => 'data1', 'v2' => 'read']);
         app(Rule::class)->getAllFromCache();
         $this->assertCount(2, DB::getQueryLog());
 
@@ -48,7 +48,7 @@ public function testDisableCache()
         app(Rule::class)->getAllFromCache();
         $this->assertCount(1, DB::getQueryLog());
 
-        $rule = Rule::create(['ptype' => 'p', 'v0' => 'alice', 'v1' => 'data1', 'v2' => 'read']);
+        $rule = Rule::create(['p_type' => 'p', 'v0' => 'alice', 'v1' => 'data1', 'v2' => 'read']);
         app(Rule::class)->getAllFromCache();
         $this->assertCount(3, DB::getQueryLog());
 

tests/TestCase.php

@@ -53,12 +53,12 @@ protected function initTable()
     {
         Rule::truncate();
 
-        Rule::create(['ptype' => 'p', 'v0' => 'alice', 'v1' => 'data1', 'v2' => 'read']);
-        Rule::create(['ptype' => 'p', 'v0' => 'bob', 'v1' => 'data2', 'v2' => 'write']);
+        Rule::create(['p_type' => 'p', 'v0' => 'alice', 'v1' => 'data1', 'v2' => 'read']);
+        Rule::create(['p_type' => 'p', 'v0' => 'bob', 'v1' => 'data2', 'v2' => 'write']);
 
-        Rule::create(['ptype' => 'p', 'v0' => 'data2_admin', 'v1' => 'data2', 'v2' => 'read']);
-        Rule::create(['ptype' => 'p', 'v0' => 'data2_admin', 'v1' => 'data2', 'v2' => 'write']);
-        Rule::create(['ptype' => 'g', 'v0' => 'alice', 'v1' => 'data2_admin']);
+        Rule::create(['p_type' => 'p', 'v0' => 'data2_admin', 'v1' => 'data2', 'v2' => 'read']);
+        Rule::create(['p_type' => 'p', 'v0' => 'data2_admin', 'v1' => 'data2', 'v2' => 'write']);
+        Rule::create(['p_type' => 'g', 'v0' => 'alice', 'v1' => 'data2_admin']);
     }
 
     protected function runMiddleware($middleware, $request, ...$args)