From fb07f3a99c081d5414b788340f8e9ab1cd8f4095 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 23 Apr 2012 20:32:33 +0200 Subject: [PATCH] renamed indice to index --- lib/Twig/Environment.php | 16 ++++++++-------- lib/Twig/Node/Module.php | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php index db28eff..0d869fe 100644 --- a/lib/Twig/Environment.php +++ b/lib/Twig/Environment.php @@ -251,14 +251,14 @@ class Twig_Environment /** * Gets the template class associated with the given string. * - * @param string $name The name for which to calculate the template class name - * @param integer $indice The indice for inline templates (null for main templates) + * @param string $name The name for which to calculate the template class name + * @param integer $index The index for inline templates (null for main templates) * * @return string The template class name */ - public function getTemplateClass($name, $indice = null) + public function getTemplateClass($name, $index = null) { - return $this->templateClassPrefix.md5($this->loader->getCacheKey($name)).(null === $indice ? '' : '_'.$indice); + return $this->templateClassPrefix.md5($this->loader->getCacheKey($name)).(null === $index ? '' : '_'.$index); } /** @@ -298,14 +298,14 @@ class Twig_Environment /** * Loads a template by name. * - * @param string $name The template name - * @param integer $indice The indice for inline templates (null for main templates) + * @param string $name The template name + * @param integer $index The index for inline templates (null for main templates) * * @return Twig_TemplateInterface A template instance representing the given template name */ - public function loadTemplate($name, $indice = null) + public function loadTemplate($name, $index = null) { - $cls = $this->getTemplateClass($name, $indice); + $cls = $this->getTemplateClass($name, $index); if (isset($this->loadedTemplates[$cls])) { return $this->loadedTemplates[$cls]; diff --git a/lib/Twig/Node/Module.php b/lib/Twig/Node/Module.php index af106ff..ba960f0 100644 --- a/lib/Twig/Node/Module.php +++ b/lib/Twig/Node/Module.php @@ -23,9 +23,9 @@ class Twig_Node_Module extends Twig_Node parent::__construct(array('parent' => $parent, 'body' => $body, 'blocks' => $blocks, 'macros' => $macros, 'traits' => $traits, 'inlined_templates' => $inlinedTemplates), array('filename' => $filename, 'inline' => null), 1); } - public function setInline($indice) + public function setInline($index) { - $this->setAttribute('inline', $indice); + $this->setAttribute('inline', $index); } /** -- 1.7.2.5