Skip to content

Commit e57276b

Browse files
authored
Merge pull request #1139 from phalcon/3.2.x
3.2.10
2 parents 61ece69 + ee40029 commit e57276b

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ This command should display something similar to:
114114
```sh
115115
$ phalcon --help
116116

117-
Phalcon DevTools (3.2.8)
117+
Phalcon DevTools (3.2.10)
118118

119119
Help:
120120
Lists the commands available in Phalcon devtools

scripts/Phalcon/Devtools/Version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ class Version extends PhVersion
3939
*/
4040
protected static function _getVersion()
4141
{
42-
return [3, 2, 8, 4, 0];
42+
return [3, 2, 10, 4, 0];
4343
}
4444
}

scripts/Phalcon/Initializable.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,11 @@ protected function initVolt()
173173
{
174174
$basePath = $this->basePath;
175175
$ptoolsPath = $this->ptoolsPath;
176+
$that = $this;
176177

177178
$this->di->setShared(
178179
'volt',
179-
function ($view, $di) use ($basePath, $ptoolsPath) {
180+
function ($view, $di) use ($basePath, $ptoolsPath, $that) {
180181
/**
181182
* @var DiInterface $this
182183
* @var Config $config
@@ -208,7 +209,8 @@ function ($view, $di) use ($basePath, $ptoolsPath) {
208209
$compiledPath = function ($templatePath) use (
209210
$voltConfig,
210211
$basePath,
211-
$ptoolsPath
212+
$ptoolsPath,
213+
$that
212214
) {
213215
/**
214216
* @var DiInterface $this
@@ -224,7 +226,7 @@ function ($view, $di) use ($basePath, $ptoolsPath) {
224226
$filename = str_replace(['\\', '/'], $voltConfig->get('separator', '_'), $templatePath);
225227
$filename = basename($filename, '.volt') . $voltConfig->get('compiledExt', '.php');
226228

227-
$cacheDir = self::getCacheDir($voltConfig);
229+
$cacheDir = $that->getCacheDir($voltConfig);
228230

229231
return rtrim($cacheDir, '\\/') . DS . $filename;
230232
};

0 commit comments

Comments
 (0)