spiral / framework

src/Views/tests/CacheTest.php

Spacing +2 added lines, -2 removed lines

@@ -130,8 +130,8 @@
     protected function getView(ContextInterface $context, string $path): ViewInterface
     {
         $loader = new ViewLoader([
-            'default' => __DIR__ . '/fixtures/default',
-            'other'   => __DIR__ . '/fixtures/other',
+            'default' => __DIR__.'/fixtures/default',
+            'other'   => __DIR__.'/fixtures/other',
         ]);
 
         $engine = new NativeEngine(new Container());

src/Views/src/ViewContext.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
     public function getID(): string
     {
         $calculated = '';
-        foreach ($this->dependencies as $dependency) {
+        foreach ($this->dependencies as $dependency){
             $calculated .= "[{$dependency->getName()}={$dependency->getValue()}]";
         }
 
@@ -61,7 +61,7 @@ 
      */
     public function resolveValue(string $dependency)
     {
-        if (!isset($this->dependencies[$dependency])) {
+        if (!isset($this->dependencies[$dependency])){
             throw new ContextException("Undefined context dependency '{$dependency}'.");
         }
 

Braces +4 added lines, -2 removed lines

@@ -30,7 +30,8 @@ 
     public function getID(): string
     {
         $calculated = '';
-        foreach ($this->dependencies as $dependency) {
+        foreach ($this->dependencies as $dependency)
+        {
             $calculated .= "[{$dependency->getName()}={$dependency->getValue()}]";
         }
 
@@ -61,7 +62,8 @@ 
      */
     public function resolveValue(string $dependency)
     {
-        if (!isset($this->dependencies[$dependency])) {
+        if (!isset($this->dependencies[$dependency]))
+        {
             throw new ContextException("Undefined context dependency '{$dependency}'.");
         }
 

src/Views/src/Traits/ProcessorTrait.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
      */
     private function process(ViewSource $source, ContextInterface $context): ViewSource
     {
-        foreach ($this->processors as $processor) {
+        foreach ($this->processors as $processor){
             $source = $processor->process($source, $context);
         }
 

Braces +2 added lines, -1 removed lines

@@ -29,7 +29,8 @@
      */
     private function process(ViewSource $source, ContextInterface $context): ViewSource
     {
-        foreach ($this->processors as $processor) {
+        foreach ($this->processors as $processor)
+        {
             $source = $processor->process($source, $context);
         }
 

src/Views/src/Config/ViewsConfig.php

Spacing +5 added lines, -5 removed lines

@@ -46,7 +46,7 @@ 
      */
     public function getCacheDirectory(): string
     {
-        return rtrim($this->config['cache']['directory'], '/') . '/';
+        return rtrim($this->config['cache']['directory'], '/').'/';
     }
 
     /**
@@ -69,7 +69,7 @@ 
     public function getDependencies(): array
     {
         $dependencies = [];
-        foreach ($this->config['dependencies'] as $dependency) {
+        foreach ($this->config['dependencies'] as $dependency){
             $dependencies[] = $this->wire($dependency);
         }
 
@@ -86,7 +86,7 @@ 
     public function getEngines(): array
     {
         $engines = [];
-        foreach ($this->config['engines'] as $engine) {
+        foreach ($this->config['engines'] as $engine){
             $engines[] = $this->wire($engine);
         }
 
@@ -101,11 +101,11 @@ 
      */
     private function wire($item): Autowire
     {
-        if ($item instanceof Autowire) {
+        if ($item instanceof Autowire){
             return $item;
         }
 
-        if (is_string($item)) {
+        if (is_string($item)){
             return new Autowire($item);
         }
 

Braces +8 added lines, -4 removed lines

@@ -69,7 +69,8 @@ 
     public function getDependencies(): array
     {
         $dependencies = [];
-        foreach ($this->config['dependencies'] as $dependency) {
+        foreach ($this->config['dependencies'] as $dependency)
+        {
             $dependencies[] = $this->wire($dependency);
         }
 
@@ -86,7 +87,8 @@ 
     public function getEngines(): array
     {
         $engines = [];
-        foreach ($this->config['engines'] as $engine) {
+        foreach ($this->config['engines'] as $engine)
+        {
             $engines[] = $this->wire($engine);
         }
 
@@ -101,11 +103,13 @@ 
      */
     private function wire($item): Autowire
     {
-        if ($item instanceof Autowire) {
+        if ($item instanceof Autowire)
+        {
             return $item;
         }
 
-        if (is_string($item)) {
+        if (is_string($item))
+        {
             return new Autowire($item);
         }
 

src/Views/src/ContextGenerator.php

Spacing +4 added lines, -4 removed lines

@@ -52,22 +52,22 @@
      */
     private function rotate(ContextInterface $context, array $dependencies): array
     {
-        if (empty($dependencies)) {
+        if (empty($dependencies)){
             return [];
         }
 
         $top = array_shift($dependencies);
 
         $variants = [];
-        foreach ($top->getVariants() as $value) {
+        foreach ($top->getVariants() as $value){
             $variant = $context->withDependency(new ValueDependency($top->getName(), $value));
 
-            if (empty($dependencies)) {
+            if (empty($dependencies)){
                 $variants[] = $variant;
                 continue;
             }
 
-            foreach ($this->rotate($variant, $dependencies) as $inner) {
+            foreach ($this->rotate($variant, $dependencies) as $inner){
                 $variants[] = $inner;
             }
         }

Braces +8 added lines, -4 removed lines

@@ -52,22 +52,26 @@
      */
     private function rotate(ContextInterface $context, array $dependencies): array
     {
-        if (empty($dependencies)) {
+        if (empty($dependencies))
+        {
             return [];
         }
 
         $top = array_shift($dependencies);
 
         $variants = [];
-        foreach ($top->getVariants() as $value) {
+        foreach ($top->getVariants() as $value)
+        {
             $variant = $context->withDependency(new ValueDependency($top->getName(), $value));
 
-            if (empty($dependencies)) {
+            if (empty($dependencies))
+            {
                 $variants[] = $variant;
                 continue;
             }
 
-            foreach ($this->rotate($variant, $dependencies) as $inner) {
+            foreach ($this->rotate($variant, $dependencies) as $inner)
+            {
                 $variants[] = $inner;
             }
         }

src/Views/src/Engine/AbstractEngine.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
      */
     public function getLoader(): LoaderInterface
     {
-        if (empty($this->loader)) {
+        if (empty($this->loader)){
             throw new EngineException('No associated loader found');
         }
 

Braces +2 added lines, -1 removed lines

@@ -44,7 +44,8 @@
      */
     public function getLoader(): LoaderInterface
     {
-        if (empty($this->loader)) {
+        if (empty($this->loader))
+        {
             throw new EngineException('No associated loader found');
         }
 

src/Views/src/Engine/Native/NativeView.php

Spacing +5 added lines, -5 removed lines

@@ -49,21 +49,21 @@
         ob_start();
         $__outputLevel__ = ob_get_level();
 
-        try {
+        try{
             ContainerScope::runScope($this->container, function () use ($data): void {
                 extract($data, EXTR_OVERWRITE);
                 // render view in context and output buffer scope, context can be accessed using $this->context
                 require $this->view->getFilename();
             });
-        } catch (\Throwable $e) {
-            while (ob_get_level() >= $__outputLevel__) {
+        }catch (\Throwable $e){
+            while (ob_get_level() >= $__outputLevel__){
                 ob_end_clean();
             }
 
             throw new RenderException($e);
-        } finally {
+        }finally{
             //Closing all nested buffers
-            while (ob_get_level() > $__outputLevel__) {
+            while (ob_get_level() > $__outputLevel__){
                 ob_end_clean();
             }
         }

Braces +12 added lines, -5 removed lines

@@ -49,21 +49,28 @@
         ob_start();
         $__outputLevel__ = ob_get_level();
 
-        try {
+        try
+        {
             ContainerScope::runScope($this->container, function () use ($data): void {
                 extract($data, EXTR_OVERWRITE);
                 // render view in context and output buffer scope, context can be accessed using $this->context
                 require $this->view->getFilename();
             });
-        } catch (\Throwable $e) {
-            while (ob_get_level() >= $__outputLevel__) {
+        }
+        catch (\Throwable $e)
+        {
+            while (ob_get_level() >= $__outputLevel__)
+            {
                 ob_end_clean();
             }
 
             throw new RenderException($e);
-        } finally {
+        }
+        finally
+        {
             //Closing all nested buffers
-            while (ob_get_level() > $__outputLevel__) {
+            while (ob_get_level() > $__outputLevel__)
+            {
                 ob_end_clean();
             }
         }

src/Views/src/ViewCache.php

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
      */
     public function reset(ContextInterface $context = null): void
     {
-        if (empty($context)) {
+        if (empty($context)){
             $this->cache = [];
             return;
         }
@@ -38,7 +38,7 @@ 
      */
     public function resetPath(string $path): void
     {
-        foreach ($this->cache as &$cache) {
+        foreach ($this->cache as &$cache){
             unset($cache[$path], $cache);
         }
     }
@@ -72,7 +72,7 @@ 
      */
     public function get(ContextInterface $context, string $path): ViewInterface
     {
-        if (!$this->has($context, $path)) {
+        if (!$this->has($context, $path)){
             throw new CacheException("No cache is available for {$path}.");
         }
 

Braces +6 added lines, -3 removed lines

@@ -23,7 +23,8 @@ 
      */
     public function reset(ContextInterface $context = null): void
     {
-        if (empty($context)) {
+        if (empty($context))
+        {
             $this->cache = [];
             return;
         }
@@ -38,7 +39,8 @@ 
      */
     public function resetPath(string $path): void
     {
-        foreach ($this->cache as &$cache) {
+        foreach ($this->cache as &$cache)
+        {
             unset($cache[$path], $cache);
         }
     }
@@ -72,7 +74,8 @@ 
      */
     public function get(ContextInterface $context, string $path): ViewInterface
     {
-        if (!$this->has($context, $path)) {
+        if (!$this->has($context, $path))
+        {
             throw new CacheException("No cache is available for {$path}.");
         }
 

src/Views/src/Loader/PathParser.php

Spacing +12 added lines, -12 removed lines

@@ -75,21 +75,21 @@ 
         );
 
         $namespace = $this->defaultNamespace;
-        if (strpos($filename, '.') === false) {
+        if (strpos($filename, '.') === false){
             //Force default extension
-            $filename .= '.' . $this->extension;
-        } elseif (!$this->match($filename)) {
+            $filename .= '.'.$this->extension;
+        } elseif (!$this->match($filename)){
             return null;
         }
 
-        if (strpos($filename, LoaderInterface::NS_SEPARATOR) !== false) {
+        if (strpos($filename, LoaderInterface::NS_SEPARATOR) !== false){
             list($namespace, $filename) = explode(LoaderInterface::NS_SEPARATOR, $filename);
         }
 
         //Twig like namespaces
-        if (isset($filename[0]) && $filename[0] == '@') {
+        if (isset($filename[0]) && $filename[0] == '@'){
             $separator = strpos($filename, '/');
-            if ($separator === false) {
+            if ($separator === false){
                 throw new PathException(sprintf('Malformed view path"%s" (expecting "@namespace/name").', $path));
             }
 
@@ -123,11 +123,11 @@ 
      */
     private function validatePath(string $path): void
     {
-        if (empty($path)) {
+        if (empty($path)){
             throw new PathException('A view path is empty');
         }
 
-        if (false !== strpos($path, "\0")) {
+        if (false !== strpos($path, "\0")){
             throw new PathException('A view path cannot contain NUL bytes');
         }
 
@@ -135,14 +135,14 @@ 
         $parts = explode('/', $path);
         $level = 0;
 
-        foreach ($parts as $part) {
-            if ('..' === $part) {
+        foreach ($parts as $part){
+            if ('..' === $part){
                 --$level;
-            } elseif ('.' !== $part) {
+            } elseif ('.' !== $part){
                 ++$level;
             }
 
-            if ($level < 0) {
+            if ($level < 0){
                 throw new PathException(sprintf(
                     'Looks like you try to load a view outside configured directories (%s)',
                     $path

Braces +24 added lines, -11 removed lines

@@ -75,21 +75,27 @@ 
         );
 
         $namespace = $this->defaultNamespace;
-        if (strpos($filename, '.') === false) {
+        if (strpos($filename, '.') === false)
+        {
             //Force default extension
             $filename .= '.' . $this->extension;
-        } elseif (!$this->match($filename)) {
+        }
+        elseif (!$this->match($filename))
+        {
             return null;
         }
 
-        if (strpos($filename, LoaderInterface::NS_SEPARATOR) !== false) {
+        if (strpos($filename, LoaderInterface::NS_SEPARATOR) !== false)
+        {
             list($namespace, $filename) = explode(LoaderInterface::NS_SEPARATOR, $filename);
         }
 
         //Twig like namespaces
-        if (isset($filename[0]) && $filename[0] == '@') {
+        if (isset($filename[0]) && $filename[0] == '@')
+        {
             $separator = strpos($filename, '/');
-            if ($separator === false) {
+            if ($separator === false)
+            {
                 throw new PathException(sprintf('Malformed view path"%s" (expecting "@namespace/name").', $path));
             }
 
@@ -123,11 +129,13 @@ 
      */
     private function validatePath(string $path): void
     {
-        if (empty($path)) {
+        if (empty($path))
+        {
             throw new PathException('A view path is empty');
         }
 
-        if (false !== strpos($path, "\0")) {
+        if (false !== strpos($path, "\0"))
+        {
             throw new PathException('A view path cannot contain NUL bytes');
         }
 
@@ -135,14 +143,19 @@ 
         $parts = explode('/', $path);
         $level = 0;
 
-        foreach ($parts as $part) {
-            if ('..' === $part) {
+        foreach ($parts as $part)
+        {
+            if ('..' === $part)
+            {
                 --$level;
-            } elseif ('.' !== $part) {
+            }
+            elseif ('.' !== $part)
+            {
                 ++$level;
             }
 
-            if ($level < 0) {
+            if ($level < 0)
+            {
                 throw new PathException(sprintf(
                     'Looks like you try to load a view outside configured directories (%s)',
                     $path