spiral / framework

src/Framework/Domain/PipelineInterceptor.php

Spacing +18 added lines, -18 removed lines

@@ -44,17 +44,17 @@ 
     public function process(string $controller, string $action, array $parameters, CoreInterface $core)
     {
         $annotation = $this->readAnnotation($controller, $action);
-        if ($core instanceof InterceptorPipeline && $annotation->skipNext) {
+        if ($core instanceof InterceptorPipeline && $annotation->skipNext){
             $this->removeNextInterceptorsFromOriginalPipeline($core);
         }
 
         $pipeline = $this->getCachedPipeline($controller, $action, $annotation);
-        if (!empty($pipeline)) {
-            if ($core instanceof InterceptorPipeline) {
+        if (!empty($pipeline)){
+            if ($core instanceof InterceptorPipeline){
                 $this->injectInterceptorsIntoOriginalPipeline($core, $pipeline);
-            } else {
+            }else{
                 $core = new InterceptableCore($core);
-                foreach ($pipeline as $interceptor) {
+                foreach ($pipeline as $interceptor){
                     $core->addInterceptor($interceptor);
                 }
             }
@@ -70,9 +70,9 @@ 
      */
     private function readAnnotation(string $controller, string $action): Pipeline
     {
-        try {
+        try{
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             return new Pipeline();
         }
 
@@ -91,14 +91,14 @@ 
 
         $oldInterceptors = $pipelineReflection->getValue($pipeline);
         $newInterceptors = [];
-        foreach ($oldInterceptors as $interceptor) {
+        foreach ($oldInterceptors as $interceptor){
             $newInterceptors[] = $interceptor;
-            if ($interceptor instanceof self) {
+            if ($interceptor instanceof self){
                 break;
             }
         }
 
-        if (count($newInterceptors) !== count($oldInterceptors)) {
+        if (count($newInterceptors) !== count($oldInterceptors)){
             $pipelineReflection->setValue($pipeline, $newInterceptors);
         }
         $pipelineReflection->setAccessible(false);
@@ -111,16 +111,16 @@ 
 
         $oldInterceptors = $pipelineReflection->getValue($pipeline);
         $newInterceptors = [];
-        foreach ($oldInterceptors as $interceptor) {
+        foreach ($oldInterceptors as $interceptor){
             $newInterceptors[] = $interceptor;
-            if ($interceptor instanceof self) {
-                foreach ($interceptors as $newInterceptor) {
+            if ($interceptor instanceof self){
+                foreach ($interceptors as $newInterceptor){
                     $newInterceptors[] = $newInterceptor;
                 }
             }
         }
 
-        if (count($newInterceptors) !== count($oldInterceptors)) {
+        if (count($newInterceptors) !== count($oldInterceptors)){
             $pipelineReflection->setValue($pipeline, $newInterceptors);
         }
         $pipelineReflection->setAccessible(false);
@@ -135,7 +135,7 @@ 
     private function getCachedPipeline(string $controller, string $action, Pipeline $annotation): array
     {
         $key = "{$controller}:{$action}";
-        if (!array_key_exists($key, $this->cache)) {
+        if (!array_key_exists($key, $this->cache)){
             $this->cache[$key] = $this->extractAnnotationPipeline($annotation);
         }
 
@@ -149,10 +149,10 @@ 
     private function extractAnnotationPipeline(Pipeline $annotation): array
     {
         $interceptors = [];
-        foreach ($annotation->pipeline as $interceptor) {
-            try {
+        foreach ($annotation->pipeline as $interceptor){
+            try{
                 $interceptors[] = $this->container->get($interceptor);
-            } catch (\Throwable $e) {
+            }catch (\Throwable $e){
             }
         }
 

Braces +39 added lines, -18 removed lines

@@ -44,17 +44,23 @@ 
     public function process(string $controller, string $action, array $parameters, CoreInterface $core)
     {
         $annotation = $this->readAnnotation($controller, $action);
-        if ($core instanceof InterceptorPipeline && $annotation->skipNext) {
+        if ($core instanceof InterceptorPipeline && $annotation->skipNext)
+        {
             $this->removeNextInterceptorsFromOriginalPipeline($core);
         }
 
         $pipeline = $this->getCachedPipeline($controller, $action, $annotation);
-        if (!empty($pipeline)) {
-            if ($core instanceof InterceptorPipeline) {
+        if (!empty($pipeline))
+        {
+            if ($core instanceof InterceptorPipeline)
+            {
                 $this->injectInterceptorsIntoOriginalPipeline($core, $pipeline);
-            } else {
+            }
+            else
+            {
                 $core = new InterceptableCore($core);
-                foreach ($pipeline as $interceptor) {
+                foreach ($pipeline as $interceptor)
+                {
                     $core->addInterceptor($interceptor);
                 }
             }
@@ -70,9 +76,12 @@ 
      */
     private function readAnnotation(string $controller, string $action): Pipeline
     {
-        try {
+        try
+        {
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             return new Pipeline();
         }
 
@@ -91,14 +100,17 @@ 
 
         $oldInterceptors = $pipelineReflection->getValue($pipeline);
         $newInterceptors = [];
-        foreach ($oldInterceptors as $interceptor) {
+        foreach ($oldInterceptors as $interceptor)
+        {
             $newInterceptors[] = $interceptor;
-            if ($interceptor instanceof self) {
+            if ($interceptor instanceof self)
+            {
                 break;
             }
         }
 
-        if (count($newInterceptors) !== count($oldInterceptors)) {
+        if (count($newInterceptors) !== count($oldInterceptors))
+        {
             $pipelineReflection->setValue($pipeline, $newInterceptors);
         }
         $pipelineReflection->setAccessible(false);
@@ -111,16 +123,20 @@ 
 
         $oldInterceptors = $pipelineReflection->getValue($pipeline);
         $newInterceptors = [];
-        foreach ($oldInterceptors as $interceptor) {
+        foreach ($oldInterceptors as $interceptor)
+        {
             $newInterceptors[] = $interceptor;
-            if ($interceptor instanceof self) {
-                foreach ($interceptors as $newInterceptor) {
+            if ($interceptor instanceof self)
+            {
+                foreach ($interceptors as $newInterceptor)
+                {
                     $newInterceptors[] = $newInterceptor;
                 }
             }
         }
 
-        if (count($newInterceptors) !== count($oldInterceptors)) {
+        if (count($newInterceptors) !== count($oldInterceptors))
+        {
             $pipelineReflection->setValue($pipeline, $newInterceptors);
         }
         $pipelineReflection->setAccessible(false);
@@ -135,7 +151,8 @@ 
     private function getCachedPipeline(string $controller, string $action, Pipeline $annotation): array
     {
         $key = "{$controller}:{$action}";
-        if (!array_key_exists($key, $this->cache)) {
+        if (!array_key_exists($key, $this->cache))
+        {
             $this->cache[$key] = $this->extractAnnotationPipeline($annotation);
         }
 
@@ -149,10 +166,14 @@ 
     private function extractAnnotationPipeline(Pipeline $annotation): array
     {
         $interceptors = [];
-        foreach ($annotation->pipeline as $interceptor) {
-            try {
+        foreach ($annotation->pipeline as $interceptor)
+        {
+            try
+            {
                 $interceptors[] = $this->container->get($interceptor);
-            } catch (\Throwable $e) {
+            }
+            catch (\Throwable $e)
+            {
             }
         }
 

tests/app/src/Interceptor/Append.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     public function process(string $controller, string $action, array $parameters, CoreInterface $core): array
     {
         $result = $core->callAction($controller, $action, $parameters);
-        if (!is_array($result)) {
+        if (!is_array($result)){
             $result = [];
         }
         $result[] = $this->string;

Braces +2 added lines, -1 removed lines

@@ -19,7 +19,8 @@
     public function process(string $controller, string $action, array $parameters, CoreInterface $core): array
     {
         $result = $core->callAction($controller, $action, $parameters);
-        if (!is_array($result)) {
+        if (!is_array($result))
+        {
             $result = [];
         }
         $result[] = $this->string;

tests/app/src/Bootloader/AppBootloader.php

Spacing +2 added lines, -2 removed lines

@@ -89,7 +89,7 @@ 
             new Route('/auth/<action>', new Controller(AuthController::class))
         );
 
-        $views->addDirectory('custom', __DIR__ . '/../../views/custom/');
+        $views->addDirectory('custom', __DIR__.'/../../views/custom/');
         $views->addEngine(TestEngine::class);
 
         $validation->addAlias('aliased', 'notEmpty');
@@ -173,7 +173,7 @@ 
     {
         $core = new InterceptableCore($this->core);
 
-        foreach ($interceptors as $interceptor) {
+        foreach ($interceptors as $interceptor){
             $core->addInterceptor(is_object($interceptor) ? $interceptor : $this->container->get($interceptor));
         }
 

Braces +2 added lines, -1 removed lines

@@ -173,7 +173,8 @@
     {
         $core = new InterceptableCore($this->core);
 
-        foreach ($interceptors as $interceptor) {
+        foreach ($interceptors as $interceptor)
+        {
             $core->addInterceptor(is_object($interceptor) ? $interceptor : $this->container->get($interceptor));
         }