Merge pull request phalcon#1139 from phalcon/3.2.x

3.2.10
Nazariy · Nov 3, 2017 · e57276b · e57276b
2 parents 61ece69 + ee40029
commit e57276b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -114,7 +114,7 @@ This command should display something similar to:
 ```sh
 $ phalcon --help
 
-Phalcon DevTools (3.2.8)
+Phalcon DevTools (3.2.10)
 
 Help:
   Lists the commands available in Phalcon devtools

diff --git a/scripts/Phalcon/Devtools/Version.php b/scripts/Phalcon/Devtools/Version.php
@@ -39,6 +39,6 @@ class Version extends PhVersion
      */
     protected static function _getVersion()
     {
-        return [3, 2, 8, 4, 0];
+        return [3, 2, 10, 4, 0];
     }
 }
diff --git a/scripts/Phalcon/Initializable.php b/scripts/Phalcon/Initializable.php
@@ -173,10 +173,11 @@ protected function initVolt()
     {
         $basePath = $this->basePath;
         $ptoolsPath = $this->ptoolsPath;
+        $that = $this;
 
         $this->di->setShared(
             'volt',
-            function ($view, $di) use ($basePath, $ptoolsPath) {
+            function ($view, $di) use ($basePath, $ptoolsPath, $that) {
                 /**
                  * @var DiInterface $this
                  * @var Config $config
@@ -208,7 +209,8 @@ function ($view, $di) use ($basePath, $ptoolsPath) {
                 $compiledPath = function ($templatePath) use (
                     $voltConfig,
                     $basePath,
-                    $ptoolsPath
+                    $ptoolsPath,
+                    $that
                 ) {
                     /**
                      * @var DiInterface $this
@@ -224,7 +226,7 @@ function ($view, $di) use ($basePath, $ptoolsPath) {
                     $filename = str_replace(['\\', '/'], $voltConfig->get('separator', '_'), $templatePath);
                     $filename = basename($filename, '.volt') . $voltConfig->get('compiledExt', '.php');
 
-                    $cacheDir = self::getCacheDir($voltConfig);
+                    $cacheDir = $that->getCacheDir($voltConfig);
 
                     return rtrim($cacheDir, '\\/') . DS . $filename;
                 };