code refactor

Author: denisdulici

src/Middleware/Geo.php

@@ -9,71 +9,57 @@ class Geo extends Middleware
 {
     public function check($patterns)
     {
-        $status = false;
+        $places = ['continents', 'regions', 'countries', 'cities'];
 
-        if ($this->isEmpty()) {
-            return $status;
+        if ($this->isEmpty($places)) {
+            return false;
         }
 
         if (!$location = $this->getLocation()) {
-            return $status;
-        }
-
-        if ($this->isFiltered($location, 'continents')) {
-            $status = true;
-        }
-
-        if (!$status && $this->isFiltered($location, 'regions')) {
-            $status = true;
+            return false;
         }
 
-        if (!$status && $this->isFiltered($location, 'countries')) {
-            $status = true;
-        }
+        foreach ($places as $place) {
+            if (!$this->isFiltered($location, $place)) {
+                continue;
+            }
 
-        if (!$status && $this->isFiltered($location, 'cities')) {
-            $status = true;
+            return true;
         }
 
-        return $status;
+        return false;
     }
 
-    protected function isEmpty()
+    protected function isEmpty($places)
     {
-        $status = true;
-
-        $types = ['continents', 'regions', 'countries', 'cities'];
-
-        foreach ($types as $type) {
-            if (!$list = config('firewall.middleware.' . $this->middleware . '.' . $type)) {
+        foreach ($places as $place) {
+            if (!$list = config('firewall.middleware.' . $this->middleware . '.' . $place)) {
                 continue;
             }
 
             if (empty($list['allow']) && empty($list['block'])) {
                 continue;
             }
 
-            $status = false;
-
-            break;
+            return false;
         }
 
-        return $status;
+        return true;
     }
 
-    protected function isFiltered($location, $type)
+    protected function isFiltered($location, $place)
     {
-        if (!$list = config('firewall.middleware.' . $this->middleware . '.' . $type)) {
+        if (!$list = config('firewall.middleware.' . $this->middleware . '.' . $place)) {
             return false;
         }
 
-        $s_type = Str::singular($type);
+        $s_place = Str::singular($place);
 
-        if (!empty($list['allow']) && !in_array((string) $location->$s_type, (array) $list['allow'])) {
+        if (!empty($list['allow']) && !in_array((string) $location->$s_place, (array) $list['allow'])) {
             return true;
         }
 
-        if (in_array((string) $location->$s_type, (array) $list['block'])) {
+        if (in_array((string) $location->$s_place, (array) $list['block'])) {
             return true;
         }