geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-15 20:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

merged branch Tobion/simplify-constructor (PR #1181)

Browse Source 
This PR was merged into the master branch.

Discussion
----------

simplify loader constructors

Commits
-------

ac23cd7 simplify loader constructors
This commit is contained in:
Fabien Potencier
2013-09-04 08:02:07 +02:00
parent ffec8ba902 ac23cd7ae4
commit f2f08e8e4b
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Loader/Array.php
+2 -5
View File
@@ -21,7 +21,7 @@
*/
class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
{
protected $templates;
protected $templates = array();
/**
* Constructor.
@@ -32,10 +32,7 @@ class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
*/
public function __construct(array $templates)
{
$this->templates = array();
foreach ($templates as $name => $template) {
$this->templates[$name] = $template;
}
$this->templates = $templates;
}
/**
lib/Twig/Loader/Chain.php
+1 -2
View File
@@ -17,7 +17,7 @@
class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
{
private $hasSourceCache = array();
protected $loaders;
protected $loaders = array();
/**
* Constructor.
@@ -26,7 +26,6 @@ class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
*/
public function __construct(array $loaders = array())
{
$this->loaders = array();
foreach ($loaders as $loader) {
$this->addLoader($loader);
}
lib/Twig/Loader/Filesystem.php
+2 -2
View File
@@ -19,8 +19,8 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
/** Identifier of the main namespace. */
const MAIN_NAMESPACE = '__main__';
protected $paths;
protected $cache;
protected $paths = array();
protected $cache = array();
/**
* Constructor.