Apply fixes from StyleCI

php-casbin · Nov 7, 2018 · a0812f3 · a0812f3
1 parent f8544c9
commit a0812f3
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 5 deletions.
diff --git a/examples/demo.php b/examples/demo.php
@@ -13,7 +13,7 @@
 $obj = 'data1'; // 将被访问的资源。buildRoleLinks
 $act = 'read'; // 用户对资源执行的操作。
 
-if ($e->enforce($sub, $obj, $act) === true) {
+if (true === $e->enforce($sub, $obj, $act)) {
     // 允许 alice 读取 data1
     echo '允许 alice 读取 data1';
 } else {

diff --git a/src/Config/Config.php b/src/Config/Config.php
@@ -71,24 +71,26 @@ private function parseBuffer($buf)
         $buf = preg_replace('/[\r\n]+/', PHP_EOL, $buf);
         $buf = explode(PHP_EOL, $buf);
 
-        for ($i = 0; $i <= \count($buf); $i++) {
+        for ($i = 0; $i <= \count($buf); ++$i) {
             if ($canWrite) {
                 $this->write($section, $lineNum, $buffer);
                 $canWrite = false;
             }
 
-            $lineNum++;
+            ++$lineNum;
             $line = isset($buf[$i]) ? $buf[$i] : '';
             if ($i == \count($buf)) {
                 if (\strlen($buffer) > 0) {
                     $this->write($section, $lineNum, $buffer);
                 }
+
                 break;
             }
             $line = trim($line);
 
             if ('' == $line || self::DEFAULT_COMMENT == substr($line, 0, 1) || self::DEFAULT_COMMENT_SEM == substr($line, 0, 1)) {
                 $canWrite = true;
+
                 continue;
             } elseif ('[' == substr($line, 0, 1) && ']' == substr($line, -1)) {
                 if (\strlen($buffer) > 0) {

diff --git a/src/Effect/DefaultEffector.php b/src/Effect/DefaultEffector.php
@@ -27,6 +27,7 @@ public function mergeEffects($expr, array $effects, array $results)
             foreach ($effects as $eft) {
                 if (self::ALLOW == $eft) {
                     $result = true;
+
                     break;
                 }
             }
@@ -35,6 +36,7 @@ public function mergeEffects($expr, array $effects, array $results)
             foreach ($effects as $eft) {
                 if (self::DENY == $eft) {
                     $result = false;
+
                     break;
                 }
             }
@@ -44,6 +46,7 @@ public function mergeEffects($expr, array $effects, array $results)
                     $result = true;
                 } elseif (self::DENY == $eft) {
                     $result = false;
+
                     break;
                 }
             }
@@ -55,6 +58,7 @@ public function mergeEffects($expr, array $effects, array $results)
                     } else {
                         $result = false;
                     }
+
                     break;
                 }
             }

diff --git a/src/Effect/Effector.php b/src/Effect/Effector.php
@@ -10,7 +10,9 @@
 abstract class Effector
 {
     const ALLOW = 0;
+
     const INDETERMINATE = 1;
+
     const DENY = 2;
 
     abstract public function mergeEffects($expr, array $effects, array $results);

diff --git a/src/Enforcer.php b/src/Enforcer.php
@@ -408,11 +408,13 @@ public function enforce(...$rvals)
                 if (\is_bool($result)) {
                     if (!$result) {
                         $policyEffects[$i] = Effector::INDETERMINATE;
+
                         continue;
                     }
                 } elseif (\is_float($result)) {
                     if (0 == $result) {
                         $policyEffects[$i] = Effector::INDETERMINATE;
+
                         continue;
                     } else {
                         $matcherResults[$i] = $result;

diff --git a/src/Model/Model.php b/src/Model/Model.php
@@ -75,7 +75,7 @@ private function loadSection($cfg, $sec)
             if (!$this->loadAssertion($cfg, $sec, $sec.$this->getKeySuffix($i))) {
                 break;
             } else {
-                $i++;
+                ++$i;
             }
         }
     }

diff --git a/src/Model/Policy.php b/src/Model/Policy.php
@@ -62,6 +62,7 @@ public function getFilteredPolicy($sec, $ptype, $fieldIndex, ...$fieldValues)
             foreach ($fieldValues as $i => $fieldValue) {
                 if ('' != $fieldValue && $rule[$fieldIndex + $i] != $fieldValue) {
                     $matched = false;
+
                     break;
                 }
             }
@@ -127,6 +128,7 @@ public function removeFilteredPolicy($sec, $ptype, $fieldIndex, ...$fieldValues)
             foreach ($fieldValues as $i => $fieldValue) {
                 if ('' != $fieldValue && $rule[$fieldIndex + $i] != $fieldValue) {
                     $matched = false;
+
                     break;
                 }
             }

diff --git a/src/Rbac/Role.php b/src/Rbac/Role.php
@@ -10,6 +10,7 @@
 class Role
 {
     public $name = '';
+
     private $roles = [];
 
     public function __construct($name)

diff --git a/src/Util/Util.php b/src/Util/Util.php
@@ -37,7 +37,7 @@ public static function arrayRemoveDuplicates(&$s)
             if (!isset($found[$x])) {
                 $found[$x] = true;
                 $s[$j] = $s[$i];
-                $j++;
+                ++$j;
             }
         }
         $s = \array_slice($s, 0, $j);