Merge branch 'symfony'

Author: Fabian Lange

phpunit.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="false"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="true"
+         syntaxCheck="false"
+>
+  <testsuites>
+    <testsuite name="Symfony Test Suite">
+      <directory>./tests/Symfony/</directory>
+      <directory>./src/Symfony/Framework/</directory>
+    </testsuite>
+  </testsuites>
+
+  <filter>
+    <whitelist>
+      <directory suffix=".php">./src/Symfony/</directory>
+      <exclude>
+        <directory suffix=".php">./src/Symfony/Framework/DoctrineBundle</directory>
+        <directory suffix=".php">./src/Symfony/Framework/ZendBundle</directory>
+
+        <directory suffix=".php">./src/Symfony/Framework/DoctrineBundle/Resources</directory>
+        <directory suffix=".php">./src/Symfony/Framework/ProfilerBundle/Resources</directory>
+        <directory suffix=".php">./src/Symfony/Framework/SwiftmailerBundle/Resources</directory>
+        <directory suffix=".php">./src/Symfony/Framework/WebBundle/Resources</directory>
+        <directory suffix=".php">./src/Symfony/Framework/ZendBundle/Resources</directory>
+
+        <file>src/Symfony/Foundation/bootstrap.php</file>
+        <file>src/Symfony/Foundation/packager.php</file>
+      </exclude>
+    </whitelist>
+  </filter>
+</phpunit>

src/Symfony/Components/Templating/Engine.php

@@ -5,6 +5,7 @@
 use Symfony\Components\Templating\Loader\LoaderInterface;
 use Symfony\Components\Templating\Renderer\PhpRenderer;
 use Symfony\Components\Templating\Renderer\RendererInterface;
+use Symfony\Components\Templating\Helper\HelperInterface;
 
 /*
  * This file is part of the symfony package.
@@ -31,6 +32,7 @@ class Engine
   protected $parents;
   protected $stack;
   protected $charset;
+  protected $cache;
 
   /**
    * Constructor.
@@ -171,7 +173,7 @@ public function addHelpers(array $helpers = array())
    * Sets a helper.
    *
    * @param HelperInterface $value The helper instance
-   * @param string                    $alias An alias
+   * @param string          $alias An alias
    */
   public function set(HelperInterface $helper, $alias = null)
   {
@@ -181,7 +183,7 @@ public function set(HelperInterface $helper, $alias = null)
       $this->helpers[$alias] = $helper;
     }
 
-    $helper->setEngine($this);
+    $helper->setCharset($this->charset);
   }
 
   /**

src/Symfony/Components/Templating/Helper/Helper.php

@@ -2,8 +2,6 @@
 
 namespace Symfony\Components\Templating\Helper;
 
-use Symfony\Components\Templating\Engine;
-
 /*
  * This file is part of the symfony package.
  *
@@ -22,25 +20,25 @@
  */
 abstract class Helper implements HelperInterface
 {
-  protected $engine;
+  protected $charset = 'UTF-8';
 
   /**
-   * Sets the engine associated with this helper.
+   * Sets the default charset.
    *
-   * @param Engine $engine A Engine instance
+   * @param string $charset The charset
    */
-  public function setEngine(Engine $engine = null)
+  public function setCharset($charset)
   {
-    $this->engine = $engine;
+    $this->charset = $charset;
   }
 
   /**
-   * Gets the engine associated with this helper.
+   * Gets the default charset.
    *
-   * @return Engine A Engine instance
+   * @return string The default charset
    */
-  public function getEngine()
+  public function getCharset()
   {
-    return $this->engine;
+    return $this->charset;
   }
 }

src/Symfony/Components/Templating/Helper/HelperInterface.php

@@ -2,8 +2,6 @@
 
 namespace Symfony\Components\Templating\Helper;
 
-use Symfony\Components\Templating\Engine;
-
 /*
  * This file is part of the symfony package.
  *
@@ -30,16 +28,16 @@ interface HelperInterface
   function getName();
 
   /**
-   * Sets the engine associated with this helper.
+   * Sets the default charset.
    *
-   * @param Engine $engine A Engine instance
+   * @param string $charset The charset
    */
-  function setEngine(Engine $engine = null);
+  function setCharset($charset);
 
   /**
-   * Gets the engine associated with this helper.
+   * Gets the default charset.
    *
-   * @return Engine A Engine instance
+   * @return string The default charset
    */
-  function getEngine();
+  function getCharset();
 }

src/Symfony/Components/Templating/Helper/JavascriptsHelper.php

@@ -28,6 +28,17 @@
 class JavascriptsHelper extends Helper
 {
   protected $javascripts = array();
+  protected $assetHelper;
+
+  /**
+   * Constructor.
+   *
+   * @param AssetsHelper $assetHelper A AssetsHelper instance
+   */
+  public function __construct(AssetsHelper $assetHelper)
+  {
+    $this->assetHelper = $assetHelper;
+  }
 
   /**
    * Adds a JavaScript file.
@@ -37,7 +48,7 @@ class JavascriptsHelper extends Helper
    */
   public function add($javascript, $attributes = array())
   {
-    $this->javascripts[$this->engine->get('assets')->getUrl($javascript)] = $attributes;
+    $this->javascripts[$this->assetHelper->getUrl($javascript)] = $attributes;
   }
 
   /**
@@ -63,7 +74,7 @@ public function render()
       $atts = '';
       foreach ($attributes as $key => $value)
       {
-        $atts .= ' '.sprintf('%s="%s"', $key, $this->engine->escape($value));
+        $atts .= ' '.sprintf('%s="%s"', $key, htmlspecialchars($value, ENT_QUOTES, $this->charset));
       }
 
       $html .= sprintf('<script type="text/javascript" src="%s"%s></script>', $path, $atts)."\n";

src/Symfony/Components/Templating/Helper/StylesheetsHelper.php

@@ -28,6 +28,17 @@
 class StylesheetsHelper extends Helper
 {
   protected $stylesheets = array();
+  protected $assetHelper;
+
+  /**
+   * Constructor.
+   *
+   * @param AssetsHelper $assetHelper A AssetsHelper instance
+   */
+  public function __construct(AssetsHelper $assetHelper)
+  {
+    $this->assetHelper = $assetHelper;
+  }
 
   /**
    * Adds a stylesheets file.
@@ -37,7 +48,7 @@ class StylesheetsHelper extends Helper
    */
   public function add($stylesheet, $attributes = array())
   {
-    $this->stylesheets[$this->engine->get('assets')->getUrl($stylesheet)] = $attributes;
+    $this->stylesheets[$this->assetHelper->getUrl($stylesheet)] = $attributes;
   }
 
   /**
@@ -63,7 +74,7 @@ public function render()
       $atts = '';
       foreach ($attributes as $key => $value)
       {
-        $atts .= ' '.sprintf('%s="%s"', $key, $this->engine->escape($value));
+        $atts .= ' '.sprintf('%s="%s"', $key, htmlspecialchars($value, ENT_QUOTES, $this->charset));
       }
 
       $html .= sprintf('<link href="%s" rel="stylesheet" type="text/css"%s />', $path, $atts)."\n";

src/Symfony/Components/Yaml/Parser.php

@@ -299,12 +299,9 @@ protected function getNextEmbedBlock()
 
     while ($this->moveToNextLine())
     {
-      if ($this->isCurrentLineEmpty())
+      if ($this->isCurrentLineBlank())
       {
-        if ($this->isCurrentLineBlank())
-        {
-          $data[] = substr($this->currentLine, $newIndent);
-        }
+        $data[] = substr($this->currentLine, $newIndent);
 
         continue;
       }