Update PSR-2

composer.json

@@ -2,7 +2,9 @@
     "name": "smarty/smarty",
     "type": "library",
     "description": "Smarty - the compiling PHP template engine",
-    "keywords": ["templating"],
+    "keywords": [
+        "templating"
+    ],
     "homepage": "http://www.smarty.net",
     "license": "LGPL-3.0",
     "authors": [
@@ -28,12 +30,13 @@
         "php": ">=5.2"
     },
     "autoload": {
-            "files": ["libs/bootstrap.php"]
+        "files": [
+            "libs/bootstrap.php"
+        ]
     },
     "extra": {
         "branch-alias": {
             "dev-master": "3.1.x-dev"
         }
     }
-
-}
+}

demo/index.php

@@ -17,11 +17,15 @@
 $smarty->assign("Name", "Fred Irving Johnathan Bradley Peppergill", true);
 $smarty->assign("FirstName", array("John", "Mary", "James", "Henry"));
 $smarty->assign("LastName", array("Doe", "Smith", "Johnson", "Case"));
-$smarty->assign("Class", array(array("A", "B", "C", "D"), array("E", "F", "G", "H"), array("I", "J", "K", "L"),
-                               array("M", "N", "O", "P")));
+$smarty->assign(
+    "Class", array(array("A", "B", "C", "D"), array("E", "F", "G", "H"), array("I", "J", "K", "L"),
+    array("M", "N", "O", "P"))
+);
 
-$smarty->assign("contacts", array(array("phone" => "1", "fax" => "2", "cell" => "3"),
-                                  array("phone" => "555-4444", "fax" => "555-3333", "cell" => "760-1234")));
+$smarty->assign(
+    "contacts", array(array("phone" => "1", "fax" => "2", "cell" => "3"),
+    array("phone" => "555-4444", "fax" => "555-3333", "cell" => "760-1234"))
+);
 
 $smarty->assign("option_values", array("NY", "NE", "KS", "IA", "OK", "TX"));
 $smarty->assign("option_output", array("New York", "Nebraska", "Kansas", "Iowa", "Oklahoma", "Texas"));

demo/plugins/cacheresource.apc.php

@@ -22,7 +22,7 @@ public function __construct()
     /**
      * Read values for a set of keys from cache
      *
-     * @param  array $keys list of keys to fetch
+     * @param array $keys list of keys to fetch
      *
      * @return array   list of values with the given keys used as indexes
      * @return boolean true on success, false on failure
@@ -41,8 +41,8 @@ protected function read(array $keys)
     /**
      * Save values for a set of keys to cache
      *
-     * @param  array $keys   list of values to save
-     * @param  int   $expire expiration time
+     * @param array $keys   list of values to save
+     * @param int   $expire expiration time
      *
      * @return boolean true on success, false on failure
      */
@@ -58,7 +58,7 @@ protected function write(array $keys, $expire = null)
     /**
      * Remove values from cache
      *
-     * @param  array $keys list of keys to delete
+     * @param array $keys list of keys to delete
      *
      * @return boolean true on success, false on failure
      */

demo/plugins/cacheresource.memcache.php

@@ -32,7 +32,7 @@ public function __construct()
     /**
      * Read values for a set of keys from cache
      *
-     * @param  array $keys list of keys to fetch
+     * @param array $keys list of keys to fetch
      *
      * @return array   list of values with the given keys used as indexes
      * @return boolean true on success, false on failure
@@ -57,8 +57,8 @@ protected function read(array $keys)
     /**
      * Save values for a set of keys to cache
      *
-     * @param  array $keys   list of values to save
-     * @param  int   $expire expiration time
+     * @param array $keys   list of values to save
+     * @param int   $expire expiration time
      *
      * @return boolean true on success, false on failure
      */
@@ -75,7 +75,7 @@ protected function write(array $keys, $expire = null)
     /**
      * Remove values from cache
      *
-     * @param  array $keys list of keys to delete
+     * @param array $keys list of keys to delete
      *
      * @return boolean true on success, false on failure
      */

demo/plugins/cacheresource.mysql.php

@@ -43,19 +43,21 @@ public function __construct()
         }
         $this->fetch = $this->db->prepare('SELECT modified, content FROM output_cache WHERE id = :id');
         $this->fetchTimestamp = $this->db->prepare('SELECT modified FROM output_cache WHERE id = :id');
-        $this->save = $this->db->prepare('REPLACE INTO output_cache (id, name, cache_id, compile_id, content)
-            VALUES  (:id, :name, :cache_id, :compile_id, :content)');
+        $this->save = $this->db->prepare(
+            'REPLACE INTO output_cache (id, name, cache_id, compile_id, content)
+            VALUES  (:id, :name, :cache_id, :compile_id, :content)'
+        );
     }
 
     /**
      * fetch cached content and its modification time from data source
      *
-     * @param  string  $id         unique cache content identifier
-     * @param  string  $name       template name
-     * @param  string  $cache_id   cache id
-     * @param  string  $compile_id compile id
-     * @param  string  $content    cached content
-     * @param  integer $mtime      cache modification timestamp (epoch)
+     * @param string  $id         unique cache content identifier
+     * @param string  $name       template name
+     * @param string  $cache_id   cache id
+     * @param string  $compile_id compile id
+     * @param string  $content    cached content
+     * @param integer $mtime      cache modification timestamp (epoch)
      *
      * @return void
      */
@@ -78,10 +80,10 @@ protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime)
      *
      * @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the complete cached content.
      *
-     * @param  string $id         unique cache content identifier
-     * @param  string $name       template name
-     * @param  string $cache_id   cache id
-     * @param  string $compile_id compile id
+     * @param string $id         unique cache content identifier
+     * @param string $name       template name
+     * @param string $cache_id   cache id
+     * @param string $compile_id compile id
      *
      * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
      */
@@ -97,30 +99,32 @@ protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
     /**
      * Save content to cache
      *
-     * @param  string       $id         unique cache content identifier
-     * @param  string       $name       template name
-     * @param  string       $cache_id   cache id
-     * @param  string       $compile_id compile id
-     * @param  integer|null $exp_time   seconds till expiration time in seconds or null
-     * @param  string       $content    content to cache
+     * @param string       $id         unique cache content identifier
+     * @param string       $name       template name
+     * @param string       $cache_id   cache id
+     * @param string       $compile_id compile id
+     * @param integer|null $exp_time   seconds till expiration time in seconds or null
+     * @param string       $content    content to cache
      *
      * @return boolean      success
      */
     protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content)
     {
-        $this->save->execute(array('id' => $id, 'name' => $name, 'cache_id' => $cache_id, 'compile_id' => $compile_id,
-                                   'content' => $content,));
+        $this->save->execute(
+            array('id' => $id, 'name' => $name, 'cache_id' => $cache_id, 'compile_id' => $compile_id,
+            'content' => $content,)
+        );
 
         return !!$this->save->rowCount();
     }
 
     /**
      * Delete content from cache
      *
-     * @param  string       $name       template name
-     * @param  string       $cache_id   cache id
-     * @param  string       $compile_id compile id
-     * @param  integer|null $exp_time   seconds till expiration or null
+     * @param string       $name       template name
+     * @param string       $cache_id   cache id
+     * @param string       $compile_id compile id
+     * @param integer|null $exp_time   seconds till expiration or null
      *
      * @return integer      number of deleted caches
      */

demo/plugins/cacheresource.pdo.php

@@ -165,12 +165,12 @@ protected function getFetchStatement($columns, $id, $cache_id = null, $compile_i
     /**
      * fetch cached content and its modification time from data source
      *
-     * @param  string      $id         unique cache content identifier
-     * @param  string      $name       template name
-     * @param  string|null $cache_id   cache id
-     * @param  string|null $compile_id compile id
-     * @param  string      $content    cached content
-     * @param  integer     $mtime      cache modification timestamp (epoch)
+     * @param string      $id         unique cache content identifier
+     * @param string      $name       template name
+     * @param string|null $cache_id   cache id
+     * @param string|null $compile_id compile id
+     * @param string      $content    cached content
+     * @param integer     $mtime      cache modification timestamp (epoch)
      *
      * @return void
      * @access protected
@@ -197,10 +197,10 @@ protected function fetch($id, $name, $cache_id = null, $compile_id = null, &$con
      * {@internal implementing this method is optional.
      *  Only implement it if modification times can be accessed faster than loading the complete cached content.}}
      *
-     * @param  string      $id         unique cache content identifier
-     * @param  string      $name       template name
-     * @param  string|null $cache_id   cache id
-     * @param  string|null $compile_id compile id
+     * @param string      $id         unique cache content identifier
+     * @param string      $name       template name
+     * @param string|null $cache_id   cache id
+     * @param string|null $compile_id compile id
      *
      * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
      * @access protected
@@ -269,10 +269,10 @@ protected function outputContent($content)
     /**
      * Delete content from cache
      *
-     * @param string|null $name       template name
-     * @param string|null $cache_id   cache id
-     * @param string|null $compile_id compile id
-     * @param  integer|null|-1 $exp_time seconds till expiration or null
+     * @param string|null     $name       template name
+     * @param string|null     $cache_id   cache id
+     * @param string|null     $compile_id compile id
+     * @param integer|null|-1 $exp_time   seconds till expiration or null
      *
      * @return integer number of deleted caches
      * @access protected
@@ -324,4 +324,4 @@ protected function getTableName()
         return (is_null($this->database)) ? "`{$this->table}`" : "`{$this->database}`.`{$this->table}`";
     }
 }
-
+

demo/plugins/cacheresource.pdo_gzip.php

@@ -40,4 +40,4 @@ protected function outputContent($content)
         return gzinflate($content);
     }
 } 
-
+

demo/plugins/resource.extendsall.php

@@ -13,8 +13,8 @@ class Smarty_Resource_Extendsall extends Smarty_Internal_Resource_Extends
     /**
      * populate Source Object with meta data from Resource
      *
-     * @param  Smarty_Template_Source   $source    source object
-     * @param  Smarty_Internal_Template $_template template object
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
      *
      * @return void
      */

demo/plugins/resource.mysql.php

@@ -43,9 +43,9 @@ public function __construct()
     /**
      * Fetch a template and its modification time from database
      *
-     * @param  string  $name   template name
-     * @param  string  $source template source
-     * @param  integer $mtime  template modification timestamp (epoch)
+     * @param string  $name   template name
+     * @param string  $source template source
+     * @param integer $mtime  template modification timestamp (epoch)
      *
      * @return void
      */
@@ -68,7 +68,7 @@ protected function fetch($name, &$source, &$mtime)
      *
      * @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the comple template source.
      *
-     * @param  string $name template name
+     * @param string $name template name
      *
      * @return integer timestamp (epoch) the template was modified
      */

demo/plugins/resource.mysqls.php

@@ -41,9 +41,9 @@ public function __construct()
     /**
      * Fetch a template and its modification time from database
      *
-     * @param  string  $name   template name
-     * @param  string  $source template source
-     * @param  integer $mtime  template modification timestamp (epoch)
+     * @param string  $name   template name
+     * @param string  $source template source
+     * @param integer $mtime  template modification timestamp (epoch)
      *
      * @return void
      */

libs/Autoloader.php

@@ -2,14 +2,14 @@
 /**
  * Smarty Autoloader
  *
- * @package    Smarty
+ * @package Smarty
  */
 
 /**
  * Smarty Autoloader
  *
- * @package    Smarty
- * @author     Uwe Tews
+ * @package Smarty
+ * @author  Uwe Tews
  *             Usage:
  *                  require_once '...path/Autoloader.php';
  *                  Smarty_Autoloader::register();
@@ -20,7 +20,7 @@
  */
 class Smarty_Autoloader
 {
-   /**
+    /**
      * Filepath to Smarty root
      *
      * @var string
@@ -54,8 +54,8 @@ public static function registerBC($prepend = false)
         if (!defined('SMARTY_SPL_AUTOLOAD')) {
             define('SMARTY_SPL_AUTOLOAD', 0);
         }
-        if (SMARTY_SPL_AUTOLOAD &&
-            set_include_path(get_include_path() . PATH_SEPARATOR . SMARTY_SYSPLUGINS_DIR) !== false
+        if (SMARTY_SPL_AUTOLOAD 
+            && set_include_path(get_include_path() . PATH_SEPARATOR . SMARTY_SYSPLUGINS_DIR) !== false
         ) {
             $registeredAutoLoadFunctions = spl_autoload_functions();
             if (!isset($registeredAutoLoadFunctions[ 'spl_autoload' ])) {