[ZF-7316] Code cleaning:

- reverted CRLF (Win*) to LF (*nix)
- reverted TABS to 4 spaces
- erased ending spaces
used revision 17680

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@17687 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Acl.php

@@ -84,12 +84,12 @@ class Zend_Acl
      * @var Zend_Acl_Role_Interface
      */
     protected $_isAllowedRole     = null;
-    
+
     /**
      * @var Zend_Acl_Resource_Interface
      */
     protected $_isAllowedResource = null;
-    
+
     /**
      * ACL rules; whitelist (deny everything to all) by default
      *
@@ -133,13 +133,13 @@ class Zend_Acl
         if (is_string($role)) {
             $role = new Zend_Acl_Role($role);
         }
-        
+
         if (!$role instanceof Zend_Acl_Role_Interface) {
             require_once 'Zend/Acl/Exception.php';
             throw new Zend_Acl_Exception('addRole() expects $role to be of type Zend_Acl_Role_Interface');
         }
-    	
-    	
+
+
         $this->_getRoleRegistry()->add($role, $parents);
 
         return $this;
@@ -263,15 +263,15 @@ class Zend_Acl
      */
     public function addResource($resource, $parent = null)
     {
-    	if (is_string($resource)) {
-    		$resource = new Zend_Acl_Resource($resource);
-    	}
-    	
-    	if (!$resource instanceof Zend_Acl_Resource_Interface) {
+        if (is_string($resource)) {
+            $resource = new Zend_Acl_Resource($resource);
+        }
+
+        if (!$resource instanceof Zend_Acl_Resource_Interface) {
             require_once 'Zend/Acl/Exception.php';
             throw new Zend_Acl_Exception('addResource() expects $resource to be of type Zend_Acl_Resource_Interface');
-    	}
-    	
+        }
+
         $resourceId = $resource->getResourceId();
 
         if ($this->has($resourceId)) {
@@ -303,7 +303,7 @@ class Zend_Acl
 
         return $this;
     }
-    
+
     /**
      * Adds a Resource having an identifier unique to the ACL
      *
@@ -312,7 +312,7 @@ class Zend_Acl
      *
      * @deprecated in version 1.9.1 and will be available till 2.0.  New code
      *             should use addResource() instead.
-     * 
+     *
      * @param  Zend_Acl_Resource_Interface        $resource
      * @param  Zend_Acl_Resource_Interface|string $parent
      * @throws Zend_Acl_Exception
@@ -731,24 +731,24 @@ class Zend_Acl
      */
     public function isAllowed($role = null, $resource = null, $privilege = null)
     {
-    	// reset role & resource to null
-    	$this->_isAllowedRole = $this->_isAllowedResource = null;
-    	
+        // reset role & resource to null
+        $this->_isAllowedRole = $this->_isAllowedResource = null;
+
         if (null !== $role) {
-        	// keep track of originally called role
-        	$this->_isAllowedRole = $role;
+            // keep track of originally called role
+            $this->_isAllowedRole = $role;
             $role = $this->_getRoleRegistry()->get($role);
             if (!$this->_isAllowedRole instanceof Zend_Acl_Role_Interface) {
-            	$this->_isAllowedRole = $role;
+                $this->_isAllowedRole = $role;
             }
         }
 
         if (null !== $resource) {
-        	// keep track of originally called resource
-        	$this->_isAllowedResource = $resource;
+            // keep track of originally called resource
+            $this->_isAllowedResource = $resource;
             $resource = $this->get($resource);
             if (!$this->_isAllowedResource instanceof Zend_Acl_Resource_Interface) {
-            	$this->_isAllowedResource = $resource;
+                $this->_isAllowedResource = $resource;
             }
         }
 
@@ -1034,8 +1034,8 @@ class Zend_Acl
                 ($this->_isAllowedResource instanceof Zend_Acl_Resource_Interface) ? $this->_isAllowedResource : $resource,
                 $privilege
                 );
-        } 
-        
+        }
+
         if (null === $rule['assert'] || $assertionValue) {
             return $rule['type'];
         } else if (null !== $resource || null !== $role || null !== $privilege) {

library/Zend/Application.php

@@ -29,28 +29,28 @@ class Zend_Application
 {
     /**
      * Autoloader to use
-     * 
+     *
      * @var Zend_Loader_Autoloader
      */
     protected $_autoloader;
 
     /**
      * Bootstrap
-     * 
+     *
      * @var Zend_Application_Bootstrap_BootstrapAbstract
      */
     protected $_bootstrap;
 
     /**
      * Application environment
-     * 
+     *
      * @var string
      */
     protected $_environment;
 
     /**
      * Options for Zend_Application
-     * 
+     *
      * @var array
      */
     protected $_options = array();
@@ -58,10 +58,10 @@ class Zend_Application
     /**
      * Constructor
      *
-     * Initialize application. Potentially initializes include_paths, PHP 
+     * Initialize application. Potentially initializes include_paths, PHP
      * settings, and bootstrap class.
-     * 
-     * @param  string                   $environment 
+     *
+     * @param  string                   $environment
      * @param  string|array|Zend_Config $options String path to configuration file, or array/Zend_Config of configuration options
      * @throws Zend_Application_Exception When invalid options are provided
      * @return void
@@ -88,7 +88,7 @@ class Zend_Application
 
     /**
      * Retrieve current environment
-     * 
+     *
      * @return string
      */
     public function getEnvironment()
@@ -98,7 +98,7 @@ class Zend_Application
 
     /**
      * Retrieve autoloader instance
-     * 
+     *
      * @return Zend_Loader_Autoloader
      */
     public function getAutoloader()
@@ -108,8 +108,8 @@ class Zend_Application
 
     /**
      * Set application options
-     * 
-     * @param  array $options 
+     *
+     * @param  array $options
      * @throws Zend_Application_Exception When no bootstrap path is provided
      * @throws Zend_Application_Exception When invalid bootstrap information are provided
      * @return Zend_Application
@@ -121,38 +121,38 @@ class Zend_Application
         if (!empty($options['config'])) {
             $options = $this->mergeOptions($options, $this->_loadConfig($options['config']));
         }
-        
+
         $this->_options = $options;
-        
+
         if (!empty($options['phpsettings'])) {
             $this->setPhpSettings($options['phpsettings']);
         }
-        
+
         if (!empty($options['includepaths'])) {
             $this->setIncludePaths($options['includepaths']);
         }
-        
+
         if (!empty($options['autoloadernamespaces'])) {
             $this->setAutoloaderNamespaces($options['autoloadernamespaces']);
         }
-        
+
         if (!empty($options['bootstrap'])) {
             $bootstrap = $options['bootstrap'];
-            
+
             if (is_string($bootstrap)) {
                 $this->setBootstrap($bootstrap);
             } elseif (is_array($bootstrap)) {
                 if (empty($bootstrap['path'])) {
                     throw new Zend_Application_Exception('No bootstrap path provided');
                 }
-                
+
                 $path  = $bootstrap['path'];
                 $class = null;
-                
+
                 if (!empty($bootstrap['class'])) {
                     $class = $bootstrap['class'];
                 }
-                
+
                 $this->setBootstrap($path, $class);
             } else {
                 throw new Zend_Application_Exception('Invalid bootstrap information provided');
@@ -164,7 +164,7 @@ class Zend_Application
 
     /**
      * Retrieve application options (for caching)
-     * 
+     *
      * @return array
      */
     public function getOptions()
@@ -174,8 +174,8 @@ class Zend_Application
 
     /**
      * Is an option present?
-     * 
-     * @param  string $key 
+     *
+     * @param  string $key
      * @return bool
      */
     public function hasOption($key)
@@ -185,8 +185,8 @@ class Zend_Application
 
     /**
      * Retrieve a single option
-     * 
-     * @param  string $key 
+     *
+     * @param  string $key
      * @return mixed
      */
     public function getOption($key)
@@ -199,9 +199,9 @@ class Zend_Application
 
     /**
      * Merge options recursively
-     * 
-     * @param  array $array1 
-     * @param  mixed $array2 
+     *
+     * @param  array $array1
+     * @param  mixed $array2
      * @return array
      */
     public function mergeOptions(array $array1, $array2 = null)
@@ -210,7 +210,7 @@ class Zend_Application
             foreach ($array2 as $key => $val) {
                 if (is_array($array2[$key])) {
                     $array1[$key] = (array_key_exists($key, $array1) && is_array($array1[$key]))
-                                  ? $this->mergeOptions($array1[$key], $array2[$key]) 
+                                  ? $this->mergeOptions($array1[$key], $array2[$key])
                                   : $array2[$key];
                 } else {
                     $array1[$key] = $val;
@@ -222,8 +222,8 @@ class Zend_Application
 
     /**
      * Set PHP configuration settings
-     * 
-     * @param  array $settings 
+     *
+     * @param  array $settings
      * @param  string $prefix Key prefix to prepend to array values (used to map . separated INI values)
      * @return Zend_Application
      */
@@ -237,14 +237,14 @@ class Zend_Application
                 $this->setPhpSettings($value, $key . '.');
             }
         }
-        
+
         return $this;
     }
 
     /**
      * Set include path
-     * 
-     * @param  array $paths 
+     *
+     * @param  array $paths
      * @return Zend_Application
      */
     public function setIncludePaths(array $paths)
@@ -256,31 +256,31 @@ class Zend_Application
 
     /**
      * Set autoloader namespaces
-     * 
-     * @param  array $namespaces 
+     *
+     * @param  array $namespaces
      * @return Zend_Application
      */
     public function setAutoloaderNamespaces(array $namespaces)
     {
         $autoloader = $this->getAutoloader();
-        
+
         foreach ($namespaces as $namespace) {
             $autoloader->registerNamespace($namespace);
         }
-        
+
         return $this;
     }
 
     /**
      * Set bootstrap path/class
-     * 
-     * @param  string $path 
-     * @param  string $class 
+     *
+     * @param  string $path
+     * @param  string $class
      * @return Zend_Application
      */
     public function setBootstrap($path, $class = null)
     {
-        // setOptions() can potentially send a null value; specify default 
+        // setOptions() can potentially send a null value; specify default
         // here
         if (null === $class) {
             $class = 'Bootstrap';
@@ -297,13 +297,13 @@ class Zend_Application
         if (!$this->_bootstrap instanceof Zend_Application_Bootstrap_Bootstrapper) {
             throw new Zend_Application_Exception('Bootstrap class does not implement Zend_Application_Bootstrap_Bootstrapper');
         }
-        
+
         return $this;
     }
 
     /**
      * Get bootstrap object
-     * 
+     *
      * @return Zend_Application_Bootstrap_BootstrapAbstract
      */
     public function getBootstrap()
@@ -316,7 +316,7 @@ class Zend_Application
 
     /**
      * Bootstrap application
-     * 
+     *
      * @return Zend_Application
      */
     public function bootstrap()
@@ -327,7 +327,7 @@ class Zend_Application
 
     /**
      * Run the application
-     * 
+     *
      * @return void
      */
     public function run()
@@ -337,25 +337,25 @@ class Zend_Application
 
     /**
      * Load configuration file of options
-     * 
+     *
      * @param  string $file
-     * @throws Zend_Application_Exception When invalid configuration file is provided 
+     * @throws Zend_Application_Exception When invalid configuration file is provided
      * @return array
      */
     protected function _loadConfig($file)
     {
         $environment = $this->getEnvironment();
         $suffix      = strtolower(pathinfo($file, PATHINFO_EXTENSION));
-        
+
         switch ($suffix) {
             case 'ini':
                 $config = new Zend_Config_Ini($file, $environment);
                 break;
-                
+
             case 'xml':
                 $config = new Zend_Config_Xml($file, $environment);
                 break;
-                
+
             case 'php':
             case 'inc':
                 $config = include $file;
@@ -364,11 +364,11 @@ class Zend_Application
                 }
                 return $config;
                 break;
-                
+
             default:
                 throw new Zend_Application_Exception('Invalid configuration file provided; unknown config type');
         }
-        
+
         return $config->toArray();
     }
 }

library/Zend/Application/Bootstrap/Bootstrap.php

@@ -32,15 +32,15 @@
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Application_Bootstrap_Bootstrap 
+class Zend_Application_Bootstrap_Bootstrap
     extends Zend_Application_Bootstrap_BootstrapAbstract
 {
     /**
      * Constructor
      *
      * Ensure FrontController resource is registered
-     * 
-     * @param  Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application 
+     *
+     * @param  Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application
      * @return void
      */
     public function __construct($application)
@@ -54,12 +54,12 @@ class Zend_Application_Bootstrap_Bootstrap
     /**
      * Run the application
      *
-     * Checks to see that we have a default controller directory. If not, an 
+     * Checks to see that we have a default controller directory. If not, an
      * exception is thrown.
      *
-     * If so, it registers the bootstrap with the 'bootstrap' parameter of 
+     * If so, it registers the bootstrap with the 'bootstrap' parameter of
      * the front controller, and dispatches the front controller.
-     * 
+     *
      * @return void
      * @throws Zend_Application_Bootstrap_Exception
      */

library/Zend/Application/Bootstrap/BootstrapAbstract.php

@@ -32,7 +32,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class Zend_Application_Bootstrap_BootstrapAbstract
-    implements Zend_Application_Bootstrap_Bootstrapper, 
+    implements Zend_Application_Bootstrap_Bootstrapper,
                Zend_Application_Bootstrap_ResourceBootstrapper
 {
     /**
@@ -56,7 +56,7 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
     protected $_environment;
 
     /**
-     * @var array 
+     * @var array
      */
     protected $_options = array();
 
@@ -83,12 +83,12 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
     /**
      * Constructor
      *
-     * Sets application object, initializes options, and prepares list of 
+     * Sets application object, initializes options, and prepares list of
      * initializer methods.
-     * 
+     *
      * @param  Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application
      * @return void
-     * @throws Zend_Application_Bootstrap_Exception When invalid applicaiton is provided 
+     * @throws Zend_Application_Bootstrap_Exception When invalid applicaiton is provided
      */
     public function __construct($application)
     {
@@ -99,8 +99,8 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
 
     /**
      * Set class state
-     * 
-     * @param  array $options 
+     *
+     * @param  array $options
      * @return Zend_Application_Bootstrap_BootstrapAbstract
      */
     public function setOptions(array $options)
@@ -113,11 +113,11 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
 
         if (array_key_exists('pluginpaths', $options)) {
             $pluginLoader = $this->getPluginLoader();
-            
+
             foreach ($options['pluginpaths'] as $prefix => $path) {
                 $pluginLoader->addPrefixPath($prefix, $path);
             }
-            
+
             unset($options['pluginpaths']);
         }
 
@@ -138,7 +138,7 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
 
     /**
      * Get current options from bootstrap
-     * 
+     *
      * @return array
      */
     public function getOptions()
@@ -148,8 +148,8 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
 
     /**
      * Is an option present?
-     * 
-     * @param  string $key 
+     *
+     * @param  string $key
      * @return bool
      */
     public function hasOption($key)
@@ -159,8 +159,8 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
 
     /**
      * Retrieve a single option
-     * 
-     * @param  string $key 
+     *
+     * @param  string $key
      * @return mixed
      */
     public function getOption($key)
@@ -173,9 +173,9 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
 
     /**
      * Merge options recursively
-     * 
-     * @param  array $array1 
-     * @param  mixed $array2 
+     *
+     * @param  array $array1
+     * @param  mixed $array2
      * @return array
      */
     public function mergeOptions(array $array1, $array2 = null)
@@ -184,7 +184,7 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
             foreach ($array2 as $key => $val) {
                 if (is_array($array2[$key])) {
                     $array1[$key] = (array_key_exists($key, $array1) && is_array($array1[$key]))
-                                  ? $this->mergeOptions($array1[$key], $array2[$key]) 
+                                  ? $this->mergeOptions($array1[$key], $array2[$key])
                                   : $array2[$key];
                 } else {
                     $array1[$key] = $val;
@@ -196,10 +196,10 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
 
     /**
      * Get class resources (as resource/method pairs)
-     * 
+     *
      * Uses get_class_methods() by default, reflection on prior to 5.2.6,
-     * as a bug prevents the usage of get_class_methods() there. 
-     * 
+     * as a bug prevents the usage of get_class_methods() there.
+     *
      * @return array
      */
     public function getClassResources()
@@ -209,14 +209,14 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
                 $class        = new ReflectionObject($this);
                 $classMethods = $class->getMethods();
                 $methodNames  = array();
-                
+
                 foreach ($classMethods as $method) {
                     $methodNames[] = $method->getName();
                 }
             } else {
                 $methodNames = get_class_methods($this);
             }
-            
+
             $this->_classResources = array();
             foreach ($methodNames as $method) {
                 if (5 < strlen($method) && '_init' === substr($method, 0, 5)) {
@@ -224,13 +224,13 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
                 }
             }
         }
-        
+
         return $this->_classResources;
     }
 
     /**
      * Get class resource names
-     * 
+     *
      * @return array
      */
     public function getClassResourceNames()
@@ -241,7 +241,7 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
 
     /**
      * Register a new resource plugin
-     * 
+     *
      * @param  string|Zend_Application_Resource_Resource $resource
      * @param  mixed  $options
      * @return Zend_Application_Bootstrap_BootstrapAbstract
@@ -274,8 +274,8 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
 
     /**
      * Unregister a resource from the bootstrap
-     * 
-     * @param  string|Zend_Application_Resource_Resource $resource 
+     *
+     * @param  string|Zend_Application_Resource_Resource $resource
      * @return Zend_Application_Bootstrap_BootstrapAbstract
      * @throws Zend_Application_Bootstrap_Exception When unknown resource type is provided
      */
@@ -301,16 +301,16 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
     }
 
     /**
-     * Is the requested plugin resource registered? 
-     * 
-     * @param  string $resource 
+     * Is the requested plugin resource registered?
+     *
+     * @param  string $resource
      * @return bool
      */
     public function hasPluginResource($resource)
     {
         return (null !== $this->getPluginResource($resource));
     }
-    
+
     /**
      * Get a registered plugin resource
      *
@@ -363,12 +363,12 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
             }
         }
 
-        return null;            
+        return null;
     }
 
     /**
      * Retrieve all plugin resources
-     * 
+     *
      * @return array
      */
     public function getPluginResources()
@@ -381,7 +381,7 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
 
     /**
      * Retrieve plugin resource names
-     * 
+     *
      * @return array
      */
     public function getPluginResourceNames()
@@ -392,8 +392,8 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
 
     /**
      * Set plugin loader for loading resources
-     * 
-     * @param  Zend_Loader_PluginLoader_Interface $loader 
+     *
+     * @param  Zend_Loader_PluginLoader_Interface $loader
      * @return Zend_Application_Bootstrap_BootstrapAbstract
      */
     public function setPluginLoader(Zend_Loader_PluginLoader_Interface $loader)
@@ -401,7 +401,7 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
         $this->_pluginLoader = $loader;
         return $this;
     }
-    
+
     /**
      * Get the plugin loader for resources
      *
@@ -422,13 +422,13 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
 
     /**
      * Set application/parent bootstrap
-     * 
-     * @param  Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application 
+     *
+     * @param  Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application
      * @return Zend_Application_Bootstrap_BootstrapAbstract
      */
     public function setApplication($application)
     {
-        if (($application instanceof Zend_Application) 
+        if (($application instanceof Zend_Application)
             || ($application instanceof Zend_Application_Bootstrap_Bootstrapper)
         ) {
             $this->_application = $application;
@@ -437,10 +437,10 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
         }
         return $this;
     }
-    
+
     /**
      * Retrieve parent application instance
-     * 
+     *
      * @return Zend_Application|Zend_Application_Bootstrap_Bootstrapper
      */
     public function getApplication()
@@ -450,7 +450,7 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
 
     /**
      * Retrieve application environment
-     * 
+     *
      * @return string
      */
     public function getEnvironment()
@@ -464,13 +464,13 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
     /**
      * Set resource container
      *
-     * By default, if a resource callback has a non-null return value, this 
-     * value will be stored in a container using the resource name as the 
+     * By default, if a resource callback has a non-null return value, this
+     * value will be stored in a container using the resource name as the
      * key.
      *
      * Containers must be objects, and must allow setting public properties.
-     * 
-     * @param  object $container 
+     *
+     * @param  object $container
      * @return Zend_Application_Bootstrap_BootstrapAbstract
      */
     public function setContainer($container)
@@ -484,7 +484,7 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
 
     /**
      * Retrieve resource container
-     * 
+     *
      * @return object
      */
     public function getContainer()
@@ -498,11 +498,11 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
     /**
      * Determine if a resource has been stored in the container
      *
-     * During bootstrap resource initialization, you may return a value. If 
+     * During bootstrap resource initialization, you may return a value. If
      * you do, it will be stored in the {@link setContainer() container}.
      * You can use this method to determine if a value was stored.
-     * 
-     * @param  string $name 
+     *
+     * @param  string $name
      * @return bool
      */
     public function hasResource($name)
@@ -515,13 +515,13 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
     /**
      * Retrieve a resource from the container
      *
-     * During bootstrap resource initialization, you may return a value. If 
+     * During bootstrap resource initialization, you may return a value. If
      * you do, it will be stored in the {@link setContainer() container}.
      * You can use this method to retrieve that value.
      *
      * If no value was returned, this will return a null value.
-     * 
-     * @param  string $name 
+     *
+     * @param  string $name
      * @return null|mixed
      */
     public function getResource($name)
@@ -549,7 +549,7 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
     /**
      * Implement PHP's magic to ask for the
      * existence of a ressource in the bootstrap
-     * 
+     *
      * @param string $prop
      * @return bool
      */
@@ -565,12 +565,12 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
      * child class 'Bootstrap' (in which case, overriding this method
      * would result in it being treated as a constructor).
      *
-     * If you need to override this functionality, override the 
+     * If you need to override this functionality, override the
      * {@link _bootstrap()} method.
-     * 
+     *
      * @param  null|string|array $resource
      * @return Zend_Application_Bootstrap_BootstrapAbstract
-     * @throws Zend_Application_Bootstrap_Exception When invalid argument was passed 
+     * @throws Zend_Application_Bootstrap_Exception When invalid argument was passed
      */
     final public function bootstrap($resource = null)
     {
@@ -580,11 +580,11 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
 
     /**
      * Overloading: intercept calls to bootstrap<resourcename>() methods
-     * 
-     * @param  string $method 
+     *
+     * @param  string $method
      * @param  array  $args
      * @return void
-     * @throws Zend_Application_Bootstrap_Exception On invalid method name 
+     * @throws Zend_Application_Bootstrap_Exception On invalid method name
      */
     public function __call($method, $args)
     {
@@ -599,12 +599,12 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
     /**
      * Bootstrap implementation
      *
-     * This method may be overridden to provide custom bootstrapping logic. 
+     * This method may be overridden to provide custom bootstrapping logic.
      * It is the sole method called by {@link bootstrap()}.
-     * 
-     * @param  null|string|array $resource 
+     *
+     * @param  null|string|array $resource
      * @return void
-     * @throws Zend_Application_Bootstrap_Exception When invalid argument was passed 
+     * @throws Zend_Application_Bootstrap_Exception When invalid argument was passed
      */
     protected function _bootstrap($resource = null)
     {
@@ -612,7 +612,7 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
             foreach ($this->getClassResourceNames() as $resource) {
                 $this->_executeResource($resource);
             }
-            
+
             foreach ($this->getPluginResourceNames() as $resource) {
                 $this->_executeResource($resource);
             }
@@ -630,14 +630,14 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
     /**
      * Execute a resource
      *
-     * Checks to see if the resource has already been run. If not, it searches 
-     * first to see if a local method matches the resource, and executes that. 
-     * If not, it checks to see if a plugin resource matches, and executes that 
+     * Checks to see if the resource has already been run. If not, it searches
+     * first to see if a local method matches the resource, and executes that.
+     * If not, it checks to see if a plugin resource matches, and executes that
      * if found.
      *
      * Finally, if not found, it throws an exception.
      *
-     * @param  string $resource 
+     * @param  string $resource
      * @return void
      * @throws Zend_Application_Bootstrap_Exception When resource not found
      */
@@ -687,9 +687,9 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
 
     /**
      * Load a plugin resource
-     * 
-     * @param  string $resource 
-     * @param  array|object|null $options 
+     *
+     * @param  string $resource
+     * @param  array|object|null $options
      * @return string|false
      */
     protected function _loadPluginResource($resource, $options)
@@ -717,8 +717,8 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
 
     /**
      * Mark a resource as having run
-     * 
-     * @param  string $resource 
+     *
+     * @param  string $resource
      * @return void
      */
     protected function _markRun($resource)
@@ -737,8 +737,8 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
      * - class name (if none of the above are true)
      *
      * The name is then cast to lowercase.
-     * 
-     * @param  Zend_Application_Resource_Resource $resource 
+     *
+     * @param  Zend_Application_Resource_Resource $resource
      * @return string
      */
     protected function _resolvePluginResourceName($resource)

library/Zend/Application/Bootstrap/Bootstrapper.php

@@ -33,61 +33,61 @@ interface Zend_Application_Bootstrap_Bootstrapper
 {
     /**
      * Constructor
-     * 
-     * @param  Zend_Application $application 
+     *
+     * @param  Zend_Application $application
      * @return void
      */
     public function __construct($application);
 
     /**
      * Set bootstrap options
-     * 
-     * @param  array $options 
+     *
+     * @param  array $options
      * @return Zend_Application_Bootstrap_Bootstrapper
      */
     public function setOptions(array $options);
 
     /**
      * Retrieve application object
-     * 
+     *
      * @return Zend_Application|Zend_Application_Bootstrap_Bootstrapper
      */
     public function getApplication();
 
     /**
      * Retrieve application environment
-     * 
+     *
      * @return string
      */
     public function getEnvironment();
 
     /**
-     * Retrieve list of class resource initializers (_init* methods). Returns 
+     * Retrieve list of class resource initializers (_init* methods). Returns
      * as resource/method pairs.
-     * 
+     *
      * @return array
      */
     public function getClassResources();
 
     /**
-     * Retrieve list of class resource initializer names (resource names only, 
+     * Retrieve list of class resource initializer names (resource names only,
      * no method names)
-     * 
+     *
      * @return array
      */
     public function getClassResourceNames();
 
     /**
      * Bootstrap application or individual resource
-     * 
-     * @param  null|string $resource 
+     *
+     * @param  null|string $resource
      * @return mixed
      */
     public function bootstrap($resource = null);
 
     /**
      * Run the application
-     * 
+     *
      * @return void
      */
     public function run();

library/Zend/Application/Bootstrap/ResourceBootstrapper.php

@@ -33,62 +33,62 @@ interface Zend_Application_Bootstrap_ResourceBootstrapper
 {
     /**
      * Register a resource with the bootstrap
-     * 
-     * @param  string|Zend_Application_Resource_Resource $resource 
-     * @param  null|array|Zend_Config                     $options 
+     *
+     * @param  string|Zend_Application_Resource_Resource $resource
+     * @param  null|array|Zend_Config                     $options
      * @return Zend_Application_Bootstrap_ResourceBootstrapper
      */
     public function registerPluginResource($resource, $options = null);
 
     /**
      * Unregister a resource from the bootstrap
-     * 
-     * @param  string|Zend_Application_Resource_Resource $resource 
+     *
+     * @param  string|Zend_Application_Resource_Resource $resource
      * @return Zend_Application_Bootstrap_ResourceBootstrapper
      */
     public function unregisterPluginResource($resource);
 
     /**
      * Is the requested resource registered?
-     * 
-     * @param  string $resource 
+     *
+     * @param  string $resource
      * @return bool
      */
     public function hasPluginResource($resource);
 
     /**
      * Retrieve resource
-     * 
-     * @param  string $resource 
+     *
+     * @param  string $resource
      * @return Zend_Application_Resource_Resource
      */
     public function getPluginResource($resource);
 
     /**
      * Get all resources
-     * 
+     *
      * @return array
      */
     public function getPluginResources();
 
     /**
      * Get just resource names
-     * 
+     *
      * @return array
      */
     public function getPluginResourceNames();
 
     /**
      * Set plugin loader to use to fetch resources
-     * 
-     * @param  Zend_Loader_PluginLoader_Interface Zend_Loader_PluginLoader 
+     *
+     * @param  Zend_Loader_PluginLoader_Interface Zend_Loader_PluginLoader
      * @return Zend_Application_Bootstrap_ResourceBootstrapper
      */
     public function setPluginLoader(Zend_Loader_PluginLoader_Interface $loader);
 
     /**
      * Retrieve plugin loader for resources
-     * 
+     *
      * @return Zend_Loader_PluginLoader
      */
     public function getPluginLoader();

library/Zend/Application/Module/Autoloader.php

@@ -25,7 +25,7 @@ require_once 'Zend/Loader/Autoloader/Resource.php';
 
 /**
  * Resource loader for application module classes
- * 
+ *
  * @uses       Zend_Loader_Autoloader_Resource
  * @category   Zend
  * @package    Zend_Application
@@ -37,8 +37,8 @@ class Zend_Application_Module_Autoloader extends Zend_Loader_Autoloader_Resource
 {
     /**
      * Constructor
-     * 
-     * @param  array|Zend_Config $options 
+     *
+     * @param  array|Zend_Config $options
      * @return void
      */
     public function __construct($options)
@@ -49,7 +49,7 @@ class Zend_Application_Module_Autoloader extends Zend_Loader_Autoloader_Resource
 
     /**
      * Initialize default resource types for module resource classes
-     * 
+     *
      * @return void
      */
     public function initDefaultResourceTypes()

library/Zend/Application/Module/Bootstrap.php

@@ -27,7 +27,7 @@ require_once 'Zend/Application/Bootstrap/Bootstrap.php';
 
 /**
  * Base bootstrap class for modules
- * 
+ *
  * @uses       Zend_Loader_Autoloader_Resource
  * @uses       Zend_Application_Bootstrap_Bootstrap
  * @category   Zend
@@ -36,7 +36,7 @@ require_once 'Zend/Application/Bootstrap/Bootstrap.php';
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-abstract class Zend_Application_Module_Bootstrap 
+abstract class Zend_Application_Module_Bootstrap
     extends Zend_Application_Bootstrap_Bootstrap
 {
     /**
@@ -46,8 +46,8 @@ abstract class Zend_Application_Module_Bootstrap
 
     /**
      * Constructor
-     * 
-     * @param  Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application 
+     *
+     * @param  Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application
      * @return void
      */
     public function __construct($application)
@@ -85,8 +85,8 @@ abstract class Zend_Application_Module_Bootstrap
 
     /**
      * Set module resource loader
-     * 
-     * @param  Zend_Loader_Autoloader_Resource $loader 
+     *
+     * @param  Zend_Loader_Autoloader_Resource $loader
      * @return Zend_Application_Module_Bootstrap
      */
     public function setResourceLoader(Zend_Loader_Autoloader_Resource $loader)
@@ -97,7 +97,7 @@ abstract class Zend_Application_Module_Bootstrap
 
     /**
      * Retrieve module resource loader
-     * 
+     *
      * @return Zend_Loader_Autoloader_Resource
      */
     public function getResourceLoader()
@@ -115,7 +115,7 @@ abstract class Zend_Application_Module_Bootstrap
 
     /**
      * Ensure resource loader is loaded
-     * 
+     *
      * @return void
      */
     public function initResourceLoader()
@@ -125,7 +125,7 @@ abstract class Zend_Application_Module_Bootstrap
 
     /**
      * Retrieve module name
-     * 
+     *
      * @return string
      */
     public function getModuleName()

library/Zend/Application/Resource/Db.php

@@ -43,24 +43,24 @@ class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbs
      * @var Zend_Db_Adapter_Interface
      */
     protected $_db;
-    
+
     /**
      * Parameters to use
      *
      * @var array
      */
     protected $_params = array();
-    
+
     /**
      * Wether to register the created adapter as default table adapter
      *
      * @var boolean
      */
-    protected $_isDefaultTableAdapter = true; 
-    
+    protected $_isDefaultTableAdapter = true;
+
     /**
      * Set the adapter
-     * 
+     *
      * @param  $adapter string
      * @return Zend_Application_Resource_Db
      */
@@ -72,7 +72,7 @@ class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbs
 
     /**
      * Adapter type to use
-     * 
+     *
      * @return string
      */
     public function getAdapter()
@@ -82,7 +82,7 @@ class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbs
 
     /**
      * Set the adapter params
-     * 
+     *
      * @param  $adapter string
      * @return Zend_Application_Resource_Db
      */
@@ -94,14 +94,14 @@ class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbs
 
     /**
      * Adapter parameters
-     * 
+     *
      * @return array
      */
     public function getParams()
     {
         return $this->_params;
     }
-    
+
     /**
      * Set whether to use this as default table adapter
      *
@@ -116,7 +116,7 @@ class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbs
 
     /**
      * Is this adapter the default table adapter?
-     * 
+     *
      * @return void
      */
     public function isDefaultTableAdapter()
@@ -126,19 +126,19 @@ class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbs
 
     /**
      * Retrieve initialized DB connection
-     * 
+     *
      * @return null|Zend_Db_Adapter_Interface
      */
     public function getDbAdapter()
     {
-        if ((null === $this->_db) 
+        if ((null === $this->_db)
             && (null !== ($adapter = $this->getAdapter()))
         ) {
             $this->_db = Zend_Db::factory($adapter, $this->getParams());
         }
         return $this->_db;
     }
-    
+
     /**
      * Defined by Zend_Application_Resource_Resource
      *

library/Zend/Application/Resource/Frontcontroller.php

@@ -38,13 +38,13 @@ class Zend_Application_Resource_Frontcontroller extends Zend_Application_Resourc
 
     /**
      * Initialize Front Controller
-     * 
+     *
      * @return Zend_Controller_Front
      */
     public function init()
     {
         $front = $this->getFrontController();
-        
+
         foreach ($this->getOptions() as $key => $value) {
             switch (strtolower($key)) {
                 case 'controllerdirectory':
@@ -56,35 +56,35 @@ class Zend_Application_Resource_Frontcontroller extends Zend_Application_Resourc
                         }
                     }
                     break;
-                    
+
                 case 'modulecontrollerdirectoryname':
                     $front->setModuleControllerDirectoryName($value);
                     break;
-                    
+
                 case 'moduledirectory':
                     $front->addModuleDirectory($value);
                     break;
-                    
+
                 case 'defaultcontrollername':
                     $front->setDefaultControllerName($value);
                     break;
-                    
+
                 case 'defaultaction':
                     $front->setDefaultAction($value);
                     break;
-                    
+
                 case 'defaultmodule':
                     $front->setDefaultModule($value);
                     break;
-                    
+
                 case 'baseurl':
                     $front->setBaseUrl($value);
                     break;
-                    
+
                 case 'params':
                     $front->setParams($value);
                     break;
-                    
+
                 case 'plugins':
                     foreach ((array) $value as $pluginClass) {
                         $plugin = new $pluginClass();
@@ -119,7 +119,7 @@ class Zend_Application_Resource_Frontcontroller extends Zend_Application_Resourc
 
     /**
      * Retrieve front controller instance
-     * 
+     *
      * @return Zend_Controller_Front
      */
     public function getFrontController()

library/Zend/Application/Resource/Layout.php

@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Application_Resource_Layout 
+class Zend_Application_Resource_Layout
     extends Zend_Application_Resource_ResourceAbstract
 {
     /**

library/Zend/Application/Resource/Locale.php

@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Application_Resource_Locale 
+class Zend_Application_Resource_Locale
     extends Zend_Application_Resource_ResourceAbstract
 {
     const DEFAULT_REGISTRY_KEY = 'Zend_Locale';
@@ -62,7 +62,7 @@ class Zend_Application_Resource_Locale
             $options = $this->getOptions();
             if (!isset($options['default'])) {
                 $this->_locale = new Zend_Locale();
-            } else { 
+            } else {
                 Zend_Locale::setDefault($options['default']);
                 $this->_locale = new Zend_Locale($options['default']);
             }

library/Zend/Application/Resource/Navigation.php

@@ -31,7 +31,7 @@
  * @author     Dolf Schimmel
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Application_Resource_Navigation 
+class Zend_Application_Resource_Navigation
     extends Zend_Application_Resource_ResourceAbstract
 {
     const DEFAULT_REGISTRY_KEY = 'Zend_Navigation';
@@ -88,10 +88,10 @@ class Zend_Application_Resource_Navigation
         {
            $key = $options['storage']['registry']['key'];
         } else {
-		    $key = self::DEFAULT_REGISTRY_KEY;
+            $key = self::DEFAULT_REGISTRY_KEY;
         }
-        
-		Zend_Registry::set($key,$this->getContainer());
+
+        Zend_Registry::set($key,$this->getContainer());
     }
 
     /**

library/Zend/Application/Resource/Resource.php

@@ -35,38 +35,38 @@ interface Zend_Application_Resource_Resource
      * Constructor
      *
      * Must take an optional single argument, $options.
-     * 
-     * @param  mixed $options 
+     *
+     * @param  mixed $options
      * @return void
      */
     public function __construct($options = null);
 
     /**
      * Set the bootstrap to which the resource is attached
-     * 
-     * @param  Zend_Application_Bootstrap_Bootstrapper $bootstrap 
+     *
+     * @param  Zend_Application_Bootstrap_Bootstrapper $bootstrap
      * @return Zend_Application_Resource_Resource
      */
     public function setBootstrap(Zend_Application_Bootstrap_Bootstrapper $bootstrap);
 
     /**
      * Retrieve the bootstrap to which the resource is attached
-     * 
+     *
      * @return Zend_Application_Bootstrap_Bootstrapper
      */
     public function getBootstrap();
 
     /**
      * Set resource options
-     * 
-     * @param  array $options 
+     *
+     * @param  array $options
      * @return Zend_Application_Resource_Resource
      */
     public function setOptions(array $options);
 
     /**
      * Retrieve resource options
-     * 
+     *
      * @return array
      */
     public function getOptions();

library/Zend/Application/Resource/ResourceAbstract.php

@@ -39,14 +39,14 @@ abstract class Zend_Application_Resource_ResourceAbstract implements Zend_Applic
 {
     /**
      * Parent bootstrap
-     * 
+     *
      * @var Zend_Application_Bootstrap_Bootstrapper
      */
     protected $_bootstrap;
 
     /**
      * Options for the resource
-     * 
+     *
      * @var array
      */
     protected $_options = array();
@@ -96,7 +96,7 @@ abstract class Zend_Application_Resource_ResourceAbstract implements Zend_Applic
                 unset($options[$key]);
             }
         }
-        
+
         $this->_options = $this->mergeOptions($this->_options, $options);
 
         return $this;
@@ -104,7 +104,7 @@ abstract class Zend_Application_Resource_ResourceAbstract implements Zend_Applic
 
     /**
      * Retrieve resource options
-     * 
+     *
      * @return array
      */
     public function getOptions()
@@ -114,9 +114,9 @@ abstract class Zend_Application_Resource_ResourceAbstract implements Zend_Applic
 
     /**
      * Merge options recursively
-     * 
-     * @param  array $array1 
-     * @param  mixed $array2 
+     *
+     * @param  array $array1
+     * @param  mixed $array2
      * @return array
      */
     public function mergeOptions(array $array1, $array2 = null)
@@ -125,7 +125,7 @@ abstract class Zend_Application_Resource_ResourceAbstract implements Zend_Applic
             foreach ($array2 as $key => $val) {
                 if (is_array($array2[$key])) {
                     $array1[$key] = (array_key_exists($key, $array1) && is_array($array1[$key]))
-                                  ? $this->mergeOptions($array1[$key], $array2[$key]) 
+                                  ? $this->mergeOptions($array1[$key], $array2[$key])
                                   : $array2[$key];
                 } else {
                     $array1[$key] = $val;
@@ -137,8 +137,8 @@ abstract class Zend_Application_Resource_ResourceAbstract implements Zend_Applic
 
     /**
      * Set the bootstrap to which the resource is attached
-     * 
-     * @param  Zend_Application_Bootstrap_Bootstrapper $bootstrap 
+     *
+     * @param  Zend_Application_Bootstrap_Bootstrapper $bootstrap
      * @return Zend_Application_Resource_Resource
      */
     public function setBootstrap(Zend_Application_Bootstrap_Bootstrapper $bootstrap)
@@ -149,7 +149,7 @@ abstract class Zend_Application_Resource_ResourceAbstract implements Zend_Applic
 
     /**
      * Retrieve the bootstrap to which the resource is attached
-     * 
+     *
      * @return null|Zend_Application_Bootstrap_Bootstrapper
      */
     public function getBootstrap()

library/Zend/Application/Resource/Router.php

@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Application_Resource_Router 
+class Zend_Application_Resource_Router
     extends Zend_Application_Resource_ResourceAbstract
 {
     /**
@@ -64,12 +64,12 @@ class Zend_Application_Resource_Router
             if (!isset($options['routes'])) {
                 $options['routes'] = array();
             }
-            
+
 
             if (isset($options['chainNameSeparator'])) {
                 $this->_router->setChainNameSeparator($options['chainNameSeparator']);
             }
-            
+
 
             $this->_router->addConfig(new Zend_Config($options['routes']));
         }

library/Zend/Application/Resource/View.php

@@ -54,7 +54,7 @@ class Zend_Application_Resource_View extends Zend_Application_Resource_ResourceA
 
     /**
      * Retrieve view object
-     * 
+     *
      * @return Zend_View
      */
     public function getView()

library/Zend/Auth/Adapter/DbTable.php

@@ -58,7 +58,7 @@ class Zend_Auth_Adapter_DbTable implements Zend_Auth_Adapter_Interface
      * @var Zend_Db_Select
      */
     protected $_dbSelect = null;
-    
+
     /**
      * $_tableName - the table name to check
      *
@@ -241,10 +241,10 @@ class Zend_Auth_Adapter_DbTable implements Zend_Auth_Adapter_Interface
         if ($this->_dbSelect == null) {
             $this->_dbSelect = $this->_zendDb->select();
         }
-        
+
         return $this->_dbSelect;
     }
-    
+
     /**
      * getResultRowObject() - Returns the result row as a stdClass object
      *

library/Zend/Auth/Adapter/Http.php

@@ -403,7 +403,7 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface
             // challenge again the client
             return $this->_challengeClient();
         }
-        
+
         switch ($clientScheme) {
             case 'basic':
                 $result = $this->_basicAuth($authHeader);

library/Zend/Cache.php

@@ -44,11 +44,11 @@ abstract class Zend_Cache
 
     /**
      * Standard backends which implement the ExtendedInterface
-     * 
+     *
      * @var array
      */
     public static $standardExtendedBackends = array('File', 'Apc', 'TwoLevels', 'Memcached', 'Sqlite');
-    
+
     /**
      * Only for backward compatibily (may be removed in next major release)
      *
@@ -73,7 +73,7 @@ abstract class Zend_Cache
     const CLEANING_MODE_MATCHING_TAG     = 'matchingTag';
     const CLEANING_MODE_NOT_MATCHING_TAG = 'notMatchingTag';
     const CLEANING_MODE_MATCHING_ANY_TAG = 'matchingAnyTag';
-    
+
     /**
      * Factory
      *
@@ -110,7 +110,7 @@ abstract class Zend_Cache
         $frontendObject->setBackend($backendObject);
         return $frontendObject;
     }
-    
+
     /**
      * Frontend Constructor
      *
@@ -151,7 +151,7 @@ abstract class Zend_Cache
         }
         return new $backendClass($backendOptions);
     }
-    
+
     /**
      * Backend Constructor
      *

library/Zend/Cache/Backend.php

@@ -140,77 +140,77 @@ class Zend_Cache_Backend
     {
         return true;
     }
-   
+
     /**
      * Determine system TMP directory and detect if we have read access
      *
-     * inspired from Zend_File_Transfer_Adapter_Abstract 
+     * inspired from Zend_File_Transfer_Adapter_Abstract
      *
      * @return string
      * @throws Zend_Cache_Exception if unable to determine directory
      */
     public function getTmpDir()
     {
-    	$tmpdir = array();
+        $tmpdir = array();
         foreach (array($_ENV, $_SERVER) as $tab) {
-        	foreach (array('TMPDIR', 'TEMP', 'TMP', 'windir', 'SystemRoot') as $key) {
-        		if (isset($tab[$key])) {
-        			if (($key == 'windir') or ($key == 'SystemRoot')) {
+            foreach (array('TMPDIR', 'TEMP', 'TMP', 'windir', 'SystemRoot') as $key) {
+                if (isset($tab[$key])) {
+                    if (($key == 'windir') or ($key == 'SystemRoot')) {
                         $dir = realpath($tab[$key] . '\\temp');
                     } else {
-                    	$dir = realpath($tab[$key]);
+                        $dir = realpath($tab[$key]);
+                    }
+                    if ($this->_isGoodTmpDir($dir)) {
+                        return $dir;
                     }
-        			if ($this->_isGoodTmpDir($dir)) {
-        				return $dir;
-        			}
-        		}
-        	}
+                }
+            }
         }
         $upload = ini_get('upload_tmp_dir');
         if ($upload) {
             $dir = realpath($upload);
-        	if ($this->_isGoodTmpDir($dir)) {
-        		return $dir;
-        	}
+            if ($this->_isGoodTmpDir($dir)) {
+                return $dir;
+            }
         }
         if (function_exists('sys_get_temp_dir')) {
             $dir = sys_get_temp_dir();
-        	if ($this->_isGoodTmpDir($dir)) {
-        		return $dir;
-        	}
+            if ($this->_isGoodTmpDir($dir)) {
+                return $dir;
+            }
         }
         // Attemp to detect by creating a temporary file
         $tempFile = tempnam(md5(uniqid(rand(), TRUE)), '');
         if ($tempFile) {
-        	$dir = realpath(dirname($tempFile));
+            $dir = realpath(dirname($tempFile));
             unlink($tempFile);
             if ($this->_isGoodTmpDir($dir)) {
                 return $dir;
             }
         }
         if ($this->_isGoodTmpDir('/tmp')) {
-        	return '/tmp';
+            return '/tmp';
         }
         if ($this->_isGoodTmpDir('\\temp')) {
-        	return '\\temp';
+            return '\\temp';
         }
         Zend_Cache::throwException('Could not determine temp directory, please specify a cache_dir manually');
     }
-    
+
     /**
      * Verify if the given temporary directory is readable and writable
-     * 
+     *
      * @param $dir temporary directory
      * @return boolean true if the directory is ok
      */
     protected function _isGoodTmpDir($dir)
     {
-    	if (is_readable($dir)) {
-	    	if (is_writable($dir)) {
-	    		return true;
-	    	}
-    	}
-    	return false;
+        if (is_readable($dir)) {
+            if (is_writable($dir)) {
+                return true;
+            }
+        }
+        return false;
     }
 
     /**
@@ -261,7 +261,7 @@ class Zend_Cache_Backend
         }
 
         if (!isset($this->_directives['logger'])) {
-        	Zend_Cache::throwException('Logging is enabled but logger is not set.');
+            Zend_Cache::throwException('Logging is enabled but logger is not set.');
         }
         $logger = $this->_directives['logger'];
         if (!$logger instanceof Zend_Log) {

library/Zend/Cache/Backend/Apc.php

@@ -166,18 +166,18 @@ class Zend_Cache_Backend_Apc extends Zend_Cache_Backend implements Zend_Cache_Ba
      * Return true if the automatic cleaning is available for the backend
      *
      * DEPRECATED : use getCapabilities() instead
-     * 
-     * @deprecated 
+     *
+     * @deprecated
      * @return boolean
      */
     public function isAutomaticCleaningAvailable()
     {
         return false;
     }
-    
+
     /**
      * Return the filling percentage of the backend storage
-     * 
+     *
      * @throws Zend_Cache_Exception
      * @return int integer between 0 and 100
      */
@@ -195,21 +195,21 @@ class Zend_Cache_Backend_Apc extends Zend_Cache_Backend implements Zend_Cache_Ba
         }
         return ((int) (100. * ($memUsed / $memSize)));
     }
-    
+
     /**
      * Return an array of stored tags
      *
      * @return array array of stored tags (string)
      */
     public function getTags()
-    {   
+    {
         $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_APC_BACKEND);
         return array();
     }
-    
+
     /**
      * Return an array of stored cache ids which match given tags
-     * 
+     *
      * In case of multiple tags, a logical AND is made between tags
      *
      * @param array $tags array of tags
@@ -218,26 +218,26 @@ class Zend_Cache_Backend_Apc extends Zend_Cache_Backend implements Zend_Cache_Ba
     public function getIdsMatchingTags($tags = array())
     {
         $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_APC_BACKEND);
-        return array();               
+        return array();
     }
 
     /**
      * Return an array of stored cache ids which don't match given tags
-     * 
+     *
      * In case of multiple tags, a logical OR is made between tags
      *
      * @param array $tags array of tags
      * @return array array of not matching cache ids (string)
-     */    
+     */
     public function getIdsNotMatchingTags($tags = array())
     {
         $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_APC_BACKEND);
-        return array();         
+        return array();
     }
-    
+
     /**
      * Return an array of stored cache ids which match any given tags
-     * 
+     *
      * In case of multiple tags, a logical AND is made between tags
      *
      * @param array $tags array of tags
@@ -246,12 +246,12 @@ class Zend_Cache_Backend_Apc extends Zend_Cache_Backend implements Zend_Cache_Ba
     public function getIdsMatchingAnyTags($tags = array())
     {
         $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_APC_BACKEND);
-        return array();         
+        return array();
     }
-    
+
     /**
      * Return an array of stored cache ids
-     * 
+     *
      * @return array array of stored cache ids (string)
      */
     public function getIds()
@@ -264,7 +264,7 @@ class Zend_Cache_Backend_Apc extends Zend_Cache_Backend implements Zend_Cache_Ba
         }
         return $res;
     }
-    
+
     /**
      * Return an array of metadatas for the given cache id
      *
@@ -272,7 +272,7 @@ class Zend_Cache_Backend_Apc extends Zend_Cache_Backend implements Zend_Cache_Ba
      * - expire : the expire timestamp
      * - tags : a string array of tags
      * - mtime : timestamp of last modification time
-     * 
+     *
      * @param string $id cache id
      * @return array array of metadatas (false if the cache id is not found)
      */
@@ -294,9 +294,9 @@ class Zend_Cache_Backend_Apc extends Zend_Cache_Backend implements Zend_Cache_Ba
                 'mtime' => $mtime
             );
         }
-        return false;  
+        return false;
     }
-    
+
     /**
      * Give (if possible) an extra lifetime to the given cache id
      *
@@ -318,17 +318,17 @@ class Zend_Cache_Backend_Apc extends Zend_Cache_Backend implements Zend_Cache_Ba
             $lifetime = $tmp[2];
             $newLifetime = $lifetime - (time() - $mtime) + $extraLifetime;
             if ($newLifetime <=0) {
-                return false; 
+                return false;
             }
             apc_store($id, array($data, time(), $newLifetime), $newLifetime);
             return true;
         }
         return false;
     }
-    
+
     /**
      * Return an associative array of capabilities (booleans) of the backend
-     * 
+     *
      * The array must include these keys :
      * - automatic_cleaning (is automating cleaning necessary)
      * - tags (are tags supported)
@@ -337,7 +337,7 @@ class Zend_Cache_Backend_Apc extends Zend_Cache_Backend implements Zend_Cache_Ba
      * - priority does the backend deal with priority when saving
      * - infinite_lifetime (is infinite lifetime can work with this backend)
      * - get_list (is it possible to get the list of cache ids and the complete list of tags)
-     * 
+     *
      * @return array associative of with capabilities
      */
     public function getCapabilities()

library/Zend/Cache/Backend/ExtendedInterface.php

@@ -36,21 +36,21 @@ interface Zend_Cache_Backend_ExtendedInterface extends Zend_Cache_Backend_Interf
 
     /**
      * Return an array of stored cache ids
-     * 
+     *
      * @return array array of stored cache ids (string)
      */
     public function getIds();
-    
+
     /**
      * Return an array of stored tags
      *
      * @return array array of stored tags (string)
      */
     public function getTags();
-    
+
     /**
      * Return an array of stored cache ids which match given tags
-     * 
+     *
      * In case of multiple tags, a logical AND is made between tags
      *
      * @param array $tags array of tags
@@ -60,24 +60,24 @@ interface Zend_Cache_Backend_ExtendedInterface extends Zend_Cache_Backend_Interf
 
     /**
      * Return an array of stored cache ids which don't match given tags
-     * 
+     *
      * In case of multiple tags, a logical OR is made between tags
      *
      * @param array $tags array of tags
      * @return array array of not matching cache ids (string)
-     */    
+     */
     public function getIdsNotMatchingTags($tags = array());
 
     /**
      * Return an array of stored cache ids which match any given tags
-     * 
+     *
      * In case of multiple tags, a logical AND is made between tags
      *
      * @param array $tags array of tags
      * @return array array of any matching cache ids (string)
      */
     public function getIdsMatchingAnyTags($tags = array());
-    
+
     /**
      * Return the filling percentage of the backend storage
      *
@@ -92,12 +92,12 @@ interface Zend_Cache_Backend_ExtendedInterface extends Zend_Cache_Backend_Interf
      * - expire : the expire timestamp
      * - tags : a string array of tags
      * - mtime : timestamp of last modification time
-     * 
+     *
      * @param string $id cache id
      * @return array array of metadatas (false if the cache id is not found)
      */
     public function getMetadatas($id);
-    
+
     /**
      * Give (if possible) an extra lifetime to the given cache id
      *
@@ -106,10 +106,10 @@ interface Zend_Cache_Backend_ExtendedInterface extends Zend_Cache_Backend_Interf
      * @return boolean true if ok
      */
     public function touch($id, $extraLifetime);
-    
+
     /**
      * Return an associative array of capabilities (booleans) of the backend
-     * 
+     *
      * The array must include these keys :
      * - automatic_cleaning (is automating cleaning necessary)
      * - tags (are tags supported)
@@ -118,9 +118,9 @@ interface Zend_Cache_Backend_ExtendedInterface extends Zend_Cache_Backend_Interf
      * - priority does the backend deal with priority when saving
      * - infinite_lifetime (is infinite lifetime can work with this backend)
      * - get_list (is it possible to get the list of cache ids and the complete list of tags)
-     * 
+     *
      * @return array associative of with capabilities
      */
     public function getCapabilities();
-    
+
 }

library/Zend/Cache/Backend/Memcached.php

@@ -155,16 +155,16 @@ class Zend_Cache_Backend_Memcached extends Zend_Cache_Backend implements Zend_Ca
                 $server['failure_callback'] = self::DEFAULT_FAILURE_CALLBACK;
             }
             if ($this->_options['compatibility']) {
-				// No status for compatibility mode (#ZF-5887)
-            	$this->_memcache->addServer($server['host'], $server['port'], $server['persistent'],
+                // No status for compatibility mode (#ZF-5887)
+                $this->_memcache->addServer($server['host'], $server['port'], $server['persistent'],
                                         $server['weight'], $server['timeout'],
                                         $server['retry_interval']);
-			} else {
-				$this->_memcache->addServer($server['host'], $server['port'], $server['persistent'],
+            } else {
+                $this->_memcache->addServer($server['host'], $server['port'], $server['persistent'],
                                         $server['weight'], $server['timeout'],
                                         $server['retry_interval'],
                                         $server['status'], $server['failure_callback']);
-			}
+            }
         }
     }
 
@@ -383,22 +383,22 @@ class Zend_Cache_Backend_Memcached extends Zend_Cache_Backend implements Zend_Ca
         $memSize = 0;
         $memUsed = 0;
         foreach ($mems as $key => $mem) {
-        	if ($mem === false) {
+            if ($mem === false) {
                 Zend_Cache::throwException('can\'t get stat from ' . $key);
-        	} else {
-        		$eachSize = $mem['limit_maxbytes'];
-        		if ($eachSize == 0) {
+            } else {
+                $eachSize = $mem['limit_maxbytes'];
+                if ($eachSize == 0) {
                     Zend_Cache::throwException('can\'t get memory size from ' . $key);
-        		}
+                }
 
-        		$eachUsed = $mem['bytes'];
-		        if ($eachUsed > $eachSize) {
-		            $eachUsed = $eachSize;
-		        }
+                $eachUsed = $mem['bytes'];
+                if ($eachUsed > $eachSize) {
+                    $eachUsed = $eachSize;
+                }
 
-        		$memSize += $eachSize;
-        		$memUsed += $eachUsed;
-        	}
+                $memSize += $eachSize;
+                $memUsed += $eachUsed;
+            }
         }
 
         return ((int) (100. * ($memUsed / $memSize)));
@@ -466,7 +466,7 @@ class Zend_Cache_Backend_Memcached extends Zend_Cache_Backend implements Zend_Ca
             }
             // #ZF-5702 : we try replace() first becase set() seems to be slower
             if (!($result = $this->_memcache->replace($id, array($data, time(), $newLifetime), $flag, $newLifetime))) {
-            	$result = $this->_memcache->set($id, array($data, time(), $newLifetime), $flag, $newLifetime);
+                $result = $this->_memcache->set($id, array($data, time(), $newLifetime), $flag, $newLifetime);
             }
             return $result;
         }

library/Zend/Cache/Backend/Xcache.php

@@ -46,7 +46,7 @@ class Zend_Cache_Backend_Xcache extends Zend_Cache_Backend implements Zend_Cache
      */
     const TAGS_UNSUPPORTED_BY_CLEAN_OF_XCACHE_BACKEND = 'Zend_Cache_Backend_Xcache::clean() : tags are unsupported by the Xcache backend';
     const TAGS_UNSUPPORTED_BY_SAVE_OF_XCACHE_BACKEND =  'Zend_Cache_Backend_Xcache::save() : tags are unsupported by the Xcache backend';
-    
+
     /**
      * Available options
      *

library/Zend/Cache/Core.php

@@ -483,11 +483,11 @@ class Zend_Cache_Core
         // we need to remove cache_id_prefix from ids (see #ZF-6178)
         $res = array();
         while (list(,$id) = each($array)) {
-        	if (strpos($id, $this->_options['cache_id_prefix']) === 0) {
-        		$res[] = preg_replace("~^{$this->_options['cache_id_prefix']}~", '', $id);
-        	} else {
-        		$res[] = $id;
-        	}
+            if (strpos($id, $this->_options['cache_id_prefix']) === 0) {
+                $res[] = preg_replace("~^{$this->_options['cache_id_prefix']}~", '', $id);
+            } else {
+                $res[] = $id;
+            }
         }
         return $res;
     }
@@ -520,7 +520,7 @@ class Zend_Cache_Core
         }
         return $this->_backend->getFillingPercentage();
     }
-    
+
     /**
      * Return an array of metadatas for the given cache id
      *
@@ -534,7 +534,7 @@ class Zend_Cache_Core
      */
     public function getMetadatas($id)
     {
-    	if (!$this->_extendedBackend) {
+        if (!$this->_extendedBackend) {
             Zend_Cache::throwException('Current backend doesn\'t implement the Zend_Cache_Backend_ExtendedInterface, so this method is not available');
         }
         $id = $this->_id($id); // cache id may need prefix

library/Zend/Cache/Frontend/File.php

@@ -35,46 +35,46 @@ require_once 'Zend/Cache/Core.php';
  */
 class Zend_Cache_Frontend_File extends Zend_Cache_Core
 {
-	
-	/**
-	 * Consts for master_files_mode
-	 */
-	const MODE_AND = 'AND';
-	const MODE_OR  = 'OR';
-	
+
+    /**
+     * Consts for master_files_mode
+     */
+    const MODE_AND = 'AND';
+    const MODE_OR  = 'OR';
+
     /**
      * Available options
      *
      * ====> (string) master_file :
      * - a complete path of the master file
      * - deprecated (see master_files)
-     * 
+     *
      * ====> (array) master_files :
      * - an array of complete path of master files
      * - this option has to be set !
-     * 
+     *
      * ====> (string) master_files_mode :
      * - Zend_Cache_Frontend_File::MODE_AND or Zend_Cache_Frontend_File::MODE_OR
      * - if MODE_AND, then all master files have to be touched to get a cache invalidation
      * - if MODE_OR (default), then a single touched master file is enough to get a cache invalidation
      *
      * ====> (boolean) ignore_missing_master_files
-     * - if set to true, missing master files are ignored silently 
+     * - if set to true, missing master files are ignored silently
      * - if set to false (default), an exception is thrown if there is a missing master file
      * @var array available options
      */
     protected $_specificOptions = array(
-    	'master_file' => null,
+        'master_file' => null,
         'master_files' => null,
-    	'master_files_mode' => 'OR',
-    	'ignore_missing_master_files' => false
+        'master_files_mode' => 'OR',
+        'ignore_missing_master_files' => false
     );
 
     /**
      * Master file mtimes
      *
      * Array of int
-     * 
+     *
      * @var array
      */
     private $_masterFile_mtimes = null;
@@ -95,10 +95,10 @@ class Zend_Cache_Frontend_File extends Zend_Cache_Core
             Zend_Cache::throwException('master_files option must be set');
         }
     }
-    
+
     /**
      * Change the master_file option
-     * 
+     *
      * @param string $masterFile the complete path and name of the master file
      */
     public function setMasterFiles($masterFiles)
@@ -109,27 +109,27 @@ class Zend_Cache_Frontend_File extends Zend_Cache_Core
         $this->_masterFile_mtimes = array();
         $i = 0;
         foreach ($masterFiles as $masterFile) {
-        	$this->_masterFile_mtimes[$i] = @filemtime($masterFile);
-        	if ((!($this->_specificOptions['ignore_missing_master_files'])) && (!($this->_masterFile_mtimes[$i]))) {
-        		Zend_Cache::throwException('Unable to read master_file : '.$masterFile);     
-        	}
-        	$i++;
+            $this->_masterFile_mtimes[$i] = @filemtime($masterFile);
+            if ((!($this->_specificOptions['ignore_missing_master_files'])) && (!($this->_masterFile_mtimes[$i]))) {
+                Zend_Cache::throwException('Unable to read master_file : '.$masterFile);
+            }
+            $i++;
         }
     }
-    
+
     /**
      * Change the master_file option
-     * 
-     * To keep the compatibility 
-     * 
+     *
+     * To keep the compatibility
+     *
      * @deprecated
      * @param string $masterFile the complete path and name of the master file
-     */    
+     */
     public function setMasterFile($masterFile)
     {
-  		$this->setMasterFiles(array(0 => $masterFile));
+          $this->setMasterFiles(array(0 => $masterFile));
     }
-    
+
     /**
      * Public frontend to set an option
      *
@@ -145,7 +145,7 @@ class Zend_Cache_Frontend_File extends Zend_Cache_Core
         if ($name == 'master_file') {
             $this->setMasterFile($value);
         } else if ($name == 'master_files') {
-        	$this->setMasterFiles($value);
+            $this->setMasterFiles($value);
         } else {
             parent::setOption($name, $value);
         }
@@ -180,27 +180,27 @@ class Zend_Cache_Frontend_File extends Zend_Cache_Core
     {
         $lastModified = parent::test($id);
         if ($lastModified) {
-        	if ($this->_specificOptions['master_files_mode'] == self::MODE_AND) {
-        		// MODE_AND
-        		foreach($this->_masterFile_mtimes as $masterFileMTime) {
-        			if ($masterFileMTime) {
-        				if ($lastModified > $masterFileMTime) {
-        					return $lastModified;
-        				}
-        			}
-        		}
-        	} else {
-        		// MODE_OR
-        		$res = true;
-        		foreach($this->_masterFile_mtimes as $masterFileMTime) {
-        			if ($masterFileMTime) {
-        				if ($lastModified <= $masterFileMTime) {
-        					return false;
-        				}
-        			}
-        		}
-        		return $lastModified;
-        	}
+            if ($this->_specificOptions['master_files_mode'] == self::MODE_AND) {
+                // MODE_AND
+                foreach($this->_masterFile_mtimes as $masterFileMTime) {
+                    if ($masterFileMTime) {
+                        if ($lastModified > $masterFileMTime) {
+                            return $lastModified;
+                        }
+                    }
+                }
+            } else {
+                // MODE_OR
+                $res = true;
+                foreach($this->_masterFile_mtimes as $masterFileMTime) {
+                    if ($masterFileMTime) {
+                        if ($lastModified <= $masterFileMTime) {
+                            return false;
+                        }
+                    }
+                }
+                return $lastModified;
+            }
         }
         return false;
     }

library/Zend/Cache/Frontend/Function.php

@@ -76,7 +76,7 @@ class Zend_Cache_Frontend_Function extends Zend_Cache_Core
      * @param  array  $parameters       Function parameters
      * @param  array  $tags             Cache tags
      * @param  int    $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
-     * @param  int   $priority         integer between 0 (very low priority) and 10 (maximum priority) used by some particular backends             
+     * @param  int   $priority         integer between 0 (very low priority) and 10 (maximum priority) used by some particular backends
      * @return mixed Result
      */
     public function call($name, $parameters = array(), $tags = array(), $specificLifetime = false, $priority = 8)

library/Zend/Cache/Frontend/Page.php

@@ -275,7 +275,7 @@ class Zend_Cache_Frontend_Page extends Zend_Cache_Core
                     header("$name: $value");
                 }
             }
-        	if ($this->_specificOptions['debug_header']) {
+            if ($this->_specificOptions['debug_header']) {
                 echo 'DEBUG HEADER : This is a cached page !';
             }
             echo $data;
@@ -339,9 +339,9 @@ class Zend_Cache_Frontend_Page extends Zend_Cache_Core
     {
         $tmp = $_SERVER['REQUEST_URI'];
         $array = explode('?', $tmp, 2);
-      	$tmp = $array[0];
+          $tmp = $array[0];
         foreach (array('Get', 'Post', 'Session', 'Files', 'Cookie') as $arrayName) {
-        	$tmp2 = $this->_makePartialId($arrayName, $this->_activeOptions['cache_with_' . strtolower($arrayName) . '_variables'], $this->_activeOptions['make_id_with_' . strtolower($arrayName) . '_variables']);
+            $tmp2 = $this->_makePartialId($arrayName, $this->_activeOptions['cache_with_' . strtolower($arrayName) . '_variables'], $this->_activeOptions['make_id_with_' . strtolower($arrayName) . '_variables']);
             if ($tmp2===false) {
                 return false;
             }
@@ -360,7 +360,7 @@ class Zend_Cache_Frontend_Page extends Zend_Cache_Core
      */
     protected function _makePartialId($arrayName, $bool1, $bool2)
     {
-    	switch ($arrayName) {
+        switch ($arrayName) {
         case 'Get':
             $var = $_GET;
             break;

library/Zend/CodeGenerator/Abstract.php

@@ -33,12 +33,12 @@ abstract class Zend_CodeGenerator_Abstract
      * @var string
      */
     protected $_sourceContent = null;
-    
+
     /**
      * @var bool
      */
     protected $_isSourceDirty = true;
-    
+
     /**
      * __construct()
      *
@@ -59,7 +59,7 @@ abstract class Zend_CodeGenerator_Abstract
         }
         $this->_prepare();
     }
-    
+
     /**
      * setConfig()
      *
@@ -71,7 +71,7 @@ abstract class Zend_CodeGenerator_Abstract
         $this->setOptions($config->toArray());
         return $this;
     }
-    
+
     /**
      * setOptions()
      *
@@ -88,7 +88,7 @@ abstract class Zend_CodeGenerator_Abstract
         }
         return $this;
     }
-    
+
     /**
      * setSourceContent()
      *
@@ -99,7 +99,7 @@ abstract class Zend_CodeGenerator_Abstract
         $this->_sourceContent = $sourceContent;
         return;
     }
-    
+
     /**
      * getSourceContent()
      *
@@ -109,31 +109,31 @@ abstract class Zend_CodeGenerator_Abstract
     {
         return $this->_sourceContent;
     }
-    
+
     /**
      * _init() - this is called before the constuctor
      *
      */
     protected function _init()
     {
-        
+
     }
-    
+
     /**
      * _prepare() - this is called at construction completion
      *
      */
     protected function _prepare()
     {
-        
+
     }
-    
+
     /**
      * generate() - must be implemented by the child
      *
      */
     abstract public function generate();
-    
+
     /**
      * __toString() - casting to a string will in turn call generate()
      *

library/Zend/CodeGenerator/Php/Abstract.php

@@ -39,17 +39,17 @@ abstract class Zend_CodeGenerator_Php_Abstract extends Zend_CodeGenerator_Abstra
      *
      */
     const LINE_FEED = "\n";
-    
+
     /**
      * @var bool
      */
     protected $_isSourceDirty = true;
-    
+
     /**
      * @var int|string
      */
     protected $_indentation = '    ';
-    
+
     /**
      * setSourceDirty()
      *
@@ -61,7 +61,7 @@ abstract class Zend_CodeGenerator_Php_Abstract extends Zend_CodeGenerator_Abstra
         $this->_isSourceDirty = ($isSourceDirty) ? true : false;
         return $this;
     }
-    
+
     /**
      * isSourceDirty()
      *
@@ -71,7 +71,7 @@ abstract class Zend_CodeGenerator_Php_Abstract extends Zend_CodeGenerator_Abstra
     {
         return $this->_isSourceDirty;
     }
-    
+
     /**
      * setIndentation()
      *
@@ -83,7 +83,7 @@ abstract class Zend_CodeGenerator_Php_Abstract extends Zend_CodeGenerator_Abstra
         $this->_indentation = $indentation;
         return $this;
     }
-    
+
     /**
      * getIndentation()
      *
@@ -93,5 +93,5 @@ abstract class Zend_CodeGenerator_Php_Abstract extends Zend_CodeGenerator_Abstra
     {
         return $this->_indentation;
     }
-    
+
 }

library/Zend/CodeGenerator/Php/Body.php

@@ -33,12 +33,12 @@ require_once 'Zend/CodeGenerator/Abstract.php';
  */
 class Zend_CodeGenerator_Php_Body extends Zend_CodeGenerator_Abstract
 {
-    
+
     /**
      * @var string
      */
     protected $_content = null;
-    
+
     /**
      * setContent()
      *
@@ -50,7 +50,7 @@ class Zend_CodeGenerator_Php_Body extends Zend_CodeGenerator_Abstract
         $this->_content = $content;
         return $this;
     }
-    
+
     /**
      * getContent()
      *
@@ -60,7 +60,7 @@ class Zend_CodeGenerator_Php_Body extends Zend_CodeGenerator_Abstract
     {
         return (string) $this->_content;
     }
-    
+
     /**
      * generate()
      *

library/Zend/CodeGenerator/Php/Class.php

@@ -53,37 +53,37 @@ require_once 'Zend/CodeGenerator/Php/Docblock.php';
  */
 class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
 {
-    
+
     /**
      * @var Zend_CodeGenerator_Php_Docblock
      */
     protected $_docblock = null;
-    
+
     /**
      * @var string
      */
     protected $_name = null;
-    
+
     /**
      * @var bool
      */
     protected $_isAbstract = false;
-    
+
     /**
      * @var string
      */
     protected $_extendedClass = null;
-    
+
     /**
      * @var array Array of string names
      */
     protected $_implementedInterfaces = array();
-    
+
     /**
      * @var array Array of properties
      */
     protected $_properties = null;
-    
+
     /**
      * @var array Array of methods
      */
@@ -98,26 +98,26 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
     public static function fromReflection(Zend_Reflection_Class $reflectionClass)
     {
         $class = new self();
-        
+
         $class->setSourceContent($class->getSourceContent());
         $class->setSourceDirty(false);
-        
+
         if ($reflectionClass->getDocComment() != '') {
             $class->setDocblock(Zend_CodeGenerator_Php_Docblock::fromReflection($reflectionClass->getDocblock()));
         }
-        
+
         $class->setAbstract($reflectionClass->isAbstract());
         $class->setName($reflectionClass->getName());
-        
+
         if ($parentClass = $reflectionClass->getParentClass()) {
             $class->setExtendedClass($parentClass->getName());
             $interfaces = array_diff($parentClass->getInterfaces(), $reflectionClass->getInterfaces());
         } else {
             $interfaces = $reflectionClass->getInterfaces();
         }
-        
+
         $class->setImplementedInterfaces($interfaces);
-        
+
         $properties = array();
         foreach ($reflectionClass->getProperties() as $reflectionProperty) {
             if ($reflectionProperty->getDeclaringClass()->getName() == $class->getName()) {
@@ -125,7 +125,7 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
             }
         }
         $class->setProperties($properties);
-        
+
         $methods = array();
         foreach ($reflectionClass->getMethods() as $reflectionMethod) {
             if ($reflectionMethod->getDeclaringClass()->getName() == $class->getName()) {
@@ -133,33 +133,33 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
             }
         }
         $class->setMethods($methods);
-        
+
         return $class;
     }
-    
+
     /**
      * setDocblock() Set the docblock
      *
      * @param Zend_CodeGenerator_Php_Docblock|array|string $docblock
      * @return Zend_CodeGenerator_Php_File
      */
-    public function setDocblock($docblock) 
+    public function setDocblock($docblock)
     {
         if (is_string($docblock)) {
             $docblock = array('shortDescription' => $docblock);
         }
-        
+
         if (is_array($docblock)) {
             $docblock = new Zend_CodeGenerator_Php_Docblock($docblock);
         } elseif (!$docblock instanceof Zend_CodeGenerator_Php_Docblock) {
             require_once 'Zend/CodeGenerator/Php/Exception.php';
             throw new Zend_CodeGenerator_Php_Exception('setDocblock() is expecting either a string, array or an instance of Zend_CodeGenerator_Php_Docblock');
         }
-        
+
         $this->_docblock = $docblock;
         return $this;
     }
-    
+
     /**
      * getDocblock()
      *
@@ -169,7 +169,7 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
     {
         return $this->_docblock;
     }
-    
+
     /**
      * setName()
      *
@@ -181,7 +181,7 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
         $this->_name = $name;
         return $this;
     }
-    
+
     /**
      * getName()
      *
@@ -203,7 +203,7 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
         $this->_isAbstract = ($isAbstract) ? true : false;
         return $this;
     }
-    
+
     /**
      * isAbstract()
      *
@@ -213,7 +213,7 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
     {
         return $this->_isAbstract;
     }
-    
+
     /**
      * setExtendedClass()
      *
@@ -225,7 +225,7 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
         $this->_extendedClass = $extendedClass;
         return $this;
     }
-    
+
     /**
      * getExtendedClass()
      *
@@ -235,7 +235,7 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
     {
         return $this->_extendedClass;
     }
-    
+
     /**
      * setImplementedInterfaces()
      *
@@ -247,7 +247,7 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
         $this->_implementedInterfaces = $implementedInterfaces;
         return $this;
     }
-    
+
     /**
      * getImplementedInterfaces
      *
@@ -257,7 +257,7 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
     {
         return $this->_implementedInterfaces;
     }
-    
+
     /**
      * setProperties()
      *
@@ -269,10 +269,10 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
         foreach ($properties as $property) {
             $this->setProperty($property);
         }
-        
+
         return $this;
     }
-    
+
     /**
      * setProperty()
      *
@@ -290,16 +290,16 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
             require_once 'Zend/CodeGenerator/Php/Exception.php';
             throw new Zend_CodeGenerator_Php_Exception('setProperty() expects either an array of property options or an instance of Zend_CodeGenerator_Php_Property');
         }
-        
+
         if (isset($this->_properties[$propertyName])) {
             require_once 'Zend/CodeGenerator/Php/Exception.php';
             throw new Zend_CodeGenerator_Php_Exception('A property by name ' . $propertyName . ' already exists in this class.');
         }
-        
+
         $this->_properties->append($property);
         return $this;
     }
-    
+
     /**
      * getProperties()
      *
@@ -309,7 +309,7 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
     {
         return $this->_properties;
     }
-    
+
     /**
      * getProperty()
      *
@@ -325,7 +325,7 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
         }
         return false;
     }
-    
+
     /**
      * hasProperty()
      *
@@ -336,7 +336,7 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
     {
         return isset($this->_properties[$propertyName]);
     }
-    
+
     /**
      * setMethods()
      *
@@ -350,7 +350,7 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
         }
         return $this;
     }
-    
+
     /**
      * setMethod()
      *
@@ -368,16 +368,16 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
             require_once 'Zend/CodeGenerator/Php/Exception.php';
             throw new Zend_CodeGenerator_Php_Exception('setMethod() expects either an array of method options or an instance of Zend_CodeGenerator_Php_Method');
         }
-        
+
         if (isset($this->_methods[$methodName])) {
             require_once 'Zend/CodeGenerator/Php/Exception.php';
             throw new Zend_CodeGenerator_Php_Exception('A method by name ' . $methodName . ' already exists in this class.');
         }
-        
+
         $this->_methods->append($method);
         return $this;
     }
-    
+
     /**
      * getMethods()
      *
@@ -387,7 +387,7 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
     {
         return $this->_methods;
     }
-    
+
     /**
      * getMethod()
      *
@@ -403,7 +403,7 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
         }
         return false;
     }
-    
+
     /**
      * hasMethod()
      *
@@ -414,7 +414,7 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
     {
         return isset($this->_methods[$methodName]);
     }
-    
+
     /**
      * isSourceDirty()
      *
@@ -425,22 +425,22 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
         if (($docblock = $this->getDocblock()) && $docblock->isSourceDirty()) {
             return true;
         }
-        
+
         foreach ($this->_properties as $property) {
             if ($property->isSourceDirty()) {
                 return true;
             }
         }
-        
+
         foreach ($this->_methods as $method) {
             if ($method->isSourceDirty()) {
                 return true;
             }
         }
-        
+
         return parent::isSourceDirty();
     }
-    
+
     /**
      * generate()
      *
@@ -451,50 +451,50 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
         if (!$this->isSourceDirty()) {
             return $this->getSourceContent();
         }
-        
-        $output = ''; 
-        
+
+        $output = '';
+
         if (null !== ($docblock = $this->getDocblock())) {
             $docblock->setIndentation('');
             $output .= $docblock->generate();
         }
-        
+
         if ($this->isAbstract()) {
             $output .= 'abstract ';
         }
-        
+
         $output .= 'class ' . $this->getName();
-        
+
         if (null !== ($ec = $this->_extendedClass)) {
             $output .= ' extends ' . $ec;
         }
-        
+
         $implemented = $this->getImplementedInterfaces();
         if (!empty($implemented)) {
             $output .= ' implements ' . implode(', ', $implemented);
         }
-        
+
         $output .= self::LINE_FEED . '{' . self::LINE_FEED . self::LINE_FEED;
-        
+
         $properties = $this->getProperties();
         if (!empty($properties)) {
             foreach ($properties as $property) {
                 $output .= $property->generate() . self::LINE_FEED . self::LINE_FEED;
             }
         }
-        
+
         $methods = $this->getMethods();
         if (!empty($methods)) {
             foreach ($methods as $method) {
                 $output .= $method->generate() . self::LINE_FEED;
             }
         }
-        
+
         $output .= self::LINE_FEED . '}' . self::LINE_FEED;
-        
+
         return $output;
     }
-    
+
     /**
      * _init() - is called at construction time
      *

library/Zend/CodeGenerator/Php/Docblock.php

@@ -42,12 +42,12 @@ class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract
      * @var string
      */
     protected $_shortDescription = null;
-    
+
     /**
      * @var string
      */
     protected $_longDescription = null;
-    
+
     /**
      * @var array
      */
@@ -57,7 +57,7 @@ class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract
      * @var string
      */
     protected $_indentation = '';
-    
+
     /**
      * fromReflection() - Build a docblock generator object from a reflection object
      *
@@ -67,20 +67,20 @@ class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract
     public static function fromReflection(Zend_Reflection_Docblock $reflectionDocblock)
     {
         $docblock = new self();
-        
+
         $docblock->setSourceContent($reflectionDocblock->getContents());
         $docblock->setSourceDirty(false);
-        
+
         $docblock->setShortDescription($reflectionDocblock->getShortDescription());
         $docblock->setLongDescription($reflectionDocblock->getLongDescription());
-        
+
         foreach ($reflectionDocblock->getTags() as $tag) {
             $docblock->setTag(Zend_CodeGenerator_Php_Docblock_Tag::fromReflection($tag));
         }
-        
+
         return $docblock;
     }
-    
+
     /**
      * setShortDescription()
      *
@@ -92,7 +92,7 @@ class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract
         $this->_shortDescription = $shortDescription;
         return $this;
     }
-    
+
     /**
      * getShortDescription()
      *
@@ -102,7 +102,7 @@ class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract
     {
         return $this->_shortDescription;
     }
-    
+
     /**
      * setLongDescription()
      *
@@ -114,7 +114,7 @@ class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract
         $this->_longDescription = $longDescription;
         return $this;
     }
-    
+
     /**
      * getLongDescription()
      *
@@ -124,7 +124,7 @@ class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract
     {
         return $this->_longDescription;
     }
-    
+
     /**
      * setTags()
      *
@@ -136,10 +136,10 @@ class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract
         foreach ($tags as $tag) {
             $this->setTag($tag);
         }
-        
+
         return $this;
     }
-    
+
     /**
      * setTag()
      *
@@ -157,11 +157,11 @@ class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract
                 . 'instance of Zend_CodeGenerator_Php_Docblock_Tag'
                 );
         }
-        
+
         $this->_tags[] = $tag;
         return $this;
     }
-    
+
     /**
      * getTags
      *
@@ -171,7 +171,7 @@ class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract
     {
         return $this->_tags;
     }
-    
+
     /**
      * generate()
      *
@@ -182,7 +182,7 @@ class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract
         if (!$this->isSourceDirty()) {
             return $this->_docCommentize($this->getSourceContent());
         }
-        
+
         $output  = '';
         if (null !== ($sd = $this->getShortDescription())) {
             $output .= $sd . self::LINE_FEED . self::LINE_FEED;
@@ -194,10 +194,10 @@ class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract
         foreach ($this->getTags() as $tag) {
             $output .= $tag->generate() . self::LINE_FEED;
         }
-        
+
         return $this->_docCommentize(trim($output));
     }
-    
+
     /**
      * _docCommentize()
      *
@@ -216,5 +216,5 @@ class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract
         $output .= $indent . ' */' . self::LINE_FEED;
         return $output;
     }
-    
+
 }

library/Zend/CodeGenerator/Php/Docblock/Tag.php

@@ -53,7 +53,7 @@ class Zend_CodeGenerator_Php_Docblock_Tag extends Zend_CodeGenerator_Php_Abstrac
      * @var string
      */
     protected $_name = null;
-    
+
     /**
      * @var string
      */
@@ -68,9 +68,9 @@ class Zend_CodeGenerator_Php_Docblock_Tag extends Zend_CodeGenerator_Php_Abstrac
     public static function fromReflection(Zend_Reflection_Docblock_Tag $reflectionTag)
     {
         $tagName = $reflectionTag->getName();
-        
+
         $codeGenDocblockTag = self::factory($tagName);
-        
+
         // transport any properties via accessors and mutators from reflection to codegen object
         $reflectionClass = new ReflectionClass($reflectionTag);
         foreach ($reflectionClass->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
@@ -81,10 +81,10 @@ class Zend_CodeGenerator_Php_Docblock_Tag extends Zend_CodeGenerator_Php_Abstrac
                 }
             }
         }
-        
+
         return $codeGenDocblockTag;
     }
-    
+
     /**
      * setPluginLoader()
      *
@@ -95,7 +95,7 @@ class Zend_CodeGenerator_Php_Docblock_Tag extends Zend_CodeGenerator_Php_Abstrac
         self::$_pluginLoader = $pluginLoader;
         return;
     }
-    
+
     /**
      * getPluginLoader()
      *
@@ -109,24 +109,24 @@ class Zend_CodeGenerator_Php_Docblock_Tag extends Zend_CodeGenerator_Php_Abstrac
                 'Zend_CodeGenerator_Php_Docblock_Tag' => dirname(__FILE__) . '/Tag/'))
                 );
         }
-        
+
         return self::$_pluginLoader;
     }
-    
+
     public static function factory($tagName)
     {
         $pluginLoader = self::getPluginLoader();
-        
+
         try {
             $tagClass = $pluginLoader->load($tagName);
         } catch (Zend_Loader_Exception $exception) {
             $tagClass = 'Zend_CodeGenerator_Php_Docblock_Tag';
         }
-        
+
         $tag = new $tagClass(array('name' => $tagName));
         return $tag;
     }
-    
+
     /**
      * setName()
      *
@@ -138,7 +138,7 @@ class Zend_CodeGenerator_Php_Docblock_Tag extends Zend_CodeGenerator_Php_Abstrac
         $this->_name = ltrim($name, '@');
         return $this;
     }
-    
+
     /**
      * getName()
      *
@@ -148,7 +148,7 @@ class Zend_CodeGenerator_Php_Docblock_Tag extends Zend_CodeGenerator_Php_Abstrac
     {
         return $this->_name;
     }
-    
+
     /**
      * setDescription()
      *
@@ -160,7 +160,7 @@ class Zend_CodeGenerator_Php_Docblock_Tag extends Zend_CodeGenerator_Php_Abstrac
         $this->_description = $description;
         return $this;
     }
-    
+
     /**
      * getDescription()
      *
@@ -180,5 +180,5 @@ class Zend_CodeGenerator_Php_Docblock_Tag extends Zend_CodeGenerator_Php_Abstrac
     {
         return '@' . $this->_name . ' ' . $this->_description;
     }
-    
+
 }

library/Zend/CodeGenerator/Php/Docblock/Tag/License.php

@@ -31,19 +31,19 @@ require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php';
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_CodeGenerator_Php_Docblock_Tag_License extends Zend_CodeGenerator_Php_Docblock_Tag 
+class Zend_CodeGenerator_Php_Docblock_Tag_License extends Zend_CodeGenerator_Php_Docblock_Tag
 {
-    
+
     /**
      * @var string
      */
     protected $_url = null;
-    
+
     /**
      * @var string
      */
     protected $_description = null;
-    
+
     /**
      * fromReflection()
      *
@@ -53,14 +53,14 @@ class Zend_CodeGenerator_Php_Docblock_Tag_License extends Zend_CodeGenerator_Php
     public static function fromReflection(Zend_Reflection_Docblock_Tag $reflectionTagLicense)
     {
         $returnTag = new self();
-        
+
         $returnTag->setName('license');
         $returnTag->setUrl($reflectionTagLicense->getUrl());
         $returnTag->setDescription($reflectionTagLicense->getDescription());
-        
+
         return $returnTag;
     }
-    
+
     /**
      * setUrl()
      *
@@ -72,7 +72,7 @@ class Zend_CodeGenerator_Php_Docblock_Tag_License extends Zend_CodeGenerator_Php
         $this->_url = $url;
         return $this;
     }
-    
+
     /**
      * getUrl()
      *
@@ -94,5 +94,5 @@ class Zend_CodeGenerator_Php_Docblock_Tag_License extends Zend_CodeGenerator_Php
         $output = '@license ' . $this->_url . ' ' . $this->_description . self::LINE_FEED;
         return $output;
     }
-    
+
 }

library/Zend/CodeGenerator/Php/Docblock/Tag/Param.php

@@ -33,22 +33,22 @@ require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php';
  */
 class Zend_CodeGenerator_Php_Docblock_Tag_Param extends Zend_CodeGenerator_Php_Docblock_Tag
 {
-    
+
     /**
      * @var string
      */
     protected $_datatype = null;
-    
+
     /**
      * @var string
      */
     protected $_paramName = null;
-    
+
     /**
      * @var string
      */
     protected $_description = null;
-    
+
     /**
      * fromReflection()
      *
@@ -63,7 +63,7 @@ class Zend_CodeGenerator_Php_Docblock_Tag_Param extends Zend_CodeGenerator_Php_D
         $paramTag->setDatatype($reflectionTagParam->getType()); // @todo rename
         $paramTag->setParamName($reflectionTagParam->getVariableName());
         $paramTag->setDescription($reflectionTagParam->getDescription());
-        
+
         return $paramTag;
     }
 
@@ -78,7 +78,7 @@ class Zend_CodeGenerator_Php_Docblock_Tag_Param extends Zend_CodeGenerator_Php_D
         $this->_datatype = $datatype;
         return $this;
     }
-    
+
     /**
      * getDatatype
      *
@@ -88,7 +88,7 @@ class Zend_CodeGenerator_Php_Docblock_Tag_Param extends Zend_CodeGenerator_Php_D
     {
         return $this->_datatype;
     }
-    
+
     /**
      * setParamName()
      *
@@ -100,7 +100,7 @@ class Zend_CodeGenerator_Php_Docblock_Tag_Param extends Zend_CodeGenerator_Php_D
         $this->_paramName = $paramName;
         return $this;
     }
-    
+
     /**
      * getParamName()
      *
@@ -110,7 +110,7 @@ class Zend_CodeGenerator_Php_Docblock_Tag_Param extends Zend_CodeGenerator_Php_D
     {
         return $this->_paramName;
     }
-    
+
     /**
      * generate()
      *
@@ -118,11 +118,11 @@ class Zend_CodeGenerator_Php_Docblock_Tag_Param extends Zend_CodeGenerator_Php_D
      */
     public function generate()
     {
-        $output = '@param ' 
+        $output = '@param '
             . (($this->_datatype  != null) ? $this->_datatype : 'unknown')
-            . (($this->_paramName != null) ? ' $' . $this->_paramName : '') 
+            . (($this->_paramName != null) ? ' $' . $this->_paramName : '')
             . (($this->_description != null) ? ' ' . $this->_description : '');
         return $output;
     }
-    
+
 }

library/Zend/CodeGenerator/Php/Docblock/Tag/Return.php

@@ -31,19 +31,19 @@ require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php';
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_CodeGenerator_Php_Docblock_Tag_Return extends Zend_CodeGenerator_Php_Docblock_Tag 
+class Zend_CodeGenerator_Php_Docblock_Tag_Return extends Zend_CodeGenerator_Php_Docblock_Tag
 {
-    
+
     /**
      * @var string
      */
     protected $_datatype = null;
-    
+
     /**
      * @var string
      */
     protected $_description = null;
-    
+
     /**
      * fromReflection()
      *
@@ -53,14 +53,14 @@ class Zend_CodeGenerator_Php_Docblock_Tag_Return extends Zend_CodeGenerator_Php_
     public static function fromReflection(Zend_Reflection_Docblock_Tag $reflectionTagReturn)
     {
         $returnTag = new self();
-        
+
         $returnTag->setName('return');
         $returnTag->setDatatype($reflectionTagReturn->getType()); // @todo rename
         $returnTag->setDescription($reflectionTagReturn->getDescription());
-        
+
         return $returnTag;
     }
-    
+
     /**
      * setDatatype()
      *
@@ -72,7 +72,7 @@ class Zend_CodeGenerator_Php_Docblock_Tag_Return extends Zend_CodeGenerator_Php_
         $this->_datatype = $datatype;
         return $this;
     }
-    
+
     /**
      * getDatatype()
      *
@@ -94,5 +94,5 @@ class Zend_CodeGenerator_Php_Docblock_Tag_Return extends Zend_CodeGenerator_Php_
         $output = '@return ' . $this->_datatype . ' ' . $this->_description;
         return $output;
     }
-    
+
 }

library/Zend/CodeGenerator/Php/Exception.php

@@ -33,5 +33,5 @@ require_once 'Zend/CodeGenerator/Exception.php';
  */
 class Zend_CodeGenerator_Php_Exception extends Zend_CodeGenerator_Exception
 {
-    
+
 }

library/Zend/CodeGenerator/Php/File.php

@@ -38,12 +38,12 @@ require_once 'Zend/CodeGenerator/Php/Class.php';
  */
 class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
 {
-    
+
     /**
      * @var array Array of Zend_CodeGenerator_Php_File
      */
     protected static $_fileCodeGenerators = array();
-    
+
     /**#@+
      * @var string
      */
@@ -51,27 +51,27 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
     protected static $_markerRequire = '/* Zend_CodeGenerator_Php_File-RequireMarker: {?} */';
     protected static $_markerClass = '/* Zend_CodeGenerator_Php_File-ClassMarker: {?} */';
     /**#@-*/
-    
+
     /**
      * @var string
      */
     protected $_filename = null;
-    
+
     /**
      * @var Zend_CodeGenerator_Php_Docblock
      */
     protected $_docblock = null;
-    
+
     /**
      * @var array
      */
     protected $_requiredFiles = array();
-    
+
     /**
      * @var array
      */
     protected $_classes = array();
-    
+
     /**
      * @var string
      */
@@ -82,20 +82,20 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
         if ($fileName == null) {
             $fileName = $fileCodeGenerator->getFilename();
         }
-        
+
         if ($fileName == '') {
             require_once 'Zend/CodeGenerator/Php/Exception.php';
             throw new Zend_CodeGenerator_Php_Exception('FileName does not exist.');
         }
-        
+
         // cannot use realpath since the file might not exist, but we do need to have the index
         // in the same DIRECTORY_SEPARATOR that realpath would use:
         $fileName = str_replace(array('\\', '/'), DIRECTORY_SEPARATOR, $fileName);
-        
+
         self::$_fileCodeGenerators[$fileName] = $fileCodeGenerator;
-        
+
     }
-    
+
     /**
      * fromReflectedFilePath() - use this if you intend on generating code generation objects based on the same file.
      * This will keep previous changes to the file in tact during the same PHP process
@@ -108,31 +108,31 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
     public static function fromReflectedFileName($filePath, $usePreviousCodeGeneratorIfItExists = true, $includeIfNotAlreadyIncluded = true)
     {
         $realpath = realpath($filePath);
-        
+
         if ($realpath === false) {
             if ( ($realpath = Zend_Reflection_file::findRealpathInIncludePath($filePath)) === false) {
                 require_once 'Zend/CodeGenerator/Php/Exception.php';
                 throw new Zend_CodeGenerator_Php_Exception('No file for ' . $realpath . ' was found.');
             }
         }
-        
+
         if ($usePreviousCodeGeneratorIfItExists && isset(self::$_fileCodeGenerators[$realpath])) {
             return self::$_fileCodeGenerators[$realpath];
         }
-        
+
         if ($includeIfNotAlreadyIncluded && !in_array($realpath, get_included_files())) {
             include $realpath;
         }
-        
+
         $codeGenerator = self::fromReflection(($fileReflector = new Zend_Reflection_File($realpath)));
-        
+
         if (!isset(self::$_fileCodeGenerators[$fileReflector->getFileName()])) {
             self::$_fileCodeGenerators[$fileReflector->getFileName()] = $codeGenerator;
         }
-        
+
         return $codeGenerator;
     }
-    
+
     /**
      * fromReflection()
      *
@@ -142,22 +142,22 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
     public static function fromReflection(Zend_Reflection_File $reflectionFile)
     {
         $file = new self();
-        
+
         $file->setSourceContent($reflectionFile->getContents());
         $file->setSourceDirty(false);
-        
+
         $body = $reflectionFile->getContents();
-        
+
         // @todo this whole area needs to be reworked with respect to how body lines are processed
         foreach ($reflectionFile->getClasses() as $class) {
             $file->setClass(Zend_CodeGenerator_Php_Class::fromReflection($class));
             $classStartLine = $class->getStartLine(true);
             $classEndLine = $class->getEndLine();
-            
+
             $bodyLines = explode("\n", $body);
             $bodyReturn = array();
             for ($lineNum = 1; $lineNum <= count($bodyLines); $lineNum++) {
-                if ($lineNum == $classStartLine) { 
+                if ($lineNum == $classStartLine) {
                     $bodyReturn[] = str_replace('?', $class->getName(), self::$_markerClass);  //'/* Zend_CodeGenerator_Php_File-ClassMarker: {' . $class->getName() . '} */';
                     $lineNum = $classEndLine;
                 } else {
@@ -167,15 +167,15 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
             $body = implode("\n", $bodyReturn);
             unset($bodyLines, $bodyReturn, $classStartLine, $classEndLine);
         }
-        
+
         if (($reflectionFile->getDocComment() != '')) {
             $docblock = $reflectionFile->getDocblock();
             $file->setDocblock(Zend_CodeGenerator_Php_Docblock::fromReflection($docblock));
-            
+
             $bodyLines = explode("\n", $body);
             $bodyReturn = array();
             for ($lineNum = 1; $lineNum <= count($bodyLines); $lineNum++) {
-                if ($lineNum == $docblock->getStartLine()) { 
+                if ($lineNum == $docblock->getStartLine()) {
                     $bodyReturn[] = str_replace('?', $class->getName(), self::$_markerDocblock);  //'/* Zend_CodeGenerator_Php_File-ClassMarker: {' . $class->getName() . '} */';
                     $lineNum = $docblock->getEndLine();
                 } else {
@@ -185,41 +185,41 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
             $body = implode("\n", $bodyReturn);
             unset($bodyLines, $bodyReturn, $classStartLine, $classEndLine);
         }
-        
+
         $file->setBody($body);
-        
+
         return $file;
     }
-    
+
     /**
      * setDocblock() Set the docblock
      *
      * @param Zend_CodeGenerator_Php_Docblock|array|string $docblock
      * @return Zend_CodeGenerator_Php_File
      */
-    public function setDocblock($docblock) 
+    public function setDocblock($docblock)
     {
         if (is_string($docblock)) {
             $docblock = array('shortDescription' => $docblock);
         }
-        
+
         if (is_array($docblock)) {
             $docblock = new Zend_CodeGenerator_Php_Docblock($docblock);
         } elseif (!$docblock instanceof Zend_CodeGenerator_Php_Docblock) {
             require_once 'Zend/CodeGenerator/Php/Exception.php';
             throw new Zend_CodeGenerator_Php_Exception('setDocblock() is expecting either a string, array or an instance of Zend_CodeGenerator_Php_Docblock');
         }
-        
+
         $this->_docblock = $docblock;
         return $this;
     }
-    
+
     /**
      * Get docblock
      *
      * @return Zend_CodeGenerator_Php_Docblock
      */
-    public function getDocblock() 
+    public function getDocblock()
     {
         return $this->_docblock;
     }
@@ -235,13 +235,13 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
         $this->_requiredFiles = $requiredFiles;
         return $this;
     }
-    
+
     /**
      * getRequiredFiles()
      *
      * @return array
      */
-    public function getRequiredFiles() 
+    public function getRequiredFiles()
     {
         return $this->_requiredFiles;
     }
@@ -252,14 +252,14 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
      * @param array $classes
      * @return Zend_CodeGenerator_Php_File
      */
-    public function setClasses(Array $classes) 
+    public function setClasses(Array $classes)
     {
         foreach ($classes as $class) {
             $this->setClass($class);
         }
         return $this;
     }
-    
+
     /**
      * getClass()
      *
@@ -272,10 +272,10 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
             reset($this->_classes);
             return current($this->_classes);
         }
-        
+
         return $this->_classes[$name];
     }
-    
+
     /**
      * setClass()
      *
@@ -293,13 +293,13 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
             require_once 'Zend/CodeGenerator/Php/Exception.php';
             throw new Zend_CodeGenerator_Php_Exception('Expecting either an array or an instance of Zend_CodeGenerator_Php_Class');
         }
-        
-        // @todo check for dup here 
-        
+
+        // @todo check for dup here
+
         $this->_classes[$className] = $class;
         return $this;
     }
-    
+
     /**
      * setFilename()
      *
@@ -311,7 +311,7 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
         $this->_filename = $filename;
         return $this;
     }
-    
+
     /**
      * getFilename()
      *
@@ -321,13 +321,13 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
     {
         return $this->_filename;
     }
-    
+
     /**
      * getClasses()
      *
      * @return array Array of Zend_CodeGenerator_Php_Class
      */
-    public function getClasses() 
+    public function getClasses()
     {
         return $this->_classes;
     }
@@ -343,7 +343,7 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
         $this->_body = $body;
         return $this;
     }
-    
+
     /**
      * getBody()
      *
@@ -353,7 +353,7 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
     {
         return $this->_body;
     }
-    
+
     /**
      * isSourceDirty()
      *
@@ -364,16 +364,16 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
         if (($docblock = $this->getDocblock()) && $docblock->isSourceDirty()) {
             return true;
         }
-        
+
         foreach ($this->_classes as $class) {
             if ($class->isSourceDirty()) {
                 return true;
             }
         }
-        
+
         return parent::isSourceDirty();
     }
-    
+
     /**
      * generate()
      *
@@ -384,21 +384,21 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
         if ($this->isSourceDirty() === false) {
             return $this->_sourceContent;
         }
-        
+
         $output = '';
-        
+
         // start with the body (if there), or open tag
         if (preg_match('#(?:\s*)<\?php#', $this->getBody()) == false) {
             $output = '<?php' . self::LINE_FEED;
         }
-        
+
         // if there are markers, put the body into the output
         $body = $this->getBody();
         if (preg_match('#/\* Zend_CodeGenerator_Php_File-(.*?)Marker:#', $body)) {
             $output .= $body;
             $body    = '';
         }
-        
+
         // Add file docblock, if any
         if (null !== ($docblock = $this->getDocblock())) {
             $docblock->setIndentation('');
@@ -409,10 +409,10 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
                 $output .= $docblock->generate() . self::LINE_FEED;
             }
         }
-        
+
         // newline
         $output .= self::LINE_FEED;
-        
+
         // process required files
         // @todo marker replacement for required files
         $requiredFiles = $this->getRequiredFiles();
@@ -420,10 +420,10 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
             foreach ($requiredFiles as $requiredFile) {
                 $output .= 'require_once \'' . $requiredFile . '\';' . self::LINE_FEED;
             }
-            
+
             $output .= self::LINE_FEED;
         }
-        
+
         // process classes
         $classes = $this->getClasses();
         if (!empty($classes)) {
@@ -436,22 +436,22 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
                     $output .= $class->generate() . self::LINE_FEED;
                 }
             }
-            
+
         }
 
         if (!empty($body)) {
 
-            // add an extra space betwee clsses and 
+            // add an extra space betwee clsses and
             if (!empty($classes)) {
                 $output .= self::LINE_FEED;
             }
-        
+
             $output .= $body;
         }
 
         return $output;
     }
-    
+
     public function write()
     {
         if ($this->_filename == '' || !is_writable(dirname($this->_filename))) {
@@ -461,5 +461,5 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
         file_put_contents($this->_filename, $this->generate());
         return $this;
     }
-    
+
 }

library/Zend/CodeGenerator/Php/Member/Abstract.php

@@ -38,7 +38,7 @@ require_once 'Zend/CodeGenerator/Php/Docblock.php';
  */
 abstract class Zend_CodeGenerator_Php_Member_Abstract extends Zend_CodeGenerator_Php_Abstract
 {
-    
+
     /**#@+
      * @param const string
      */
@@ -46,32 +46,32 @@ abstract class Zend_CodeGenerator_Php_Member_Abstract extends Zend_CodeGenerator
     const VISIBILITY_PROTECTED = 'protected';
     const VISIBILITY_PRIVATE   = 'private';
     /**#@-*/
-    
+
     /**
      * @var Zend_CodeGenerator_Php_Docblock
      */
     protected $_docblock   = null;
-    
+
     /**
      * @var bool
      */
     protected $_isAbstract = false;
-    
+
     /**
      * @var bool
      */
     protected $_isFinal    = false;
-    
+
     /**
      * @var bool
      */
     protected $_isStatic   = false;
-    
+
     /**
      * @var const
      */
     protected $_visibility = self::VISIBILITY_PUBLIC;
-    
+
     /**
      * @var string
      */
@@ -83,23 +83,23 @@ abstract class Zend_CodeGenerator_Php_Member_Abstract extends Zend_CodeGenerator
      * @param Zend_CodeGenerator_Php_Docblock|array|string $docblock
      * @return Zend_CodeGenerator_Php_File
      */
-    public function setDocblock($docblock) 
+    public function setDocblock($docblock)
     {
         if (is_string($docblock)) {
             $docblock = array('shortDescription' => $docblock);
         }
-        
+
         if (is_array($docblock)) {
             $docblock = new Zend_CodeGenerator_Php_Docblock($docblock);
         } elseif (!$docblock instanceof Zend_CodeGenerator_Php_Docblock) {
             require_once 'Zend/CodeGenerator/Php/Exception.php';
             throw new Zend_CodeGenerator_Php_Exception('setDocblock() is expecting either a string, array or an instance of Zend_CodeGenerator_Php_Docblock');
         }
-        
+
         $this->_docblock = $docblock;
         return $this;
     }
-    
+
     /**
      * getDocblock()
      *
@@ -109,7 +109,7 @@ abstract class Zend_CodeGenerator_Php_Member_Abstract extends Zend_CodeGenerator
     {
         return $this->_docblock;
     }
-    
+
     /**
      * setAbstract()
      *
@@ -121,7 +121,7 @@ abstract class Zend_CodeGenerator_Php_Member_Abstract extends Zend_CodeGenerator
         $this->_isAbstract = ($isAbstract) ? true : false;
         return $this;
     }
-    
+
     /**
      * isAbstract()
      *
@@ -131,7 +131,7 @@ abstract class Zend_CodeGenerator_Php_Member_Abstract extends Zend_CodeGenerator
     {
         return $this->_isAbstract;
     }
-    
+
     /**
      * setFinal()
      *
@@ -143,7 +143,7 @@ abstract class Zend_CodeGenerator_Php_Member_Abstract extends Zend_CodeGenerator
         $this->_isFinal = ($isFinal) ? true : false;
         return $this;
     }
-    
+
     /**
      * isFinal()
      *
@@ -153,7 +153,7 @@ abstract class Zend_CodeGenerator_Php_Member_Abstract extends Zend_CodeGenerator
     {
         return $this->_isFinal;
     }
-    
+
     /**
      * setStatic()
      *
@@ -165,7 +165,7 @@ abstract class Zend_CodeGenerator_Php_Member_Abstract extends Zend_CodeGenerator
         $this->_isStatic = ($isStatic) ? true : false;
         return $this;
     }
-    
+
     /**
      * isStatic()
      *
@@ -175,7 +175,7 @@ abstract class Zend_CodeGenerator_Php_Member_Abstract extends Zend_CodeGenerator
     {
         return $this->_isStatic;
     }
-    
+
     /**
      * setVisitibility()
      *
@@ -187,7 +187,7 @@ abstract class Zend_CodeGenerator_Php_Member_Abstract extends Zend_CodeGenerator
         $this->_visibility = $visibility;
         return $this;
     }
-    
+
     /**
      * getVisibility()
      *
@@ -197,7 +197,7 @@ abstract class Zend_CodeGenerator_Php_Member_Abstract extends Zend_CodeGenerator
     {
         return $this->_visibility;
     }
-    
+
     /**
      * setName()
      *
@@ -209,7 +209,7 @@ abstract class Zend_CodeGenerator_Php_Member_Abstract extends Zend_CodeGenerator
         $this->_name = $name;
         return $this;
     }
-    
+
     /**
      * getName()
      *

library/Zend/CodeGenerator/Php/Member/Container.php

@@ -28,19 +28,19 @@
  */
 class Zend_CodeGenerator_Php_Member_Container extends ArrayObject
 {
-    
+
     /**#@+
      * @param const string
      */
     const TYPE_PROPERTY = 'property';
     const TYPE_METHOD   = 'method';
     /**#@-*/
-    
+
     /**
      * @var const|string
      */
     protected $_type = self::TYPE_PROPERTY;
-    
+
     /**
      * __construct()
      *
@@ -51,5 +51,5 @@ class Zend_CodeGenerator_Php_Member_Container extends ArrayObject
         $this->_type = $type;
         parent::__construct(array(), self::ARRAY_AS_PROPS);
     }
-    
+
 }

library/Zend/CodeGenerator/Php/Method.php

@@ -41,28 +41,28 @@ require_once 'Zend/CodeGenerator/Php/Parameter.php';
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_CodeGenerator_Php_Method extends Zend_CodeGenerator_Php_Member_Abstract 
+class Zend_CodeGenerator_Php_Method extends Zend_CodeGenerator_Php_Member_Abstract
 {
     /**
      * @var Zend_CodeGenerator_Php_Docblock
      */
     protected $_docblock = null;
-    
+
     /**
      * @var bool
      */
     protected $_isFinal = false;
-    
+
     /**
      * @var array
      */
     protected $_parameters = array();
-    
+
     /**
      * @var string
      */
     protected $_body = null;
-    
+
     /**
      * fromReflection()
      *
@@ -72,16 +72,16 @@ class Zend_CodeGenerator_Php_Method extends Zend_CodeGenerator_Php_Member_Abstra
     public static function fromReflection(Zend_Reflection_Method $reflectionMethod)
     {
         $method = new self();
-        
+
         $method->setSourceContent($reflectionMethod->getContents(false));
         $method->setSourceDirty(false);
-        
+
         if ($reflectionMethod->getDocComment() != '') {
             $method->setDocblock(Zend_CodeGenerator_Php_Docblock::fromReflection($reflectionMethod->getDocblock()));
         }
-        
+
         $method->setFinal($reflectionMethod->isFinal());
-        
+
         if ($reflectionMethod->isPrivate()) {
             $method->setVisibility(self::VISIBILITY_PRIVATE);
         } elseif ($reflectionMethod->isProtected()) {
@@ -89,20 +89,20 @@ class Zend_CodeGenerator_Php_Method extends Zend_CodeGenerator_Php_Member_Abstra
         } else {
             $method->setVisibility(self::VISIBILITY_PUBLIC);
         }
-        
+
         $method->setStatic($reflectionMethod->isStatic());
 
         $method->setName($reflectionMethod->getName());
-        
+
         foreach ($reflectionMethod->getParameters() as $reflectionParameter) {
             $method->setParameter(Zend_CodeGenerator_Php_Parameter::fromReflection($reflectionParameter));
         }
-        
+
         $method->setBody($reflectionMethod->getBody());
 
         return $method;
     }
-    
+
     /**
      * setFinal()
      *
@@ -112,7 +112,7 @@ class Zend_CodeGenerator_Php_Method extends Zend_CodeGenerator_Php_Member_Abstra
     {
         $this->_isFinal = ($isFinal) ? true : false;
     }
-    
+
     /**
      * setParameters()
      *
@@ -126,7 +126,7 @@ class Zend_CodeGenerator_Php_Method extends Zend_CodeGenerator_Php_Member_Abstra
         }
         return $this;
     }
-    
+
     /**
      * setParameter()
      *
@@ -144,11 +144,11 @@ class Zend_CodeGenerator_Php_Method extends Zend_CodeGenerator_Php_Member_Abstra
             require_once 'Zend/CodeGenerator/Php/Exception.php';
             throw new Zend_CodeGenerator_Php_Exception('setParameter() expects either an array of method options or an instance of Zend_CodeGenerator_Php_Parameter');
         }
-        
+
         $this->_parameters[$parameterName] = $parameter;
         return $this;
     }
-    
+
     /**
      * getParameters()
      *
@@ -170,7 +170,7 @@ class Zend_CodeGenerator_Php_Method extends Zend_CodeGenerator_Php_Member_Abstra
         $this->_body = $body;
         return $this;
     }
-    
+
     /**
      * getBody()
      *
@@ -180,7 +180,7 @@ class Zend_CodeGenerator_Php_Method extends Zend_CodeGenerator_Php_Member_Abstra
     {
         return $this->_body;
     }
-    
+
     /**
      * generate()
      *
@@ -189,22 +189,22 @@ class Zend_CodeGenerator_Php_Method extends Zend_CodeGenerator_Php_Member_Abstra
     public function generate()
     {
         $output = '';
-        
+
         $indent = $this->getIndentation();
-        
+
         if (($docblock = $this->getDocblock()) !== null) {
             $docblock->setIndentation($indent);
             $output .= $docblock->generate();
         }
-        
+
         $output .= $indent;
-        
+
         if ($this->isAbstract()) {
             $output .= 'abstract ';
         } else {
             $output .= (($this->isFinal()) ? 'final ' : '');
         }
-                
+
         $output .= $this->getVisibility()
             . (($this->isStatic()) ? ' static' : '')
             . ' function ' . $this->getName() . '(';
@@ -214,21 +214,21 @@ class Zend_CodeGenerator_Php_Method extends Zend_CodeGenerator_Php_Member_Abstra
             foreach ($parameters as $parameter) {
                 $parameterOuput[] = $parameter->generate();
             }
-            
+
             $output .= implode(', ', $parameterOuput);
         }
-        
+
         $output .= ')' . self::LINE_FEED . $indent . '{' . self::LINE_FEED;
 
         if ($this->_body) {
-            $output .= '        ' 
-                    .  str_replace(self::LINE_FEED, self::LINE_FEED . $indent . $indent, trim($this->_body)) 
+            $output .= '        '
+                    .  str_replace(self::LINE_FEED, self::LINE_FEED . $indent . $indent, trim($this->_body))
                     .  self::LINE_FEED;
         }
-        
+
         $output .= $indent . '}' . self::LINE_FEED;
-        
+
         return $output;
     }
-    
+
 }

library/Zend/CodeGenerator/Php/Parameter.php

@@ -37,22 +37,22 @@ class Zend_CodeGenerator_Php_Parameter extends Zend_CodeGenerator_Php_Abstract
      * @var string
      */
     protected $_type = null;
-    
+
     /**
      * @var string
      */
     protected $_name = null;
-    
+
     /**
      * @var string
      */
     protected $_defaultValue = null;
-    
+
     /**
      * @var int
      */
     protected $_position = null;
-    
+
     /**
      * fromReflection()
      *
@@ -64,7 +64,7 @@ class Zend_CodeGenerator_Php_Parameter extends Zend_CodeGenerator_Php_Abstract
         // @todo Research this
         return new self();
     }
-    
+
     /**
      * setType()
      *
@@ -76,7 +76,7 @@ class Zend_CodeGenerator_Php_Parameter extends Zend_CodeGenerator_Php_Abstract
         $this->_type = $type;
         return $this;
     }
-    
+
     /**
      * getType()
      *
@@ -86,7 +86,7 @@ class Zend_CodeGenerator_Php_Parameter extends Zend_CodeGenerator_Php_Abstract
     {
         return $this->_type;
     }
-    
+
     /**
      * setName()
      *
@@ -98,7 +98,7 @@ class Zend_CodeGenerator_Php_Parameter extends Zend_CodeGenerator_Php_Abstract
         $this->_name = $name;
         return $this;
     }
-    
+
     /**
      * getName()
      *
@@ -108,7 +108,7 @@ class Zend_CodeGenerator_Php_Parameter extends Zend_CodeGenerator_Php_Abstract
     {
         return $this->_name;
     }
-    
+
     /**
      * setDefaultValue()
      *
@@ -120,7 +120,7 @@ class Zend_CodeGenerator_Php_Parameter extends Zend_CodeGenerator_Php_Abstract
         $this->_defaultValue = $defaultValue;
         return $this;
     }
-    
+
     /**
      * getDefaultValue()
      *
@@ -130,7 +130,7 @@ class Zend_CodeGenerator_Php_Parameter extends Zend_CodeGenerator_Php_Abstract
     {
         return $this->_defaultValue;
     }
-    
+
     /**
      * setPosition()
      *
@@ -142,7 +142,7 @@ class Zend_CodeGenerator_Php_Parameter extends Zend_CodeGenerator_Php_Abstract
         $this->_position = $position;
         return $this;
     }
-    
+
     /**
      * getPosition()
      *
@@ -152,7 +152,7 @@ class Zend_CodeGenerator_Php_Parameter extends Zend_CodeGenerator_Php_Abstract
     {
         return $this->_position;
     }
-    
+
     /**
      * generate()
      *
@@ -161,13 +161,13 @@ class Zend_CodeGenerator_Php_Parameter extends Zend_CodeGenerator_Php_Abstract
     public function generate()
     {
         $output = '';
-        
+
         if ($this->_type) {
-            $output .= $this->_type . ' '; 
+            $output .= $this->_type . ' ';
         }
-        
+
         $output .= '$' . $this->_name;
-        
+
         if ($this->_defaultValue) {
             $output .= ' = ';
             if (is_string($this->_defaultValue)) {
@@ -179,5 +179,5 @@ class Zend_CodeGenerator_Php_Parameter extends Zend_CodeGenerator_Php_Abstract
 
         return $output;
     }
-    
+
 }

library/Zend/CodeGenerator/Php/Property.php

@@ -36,14 +36,14 @@ require_once 'Zend/CodeGenerator/Php/Property/DefaultValue.php';
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_CodeGenerator_Php_Property extends Zend_CodeGenerator_Php_Member_Abstract 
+class Zend_CodeGenerator_Php_Property extends Zend_CodeGenerator_Php_Member_Abstract
 {
-    
+
     /**
      * @var bool
      */
     protected $_isConst = null;
-    
+
     /**
      * @var string
      */
@@ -58,21 +58,21 @@ class Zend_CodeGenerator_Php_Property extends Zend_CodeGenerator_Php_Member_Abst
     public static function fromReflection(Zend_Reflection_Property $reflectionProperty)
     {
         $property = new self();
-        
+
         $property->setName($reflectionProperty->getName());
-        
+
         $allDefaultProperties = $reflectionProperty->getDeclaringClass()->getDefaultProperties();
-        
+
         $property->setDefaultValue($allDefaultProperties[$reflectionProperty->getName()]);
-        
+
         if ($reflectionProperty->getDocComment() != '') {
             $property->setDocblock(Zend_CodeGenerator_Php_Docblock::fromReflection($reflectionProperty->getDocComment()));
         }
-        
+
         if ($reflectionProperty->isStatic()) {
             $property->setStatic(true);
         }
-        
+
         if ($reflectionProperty->isPrivate()) {
             $property->setVisibility(self::VISIBILITY_PRIVATE);
         } elseif ($reflectionProperty->isProtected()) {
@@ -80,12 +80,12 @@ class Zend_CodeGenerator_Php_Property extends Zend_CodeGenerator_Php_Member_Abst
         } else {
             $property->setVisibility(self::VISIBILITY_PUBLIC);
         }
-        
+
         $property->setSourceDirty(false);
-        
+
         return $property;
     }
-    
+
     /**
      * setConst()
      *
@@ -97,7 +97,7 @@ class Zend_CodeGenerator_Php_Property extends Zend_CodeGenerator_Php_Member_Abst
         $this->_isConst = $const;
         return $this;
     }
-    
+
     /**
      * isConst()
      *
@@ -117,16 +117,16 @@ class Zend_CodeGenerator_Php_Property extends Zend_CodeGenerator_Php_Member_Abst
     public function setDefaultValue($defaultValue)
     {
         // if it looks like
-        if (is_array($defaultValue) 
+        if (is_array($defaultValue)
             && array_key_exists('value', $defaultValue)
             && array_key_exists('type', $defaultValue)) {
             $defaultValue = new Zend_CodeGenerator_Php_Property_DefaultValue($defaultValue);
         }
-        
+
         if (!($defaultValue instanceof Zend_CodeGenerator_Php_Property_DefaultValue)) {
             $defaultValue = new Zend_CodeGenerator_Php_Property_DefaultValue(array('value' => $defaultValue));
         }
-        
+
         $this->_defaultValue = $defaultValue;
         return $this;
     }
@@ -140,7 +140,7 @@ class Zend_CodeGenerator_Php_Property extends Zend_CodeGenerator_Php_Member_Abst
     {
         return $this->_defaultValue;
     }
-    
+
     /**
      * generate()
      *
@@ -150,30 +150,30 @@ class Zend_CodeGenerator_Php_Property extends Zend_CodeGenerator_Php_Member_Abst
     {
         $name         = $this->getName();
         $defaultValue = $this->getDefaultValue();
-        
+
         $output = '';
-        
+
         if (($docblock = $this->getDocblock()) !== null) {
             $docblock->setIndentation('    ');
             $output .= $docblock->generate();
         }
-        
+
         if ($this->isConst()) {
             if ($defaultValue != null && !$defaultValue->isValidConstantType()) {
                 require_once 'Zend/CodeGenerator/Php/Exception.php';
                 throw new Zend_CodeGenerator_Php_Exception('The property ' . $this->_name . ' is said to be '
                     . 'constant but does not have a valid constant value.');
             }
-            $output .= $this->_indentation . 'const ' . $name . ' = ' 
+            $output .= $this->_indentation . 'const ' . $name . ' = '
                 . (($defaultValue !== null) ? $defaultValue->generate() : 'null;');
         } else {
             $output .= $this->_indentation
-                . $this->getVisibility() 
-                . (($this->isStatic()) ? ' static' : '') 
+                . $this->getVisibility()
+                . (($this->isStatic()) ? ' static' : '')
                 . ' $' . $name . ' = '
                 . (($defaultValue !== null) ? $defaultValue->generate() : 'null;');
         }
-        return $output; 
+        return $output;
     }
-    
+
 }

library/Zend/CodeGenerator/Php/Property/DefaultValue.php

@@ -50,22 +50,22 @@ class Zend_CodeGenerator_Php_Property_DefaultValue extends Zend_CodeGenerator_Ph
     const TYPE_NULL     = 'null';
     const TYPE_OTHER    = 'other';
     /**#@-*/
-    
+
     /**
      * @var array of reflected constants
      */
     protected static $_constants = array();
-    
+
     /**
      * @var mixed
      */
     protected $_value = null;
-    
+
     /**
      * @var string
      */
     protected $_type  = self::TYPE_AUTO;
-    
+
     /**
      * @var int
      */
@@ -82,7 +82,7 @@ class Zend_CodeGenerator_Php_Property_DefaultValue extends Zend_CodeGenerator_Ph
         self::$_constants = $reflect->getConstants();
         unset($reflect);
     }
-    
+
     /**
      * isValidConstantType()
      *
@@ -93,7 +93,7 @@ class Zend_CodeGenerator_Php_Property_DefaultValue extends Zend_CodeGenerator_Ph
         if ($this->_type == self::TYPE_AUTO) {
             $type = $this->_getAutoDeterminedType($this->_value);
         }
-        
+
         // valid types for constants
         $scalarTypes = array(
             self::TYPE_BOOLEAN,
@@ -107,10 +107,10 @@ class Zend_CodeGenerator_Php_Property_DefaultValue extends Zend_CodeGenerator_Ph
             self::TYPE_CONSTANT,
             self::TYPE_NULL
             );
-        
+
         return in_array($type, $scalarTypes);
     }
-    
+
     /**
      * setValue()
      *
@@ -122,7 +122,7 @@ class Zend_CodeGenerator_Php_Property_DefaultValue extends Zend_CodeGenerator_Ph
         $this->_value = $value;
         return $this;
     }
-    
+
     /**
      * getValue()
      *
@@ -132,7 +132,7 @@ class Zend_CodeGenerator_Php_Property_DefaultValue extends Zend_CodeGenerator_Ph
     {
         return $this->_value;
     }
-    
+
     /**
      * setType()
      *
@@ -144,7 +144,7 @@ class Zend_CodeGenerator_Php_Property_DefaultValue extends Zend_CodeGenerator_Ph
         $this->_type = $type;
         return $this;
     }
-    
+
     /**
      * getType()
      *
@@ -154,7 +154,7 @@ class Zend_CodeGenerator_Php_Property_DefaultValue extends Zend_CodeGenerator_Ph
     {
         return $this->_type;
     }
-    
+
     /**
      * setArrayDepth()
      *
@@ -166,7 +166,7 @@ class Zend_CodeGenerator_Php_Property_DefaultValue extends Zend_CodeGenerator_Ph
         $this->_arrayDepth = $arrayDepth;
         return $this;
     }
-    
+
     /**
      * getArrayDepth()
      *
@@ -176,7 +176,7 @@ class Zend_CodeGenerator_Php_Property_DefaultValue extends Zend_CodeGenerator_Ph
     {
         return $this->_arrayDepth;
     }
-    
+
     /**
      * _getValidatedType()
      *
@@ -188,10 +188,10 @@ class Zend_CodeGenerator_Php_Property_DefaultValue extends Zend_CodeGenerator_Ph
         if (($constName = array_search($type, self::$_constants)) !== false) {
             return $type;
         }
-        
+
         return self::TYPE_AUTO;
     }
-    
+
     /**
      * _getAutoDeterminedType()
      *
@@ -221,10 +221,10 @@ class Zend_CodeGenerator_Php_Property_DefaultValue extends Zend_CodeGenerator_Ph
             default:
                 return self::TYPE_OTHER;
         }
-        
+
         return self::TYPE_OTHER;
     }
-    
+
     /**
      * generate()
      *
@@ -233,16 +233,16 @@ class Zend_CodeGenerator_Php_Property_DefaultValue extends Zend_CodeGenerator_Ph
     public function generate()
     {
         $type = $this->_type;
-        
+
         if ($type != self::TYPE_AUTO) {
             $type = $this->_getValidatedType($type);
         }
-        
+
         $value = $this->_value;
-        
+
         if ($type == self::TYPE_AUTO) {
             $type = $this->_getAutoDeterminedType($value);
-            
+
             if ($type == self::TYPE_ARRAY) {
                 $rii = new RecursiveIteratorIterator(
                     $it = new RecursiveArrayIterator($value),
@@ -257,11 +257,11 @@ class Zend_CodeGenerator_Php_Property_DefaultValue extends Zend_CodeGenerator_Ph
                 }
                 $value = $rii->getSubIterator()->getArrayCopy();
             }
-            
+
         }
-        
+
         $output = '';
-        
+
         switch ($type) {
             case self::TYPE_STRING:
                 $output .= "'" . $value . "'";
@@ -294,7 +294,7 @@ class Zend_CodeGenerator_Php_Property_DefaultValue extends Zend_CodeGenerator_Ph
                     } else {
                         $outputParts[] = (is_int($n) ? $n : "'" . $n . "'") . ' => ' . $partV;
                     }
-                   
+
                 }
                 $output .= implode(',' . PHP_EOL . str_repeat($this->_indentation, $this->_arrayDepth+1), $outputParts);
                 if ($curArrayMultiblock == true) {
@@ -306,9 +306,9 @@ class Zend_CodeGenerator_Php_Property_DefaultValue extends Zend_CodeGenerator_Ph
             default:
                 throw new Exception('I dont know this type');
         }
-        
+
         $output .= ';';
-        
+
         return $output;
     }
 }

library/Zend/Config.php

@@ -83,7 +83,7 @@ class Zend_Config implements Countable, Iterator
 
     /**
      * Load file error string.
-     * 
+     *
      * Is null if there was no error while file loading
      *
      * @var string
@@ -169,11 +169,11 @@ class Zend_Config implements Countable, Iterator
             throw new Zend_Config_Exception('Zend_Config is read only');
         }
     }
-    
+
     /**
      * Deep clone of this instance to ensure that nested Zend_Configs
      * are also cloned.
-     * 
+     *
      * @return void
      */
     public function __clone()
@@ -374,7 +374,7 @@ class Zend_Config implements Countable, Iterator
             }
         }
     }
-    
+
     /**
      * Returns if this Zend_Config object is read only or not.
      *
@@ -384,7 +384,7 @@ class Zend_Config implements Countable, Iterator
     {
         return !$this->_allowModifications;
     }
-    
+
     /**
      * Get the current extends
      *
@@ -394,7 +394,7 @@ class Zend_Config implements Countable, Iterator
     {
         return $this->_extends;
     }
-    
+
     /**
      * Set an extend for Zend_Config_Writer
      *
@@ -410,7 +410,7 @@ class Zend_Config implements Countable, Iterator
             $this->_extends[$extendingSection] = $extendedSection;
         }
     }
-    
+
     /**
      * Throws an exception if $extendingSection may not extend $extendedSection,
      * and tracks the section extension if it is valid.
@@ -445,7 +445,7 @@ class Zend_Config implements Countable, Iterator
      * @param integer $errline
      */
     protected function _loadFileErrorHandler($errno, $errstr, $errfile, $errline)
-    { 
+    {
         if ($this->_loadFileErrorStr === null) {
             $this->_loadFileErrorStr = $errstr;
         } else {

library/Zend/Config/Ini.php

@@ -54,7 +54,7 @@ class Zend_Config_Ini extends Zend_Config
      * @var boolean
      */
     protected $_skipExtends = false;
-    
+
     /**
      * Loads the section $section from the config file $filename for
      * access facilitated by nested object properties.
@@ -153,7 +153,7 @@ class Zend_Config_Ini extends Zend_Config
 
             }
             parent::__construct($dataArray, $allowModifications);
-        } 
+        }
 
         $this->_loadedSection = $section;
     }
@@ -210,7 +210,7 @@ class Zend_Config_Ini extends Zend_Config
 
         return $iniArray;
     }
-    
+
     /**
      * Process each element in the section and handle the ";extends" inheritance
      * key. Passes control to _processKey() to handle the nest separator
@@ -230,7 +230,7 @@ class Zend_Config_Ini extends Zend_Config
             if (strtolower($key) == ';extends') {
                 if (isset($iniArray[$value])) {
                     $this->_assertValidExtend($section, $value);
-                    
+
                     if (!$this->_skipExtends) {
                         $config = $this->_processSection($iniArray, $value, $config);
                     }

library/Zend/Config/Writer.php

@@ -29,13 +29,13 @@ abstract class Zend_Config_Writer
 {
     /**
      * Option keys to skip when calling setOptions()
-     * 
+     *
      * @var array
      */
     protected $_skipOptions = array(
         'options'
     );
-    
+
     /**
      * Config object to write
      *
@@ -45,8 +45,8 @@ abstract class Zend_Config_Writer
 
     /**
      * Create a new adapter
-     * 
-     * $options can only be passed as array or be omitted 
+     *
+     * $options can only be passed as array or be omitted
      *
      * @param null|array $options
      */
@@ -56,7 +56,7 @@ abstract class Zend_Config_Writer
             $this->setOptions($options);
         }
     }
-    
+
     /**
      * Set options via a Zend_Config instance
      *
@@ -66,10 +66,10 @@ abstract class Zend_Config_Writer
     public function setConfig(Zend_Config $config)
     {
         $this->_config = $config;
-        
+
         return $this;
     }
-    
+
     /**
      * Set options via an array
      *
@@ -88,10 +88,10 @@ abstract class Zend_Config_Writer
                 $this->$method($value);
             }
         }
-        
+
         return $this;
     }
-    
+
     /**
      * Write a Zend_Config object to it's target
      *

library/Zend/Config/Writer/Array.php

@@ -38,14 +38,14 @@ class Zend_Config_Writer_Array extends Zend_Config_Writer
      * @var string
      */
     protected $_filename = null;
-    
+
     /**
      * Wether to exclusively lock the file or not
      *
      * @var boolean
      */
     protected $_exclusiveLock = false;
-    
+
     /**
      * Set the target filename
      *
@@ -55,10 +55,10 @@ class Zend_Config_Writer_Array extends Zend_Config_Writer
     public function setFilename($filename)
     {
         $this->_filename = $filename;
-        
+
         return $this;
     }
-    
+
     /**
      * Set wether to exclusively lock the file or not
      *
@@ -68,10 +68,10 @@ class Zend_Config_Writer_Array extends Zend_Config_Writer
     public function setExclusiveLock($exclusiveLock)
     {
         $this->_exclusiveLock = $exclusiveLock;
-        
+
         return $this;
     }
-    
+
     /**
      * Defined by Zend_Config_Writer
      *
@@ -87,43 +87,43 @@ class Zend_Config_Writer_Array extends Zend_Config_Writer
         if ($filename !== null) {
             $this->setFilename($filename);
         }
-        
+
         if ($config !== null) {
             $this->setConfig($config);
         }
-        
+
         if ($exclusiveLock !== null) {
             $this->setExclusiveLock($exclusiveLock);
         }
-        
+
         if ($this->_filename === null) {
             require_once 'Zend/Config/Exception.php';
             throw new Zend_Config_Exception('No filename was set');
         }
-        
+
         if ($this->_config === null) {
             require_once 'Zend/Config/Exception.php';
             throw new Zend_Config_Exception('No config was set');
         }
-        
+
         $data        = $this->_config->toArray();
         $sectionName = $this->_config->getSectionName();
-        
+
         if (is_string($sectionName)) {
             $data = array($sectionName => $data);
         }
-        
+
         $arrayString = "<?php\n"
                      . "return " . var_export($data, true) . ";\n";
-       
+
         $flags = 0;
-        
+
         if ($this->_exclusiveLock) {
             $flags |= LOCK_EX;
         }
-                     
+
         $result = @file_put_contents($this->_filename, $arrayString, $flags);
-        
+
         if ($result === false) {
             require_once 'Zend/Config/Exception.php';
             throw new Zend_Config_Exception('Could not write to file "' . $this->_filename . '"');

library/Zend/Config/Writer/Ini.php

@@ -38,21 +38,21 @@ class Zend_Config_Writer_Ini extends Zend_Config_Writer
      * @var string
      */
     protected $_filename = null;
-        
+
     /**
      * Wether to exclusively lock the file or not
      *
      * @var boolean
      */
     protected $_exclusiveLock = false;
-    
+
     /**
      * String that separates nesting levels of configuration data identifiers
      *
      * @var string
      */
     protected $_nestSeparator = '.';
-    
+
     /**
      * Set the target filename
      *
@@ -62,10 +62,10 @@ class Zend_Config_Writer_Ini extends Zend_Config_Writer
     public function setFilename($filename)
     {
         $this->_filename = $filename;
-        
+
         return $this;
     }
-    
+
     /**
      * Set wether to exclusively lock the file or not
      *
@@ -75,10 +75,10 @@ class Zend_Config_Writer_Ini extends Zend_Config_Writer
     public function setExclusiveLock($exclusiveLock)
     {
         $this->_exclusiveLock = $exclusiveLock;
-        
+
         return $this;
     }
-    
+
     /**
      * Set the nest separator
      *
@@ -88,10 +88,10 @@ class Zend_Config_Writer_Ini extends Zend_Config_Writer
     public function setNestSeparator($separator)
     {
         $this->_nestSeparator = $separator;
-        
+
         return $this;
     }
-    
+
     /**
      * Defined by Zend_Config_Writer
      *
@@ -107,29 +107,29 @@ class Zend_Config_Writer_Ini extends Zend_Config_Writer
         if ($filename !== null) {
             $this->setFilename($filename);
         }
-        
+
         if ($config !== null) {
             $this->setConfig($config);
         }
-        
+
         if ($exclusiveLock !== null) {
             $this->setExclusiveLock($exclusiveLock);
         }
-        
+
         if ($this->_filename === null) {
             require_once 'Zend/Config/Exception.php';
             throw new Zend_Config_Exception('No filename was set');
         }
-        
+
         if ($this->_config === null) {
             require_once 'Zend/Config/Exception.php';
             throw new Zend_Config_Exception('No config was set');
         }
-        
+
         $iniString   = '';
         $extends     = $this->_config->getExtends();
         $sectionName = $this->_config->getSectionName();
-        
+
         if (is_string($sectionName)) {
             $iniString .= '[' . $sectionName . ']' . "\n"
                        .  $this->_addBranch($this->_config)
@@ -145,20 +145,20 @@ class Zend_Config_Writer_Ini extends Zend_Config_Writer
                     if (isset($extends[$sectionName])) {
                         $sectionName .= ' : ' . $extends[$sectionName];
                     }
-                    
+
                     $iniString .= '[' . $sectionName . ']' . "\n"
                                .  $this->_addBranch($data)
                                .  "\n";
                 }
             }
         }
-       
+
         $flags = 0;
-        
+
         if ($this->_exclusiveLock) {
             $flags |= LOCK_EX;
         }
-        
+
         $result = @file_put_contents($this->_filename, $iniString, $flags);
 
         if ($result === false) {
@@ -166,7 +166,7 @@ class Zend_Config_Writer_Ini extends Zend_Config_Writer
             throw new Zend_Config_Exception('Could not write to file "' . $this->_filename . '"');
         }
     }
-    
+
     /**
      * Add a branch to an INI string recursively
      *
@@ -179,7 +179,7 @@ class Zend_Config_Writer_Ini extends Zend_Config_Writer
 
         foreach ($config as $key => $value) {
             $group = array_merge($parents, array($key));
-            
+
             if ($value instanceof Zend_Config) {
                 $iniString .= $this->_addBranch($value, $group);
             } else {
@@ -189,10 +189,10 @@ class Zend_Config_Writer_Ini extends Zend_Config_Writer
                            .  "\n";
             }
         }
-        
+
         return $iniString;
     }
-    
+
     /**
      * Prepare a value for INI
      *

library/Zend/Config/Writer/Xml.php

@@ -43,14 +43,14 @@ class Zend_Config_Writer_Xml extends Zend_Config_Writer
      * @var string
      */
     protected $_filename = null;
-    
+
     /**
      * Wether to exclusively lock the file or not
      *
      * @var boolean
      */
     protected $_exclusiveLock = false;
-    
+
     /**
      * Set the target filename
      *
@@ -60,10 +60,10 @@ class Zend_Config_Writer_Xml extends Zend_Config_Writer
     public function setFilename($filename)
     {
         $this->_filename = $filename;
-        
+
         return $this;
     }
-    
+
     /**
      * Set wether to exclusively lock the file or not
      *
@@ -73,10 +73,10 @@ class Zend_Config_Writer_Xml extends Zend_Config_Writer
     public function setExclusiveLock($exclusiveLock)
     {
         $this->_exclusiveLock = $exclusiveLock;
-        
+
         return $this;
     }
-    
+
     /**
      * Defined by Zend_Config_Writer
      *
@@ -92,29 +92,29 @@ class Zend_Config_Writer_Xml extends Zend_Config_Writer
         if ($filename !== null) {
             $this->setFilename($filename);
         }
-        
+
         if ($config !== null) {
             $this->setConfig($config);
         }
-        
+
         if ($exclusiveLock !== null) {
             $this->setExclusiveLock($exclusiveLock);
         }
-        
+
         if ($this->_filename === null) {
             require_once 'Zend/Config/Exception.php';
             throw new Zend_Config_Exception('No filename was set');
         }
-        
+
         if ($this->_config === null) {
             require_once 'Zend/Config/Exception.php';
             throw new Zend_Config_Exception('No config was set');
         }
-        
+
         $xml         = new SimpleXMLElement('<zend-config xmlns:zf="' . Zend_Config_Xml::XML_NAMESPACE . '"/>');
         $extends     = $this->_config->getExtends();
         $sectionName = $this->_config->getSectionName();
-        
+
         if (is_string($sectionName)) {
             $child = $xml->addChild($sectionName);
 
@@ -125,35 +125,35 @@ class Zend_Config_Writer_Xml extends Zend_Config_Writer
                     $xml->addChild($sectionName, (string) $data);
                 } else {
                     $child = $xml->addChild($sectionName);
-                    
+
                     if (isset($extends[$sectionName])) {
                         $child->addAttribute('zf:extends', $extends[$sectionName], Zend_Config_Xml::XML_NAMESPACE);
                     }
-        
+
                     $this->_addBranch($data, $child, $xml);
                 }
             }
         }
-                
+
         $dom = dom_import_simplexml($xml)->ownerDocument;
         $dom->formatOutput = true;
-        
+
         $xmlString = $dom->saveXML();
-       
+
         $flags = 0;
-        
+
         if ($this->_exclusiveLock) {
             $flags |= LOCK_EX;
         }
-        
+
         $result = @file_put_contents($this->_filename, $xmlString, $flags);
-        
+
         if ($result === false) {
             require_once 'Zend/Config/Exception.php';
             throw new Zend_Config_Exception('Could not write to file "' . $this->_filename . '"');
         }
     }
-    
+
     /**
      * Add a branch to an XML object recursively
      *
@@ -165,35 +165,35 @@ class Zend_Config_Writer_Xml extends Zend_Config_Writer
     protected function _addBranch(Zend_Config $config, SimpleXMLElement $xml, SimpleXMLElement $parent)
     {
         $branchType = null;
-        
+
         foreach ($config as $key => $value) {
             if ($branchType === null) {
                 if (is_numeric($key)) {
                     $branchType = 'numeric';
                     $branchName = $xml->getName();
                     $xml        = $parent;
-                    
+
                     unset($parent->{$branchName});
                 } else {
                     $branchType = 'string';
                 }
             } else if ($branchType !== (is_numeric($key) ? 'numeric' : 'string')) {
                 require_once 'Zend/Config/Exception.php';
-                throw new Zend_Config_Exception('Mixing of string and numeric keys is not allowed');                
+                throw new Zend_Config_Exception('Mixing of string and numeric keys is not allowed');
             }
-            
+
             if ($branchType === 'numeric') {
                 if ($value instanceof Zend_Config) {
                     $child = $parent->addChild($branchName, (string) $value);
-    
+
                     $this->_addBranch($value, $child, $parent);
                 } else {
                     $parent->addChild($branchName, (string) $value);
                 }
-            } else {            
+            } else {
                 if ($value instanceof Zend_Config) {
                     $child = $xml->addChild($key);
-    
+
                     $this->_addBranch($value, $child, $xml);
                 } else {
                     $xml->addChild($key, (string) $value);

library/Zend/Controller/Action/Helper/ActionStack.php

@@ -46,7 +46,7 @@ class Zend_Controller_Action_Helper_ActionStack extends Zend_Controller_Action_H
      * Constructor
      *
      * Register action stack plugin
-     * 
+     *
      * @return void
      */
     public function __construct()
@@ -65,9 +65,9 @@ class Zend_Controller_Action_Helper_ActionStack extends Zend_Controller_Action_H
     }
 
     /**
-     * Push onto the stack 
-     * 
-     * @param  Zend_Controller_Request_Abstract $next 
+     * Push onto the stack
+     *
+     * @param  Zend_Controller_Request_Abstract $next
      * @return Zend_Controller_Action_Helper_ActionStack Provides a fluent interface
      */
     public function pushStack(Zend_Controller_Request_Abstract $next)
@@ -78,12 +78,12 @@ class Zend_Controller_Action_Helper_ActionStack extends Zend_Controller_Action_H
 
     /**
      * Push a new action onto the stack
-     * 
-     * @param  string $action 
-     * @param  string $controller 
-     * @param  string $module 
+     *
+     * @param  string $action
+     * @param  string $controller
+     * @param  string $module
      * @param  array  $params
-     * @throws Zend_Controller_Action_Exception 
+     * @throws Zend_Controller_Action_Exception
      * @return Zend_Controller_Action_Helper_ActionStack
      */
     public function actionToStack($action, $controller = null, $module = null, array $params = array())
@@ -107,7 +107,7 @@ class Zend_Controller_Action_Helper_ActionStack extends Zend_Controller_Action_H
             require_once 'Zend/Controller/Action/Exception.php';
             throw new Zend_Controller_Action_Exception('Request object not set yet');
         }
-        
+
         $controller = (null === $controller) ? $request->getControllerName() : $controller;
         $module = (null === $module) ? $request->getModuleName() : $module;
 

library/Zend/Controller/Action/Helper/AjaxContext.php

@@ -47,7 +47,7 @@ class Zend_Controller_Action_Helper_AjaxContext extends Zend_Controller_Action_H
      * Constructor
      *
      * Add HTML context
-     * 
+     *
      * @return void
      */
     public function __construct()
@@ -60,8 +60,8 @@ class Zend_Controller_Action_Helper_AjaxContext extends Zend_Controller_Action_H
      * Initialize AJAX context switching
      *
      * Checks for XHR requests; if detected, attempts to perform context switch.
-     * 
-     * @param  string $format 
+     *
+     * @param  string $format
      * @return void
      */
     public function initContext($format = null)

library/Zend/Controller/Action/Helper/AutoComplete/Abstract.php

@@ -46,7 +46,7 @@ abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_
 
     /**
      * Validate autocompletion data
-     * 
+     *
      * @param  mixed $data
      * @return boolean
      */
@@ -54,16 +54,16 @@ abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_
 
     /**
      * Prepare autocompletion data
-     * 
-     * @param  mixed   $data 
-     * @param  boolean $keepLayouts 
+     *
+     * @param  mixed   $data
+     * @param  boolean $keepLayouts
      * @return mixed
      */
     abstract public function prepareAutoCompletion($data, $keepLayouts = false);
 
     /**
      * Disable layouts and view renderer
-     * 
+     *
      * @return Zend_Controller_Action_Helper_AutoComplete_Abstract Provides a fluent interface
      */
     public function disableLayouts()
@@ -83,9 +83,9 @@ abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_
 
     /**
      * Encode data to JSON
-     * 
-     * @param  mixed $data 
-     * @param  bool  $keepLayouts 
+     *
+     * @param  mixed $data
+     * @param  bool  $keepLayouts
      * @throws Zend_Controller_Action_Exception
      * @return string
      */
@@ -105,11 +105,11 @@ abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_
     /**
      * Send autocompletion data
      *
-     * Calls prepareAutoCompletion, populates response body with this 
+     * Calls prepareAutoCompletion, populates response body with this
      * information, and sends response.
-     * 
-     * @param  mixed $data 
-     * @param  bool  $keepLayouts 
+     *
+     * @param  mixed $data
+     * @param  bool  $keepLayouts
      * @return string|void
      */
     public function sendAutoCompletion($data, $keepLayouts = false)
@@ -130,12 +130,12 @@ abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_
     /**
      * Strategy pattern: allow calling helper as broker method
      *
-     * Prepares autocompletion data and, if $sendNow is true, immediately sends 
+     * Prepares autocompletion data and, if $sendNow is true, immediately sends
      * response.
-     * 
-     * @param  mixed $data 
-     * @param  bool  $sendNow 
-     * @param  bool  $keepLayouts 
+     *
+     * @param  mixed $data
+     * @param  bool  $sendNow
+     * @param  bool  $keepLayouts
      * @return string|void
      */
     public function direct($data, $sendNow = true, $keepLayouts = false)

library/Zend/Controller/Action/Helper/AutoCompleteDojo.php

@@ -41,8 +41,8 @@ class Zend_Controller_Action_Helper_AutoCompleteDojo extends Zend_Controller_Act
      * Validate data for autocompletion
      *
      * Stub; unused
-     * 
-     * @param  mixed $data 
+     *
+     * @param  mixed $data
      * @return boolean
      */
     public function validateData($data)
@@ -52,9 +52,9 @@ class Zend_Controller_Action_Helper_AutoCompleteDojo extends Zend_Controller_Act
 
     /**
      * Prepare data for autocompletion
-     * 
-     * @param  mixed   $data 
-     * @param  boolean $keepLayouts 
+     *
+     * @param  mixed   $data
+     * @param  boolean $keepLayouts
      * @return string
      */
     public function prepareAutoCompletion($data, $keepLayouts = false)

library/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php

@@ -39,8 +39,8 @@ class Zend_Controller_Action_Helper_AutoCompleteScriptaculous extends Zend_Contr
 {
     /**
      * Validate data for autocompletion
-     * 
-     * @param  mixed $data 
+     *
+     * @param  mixed $data
      * @return bool
      */
     public function validateData($data)
@@ -54,9 +54,9 @@ class Zend_Controller_Action_Helper_AutoCompleteScriptaculous extends Zend_Contr
 
     /**
      * Prepare data for autocompletion
-     * 
-     * @param  mixed   $data 
-     * @param  boolean $keepLayouts 
+     *
+     * @param  mixed   $data
+     * @param  boolean $keepLayouts
      * @throws Zend_Controller_Action_Exception
      * @return string
      */

library/Zend/Controller/Action/Helper/ContextSwitch.php

@@ -157,9 +157,9 @@ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action
     /**
      * Initialize at start of action controller
      *
-     * Reset the view script suffix to the original state, or store the 
+     * Reset the view script suffix to the original state, or store the
      * original state.
-     * 
+     *
      * @return void
      */
     public function init()

library/Zend/Controller/Action/Helper/FlashMessenger.php

@@ -221,10 +221,10 @@ class Zend_Controller_Action_Helper_FlashMessenger extends Zend_Controller_Actio
             unset(self::$_session->{$this->_namespace});
             return true;
         }
-        
+
         return false;
     }
-    
+
     /**
      * getIterator() - complete the IteratorAggregate interface, for iterating
      *
@@ -255,8 +255,8 @@ class Zend_Controller_Action_Helper_FlashMessenger extends Zend_Controller_Actio
 
     /**
      * Strategy pattern: proxy to addMessage()
-     * 
-     * @param  string $message 
+     *
+     * @param  string $message
      * @return void
      */
     public function direct($message)

library/Zend/Controller/Action/Helper/Url.php

@@ -62,9 +62,9 @@ class Zend_Controller_Action_Helper_Url extends Zend_Controller_Action_Helper_Ab
         if ($module != $this->getFrontController()->getDispatcher()->getDefaultModule()) {
             $url = $module . '/' . $url;
         }
-        
+
         if ('' !== ($baseUrl = $this->getFrontController()->getBaseUrl())) {
-        	$url = $baseUrl . '/' . $url;
+            $url = $baseUrl . '/' . $url;
         }
 
         if (null !== $params) {
@@ -98,7 +98,7 @@ class Zend_Controller_Action_Helper_Url extends Zend_Controller_Action_Helper_Ab
         $router = $this->getFrontController()->getRouter();
         return $router->assemble($urlOptions, $name, $reset, $encode);
     }
-    
+
     /**
      * Perform helper when called as $this->_helper->url() from an action controller
      *

library/Zend/Controller/Action/HelperBroker.php

@@ -60,8 +60,8 @@ class Zend_Controller_Action_HelperBroker
 
     /**
      * Set PluginLoader for use with broker
-     * 
-     * @param  Zend_Loader_PluginLoader_Interface $loader 
+     *
+     * @param  Zend_Loader_PluginLoader_Interface $loader
      * @return void
      */
     public static function setPluginLoader($loader)
@@ -75,7 +75,7 @@ class Zend_Controller_Action_HelperBroker
 
     /**
      * Retrieve PluginLoader
-     * 
+     *
      * @return Zend_Loader_PluginLoader
      */
     public static function getPluginLoader()
@@ -150,7 +150,7 @@ class Zend_Controller_Action_HelperBroker
     {
         $name  = self::_normalizeHelperName($name);
         $stack = self::getStack();
-        
+
         if (!isset($stack->{$name})) {
             self::_loadHelper($name);
         }
@@ -177,7 +177,7 @@ class Zend_Controller_Action_HelperBroker
     {
         $name  = self::_normalizeHelperName($name);
         $stack = self::getStack();
-        
+
         if (!isset($stack->{$name})) {
             require_once 'Zend/Controller/Action/Exception.php';
             throw new Zend_Controller_Action_Exception('Action helper "' . $name . '" has not been registered with the helper broker');
@@ -235,10 +235,10 @@ class Zend_Controller_Action_HelperBroker
         if (self::$_stack == null) {
             self::$_stack = new Zend_Controller_Action_HelperBroker_PriorityStack();
         }
-        
+
         return self::$_stack;
     }
-    
+
     /**
      * Constructor
      *

library/Zend/Controller/Action/HelperBroker/PriorityStack.php

@@ -33,7 +33,7 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
     protected $_helpersByPriority = array();
     protected $_helpersByNameRef  = array();
     protected $_nextDefaultPriority = 1;
-    
+
     /**
      * Magic property overloading for returning helper by name
      *
@@ -45,10 +45,10 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
         if (!array_key_exists($helperName, $this->_helpersByNameRef)) {
             return false;
         }
-        
+
         return $this->_helpersByNameRef[$helperName];
     }
-    
+
     /**
      * Magic property overloading for returning if helper is set by name
      *
@@ -59,7 +59,7 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
     {
         return array_key_exists($helperName, $this->_helpersByNameRef);
     }
-    
+
     /**
      * Magic property overloading for unsetting if helper is exists by name
      *
@@ -70,7 +70,7 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
     {
         return $this->offsetUnset($helperName);
     }
-    
+
     /**
      * push helper onto the stack
      *
@@ -82,7 +82,7 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
         $this->offsetSet($this->getNextFreeHigherPriority(), $helper);
         return $this;
     }
-    
+
     /**
      * Return something iterable
      *
@@ -92,11 +92,11 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
     {
         return new ArrayObject($this->_helpersByPriority);
     }
-    
+
     /**
      * offsetExists()
      *
-     * @param int|string $priorityOrHelperName 
+     * @param int|string $priorityOrHelperName
      * @return Zend_Controller_Action_HelperBroker_PriorityStack
      */
     public function offsetExists($priorityOrHelperName)
@@ -107,7 +107,7 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
             return array_key_exists($priorityOrHelperName, $this->_helpersByPriority);
         }
     }
-    
+
     /**
      * offsetGet()
      *
@@ -120,14 +120,14 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
             require_once 'Zend/Controller/Action/Exception.php';
             throw new Zend_Controller_Action_Exception('A helper with priority ' . $priority . ' does not exist.');
         }
-        
+
         if (is_string($priorityOrHelperName)) {
             return $this->_helpersByNameRef[$priorityOrHelperName];
         } else {
             return $this->_helpersByPriority[$priorityOrHelperName];
         }
     }
-    
+
     /**
      * offsetSet()
      *
@@ -143,29 +143,29 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
             require_once 'Zend/Controller/Action/Exception.php';
             throw new Zend_Controller_Action_Exception('$helper must extend Zend_Controller_Action_Helper_Abstract.');
         }
-        
+
         if (array_key_exists($helper->getName(), $this->_helpersByNameRef)) {
             // remove any object with the same name to retain BC compailitbility
             // @todo At ZF 2.0 time throw an exception here.
             $this->offsetUnset($helper->getName());
         }
-        
+
         if (array_key_exists($priority, $this->_helpersByPriority)) {
             $priority = $this->getNextFreeHigherPriority($priority);  // ensures LIFO
             trigger_error("A helper with the same priority already exists, reassigning to $priority", E_USER_WARNING);
         }
-        
+
         $this->_helpersByPriority[$priority] = $helper;
         $this->_helpersByNameRef[$helper->getName()] = $helper;
 
         if ($priority == ($nextFreeDefault = $this->getNextFreeHigherPriority($this->_nextDefaultPriority))) {
             $this->_nextDefaultPriority = $nextFreeDefault;
         }
-        
+
         krsort($this->_helpersByPriority);  // always make sure priority and LIFO are both enforced
         return $this;
     }
-    
+
     /**
      * offsetUnset()
      *
@@ -178,7 +178,7 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
             require_once 'Zend/Controller/Action/Exception.php';
             throw new Zend_Controller_Action_Exception('A helper with priority or name ' . $priorityOrHelperName . ' does not exist.');
         }
-        
+
         if (is_string($priorityOrHelperName)) {
             $helperName = $priorityOrHelperName;
             $helper = $this->_helpersByNameRef[$helperName];
@@ -187,12 +187,12 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
             $priority = $priorityOrHelperName;
             $helperName = $this->_helpersByPriority[$priorityOrHelperName]->getName();
         }
-        
+
         unset($this->_helpersByNameRef[$helperName]);
         unset($this->_helpersByPriority[$priority]);
         return $this;
     }
-    
+
     /**
      * return the count of helpers
      *
@@ -202,7 +202,7 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
     {
         return count($this->_helpersByPriority);
     }
-    
+
     /**
      * Find the next free higher priority.  If an index is given, it will
      * find the next free highest priority after it.
@@ -215,16 +215,16 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
         if ($indexPriority == null) {
             $indexPriority = $this->_nextDefaultPriority;
         }
-        
+
         $priorities = array_keys($this->_helpersByPriority);
 
         while (in_array($indexPriority, $priorities)) {
             $indexPriority++;
         }
-        
+
         return $indexPriority;
     }
-    
+
     /**
      * Find the next free lower priority.  If an index is given, it will
      * find the next free lower priority before it.
@@ -237,16 +237,16 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
         if ($indexPriority == null) {
             $indexPriority = $this->_nextDefaultPriority;
         }
-        
+
         $priorities = array_keys($this->_helpersByPriority);
 
         while (in_array($indexPriority, $priorities)) {
             $indexPriority--;
         }
-        
-        return $indexPriority;        
+
+        return $indexPriority;
     }
-    
+
     /**
      * return the highest priority
      *
@@ -256,7 +256,7 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
     {
         return max(array_keys($this->_helpersByPriority));
     }
-    
+
     /**
      * return the lowest priority
      *
@@ -266,7 +266,7 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
     {
         return min(array_keys($this->_helpersByPriority));
     }
-    
+
     /**
      * return the helpers referenced by name
      *
@@ -276,5 +276,5 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
     {
         return $this->_helpersByNameRef;
     }
-    
+
 }

library/Zend/Controller/Dispatcher/Interface.php

@@ -185,21 +185,21 @@ interface Zend_Controller_Dispatcher_Interface
 
     /**
      * Retrieve the default module name
-     * 
+     *
      * @return string
      */
     public function getDefaultModule();
 
     /**
      * Retrieve the default controller name
-     * 
+     *
      * @return string
      */
     public function getDefaultControllerName();
 
     /**
      * Retrieve the default action
-     * 
+     *
      * @return string
      */
     public function getDefaultAction();

library/Zend/Controller/Dispatcher/Standard.php

@@ -260,7 +260,7 @@ class Zend_Controller_Dispatcher_Standard extends Zend_Controller_Dispatcher_Abs
          * arguments; throw exception if it's not an action controller
          */
         $controller = new $className($request, $this->getResponse(), $this->getParams());
-        if (!($controller instanceof Zend_Controller_Action_Interface) && 
+        if (!($controller instanceof Zend_Controller_Action_Interface) &&
             !($controller instanceof Zend_Controller_Action)) {
             require_once 'Zend/Controller/Dispatcher/Exception.php';
             throw new Zend_Controller_Dispatcher_Exception(

library/Zend/Controller/Plugin/ActionStack.php

@@ -52,7 +52,7 @@ class Zend_Controller_Plugin_ActionStack extends Zend_Controller_Plugin_Abstract
      * @var array
      */
     protected $_validKeys = array(
-        'module', 
+        'module',
         'controller',
         'action',
         'params'
@@ -83,8 +83,8 @@ class Zend_Controller_Plugin_ActionStack extends Zend_Controller_Plugin_Abstract
 
     /**
      * Set registry object
-     * 
-     * @param  Zend_Registry $registry 
+     *
+     * @param  Zend_Registry $registry
      * @return Zend_Controller_Plugin_ActionStack
      */
     public function setRegistry(Zend_Registry $registry)
@@ -95,7 +95,7 @@ class Zend_Controller_Plugin_ActionStack extends Zend_Controller_Plugin_Abstract
 
     /**
      * Retrieve registry object
-     * 
+     *
      * @return Zend_Registry
      */
     public function getRegistry()
@@ -127,7 +127,7 @@ class Zend_Controller_Plugin_ActionStack extends Zend_Controller_Plugin_Abstract
 
     /**
      * Retrieve action stack
-     * 
+     *
      * @return array
      */
     public function getStack()
@@ -139,8 +139,8 @@ class Zend_Controller_Plugin_ActionStack extends Zend_Controller_Plugin_Abstract
 
     /**
      * Save stack to registry
-     * 
-     * @param  array $stack 
+     *
+     * @param  array $stack
      * @return Zend_Controller_Plugin_ActionStack
      */
     protected function _saveStack(array $stack)
@@ -152,8 +152,8 @@ class Zend_Controller_Plugin_ActionStack extends Zend_Controller_Plugin_Abstract
 
     /**
      * Push an item onto the stack
-     * 
-     * @param  Zend_Controller_Request_Abstract $next 
+     *
+     * @param  Zend_Controller_Request_Abstract $next
      * @return Zend_Controller_Plugin_ActionStack
      */
     public function pushStack(Zend_Controller_Request_Abstract $next)
@@ -165,7 +165,7 @@ class Zend_Controller_Plugin_ActionStack extends Zend_Controller_Plugin_Abstract
 
     /**
      * Pop an item off the action stack
-     * 
+     *
      * @return false|Zend_Controller_Request_Abstract
      */
     public function popStack()
@@ -209,7 +209,7 @@ class Zend_Controller_Plugin_ActionStack extends Zend_Controller_Plugin_Abstract
      */
     public function postDispatch(Zend_Controller_Request_Abstract $request)
     {
-        // Don't move on to next request if this is already an attempt to 
+        // Don't move on to next request if this is already an attempt to
         // forward
         if (!$request->isDispatched()) {
             return;
@@ -230,8 +230,8 @@ class Zend_Controller_Plugin_ActionStack extends Zend_Controller_Plugin_Abstract
 
     /**
      * Forward request with next action
-     * 
-     * @param  array $next 
+     *
+     * @param  array $next
      * @return void
      */
     public function forward(Zend_Controller_Request_Abstract $next)

library/Zend/Controller/Request/HttpTestCase.php

@@ -68,7 +68,7 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
 
     /**
      * Clear GET values
-     * 
+     *
      * @return Zend_Controller_Request_HttpTestCase
      */
     public function clearQuery()
@@ -79,7 +79,7 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
 
     /**
      * Clear POST values
-     * 
+     *
      * @return Zend_Controller_Request_HttpTestCase
      */
     public function clearPost()
@@ -90,8 +90,8 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
 
     /**
      * Set raw POST body
-     * 
-     * @param  string $content 
+     *
+     * @param  string $content
      * @return Zend_Controller_Request_HttpTestCase
      */
     public function setRawBody($content)
@@ -102,7 +102,7 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
 
     /**
      * Get RAW POST body
-     * 
+     *
      * @return string|null
      */
     public function getRawBody()
@@ -112,7 +112,7 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
 
     /**
      * Clear raw POST body
-     * 
+     *
      * @return Zend_Controller_Request_HttpTestCase
      */
     public function clearRawBody()
@@ -123,9 +123,9 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
 
     /**
      * Set a cookie
-     * 
-     * @param  string $key 
-     * @param  mixed $value 
+     *
+     * @param  string $key
+     * @param  mixed $value
      * @return Zend_Controller_Request_HttpTestCase
      */
     public function setCookie($key, $value)
@@ -136,8 +136,8 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
 
     /**
      * Set multiple cookies at once
-     * 
-     * @param array $cookies 
+     *
+     * @param array $cookies
      * @return void
      */
     public function setCookies(array $cookies)
@@ -150,7 +150,7 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
 
     /**
      * Clear all cookies
-     * 
+     *
      * @return Zend_Controller_Request_HttpTestCase
      */
     public function clearCookies()
@@ -161,8 +161,8 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
 
     /**
      * Set request method
-     * 
-     * @param  string $type 
+     *
+     * @param  string $type
      * @return Zend_Controller_Request_HttpTestCase
      */
     public function setMethod($type)
@@ -178,7 +178,7 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
 
     /**
      * Get request method
-     * 
+     *
      * @return string|null
      */
     public function getMethod()
@@ -188,9 +188,9 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
 
     /**
      * Set a request header
-     * 
-     * @param  string $key 
-     * @param  string $value 
+     *
+     * @param  string $key
+     * @param  string $value
      * @return Zend_Controller_Request_HttpTestCase
      */
     public function setHeader($key, $value)
@@ -202,8 +202,8 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
 
     /**
      * Set request headers
-     * 
-     * @param  array $headers 
+     *
+     * @param  array $headers
      * @return Zend_Controller_Request_HttpTestCase
      */
     public function setHeaders(array $headers)
@@ -216,9 +216,9 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
 
     /**
      * Get request header
-     * 
-     * @param  string $header 
-     * @param  mixed $default 
+     *
+     * @param  string $header
+     * @param  mixed $default
      * @return string|null
      */
     public function getHeader($header, $default = null)
@@ -232,7 +232,7 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
 
     /**
      * Get all request headers
-     * 
+     *
      * @return array
      */
     public function getHeaders()
@@ -242,7 +242,7 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
 
     /**
      * Clear request headers
-     * 
+     *
      * @return Zend_Controller_Request_HttpTestCase
      */
     public function clearHeaders()
@@ -253,7 +253,7 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
 
     /**
      * Get REQUEST_URI
-     * 
+     *
      * @return null|string
      */
     public function getRequestUri()
@@ -263,8 +263,8 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
 
     /**
      * Normalize a header name for setting and retrieval
-     * 
-     * @param  string $name 
+     *
+     * @param  string $name
      * @return string
      */
     protected function _normalizeHeaderName($name)

library/Zend/Controller/Request/Simple.php

@@ -32,24 +32,24 @@ require_once 'Zend/Controller/Request/Abstract.php';
  */
 class Zend_Controller_Request_Simple extends Zend_Controller_Request_Abstract
 {
-    
+
     public function __construct($action = null, $controller = null, $module = null, array $params = array())
     {
         if ($action) {
             $this->setActionName($action);
         }
-        
+
         if ($controller) {
             $this->setControllerName($controller);
         }
-        
+
         if ($module) {
             $this->setModuleName($module);
         }
-        
+
         if ($params) {
             $this->setParams($params);
         }
     }
-    
+
 }

library/Zend/Controller/Response/Abstract.php

@@ -87,8 +87,8 @@ abstract class Zend_Controller_Response_Abstract
      * Normalize a header name
      *
      * Normalizes a header name to X-Capitalized-Names
-     * 
-     * @param  string $name 
+     *
+     * @param  string $name
      * @return string
      */
     protected function _normalizeHeader($name)

library/Zend/Controller/Response/HttpTestCase.php

@@ -35,7 +35,7 @@ class Zend_Controller_Response_HttpTestCase extends Zend_Controller_Response_Htt
 {
     /**
      * "send" headers by returning array of all headers that would be sent
-     * 
+     *
      * @return array
      */
     public function sendHeaders()
@@ -60,8 +60,8 @@ class Zend_Controller_Response_HttpTestCase extends Zend_Controller_Response_Htt
 
     /**
      * Can we send headers?
-     * 
-     * @param  bool $throw 
+     *
+     * @param  bool $throw
      * @return void
      */
     public function canSendHeaders($throw = false)
@@ -71,7 +71,7 @@ class Zend_Controller_Response_HttpTestCase extends Zend_Controller_Response_Htt
 
     /**
      * Return the concatenated body segments
-     * 
+     *
      * @return string
      */
     public function outputBody()
@@ -85,8 +85,8 @@ class Zend_Controller_Response_HttpTestCase extends Zend_Controller_Response_Htt
 
     /**
      * Get body and/or body segments
-     * 
-     * @param  bool|string $spec 
+     *
+     * @param  bool|string $spec
      * @return string|array|null
      */
     public function getBody($spec = false)
@@ -105,9 +105,9 @@ class Zend_Controller_Response_HttpTestCase extends Zend_Controller_Response_Htt
     /**
      * "send" Response
      *
-     * Concats all response headers, and then final body (separated by two 
+     * Concats all response headers, and then final body (separated by two
      * newlines)
-     * 
+     *
      * @return string
      */
     public function sendResponse()

library/Zend/Controller/Router/Interface.php

@@ -39,19 +39,19 @@ interface Zend_Controller_Router_Interface
     public function route(Zend_Controller_Request_Abstract $dispatcher);
 
     /**
-     * Generates a URL path that can be used in URL creation, redirection, etc. 
-     * 
-     * May be passed user params to override ones from URI, Request or even defaults. 
+     * Generates a URL path that can be used in URL creation, redirection, etc.
+     *
+     * May be passed user params to override ones from URI, Request or even defaults.
      * If passed parameter has a value of null, it's URL variable will be reset to
-     * default. 
-     * 
+     * default.
+     *
      * If null is passed as a route name assemble will use the current Route or 'default'
      * if current is not yet set.
-     * 
-     * Reset is used to signal that all parameters should be reset to it's defaults. 
+     *
+     * Reset is used to signal that all parameters should be reset to it's defaults.
      * Ignoring all URL specified values. User specified params still get precedence.
-     * 
-     * Encode tells to url encode resulting path parts.     
+     *
+     * Encode tells to url encode resulting path parts.
      *
      * @param  array $userParams Options passed by a user used to override parameters
      * @param  mixed $name The name of a Route to use
@@ -61,7 +61,7 @@ interface Zend_Controller_Router_Interface
      * @return string Resulting URL path
      */
     public function assemble($userParams, $name = null, $reset = false, $encode = true);
-    
+
     /**
      * Retrieve Front Controller
      *
@@ -76,7 +76,7 @@ interface Zend_Controller_Router_Interface
      * @return Zend_Controller_Router_Interface
      */
     public function setFrontController(Zend_Controller_Front $controller);
-    
+
     /**
      * Add or modify a parameter with which to instantiate any helper objects
      *
@@ -120,5 +120,5 @@ interface Zend_Controller_Router_Interface
      * @return Zend_Controller_Router_Interface
      */
     public function clearParams($name = null);
-    
+
 }

library/Zend/Controller/Router/Rewrite.php

@@ -40,42 +40,42 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
 
     /**
      * Whether or not to use default routes
-     * 
+     *
      * @var boolean
      */
     protected $_useDefaultRoutes = true;
 
     /**
      * Array of routes to match against
-     * 
+     *
      * @var array
      */
     protected $_routes = array();
 
     /**
      * Currently matched route
-     * 
+     *
      * @var Zend_Controller_Router_Route_Interface
      */
     protected $_currentRoute = null;
 
     /**
      * Global parameters given to all routes
-     * 
+     *
      * @var array
      */
     protected $_globalParams = array();
-    
+
     /**
      * Separator to use with chain names
-     * 
+     *
      * @var string
      */
     protected $_chainNameSeparator = '-';
-    
+
     /**
      * Add default routes which are used to mimic basic router behaviour
-     * 
+     *
      * @return Zend_Controller_Router_Rewrite
      */
     public function addDefaultRoutes()
@@ -89,27 +89,27 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
 
             $this->_routes = array_merge(array('default' => $compat), $this->_routes);
         }
-        
+
         return $this;
     }
 
     /**
      * Add route to the route chain
-     * 
+     *
      * If route contains method setRequest(), it is initialized with a request object
      *
      * @param  string                                 $name       Name of the route
      * @param  Zend_Controller_Router_Route_Interface $route      Instance of the route
      * @return Zend_Controller_Router_Rewrite
      */
-    public function addRoute($name, Zend_Controller_Router_Route_Interface $route) 
+    public function addRoute($name, Zend_Controller_Router_Route_Interface $route)
     {
         if (method_exists($route, 'setRequest')) {
             $route->setRequest($this->getFrontController()->getRequest());
         }
-        
+
         $this->_routes[$name] = $route;
-        
+
         return $this;
     }
 
@@ -123,7 +123,7 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
         foreach ($routes as $name => $route) {
             $this->addRoute($name, $route);
         }
-        
+
         return $this;
     }
 
@@ -158,30 +158,30 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
                 require_once 'Zend/Controller/Router/Exception.php';
                 throw new Zend_Controller_Router_Exception("No route configuration in section '{$section}'");
             }
-            
+
             $config = $config->{$section};
         }
-        
+
         foreach ($config as $name => $info) {
             $route = $this->_getRouteFromConfig($info);
-            
+
             if ($route instanceof Zend_Controller_Router_Route_Chain) {
                 if (!isset($info->chain)) {
                     require_once 'Zend/Controller/Router/Exception.php';
-                    throw new Zend_Controller_Router_Exception("No chain defined");                    
+                    throw new Zend_Controller_Router_Exception("No chain defined");
                 }
-                
+
                 if ($info->chain instanceof Zend_Config) {
                     $childRouteNames = $info->chain;
                 } else {
                     $childRouteNames = explode(',', $info->chain);
-                } 
-                    
+                }
+
                 foreach ($childRouteNames as $childRouteName) {
                     $childRoute = $this->getRoute(trim($childRouteName));
                     $route->chain($childRoute);
                 }
-                
+
                 $this->addRoute($name, $route);
             } elseif (isset($info->chains) && $info->chains instanceof Zend_Config) {
                 $this->_addChainRoutesFromConfig($name, $route, $info->chains);
@@ -192,7 +192,7 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
 
         return $this;
     }
-    
+
     /**
      * Get a route frm a config instance
      *
@@ -206,16 +206,16 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
             require_once 'Zend/Loader.php';
             Zend_Loader::loadClass($class);
         }
-              
+
         $route = call_user_func(array($class, 'getInstance'), $info);
-        
+
         if (isset($info->abstract) && $info->abstract && method_exists($route, 'isAbstract')) {
             $route->isAbstract(true);
         }
 
         return $route;
     }
-    
+
     /**
      * Add chain routes from a config route
      *
@@ -235,16 +235,16 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
             } else {
                 $childRoute = $this->_getRouteFromConfig($childRouteInfo);
             }
-            
+
             if ($route instanceof Zend_Controller_Router_Route_Chain) {
                 $chainRoute = clone $route;
                 $chainRoute->chain($childRoute);
             } else {
                 $chainRoute = $route->chain($childRoute);
             }
-            
+
             $chainName = $name . $this->_chainNameSeparator . $childRouteName;
-            
+
             if (isset($childRouteInfo->chains)) {
                 $this->_addChainRoutesFromConfig($chainName, $chainRoute, $childRouteInfo->chains);
             } else {
@@ -266,9 +266,9 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
             require_once 'Zend/Controller/Router/Exception.php';
             throw new Zend_Controller_Router_Exception("Route $name is not defined");
         }
-        
+
         unset($this->_routes[$name]);
-        
+
         return $this;
     }
 
@@ -281,7 +281,7 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
     public function removeDefaultRoutes()
     {
         $this->_useDefaultRoutes = false;
-        
+
         return $this;
     }
 
@@ -309,7 +309,7 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
             require_once 'Zend/Controller/Router/Exception.php';
             throw new Zend_Controller_Router_Exception("Route $name is not defined");
         }
-        
+
         return $this->_routes[$name];
     }
 
@@ -377,14 +377,14 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
             if (method_exists($route, 'isAbstract') && $route->isAbstract()) {
                 continue;
             }
-            
-            // TODO: Should be an interface method. Hack for 1.0 BC  
+
+            // TODO: Should be an interface method. Hack for 1.0 BC
             if (!method_exists($route, 'getVersion') || $route->getVersion() == 1) {
                 $match = $request->getPathInfo();
             } else {
                 $match = $request;
             }
-                        
+
             if ($params = $route->match($match)) {
                 $this->_setRequestParams($request, $params);
                 $this->_currentRoute = $name;
@@ -417,14 +417,14 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
 
     /**
      * Generates a URL path that can be used in URL creation, redirection, etc.
-     * 
+     *
      * @param  array $userParams Options passed by a user used to override parameters
      * @param  mixed $name The name of a Route to use
      * @param  bool $reset Whether to reset to the route defaults ignoring URL params
      * @param  bool $encode Tells to encode URL parts on output
      * @throws Zend_Controller_Router_Exception
      * @return string Resulting absolute URL path
-     */ 
+     */
     public function assemble($userParams, $name = null, $reset = false, $encode = true)
     {
         if ($name == null) {
@@ -434,9 +434,9 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
                 $name = 'default';
             }
         }
-        
+
         $params = array_merge($this->_globalParams, $userParams);
-        
+
         $route = $this->getRoute($name);
         $url   = $route->assemble($params, $reset, $encode);
 
@@ -446,10 +446,10 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
 
         return $url;
     }
-    
+
     /**
      * Set a global parameter
-     * 
+     *
      * @param  string $name
      * @param  mixed $value
      * @return Zend_Controller_Router_Rewrite
@@ -457,25 +457,25 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
     public function setGlobalParam($name, $value)
     {
         $this->_globalParams[$name] = $value;
-    
+
         return $this;
     }
-    
+
     /**
      * Set the separator to use with chain names
-     * 
+     *
      * @param  string $separator The separator to use
      * @return Zend_Controller_Router_Rewrite
      */
     public function setChainNameSeparator($separator) {
-    	$this->_chainNameSeparator = $separator;
-    	
-    	return $this;
+        $this->_chainNameSeparator = $separator;
+
+        return $this;
     }
-    
+
     /**
      * Get the separator to use for chain names
-     * 
+     *
      * @return string
      */
     public function getChainNameSeparator() {

library/Zend/Controller/Router/Route.php

@@ -47,28 +47,28 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
      * @var Zend_Translate
      */
     protected $_translator;
-    
+
     /**
      * Default locale
      *
      * @var mixed
      */
     protected static $_defaultLocale;
-    
+
     /**
      * Locale
-     * 
+     *
      * @var mixed
      */
     protected $_locale;
-    
+
     /**
      * Wether this is a translated route or not
      *
      * @var boolean
      */
     protected $_isTranslated = false;
-    
+
     /**
      * Translatable variables
      *
@@ -132,7 +132,7 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
     public function getVersion() {
         return 1;
     }
-    
+
     /**
      * Instantiates route based on passed Zend_Config structure
      *
@@ -174,20 +174,20 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
                         $this->_translatable[] = $name;
                         $this->_isTranslated   = true;
                     }
-                    
+
                     $this->_parts[$pos]     = (isset($reqs[$name]) ? $reqs[$name] : $this->_defaultRegex);
                     $this->_variables[$pos] = $name;
                 } else {
                     if (substr($part, 0, 1) == $this->_urlVariable) {
                         $part = substr($part, 1);
                     }
-                    
+
                     if (substr($part, 0, 1) === '@' && substr($part, 1, 1) !== '@') {
                         $this->_isTranslated = true;
                     }
-                    
+
                     $this->_parts[$pos] = $part;
-                    
+
                     if ($part !== '*') {
                         $this->_staticCount++;
                     }
@@ -208,15 +208,15 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
         if ($this->_isTranslated) {
             $translateMessages = $this->getTranslator()->getMessages();
         }
-        
+
         $pathStaticCount = 0;
         $values          = array();
         $matchedPath     = '';
-        
+
         if (!$partial) {
             $path = trim($path, $this->_urlDelimiter);
         }
-        
+
         if ($path !== '') {
             $path = explode($this->_urlDelimiter, $path);
 
@@ -229,9 +229,9 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
                         return false;
                     }
                 }
-                
+
                 $matchedPath .= $pathPart . $this->_urlDelimiter;
-                
+
                 // If it's a wildcard, get the rest of URL as wildcard data and stop matching
                 if ($this->_parts[$pos] == '*') {
                     $count = count($path);
@@ -253,12 +253,12 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
                     if (substr($part, 0, 1) === '@') {
                         $part = substr($part, 1);
                     }
-                    
+
                     if (($originalPathPart = array_search($pathPart, $translateMessages)) !== false) {
                         $pathPart = $originalPathPart;
                     }
                 }
-                
+
                 if (substr($part, 0, 2) === '@@') {
                     $part = substr($part, 1);
                 }
@@ -278,7 +278,7 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
                     $values[$name] = $pathPart;
                 } else {
                     $pathStaticCount++;
-                }  
+                }
             }
         }
 
@@ -295,11 +295,11 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
                 return false;
             }
         }
-        
+
         $this->setMatchedPath(rtrim($matchedPath, $this->_urlDelimiter));
 
         $this->_values = $values;
-        
+
         return $return;
 
     }
@@ -315,7 +315,7 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
     {
         if ($this->_isTranslated) {
             $translator = $this->getTranslator();
-            
+
             if (isset($data['@locale'])) {
                 $locale = $data['@locale'];
                 unset($data['@locale']);
@@ -323,7 +323,7 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
                 $locale = $this->getLocale();
             }
         }
-        
+
         $url  = array();
         $flag = false;
 
@@ -349,12 +349,12 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
                     require_once 'Zend/Controller/Router/Exception.php';
                     throw new Zend_Controller_Router_Exception($name . ' is not specified');
                 }
-                
+
                 if ($this->_isTranslated && in_array($name, $this->_translatable)) {
                     $url[$key] = $translator->translate($value, $locale);
                 } else {
                     $url[$key] = $value;
-                } 
+                }
             } elseif ($part != '*') {
                 if ($this->_isTranslated && substr($part, 0, 1) === '@') {
                     if (substr($part, 1, 1) !== '@') {
@@ -366,7 +366,7 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
                     if (substr($part, 0, 2) === '@@') {
                         $part = substr($part, 1);
                     }
-                    
+
                     $url[$key] = $part;
                 }
             } else {
@@ -385,15 +385,15 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
 
         foreach (array_reverse($url, true) as $key => $value) {
             $defaultValue = null;
-            
+
             if (isset($this->_variables[$key])) {
                 $defaultValue = $this->getDefault($this->_variables[$key]);
-               
+
                 if ($this->_isTranslated && $defaultValue !== null && isset($this->_translatable[$this->_variables[$key]])) {
                     $defaultValue = $translator->translate($defaultValue, $locale);
                 }
             }
-                
+
             if ($flag || $value !== $defaultValue || $partial) {
                 if ($encode) $value = urlencode($value);
                 $return = $this->_urlDelimiter . $value . $return;
@@ -426,7 +426,7 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
     public function getDefaults() {
         return $this->_defaults;
     }
-    
+
     /**
      * Get all variables which are used by the route
      *
@@ -439,7 +439,7 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
 
     /**
      * Set a default translator
-     * 
+     *
      * @param  Zend_Translate $translator
      * @return void
      */
@@ -447,7 +447,7 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
     {
         self::$_defaultTranslator = $translator;
     }
-    
+
     /**
      * Get the default translator
      *
@@ -457,10 +457,10 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
     {
         return self::$_defaultTranslator;
     }
-    
+
     /**
      * Set a translator
-     * 
+     *
      * @param  Zend_Translate $translator
      * @return void
      */
@@ -468,10 +468,10 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
     {
         $this->_translator = $translator;
     }
-    
+
     /**
      * Get the translator
-     * 
+     *
      * @throws Zend_Controller_Router_Exception When no translator can be found
      * @return Zend_Translate
      */
@@ -487,19 +487,19 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
             } catch (Zend_Exception $e) {
                 $translator = null;
             }
-            
-            if ($translator instanceof Zend_Translate) { 
+
+            if ($translator instanceof Zend_Translate) {
                 return $translator;
             }
         }
-        
+
         require_once 'Zend/Controller/Router/Exception.php';
         throw new Zend_Controller_Router_Exception('Could not find a translator');
     }
-    
+
     /**
      * Set a default locale
-     * 
+     *
      * @param  mixed $locale
      * @return void
      */
@@ -507,7 +507,7 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
     {
         self::$_defaultLocale = $locale;
     }
-    
+
     /**
      * Get the default locale
      *
@@ -517,10 +517,10 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
     {
         return self::$_defaultLocale;
     }
-    
+
     /**
      * Set a locale
-     * 
+     *
      * @param  mixed $locale
      * @return void
      */
@@ -528,10 +528,10 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
     {
         $this->_locale = $locale;
     }
-    
+
     /**
      * Get the locale
-     * 
+     *
      * @return mixed
      */
     public function getLocale()
@@ -546,12 +546,12 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
             } catch (Zend_Exception $e) {
                 $locale = null;
             }
-            
-            if ($locale !== null) { 
+
+            if ($locale !== null) {
                 return $locale;
             }
         }
-        
+
         return null;
     }
 }

library/Zend/Controller/Router/Route/Abstract.php

@@ -50,7 +50,7 @@ abstract class Zend_Controller_Router_Route_Abstract implements Zend_Controller_
      * @var string
      */
     protected $_matchedPath = null;
-    
+
     /**
      * Get the version of the route
      *
@@ -60,7 +60,7 @@ abstract class Zend_Controller_Router_Route_Abstract implements Zend_Controller_
     {
         return 2;
     }
-    
+
     /**
      * Set partially matched path
      *
@@ -71,7 +71,7 @@ abstract class Zend_Controller_Router_Route_Abstract implements Zend_Controller_
     {
         $this->_matchedPath = $path;
     }
-    
+
     /**
      * Get partially matched path
      *
@@ -81,10 +81,10 @@ abstract class Zend_Controller_Router_Route_Abstract implements Zend_Controller_
     {
         return $this->_matchedPath;
     }
-    
+
     /**
      * Check or set wether this is an abstract route or not
-     * 
+     *
      * @param  boolean $flag
      * @return boolean
      */
@@ -93,17 +93,17 @@ abstract class Zend_Controller_Router_Route_Abstract implements Zend_Controller_
         if ($flag !== null) {
             $this->_isAbstract = $flag;
         }
-    
+
         return $this->_isAbstract;
     }
-    
+
     /**
      * Create a new chain
-     * 
+     *
      * @param  Zend_Controller_Router_Route_Abstract $route
      * @param  string                                $separator
      * @return Zend_Controller_Router_Route_Chain
-     */    
+     */
     public function chain(Zend_Controller_Router_Route_Abstract $route, $separator = '/')
     {
         require_once 'Zend/Controller/Router/Route/Chain.php';

library/Zend/Controller/Router/Route/Chain.php

@@ -46,10 +46,10 @@ class Zend_Controller_Router_Route_Chain extends Zend_Controller_Router_Route_Ab
         $defs = ($config->defaults instanceof Zend_Config) ? $config->defaults->toArray() : array();
         return new self($config->route, $defs);
     }
-    
+
     /**
      * Add a route to this chain
-     * 
+     *
      * @param  Zend_Controller_Router_Route_Abstract $route
      * @param  string                                $separator
      * @return Zend_Controller_Router_Route_Chain
@@ -79,29 +79,29 @@ class Zend_Controller_Router_Route_Chain extends Zend_Controller_Router_Route_Ab
         foreach ($this->_routes as $key => $route) {
             if ($key > 0 && $matchedPath !== null) {
                 $separator = substr($subPath, 0, strlen($this->_separators[$key]));
-                
+
                 if ($separator !== $this->_separators[$key]) {
-                    return false;                
+                    return false;
                 }
-                
+
                 $subPath = substr($subPath, strlen($separator));
             }
-            
-            // TODO: Should be an interface method. Hack for 1.0 BC  
+
+            // TODO: Should be an interface method. Hack for 1.0 BC
             if (!method_exists($route, 'getVersion') || $route->getVersion() == 1) {
                 $match = $subPath;
             } else {
                 $request->setPathInfo($subPath);
-                $match = $request;                
+                $match = $request;
             }
-            
+
             $res = $route->match($match, true);
             if ($res === false) {
                 return false;
             }
-            
+
             $matchedPath = $route->getMatchedPath();
-            
+
             if ($matchedPath !== null) {
                 $subPath     = substr($subPath, strlen($matchedPath));
                 $separator   = substr($subPath, 0, strlen($this->_separators[$key]));
@@ -109,9 +109,9 @@ class Zend_Controller_Router_Route_Chain extends Zend_Controller_Router_Route_Ab
 
             $values = $res + $values;
         }
-        
+
         $request->setPathInfo($path);
-        
+
         if ($subPath !== '' && $subPath !== false) {
             return false;
         }
@@ -129,17 +129,17 @@ class Zend_Controller_Router_Route_Chain extends Zend_Controller_Router_Route_Ab
     {
         $value     = '';
         $numRoutes = count($this->_routes);
-        
+
         foreach ($this->_routes as $key => $route) {
             if ($key > 0) {
                 $value .= $this->_separators[$key];
             }
-            
+
             $value .= $route->assemble($data, $reset, $encode, (($numRoutes - 1) > $key));
-            
+
             if (method_exists($route, 'getVariables')) {
                 $variables = $route->getVariables();
-                
+
                 foreach ($variables as $variable) {
                     $data[$variable] = null;
                 }
@@ -151,7 +151,7 @@ class Zend_Controller_Router_Route_Chain extends Zend_Controller_Router_Route_Ab
 
     /**
      * Set the request object for this and the child routes
-     * 
+     *
      * @param  Zend_Controller_Request_Abstract|null $request
      * @return void
      */

library/Zend/Controller/Router/Route/Module.php

@@ -80,11 +80,11 @@ class Zend_Controller_Router_Route_Module extends Zend_Controller_Router_Route_A
     public static function getInstance(Zend_Config $config)
     {
         $frontController = Zend_Controller_Front::getInstance();
-        
+
         $defs       = ($config->defaults instanceof Zend_Config) ? $config->defaults->toArray() : array();
         $dispatcher = $frontController->getDispatcher();
         $request    = $frontController->getRequest();
-        
+
         return new self($defs, $dispatcher, $request);
     }
 
@@ -151,7 +151,7 @@ class Zend_Controller_Router_Route_Module extends Zend_Controller_Router_Route_A
 
         $values = array();
         $params = array();
-        
+
         if (!$partial) {
             $path = trim($path, self::URI_DELIMITER);
         } else {
@@ -182,7 +182,7 @@ class Zend_Controller_Router_Route_Module extends Zend_Controller_Router_Route_A
                 }
             }
         }
-        
+
         if ($partial) {
             $this->setMatchedPath($matchedPath);
         }

library/Zend/Controller/Router/Route/Regex.php

@@ -63,7 +63,7 @@ class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Ab
     public function getVersion() {
         return 1;
     }
-    
+
     /**
      * Matches a user submitted path with a previously defined route.
      * Assigns and returns an array of defaults on a successful match.
@@ -79,13 +79,13 @@ class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Ab
         } else {
             $regex = '#^' . $this->_regex . '#i';
         }
-        
+
         $res = preg_match($regex, $path, $values);
-        
+
         if ($res === 0) {
             return false;
         }
-        
+
         if ($partial) {
             $this->setMatchedPath($values[0]);
         }
@@ -185,7 +185,7 @@ class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Ab
             foreach ($mergedData as $key => &$value) {
                 $value = urlencode($value);
             }
-        }	
+        }
 
         ksort($mergedData);
 
@@ -220,7 +220,7 @@ class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Ab
     public function getDefaults() {
         return $this->_defaults;
     }
-    
+
     /**
      * Get all variables which are used by the route
      *
@@ -229,7 +229,7 @@ class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Ab
     public function getVariables()
     {
         $variables = array();
-        
+
         foreach ($this->_map as $key => $value) {
             if (is_numeric($key)) {
                 $variables[] = $value;
@@ -237,7 +237,7 @@ class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Ab
                 $variables[] = $key;
             }
         }
-        
+
         return $variables;
     }
 

library/Zend/Controller/Router/Route/Static.php

@@ -42,7 +42,7 @@ class Zend_Controller_Router_Route_Static extends Zend_Controller_Router_Route_A
     public function getVersion() {
         return 1;
     }
-    
+
     /**
      * Instantiates route based on passed Zend_Config structure
      *
@@ -85,7 +85,7 @@ class Zend_Controller_Router_Route_Static extends Zend_Controller_Router_Route_A
                 return $this->_defaults;
             }
         }
-        
+
         return false;
     }
 

library/Zend/Db/Adapter/Abstract.php

@@ -209,7 +209,7 @@ abstract class Zend_Db_Adapter_Abstract
         if (!isset($config['charset'])) {
             $config['charset'] = null;
         }
-        
+
         if (!isset($config['persistent'])) {
             $config['persistent'] = false;
         }

library/Zend/Db/Adapter/Db2.php

@@ -373,7 +373,7 @@ class Zend_Db_Adapter_Db2 extends Zend_Db_Adapter_Abstract
         if ($schemaName === null && $this->_config['schema'] != null) {
             $schemaName = $this->_config['schema'];
         }
-        
+
         if (!$this->_isI5) {
 
             $sql = "SELECT DISTINCT c.tabschema, c.tabname, c.colname, c.colno,
@@ -402,14 +402,14 @@ class Zend_Db_Adapter_Db2 extends Zend_Db_Adapter_Abstract
             $sql = "SELECT DISTINCT C.TABLE_SCHEMA, C.TABLE_NAME, C.COLUMN_NAME, C.ORDINAL_POSITION,
                 C.DATA_TYPE, C.COLUMN_DEFAULT, C.NULLS ,C.LENGTH, C.SCALE, LEFT(C.IDENTITY,1),
                 LEFT(tc.TYPE, 1) AS tabconsttype, k.COLSEQ
-                FROM QSYS2.SYSCOLUMNS C     
+                FROM QSYS2.SYSCOLUMNS C
                 LEFT JOIN (QSYS2.syskeycst k JOIN QSYS2.SYSCST tc
                     ON (k.TABLE_SCHEMA = tc.TABLE_SCHEMA
                       AND k.TABLE_NAME = tc.TABLE_NAME
-                      AND LEFT(tc.type,1) = 'P'))                  
+                      AND LEFT(tc.type,1) = 'P'))
                     ON (C.TABLE_SCHEMA = k.TABLE_SCHEMA
                        AND C.TABLE_NAME = k.TABLE_NAME
-                       AND C.COLUMN_NAME = k.COLUMN_NAME)                          
+                       AND C.COLUMN_NAME = k.COLUMN_NAME)
                 WHERE "
                  . $this->quoteInto('UPPER(C.TABLE_NAME) = UPPER(?)', $tableName);
 

library/Zend/Db/Adapter/Oracle.php

@@ -120,7 +120,7 @@ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract
         }
 
         $connectionFuncName = ($this->_config['persistent'] == true) ? 'oci_pconnect' : 'oci_connect';
-        
+
         $this->_connection = @$connectionFuncName(
                 $this->_config['username'],
                 $this->_config['password'],

library/Zend/Db/Adapter/Pdo/Abstract.php

@@ -119,7 +119,7 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract
         if (isset($this->_config['persistent']) && ($this->_config['persistent'] == true)) {
             $this->_config['driver_options'][PDO::ATTR_PERSISTENT] = true;
         }
-        
+
         try {
             $this->_connection = new PDO(
                 $dsn,
@@ -258,10 +258,10 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract
         if ($sql instanceof Zend_Db_Select) {
             $sql = $sql->assemble();
         }
-        
+
         try {
             $affected = $this->getConnection()->exec($sql);
-            
+
             if ($affected === false) {
                 $errorInfo = $this->getConnection()->errorInfo();
                 /**
@@ -270,7 +270,7 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract
                 require_once 'Zend/Db/Adapter/Exception.php';
                 throw new Zend_Db_Adapter_Exception($errorInfo[2]);
             }
-            
+
             return $affected;
         } catch (PDOException $e) {
             /**

library/Zend/Db/Profiler/Firebug.php

@@ -31,7 +31,7 @@ require_once 'Zend/Wildfire/Plugin/FirePhp/TableMessage.php';
 
 /**
  * Writes DB events as log messages to the Firebug Console via FirePHP.
- * 
+ *
  * @category   Zend
  * @package    Zend_Db
  * @subpackage Profiler
@@ -45,25 +45,25 @@ class Zend_Db_Profiler_Firebug extends Zend_Db_Profiler
      * @var string
      */
     protected $_label = null;
-    
+
     /**
      * The label template for this profiler
      * @var string
      */
     protected $_label_template = '%label% (%totalCount% @ %totalDuration% sec)';
-  
+
     /**
      * The message envelope holding the profiling summary
      * @var Zend_Wildfire_Plugin_FirePhp_TableMessage
      */
     protected $_message = null;
-  
+
     /**
      * The total time taken for all profiled queries.
      * @var float
      */
     protected $_totalElapsedTime = 0;
-  
+
     /**
      * Constructor
      *
@@ -90,7 +90,7 @@ class Zend_Db_Profiler_Firebug extends Zend_Db_Profiler
         parent::setEnabled($enable);
 
         if ($this->getEnabled()) {
-          
+
             if (!$this->_message) {
                 $this->_message = new Zend_Wildfire_Plugin_FirePhp_TableMessage($this->_label);
                 $this->_message->setBuffered(true);
@@ -106,7 +106,7 @@ class Zend_Db_Profiler_Firebug extends Zend_Db_Profiler
                 $this->_message->setDestroy(true);
                 $this->_message = null;
             }
-          
+
         }
 
         return $this;
@@ -122,7 +122,7 @@ class Zend_Db_Profiler_Firebug extends Zend_Db_Profiler
     public function queryEnd($queryId)
     {
         parent::queryEnd($queryId);
-        
+
         if (!$this->getEnabled()) {
             return;
         }
@@ -130,19 +130,19 @@ class Zend_Db_Profiler_Firebug extends Zend_Db_Profiler
         $this->_message->setDestroy(false);
 
         $profile = $this->getQueryProfile($queryId);
-        
+
         $this->_totalElapsedTime += $profile->getElapsedSecs();
-        
+
         $this->_message->addRow(array((string)round($profile->getElapsedSecs(),5),
                                       $profile->getQuery(),
                                       ($params=$profile->getQueryParams())?$params:null));
-                                      
+
         $this->updateMessageLabel();
     }
-    
+
     /**
      * Update the label of the message holding the profile info.
-     * 
+     *
      * @return void
      */
     protected function updateMessageLabel()

library/Zend/Db/Select.php

@@ -173,7 +173,7 @@ class Zend_Db_Select
      */
     public function getBind()
     {
-    	return $this->_bind;
+        return $this->_bind;
     }
 
     /**
@@ -184,9 +184,9 @@ class Zend_Db_Select
      */
     public function bind($bind)
     {
-    	$this->_bind = $bind;
+        $this->_bind = $bind;
 
-    	return $this;
+        return $this;
     }
 
     /**

library/Zend/Db/Statement/Db2.php

@@ -158,7 +158,7 @@ class Zend_Db_Statement_Db2 extends Zend_Db_Statement
 
         $error = db2_stmt_error();
         if ($error === '') {
-        	return false;
+            return false;
         }
 
         return $error;
@@ -172,10 +172,10 @@ class Zend_Db_Statement_Db2 extends Zend_Db_Statement
      */
     public function errorInfo()
     {
-    	$error = $this->errorCode();
-    	if ($error === false){
-    		return false;
-    	}
+        $error = $this->errorCode();
+        if ($error === false){
+            return false;
+        }
 
         /*
          * Return three-valued array like PDO.  But DB2 does not distinguish

library/Zend/Db/Statement/Mysqli.php

@@ -26,7 +26,7 @@
  */
 require_once 'Zend/Db/Statement.php';
 
-    
+
 /**
  * Extends for Mysqli
  *

library/Zend/Db/Table.php

@@ -47,7 +47,7 @@ class Zend_Db_Table extends Zend_Db_Table_Abstract
      *
      * @param string|array $config string can reference a Zend_Registry key for a db adapter
      *                             OR it can reference the name of a table
-     * @param array|Zend_Db_Table_Definition $definition 
+     * @param array|Zend_Db_Table_Definition $definition
      */
     public function __construct($config = array(), $definition = null)
     {

library/Zend/Db/Table/Abstract.php

@@ -93,14 +93,14 @@ abstract class Zend_Db_Table_Abstract
      * @var unknown_type
      */
     protected $_definition = null;
-    
+
     /**
      * Optional definition config name used in concrete implementation
      *
      * @var string
      */
     protected $_definitionConfigName = null;
-    
+
     /**
      * Default cache for information provided by the adapter's describeTable() method.
      *
@@ -326,7 +326,7 @@ abstract class Zend_Db_Table_Abstract
 
         return $this;
     }
-    
+
     /**
      * setDefinition()
      *
@@ -338,7 +338,7 @@ abstract class Zend_Db_Table_Abstract
         $this->_definition = $definition;
         return $this;
     }
-    
+
     /**
      * getDefinition()
      *
@@ -348,7 +348,7 @@ abstract class Zend_Db_Table_Abstract
     {
         return $this->_definition;
     }
-    
+
     /**
      * setDefinitionConfigName()
      *
@@ -360,7 +360,7 @@ abstract class Zend_Db_Table_Abstract
         $this->_definitionConfigName = $definitionConfigName;
         return $this;
     }
-    
+
     /**
      * getDefinitionConfigName()
      *

library/Zend/Db/Table/Definition.php

@@ -31,12 +31,12 @@
  */
 class Zend_Db_Table_Definition
 {
-    
+
     /**
      * @var array
      */
     protected $_tableConfigs = array();
-    
+
     /**
      * __construct()
      *
@@ -50,7 +50,7 @@ class Zend_Db_Table_Definition
             $this->setOptions($options);
         }
     }
-    
+
     /**
      * setConfig()
      *
@@ -62,7 +62,7 @@ class Zend_Db_Table_Definition
         $this->setOptions($config->toArray());
         return $this;
     }
-    
+
     /**
      * setOptions()
      *
@@ -76,7 +76,7 @@ class Zend_Db_Table_Definition
         }
         return $this;
     }
-    
+
     /**
      * @param string $tableName
      * @param array  $tableConfig
@@ -87,15 +87,15 @@ class Zend_Db_Table_Definition
         // @todo logic here
         $tableConfig[Zend_Db_Table::DEFINITION_CONFIG_NAME] = $tableName;
         $tableConfig[Zend_Db_Table::DEFINITION] = $this;
-        
+
         if (!isset($tableConfig[Zend_Db_Table::NAME])) {
             $tableConfig[Zend_Db_Table::NAME] = $tableName;
         }
-        
+
         $this->_tableConfigs[$tableName] = $tableConfig;
         return $this;
     }
-    
+
     /**
      * getTableConfig()
      *
@@ -106,7 +106,7 @@ class Zend_Db_Table_Definition
     {
         return $this->_tableConfigs[$tableName];
     }
-    
+
     /**
      * removeTableConfig()
      *
@@ -116,7 +116,7 @@ class Zend_Db_Table_Definition
     {
         unset($this->_tableConfigs[$tableName]);
     }
-    
+
     /**
      * hasTableConfig()
      *

library/Zend/Db/Table/Row/Abstract.php

@@ -472,9 +472,9 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess
         if (is_array($primaryKey)) {
             $newPrimaryKey = $primaryKey;
         } else {
-        	//ZF-6167 Use tempPrimaryKey temporary to avoid that zend encoding fails.
+            //ZF-6167 Use tempPrimaryKey temporary to avoid that zend encoding fails.
             $tempPrimaryKey = (array) $this->_primary;
-        	$newPrimaryKey = array(current($tempPrimaryKey) => $primaryKey);
+            $newPrimaryKey = array(current($tempPrimaryKey) => $primaryKey);
         }
 
         /**
@@ -865,7 +865,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess
         if (is_string($dependentTable)) {
             $dependentTable = $this->_getTableFromString($dependentTable);
         }
-        
+
         if (!$dependentTable instanceof Zend_Db_Table_Abstract) {
             $type = gettype($dependentTable);
             if ($type == 'object') {
@@ -921,7 +921,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess
         if (is_string($parentTable)) {
             $parentTable = $this->_getTableFromString($parentTable);
         }
-        
+
         if (!$parentTable instanceof Zend_Db_Table_Abstract) {
             $type = gettype($parentTable);
             if ($type == 'object') {
@@ -937,7 +937,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess
             && ($parentTable->getDefinition() == null)) {
             $parentTable->setOptions(array(Zend_Db_Table_Abstract::DEFINITION => $tableDefinition));
         }
-        
+
         if ($select === null) {
             $select = $parentTable->select();
         } else {
@@ -955,7 +955,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess
             $parentColumnName = $parentDb->foldCase($map[Zend_Db_Table_Abstract::REF_COLUMNS][$i]);
             $parentColumn = $parentDb->quoteIdentifier($parentColumnName, true);
             $parentInfo = $parentTable->info();
-            
+
             // determine where part
             $type     = $parentInfo[Zend_Db_Table_Abstract::METADATA][$parentColumnName]['DATA_TYPE'];
             $nullable = $parentInfo[Zend_Db_Table_Abstract::METADATA][$parentColumnName]['NULLABLE'];
@@ -966,7 +966,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess
             } else {
                 $select->where("$parentColumn = ?", $value, $type);
             }
-            
+
         }
 
         return $parentTable->fetchRow($select);
@@ -989,7 +989,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess
         if (is_string($intersectionTable)) {
             $intersectionTable = $this->_getTableFromString($intersectionTable);
         }
-        
+
         if (!$intersectionTable instanceof Zend_Db_Table_Abstract) {
             $type = gettype($intersectionTable);
             if ($type == 'object') {
@@ -1005,11 +1005,11 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess
             && ($intersectionTable->getDefinition() == null)) {
             $intersectionTable->setOptions(array(Zend_Db_Table_Abstract::DEFINITION => $tableDefinition));
         }
-        
+
         if (is_string($matchTable)) {
             $matchTable = $this->_getTableFromString($matchTable);
         }
-        
+
         if (! $matchTable instanceof Zend_Db_Table_Abstract) {
             $type = gettype($matchTable);
             if ($type == 'object') {
@@ -1025,7 +1025,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess
             && ($matchTable->getDefinition() == null)) {
             $matchTable->setOptions(array(Zend_Db_Table_Abstract::DEFINITION => $tableDefinition));
         }
-        
+
         if ($select === null) {
             $select = $matchTable->select();
         } else {
@@ -1164,12 +1164,12 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess
 
         if ($this->_table instanceof Zend_Db_Table_Abstract) {
             $tableDefinition = $this->_table->getDefinition();
-            
+
             if ($tableDefinition !== null && $tableDefinition->hasTableConfig($tableName)) {
                 return new Zend_Db_Table($tableName, $tableDefinition);
-            } 
+            }
         }
-                
+
         // assume the tableName is the class name
         if (!class_exists($tableName)) {
             try {
@@ -1182,11 +1182,11 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess
         }
 
         $options = array();
-        
+
         if (($table = $this->_getTable())) {
             $options['db'] = $table->getAdapter();
         }
-        
+
         if (isset($tableDefinition) && $tableDefinition !== null) {
             $options[Zend_Db_Table_Abstract::DEFINITION] = $tableDefinition;
         }

library/Zend/Dojo.php

@@ -20,7 +20,7 @@
 
 /**
  * Enable Dojo components
- * 
+ *
  * @package    Zend_Dojo
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
@@ -50,8 +50,8 @@ class Zend_Dojo
 
     /**
      * Dojo-enable a form instance
-     * 
-     * @param  Zend_Form $form 
+     *
+     * @param  Zend_Form $form
      * @return void
      */
     public static function enableForm(Zend_Form $form)
@@ -73,8 +73,8 @@ class Zend_Dojo
 
     /**
      * Dojo-enable a view instance
-     * 
-     * @param  Zend_View_Interface $view 
+     *
+     * @param  Zend_View_Interface $view
      * @return void
      */
     public static function enableView(Zend_View_Interface $view)

library/Zend/Dojo/BuildLayer.php

@@ -21,7 +21,7 @@
 
 /**
  * Dojo module layer and custom build profile generation support
- * 
+ *
  * @package    Zend_Dojo
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
@@ -29,15 +29,15 @@
 class Zend_Dojo_BuildLayer
 {
     /**
-     * Flag: whether or not to consume JS aggregated in the dojo() view 
+     * Flag: whether or not to consume JS aggregated in the dojo() view
      * helper when generate the module layer contents
      * @var bool
      */
     protected $_consumeJavascript = false;
 
     /**
-     * Flag: whether or not to consume dojo.addOnLoad events registered 
-     * with the dojo() view helper when generating the module layer file 
+     * Flag: whether or not to consume dojo.addOnLoad events registered
+     * with the dojo() view helper when generating the module layer file
      * contents
      * @var bool
      */
@@ -56,7 +56,7 @@ class Zend_Dojo_BuildLayer
     protected $_layerName;
 
     /**
-     * Path to the custom layer script relative to dojo.js (used when 
+     * Path to the custom layer script relative to dojo.js (used when
      * creating the build profile)
      * @var string
      */
@@ -89,8 +89,8 @@ class Zend_Dojo_BuildLayer
 
     /**
      * Constructor
-     * 
-     * @param  array|Zend_Config $options 
+     *
+     * @param  array|Zend_Config $options
      * @return void
      * @throws Zend_Dojo_Exception for invalid option argument
      */
@@ -111,8 +111,8 @@ class Zend_Dojo_BuildLayer
      * Set options
      *
      * Proxies to any setter that matches an option key.
-     * 
-     * @param  array $options 
+     *
+     * @param  array $options
      * @return Zend_Dojo_BuildLayer
      */
     public function setOptions(array $options)
@@ -129,8 +129,8 @@ class Zend_Dojo_BuildLayer
 
     /**
      * Set View object
-     * 
-     * @param  Zend_View_Interface $view 
+     *
+     * @param  Zend_View_Interface $view
      * @return Zend_Dojo_BuildLayer
      */
     public function setView(Zend_View_Interface $view)
@@ -141,7 +141,7 @@ class Zend_Dojo_BuildLayer
 
     /**
      * Retrieve view object
-     * 
+     *
      * @return Zend_View_Interface|null
      */
     public function getView()
@@ -151,8 +151,8 @@ class Zend_Dojo_BuildLayer
 
     /**
      * Set dojo() view helper instance
-     * 
-     * @param  Zend_Dojo_View_Helper_Dojo_Container $helper 
+     *
+     * @param  Zend_Dojo_View_Helper_Dojo_Container $helper
      * @return Zend_Dojo_BuildLayer
      */
     public function setDojoHelper(Zend_Dojo_View_Helper_Dojo_Container $helper)
@@ -165,7 +165,7 @@ class Zend_Dojo_BuildLayer
      * Retrieve dojo() view helper instance
      *
      * Will retrieve it from the view object if not registered.
-     * 
+     *
      * @return Zend_Dojo_View_Helper_Dojo_Container
      * @throws Zend_Dojo_Exception if not registered and no view object found
      */
@@ -184,8 +184,8 @@ class Zend_Dojo_BuildLayer
 
     /**
      * Set custom layer name; e.g. "custom.main"
-     * 
-     * @param  string $name 
+     *
+     * @param  string $name
      * @return Zend_Dojo_BuildLayer
      */
     public function setLayerName($name)
@@ -200,7 +200,7 @@ class Zend_Dojo_BuildLayer
 
     /**
      * Retrieve custom layer name
-     * 
+     *
      * @return string|null
      */
     public function getLayerName()
@@ -212,8 +212,8 @@ class Zend_Dojo_BuildLayer
      * Set the path to the custom layer script
      *
      * Should be a path relative to dojo.js
-     * 
-     * @param  string $path 
+     *
+     * @param  string $path
      * @return Zend_Dojo_BuildLayer
      */
     public function setLayerScriptPath($path)
@@ -224,7 +224,7 @@ class Zend_Dojo_BuildLayer
 
     /**
      * Get custom layer script path
-     * 
+     *
      * @return string|null
      */
     public function getLayerScriptPath()
@@ -233,10 +233,10 @@ class Zend_Dojo_BuildLayer
     }
 
     /**
-     * Set flag indicating whether or not to consume JS aggregated in dojo() 
+     * Set flag indicating whether or not to consume JS aggregated in dojo()
      * view helper
-     * 
-     * @param  bool $flag 
+     *
+     * @param  bool $flag
      * @return Zend_Dojo_BuildLayer
      */
     public function setConsumeJavascript($flag)
@@ -246,9 +246,9 @@ class Zend_Dojo_BuildLayer
     }
 
     /**
-     * Get flag indicating whether or not to consume JS aggregated in dojo() 
+     * Get flag indicating whether or not to consume JS aggregated in dojo()
      * view helper
-     * 
+     *
      * @return bool
      */
     public function consumeJavascript()
@@ -257,10 +257,10 @@ class Zend_Dojo_BuildLayer
     }
 
     /**
-     * Set flag indicating whether or not to consume dojo.addOnLoad events 
+     * Set flag indicating whether or not to consume dojo.addOnLoad events
      * aggregated in dojo() view helper
-     * 
-     * @param  bool $flag 
+     *
+     * @param  bool $flag
      * @return Zend_Dojo_BuildLayer
      */
     public function setConsumeOnLoad($flag)
@@ -271,7 +271,7 @@ class Zend_Dojo_BuildLayer
 
     /**
      * Get flag indicating whether or not to consume dojo.addOnLoad events aggregated in dojo() view helper
-     * 
+     *
      * @return bool
      */
     public function consumeOnLoad()
@@ -281,8 +281,8 @@ class Zend_Dojo_BuildLayer
 
     /**
      * Set many build profile options at once
-     * 
-     * @param  array $options 
+     *
+     * @param  array $options
      * @return Zend_Dojo_BuildLayer
      */
     public function setProfileOptions(array $options)
@@ -293,8 +293,8 @@ class Zend_Dojo_BuildLayer
 
     /**
      * Add many build profile options at once
-     * 
-     * @param  array $options 
+     *
+     * @param  array $options
      * @return Zend_Dojo_BuildLayer
      */
     public function addProfileOptions(array $options)
@@ -305,9 +305,9 @@ class Zend_Dojo_BuildLayer
 
     /**
      * Add a single build profile option
-     * 
-     * @param  string $key 
-     * @param  value $value 
+     *
+     * @param  string $key
+     * @param  value $value
      * @return Zend_Dojo_BuildLayer
      */
     public function addProfileOption($key, $value)
@@ -318,8 +318,8 @@ class Zend_Dojo_BuildLayer
 
     /**
      * Is a given build profile option set?
-     * 
-     * @param  string $key 
+     *
+     * @param  string $key
      * @return bool
      */
     public function hasProfileOption($key)
@@ -331,8 +331,8 @@ class Zend_Dojo_BuildLayer
      * Retrieve a single build profile option
      *
      * Returns null if profile option does not exist.
-     * 
-     * @param  string $key 
+     *
+     * @param  string $key
      * @return mixed
      */
     public function getProfileOption($key)
@@ -345,7 +345,7 @@ class Zend_Dojo_BuildLayer
 
     /**
      * Get all build profile options
-     * 
+     *
      * @return array
      */
     public function getProfileOptions()
@@ -355,8 +355,8 @@ class Zend_Dojo_BuildLayer
 
     /**
      * Remove a build profile option
-     * 
-     * @param  string $name 
+     *
+     * @param  string $name
      * @return Zend_Dojo_BuildLayer
      */
     public function removeProfileOption($name)
@@ -369,7 +369,7 @@ class Zend_Dojo_BuildLayer
 
     /**
      * Remove all build profile options
-     * 
+     *
      * @return Zend_Dojo_BuildLayer
      */
     public function clearProfileOptions()
@@ -382,9 +382,9 @@ class Zend_Dojo_BuildLayer
      * Add a build profile dependency prefix
      *
      * If just the prefix is passed, sets path to "../$prefix".
-     * 
-     * @param  string $prefix 
-     * @param  null|string $path 
+     *
+     * @param  string $prefix
+     * @param  null|string $path
      * @return Zend_Dojo_BuildLayer
      */
     public function addProfilePrefix($prefix, $path = null)
@@ -398,8 +398,8 @@ class Zend_Dojo_BuildLayer
 
     /**
      * Set multiple dependency prefixes for bulid profile
-     * 
-     * @param  array $prefixes 
+     *
+     * @param  array $prefixes
      * @return Zend_Dojo_BuildLayer
      */
     public function setProfilePrefixes(array $prefixes)
@@ -412,7 +412,7 @@ class Zend_Dojo_BuildLayer
 
     /**
      * Get build profile dependency prefixes
-     * 
+     *
      * @return array
      */
     public function getProfilePrefixes()
@@ -442,7 +442,7 @@ class Zend_Dojo_BuildLayer
 
     /**
      * Generate module layer script
-     * 
+     *
      * @return string
      */
     public function generateLayerScript()
@@ -482,7 +482,7 @@ class Zend_Dojo_BuildLayer
 
     /**
      * Generate build profile
-     * 
+     *
      * @return string
      */
     public function generateBuildProfile()
@@ -509,8 +509,8 @@ class Zend_Dojo_BuildLayer
 
     /**
      * Retrieve module prefix
-     * 
-     * @param  string $module 
+     *
+     * @param  string $module
      * @return void
      */
     protected function _getPrefix($module)
@@ -521,8 +521,8 @@ class Zend_Dojo_BuildLayer
 
     /**
      * Filter a JSON build profile to JavaScript
-     * 
-     * @param  string $profile 
+     *
+     * @param  string $profile
      * @return string
      */
     protected function _filterJsonProfileToJavascript($profile)

library/Zend/Dojo/Data.php

@@ -21,7 +21,7 @@
 
 /**
  * dojo.data support for Zend Framework
- * 
+ *
  * @uses       ArrayAccess
  * @uses       Iterator
  * @uses       Countable
@@ -29,7 +29,7 @@
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Dojo_Data implements ArrayAccess,Iterator,Countable 
+class Zend_Dojo_Data implements ArrayAccess,Iterator,Countable
 {
     /**
      * Identifier field of item
@@ -57,25 +57,25 @@ class Zend_Dojo_Data implements ArrayAccess,Iterator,Countable
 
     /**
      * Constructor
-     * 
-     * @param  string|null $identifier 
-     * @param  array|Traversable|null $items 
-     * @param  string|null $label 
+     *
+     * @param  string|null $identifier
+     * @param  array|Traversable|null $items
+     * @param  string|null $label
      * @return void
      */
-    public function __construct($identifier = null, $items = null, $label = null) 
-    { 
-        if (null !== $identifier) { 
-            $this->setIdentifier($identifier); 
-        } 
-        if (null !== $items) { 
-            $this->setItems($items); 
-        } 
-        if (null !== $label) { 
-            $this->setLabel($label); 
-        } 
-    } 
- 
+    public function __construct($identifier = null, $items = null, $label = null)
+    {
+        if (null !== $identifier) {
+            $this->setIdentifier($identifier);
+        }
+        if (null !== $items) {
+            $this->setItems($items);
+        }
+        if (null !== $label) {
+            $this->setLabel($label);
+        }
+    }
+
     /**
      * Set the items to collect
      *
@@ -157,8 +157,8 @@ class Zend_Dojo_Data implements ArrayAccess,Iterator,Countable
 
     /**
      * Does an item with the given identifier exist?
-     * 
-     * @param  string|int $id 
+     *
+     * @param  string|int $id
      * @return bool
      */
     public function hasItem($id)
@@ -209,7 +209,7 @@ class Zend_Dojo_Data implements ArrayAccess,Iterator,Countable
         return $this;
     }
 
- 
+
     /**
      * Set identifier for item lookups
      *
@@ -242,7 +242,7 @@ class Zend_Dojo_Data implements ArrayAccess,Iterator,Countable
         return $this->_identifier;
     }
 
- 
+
     /**
      * Set label to use for displaying item associations
      *
@@ -271,9 +271,9 @@ class Zend_Dojo_Data implements ArrayAccess,Iterator,Countable
 
     /**
      * Set metadata by key or en masse
-     * 
-     * @param  string|array $spec 
-     * @param  mixed $value 
+     *
+     * @param  string|array $spec
+     * @param  mixed $value
      * @return Zend_Dojo_Data
      */
     public function setMetadata($spec, $value = null)
@@ -290,7 +290,7 @@ class Zend_Dojo_Data implements ArrayAccess,Iterator,Countable
 
     /**
      * Get metadata item or all metadata
-     * 
+     *
      * @param  null|string $key Metadata key when pulling single metadata item
      * @return mixed
      */
@@ -309,8 +309,8 @@ class Zend_Dojo_Data implements ArrayAccess,Iterator,Countable
 
     /**
      * Clear individual or all metadata item(s)
-     * 
-     * @param  null|string $key 
+     *
+     * @param  null|string $key
      * @return Zend_Dojo_Data
      */
     public function clearMetadata($key = null)
@@ -325,8 +325,8 @@ class Zend_Dojo_Data implements ArrayAccess,Iterator,Countable
 
     /**
      * Load object from array
-     * 
-     * @param  array $data 
+     *
+     * @param  array $data
      * @return Zend_Dojo_Data
      */
     public function fromArray(array $data)
@@ -347,8 +347,8 @@ class Zend_Dojo_Data implements ArrayAccess,Iterator,Countable
 
     /**
      * Load object from JSON
-     * 
-     * @param  string $json 
+     *
+     * @param  string $json
      * @return Zend_Dojo_Data
      */
     public function fromJson($json)
@@ -364,7 +364,7 @@ class Zend_Dojo_Data implements ArrayAccess,Iterator,Countable
 
     /**
      * Seralize entire data structure, including identifier and label, to array
-     * 
+     *
      * @return array
      */
     public function toArray()
@@ -392,7 +392,7 @@ class Zend_Dojo_Data implements ArrayAccess,Iterator,Countable
 
         return $array;
     }
- 
+
     /**
      * Serialize to JSON (dojo.data format)
      *
@@ -520,10 +520,10 @@ class Zend_Dojo_Data implements ArrayAccess,Iterator,Countable
     }
 
     /**
-     * Normalize an item to attach to the collection 
-     * 
-     * @param  array|object $item 
-     * @param  string|int|null $id 
+     * Normalize an item to attach to the collection
+     *
+     * @param  array|object $item
+     * @param  string|int|null $id
      * @return array
      */
     protected function _normalizeItem($item, $id)
@@ -560,4 +560,4 @@ class Zend_Dojo_Data implements ArrayAccess,Iterator,Countable
             'data' => $item,
         );
     }
-} 
+}

library/Zend/Dojo/Exception.php

@@ -24,7 +24,7 @@ require_once 'Zend/Exception.php';
 
 /**
  * Exception class for Zend_Dojo
- * 
+ *
  * @uses       Zend_Exception
  * @package    Zend_Dojo
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)

library/Zend/Dojo/Form.php

@@ -24,7 +24,7 @@ require_once 'Zend/Form.php';
 
 /**
  * Dijit-enabled Form
- * 
+ *
  * @uses       Zend_Form
  * @package    Zend_Dojo
  * @subpackage Form
@@ -36,8 +36,8 @@ class Zend_Dojo_Form extends Zend_Form
 {
     /**
      * Constructor
-     * 
-     * @param  array|Zend_Config|null $options 
+     *
+     * @param  array|Zend_Config|null $options
      * @return void
      */
     public function __construct($options = null)
@@ -52,7 +52,7 @@ class Zend_Dojo_Form extends Zend_Form
 
     /**
      * Load the default decorators
-     * 
+     *
      * @return void
      */
     public function loadDefaultDecorators()
@@ -73,8 +73,8 @@ class Zend_Dojo_Form extends Zend_Form
      * Set the view object
      *
      * Ensures that the view object has the dojo view helper path set.
-     * 
-     * @param  Zend_View_Interface $view 
+     *
+     * @param  Zend_View_Interface $view
      * @return Zend_Dojo_Form_Element_Dijit
      */
     public function setView(Zend_View_Interface $view = null)

library/Zend/Dojo/Form/Decorator/DijitContainer.php

@@ -29,9 +29,9 @@ require_once 'Zend/Form/Decorator/Abstract.php';
  * Accepts the following options:
  * - helper:    the name of the view helper to use
  *
- * Assumes the view helper accepts four parameters, the id, content, dijit 
+ * Assumes the view helper accepts four parameters, the id, content, dijit
  * parameters, and (X)HTML attributes; these will be provided by the element.
- * 
+ *
  * @uses       Zend_Form_Decorator_Abstract
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
@@ -48,7 +48,7 @@ abstract class Zend_Dojo_Form_Decorator_DijitContainer extends Zend_Form_Decorat
     protected $_helper;
 
     /**
-     * Element attributes 
+     * Element attributes
      * @var array
      */
     protected $_attribs;
@@ -67,7 +67,7 @@ abstract class Zend_Dojo_Form_Decorator_DijitContainer extends Zend_Form_Decorat
 
     /**
      * Get view helper for rendering container
-     * 
+     *
      * @return string
      */
     public function getHelper()
@@ -80,8 +80,8 @@ abstract class Zend_Dojo_Form_Decorator_DijitContainer extends Zend_Form_Decorat
     }
 
     /**
-     * Get element attributes 
-     * 
+     * Get element attributes
+     *
      * @return array
      */
     public function getAttribs()
@@ -98,7 +98,7 @@ abstract class Zend_Dojo_Form_Decorator_DijitContainer extends Zend_Form_Decorat
 
     /**
      * Get dijit option parameters
-     * 
+     *
      * @return array
      */
     public function getDijitParams()
@@ -128,7 +128,7 @@ abstract class Zend_Dojo_Form_Decorator_DijitContainer extends Zend_Form_Decorat
 
     /**
      * Get title
-     * 
+     *
      * @return string
      */
     public function getTitle()
@@ -162,8 +162,8 @@ abstract class Zend_Dojo_Form_Decorator_DijitContainer extends Zend_Form_Decorat
      * Render a dijit layout container
      *
      * Replaces $content entirely from currently set element.
-     * 
-     * @param  string $content 
+     *
+     * @param  string $content
      * @return string
      */
     public function render($content)
@@ -195,6 +195,6 @@ abstract class Zend_Dojo_Form_Decorator_DijitContainer extends Zend_Form_Decorat
             } while ($view->dojo()->hasDijit($id));
         }
 
-        return $view->$helper($id, $content, $dijitParams, $attribs); 
+        return $view->$helper($id, $content, $dijitParams, $attribs);
     }
 }

library/Zend/Dojo/Form/Decorator/DijitElement.php

@@ -31,9 +31,9 @@ require_once 'Zend/Form/Decorator/ViewHelper.php';
  * - placement: whether to append or prepend the generated content to the passed in content
  * - helper:    the name of the view helper to use
  *
- * Assumes the view helper accepts three parameters, the name, value, and 
+ * Assumes the view helper accepts three parameters, the name, value, and
  * optional attributes; these will be provided by the element.
- * 
+ *
  * @package    Zend_Dojo
  * @subpackage Form_Decorator
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
@@ -67,7 +67,7 @@ class Zend_Dojo_Form_Decorator_DijitElement extends Zend_Form_Decorator_ViewHelp
 
     /**
      * Get element attributes
-     * 
+     *
      * @return array
      */
     public function getElementAttribs()
@@ -85,9 +85,9 @@ class Zend_Dojo_Form_Decorator_DijitElement extends Zend_Form_Decorator_ViewHelp
 
     /**
      * Set a single dijit option parameter
-     * 
-     * @param  string $key 
-     * @param  mixed $value 
+     *
+     * @param  string $key
+     * @param  mixed $value
      * @return Zend_Dojo_Form_Decorator_DijitContainer
      */
     public function setDijitParam($key, $value)
@@ -98,8 +98,8 @@ class Zend_Dojo_Form_Decorator_DijitElement extends Zend_Form_Decorator_ViewHelp
 
     /**
      * Set dijit option parameters
-     * 
-     * @param  array $params 
+     *
+     * @param  array $params
      * @return Zend_Dojo_Form_Decorator_DijitContainer
      */
     public function setDijitParams(array $params)
@@ -110,8 +110,8 @@ class Zend_Dojo_Form_Decorator_DijitElement extends Zend_Form_Decorator_ViewHelp
 
     /**
      * Retrieve a single dijit option parameter
-     * 
-     * @param  string $key 
+     *
+     * @param  string $key
      * @return mixed|null
      */
     public function getDijitParam($key)
@@ -127,7 +127,7 @@ class Zend_Dojo_Form_Decorator_DijitElement extends Zend_Form_Decorator_ViewHelp
 
     /**
      * Get dijit option parameters
-     * 
+     *
      * @return array
      */
     public function getDijitParams()
@@ -139,10 +139,10 @@ class Zend_Dojo_Form_Decorator_DijitElement extends Zend_Form_Decorator_ViewHelp
     /**
      * Render an element using a view helper
      *
-     * Determine view helper from 'helper' option, or, if none set, from 
-     * the element type. Then call as 
+     * Determine view helper from 'helper' option, or, if none set, from
+     * the element type. Then call as
      * helper($element->getName(), $element->getValue(), $element->getAttribs())
-     * 
+     *
      * @param  string $content
      * @return string
      * @throws Zend_Form_Decorator_Exception if element or view are not registered
@@ -177,11 +177,11 @@ class Zend_Dojo_Form_Decorator_DijitElement extends Zend_Form_Decorator_ViewHelp
             } while ($view->dojo()->hasDijit($id));
         }
         $attribs['id'] = $id;
-        
+
         if (array_key_exists('options', $attribs)) {
-       		$options = $attribs['options'];
+               $options = $attribs['options'];
         }
-        
+
         $elementContent = $view->$helper($name, $value, $dijitParams, $attribs, $options);
         switch ($this->getPlacement()) {
             case self::APPEND:

library/Zend/Dojo/Form/Decorator/DijitForm.php

@@ -41,8 +41,8 @@ class Zend_Dojo_Form_Decorator_DijitForm extends Zend_Dojo_Form_Decorator_DijitC
      * Render a form
      *
      * Replaces $content entirely from currently set element.
-     * 
-     * @param  string $content 
+     *
+     * @param  string $content
      * @return string
      */
     public function render($content)
@@ -56,6 +56,6 @@ class Zend_Dojo_Form_Decorator_DijitForm extends Zend_Dojo_Form_Decorator_DijitC
         $dijitParams = $this->getDijitParams();
         $attribs     = array_merge($this->getAttribs(), $this->getOptions());
 
-        return $view->form($element->getName(), $attribs, $content); 
+        return $view->form($element->getName(), $attribs, $content);
     }
 }

library/Zend/Dojo/Form/DisplayGroup.php

@@ -24,7 +24,7 @@ require_once 'Zend/Form/DisplayGroup.php';
 
 /**
  * Dijit-enabled DisplayGroup
- * 
+ *
  * @uses       Zend_Form_DisplayGroup
  * @package    Zend_Dojo
  * @subpackage Form
@@ -36,10 +36,10 @@ class Zend_Dojo_Form_DisplayGroup extends Zend_Form_DisplayGroup
 {
     /**
      * Constructor
-     * 
+     *
      * @param  string $name
      * @param  Zend_Loader_PluginLoader $loader
-     * @param  array|Zend_Config|null $options 
+     * @param  array|Zend_Config|null $options
      * @return void
      */
     public function __construct($name, Zend_Loader_PluginLoader $loader, $options = null)
@@ -52,8 +52,8 @@ class Zend_Dojo_Form_DisplayGroup extends Zend_Form_DisplayGroup
      * Set the view object
      *
      * Ensures that the view object has the dojo view helper path set.
-     * 
-     * @param  Zend_View_Interface $view 
+     *
+     * @param  Zend_View_Interface $view
      * @return Zend_Dojo_Form_Element_Dijit
      */
     public function setView(Zend_View_Interface $view = null)

library/Zend/Dojo/Form/Element/Button.php

@@ -24,7 +24,7 @@ require_once 'Zend/Dojo/Form/Element/Dijit.php';
 
 /**
  * Button dijit
- * 
+ *
  * @category   Zend
  * @package    Zend_Dojo
  * @subpackage Form_Element
@@ -42,7 +42,7 @@ class Zend_Dojo_Form_Element_Button extends Zend_Dojo_Form_Element_Dijit
 
     /**
      * Constructor
-     * 
+     *
      * @param  string|array|Zend_Config $spec Element name or configuration
      * @param  string|array|Zend_Config $options Element value or configuration
      * @return void
@@ -62,7 +62,7 @@ class Zend_Dojo_Form_Element_Button extends Zend_Dojo_Form_Element_Dijit
      * If no label is present, returns the currently set name.
      *
      * If a translator is present, returns the translated label.
-     * 
+     *
      * @return string
      */
     public function getLabel()
@@ -82,7 +82,7 @@ class Zend_Dojo_Form_Element_Button extends Zend_Dojo_Form_Element_Dijit
 
     /**
      * Has this submit button been selected?
-     * 
+     *
      * @return bool
      */
     public function isChecked()
@@ -103,7 +103,7 @@ class Zend_Dojo_Form_Element_Button extends Zend_Dojo_Form_Element_Dijit
      * Default decorators
      *
      * Uses only 'DijitElement' and 'DtDdWrapper' decorators by default.
-     * 
+     *
      * @return void
      */
     public function loadDefaultDecorators()

library/Zend/Dojo/Form/Element/CheckBox.php

@@ -26,7 +26,7 @@ require_once 'Zend/Dojo/Form/Element/Dijit.php';
  * CheckBox dijit
  *
  * Note: this would be easier with mixins or traits...
- * 
+ *
  * @uses       Zend_Dojo_Form_Element_Dijit
  * @package    Zend_Dojo
  * @subpackage Form_Element
@@ -69,10 +69,10 @@ class Zend_Dojo_Form_Element_CheckBox extends Zend_Dojo_Form_Element_Dijit
     /**
      * Set options
      *
-     * Intercept checked and unchecked values and set them early; test stored 
+     * Intercept checked and unchecked values and set them early; test stored
      * value against checked and unchecked values after configuration.
-     * 
-     * @param  array $options 
+     *
+     * @param  array $options
      * @return Zend_Form_Element_Checkbox
      */
     public function setOptions(array $options)
@@ -102,11 +102,11 @@ class Zend_Dojo_Form_Element_CheckBox extends Zend_Dojo_Form_Element_Dijit
      * If value matches checked value, sets to that value, and sets the checked
      * flag to true.
      *
-     * Any other value causes the unchecked value to be set as the current 
+     * Any other value causes the unchecked value to be set as the current
      * value, and the checked flag to be set as false.
      *
-     * 
-     * @param  mixed $value 
+     *
+     * @param  mixed $value
      * @return Zend_Form_Element_Checkbox
      */
     public function setValue($value)
@@ -123,8 +123,8 @@ class Zend_Dojo_Form_Element_CheckBox extends Zend_Dojo_Form_Element_Dijit
 
     /**
      * Set checked value
-     * 
-     * @param  string $value 
+     *
+     * @param  string $value
      * @return Zend_Form_Element_Checkbox
      */
     public function setCheckedValue($value)
@@ -135,7 +135,7 @@ class Zend_Dojo_Form_Element_CheckBox extends Zend_Dojo_Form_Element_Dijit
 
     /**
      * Get value when checked
-     * 
+     *
      * @return string
      */
     public function getCheckedValue()
@@ -145,8 +145,8 @@ class Zend_Dojo_Form_Element_CheckBox extends Zend_Dojo_Form_Element_Dijit
 
     /**
      * Set unchecked value
-     * 
-     * @param  string $value 
+     *
+     * @param  string $value
      * @return Zend_Form_Element_Checkbox
      */
     public function setUncheckedValue($value)
@@ -157,7 +157,7 @@ class Zend_Dojo_Form_Element_CheckBox extends Zend_Dojo_Form_Element_Dijit
 
     /**
      * Get value when not checked
-     * 
+     *
      * @return string
      */
     public function getUncheckedValue()
@@ -167,8 +167,8 @@ class Zend_Dojo_Form_Element_CheckBox extends Zend_Dojo_Form_Element_Dijit
 
     /**
      * Set checked flag
-     * 
-     * @param  bool $flag 
+     *
+     * @param  bool $flag
      * @return Zend_Form_Element_Checkbox
      */
     public function setChecked($flag)
@@ -184,7 +184,7 @@ class Zend_Dojo_Form_Element_CheckBox extends Zend_Dojo_Form_Element_Dijit
 
     /**
      * Get checked flag
-     * 
+     *
      * @return bool
      */
     public function isChecked()
@@ -196,8 +196,8 @@ class Zend_Dojo_Form_Element_CheckBox extends Zend_Dojo_Form_Element_Dijit
      * Render
      *
      * Ensure that options property is set when rendering.
-     * 
-     * @param  Zend_View_Interface $view 
+     *
+     * @param  Zend_View_Interface $view
      * @return string
      */
     public function render(Zend_View_Interface $view = null)