fix bugs

shetabit · Jun 21, 2019 · f7ed296 · f7ed296
1 parent d33c4a5
commit f7ed296
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/Traits/HasStamps.php b/src/Traits/HasStamps.php
@@ -137,6 +137,8 @@ public function scopeUnstamped($query, $stampName)
     private function getStampBehavior($method)
     {
         $behavior = null;
+        $stampName = null;
+        $lowerCaseMethod = strtolower($method);
 
         $prefixes = [
             'is' => 'isStampedBy',
@@ -149,26 +151,28 @@ private function getStampBehavior($method)
 
         foreach ($stampsName as $key => $name) {
             foreach ($prefixes as $prefix => $methodName) {
-                if ($prefix.$key == $method) {
+                if (strtolower($prefix.$name) == $lowerCaseMethod) {
                     $behavior = $methodName;
+                    $stampName = $name;
                     break;
                 }
             }
         }
 
-        return $behavior;
+        return empty($behavior) ? false : [$behavior, $stampName];
     }
 
     private function getStampScope($method)
     {
         $scope = null;
+        $lowerCaseMethod = strtolower($method);
 
         $stampKeys = array_keys($this->getStamps());
 
         foreach ($stampKeys as $key) {
-            if ($method == $key) {
+            if ($lowerCaseMethod == $key) {
                 $scope = 'stamped';
-            } elseif ($method == 'un'.strtolower($key)) {
+            } elseif ($lowerCaseMethod == strtolower('un'.$key)) {
                 $scope = 'unstamped';
             }
         }
@@ -189,8 +193,10 @@ public function __call($method, $parameters)
             return $this->$method(...$parameters);
         }
 
-        if ($methodName = $this->getStampBehavior($method)) {
-            return $this->$methodName(...$parameters);
+        if ($info = $this->getStampBehavior($method)) {
+            $methodName = $info[0];
+            $stampName = $info[1];
+            return $this->$methodName($stampName);
         }
 
         if ($methodName = $this->getStampScope($method)) {