Merge branch '2.2' into 2.3

fabpot · fabpot · commit 9d53905b88d5 · 2013-07-27T07:01:40.000+02:00
* 2.2:
  return 0 if there is no valid data
  [Tests] Tests on php 5.5 should pass
  [Twig] fixed TwigEngine::exists() method when a template contains a syntax error (closes #88546)
diff --git a/src/Symfony/Bridge/Twig/Tests/TwigEngineTest.php b/src/Symfony/Bridge/Twig/Tests/TwigEngineTest.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Twig\Tests;
+
+use Symfony\Bridge\Twig\TwigEngine;
+
+class TwigEngineTest extends TestCase
+{
+    public function testExistsWithTemplateInstances()
+    {
+        $engine = $this->getTwig();
+
+        $this->assertTrue($engine->exists($this->getMockForAbstractClass('Twig_Template', array(), '', false)));
+    }
+
+    public function testExistsWithNonExistentTemplates()
+    {
+        $engine = $this->getTwig();
+
+        $this->assertFalse($engine->exists('foobar'));
+    }
+
+    public function testExistsWithTemplateWithSyntaxErrors()
+    {
+        $engine = $this->getTwig();
+
+        $this->assertTrue($engine->exists('error'));
+    }
+
+    public function testExists()
+    {
+        $engine = $this->getTwig();
+
+        $this->assertTrue($engine->exists('index'));
+    }
+
+    protected function getTwig()
+    {
+        $twig = new \Twig_Environment(new \Twig_Loader_Array(array(
+            'index' => 'foo',
+            'error' => '{{ foo }',
+        )));
+        $parser = $this->getMock('Symfony\Component\Templating\TemplateNameParserInterface');
+
+        return new TwigEngine($twig, $parser);
+    }
+}
diff --git a/src/Symfony/Bridge/Twig/TwigEngine.php b/src/Symfony/Bridge/Twig/TwigEngine.php
@@ -75,9 +75,19 @@ public function stream($name, array $parameters = array())
      */
     public function exists($name)
     {
+        if ($name instanceof \Twig_Template) {
+            return true;
+        }
+
+        $loader = $this->environment->getLoader();
+
+        if ($loader instanceof \Twig_ExistsLoaderInterface) {
+            return $loader->exists($name);
+        }
+
         try {
-            $this->load($name);
-        } catch (\InvalidArgumentException $e) {
+            $loader->getSource($name);
+        } catch (\Twig_Error_Loader $e) {
             return false;
         }
 
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
@@ -78,6 +78,10 @@ public function getEvents()
      */
     public function getDuration()
     {
+        if (!isset($this->data['events']['__section__'])) {
+            return 0;
+        }
+
         $lastEvent = $this->data['events']['__section__'];
 
         return $lastEvent->getOrigin() + $lastEvent->getDuration() - $this->getStartTime();
@@ -92,6 +96,10 @@ public function getDuration()
      */
     public function getInitTime()
     {
+        if (!isset($this->data['events']['__section__'])) {
+            return 0;
+        }
+
         return $this->data['events']['__section__']->getOrigin() - $this->getStartTime();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,10 @@ public function getEvents()`
`78`	`78`	`*/`
`79`	`79`	`public function getDuration()`
`80`	`80`	`{`
	`81`	`+ if (!isset($this->data['events']['__section__'])) {`
	`82`	`+ return 0;`
	`83`	`+ }`
	`84`	`+`
`81`	`85`	`$lastEvent = $this->data['events']['__section__'];`
`82`	`86`
`83`	`87`	`return $lastEvent->getOrigin() + $lastEvent->getDuration() - $this->getStartTime();`
`@@ -92,6 +96,10 @@ public function getDuration()`
`92`	`96`	`*/`
`93`	`97`	`public function getInitTime()`
`94`	`98`	`{`
	`99`	`+ if (!isset($this->data['events']['__section__'])) {`
	`100`	`+ return 0;`
	`101`	`+ }`
	`102`	`+`
`95`	`103`	`return $this->data['events']['__section__']->getOrigin() - $this->getStartTime();`
`96`	`104`	`}`
`97`	`105`