diff --git a/examples/application/index/index.twig b/examples/application/index/index.twig index 073b41f..22d4dc4 100644 --- a/examples/application/index/index.twig +++ b/examples/application/index/index.twig @@ -1,30 +1,48 @@ {% extends 'layout/layout.twig' %} {% block content %} -
-

{{ translate('Welcome to %sZend Framework 2%s'|format('', '')) }}

-

{{ translate('Congratulations! You have successfully installed the %sZF2 Skeleton Application%s. You are currently running Zend Framework version %s. This skeleton can serve as a simple starting point for you to begin building your application on ZF2.'|format('', '', 2)) }}

-

{{ translate('Fork Zend Framework 2 on GitHub') }} »

-
+
+

{{ translate('Welcome to %sZend Framework 2%s'|format('', '')) }}

+

{{ translate('Congratulations! You have successfully installed the %sZF2 Skeleton Application%s. You are currently running Zend Framework version %s. This skeleton can serve as a simple starting point for you to begin building your application on ZF2.'|format('', '', 2)) }}

+

{{ translate('Fork Zend Framework 2 on GitHub') }} »

+
-
+
-
-

{{ translate('Follow Development') }}

-

{{ translate('Zend Framework 2 is under active development. If you are interested in following the development of ZF2, there is a special ZF2 portal on the official Zend Framework website which provides links to the ZF2 %swiki%s, %sdev blog%s, %sissue tracker%s, and much more. This is a great resource for staying up to date with the latest developments!'|format('', '', '', '', '', '')) }}

-

{{ translate('ZF2 Development Portal') }} »

+
+
+
+

{{ translate('Follow Development') }}

+
+
+

{{ translate('Zend Framework 2 is under active development. If you are interested in following the development of ZF2, there is a special ZF2 portal on the official Zend Framework website which provides links to the ZF2 %swiki%s, %sdev blog%s, %sissue tracker%s, and much more. This is a great resource for staying up to date with the latest developments!'|format('', '', '', '', '', '')) }}

+

{{ translate('ZF2 Development Portal') }} »

+
+
-
-

{{ translate('Discover Modules') }}

-

{{ translate('The community is working on developing a community site to serve as a repository and gallery for ZF2 modules. The project is available %son GitHub%s. The site is currently live and currently contains a list of some of the modules already available for ZF2.'|format('', '')) }}

-

{{ translate('Explore ZF2 Modules') }} »

+
+
+
+

{{ translate('Discover Modules') }}

+
+
+

{{ translate('The community is working on developing a community site to serve as a repository and gallery for ZF2 modules. The project is available %son GitHub%s. The site is currently live and currently contains a list of some of the modules already available for ZF2.'|format('', '')) }}

+

{{ translate('Explore ZF2 Modules') }} »

+
+
-
-

{{ translate('Help & Support') }}

-

{{ translate('If you need any help or support while developing with ZF2, you may reach us via IRC: %s#zftalk on Freenode%s. We\'d love to hear any questions or feedback you may have regarding the beta releases. Alternatively, you may subscribe and post questions to the %smailing lists%s.'|format('', '', '', '')) }}

-

{{ translate('Ping us on IRC') }} »

+
+
+
+

{{ translate('Help & Support') }}

+
+
+

{{ translate('If you need any help or support while developing with ZF2, you may reach us via IRC: %s#zftalk on Freenode%s. We\'d love to hear any questions or feedback you may have regarding the beta releases. Alternatively, you may subscribe and post questions to the %smailing lists%s.'|format('', '', '', '')) }}

+

{{ translate('Ping us on IRC') }} »

+
+
{% endblock content %} \ No newline at end of file diff --git a/examples/layout/layout.twig b/examples/layout/layout.twig index 965303d..f03d55c 100644 --- a/examples/layout/layout.twig +++ b/examples/layout/layout.twig @@ -10,42 +10,43 @@ {% block meta %}{% endblock meta %} - - - - + + + + + {% block style %}{% endblock style %} - + - - - + + + + {% block script %}{% endblock script %} -
-
-
- +
+
- {% block content %}{{ content|raw }}{% endblock content %}
-

© 2005 - 2012 by Zend Technologies Ltd. {{ translate('All rights reserved.') }}

+

© 2005 - 2014 by Zend Technologies Ltd. {{ translate('All rights reserved.') }}

{% block inline %}{% endblock inline %} diff --git a/src/ZfcTwig/ModuleOptions.php b/src/ZfcTwig/ModuleOptions.php index 7e0f362..52d3dee 100644 --- a/src/ZfcTwig/ModuleOptions.php +++ b/src/ZfcTwig/ModuleOptions.php @@ -21,6 +21,11 @@ class ModuleOptions extends AbstractOptions */ protected $environmentOptions = array(); + /** + * @var array + */ + protected $globals = array(); + /** * @var array */ @@ -210,5 +215,21 @@ public function getEnvironmentClass() { return $this->environmentClass; } + + /** + * @param array $globals + */ + public function setGlobals($globals) + { + $this->globals = $globals; + } + + /** + * @return array + */ + public function getGlobals() + { + return $this->globals; + } } diff --git a/src/ZfcTwig/Twig/EnvironmentFactory.php b/src/ZfcTwig/Twig/EnvironmentFactory.php index dccfb4b..9be3789 100644 --- a/src/ZfcTwig/Twig/EnvironmentFactory.php +++ b/src/ZfcTwig/Twig/EnvironmentFactory.php @@ -19,7 +19,8 @@ public function createService(ServiceLocatorInterface $serviceLocator) /** @var \ZfcTwig\moduleOptions $options */ $options = $serviceLocator->get('ZfcTwig\ModuleOptions'); $envClass = $options->getEnvironmentClass(); - + + /** @var \Twig_Environment $env */ $env = new $envClass(null, $options->getEnvironmentOptions()); if ($options->getEnableFallbackFunctions()) { @@ -45,6 +46,10 @@ function ($name) use ($helperPluginManager) { $env->setLoader($serviceLocator->get($options->getEnvironmentLoader())); + foreach ($options->getGlobals() as $name => $value) { + $env->addGlobal($name, $value); + } + // Extensions are loaded later to avoid circular dependencies (for example, if an extension needs Renderer). return $env; } diff --git a/src/ZfcTwig/Twig/MapLoader.php b/src/ZfcTwig/Twig/MapLoader.php index cda7d5e..5eecddb 100644 --- a/src/ZfcTwig/Twig/MapLoader.php +++ b/src/ZfcTwig/Twig/MapLoader.php @@ -53,6 +53,12 @@ public function getSource($name) $name )); } + if(!file_exists($this->map[$name])) { + throw new Twig_Error_Loader(sprintf( + 'Unable to open file "%s" from template map', + $this->map[$name] + )); + } return file_get_contents($this->map[$name]); } @@ -71,4 +77,4 @@ public function isFresh($name, $time) { return filemtime($this->map[$name]) <= $time; } -} \ No newline at end of file +} diff --git a/src/ZfcTwig/Twig/StackLoader.php b/src/ZfcTwig/Twig/StackLoader.php index be9f569..097de4f 100644 --- a/src/ZfcTwig/Twig/StackLoader.php +++ b/src/ZfcTwig/Twig/StackLoader.php @@ -39,7 +39,7 @@ public function getDefaultSuffix() return $this->defaultSuffix; } - protected function findTemplate($name) + protected function findTemplate($name, $throw = true) { $name = (string) $name; @@ -78,7 +78,10 @@ protected function findTemplate($name) return $this->cache[$name] = $path.'/'.$name; } } - - throw new Twig_Error_Loader(sprintf('Unable to find template "%s" (looked into: %s).', $name, implode(', ', $this->paths[$namespace]))); + if ($throw) { + throw new Twig_Error_Loader(sprintf('Unable to find template "%s" (looked into: %s).', $name, implode(', ', $this->paths[$namespace]))); + } else { + return false; + } } -} \ No newline at end of file +} diff --git a/src/ZfcTwig/View/HelperPluginManagerFactory.php b/src/ZfcTwig/View/HelperPluginManagerFactory.php index 5672f80..7e98b3f 100644 --- a/src/ZfcTwig/View/HelperPluginManagerFactory.php +++ b/src/ZfcTwig/View/HelperPluginManagerFactory.php @@ -28,6 +28,7 @@ public function createService(ServiceLocatorInterface $serviceLocator) $baseManager = $serviceLocator->get('ViewHelperManager'); $twigManager = new HelperPluginManager(new Config($managerOptions)); + $twigManager->setServiceLocator($serviceLocator); $twigManager->addPeeringServiceManager($baseManager); foreach ($managerConfigs as $configClass) { @@ -51,4 +52,4 @@ public function createService(ServiceLocatorInterface $serviceLocator) return $twigManager; } -} \ No newline at end of file +} diff --git a/src/ZfcTwig/View/TwigRenderer.php b/src/ZfcTwig/View/TwigRenderer.php index bfa1a3b..e536bc1 100644 --- a/src/ZfcTwig/View/TwigRenderer.php +++ b/src/ZfcTwig/View/TwigRenderer.php @@ -29,6 +29,11 @@ class TwigRenderer implements RendererInterface, TreeRendererInterface */ protected $helperPluginManager; + /** + * @var Twig_Loader_Chain + */ + protected $loader; + /** * @var TwigResolver */ diff --git a/tests/ZfcTwigTest/View/Strategy/TwigStrategyTest.php b/tests/ZfcTwigTest/View/Strategy/TwigStrategyTest.php index c6d6470..fb19257 100644 --- a/tests/ZfcTwigTest/View/Strategy/TwigStrategyTest.php +++ b/tests/ZfcTwigTest/View/Strategy/TwigStrategyTest.php @@ -4,20 +4,24 @@ use PHPUnit_Framework_TestCase as TestCase; use Twig_Environment; use Twig_Loader_Array; +use Twig_Loader_Chain; use Zend\View\View; use Zend\View\ViewEvent; -use ZfcTwig\View\Renderer\TwigRenderer; -use ZfcTwig\View\Strategy\TwigStrategy; -use ZfcTwig\View\Resolver\TwigResolver; +use ZfcTwig\View\TwigRenderer; +use ZfcTwig\View\TwigStrategy; +use ZfcTwig\View\TwigResolver; class TwigStrategyTest extends TestCase { public function setUp() { - $this->environment = new Twig_Environment(new Twig_Loader_Array(array('key1' => 'var1'))); - $this->renderer = new TwigRenderer(new View, $this->environment, new TwigResolver($this->environment)); - $this->strategy = new TwigStrategy($this->renderer); - $this->event = new ViewEvent(); + $this->chain = $chain = new Twig_Loader_Chain(); + $this->loader = new Twig_Loader_Array(array('key1' => 'var1')); + $this->chain->addLoader($this->loader); + $this->environment = new Twig_Environment($this->chain); + $this->renderer = new TwigRenderer(new View, $this->chain, $this->environment, new TwigResolver($this->environment)); + $this->strategy = new TwigStrategy($this->renderer); + $this->event = new ViewEvent(); } public function testSelectRendererWhenTemplateFound()