Archived
1
0
Fork 0

app/library/Services.php: update view initialization

This commit is contained in:
Henrik Hautakoski 2022-07-26 20:17:06 +02:00
parent abcbf8759e
commit 2dd571cd3d

View file

@ -12,6 +12,7 @@ use Phalcon\Di\FactoryDefault as DiDefault,
Phalcon\Flash\Direct as FlashDirect, Phalcon\Flash\Direct as FlashDirect,
Phalcon\Mvc\Model\Metadata\Memory as MemoryMetaData, Phalcon\Mvc\Model\Metadata\Memory as MemoryMetaData,
Phalcon\Mvc\Model\MetaData\Apc as ApcMetaData, Phalcon\Mvc\Model\MetaData\Apc as ApcMetaData,
Phalcon\Mvc\ViewBaseInterface,
Phalcon\Cache\Frontend\Data as FrontendDataCache, Phalcon\Cache\Frontend\Data as FrontendDataCache,
Phalcon\Cache\Backend\Apc as BackendApcCache, Phalcon\Cache\Backend\Apc as BackendApcCache,
Phalcon\Translate\Adapter\NativeArray as TranslateAdapter, Phalcon\Translate\Adapter\NativeArray as TranslateAdapter,
@ -227,23 +228,23 @@ class Services extends DiDefault
$view->setPartialsDir('_partials/'); $view->setPartialsDir('_partials/');
$view->registerEngines(array( $view->registerEngines(array(
'.volt' => function ($view, $di) use ($config) { '.volt' => function (ViewBaseInterface $view) use ($config) {
$volt = new VoltEngine($view, $di); $volt = new VoltEngine($view, $this);
$volt->setOptions(array( $volt->setOptions(array(
'compiledPath' => $config->application->viewCacheDir, 'path' => $config->application->viewCacheDir,
'compiledSeparator' => '_', 'separator' => '_',
'compileAlways' => true, 'always' => true,
)); ));
// Register view helpers // Register view helpers
$compiler = $volt->getCompiler(); $compiler = $volt->getCompiler();
$compiler->addExtension(new ViewHelperVoltExtension($di)); $compiler->addExtension(new ViewHelperVoltExtension($this));
return $volt; return $volt;
}, },
'.phtml' => 'Phalcon\Mvc\View\Engine\Php' '.phtml' => \Phalcon\Mvc\View\Engine\Php::class
)); ));
// Set default main layout. // Set default main layout.
@ -367,17 +368,17 @@ class Services extends DiDefault
$view = new SimpleView(); $view = new SimpleView();
$view->setViewsDir($config->application->templateDir); $view->setViewsDir($config->application->templateDir);
$view->registerEngines([ $view->registerEngines([
'.volt' => function ($view, $di) use ($config) { '.volt' => function (ViewBaseInterface $view) use ($config) {
$volt = new VoltEngine($view, $di); $volt = new VoltEngine($view, $this);
$volt->setOptions(array( $volt->setOptions(array(
'compiledPath' => $config->application->viewCacheDir, 'path' => $config->application->viewCacheDir,
'compiledSeparator' => '_', 'separator' => '_',
)); ));
return $volt; return $volt;
}, },
'.phtml' => 'Phalcon\Mvc\View\Engine\Php' '.phtml' => \Phalcon\Mvc\View\Engine\Php::class,
]); ]);
return $view; return $view;
} }