Merge pull request #197 from spiral/develop

sync

CHANGELOG.md

@@ -1,5 +1,17 @@
 CHANGELOG for 0.9.0 RC
 ======================
+1.0.6 (28.09.2017)
+-----
+- Fixed a bug when error message was converted to empty array
+- Fixed a bug when multidepth requests contained invalid prefix (in case of depth more than 3)
+
+1.0.5
+-----
+- ability to locate view cache files by view name and namespace
+
+1.0.4
+-----
+- ability to add conditions to skip validation rules
 
 1.0.2 (04.05.2017)
 -----

source/Spiral/Http/Request/InputInterface.php

@@ -36,7 +36,9 @@ public function getValue(string $source, string $name = null);
      *
      * @param string $prefix
      *
+     * @param bool $add When set to false current prefix path will be overwritten.
+     *
      * @return InputInterface
      */
-    public function withPrefix(string $prefix): InputInterface;
+    public function withPrefix(string $prefix, bool $add = true): InputInterface;
 }

source/Spiral/Http/Request/InputManager.php

@@ -387,10 +387,16 @@ public function getValue(string $source, string $name = null)
      *
      * @return self
      */
-    public function withPrefix(string $prefix): InputInterface
+    public function withPrefix(string $prefix, bool $add = true): InputInterface
     {
         $input = clone $this;
-        $input->prefix = $prefix;
+
+        if ($add) {
+            $input->prefix .= '.' . $prefix;
+            $input->prefix = trim($input->prefix, '.');
+        } else {
+            $input->prefix = $prefix;
+        }
 
         return $input;
     }

source/Spiral/Http/Request/InputMapper.php

@@ -113,7 +113,7 @@ public function originateErrors(array $errors): array
                 $this->mountMessage($mapped, $this->schema[$field]['origin'], $message);
             } else {
                 //Custom error
-                $mapped[$field] = $mapped;
+                $mapped[$field] = $message;
             }
         }
 
@@ -264,4 +264,4 @@ private function createOrigins(
 
         return $result;
     }
-}
+}

source/Spiral/Views/AbstractViewCache.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * (c) Lev Seleznev (tuneyourserver) 2017
+ */
+
+namespace Spiral\Views;
+
+/**
+ * Class AbstractViewCache
+ *
+ * Provides ability to locate cache files by common prefix with many environments.
+ *
+ * @package Spiral\Views
+ */
+abstract class AbstractViewCache
+{
+    /**
+     * Returns file name prefix by namespace:name
+     *
+     * @param string $name
+     * @param string $namespace
+     * @return string
+     */
+    protected function getPrefix($name, $namespace = 'default')
+    {
+        $prefix = $namespace . ViewManager::NS_SEPARATOR . $name;
+        $prefix = preg_replace('/([^A-Za-z0-9]|-)+/', '-', $prefix) . '-' .
+            hash('md5', $name . ViewManager::NS_SEPARATOR . $namespace);
+
+        return $prefix;
+    }
+}

source/Spiral/Views/Engines/Stempler/StemplerCache.php

@@ -9,13 +9,14 @@
 namespace Spiral\Views\Engines\Stempler;
 
 use Spiral\Files\FilesInterface;
+use Spiral\Views\AbstractViewCache;
 use Spiral\Views\EnvironmentInterface;
 use Spiral\Views\ViewSource;
 
 /**
  * Very simple Stempler cache. Almost identical to twig cache except generateKey method.
  */
-class StemplerCache
+class StemplerCache extends AbstractViewCache
 {
     /**
      * @var FilesInterface
@@ -61,7 +62,8 @@ public function cacheFilename(ViewSource $context): string
     {
         $hash = hash('md5', $context->getFilename() . '.' . $this->environment->getID());
 
-        return $this->environment->cacheDirectory() . $hash . '.php';
+        return $this->environment->cacheDirectory() .
+            $this->getPrefix($context->getName(), $context->getNamespace()) . '-' . $hash . '.php';
     }
 
     /**

source/Spiral/Views/Engines/Twig/TwigCache.php

@@ -9,12 +9,13 @@
 namespace Spiral\Views\Engines\Twig;
 
 use Spiral\Files\FilesInterface;
+use Spiral\Views\AbstractViewCache;
 use Spiral\Views\EnvironmentInterface;
 
 /**
  * Spiral specific twig cache. OpCache reset not included yet.
  */
-class TwigCache implements \Twig_CacheInterface
+class TwigCache extends AbstractViewCache implements \Twig_CacheInterface
 {
     /**
      * @var FilesInterface
@@ -41,9 +42,10 @@ public function __construct(FilesInterface $files, EnvironmentInterface $environ
      */
     public function generateKey($name, $className)
     {
+        $prefix = $this->getPrefix($name);
         $hash = hash('md5', $className . '.' . $this->environment->getID());
 
-        return "{$this->environment->cacheDirectory()}/{$hash}.php";
+        return "{$this->environment->cacheDirectory()}/{$prefix}-{$hash}.php";
     }
 
     /**

source/Spiral/Views/ViewCacheLocator.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * (c) Lev Seleznev (tuneyourserver) 2017
+ */
+
+namespace Spiral\Views;
+
+
+use Spiral\Files\FileManager;
+use Spiral\Views\Configs\ViewsConfig;
+
+/**
+ * Class ViewCacheLocator
+ *
+ * Provides ability to locate cache files by view name and namespace
+ *
+ * @package Spiral\Views
+ */
+class ViewCacheLocator extends AbstractViewCache
+{
+    /** @var FileManager  */
+    protected $fileManager;
+
+    /** @var ViewsConfig  */
+    protected $config;
+
+    /**
+     * CacheLocator constructor.
+     *
+     * @param ViewsConfig $config
+     * @param FileManager $fileManager
+     */
+    public function __construct(ViewsConfig $config, FileManager $fileManager)
+    {
+        $this->config = $config;
+        $this->fileManager = $fileManager;
+    }
+
+    /**
+     * Returns all cache files for view.
+     *
+     * @param string $view
+     * @param string $namespace
+     * @return array
+     */
+    public function getFiles($view, $namespace = 'default')
+    {
+        $prefix = $this->getPrefix($view, $namespace);
+
+        return $this->fileManager->getFiles($this->config->cacheDirectory(), $prefix.'-*');
+    }
+}

tests/Http/Fixtures/FirstDepthRequest.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Spiral\Tests\Http\Fixtures;
+
+use Spiral\Http\Request\RequestFilter;
+
+class FirstDepthRequest extends RequestFilter
+{
+    const SCHEMA = [
+        'first' => SecondDepthRequest::class
+    ];
+}

tests/Http/Fixtures/SecondDepthRequest.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Spiral\Tests\Http\Fixtures;
+
+use Spiral\Http\Request\RequestFilter;
+
+class SecondDepthRequest extends RequestFilter
+{
+    const SCHEMA = [
+        'second' => ThirdDepthRequest::class
+    ];
+}

tests/Http/Fixtures/ThirdDepthRequest.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Spiral\Tests\Http\Fixtures;
+
+use Spiral\Http\Request\RequestFilter;
+
+class ThirdDepthRequest extends RequestFilter
+{
+    const SCHEMA = [
+        'third' => 'data:third'
+    ];
+
+    const VALIDATES = [
+        'third' => ['notEmpty']
+    ];
+}

tests/Http/RequestFilters/MultipleDepthRequestTest.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace Spiral\Tests\Http\RequestFilters;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Spiral\Tests\Http\Fixtures\DemoRequest;
+use Spiral\Tests\Http\Fixtures\FirstDepthRequest;
+use Spiral\Tests\Http\Fixtures\ThirdDepthRequest;
+use Spiral\Tests\Http\HttpTest;
+use Zend\Diactoros\ServerRequest;
+
+class MultipleDepthRequestTest extends HttpTest
+{
+    public function testHasErrors()
+    {
+        $serverRequest = new ServerRequest();
+        $serverRequest = $serverRequest->withParsedBody([]);
+        $this->container->bind(ServerRequestInterface::class, $serverRequest);
+
+        /** @var DemoRequest $request */
+        $request = $this->container->get(FirstDepthRequest::class);
+
+        $this->assertFalse($request->isValid());
+        $this->assertArrayHasKey('first', $request->getErrors());
+        $this->assertArrayHasKey('second', $request->getErrors()['first']);
+        $this->assertArrayHasKey('third', $request->getErrors()['first']['second']);
+    }
+
+    public function testDataPassed()
+    {
+        $serverRequest = new ServerRequest();
+        $serverRequest = $serverRequest->withParsedBody([
+            'first' => [
+                'second' => [
+                    'third' => '3rd value',
+                ],
+            ]
+        ]);
+        $this->container->bind(ServerRequestInterface::class, $serverRequest);
+
+        /** @var DemoRequest $request */
+        $request = $this->container->get(FirstDepthRequest::class);
+
+        $this->assertTrue($request->isValid());
+        $this->assertArrayNotHasKey('first', $request->getErrors());
+
+        $this->assertArrayHasKey('first', $request->getValidator()->getData());
+        $this->assertArrayHasKey('second', $request->getValidator()->getData()['first']);
+        $this->assertArrayHasKey('third', $request->getValidator()->getData()['first']['second']);
+        $this->assertSame('3rd value', $request->getValidator()->getData()['first']['second']['third']);
+    }
+}

tests/Http/RequestFilters/ScopingTest.php

@@ -35,7 +35,7 @@ public function getValue(string $source, string $name = null)
                 }
             }
 
-            public function withPrefix(string $prefix): InputInterface
+            public function withPrefix(string $prefix, bool $add = true): InputInterface
             {
                 return $this;
             }

tests/Translator/LocatorTest.php

@@ -49,7 +49,12 @@ public function testGetLocales()
 
         $config->shouldReceive('localesDirectory')->andReturn(__DIR__ . '/fixtures/locales/');
 
-        $this->assertSame(['en', 'ru'], $source->getLocales());
+        $compared = $source->getLocales();
+        $shouldBe = ['en', 'ru'];
+        sort($shouldBe);
+        sort($compared);
+
+        $this->assertSame($shouldBe, $compared);
     }
 
     public function testLoadLocale()

tests/Views/StemplerTest.php

@@ -10,10 +10,20 @@
 use Spiral\Tests\BaseTest;
 use Spiral\Views\Engines\Stempler\StemplerCache;
 use Spiral\Views\Engines\Stempler\StemplerView;
+use Spiral\Views\ViewCacheLocator;
 use Spiral\Views\ViewLoader;
 
 class StemplerTest extends BaseTest
 {
+    protected function deleteCacheFiles()
+    {
+        foreach ($this->files->getFiles($this->views->getEnvironment()->cacheDirectory()) as $filename) {
+            //If exception is thrown here this will mean that application wasn't correctly
+            //destructed and there is open resources kept
+            $this->files->delete($filename);
+        }
+    }
+
     public function testRenderSimple()
     {
         $this->assertSame('Hello, World!', trim($this->views->render('home', [
@@ -53,7 +63,10 @@ public function testCompileWithEnvironment()
 
     public function testRenderFromOtherLoader()
     {
-        $this->assertSame('Hello, World!', $this->views->render('native', [
+        $this->deleteCacheFiles();
+        clearstatcache();
+
+        $this->assertContains('Hello, World!', $this->views->render('home', [
             'name' => 'World'
         ]));
 
@@ -64,7 +77,7 @@ public function testRenderFromOtherLoader()
             )
         );
 
-        $this->assertSame('home alt', $views->render('home'));
+        $this->assertContains('home alt', $views->render('home'));
     }
 
     public function testRenderFromCache()
@@ -92,4 +105,27 @@ public function testView()
     {
         $this->assertInstanceOf(StemplerView::class, $this->views->get('home'));
     }
+
+    public function testCacheLocator()
+    {
+        $this->deleteCacheFiles();
+        clearstatcache();
+
+        $this->views->withEnvironment(
+            $this->views->getEnvironment()->withDependency('value', function () {
+                return 'test-one';
+            })
+        )->compile('home');
+
+        $this->views->withEnvironment(
+            $this->views->getEnvironment()->withDependency('value', function () {
+                return 'test-two';
+            })
+        )->compile('home');
+
+        /** @var ViewCacheLocator $data */
+        $viewCacheLocator = $this->container->get(ViewCacheLocator::class);
+
+        $this->assertSame(2, count($viewCacheLocator->getFiles('home')));
+    }
 }