tidal / PEIP

src/Pipe/FixedEventPipe.php

Doc Comments +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
     

     /**

      * @access public

-     * @param $eventName 

+     * @param string $eventName 

      * @return 

      */

     public function setEventName($eventName){

Spacing +6 added lines, -6 removed lines

@@ -31,10 +31,10 @@ 
      * @param $inputChannel 

      * @return 

      */

-    public function setInputChannel(\PEIP\INF\Channel\Channel $inputChannel){        

-        if(isset($this->eventName)){

+    public function setInputChannel(\PEIP\INF\Channel\Channel $inputChannel) {        

+        if (isset($this->eventName)) {

             $this->connectChannel($inputChannel);   

-        }else{

+        }else {

             $this->inputChannel = $inputChannel;    

         }               

     }       

@@ -45,10 +45,10 @@ 
      * @param $eventName 

      * @return 

      */

-    public function setEventName($eventName){

-        if(!isset($this->eventName)){

+    public function setEventName($eventName) {

+        if (!isset($this->eventName)) {

             $this->eventName = $eventName;

-            if($this->inputChannel){

+            if ($this->inputChannel) {

                 $this->inputChannel->connect($this->eventName, $this);

             }   

         }

Braces +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     protected function getMessage($object){

         if($this->channel instanceof \PEIP\INF\Channel\SubscribableChannel){

             return $object; 

-        }else{

+        } else{

             return $object->getContent()->receive();

         }

     }

src/Pipe/Pipe.php

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

@@ -24,8 +24,8 @@
  */

 

 

-use PEIP\Dispatcher\Dispatcher;

-use PEIP\Event\Event;

+use PEIP\Dispatcher\Dispatcher;
+use PEIP\Event\Event;
 use PEIP\Util\Test;

 

 class Pipe 

Spacing +18 added lines, -18 removed lines

@@ -63,7 +63,7 @@ 
      * @param $name 

      * @return 

      */

-    public function setName($name){

+    public function setName($name) {

         $this->name = $name;

     }

     

@@ -72,7 +72,7 @@ 
      * @access public

      * @return 

      */

-    public function getName(){

+    public function getName() {

         return $this->name;

     }

 

@@ -83,7 +83,7 @@ 
      * @param $timeout 

      * @return 

      */

-    public function send(\PEIP\INF\Message\Message $message, $timeout = -1){

+    public function send(\PEIP\INF\Message\Message $message, $timeout = -1) {

         return $this->handle($message);

     }

 

@@ -93,7 +93,7 @@ 
      * @param $message 

      * @return 

      */

-    protected function doSend(\PEIP\INF\Message\Message $message){

+    protected function doSend(\PEIP\INF\Message\Message $message) {

         $this->doFireEvent(self::EVENT_PRE_PUBLISH, array(self::HEADER_MESSAGE=>$message));

         $this->getMessageDispatcher()->notify($message);

         $this->doFireEvent(self::EVENT_POST_PUBLISH, array(self::HEADER_MESSAGE=>$message));

@@ -106,11 +106,11 @@ 
      * @param $content 

      * @return 

      */

-    protected function replyMessage($message){

-        if(\PEIP\Util\Test::assertMessage($message)){

-            if($this->getOutputChannel()){

+    protected function replyMessage($message) {

+        if (\PEIP\Util\Test::assertMessage($message)) {

+            if ($this->getOutputChannel()) {

                 $this->getOutputChannel()->send($message);

-            }else{

+            }else {

                 $this->doSend($message);

             }

         }

@@ -122,7 +122,7 @@ 
      * @param $message 

      * @return 

      */

-    protected function doReply(\PEIP\INF\Message\Message $message){

+    protected function doReply(\PEIP\INF\Message\Message $message) {

         $this->replyMessage($message);

     }

 

@@ -132,7 +132,7 @@ 
      * @param $handler 

      * @return 

      */

-    public function subscribe($handler){

+    public function subscribe($handler) {

         Test::ensureHandler($handler);

         $this->getMessageDispatcher()->connect($handler);

         $this->doFireEvent(self::EVENT_SUBSCRIBE, array(self::HEADER_SUBSCRIBER=>$handler));

@@ -144,7 +144,7 @@ 
      * @param $handler e

      * @return 

      */

-    public function unsubscribe($handler){

+    public function unsubscribe($handler) {

         Test::ensureHandler($handler);

         $this->getMessageDispatcher()->disconnect($handler);

         $this->doFireEvent(

@@ -162,9 +162,9 @@ 
      * @param $transferListeners 

      * @return 

      */

-    public function setMessageDispatcher(\PEIP\INF\Dispatcher\Dispatcher $dispatcher, $transferListeners = true){

-        if(isset($this->dispatcher) && $transferListeners){

-            foreach($this->dispatcher->getListeners() as $listener){

+    public function setMessageDispatcher(\PEIP\INF\Dispatcher\Dispatcher $dispatcher, $transferListeners = true) {

+        if (isset($this->dispatcher) && $transferListeners) {

+            foreach ($this->dispatcher->getListeners() as $listener) {

                 $dispatcher->connect($listener);

                 $this->dispatcher->disconnect($listener);       

             }   

@@ -178,7 +178,7 @@ 
      * @access public

      * @return 

      */

-    public function getMessageDispatcher(){

+    public function getMessageDispatcher() {

         $defaultDispatcher = self::DEFAULT_CLASS_MESSAGE_DISPATCHER;

         return isset($this->dispatcher) ? $this->dispatcher : $this->dispatcher = new $defaultDispatcher;

     }   

@@ -190,7 +190,7 @@ 
      * @param $callable 

      * @return 

      */

-    protected function registerCommand($commandName, $callable){

+    protected function registerCommand($commandName, $callable) {

         $this->commands[$commandName] = $callable;  

     }

     

@@ -200,10 +200,10 @@ 
      * @param $cmdMessage 

      * @return 

      */

-    public function command(\PEIP\INF\Message\Message $cmdMessage){

+    public function command(\PEIP\INF\Message\Message $cmdMessage) {

         $this->doFireEvent(self::EVENT_PRE_COMMAND, array(self::HEADER_MESSAGE=>$cmdMessage));

         $commandName = trim((string)$cmdMessage->getHeader('COMMAND'));

-        if($commandName != '' && array_key_exists($commandName, $this->commands)){

+        if ($commandName != '' && array_key_exists($commandName, $this->commands)) {

             call_user_func($this->commands[$commandName], $cmdMessage->getContent());   

         }

         $this->doFireEvent(self::EVENT_POST_COMMAND, array(self::HEADER_MESSAGE=>$cmdMessage));

Braces +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
             $store = $this->factory->build();

             if($store instanceof \PEIP\INF\Data\Store){

                 $this->setPrivateValue($namespace, $store);

-            }else{

+            } else{

                 throw new \Exception('Could not build Instance of \PEIP\INF\Data\Store from factory.');

             }

         }

src/Plugins/BasePlugin.php

Doc Comments +3 added lines, -2 removed lines

@@ -217,7 +217,7 @@ 
      *

      * @access protected

      * @param object $config configuration object to create arguments from.

-     * @return mixed build arguments

+     * @return \PEIP\INF\Channel\Channel[] build arguments

      */

     protected function getReplyHandlerArguments($config){

         $args = array(

@@ -262,7 +262,8 @@ 
      *

      * @access protected

      * @param string the configuration type ofthe channel (e.g.: 'reply', 'request')

-     * @param object $config configuration object to return channel from.

+     * @param object $config configuration object to return channel from.
+     * @param string $type

      * @return \PEIP\INF\Channel\Channel reply-channel

      */

     public function doGetChannel($type, $config){

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

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

  * @author timo

  */

-use PEIP\Context\XMLContext;

-use PEIP\Channel\PollableChannel;

-use PEIP\Channel\PublishSubscribeChannel;

-use PEIP\Gateway\SimpleMessagingGateway;

-use PEIP\Listener\Wiretap;

+use PEIP\Context\XMLContext;
+use PEIP\Channel\PollableChannel;
+use PEIP\Channel\PublishSubscribeChannel;
+use PEIP\Gateway\SimpleMessagingGateway;
+use PEIP\Listener\Wiretap;
 use PEIP\Service\ServiceActivator;

 

 class BasePlugin extends \PEIP\ABS\Context\ContextPlugin {

Spacing +22 added lines, -22 removed lines

@@ -46,7 +46,7 @@ 
      * @param object $config configuration object for the pollable channel.

      * @return \PEIP\INF\Channel\Channel the created pollable channel instance

      */

-    public function createChannel($config){

+    public function createChannel($config) {

         return $this->doCreateChannel($config, 'PollableChannel');

     }

 

@@ -58,7 +58,7 @@ 
      * @param object $config configuration object for the subscribable channel.

      * @return \PEIP\INF\Channel\Channel the created subscribable channel instance

      */

-    public function createSubscribableChannel($config){

+    public function createSubscribableChannel($config) {

         return $this->doCreateChannel($config, 'PublishSubscribeChannel');

     }

 

@@ -71,9 +71,9 @@ 
      * @param $additionalArguments additional arguments for the channel constructor (without first arg = id)

      * @return \PEIP\INF\Channel\Channel the created channel instance

      */

-    public function doCreateChannel($config, $defaultChannelClass, array $additionalArguments = array()){

+    public function doCreateChannel($config, $defaultChannelClass, array $additionalArguments = array()) {

         $id = (string)$config['id'];

-        if($id != ''){

+        if ($id != '') {

             array_unshift($additionalArguments, $id);

             $channel = $this->buildAndModify($config, $additionalArguments, $defaultChannelClass);

             //$this->channelRegistry->register($channel);

@@ -91,7 +91,7 @@ 
      * @param string $defaultClass the class to use if none is set in config.

      * @return object the gateway instance

      */

-    public function createGateway($config, $defaultClass = false){

+    public function createGateway($config, $defaultClass = false) {

         $args = array(

             $this->getRequestChannel($config),

             $this->getReplyChannel($config)

@@ -115,7 +115,7 @@ 
      * @param string $defaultClass the class to use if none is set in config.

      * @return object the router instance

      */

-    public function createRouter($config, $defaultClass = false){

+    public function createRouter($config, $defaultClass = false) {

         $resolver = $config['channel_resolver'] ? (string)$config['channel_resolver'] : $this->channelRegistry;

         return $this->buildAndModify($config, array(

             $resolver,

@@ -132,7 +132,7 @@ 
      * @param object $config configuration object for the splitter.

      * @return object the splitter instance

      */

-    public function createSplitter($config){

+    public function createSplitter($config) {

         return $this->createReplyMessageHandler($config);

     }

 

@@ -145,7 +145,7 @@ 
      * @param object $config configuration object for the transformer.

      * @return object the transformer instance

      */

-    public function createTransformer($config){

+    public function createTransformer($config) {

         return $this->createReplyMessageHandler($config);

     }

 

@@ -158,7 +158,7 @@ 
      * @param object $config configuration object for the aggregator.

      * @return object the aggregator instance

      */

-    public function createAggregator($config){

+    public function createAggregator($config) {

         return $this->createReplyMessageHandler($config);

     }

 

@@ -171,7 +171,7 @@ 
      * @param object $config configuration object for the wiretap.

      * @return object the wiretap instance

      */

-    public function createWiretap($config){

+    public function createWiretap($config) {

         return $this->createReplyMessageHandler($config, 'Wiretap');

     }

 

@@ -184,7 +184,7 @@ 
      * @param string $defaultClass the class to use if none is set in config.

      * @return object the reply-message-handler instance

      */

-    public function createReplyMessageHandler($config, $defaultClass = false){

+    public function createReplyMessageHandler($config, $defaultClass = false) {

         return $this->buildAndModify($config, $this->getReplyHandlerArguments($config), $defaultClass);

     }

 

@@ -197,12 +197,12 @@ 
      * @param string $defaultClass the class to use if none is set in config.

      * @return object the service-activator instance

      */

-    public function createServiceActivator($config, $defaultClass = false){

+    public function createServiceActivator($config, $defaultClass = false) {

         $method = (string)$config['method'];

         $service = $this->context->getServiceProvider()->provideService((string)$config['ref']);

-        if($method && $service){

+        if ($method && $service) {

             $args = $this->getReplyHandlerArguments($config);

-            array_unshift($args,array(

+            array_unshift($args, array(

                 $service,

                 $method

             ));

@@ -219,12 +219,12 @@ 
      * @param object $config configuration object to create arguments from.

      * @return mixed build arguments

      */

-    protected function getReplyHandlerArguments($config){

+    protected function getReplyHandlerArguments($config) {

         $args = array(

             $this->doGetChannel('input', $config),

             $this->doGetChannel('output', $config)

         );

-        if($args[0] == NULL){

+        if ($args[0] == NULL) {

             throw new \RuntimeException('Could not receive input channel.');

         }

         return $args;

@@ -239,7 +239,7 @@ 
      * @param object $config configuration object to return request-channel from.

      * @return \PEIP\INF\Channel\Channel request-channel

      */

-    protected function getRequestChannel($config){

+    protected function getRequestChannel($config) {

         return $this->doGetChannel('request', $config);

     }

 

@@ -252,7 +252,7 @@ 
      * @param object $config configuration object to return reply-channel from.

      * @return \PEIP\INF\Channel\Channel reply-channel

      */

-    protected function getReplyChannel($config){

+    protected function getReplyChannel($config) {

         return $this->doGetChannel('reply', $config);

     }

 

@@ -265,15 +265,15 @@ 
      * @param object $config configuration object to return channel from.

      * @return \PEIP\INF\Channel\Channel reply-channel

      */

-    public function doGetChannel($type, $config){

+    public function doGetChannel($type, $config) {

         $channelName = $config[$type."_channel"]

             ? $config[$type."_channel"]

             : $config["default_".$type."_channel"];

         return $this->context->getServiceProvider()->provideService(trim((string)$channelName));

-        $channel =  $this->services[trim((string)$channelName)];

-        if($channel instanceof \PEIP\INF\Channel\Channel){

+        $channel = $this->services[trim((string)$channelName)];

+        if ($channel instanceof \PEIP\INF\Channel\Channel) {

             return $channel;

-        }else{

+        }else {

             return NULL;

         }

     }

Braces +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     protected function getMessage($object){

         if($this->channel instanceof \PEIP\INF\Channel\SubscribableChannel){

             return $object; 

-        }else{

+        } else{

             return $object->getContent()->receive();

         }

     }

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 added lines, -1 removed lines

@@ -11,7 +11,7 @@
  *

  * @author timo

  */

-use PEIP\Context\XMLContext;

+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

@@ -89,7 +89,7 @@ 
         );

         $plugin = new BasePlugin();

         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,17 +83,17 @@ 
      * @see XMLContext::includeContext

      * @access protected

      */

-    protected function initNodeBuilders(){ return;

+    protected function initNodeBuilders() { return;

         $builders = array(

             'service' => 'initService'

         );

         $plugin = new BasePlugin();

-        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(

@@ -112,15 +112,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(

@@ -131,16 +131,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

@@ -151,11 +151,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(

@@ -165,8 +165,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]];

@@ -181,7 +181,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(

@@ -189,20 +189,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;

         }

 

@@ -213,27 +213,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

@@ -119,7 +119,7 @@ 
 

         if($this->hasService($key)){

             $service =  $this->getService($key);

-        }else{

+        } else{

             $service =  $this->createService($key);

         }

 

@@ -151,11 +151,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(

@@ -199,10 +199,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/messaging/DrinkRouter.php

Indentation +7 added lines, -7 removed lines

@@ -1,14 +1,14 @@
 <?php
 
 class DrinkRouter 
-	extends PEIP_ABS_Router {
+    extends PEIP_ABS_Router {
 	
-	protected function selectChannels(PEIP_INF_Message $message){
-		$order = $message->getContent();
-		$channelName = $order['iced']  ? 'coldDrinks' : 'hotDrinks';
-		echo PEIP_LINE_SEPARATOR."DrinkRouter: routed to channel: $channelName";
-		return $channelName;
-	}	
+    protected function selectChannels(PEIP_INF_Message $message){
+        $order = $message->getContent();
+        $channelName = $order['iced']  ? 'coldDrinks' : 'hotDrinks';
+        echo PEIP_LINE_SEPARATOR."DrinkRouter: routed to channel: $channelName";
+        return $channelName;
+    }	
 
 	
 }

Spacing +2 added lines, -2 removed lines

@@ -3,9 +3,9 @@
 class DrinkRouter 
 	extends PEIP_ABS_Router {
 	
-	protected function selectChannels(PEIP_INF_Message $message){
+	protected function selectChannels(PEIP_INF_Message $message) {
 		$order = $message->getContent();
-		$channelName = $order['iced']  ? 'coldDrinks' : 'hotDrinks';
+		$channelName = $order['iced'] ? 'coldDrinks' : 'hotDrinks';
 		echo PEIP_LINE_SEPARATOR."DrinkRouter: routed to channel: $channelName";
 		return $channelName;
 	}	

examples/Cafe/lib/messaging/DrinkAggregator.php

Indentation +28 added lines, -28 removed lines

@@ -1,38 +1,38 @@
 <?php
 
 class DrinkAggregator 
-	extends PEIP_Pipe {
+    extends PEIP_Pipe {
 
-	protected $orders = array();
-	protected $preparedDrinks = array();
+    protected $orders = array();
+    protected $preparedDrinks = array();
 	
-	public function __construct(PEIP_INF_Channel $inputChannel, PEIP_INF_Channel $outputChannel = NULL){
-		$this->setInputChannel($inputChannel);
-		if(is_object($outputChannel)){
-			$this->setOutputChannel($outputChannel);	
-		}
-		$this->registerCommand('ADD_ORDER', array($this, 'receiveOrder'));
-	}
+    public function __construct(PEIP_INF_Channel $inputChannel, PEIP_INF_Channel $outputChannel = NULL){
+        $this->setInputChannel($inputChannel);
+        if(is_object($outputChannel)){
+            $this->setOutputChannel($outputChannel);	
+        }
+        $this->registerCommand('ADD_ORDER', array($this, 'receiveOrder'));
+    }
 
-	protected function doReply(PEIP_INF_Message $message){
-		$drink = $message->getContent();
-		$nr = $drink->getOrderNumber();
-		if(!isset($this->preparedDrinks[$nr])){
-			$this->preparedDrinks[$nr] = array();
-		}
-		$this->preparedDrinks[$drink->getOrderNumber()][] = $drink;
-		if(isset($this->orders[$nr]) 
-			&& $this->orders[$nr]->getTotalCount() == count($this->preparedDrinks[$nr])){
-			$this->replyMessage($this->preparedDrinks[$nr]);
-			unset($this->preparedDrinks[$nr]);
-			echo PEIP_LINE_SEPARATOR.'DrinkAggregator : reply #'.$nr;	
-		}
-	}
+    protected function doReply(PEIP_INF_Message $message){
+        $drink = $message->getContent();
+        $nr = $drink->getOrderNumber();
+        if(!isset($this->preparedDrinks[$nr])){
+            $this->preparedDrinks[$nr] = array();
+        }
+        $this->preparedDrinks[$drink->getOrderNumber()][] = $drink;
+        if(isset($this->orders[$nr]) 
+            && $this->orders[$nr]->getTotalCount() == count($this->preparedDrinks[$nr])){
+            $this->replyMessage($this->preparedDrinks[$nr]);
+            unset($this->preparedDrinks[$nr]);
+            echo PEIP_LINE_SEPARATOR.'DrinkAggregator : reply #'.$nr;	
+        }
+    }
 
-	public function receiveOrder(Order $order){
-		echo PEIP_LINE_SEPARATOR.'DrinkAggregator: received Order';
-		$this->orders[$order->getOrderNumber()] = $order;	
-	}	
+    public function receiveOrder(Order $order){
+        echo PEIP_LINE_SEPARATOR.'DrinkAggregator: received Order';
+        $this->orders[$order->getOrderNumber()] = $order;	
+    }	
 	
 
 }

Spacing +7 added lines, -7 removed lines

@@ -6,30 +6,30 @@
 	protected $orders = array();
 	protected $preparedDrinks = array();
 	
-	public function __construct(PEIP_INF_Channel $inputChannel, PEIP_INF_Channel $outputChannel = NULL){
+	public function __construct(PEIP_INF_Channel $inputChannel, PEIP_INF_Channel $outputChannel = NULL) {
 		$this->setInputChannel($inputChannel);
-		if(is_object($outputChannel)){
+		if (is_object($outputChannel)) {
 			$this->setOutputChannel($outputChannel);	
 		}
 		$this->registerCommand('ADD_ORDER', array($this, 'receiveOrder'));
 	}
 
-	protected function doReply(PEIP_INF_Message $message){
+	protected function doReply(PEIP_INF_Message $message) {
 		$drink = $message->getContent();
 		$nr = $drink->getOrderNumber();
-		if(!isset($this->preparedDrinks[$nr])){
+		if (!isset($this->preparedDrinks[$nr])) {
 			$this->preparedDrinks[$nr] = array();
 		}
 		$this->preparedDrinks[$drink->getOrderNumber()][] = $drink;
-		if(isset($this->orders[$nr]) 
-			&& $this->orders[$nr]->getTotalCount() == count($this->preparedDrinks[$nr])){
+		if (isset($this->orders[$nr]) 
+			&& $this->orders[$nr]->getTotalCount() == count($this->preparedDrinks[$nr])) {
 			$this->replyMessage($this->preparedDrinks[$nr]);
 			unset($this->preparedDrinks[$nr]);
 			echo PEIP_LINE_SEPARATOR.'DrinkAggregator : reply #'.$nr;	
 		}
 	}
 
-	public function receiveOrder(Order $order){
+	public function receiveOrder(Order $order) {
 		echo PEIP_LINE_SEPARATOR.'DrinkAggregator: received Order';
 		$this->orders[$order->getOrderNumber()] = $order;	
 	}	

examples/Cafe/lib/messaging/CafeGateway.php

Indentation +7 added lines, -7 removed lines

@@ -2,13 +2,13 @@
 
 class CafeGateway extends PEIP_Simple_Messaging_Gateway {
 
-	public function placeOrder(Order $order){
-		echo "\nCafe: place order #".$order->getOrderNumber();
-		$this->send($order);
-	}
+    public function placeOrder(Order $order){
+        echo "\nCafe: place order #".$order->getOrderNumber();
+        $this->send($order);
+    }
 	
-	public function receiveDelivery(){
-		return $this->receive();
-	}
+    public function receiveDelivery(){
+        return $this->receive();
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -2,12 +2,12 @@
 
 class CafeGateway extends PEIP_Simple_Messaging_Gateway {
 
-	public function placeOrder(Order $order){
+	public function placeOrder(Order $order) {
 		echo "\nCafe: place order #".$order->getOrderNumber();
 		$this->send($order);
 	}
 	
-	public function receiveDelivery(){
+	public function receiveDelivery() {
 		return $this->receive();
 	}
 

examples/Cafe/lib/messaging/OrderSplitter.php

Indentation +15 added lines, -15 removed lines

@@ -2,20 +2,20 @@
 
 class OrderSplitter extends PEIP_ABS_Message_Splitter {
 
-	public function split(PEIP_INF_Message $message){
-		$order = $message->getContent();
-		$orderItems = $order->getItems();
-		$items = array();
-		foreach($orderItems as $item){
-			$nr = $item['number'];
-			unset($item['number']);
-			$item['order'] = $order->getOrderNumber();
-			for($x = 0; $x < $nr; $x++){
-				$items[] = $item;	
-			}
-		}
-		echo PEIP_LINE_SEPARATOR."OrderSplitter: split order #: ".$order->getOrderNumber();
-		return $items;
-	}
+    public function split(PEIP_INF_Message $message){
+        $order = $message->getContent();
+        $orderItems = $order->getItems();
+        $items = array();
+        foreach($orderItems as $item){
+            $nr = $item['number'];
+            unset($item['number']);
+            $item['order'] = $order->getOrderNumber();
+            for($x = 0; $x < $nr; $x++){
+                $items[] = $item;	
+            }
+        }
+        echo PEIP_LINE_SEPARATOR."OrderSplitter: split order #: ".$order->getOrderNumber();
+        return $items;
+    }
 	
 }

Spacing +3 added lines, -3 removed lines

@@ -2,15 +2,15 @@
 
 class OrderSplitter extends PEIP_ABS_Message_Splitter {
 
-	public function split(PEIP_INF_Message $message){
+	public function split(PEIP_INF_Message $message) {
 		$order = $message->getContent();
 		$orderItems = $order->getItems();
 		$items = array();
-		foreach($orderItems as $item){
+		foreach ($orderItems as $item) {
 			$nr = $item['number'];
 			unset($item['number']);
 			$item['order'] = $order->getOrderNumber();
-			for($x = 0; $x < $nr; $x++){
+			for ($x = 0; $x < $nr; $x++) {
 				$items[] = $item;	
 			}
 		}

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;    		
     	}