tidal / PEIP

src/Base/GenericBuilder.php

Doc Comments +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      * 
      * @access public
      * @param string $className class-name to create objects for
-     * @param ReflectionClass $reflectionClass reflection-class for class. default: NULL 
+     * @param \ReflectionClass $reflectionClass reflection-class for class. default: NULL 
      * @param boolean $storeRef wether to store a reference for new instance. default: true 
      * @return 
      */

Spacing +10 added lines, -10 removed lines

@@ -43,10 +43,10 @@ 
      * @param boolean $storeRef wether to store a reference for new instance. default: true 
      * @return 
      */
-    public function __construct($className, \ReflectionClass $reflectionClass = NULL, $storeRef = true){
-        if($reflectionClass ){
+    public function __construct($className, \ReflectionClass $reflectionClass = NULL, $storeRef = true) {
+        if ($reflectionClass) {
             
-            if($reflectionClass->getName() != $className){
+            if ($reflectionClass->getName() != $className) {
                 throw new \Exception(
                     'Constructing GenericBuilder with wrong ReflectionClass'
                 );
@@ -56,7 +56,7 @@ 
             $this->reflectionClass = $reflectionClass;
         }
         $this->className = $className;
-        if($storeRef){
+        if ($storeRef) {
             self::$instances[$this->className] = $this;
         }            
     }
@@ -68,8 +68,8 @@ 
      * @param string $className class-name to return builder instance for 
      * @return GenericBuilder builder instance for class
      */
-    public static function getInstance($className){
-        if(!array_key_exists((string)$className, self::$instances)) {
+    public static function getInstance($className) {
+        if (!array_key_exists((string)$className, self::$instances)) {
             new GenericBuilder($className);
         }
         return self::$instances[$className];
@@ -82,9 +82,9 @@ 
      * @param array $arguments array of constructore arguments
      * @return object the created object instance
      */
-    public function build(array $arguments = array()){      
-        if(Test::assertClassHasConstructor($this->className)){
-            if(!Test::assertRequiredConstructorParameters($this->className, $arguments)){
+    public function build(array $arguments = array()) {      
+        if (Test::assertClassHasConstructor($this->className)) {
+            if (!Test::assertRequiredConstructorParameters($this->className, $arguments)) {
                 throw new \Exception('Missing Argument '.(count($arguments) + 1).' for '.$this->className.'::__construct');
             }
             return $this->getReflectionClass()->newInstanceArgs($arguments);
@@ -98,7 +98,7 @@ 
      * @access public
      * @return ReflectionClass
      */
-    public function getReflectionClass(){
+    public function getReflectionClass() {
         return ReflectionPool::getInstance($this->className);
     }
     

src/Event/EventBuilder.php

Doc Comments -1 removed lines

@@ -83,7 +83,6 @@
      * @param ObjectEventDispatcher $dispatcher the dispatcher to dispatch the event 
      * @param mixed $subject the subject for the event
      * @param string $name the name of the event
-     * @param array $parameters the headers for the event
      * @return 
      */
     public function buildAndDispatch(ObjectEventDispatcher $dispatcher, $subject, $name, array $headers = array()){

Spacing +4 added lines, -4 removed lines

@@ -37,7 +37,7 @@ 
      * @param string $eventClass the event-class the builder shall create instances for 
      * @param array $defaultHeaders default headers for the created events 
      */
-    public function __construct($eventClass = '\PEIP\Event\Event', array $defaultHeaders = array()){
+    public function __construct($eventClass = '\PEIP\Event\Event', array $defaultHeaders = array()) {
         $this->eventClass = $eventClass;
         $this->defaultParameters = $defaultHeaders;
     }
@@ -49,7 +49,7 @@ 
      * @param string $eventClass the event-class the builder shall create instances for 
      * @return EventBuilder the instance of EventBuilder for the given event-class 
      */    
-    public static function getInstance($eventClass = '\PEIP\Event\Event'){ 
+    public static function getInstance($eventClass = '\PEIP\Event\Event') { 
 
         return isset(self::$instances[$eventClass]) 
             ? self::$instances[$eventClass] 
@@ -67,7 +67,7 @@ 
      * @param array $headers the headers for the event 
      * @return object event instance
      */
-    public function build($subject, $name, array $headers = array()){
+    public function build($subject, $name, array $headers = array()) {
 
         return new $this->eventClass(
             $subject,
@@ -86,7 +86,7 @@ 
      * @param array $parameters the headers for the event
      * @return 
      */
-    public function buildAndDispatch(ObjectEventDispatcher $dispatcher, $subject, $name, array $headers = array()){
+    public function buildAndDispatch(ObjectEventDispatcher $dispatcher, $subject, $name, array $headers = array()) {
   
         return $dispatcher->notify(
             $name,

src/Factory/DedicatedFactory.php

Doc Comments +3 added lines

@@ -47,6 +47,9 @@
         return new DedicatedFactory(array($class, '__construct'), $parameters); 

     } 

 

+    /**
+     * @param string[] $callable
+     */
     public static function getfromCallable($callable, array $parameters = array()){

         return new DedicatedFactory($callable, $parameters); 

     } 

Spacing +5 added lines, -5 removed lines

@@ -38,16 +38,16 @@ 
      * @param $parameters 
      * @return 
      */
-    protected function __construct($callable ,array $parameters = array()){
+    protected function __construct($callable, array $parameters = array()) {
         $this->callable = $callable;
         $this->setParameters($parameters);
     }
 
-    public static function getfromClass($class, array $parameters = array()){
+    public static function getfromClass($class, array $parameters = array()) {
         return new DedicatedFactory(array($class, '__construct'), $parameters); 
     } 
 
-    public static function getfromCallable($callable, array $parameters = array()){
+    public static function getfromCallable($callable, array $parameters = array()) {
         return new DedicatedFactory($callable, $parameters); 
     } 
     
@@ -57,7 +57,7 @@ 
      * @param $arguments 
      * @return 
      */
-    public function build(array $arguments = array()){
+    public function build(array $arguments = array()) {
         $arguments = count($arguments) > 0 ? $arguments : $this->getParameters();
         return (is_array($this->callable) && $this->callable[1] == '__construct') 
             ? GenericBuilder::GetInstance($this->callable[0])->build($arguments) 
@@ -70,7 +70,7 @@ 
      * @param $method 
      * @return 
      */
-    public function setConstructor($method){
+    public function setConstructor($method) {
         $this->constructor = (string)$method;
         return $this;
     }   

src/Factory/ServiceFactory.php

Unused Use Statements +2 added lines, -2 removed lines

@@ -11,8 +11,8 @@
  *

  * @author timo

  */

-use PEIP\Util\Test;

-use PEIP\Base\GenericBuilder;

+use PEIP\Util\Test;
+use PEIP\Base\GenericBuilder;
 use PEIP\Context\XMLContext;

 

 class ServiceFactory {

Indentation +23 added lines, -23 removed lines

@@ -16,13 +16,13 @@ 
 use PEIP\Context\XMLContext;

 

 class ServiceFactory {

-     /**

-     * Creates and initializes service instance from a given configuration.

-     *

-     * @access public

-     * @param $config configuration of the service

-     * @return object the initialized service instance

-     */

+        /**

+         * Creates and initializes service instance from a given configuration.

+         *

+         * @access public

+         * @param $config configuration of the service

+         * @return object the initialized service instance

+         */

     public static function createService(array $config){

         $args = array();

         //build arguments for constructor

@@ -35,15 +35,15 @@ 
     }

 

         /**

-     * Builds an arbitrary service/object instance from a config-obect.

-     *

-     * @static

-     * @access protected

-     * @param object $config configuration object to build a service instance from.

-     * @param array $arguments arguments for the service constructor

-     * @param string $defaultClass class to create instance for if none is set in config

-     * @return object build and modified srvice instance

-     */

+         * Builds an arbitrary service/object instance from a config-obect.

+         *

+         * @static

+         * @access protected

+         * @param object $config configuration object to build a service instance from.

+         * @param array $arguments arguments for the service constructor

+         * @param string $defaultClass class to create instance for if none is set in config

+         * @return object build and modified srvice instance

+         */

     public static function doBuild($config, $arguments, $defaultClass = false){

         $cls = isset($config["class"]) ? trim((string)$config["class"]) : (string)$defaultClass;

         if($cls != ''){

@@ -80,12 +80,12 @@ 
     }

 

         /**

-     * Builds single argument (to call a method with later) from a config-obect.

-     *

-     * @access protected

-     * @param object $config configuration object to create argument from.

-     * @return mixed build argument

-     */

+         * Builds single argument (to call a method with later) from a config-obect.

+         *

+         * @access protected

+         * @param object $config configuration object to create argument from.

+         * @return mixed build argument

+         */

     protected function buildArg($config){

         if(trim((string)$config['value']) != ''){

             $arg = (string)$config['value'];

@@ -128,7 +128,7 @@ 
      */

     public static function buildAndModify(array $config, $arguments, $defaultClass = ""){

         if((isset($config["class"]) && "" != (string)$config["class"])  || $defaultClass !== ""){

-             $service = ServiceFactory::doBuild($config, $arguments, $defaultClass);

+                $service = ServiceFactory::doBuild($config, $arguments, $defaultClass);

         }else{

             throw new \RuntimeException('Could not create Service. no class or reference given.');

         }

Braces +11 added lines, -11 removed lines

@@ -51,7 +51,7 @@ 
                 $constructor = isset($config["constructor"]) ? (string)$config["constructor"] : "";

                 if ($constructor != '' && Test::assertMethod($cls, $constructor)) {

                     $service = call_user_func_array(array($cls, $constructor), $arguments);

-                }else {

+                } else {

                     $service = self::build($cls, $arguments);

                 }

             } catch (\Exception $e) {

@@ -89,26 +89,26 @@ 
     protected static function buildArg($config) {

         if (trim((string)$config['value']) != '') {

             $arg = (string)$config['value'];

-        }elseif ($config->getName() == 'value') {

+        } elseif ($config->getName() == 'value') {

             $arg = (string)$config;

-        }elseif ($config->getName() == 'list') {

+        } elseif ($config->getName() == 'list') {

             $arg = array();

             foreach ($config->children() as $entry) {

                 if ($entry->getName() == 'value') {

                     if ($entry['key']) {

                         $arg[(string)$entry['key']] = (string)$entry;

-                    }else {

+                    } else {

                         $arg[] = (string)$entry;

                     }

-                }elseif ($entry->getName() == 'service') {

+                } elseif ($entry->getName() == 'service') {

                     $arg[] = $this->provideService($entry);

                 }

             }

-        }elseif ($config->getName() == 'service') {

+        } elseif ($config->getName() == 'service') {

             $arg = self::provideService($config);

-        }elseif ($config->list) {

+        } elseif ($config->list) {

             $arg = self::buildArg($config->list);

-        }elseif ($config->service) {

+        } elseif ($config->service) {

             $arg = self::buildArg($config->service);

         }

         return $arg;

@@ -129,12 +129,12 @@ 
     public static function buildAndModify(array $config, $arguments, $defaultClass = "") {

         if ((isset($config["class"]) && "" != (string)$config["class"]) || $defaultClass !== "") {

              $service = ServiceFactory::doBuild($config, $arguments, $defaultClass);

-        }else {

+        } else {

             throw new \RuntimeException('Could not create Service. no class or reference given.');

         }

         if (isset($config["ref_property"])) {

             $service = $service->{(string)$config["ref_property"]};

-        }elseif (isset($config["ref_method"])) {

+        } elseif (isset($config["ref_method"])) {

                 $args = array();

             if (isset($config['argument'])) {

                         foreach ($config['argument'] as $arg) {

@@ -175,7 +175,7 @@ 
                     $setter = self::getSetter($property);

                     if ($setter && self::hasPublicProperty($service, 'Method', $setter)) {

                         $service->{$setter}($arg);

-                    }elseif (in_array($property, self::hasPublicProperty($service, 'Property', $setter))) {

+                    } elseif (in_array($property, self::hasPublicProperty($service, 'Property', $setter))) {

                         $service->$setter = $arg;

                     }

                 }

src/Service/ServiceProvider.php

Doc Comments +3 added lines

@@ -112,6 +112,9 @@
         );

     }

 

+    /**
+     * @param string $key
+     */
     public function provideService($key){

         $this->doFireEvent(self::EVENT_BEFORE_PROVIDE_SERVICE, array(

             self::HEADER_KEY=>$key)

Unused Use Statements -1 removed lines

@@ -12,7 +12,6 @@
  * @author timo
  */
 use PEIP\Context\XMLContext;
-use PEIP\Plugins\BasePlugin;
 
 class ServiceProvider extends \PEIP\Service\ServiceContainer  {
 

Indentation +9 added lines, -9 removed lines

@@ -63,17 +63,17 @@ 
     }
 
         /**
-     * Registers a callable as builder for given node-name
-     *
-     * @implements \PEIP\INF\Context\Context
-     * @access public
-     * @param string $nodeName the name of the node
-     * @param callable $callable a callable which creates instances for node-name
-     */
+         * Registers a callable as builder for given node-name
+         *
+         * @implements \PEIP\INF\Context\Context
+         * @access public
+         * @param string $nodeName the name of the node
+         * @param callable $callable a callable which creates instances for node-name
+         */
     public function registerNodeBuilder($nodeName, $callable){
         $this->nodeBuilders[$nodeName] = $callable;
     }
-  /**
+    /**
      * Registers the build-methods for the main-components with this context.
      * Note: This method and subsequent registered methods of this class are
      * candidates for refactoring. Because this class has grown much to large
@@ -88,7 +88,7 @@ 
             'service' => 'initService'
         );
         foreach($builders as $nodeName => $method){
-           $this->registerNodeBuilder($nodeName, array($this, $method));
+            $this->registerNodeBuilder($nodeName, array($this, $method));
         }
     }
 

Spacing +31 added lines, -31 removed lines

@@ -14,7 +14,7 @@ 
 use PEIP\Context\XMLContext;
 use PEIP\Plugins\BasePlugin;
 
-class ServiceProvider extends \PEIP\Service\ServiceContainer  {
+class ServiceProvider extends \PEIP\Service\ServiceContainer {
 
     const
         /* Headers */
@@ -47,7 +47,7 @@ 
     public function  __construct(array $config = array(), $idAttribute = 'id') {
         $this->idAttribute = $idAttribute;
         $this->initNodeBuilders();
-        foreach($config as $serviceConfig){
+        foreach ($config as $serviceConfig) {
             $this->addConfig($serviceConfig);
         }
         
@@ -58,7 +58,7 @@ 
      * @access public
      * @return array registered services
      */
-    public function getServices(){
+    public function getServices() {
         return $this->services;
     }
 
@@ -70,7 +70,7 @@ 
      * @param string $nodeName the name of the node
      * @param callable $callable a callable which creates instances for node-name
      */
-    public function registerNodeBuilder($nodeName, $callable){
+    public function registerNodeBuilder($nodeName, $callable) {
         $this->nodeBuilders[$nodeName] = $callable;
     }
   /**
@@ -83,16 +83,16 @@ 
      * @see XMLContext::includeContext
      * @access protected
      */
-    protected function initNodeBuilders(){
+    protected function initNodeBuilders() {
         $builders = array(
             'service' => 'initService'
         );
-        foreach($builders as $nodeName => $method){
+        foreach ($builders as $nodeName => $method) {
            $this->registerNodeBuilder($nodeName, array($this, $method));
         }
     }
 
-    public function addConfig($config){ 
+    public function addConfig($config) { 
         $this->doFireEvent(
             self::EVENT_BEFORE_ADD_CONFIG,
             array(
@@ -111,15 +111,15 @@ 
         );
     }
 
-    public function provideService($key){
+    public function provideService($key) {
         $this->doFireEvent(self::EVENT_BEFORE_PROVIDE_SERVICE, array(
             self::HEADER_KEY=>$key)
         );
 
-        if($this->hasService($key)){
-            $service =  $this->getService($key);
-        }else{
-            $service =  $this->createService($key);
+        if ($this->hasService($key)) {
+            $service = $this->getService($key);
+        }else {
+            $service = $this->createService($key);
         }
 
         $this->doFireEvent(self::EVENT_AFTER_PROVIDE_SERVICE, array(
@@ -130,16 +130,16 @@ 
         return $service;
     }
 
-    protected function createService($key){
+    protected function createService($key) {
         $this->doFireEvent(self::EVENT_BEFORE_CREATE_SERVICE, array(
             self::HEADER_KEY=>$key)
         );
         $errorMessage = '';
         $config = $this->getServiceConfig($key);
 
-        if($config){
+        if ($config) {
             $node = $this->buildNode($config);
-            if($node){
+            if ($node) {
                 $this->setService(
                     $key,
                     $node
@@ -150,11 +150,11 @@ 
                 ));
 
                 return $node;                
-            }else{
+            }else {
                 $errorMessage = 'COULD NOT BUILD NODE FOR KEY: '.$key;
             }
 
-        }else{
+        }else {
             $errorMessage = 'NO CONFIG FOR KEY: '.$key;
         }
         $this->doFireEvent(self::EVENT_CREATE_SERVICE_ERROR, array(
@@ -164,8 +164,8 @@ 
         return NULL;
     }
 
-    public function getServiceConfig($key){
-        if(!isset($this->ids[$key])){
+    public function getServiceConfig($key) {
+        if (!isset($this->ids[$key])) {
             return false;
         }
         return $this->config[$this->ids[$key]];
@@ -180,7 +180,7 @@ 
      * @param object $config configuration-node
      * @return void
      */
-    protected function buildNode($config){
+    protected function buildNode($config) {
         $nodeName = (string)$config['type'];
 
         $this->doFireEvent(self::EVENT_BEFORE_BUILD_NODE, array(
@@ -188,20 +188,20 @@ 
             self::HEADER_NODE_NAME=> $nodeName
         ));
         // call the builder method registered for the node.
-        if(array_key_exists($nodeName, $this->nodeBuilders)){
+        if (array_key_exists($nodeName, $this->nodeBuilders)) {
 
             $nodeInstance = call_user_func($this->nodeBuilders[$nodeName], $config);
-            if(is_object($nodeInstance)){
+            if (is_object($nodeInstance)) {
                 $this->doFireEvent(self::EVENT_BUILD_NODE_SUCCESS, array(
                     self::HEADER_NODE_CONFIG=>$config,
                     self::HEADER_NODE_NAME=> $nodeName,
                     self::HEADER_NODE => $nodeInstance
                 ));
                 return $nodeInstance;
-            }else{
+            }else {
                 $errorMessage = 'BUILDER RETURNED NO OBJECT FOR NODE-TYPE: '.$nodeName;
             }
-        }else{
+        }else {
             $errorMessage = 'NO BUILDER FOUND FOR NODE-TYPE: '.$nodeName;
         }
 
@@ -212,27 +212,27 @@ 
         ));
     }
 
-    protected function getIdFromConfig($config){
+    protected function getIdFromConfig($config) {
         $id = '';
-        if(isset($config[$this->idAttribute])){
+        if (isset($config[$this->idAttribute])) {
             $id = trim((string)($config[$this->idAttribute]));
         }
         return $id;
     }
 
-    protected function getCountConfig(){
+    protected function getCountConfig() {
         return count($this->config);
     }
 
-    protected function doAddConfig($config){
+    protected function doAddConfig($config) {
         $countConfig = $this->getCountConfig();
         $this->config[$countConfig] = $config;
         return $countConfig;
     }
 
-    protected function doRegisterConfig($config){
-        $id  = $this->getIdFromConfig($config);
-        if($id != ''){
+    protected function doRegisterConfig($config) {
+        $id = $this->getIdFromConfig($config);
+        if ($id != '') {
             $this->ids[$id] = $this->getCountConfig() - 1;
         }
         return $id;

Braces +5 added lines, -5 removed lines

@@ -118,7 +118,7 @@ 
 
         if($this->hasService($key)){
             $service =  $this->getService($key);
-        }else{
+        } else{
             $service =  $this->createService($key);
         }
 
@@ -150,11 +150,11 @@ 
                 ));
 
                 return $node;                
-            }else{
+            } else{
                 $errorMessage = 'COULD NOT BUILD NODE FOR KEY: '.$key;
             }
 
-        }else{
+        } else{
             $errorMessage = 'NO CONFIG FOR KEY: '.$key;
         }
         $this->doFireEvent(self::EVENT_CREATE_SERVICE_ERROR, array(
@@ -198,10 +198,10 @@ 
                     self::HEADER_NODE => $nodeInstance
                 ));
                 return $nodeInstance;
-            }else{
+            } else{
                 $errorMessage = 'BUILDER RETURNED NO OBJECT FOR NODE-TYPE: '.$nodeName;
             }
-        }else{
+        } else{
             $errorMessage = 'NO BUILDER FOUND FOR NODE-TYPE: '.$nodeName;
         }
 

examples/Cafe/lib/model/Barista.php

Indentation +10 added lines, -10 removed lines

@@ -31,19 +31,19 @@
     }    
 	
     protected function prepareDrink($orderNumber, $type, $iced){
-    	$drink = new Drink($orderNumber, $type, $iced);	
-    	return $drink;
+        $drink = new Drink($orderNumber, $type, $iced);	
+        return $drink;
     }
 
     protected function printAction($cold, $orderNr){
-    	if($cold){
-    		$type = 'cold';
-    		$count = $this->coldDrinkCounter;
-    	}else{
-    		$type = 'hot';
-    		$count = $this->hotDrinkCounter;    		
-    	}
-    	$total = $this->coldDrinkCounter + $this->hotDrinkCounter;
+        if($cold){
+            $type = 'cold';
+            $count = $this->coldDrinkCounter;
+        }else{
+            $type = 'hot';
+            $count = $this->hotDrinkCounter;    		
+        }
+        $total = $this->coldDrinkCounter + $this->hotDrinkCounter;
         echo PEIP_LINE_SEPARATOR."Barista: prepared $type drink (total #$total- $type #$count) for order #$orderNr";
         flush();    
     }

Spacing +4 added lines, -4 removed lines

@@ -30,16 +30,16 @@
         return $this->prepareDrink($orderItem['order'], $orderItem['type'], true);
     }    
 	
-    protected function prepareDrink($orderNumber, $type, $iced){
+    protected function prepareDrink($orderNumber, $type, $iced) {
     	$drink = new Drink($orderNumber, $type, $iced);	
     	return $drink;
     }
 
-    protected function printAction($cold, $orderNr){
-    	if($cold){
+    protected function printAction($cold, $orderNr) {
+    	if ($cold) {
     		$type = 'cold';
     		$count = $this->coldDrinkCounter;
-    	}else{
+    	}else {
     		$type = 'hot';
     		$count = $this->hotDrinkCounter;    		
     	}

Braces +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     	if($cold){
     		$type = 'cold';
     		$count = $this->coldDrinkCounter;
-    	}else{
+    	} else{
     		$type = 'hot';
     		$count = $this->hotDrinkCounter;    		
     	}

examples/Cafe/lib/model/Order.php

Indentation +29 added lines, -29 removed lines

@@ -2,40 +2,40 @@
 
 class Order {
 
-	protected 
-		$items = array(),
-		$orderNumber;
-	protected static $orderCount = 0;
+    protected 
+        $items = array(),
+        $orderNumber;
+    protected static $orderCount = 0;
 
-	public function __construct(){
-		self::$orderCount++;
-		$this->orderNumber = self::$orderCount;
-	}	
+    public function __construct(){
+        self::$orderCount++;
+        $this->orderNumber = self::$orderCount;
+    }	
 
-	public function getOrderNumber(){
-		return $this->orderNumber;
-	}
+    public function getOrderNumber(){
+        return $this->orderNumber;
+    }
 	
-	public function addItem($type, $number, $iced = false){
-		$this->items[] = 
-			array(
-				'type' => $type,
-				'number' => $number,
-				'iced' => $iced
-			);
-	}
+    public function addItem($type, $number, $iced = false){
+        $this->items[] = 
+            array(
+                'type' => $type,
+                'number' => $number,
+                'iced' => $iced
+            );
+    }
 
-	public function getItems(){
-		return $this->items;
-	}
+    public function getItems(){
+        return $this->items;
+    }
 
-	public function getTotalCount(){
-		$x = 0;
-		foreach($this->items as $item){
-			$x += (int)$item['number'];
-		}
-		return $x;
-	}
+    public function getTotalCount(){
+        $x = 0;
+        foreach($this->items as $item){
+            $x += (int)$item['number'];
+        }
+        return $x;
+    }
 	
 	
 	

Spacing +6 added lines, -6 removed lines

@@ -7,16 +7,16 @@ 
 		$orderNumber;
 	protected static $orderCount = 0;
 
-	public function __construct(){
+	public function __construct() {
 		self::$orderCount++;
 		$this->orderNumber = self::$orderCount;
 	}	
 
-	public function getOrderNumber(){
+	public function getOrderNumber() {
 		return $this->orderNumber;
 	}
 	
-	public function addItem($type, $number, $iced = false){
+	public function addItem($type, $number, $iced = false) {
 		$this->items[] = 
 			array(
 				'type' => $type,
@@ -25,13 +25,13 @@ 
 			);
 	}
 
-	public function getItems(){
+	public function getItems() {
 		return $this->items;
 	}
 
-	public function getTotalCount(){
+	public function getTotalCount() {
 		$x = 0;
-		foreach($this->items as $item){
+		foreach ($this->items as $item) {
 			$x += (int)$item['number'];
 		}
 		return $x;

examples/Cafe/lib/model/Delivery.php

Indentation +7 added lines, -7 removed lines

@@ -2,14 +2,14 @@
 
 class Delivery {
 
-	protected 
-		$deliveredDrinks,
-		$orderNumber;
+    protected 
+        $deliveredDrinks,
+        $orderNumber;
 	
-	public function __construct(array $deliveredDrinks){
-		$this->deliveredDrinks = $deliveredDrinks;
-		$this->orderNumber = $deliveredDrinks[0]->getOrderNumber();
-	}
+    public function __construct(array $deliveredDrinks){
+        $this->deliveredDrinks = $deliveredDrinks;
+        $this->orderNumber = $deliveredDrinks[0]->getOrderNumber();
+    }
 
 
 

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 		$deliveredDrinks,
 		$orderNumber;
 	
-	public function __construct(array $deliveredDrinks){
+	public function __construct(array $deliveredDrinks) {
 		$this->deliveredDrinks = $deliveredDrinks;
 		$this->orderNumber = $deliveredDrinks[0]->getOrderNumber();
 	}

examples/Cafe/lib/model/Drink.php

Indentation +19 added lines, -19 removed lines

@@ -3,30 +3,30 @@
 
 class Drink {
 
-	protected 
-		$orderNumber,
-		$type,
-		$iced;
+    protected 
+        $orderNumber,
+        $type,
+        $iced;
 	
-	public function __construct($orderNumber, $type, $iced){
-		$this->orderNumber = $orderNumber;
-		$this->type = $type;
-		$this->iced = $iced;
-	}
+    public function __construct($orderNumber, $type, $iced){
+        $this->orderNumber = $orderNumber;
+        $this->type = $type;
+        $this->iced = $iced;
+    }
 
-	public function getType(){
-		return $this->type; 
-	}
+    public function getType(){
+        return $this->type; 
+    }
 
-	public function getIced(){
-		return $this->iced; 
-	}	
+    public function getIced(){
+        return $this->iced; 
+    }	
 
-	public function getOrderNumber(){
-		return $this->orderNumber;
-	}
+    public function getOrderNumber(){
+        return $this->orderNumber;
+    }
 	
-	public function __sleep()
+    public function __sleep()
     {
         return array('orderNumber', 'type', 'iced');
     }

Spacing +4 added lines, -4 removed lines

@@ -8,21 +8,21 @@
 		$type,
 		$iced;
 	
-	public function __construct($orderNumber, $type, $iced){
+	public function __construct($orderNumber, $type, $iced) {
 		$this->orderNumber = $orderNumber;
 		$this->type = $type;
 		$this->iced = $iced;
 	}
 
-	public function getType(){
+	public function getType() {
 		return $this->type; 
 	}
 
-	public function getIced(){
+	public function getIced() {
 		return $this->iced; 
 	}	
 
-	public function getOrderNumber(){
+	public function getOrderNumber() {
 		return $this->orderNumber;
 	}