Ver Fonte

[Templating] fixed coding standards

Fabien Potencier há 15 anos atrás
pai
commit
869a4698ed

+ 14 - 10
src/Symfony/Components/Templating/Engine.php

@@ -24,16 +24,15 @@ use Symfony\Components\Templating\Renderer\PhpRenderer;
  */
 class Engine
 {
-  protected
-    $loader    = null,
-    $renderers = array(),
-    $current   = null,
-    $helperSet = array(),
-    $parents   = array(),
-    $stack     = array(),
-    $slots     = array(),
-    $openSlots = array(),
-    $charset   = 'UTF-8';
+  protected $loader;
+  protected $renderers;
+  protected $current;
+  protected $helperSet;
+  protected $parents;
+  protected $stack;
+  protected $slots;
+  protected $openSlots;
+  protected $charset;
 
   /**
    * Constructor.
@@ -46,6 +45,11 @@ class Engine
   {
     $this->loader    = $loader;
     $this->renderers = $renderers;
+    $this->parents   = array();
+    $this->stack     = array();
+    $this->slots     = array();
+    $this->openSlots = array();
+    $this->charset   = 'UTF-8';
 
     $this->setHelperSet(null === $helperSet ? new HelperSet() : $helperSet);
 

+ 3 - 4
src/Symfony/Components/Templating/Helper/AssetsHelper.php

@@ -26,10 +26,9 @@ namespace Symfony\Components\Templating\Helper;
  */
 class AssetsHelper extends Helper
 {
-  protected
-    $version  = null,
-    $baseURLs = array(),
-    $basePath = '';
+  protected $version;
+  protected $baseURLs;
+  protected $basePath;
 
   /**
    * Constructor.

+ 1 - 2
src/Symfony/Components/Templating/Helper/Helper.php

@@ -20,8 +20,7 @@ namespace Symfony\Components\Templating\Helper;
  */
 abstract class Helper implements HelperInterface
 {
-  protected
-    $helperSet = null;
+  protected $helperSet;
 
   /**
    * Sets the helper set associated with this helper.

+ 3 - 3
src/Symfony/Components/Templating/Helper/HelperSet.php

@@ -22,12 +22,12 @@ use Symfony\Components\Templating\Engine;
  */
 class HelperSet
 {
-  protected
-    $helpers = array(),
-    $engine  = null;
+  protected $helpers;
+  protected $engine;
 
   public function __construct(array $helpers = array())
   {
+    $this->helpers = array();
     foreach ($helpers as $alias => $helper)
     {
       $this->set($helper, is_int($alias) ? null : $alias);

+ 1 - 2
src/Symfony/Components/Templating/Helper/JavascriptsHelper.php

@@ -27,8 +27,7 @@ namespace Symfony\Components\Templating\Helper;
  */
 class JavascriptsHelper extends Helper
 {
-  protected
-    $javascripts = array();
+  protected $javascripts = array();
 
   /**
    * Adds a JavaScript file.

+ 1 - 2
src/Symfony/Components/Templating/Helper/StylesheetsHelper.php

@@ -27,8 +27,7 @@ namespace Symfony\Components\Templating\Helper;
  */
 class StylesheetsHelper extends Helper
 {
-  protected
-    $stylesheets = array();
+  protected $stylesheets = array();
 
   /**
    * Adds a stylesheets file.

+ 2 - 3
src/Symfony/Components/Templating/Loader/CacheLoader.php

@@ -27,9 +27,8 @@ use Symfony\Components\Templating\Storage\FileStorage;
  */
 class CacheLoader extends Loader
 {
-  protected
-    $loader = null,
-    $dir    = '';
+  protected $loader;
+  protected $dir;
 
   /**
    * Constructor.

+ 2 - 2
src/Symfony/Components/Templating/Loader/ChainLoader.php

@@ -22,8 +22,7 @@ use Symfony\Components\Templating\Storage;
  */
 class ChainLoader extends Loader
 {
-  protected
-    $loaders = array();
+  protected $loaders;
 
   /**
    * Constructor.
@@ -32,6 +31,7 @@ class ChainLoader extends Loader
    */
   public function __construct(array $loaders = array())
   {
+    $this->loaders = array();
     foreach ($loaders as $loader)
     {
       $this->addLoader($loader);

+ 1 - 2
src/Symfony/Components/Templating/Loader/FilesystemLoader.php

@@ -23,8 +23,7 @@ use Symfony\Components\Templating\Storage\FileStorage;
  */
 class FilesystemLoader extends Loader
 {
-  protected
-    $templatePathPatternPatterns = array();
+  protected $templatePathPatterns;
 
   /**
    * Constructor.

+ 1 - 2
src/Symfony/Components/Templating/Loader/Loader.php

@@ -22,8 +22,7 @@ use Symfony\Components\Templating\DebuggerInterface;
  */
 abstract class Loader implements LoaderInterface
 {
-  protected
-    $debugger = null;
+  protected $debugger;
 
   /**
    * Sets the debugger to use for this loader.

+ 1 - 2
src/Symfony/Components/Templating/Renderer/Renderer.php

@@ -22,8 +22,7 @@ use Symfony\Components\Templating\Engine;
  */
 abstract class Renderer implements RendererInterface
 {
-  protected
-    $engine = null;
+  protected $engine;
 
   /**
    * Sets the template engine associated with this renderer.

+ 2 - 3
src/Symfony/Components/Templating/Storage/Storage.php

@@ -20,9 +20,8 @@ namespace Symfony\Components\Templating\Storage;
  */
 class Storage
 {
-  protected
-    $renderer = null,
-    $template = '';
+  protected $renderer;
+  protected $template;
 
   /**
    * Constructor.