removed code that prevents the stopwatch to work properly

fabpot · fabpot · commit 459097413db6 · 2013-08-11T22:55:10.000+02:00
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php
@@ -26,14 +26,6 @@ protected function setUp()
         }
     }
 
-    /**
-     * @expectedException \Twig_Error_Syntax
-     */
-    public function testFailIfNameAlreadyExists()
-    {
-        $this->testTiming('{% stopwatch foo %}{% endstopwatch %}{% stopwatch foo %}{% endstopwatch %}', array());
-    }
-
     /**
      * @expectedException \Twig_Error_Syntax
      */
@@ -64,6 +56,7 @@ public function getTimingTemplates()
             array('{% stopwatch foo %}symfony2 is fun{% endstopwatch %}{% stopwatch bar %}something{% endstopwatch %}', array('foo', 'bar')),
             array('{% stopwatch foo %}something{% endstopwatch foo %}', 'foo'),
             array('{% stopwatch "foo.bar" %}something{% endstopwatch %}', 'foo.bar'),
+            array('{% stopwatch foo %}something{% endstopwatch foo %}{% stopwatch foo %}something else{% endstopwatch foo %}', array('foo', 'foo')),
         );
     }
 
diff --git a/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php
@@ -21,7 +21,6 @@
 class StopwatchTokenParser extends \Twig_TokenParser
 {
     protected $stopwatchIsAvailable;
-    protected $_events = array();
 
     public function __construct($stopwatchIsAvailable)
     {
@@ -40,11 +39,6 @@ public function parse(\Twig_Token $token)
             $name = $stream->expect(\Twig_Token::STRING_TYPE)->getValue();
         }
 
-        if (in_array($name, $this->_events)) {
-            throw new \Twig_Error_Syntax(sprintf('The stopwatch event "%s" has already been defined.', $name));
-        }
-        $this->_events[] = $name;
-
         $stream->expect(\Twig_Token::BLOCK_END_TYPE);
 
         // {% endstopwatch %} or {% endstopwatch bar %}

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@`
`21`	`21`	`class StopwatchTokenParser extends \Twig_TokenParser`
`22`	`22`	`{`
`23`	`23`	`protected $stopwatchIsAvailable;`
`24`		`- protected $_events = array();`
`25`	`24`
`26`	`25`	`public function __construct($stopwatchIsAvailable)`
`27`	`26`	`{`
`@@ -40,11 +39,6 @@ public function parse(\Twig_Token $token)`
`40`	`39`	`$name = $stream->expect(\Twig_Token::STRING_TYPE)->getValue();`
`41`	`40`	`}`
`42`	`41`
`43`		`- if (in_array($name, $this->_events)) {`
`44`		`- throw new \Twig_Error_Syntax(sprintf('The stopwatch event "%s" has already been defined.', $name));`
`45`		`- }`
`46`		`- $this->_events[] = $name;`
`47`		`-`
`48`	`42`	`$stream->expect(\Twig_Token::BLOCK_END_TYPE);`
`49`	`43`
`50`	`44`	`// {% endstopwatch %} or {% endstopwatch bar %}`