refactor: use private methods

codeigniter4 · Oct 18, 2023 · a54095b · a54095b
1 parent cdb3bf1
commit a54095b
Showing 1 changed file with 11 additions and 42 deletions.
diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
@@ -302,55 +302,24 @@ public function runRequired(string $position = 'before')
             }
         }
 
-        foreach ($filtersClass[$position] as $className) {
-            $class = new $className();
-
-            if (! $class instanceof FilterInterface) {
-                throw FilterException::forIncorrectInterface(get_class($class));
-            }
-
-            if ($position === 'before') {
-                $result = $class->before(
-                    $this->request,
-                    $this->argumentsClass[$className] ?? null
-                );
-
-                if ($result instanceof RequestInterface) {
-                    $this->request = $result;
-
-                    continue;
-                }
-
-                // If the response object was sent back,
-                // then send it and quit.
-                if ($result instanceof ResponseInterface) {
-                    // short circuit - bypass any other filters
-                    return $result;
-                }
-                // Ignore an empty result
-                if (empty($result)) {
-                    continue;
-                }
+        if ($position === 'before') {
+            $result = $this->runBefore($filtersClass);
 
+            // If the response object was sent back,
+            // then send it and quit.
+            if ($result instanceof ResponseInterface) {
+                // short circuit - bypass any other filters
                 return $result;
             }
 
-            if ($position === 'after') {
-                $result = $class->after(
-                    $this->request,
-                    $this->response,
-                    $this->argumentsClass[$className] ?? null
-                );
-
-                if ($result instanceof ResponseInterface) {
-                    $this->response = $result;
+            return $result;
+        }
 
-                    continue;
-                }
-            }
+        if ($position === 'after') {
+            $result = $this->runAfter($filtersClass);
         }
 
-        return $position === 'before' ? $this->request : $this->response;
+        return $result;
     }
 
     /**