Merge branch 'cs/various-things' of https://github.com/Maks3w/zf2

zendframework · Jul 12, 2012 · 1b64e7d · 1b64e7d
commit 1b64e7d
Show file tree

Hide file tree

Showing 29 changed files with 163 additions and 163 deletions.
diff --git a/src/Configuration.php b/src/Configuration.php
@@ -19,7 +19,7 @@ class Configuration
      * @var array
      */
     protected $data = array();
-    
+
     /**
      * Constructor
      *
@@ -55,7 +55,7 @@ public function configure(Di $di)
         if (isset($this->data['instance'])) {
             $this->configureInstance($di, $this->data['instance']);
         }
-        
+
     }
 
     public function configureDefinition(Di $di, $definition)
@@ -136,11 +136,11 @@ public function configureDefinition(Di $di, $definition)
         }
 
     }
-    
+
     public function configureInstance(Di $di, $instanceData)
     {
         $im = $di->instanceManager();
-        
+
         foreach ($instanceData as $target => $data) {
             switch (strtolower($target)) {
                 case 'aliases':
@@ -183,5 +183,5 @@ public function configureInstance(Di $di, $instanceData)
 
     }
 
-    
+
 }
diff --git a/src/Definition/ArrayDefinition.php b/src/Definition/ArrayDefinition.php
@@ -12,9 +12,9 @@
 
 class ArrayDefinition implements DefinitionInterface
 {
-    
+
     protected $dataArray = array();
-    
+
     public function __construct(Array $dataArray)
     {
         foreach ($dataArray as $class => $value) {
@@ -23,79 +23,79 @@ public function __construct(Array $dataArray)
         }
         $this->dataArray = $dataArray;
     }
-    
+
     public function getClasses()
     {
         return array_keys($this->dataArray);
     }
-    
+
     public function hasClass($class)
     {
         return array_key_exists($class, $this->dataArray);
     }
-    
+
     public function getClassSupertypes($class)
     {
         if (!isset($this->dataArray[$class])) {
             return array();
         }
-        
+
         if (!isset($this->dataArray[$class]['supertypes'])) {
             return array();
         }
-        
+
         return $this->dataArray[$class]['supertypes'];
     }
-    
+
     public function getInstantiator($class)
     {
         if (!isset($this->dataArray[$class])) {
             return null;
         }
-        
+
         if (!isset($this->dataArray[$class]['instantiator'])) {
             return '__construct';
         }
-        
+
         return $this->dataArray[$class]['instantiator'];
     }
-    
+
     public function hasMethods($class)
     {
         if (!isset($this->dataArray[$class])) {
             return array();
         }
-        
+
         if (!isset($this->dataArray[$class]['methods'])) {
             return array();
         }
-        
+
         return (count($this->dataArray[$class]['methods']) > 0);
     }
-    
+
     public function hasMethod($class, $method)
     {
         if (!isset($this->dataArray[$class])) {
             return false;
         }
-        
+
         if (!isset($this->dataArray[$class]['methods'])) {
             return false;
         }
-        
+
         return array_key_exists($method, $this->dataArray[$class]['methods']);
     }
-    
+
     public function getMethods($class)
     {
         if (!isset($this->dataArray[$class])) {
             return array();
         }
-        
+
         if (!isset($this->dataArray[$class]['methods'])) {
             return array();
         }
-        
+
         return $this->dataArray[$class]['methods'];
     }
 
@@ -114,18 +114,18 @@ public function getMethodParameters($class, $method)
         if (!isset($this->dataArray[$class])) {
             return array();
         }
-        
+
         if (!isset($this->dataArray[$class]['parameters'])) {
             return array();
         }
-        
+
         if (!isset($this->dataArray[$class]['parameters'][$method])) {
             return array();
         }
-        
+
         return $this->dataArray[$class]['parameters'][$method];
     }
-    
+
     public function toArray()
     {
         return $this->dataArray;

diff --git a/src/Definition/Builder/InjectionMethod.php b/src/Definition/Builder/InjectionMethod.php
@@ -13,21 +13,21 @@
 class InjectionMethod
 {
     const PARAMETER_POSTION_NEXT = 'next';
-    
+
     protected $name = null;
     protected $parameters = array();
-    
+
     public function setName($name)
     {
         $this->name = $name;
         return $this;
     }
-    
+
     public function getName()
     {
         return $this->name;
     }
-    
+
     public function addParameter($name, $class = null, $isRequired = null)
     {
         $this->parameters[] = array(
@@ -37,10 +37,10 @@ public function addParameter($name, $class = null, $isRequired = null)
         );
         return $this;
     }
-    
+
     public function getParameters()
     {
         return $this->parameters;
     }
-    
+
 }
diff --git a/src/Definition/Builder/PhpClass.php b/src/Definition/Builder/PhpClass.php
@@ -39,13 +39,13 @@ public function getName()
     {
         return $this->name;
     }
-    
+
     public function setInstantiator($instantiator)
     {
         $this->instantiator = $instantiator;
         return $this;
     }
-    
+
     public function getInstantiator()
     {
         return $this->instantiator;
@@ -84,11 +84,11 @@ public function addInjectionMethod(InjectionMethod $injectionMethod)
      *
      * Optionally takes the method name.
      *
-     * This method may be used in lieu of addInjectionMethod() in 
+     * This method may be used in lieu of addInjectionMethod() in
      * order to provide a more fluent interface for building classes with
      * injection methods.
-     * 
-     * @param  null|string $name 
+     *
+     * @param  null|string $name
      * @return InjectionMethod
      */
     public function createInjectionMethod($name = null)
@@ -104,8 +104,8 @@ public function createInjectionMethod($name = null)
 
     /**
      * Override which class will be used by {@link createInjectionMethod()}
-     * 
-     * @param  string $class 
+     *
+     * @param  string $class
      * @return PhpClass
      */
     public function setMethodBuilder($class)
@@ -118,14 +118,14 @@ public function setMethodBuilder($class)
      * Determine what class will be used by {@link createInjectionMethod()}
      *
      * Mainly to provide the ability to temporarily override the class used.
-     * 
+     *
      * @return string
      */
     public function getMethodBuilder()
     {
         return $this->defaultMethodBuilder;
     }
-    
+
     public function getInjectionMethods()
     {
         return $this->injectionMethods;

diff --git a/src/Definition/BuilderDefinition.php b/src/Definition/BuilderDefinition.php
@@ -57,7 +57,7 @@ public function createClassesFromArray(array $builderData)
                             $class->addInjectionMethod($injectionMethod);
                         }
                         break;
-                    
+
                 }
             }
             $this->addClass($class);
@@ -80,7 +80,7 @@ public function addClass(Builder\PhpClass $phpClass)
      * Create a class builder object using default class builder class
      *
      * This method is a factory that can be used in place of addClass().
-     * 
+     *
      * @param  null|string $name Optional name of class to assign
      * @return Builder\PhpClass
      */
@@ -98,8 +98,8 @@ public function createClass($name = null)
 
     /**
      * Set the class to use with {@link createClass()}
-     * 
-     * @param  string $class 
+     *
+     * @param  string $class
      * @return BuilderDefinition
      */
     public function setClassBuilder($class)
@@ -111,9 +111,9 @@ public function setClassBuilder($class)
     /**
      * Get the class used for {@link createClass()}
      *
-     * This is primarily to allow developers to temporarily override 
+     * This is primarily to allow developers to temporarily override
      * the builder strategy.
-     * 
+     *
      * @return string
      */
     public function getClassBuilder()

diff --git a/src/Definition/ClassDefinition.php b/src/Definition/ClassDefinition.php
@@ -75,7 +75,7 @@ public function addMethodParameter($method, $parameterName, array $parameterInfo
         $this->methodParameters[$method][$fqName] = array(
             $parameterName, $type, $required
         );
-        
+
         return $this;
     }
 

diff --git a/src/DefinitionList.php b/src/DefinitionList.php
@@ -119,7 +119,7 @@ public function hasClass($class)
         }
         return false;
     }
-    
+
     public function getClassSupertypes($class)
     {
         $supertypes = array();
@@ -130,7 +130,7 @@ public function getClassSupertypes($class)
         // @todo remove duplicates?
         return $supertypes;
     }
-    
+
     public function getInstantiator($class)
     {
         /** @var $definition Definition\DefinitionInterface */
@@ -228,5 +228,5 @@ public function getMethodParameters($class, $method)
         }
         return array();
     }
-    
+
 }
diff --git a/src/DependencyInjectionInterface.php b/src/DependencyInjectionInterface.php
@@ -17,7 +17,7 @@ interface DependencyInjectionInterface extends LocatorInterface
      *
      * Forces retrieval of a discrete instance of the given class, using the
      * constructor parameters provided.
-     * 
+     *
      * @param  mixed $name Class name or service alias
      * @param  array $params Parameters to pass to the constructor
      * @return object|null

diff --git a/src/Display/Console.php b/src/Display/Console.php
@@ -108,7 +108,7 @@ public function render()
         }
 
         echo PHP_EOL . '  Configurations:' . PHP_EOL;
-        
+
         foreach ($configuredTypes as $type) {
             $info = $this->di->instanceManager()->getConfiguration($type);
             echo '    ' . $type . PHP_EOL;