Inspection of "removed unused variable" - tidal/PEIP - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — v1.ns ( a6bb16...dc5273 )

by Timo

created 2016-07-01 14:24 UTC

Status

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -71,7 +71,7 @@
 block discarded – undo
      * @see GenericBuilder
      * @static
      * @access protected
-     * @param object $className name of class to build instance for.
+     * @param string $className name of class to build instance for.
      * @param array $arguments arguments for the constructor
      * @return object build and modified srvice instance
      */

Please login to merge, or discard this patch.

Unused Use Statements +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -11,8 +11,8 @@
 block discarded – undo
  *
  * @author timo
  */
-use PEIP\Util\Test;
-use PEIP\Base\GenericBuilder;
+use PEIP\Util\Test;
+use PEIP\Base\GenericBuilder;
 use PEIP\Context\XMLContext;
 
 class ServiceFactory {

Please login to merge, or discard this patch.

Braces +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -51,10 +51,10 @@  discard block
 block discarded – undo
                 $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){
+            } catch(\Exception $e){
                 throw new \RuntimeException('Could not create Service "'.$cls.'" -> '.$e->getMessage());
             }
         }
@@ -89,26 +89,26 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
     public static function buildAndModify($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($config->argument){
                         foreach($config->argument as $arg){
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
                     $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;
                     }
                 }

Please login to merge, or discard this patch.

Indentation +23 added lines, -23 removed lines patch added patch discarded remove patch

@@ -16,13 +16,13 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
     }
 
         /**
-     * 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 @@  discard block
 block discarded – undo
     }
 
         /**
-     * 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 @@  discard block
 block discarded – undo
      */
     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.');
         }

Please login to merge, or discard this patch.

Spacing +44 added lines, -44 removed lines patch added patch discarded remove patch

@@ -23,11 +23,11 @@  discard block
 block discarded – undo
      * @param $config configuration of the service
      * @return object the initialized service instance
      */
-    public static function createService(array $config){
+    public static function createService(array $config) {
         $args = array();
         //build arguments for constructor
-        if(isset($config['constructor_arg'])){
-            foreach($config['constructor_arg'] as $arg){
+        if (isset($config['constructor_arg'])) {
+            foreach ($config['constructor_arg'] as $arg) {
                 $args[] = self::buildArg($arg);
             }
         }
@@ -44,21 +44,21 @@  discard block
 block discarded – undo
      * @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){
+    public static function doBuild($config, $arguments, $defaultClass = false) {
         $cls = isset($config["class"]) ? trim((string)$config["class"]) : (string)$defaultClass;
-        if($cls != ''){
+        if ($cls != '') {
             try {
-                $constructor = isset($config["constructor"])?(string)$config["constructor"]:"";
-                if($constructor != '' && Test::assertMethod($cls, $constructor)){
+                $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){
+            } catch (\Exception $e) {
                 throw new \RuntimeException('Could not create Service "'.$cls.'" -> '.$e->getMessage());
             }
         }
-        if(is_object($service)){
+        if (is_object($service)) {
             return $service;
         }
         throw new \RuntimeException('Could not create Service "'.$cls.'". Class does not exist.');
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
      * @param array $arguments arguments for the constructor
      * @return object build and modified srvice instance
      */
-    public static function build($className, $arguments){
+    public static function build($className, $arguments) {
         return GenericBuilder::getInstance($className)->build($arguments);
     }
 
@@ -86,29 +86,29 @@  discard block
 block discarded – undo
      * @param object $config configuration object to create argument from.
      * @return mixed build argument
      */
-    protected function buildArg($config){
-        if(trim((string)$config['value']) != ''){
+    protected 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']){
+            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 = $this->buildArg($config->list);
-        }elseif($config->service){
+        }elseif ($config->service) {
             $arg = $this->buildArg($config->service);
         }
         return $arg;
@@ -126,24 +126,24 @@  discard block
 block discarded – undo
      * @param string $defaultClass class to create instance for if none is set in config
      * @return object build and modified srvice instance
      */
-    public static function buildAndModify(array $config, $arguments, $defaultClass = ""){
-        if((isset($config["class"]) && "" != (string)$config["class"])  || $defaultClass !== ""){
+    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"])){
+        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){
+            if (isset($config['argument'])) {
+                        foreach ($config['argument'] as $arg) {
                             $args[] = $this->buildArg($arg);
                         }
                 }
             $service = call_user_func_array(array($service, (string)$config["ref_method"]), $args);
         }
-        if(!is_object($service)){
+        if (!is_object($service)) {
             throw new \RuntimeException('Could not create Service.');
         }
         $service = self::modifyService($service, $config);
@@ -165,29 +165,29 @@  discard block
 block discarded – undo
      * @param object $config configuration to get the modification instructions from.
      * @return object the modificated service
      */
-    protected function modifyService($service, $config){        
+    protected function modifyService($service, $config) {        
         $config = is_array($config) ? new \ArrayObject($config) : $config;
         // set instance properties
-        if(isset($config->property)){
-            foreach($config->property as $property){
+        if (isset($config->property)) {
+            foreach ($config->property as $property) {
                 $arg = $this->buildArg($property);
-                if($arg){
+                if ($arg) {
                     $setter = self::getSetter($property);
-                    if($setter &&  self::hasPublicProperty($service, 'Method', $setter)){
+                    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;
                     }
                 }
             }
         }
         // call instance methods
-        if(isset($config->action)){
-            foreach($config->action as $action){
+        if (isset($config->action)) {
+            foreach ($config->action as $action) {
                 $method = (string)$action['method'] != '' ? (string)$action['method'] : NULL;
-                if($method && self::hasPublicProperty($service, 'Method', $method)){
+                if ($method && self::hasPublicProperty($service, 'Method', $method)) {
                     $args = array();
-                    foreach($action->children() as $argument){
+                    foreach ($action->children() as $argument) {
                         $args[] = $this->buildArg($argument);
                     }
                     call_user_func_array(array($service, (string)$action['method']), $args);
@@ -195,9 +195,9 @@  discard block
 block discarded – undo
             }
         }
         // register instance listeners
-        if($service instanceof \PEIP\INF\Event\Connectable){
-            if(isset($config->listener)){
-                foreach($config->listener as $listenerConf){
+        if ($service instanceof \PEIP\INF\Event\Connectable) {
+            if (isset($config->listener)) {
+                foreach ($config->listener as $listenerConf) {
                     $event = (string)$listenerConf['event'];
                     $listener = $this->provideService($listenerConf);
                     $service->connect($event, $listener);

Please login to merge, or discard this patch.

src/INF/Channel/Channel.php 1 patch

Doc Comments +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -33,10 +33,10 @@
 block discarded – undo
      * Send a message, blocking until either the message is accepted or the
      * specified timeout period elapses.
      * 
-     * @param message the {@link Message} to send
-     * @param timeout the timeout in milliseconds
+     * @param message \PEIP\INF\Message\Message {@link Message} to send
+     * @param timeout integer timeout in milliseconds
      * 
-     * @return <code>true</code> if the message is sent successfully,
+     * @return void if the message is sent successfully,
      * <code>false</false> if the specified timeout period elapses or
      * the send is interrupted
      */

Please login to merge, or discard this patch.

src/Message/GenericMessage.php 4 patches

Unused Use Statements +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -20,7 +20,7 @@
 block discarded – undo
  * @implements \PEIP\INF\Base\Container, \PEIP\INF\Message\Message, \PEIP\INF\Base\Buildable
  */
 
-use PEIP\Util\Test;
+use PEIP\Util\Test;
 use PEIP\Base\GenericBuilder;
 
 class GenericMessage 

Please login to merge, or discard this patch.

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -76,11 +76,11 @@
 block discarded – undo
     }
 
         /**
-     * returns all headers of the message
-     * 
-     * @access public
-     * @return ArrayAccess ArrayAccess object of headers
-     */
+         * returns all headers of the message
+         * 
+         * @access public
+         * @return ArrayAccess ArrayAccess object of headers
+         */
     public function getHeaders(){
         return (array) $this->headers;
     }

Please login to merge, or discard this patch.

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -41,7 +41,7 @@  discard block
 block discarded – undo
      * @param mixed $content The content/payload of the message 
      * @param array|ArrayAccess $headers headers as key/value pairs
      */
-    public function __construct($content, $headers = array()){
+    public function __construct($content, $headers = array()) {
         $this->doSetContent($content);
         $this->doSetHeaders($headers);          
     }
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
      * @access public
      * @return
      */
-    public function getContent(){
+    public function getContent() {
         return $this->content;
     }
 
@@ -63,13 +63,13 @@  discard block
 block discarded – undo
      * @access protected
      * @param mixed $content The content/payload of the message 
      */
-    protected function doSetContent($content){
+    protected function doSetContent($content) {
         $this->content = Test::castType($content, self::CONTENT_CAST_TYPE);
     }
 
-    protected function doSetHeaders($headers){
+    protected function doSetHeaders($headers) {
         $headers = Test::ensureArrayAccess($headers);
-        if(is_array($headers)){
+        if (is_array($headers)) {
             $headers = new \ArrayObject($headers);
         }
         $this->headers = $headers;
@@ -81,8 +81,8 @@  discard block
 block discarded – undo
      * @access public
      * @return ArrayAccess ArrayAccess object of headers
      */
-    public function getHeaders(){
-        return (array) $this->headers;
+    public function getHeaders() {
+        return (array)$this->headers;
     }
   
     /**
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
      * @param string $name the name of the header  
      * @return mixed the value of the header
      */
-    public function getHeader($name){
+    public function getHeader($name) {
         $name = (string)$name;
         return isset($this->headers[$name]) ? $this->headers[$name] : NULL;
     }
@@ -105,8 +105,8 @@  discard block
 block discarded – undo
      * @param string $name the name of the header
      * @return boolean wether the header has been successfully  set
      */
-    public function addHeader($name, $value){
-        if(!$this->hasHeader($name)){
+    public function addHeader($name, $value) {
+        if (!$this->hasHeader($name)) {
             $this->headers[$name] = $value;
             return true;
         }
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
      * @param string $name the name of the header
      * @return boolean wether the header is set
      */
-    public function hasHeader($name){
+    public function hasHeader($name) {
         return isset($this->headers[$name]);
     }
 
@@ -130,16 +130,16 @@  discard block
 block discarded – undo
      * @access public
      * @return string  content/payload of the message
      */
-    public function __toString(){
+    public function __toString() {
         $res = false;
         try {
             $res = (string)$this->getContent();
         }
-        catch(\Exception $e){           
+        catch (\Exception $e) {           
             try {
                 $res = get_class($this->getContent());
             }
-            catch(\Exception $e){
+            catch (\Exception $e) {
 
             }
         }
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
      * @param array $arguments argumends for the constructor
      * @return GenericMessage new class instance
      */    
-    public static function build(array $arguments = array()){
+    public static function build(array $arguments = array()) {
         return GenericBuilder::getInstance(__CLASS__)->build($arguments);
     }     
 } 
\ No newline at end of file

Please login to merge, or discard this patch.

Braces +2 added lines, -4 removed lines patch added patch discarded remove patch

@@ -134,12 +134,10 @@
 block discarded – undo
         $res = false;
         try {
             $res = (string)$this->getContent();
-        }
-        catch(\Exception $e){           
+        } catch(\Exception $e){           
             try {
                 $res = get_class($this->getContent());
-            }
-            catch(\Exception $e){
+            } catch(\Exception $e){
 
             }
         }

Please login to merge, or discard this patch.

src/Message/TextMessage.php 2 patches

Doc Comments -1 removed lines patch added patch discarded remove patch

@@ -64,7 +64,6 @@
 block discarded – undo
      * @static
      * @access public
      * @implements \PEIP\INF\Base\Buildable
-     * @param string $name the name of the header
      * @return boolean wether the header is set
      */
     public static function build(array $arguments = array()){

Please login to merge, or discard this patch.

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -34,7 +34,7 @@  discard block
 block discarded – undo
      * @param $title 
      * @return 
      */
-    public function __construct($content, $title){
+    public function __construct($content, $title) {
         $this->setContent((string)$content);
     }
 
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
      * @param $title 
      * @return 
      */
-    public function setTitle($title){
+    public function setTitle($title) {
         $this->title = (string)$title;
     }
 
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
      * @access public
      * @return 
      */
-    public function getTitle(){
+    public function getTitle() {
         return $this->title;
     }
 
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
      * @param string $name the name of the header
      * @return boolean wether the header is set
      */
-    public static function build(array $arguments = array()){
+    public static function build(array $arguments = array()) {
         return GenericBuilder::getInstance('\PEIP\Message\StringMessage')->build($arguments);
     }
 

Please login to merge, or discard this patch.

src/Pipe/FixedEventPipe.php 3 patches

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -42,7 +42,7 @@
 block discarded – undo
     
     /**
      * @access public
-     * @param $eventName 
+     * @param string $eventName 
      * @return 
      */
     public function setEventName($eventName){

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -31,10 +31,10 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
      * @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);
             }   
         }

Please login to merge, or discard this patch.

Braces +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -17,7 +17,7 @@
 block discarded – undo
     protected function getMessage($object){
         if($this->channel instanceof \PEIP\INF\Channel\SubscribableChannel){
             return $object; 
-        }else{
+        } else{
             return $object->getContent()->receive();
         }
     }

Please login to merge, or discard this patch.

src/Plugins/BasePlugin.php 3 patches

Doc Comments +3 added lines, -2 removed lines patch added patch discarded remove patch

@@ -217,7 +217,7 @@  discard block
 block discarded – undo
      *
      * @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 @@  discard block
 block discarded – undo
      *
      * @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){

Please login to merge, or discard this patch.

Spacing +22 added lines, -22 removed lines patch added patch discarded remove patch

@@ -46,7 +46,7 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
      * @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;
         }
     }

Please login to merge, or discard this patch.

Braces +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -17,7 +17,7 @@
 block discarded – undo
     protected function getMessage($object){
         if($this->channel instanceof \PEIP\INF\Channel\SubscribableChannel){
             return $object; 
-        }else{
+        } else{
             return $object->getContent()->receive();
         }
     }

Please login to merge, or discard this patch.

src/Service/ServiceProvider.php 5 patches

Doc Comments +3 added lines patch added patch discarded remove patch

@@ -112,6 +112,9 @@
 block discarded – undo
         );
     }
 
+    /**
+     * @param string $key
+     */
     public function provideService($key){
         $this->doFireEvent(self::EVENT_BEFORE_PROVIDE_SERVICE, array(
             self::HEADER_KEY=>$key)

Please login to merge, or discard this patch.

Unused Use Statements +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -11,7 +11,7 @@
 block discarded – undo
  *
  * @author timo
  */
-use PEIP\Context\XMLContext;
+use PEIP\Context\XMLContext;
 use PEIP\Plugins\BasePlugin;
 
 class ServiceProvider extends \PEIP\Service\ServiceContainer  {

Please login to merge, or discard this patch.

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -63,17 +63,17 @@  discard block
 block discarded – undo
     }
 
         /**
-     * 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 @@  discard block
 block discarded – undo
         );
         $plugin = new BasePlugin();
         foreach($builders as $nodeName => $method){
-           $this->registerNodeBuilder($nodeName, array($this, $method));
+            $this->registerNodeBuilder($nodeName, array($this, $method));
         }
     }
 

Please login to merge, or discard this patch.

Spacing +31 added lines, -31 removed lines patch added patch discarded remove patch

@@ -14,7 +14,7 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
      * @access public
      * @return array registered services
      */
-    public function getServices(){
+    public function getServices() {
         return $this->services;
     }
 
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
         );
     }
 
-    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 @@  discard block
 block discarded – undo
         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 @@  discard block
 block discarded – undo
                 ));
 
                 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 @@  discard block
 block discarded – undo
         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 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
             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 @@  discard block
 block discarded – undo
         ));
     }
 
-    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;

Please login to merge, or discard this patch.

Braces +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -119,7 +119,7 @@  discard block
 block discarded – undo
 
         if($this->hasService($key)){
             $service =  $this->getService($key);
-        }else{
+        } else{
             $service =  $this->createService($key);
         }
 
@@ -151,11 +151,11 @@  discard block
 block discarded – undo
                 ));
 
                 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 @@  discard block
 block discarded – undo
                     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;
         }
 

Please login to merge, or discard this patch.

examples/Cafe/lib/model/Barista.php 3 patches

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -31,19 +31,19 @@
 block discarded – undo
     }    
 	
     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();    
     }

Please login to merge, or discard this patch.

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -30,16 +30,16 @@
 block discarded – undo
         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;    		
     	}

Please login to merge, or discard this patch.

Braces +1 added lines, -1 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

examples/Cafe/lib/model/Order.php 2 patches

Indentation +29 added lines, -29 removed lines patch added patch discarded remove patch

@@ -2,40 +2,40 @@
 block discarded – undo
 
 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;
+    }
 	
 	
 	

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -7,16 +7,16 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 			);
 	}
 
-	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;

Please login to merge, or discard this patch.

		@@ -134,12 +134,10 @@
		block discarded – undo
134	134	$res = false;
135	135	try {
136	136	$res = (string)$this->getContent();
137		- }
138		- catch(\Exception $e){
	137	+ } catch(\Exception $e){
139	138	try {
140	139	$res = get_class($this->getContent());
141		- }
142		- catch(\Exception $e){
	140	+ } catch(\Exception $e){
143	141
144	142	}
145	143	}

		@@ -71,7 +71,7 @@
		block discarded – undo
71	71	* @see GenericBuilder
72	72	* @static
73	73	* @access protected
74		- * @param object $className name of class to build instance for.
	74	+ * @param string $className name of class to build instance for.
75	75	* @param array $arguments arguments for the constructor
76	76	* @return object build and modified srvice instance
77	77	*/

		@@ -11,8 +11,8 @@
		block discarded – undo
11	11	*
12	12	* @author timo
13	13	*/
14		-use PEIP\Util\Test;
15		-use PEIP\Base\GenericBuilder;
	14	+use PEIP\Util\Test;
	15	+use PEIP\Base\GenericBuilder;
16	16	use PEIP\Context\XMLContext;
17	17
18	18	class ServiceFactory {

		@@ -51,10 +51,10 @@ discard block
		block discarded – undo
51	51	$constructor = isset($config["constructor"])?(string)$config["constructor"]:"";
52	52	if($constructor != '' && Test::assertMethod($cls, $constructor)){
53	53	$service = call_user_func_array(array($cls, $constructor), $arguments);
54		- }else{
	54	+ } else{
55	55	$service = self::build($cls, $arguments);
56	56	}
57		- }catch(\Exception $e){
	57	+ } catch(\Exception $e){
58	58	throw new \RuntimeException('Could not create Service "'.$cls.'" -> '.$e->getMessage());
59	59	}
60	60	}
		@@ -89,26 +89,26 @@ discard block
		block discarded – undo
89	89	protected static function buildArg($config){
90	90	if(trim((string)$config['value']) != ''){
91	91	$arg = (string)$config['value'];
92		- }elseif($config->getName() == 'value'){
	92	+ } elseif($config->getName() == 'value'){
93	93	$arg = (string)$config;
94		- }elseif($config->getName() == 'list'){
	94	+ } elseif($config->getName() == 'list'){
95	95	$arg = array();
96	96	foreach($config->children() as $entry){
97	97	if($entry->getName() == 'value'){
98	98	if($entry['key']){
99	99	$arg[(string)$entry['key']] = (string)$entry;
100		- }else{
	100	+ } else{
101	101	$arg[] = (string)$entry;
102	102	}
103		- }elseif($entry->getName() == 'service'){
	103	+ } elseif($entry->getName() == 'service'){
104	104	$arg[] = $this->provideService($entry);
105	105	}
106	106	}
107		- }elseif($config->getName() == 'service'){
	107	+ } elseif($config->getName() == 'service'){
108	108	$arg = self::provideService($config);
109		- }elseif($config->list){
	109	+ } elseif($config->list){
110	110	$arg = self::buildArg($config->list);
111		- }elseif($config->service){
	111	+ } elseif($config->service){
112	112	$arg = self::buildArg($config->service);
113	113	}
114	114	return $arg;
		@@ -129,12 +129,12 @@ discard block
		block discarded – undo
129	129	public static function buildAndModify($config, $arguments, $defaultClass = ""){
130	130	if((isset($config["class"]) && "" != (string)$config["class"]) \|\| $defaultClass !== ""){
131	131	$service = ServiceFactory::doBuild($config, $arguments, $defaultClass);
132		- }else{
	132	+ } else{
133	133	throw new \RuntimeException('Could not create Service. no class or reference given.');
134	134	}
135	135	if(isset($config["ref_property"])){
136	136	$service = $service->{(string)$config["ref_property"]};
137		- }elseif(isset($config["ref_method"])){
	137	+ } elseif(isset($config["ref_method"])){
138	138	$args = array();
139	139	if($config->argument){
140	140	foreach($config->argument as $arg){
		@@ -177,7 +177,7 @@ discard block
		block discarded – undo
177	177	$setter = self::getSetter($property);
178	178	if($setter && self::hasPublicProperty($service, 'Method', $setter)){
179	179	$service->{$setter}($arg);
180		- }elseif(in_array($property, self::hasPublicProperty($service, 'Property', $setter))){
	180	+ } elseif(in_array($property, self::hasPublicProperty($service, 'Property', $setter))){
181	181	$service->$setter = $arg;
182	182	}
183	183	}

		@@ -16,13 +16,13 @@ discard block
		block discarded – undo
16	16	use PEIP\Context\XMLContext;
17	17
18	18	class ServiceFactory {
19		- /**
20		- * Creates and initializes service instance from a given configuration.
21		- *
22		- * @access public
23		- * @param $config configuration of the service
24		- * @return object the initialized service instance
25		- */
	19	+ /**
	20	+ * Creates and initializes service instance from a given configuration.
	21	+ *
	22	+ * @access public
	23	+ * @param $config configuration of the service
	24	+ * @return object the initialized service instance
	25	+ */
26	26	public static function createService(array $config){
27	27	$args = array();
28	28	//build arguments for constructor
		@@ -35,15 +35,15 @@ discard block
		block discarded – undo
35	35	}
36	36
37	37	/**
38		- * Builds an arbitrary service/object instance from a config-obect.
39		- *
40		- * @static
41		- * @access protected
42		- * @param object $config configuration object to build a service instance from.
43		- * @param array $arguments arguments for the service constructor
44		- * @param string $defaultClass class to create instance for if none is set in config
45		- * @return object build and modified srvice instance
46		- */
	38	+ * Builds an arbitrary service/object instance from a config-obect.
	39	+ *
	40	+ * @static
	41	+ * @access protected
	42	+ * @param object $config configuration object to build a service instance from.
	43	+ * @param array $arguments arguments for the service constructor
	44	+ * @param string $defaultClass class to create instance for if none is set in config
	45	+ * @return object build and modified srvice instance
	46	+ */
47	47	public static function doBuild($config, $arguments, $defaultClass = false){
48	48	$cls = isset($config["class"]) ? trim((string)$config["class"]) : (string)$defaultClass;
49	49	if($cls != ''){
		@@ -80,12 +80,12 @@ discard block
		block discarded – undo
80	80	}
81	81
82	82	/**
83		- * Builds single argument (to call a method with later) from a config-obect.
84		- *
85		- * @access protected
86		- * @param object $config configuration object to create argument from.
87		- * @return mixed build argument
88		- */
	83	+ * Builds single argument (to call a method with later) from a config-obect.
	84	+ *
	85	+ * @access protected
	86	+ * @param object $config configuration object to create argument from.
	87	+ * @return mixed build argument
	88	+ */
89	89	protected function buildArg($config){
90	90	if(trim((string)$config['value']) != ''){
91	91	$arg = (string)$config['value'];
		@@ -128,7 +128,7 @@ discard block
		block discarded – undo
128	128	*/
129	129	public static function buildAndModify(array $config, $arguments, $defaultClass = ""){
130	130	if((isset($config["class"]) && "" != (string)$config["class"]) \|\| $defaultClass !== ""){
131		- $service = ServiceFactory::doBuild($config, $arguments, $defaultClass);
	131	+ $service = ServiceFactory::doBuild($config, $arguments, $defaultClass);
132	132	}else{
133	133	throw new \RuntimeException('Could not create Service. no class or reference given.');
134	134	}

		@@ -23,11 +23,11 @@ discard block
		block discarded – undo
23	23	* @param $config configuration of the service
24	24	* @return object the initialized service instance
25	25	*/
26		- public static function createService(array $config){
	26	+ public static function createService(array $config) {
27	27	$args = array();
28	28	//build arguments for constructor
29		- if(isset($config['constructor_arg'])){
30		- foreach($config['constructor_arg'] as $arg){
	29	+ if (isset($config['constructor_arg'])) {
	30	+ foreach ($config['constructor_arg'] as $arg) {
31	31	$args[] = self::buildArg($arg);
32	32	}
33	33	}
		@@ -44,21 +44,21 @@ discard block
		block discarded – undo
44	44	* @param string $defaultClass class to create instance for if none is set in config
45	45	* @return object build and modified srvice instance
46	46	*/
47		- public static function doBuild($config, $arguments, $defaultClass = false){
	47	+ public static function doBuild($config, $arguments, $defaultClass = false) {
48	48	$cls = isset($config["class"]) ? trim((string)$config["class"]) : (string)$defaultClass;
49		- if($cls != ''){
	49	+ if ($cls != '') {
50	50	try {
51		- $constructor = isset($config["constructor"])?(string)$config["constructor"]:"";
52		- if($constructor != '' && Test::assertMethod($cls, $constructor)){
	51	+ $constructor = isset($config["constructor"]) ? (string)$config["constructor"] : "";
	52	+ if ($constructor != '' && Test::assertMethod($cls, $constructor)) {
53	53	$service = call_user_func_array(array($cls, $constructor), $arguments);
54		- }else{
	54	+ }else {
55	55	$service = self::build($cls, $arguments);
56	56	}
57		- }catch(\Exception $e){
	57	+ } catch (\Exception $e) {
58	58	throw new \RuntimeException('Could not create Service "'.$cls.'" -> '.$e->getMessage());
59	59	}
60	60	}
61		- if(is_object($service)){
	61	+ if (is_object($service)) {
62	62	return $service;
63	63	}
64	64	throw new \RuntimeException('Could not create Service "'.$cls.'". Class does not exist.');
		@@ -75,7 +75,7 @@ discard block
		block discarded – undo
75	75	* @param array $arguments arguments for the constructor
76	76	* @return object build and modified srvice instance
77	77	*/
78		- public static function build($className, $arguments){
	78	+ public static function build($className, $arguments) {
79	79	return GenericBuilder::getInstance($className)->build($arguments);
80	80	}
81	81
		@@ -86,29 +86,29 @@ discard block
		block discarded – undo
86	86	* @param object $config configuration object to create argument from.
87	87	* @return mixed build argument
88	88	*/
89		- protected function buildArg($config){
90		- if(trim((string)$config['value']) != ''){
	89	+ protected function buildArg($config) {
	90	+ if (trim((string)$config['value']) != '') {
91	91	$arg = (string)$config['value'];
92		- }elseif($config->getName() == 'value'){
	92	+ }elseif ($config->getName() == 'value') {
93	93	$arg = (string)$config;
94		- }elseif($config->getName() == 'list'){
	94	+ }elseif ($config->getName() == 'list') {
95	95	$arg = array();
96		- foreach($config->children() as $entry){
97		- if($entry->getName() == 'value'){
98		- if($entry['key']){
	96	+ foreach ($config->children() as $entry) {
	97	+ if ($entry->getName() == 'value') {
	98	+ if ($entry['key']) {
99	99	$arg[(string)$entry['key']] = (string)$entry;
100		- }else{
	100	+ }else {
101	101	$arg[] = (string)$entry;
102	102	}
103		- }elseif($entry->getName() == 'service'){
	103	+ }elseif ($entry->getName() == 'service') {
104	104	$arg[] = $this->provideService($entry);
105	105	}
106	106	}
107		- }elseif($config->getName() == 'service'){
	107	+ }elseif ($config->getName() == 'service') {
108	108	$arg = self::provideService($config);
109		- }elseif($config->list){
	109	+ }elseif ($config->list) {
110	110	$arg = $this->buildArg($config->list);
111		- }elseif($config->service){
	111	+ }elseif ($config->service) {
112	112	$arg = $this->buildArg($config->service);
113	113	}
114	114	return $arg;
		@@ -126,24 +126,24 @@ discard block
		block discarded – undo
126	126	* @param string $defaultClass class to create instance for if none is set in config
127	127	* @return object build and modified srvice instance
128	128	*/
129		- public static function buildAndModify(array $config, $arguments, $defaultClass = ""){
130		- if((isset($config["class"]) && "" != (string)$config["class"]) \|\| $defaultClass !== ""){
	129	+ public static function buildAndModify(array $config, $arguments, $defaultClass = "") {
	130	+ if ((isset($config["class"]) && "" != (string)$config["class"]) \|\| $defaultClass !== "") {
131	131	$service = ServiceFactory::doBuild($config, $arguments, $defaultClass);
132		- }else{
	132	+ }else {
133	133	throw new \RuntimeException('Could not create Service. no class or reference given.');
134	134	}
135		- if(isset($config["ref_property"])){
	135	+ if (isset($config["ref_property"])) {
136	136	$service = $service->{(string)$config["ref_property"]};
137		- }elseif(isset($config["ref_method"])){
	137	+ }elseif (isset($config["ref_method"])) {
138	138	$args = array();
139		- if(isset($config['argument'])){
140		- foreach($config['argument'] as $arg){
	139	+ if (isset($config['argument'])) {
	140	+ foreach ($config['argument'] as $arg) {
141	141	$args[] = $this->buildArg($arg);
142	142	}
143	143	}
144	144	$service = call_user_func_array(array($service, (string)$config["ref_method"]), $args);
145	145	}
146		- if(!is_object($service)){
	146	+ if (!is_object($service)) {
147	147	throw new \RuntimeException('Could not create Service.');
148	148	}
149	149	$service = self::modifyService($service, $config);
		@@ -165,29 +165,29 @@ discard block
		block discarded – undo
165	165	* @param object $config configuration to get the modification instructions from.
166	166	* @return object the modificated service
167	167	*/
168		- protected function modifyService($service, $config){
	168	+ protected function modifyService($service, $config) {
169	169	$config = is_array($config) ? new \ArrayObject($config) : $config;
170	170	// set instance properties
171		- if(isset($config->property)){
172		- foreach($config->property as $property){
	171	+ if (isset($config->property)) {
	172	+ foreach ($config->property as $property) {
173	173	$arg = $this->buildArg($property);
174		- if($arg){
	174	+ if ($arg) {
175	175	$setter = self::getSetter($property);
176		- if($setter && self::hasPublicProperty($service, 'Method', $setter)){
	176	+ if ($setter && self::hasPublicProperty($service, 'Method', $setter)) {
177	177	$service->{$setter}($arg);
178		- }elseif(in_array($property, self::hasPublicProperty($service, 'Property', $setter))){
	178	+ }elseif (in_array($property, self::hasPublicProperty($service, 'Property', $setter))) {
179	179	$service->$setter = $arg;
180	180	}
181	181	}
182	182	}
183	183	}
184	184	// call instance methods
185		- if(isset($config->action)){
186		- foreach($config->action as $action){
	185	+ if (isset($config->action)) {
	186	+ foreach ($config->action as $action) {
187	187	$method = (string)$action['method'] != '' ? (string)$action['method'] : NULL;
188		- if($method && self::hasPublicProperty($service, 'Method', $method)){
	188	+ if ($method && self::hasPublicProperty($service, 'Method', $method)) {
189	189	$args = array();
190		- foreach($action->children() as $argument){
	190	+ foreach ($action->children() as $argument) {
191	191	$args[] = $this->buildArg($argument);
192	192	}
193	193	call_user_func_array(array($service, (string)$action['method']), $args);
		@@ -195,9 +195,9 @@ discard block
		block discarded – undo
195	195	}
196	196	}
197	197	// register instance listeners
198		- if($service instanceof \PEIP\INF\Event\Connectable){
199		- if(isset($config->listener)){
200		- foreach($config->listener as $listenerConf){
	198	+ if ($service instanceof \PEIP\INF\Event\Connectable) {
	199	+ if (isset($config->listener)) {
	200	+ foreach ($config->listener as $listenerConf) {
201	201	$event = (string)$listenerConf['event'];
202	202	$listener = $this->provideService($listenerConf);
203	203	$service->connect($event, $listener);

		@@ -33,10 +33,10 @@
		block discarded – undo
33	33	* Send a message, blocking until either the message is accepted or the
34	34	* specified timeout period elapses.
35	35	*
36		- * @param message the {@link Message} to send
37		- * @param timeout the timeout in milliseconds
	36	+ * @param message \PEIP\INF\Message\Message {@link Message} to send
	37	+ * @param timeout integer timeout in milliseconds
38	38	*
39		- * @return <code>true</code> if the message is sent successfully,
	39	+ * @return void if the message is sent successfully,
40	40	* <code>false</false> if the specified timeout period elapses or
41	41	* the send is interrupted
42	42	*/

		@@ -20,7 +20,7 @@
		block discarded – undo
20	20	* @implements \PEIP\INF\Base\Container, \PEIP\INF\Message\Message, \PEIP\INF\Base\Buildable
21	21	*/
22	22
23		-use PEIP\Util\Test;
	23	+use PEIP\Util\Test;
24	24	use PEIP\Base\GenericBuilder;
25	25
26	26	class GenericMessage

		@@ -76,11 +76,11 @@
		block discarded – undo
76	76	}
77	77
78	78	/**
79		- * returns all headers of the message
80		- *
81		- * @access public
82		- * @return ArrayAccess ArrayAccess object of headers
83		- */
	79	+ * returns all headers of the message
	80	+ *
	81	+ * @access public
	82	+ * @return ArrayAccess ArrayAccess object of headers
	83	+ */
84	84	public function getHeaders(){
85	85	return (array) $this->headers;
86	86	}

		@@ -41,7 +41,7 @@ discard block
		block discarded – undo
41	41	* @param mixed $content The content/payload of the message
42	42	* @param array\|ArrayAccess $headers headers as key/value pairs
43	43	*/
44		- public function __construct($content, $headers = array()){
	44	+ public function __construct($content, $headers = array()) {
45	45	$this->doSetContent($content);
46	46	$this->doSetHeaders($headers);
47	47	}
		@@ -53,7 +53,7 @@ discard block
		block discarded – undo
53	53	* @access public
54	54	* @return
55	55	*/
56		- public function getContent(){
	56	+ public function getContent() {
57	57	return $this->content;
58	58	}
59	59
		@@ -63,13 +63,13 @@ discard block
		block discarded – undo
63	63	* @access protected
64	64	* @param mixed $content The content/payload of the message
65	65	*/
66		- protected function doSetContent($content){
	66	+ protected function doSetContent($content) {
67	67	$this->content = Test::castType($content, self::CONTENT_CAST_TYPE);
68	68	}
69	69
70		- protected function doSetHeaders($headers){
	70	+ protected function doSetHeaders($headers) {
71	71	$headers = Test::ensureArrayAccess($headers);
72		- if(is_array($headers)){
	72	+ if (is_array($headers)) {
73	73	$headers = new \ArrayObject($headers);
74	74	}
75	75	$this->headers = $headers;
		@@ -81,8 +81,8 @@ discard block
		block discarded – undo
81	81	* @access public
82	82	* @return ArrayAccess ArrayAccess object of headers
83	83	*/
84		- public function getHeaders(){
85		- return (array) $this->headers;
	84	+ public function getHeaders() {
	85	+ return (array)$this->headers;
86	86	}
87	87
88	88	/**
		@@ -92,7 +92,7 @@ discard block
		block discarded – undo
92	92	* @param string $name the name of the header
93	93	* @return mixed the value of the header
94	94	*/
95		- public function getHeader($name){
	95	+ public function getHeader($name) {
96	96	$name = (string)$name;
97	97	return isset($this->headers[$name]) ? $this->headers[$name] : NULL;
98	98	}
		@@ -105,8 +105,8 @@ discard block
		block discarded – undo
105	105	* @param string $name the name of the header
106	106	* @return boolean wether the header has been successfully set
107	107	*/
108		- public function addHeader($name, $value){
109		- if(!$this->hasHeader($name)){
	108	+ public function addHeader($name, $value) {
	109	+ if (!$this->hasHeader($name)) {
110	110	$this->headers[$name] = $value;
111	111	return true;
112	112	}
		@@ -120,7 +120,7 @@ discard block
		block discarded – undo
120	120	* @param string $name the name of the header
121	121	* @return boolean wether the header is set
122	122	*/
123		- public function hasHeader($name){
	123	+ public function hasHeader($name) {
124	124	return isset($this->headers[$name]);
125	125	}
126	126
		@@ -130,16 +130,16 @@ discard block
		block discarded – undo
130	130	* @access public
131	131	* @return string content/payload of the message
132	132	*/
133		- public function __toString(){
	133	+ public function __toString() {
134	134	$res = false;
135	135	try {
136	136	$res = (string)$this->getContent();
137	137	}
138		- catch(\Exception $e){
	138	+ catch (\Exception $e) {
139	139	try {
140	140	$res = get_class($this->getContent());
141	141	}
142		- catch(\Exception $e){
	142	+ catch (\Exception $e) {
143	143
144	144	}
145	145	}
		@@ -159,7 +159,7 @@ discard block
		block discarded – undo
159	159	* @param array $arguments argumends for the constructor
160	160	* @return GenericMessage new class instance
161	161	*/
162		- public static function build(array $arguments = array()){
	162	+ public static function build(array $arguments = array()) {
163	163	return GenericBuilder::getInstance(__CLASS__)->build($arguments);
164	164	}
165	165	}
166	166	\ No newline at end of file

		@@ -64,7 +64,6 @@
		block discarded – undo
64	64	* @static
65	65	* @access public
66	66	* @implements \PEIP\INF\Base\Buildable
67		- * @param string $name the name of the header
68	67	* @return boolean wether the header is set
69	68	*/
70	69	public static function build(array $arguments = array()){

		@@ -34,7 +34,7 @@ discard block
		block discarded – undo
34	34	* @param $title
35	35	* @return
36	36	*/
37		- public function __construct($content, $title){
	37	+ public function __construct($content, $title) {
38	38	$this->setContent((string)$content);
39	39	}
40	40
		@@ -44,7 +44,7 @@ discard block
		block discarded – undo
44	44	* @param $title
45	45	* @return
46	46	*/
47		- public function setTitle($title){
	47	+ public function setTitle($title) {
48	48	$this->title = (string)$title;
49	49	}
50	50
		@@ -53,7 +53,7 @@ discard block
		block discarded – undo
53	53	* @access public
54	54	* @return
55	55	*/
56		- public function getTitle(){
	56	+ public function getTitle() {
57	57	return $this->title;
58	58	}
59	59
		@@ -67,7 +67,7 @@ discard block
		block discarded – undo
67	67	* @param string $name the name of the header
68	68	* @return boolean wether the header is set
69	69	*/
70		- public static function build(array $arguments = array()){
	70	+ public static function build(array $arguments = array()) {
71	71	return GenericBuilder::getInstance('\PEIP\Message\StringMessage')->build($arguments);
72	72	}
73	73

		@@ -42,7 +42,7 @@
		block discarded – undo
42	42
43	43	/**
44	44	* @access public
45		- * @param $eventName
	45	+ * @param string $eventName
46	46	* @return
47	47	*/
48	48	public function setEventName($eventName){

		@@ -31,10 +31,10 @@ discard block
		block discarded – undo
31	31	* @param $inputChannel
32	32	* @return
33	33	*/
34		- public function setInputChannel(\PEIP\INF\Channel\Channel $inputChannel){
35		- if(isset($this->eventName)){
	34	+ public function setInputChannel(\PEIP\INF\Channel\Channel $inputChannel) {
	35	+ if (isset($this->eventName)) {
36	36	$this->connectChannel($inputChannel);
37		- }else{
	37	+ }else {
38	38	$this->inputChannel = $inputChannel;
39	39	}
40	40	}
		@@ -45,10 +45,10 @@ discard block
		block discarded – undo
45	45	* @param $eventName
46	46	* @return
47	47	*/
48		- public function setEventName($eventName){
49		- if(!isset($this->eventName)){
	48	+ public function setEventName($eventName) {
	49	+ if (!isset($this->eventName)) {
50	50	$this->eventName = $eventName;
51		- if($this->inputChannel){
	51	+ if ($this->inputChannel) {
52	52	$this->inputChannel->connect($this->eventName, $this);
53	53	}
54	54	}

		@@ -17,7 +17,7 @@
		block discarded – undo
17	17	protected function getMessage($object){
18	18	if($this->channel instanceof \PEIP\INF\Channel\SubscribableChannel){
19	19	return $object;
20		- }else{
	20	+ } else{
21	21	return $object->getContent()->receive();
22	22	}
23	23	}

		@@ -217,7 +217,7 @@ discard block
		block discarded – undo
217	217	*
218	218	* @access protected
219	219	* @param object $config configuration object to create arguments from.
220		- * @return mixed build arguments
	220	+ * @return \PEIP\INF\Channel\Channel[] build arguments
221	221	*/
222	222	protected function getReplyHandlerArguments($config){
223	223	$args = array(
		@@ -262,7 +262,8 @@ discard block
		block discarded – undo
262	262	*
263	263	* @access protected
264	264	* @param string the configuration type ofthe channel (e.g.: 'reply', 'request')
265		- * @param object $config configuration object to return channel from.
	265	+ * @param object $config configuration object to return channel from.
	266	+ * @param string $type
266	267	* @return \PEIP\INF\Channel\Channel reply-channel
267	268	*/
268	269	public function doGetChannel($type, $config){

		@@ -46,7 +46,7 @@ discard block
		block discarded – undo
46	46	* @param object $config configuration object for the pollable channel.
47	47	* @return \PEIP\INF\Channel\Channel the created pollable channel instance
48	48	*/
49		- public function createChannel($config){
	49	+ public function createChannel($config) {
50	50	return $this->doCreateChannel($config, 'PollableChannel');
51	51	}
52	52
		@@ -58,7 +58,7 @@ discard block
		block discarded – undo
58	58	* @param object $config configuration object for the subscribable channel.
59	59	* @return \PEIP\INF\Channel\Channel the created subscribable channel instance
60	60	*/
61		- public function createSubscribableChannel($config){
	61	+ public function createSubscribableChannel($config) {
62	62	return $this->doCreateChannel($config, 'PublishSubscribeChannel');
63	63	}
64	64
		@@ -71,9 +71,9 @@ discard block
		block discarded – undo
71	71	* @param $additionalArguments additional arguments for the channel constructor (without first arg = id)
72	72	* @return \PEIP\INF\Channel\Channel the created channel instance
73	73	*/
74		- public function doCreateChannel($config, $defaultChannelClass, array $additionalArguments = array()){
	74	+ public function doCreateChannel($config, $defaultChannelClass, array $additionalArguments = array()) {
75	75	$id = (string)$config['id'];
76		- if($id != ''){
	76	+ if ($id != '') {
77	77	array_unshift($additionalArguments, $id);
78	78	$channel = $this->buildAndModify($config, $additionalArguments, $defaultChannelClass);
79	79	//$this->channelRegistry->register($channel);
		@@ -91,7 +91,7 @@ discard block
		block discarded – undo
91	91	* @param string $defaultClass the class to use if none is set in config.
92	92	* @return object the gateway instance
93	93	*/
94		- public function createGateway($config, $defaultClass = false){
	94	+ public function createGateway($config, $defaultClass = false) {
95	95	$args = array(
96	96	$this->getRequestChannel($config),
97	97	$this->getReplyChannel($config)
		@@ -115,7 +115,7 @@ discard block
		block discarded – undo
115	115	* @param string $defaultClass the class to use if none is set in config.
116	116	* @return object the router instance
117	117	*/
118		- public function createRouter($config, $defaultClass = false){
	118	+ public function createRouter($config, $defaultClass = false) {
119	119	$resolver = $config['channel_resolver'] ? (string)$config['channel_resolver'] : $this->channelRegistry;
120	120	return $this->buildAndModify($config, array(
121	121	$resolver,
		@@ -132,7 +132,7 @@ discard block
		block discarded – undo
132	132	* @param object $config configuration object for the splitter.
133	133	* @return object the splitter instance
134	134	*/
135		- public function createSplitter($config){
	135	+ public function createSplitter($config) {
136	136	return $this->createReplyMessageHandler($config);
137	137	}
138	138
		@@ -145,7 +145,7 @@ discard block
		block discarded – undo
145	145	* @param object $config configuration object for the transformer.
146	146	* @return object the transformer instance
147	147	*/
148		- public function createTransformer($config){
	148	+ public function createTransformer($config) {
149	149	return $this->createReplyMessageHandler($config);
150	150	}
151	151
		@@ -158,7 +158,7 @@ discard block
		block discarded – undo
158	158	* @param object $config configuration object for the aggregator.
159	159	* @return object the aggregator instance
160	160	*/
161		- public function createAggregator($config){
	161	+ public function createAggregator($config) {
162	162	return $this->createReplyMessageHandler($config);
163	163	}
164	164
		@@ -171,7 +171,7 @@ discard block
		block discarded – undo
171	171	* @param object $config configuration object for the wiretap.
172	172	* @return object the wiretap instance
173	173	*/
174		- public function createWiretap($config){
	174	+ public function createWiretap($config) {
175	175	return $this->createReplyMessageHandler($config, 'Wiretap');
176	176	}
177	177
		@@ -184,7 +184,7 @@ discard block
		block discarded – undo
184	184	* @param string $defaultClass the class to use if none is set in config.
185	185	* @return object the reply-message-handler instance
186	186	*/
187		- public function createReplyMessageHandler($config, $defaultClass = false){
	187	+ public function createReplyMessageHandler($config, $defaultClass = false) {
188	188	return $this->buildAndModify($config, $this->getReplyHandlerArguments($config), $defaultClass);
189	189	}
190	190
		@@ -197,12 +197,12 @@ discard block
		block discarded – undo
197	197	* @param string $defaultClass the class to use if none is set in config.
198	198	* @return object the service-activator instance
199	199	*/
200		- public function createServiceActivator($config, $defaultClass = false){
	200	+ public function createServiceActivator($config, $defaultClass = false) {
201	201	$method = (string)$config['method'];
202	202	$service = $this->context->getServiceProvider()->provideService((string)$config['ref']);
203		- if($method && $service){
	203	+ if ($method && $service) {
204	204	$args = $this->getReplyHandlerArguments($config);
205		- array_unshift($args,array(
	205	+ array_unshift($args, array(
206	206	$service,
207	207	$method
208	208	));
		@@ -219,12 +219,12 @@ discard block
		block discarded – undo
219	219	* @param object $config configuration object to create arguments from.
220	220	* @return mixed build arguments
221	221	*/
222		- protected function getReplyHandlerArguments($config){
	222	+ protected function getReplyHandlerArguments($config) {
223	223	$args = array(
224	224	$this->doGetChannel('input', $config),
225	225	$this->doGetChannel('output', $config)
226	226	);
227		- if($args[0] == NULL){
	227	+ if ($args[0] == NULL) {
228	228	throw new \RuntimeException('Could not receive input channel.');
229	229	}
230	230	return $args;
		@@ -239,7 +239,7 @@ discard block
		block discarded – undo
239	239	* @param object $config configuration object to return request-channel from.
240	240	* @return \PEIP\INF\Channel\Channel request-channel
241	241	*/
242		- protected function getRequestChannel($config){
	242	+ protected function getRequestChannel($config) {
243	243	return $this->doGetChannel('request', $config);
244	244	}
245	245
		@@ -252,7 +252,7 @@ discard block
		block discarded – undo
252	252	* @param object $config configuration object to return reply-channel from.
253	253	* @return \PEIP\INF\Channel\Channel reply-channel
254	254	*/
255		- protected function getReplyChannel($config){
	255	+ protected function getReplyChannel($config) {
256	256	return $this->doGetChannel('reply', $config);
257	257	}
258	258
		@@ -265,15 +265,15 @@ discard block
		block discarded – undo
265	265	* @param object $config configuration object to return channel from.
266	266	* @return \PEIP\INF\Channel\Channel reply-channel
267	267	*/
268		- public function doGetChannel($type, $config){
	268	+ public function doGetChannel($type, $config) {
269	269	$channelName = $config[$type."_channel"]
270	270	? $config[$type."_channel"]
271	271	: $config["default_".$type."_channel"];
272	272	return $this->context->getServiceProvider()->provideService(trim((string)$channelName));
273		- $channel = $this->services[trim((string)$channelName)];
274		- if($channel instanceof \PEIP\INF\Channel\Channel){
	273	+ $channel = $this->services[trim((string)$channelName)];
	274	+ if ($channel instanceof \PEIP\INF\Channel\Channel) {
275	275	return $channel;
276		- }else{
	276	+ }else {
277	277	return NULL;
278	278	}
279	279	}

		@@ -112,6 +112,9 @@
		block discarded – undo
112	112	);
113	113	}
114	114
	115	+ /**
	116	+ * @param string $key
	117	+ */
115	118	public function provideService($key){
116	119	$this->doFireEvent(self::EVENT_BEFORE_PROVIDE_SERVICE, array(
117	120	self::HEADER_KEY=>$key)

		@@ -11,7 +11,7 @@
		block discarded – undo
11	11	*
12	12	* @author timo
13	13	*/
14		-use PEIP\Context\XMLContext;
	14	+use PEIP\Context\XMLContext;
15	15	use PEIP\Plugins\BasePlugin;
16	16
17	17	class ServiceProvider extends \PEIP\Service\ServiceContainer {

		@@ -63,17 +63,17 @@ discard block
		block discarded – undo
63	63	}
64	64
65	65	/**
66		- * Registers a callable as builder for given node-name
67		- *
68		- * @implements \PEIP\INF\Context\Context
69		- * @access public
70		- * @param string $nodeName the name of the node
71		- * @param callable $callable a callable which creates instances for node-name
72		- */
	66	+ * Registers a callable as builder for given node-name
	67	+ *
	68	+ * @implements \PEIP\INF\Context\Context
	69	+ * @access public
	70	+ * @param string $nodeName the name of the node
	71	+ * @param callable $callable a callable which creates instances for node-name
	72	+ */
73	73	public function registerNodeBuilder($nodeName, $callable){
74	74	$this->nodeBuilders[$nodeName] = $callable;
75	75	}
76		- /**
	76	+ /**
77	77	* Registers the build-methods for the main-components with this context.
78	78	* Note: This method and subsequent registered methods of this class are
79	79	* candidates for refactoring. Because this class has grown much to large
		@@ -89,7 +89,7 @@ discard block
		block discarded – undo
89	89	);
90	90	$plugin = new BasePlugin();
91	91	foreach($builders as $nodeName => $method){
92		- $this->registerNodeBuilder($nodeName, array($this, $method));
	92	+ $this->registerNodeBuilder($nodeName, array($this, $method));
93	93	}
94	94	}
95	95

		@@ -14,7 +14,7 @@ discard block
		block discarded – undo
14	14	use PEIP\Context\XMLContext;
15	15	use PEIP\Plugins\BasePlugin;
16	16
17		-class ServiceProvider extends \PEIP\Service\ServiceContainer {
	17	+class ServiceProvider extends \PEIP\Service\ServiceContainer {
18	18
19	19	const
20	20	/* Headers */
		@@ -47,7 +47,7 @@ discard block
		block discarded – undo
47	47	public function __construct(array $config = array(), $idAttribute = 'id') {
48	48	$this->idAttribute = $idAttribute;
49	49	$this->initNodeBuilders();
50		- foreach($config as $serviceConfig){
	50	+ foreach ($config as $serviceConfig) {
51	51	$this->addConfig($serviceConfig);
52	52	}
53	53
		@@ -58,7 +58,7 @@ discard block
		block discarded – undo
58	58	* @access public
59	59	* @return array registered services
60	60	*/
61		- public function getServices(){
	61	+ public function getServices() {
62	62	return $this->services;
63	63	}
64	64
		@@ -70,7 +70,7 @@ discard block
		block discarded – undo
70	70	* @param string $nodeName the name of the node
71	71	* @param callable $callable a callable which creates instances for node-name
72	72	*/
73		- public function registerNodeBuilder($nodeName, $callable){
	73	+ public function registerNodeBuilder($nodeName, $callable) {
74	74	$this->nodeBuilders[$nodeName] = $callable;
75	75	}
76	76	/**
		@@ -83,17 +83,17 @@ discard block
		block discarded – undo
83	83	* @see XMLContext::includeContext
84	84	* @access protected
85	85	*/
86		- protected function initNodeBuilders(){ return;
	86	+ protected function initNodeBuilders() { return;
87	87	$builders = array(
88	88	'service' => 'initService'
89	89	);
90	90	$plugin = new BasePlugin();
91		- foreach($builders as $nodeName => $method){
	91	+ foreach ($builders as $nodeName => $method) {
92	92	$this->registerNodeBuilder($nodeName, array($this, $method));
93	93	}
94	94	}
95	95
96		- public function addConfig($config){
	96	+ public function addConfig($config) {
97	97	$this->doFireEvent(
98	98	self::EVENT_BEFORE_ADD_CONFIG,
99	99	array(
		@@ -112,15 +112,15 @@ discard block
		block discarded – undo
112	112	);
113	113	}
114	114
115		- public function provideService($key){
	115	+ public function provideService($key) {
116	116	$this->doFireEvent(self::EVENT_BEFORE_PROVIDE_SERVICE, array(
117	117	self::HEADER_KEY=>$key)
118	118	);
119	119
120		- if($this->hasService($key)){
121		- $service = $this->getService($key);
122		- }else{
123		- $service = $this->createService($key);
	120	+ if ($this->hasService($key)) {
	121	+ $service = $this->getService($key);
	122	+ }else {
	123	+ $service = $this->createService($key);
124	124	}
125	125
126	126	$this->doFireEvent(self::EVENT_AFTER_PROVIDE_SERVICE, array(
		@@ -131,16 +131,16 @@ discard block
		block discarded – undo
131	131	return $service;
132	132	}
133	133
134		- protected function createService($key){
	134	+ protected function createService($key) {
135	135	$this->doFireEvent(self::EVENT_BEFORE_CREATE_SERVICE, array(
136	136	self::HEADER_KEY=>$key)
137	137	);
138	138	$errorMessage = '';
139	139	$config = $this->getServiceConfig($key);
140	140
141		- if($config){
	141	+ if ($config) {
142	142	$node = $this->buildNode($config);
143		- if($node){
	143	+ if ($node) {
144	144	$this->setService(
145	145	$key,
146	146	$node
		@@ -151,11 +151,11 @@ discard block
		block discarded – undo
151	151	));
152	152
153	153	return $node;
154		- }else{
	154	+ }else {
155	155	$errorMessage = 'COULD NOT BUILD NODE FOR KEY: '.$key;
156	156	}
157	157
158		- }else{
	158	+ }else {
159	159	$errorMessage = 'NO CONFIG FOR KEY: '.$key;
160	160	}
161	161	$this->doFireEvent(self::EVENT_CREATE_SERVICE_ERROR, array(
		@@ -165,8 +165,8 @@ discard block
		block discarded – undo
165	165	return NULL;
166	166	}
167	167
168		- public function getServiceConfig($key){
169		- if(!isset($this->ids[$key])){
	168	+ public function getServiceConfig($key) {
	169	+ if (!isset($this->ids[$key])) {
170	170	return false;
171	171	}
172	172	return $this->config[$this->ids[$key]];
		@@ -181,7 +181,7 @@ discard block
		block discarded – undo
181	181	* @param object $config configuration-node
182	182	* @return void
183	183	*/
184		- protected function buildNode($config){
	184	+ protected function buildNode($config) {
185	185	$nodeName = (string)$config['type'];
186	186
187	187	$this->doFireEvent(self::EVENT_BEFORE_BUILD_NODE, array(
		@@ -189,20 +189,20 @@ discard block
		block discarded – undo
189	189	self::HEADER_NODE_NAME=> $nodeName
190	190	));
191	191	// call the builder method registered for the node.
192		- if(array_key_exists($nodeName, $this->nodeBuilders)){
	192	+ if (array_key_exists($nodeName, $this->nodeBuilders)) {
193	193
194	194	$nodeInstance = call_user_func($this->nodeBuilders[$nodeName], $config);
195		- if(is_object($nodeInstance)){
	195	+ if (is_object($nodeInstance)) {
196	196	$this->doFireEvent(self::EVENT_BUILD_NODE_SUCCESS, array(
197	197	self::HEADER_NODE_CONFIG=>$config,
198	198	self::HEADER_NODE_NAME=> $nodeName,
199	199	self::HEADER_NODE => $nodeInstance
200	200	));
201	201	return $nodeInstance;
202		- }else{
	202	+ }else {
203	203	$errorMessage = 'BUILDER RETURNED NO OBJECT FOR NODE-TYPE: '.$nodeName;
204	204	}
205		- }else{
	205	+ }else {
206	206	$errorMessage = 'NO BUILDER FOUND FOR NODE-TYPE: '.$nodeName;
207	207	}
208	208
		@@ -213,27 +213,27 @@ discard block
		block discarded – undo
213	213	));
214	214	}
215	215
216		- protected function getIdFromConfig($config){
	216	+ protected function getIdFromConfig($config) {
217	217	$id = '';
218		- if(isset($config[$this->idAttribute])){
	218	+ if (isset($config[$this->idAttribute])) {
219	219	$id = trim((string)($config[$this->idAttribute]));
220	220	}
221	221	return $id;
222	222	}
223	223
224		- protected function getCountConfig(){
	224	+ protected function getCountConfig() {
225	225	return count($this->config);
226	226	}
227	227
228		- protected function doAddConfig($config){
	228	+ protected function doAddConfig($config) {
229	229	$countConfig = $this->getCountConfig();
230	230	$this->config[$countConfig] = $config;
231	231	return $countConfig;
232	232	}
233	233
234		- protected function doRegisterConfig($config){
235		- $id = $this->getIdFromConfig($config);
236		- if($id != ''){
	234	+ protected function doRegisterConfig($config) {
	235	+ $id = $this->getIdFromConfig($config);
	236	+ if ($id != '') {
237	237	$this->ids[$id] = $this->getCountConfig() - 1;
238	238	}
239	239	return $id;

tidal / PEIP

Push — v1.ns ( a6bb16...dc5273 )

Status

Category

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Unused Use Statements +2 added lines, -2 removed lines patch added patch discarded remove patch

Braces +12 added lines, -12 removed lines patch added patch discarded remove patch

Indentation +23 added lines, -23 removed lines patch added patch discarded remove patch

Spacing +44 added lines, -44 removed lines patch added patch discarded remove patch

Doc Comments +3 added lines, -3 removed lines patch added patch discarded remove patch

Unused Use Statements +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Braces +2 added lines, -4 removed lines patch added patch discarded remove patch

Doc Comments -1 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +1 added lines, -1 removed lines patch added patch discarded remove patch

Doc Comments +3 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +22 added lines, -22 removed lines patch added patch discarded remove patch

Braces +1 added lines, -1 removed lines patch added patch discarded remove patch

Doc Comments +3 added lines patch added patch discarded remove patch

Unused Use Statements +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +31 added lines, -31 removed lines patch added patch discarded remove patch

Braces +5 added lines, -5 removed lines patch added patch discarded remove patch

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Braces +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +29 added lines, -29 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

		@@ -119,7 +119,7 @@ discard block
		block discarded – undo
119	119
120	120	if($this->hasService($key)){
121	121	$service = $this->getService($key);
122		- }else{
	122	+ } else{
123	123	$service = $this->createService($key);
124	124	}
125	125
		@@ -151,11 +151,11 @@ discard block
		block discarded – undo
151	151	));
152	152
153	153	return $node;
154		- }else{
	154	+ } else{
155	155	$errorMessage = 'COULD NOT BUILD NODE FOR KEY: '.$key;
156	156	}
157	157
158		- }else{
	158	+ } else{
159	159	$errorMessage = 'NO CONFIG FOR KEY: '.$key;
160	160	}
161	161	$this->doFireEvent(self::EVENT_CREATE_SERVICE_ERROR, array(
		@@ -199,10 +199,10 @@ discard block
		block discarded – undo
199	199	self::HEADER_NODE => $nodeInstance
200	200	));
201	201	return $nodeInstance;
202		- }else{
	202	+ } else{
203	203	$errorMessage = 'BUILDER RETURNED NO OBJECT FOR NODE-TYPE: '.$nodeName;
204	204	}
205		- }else{
	205	+ } else{
206	206	$errorMessage = 'NO BUILDER FOUND FOR NODE-TYPE: '.$nodeName;
207	207	}
208	208

		@@ -31,19 +31,19 @@
		block discarded – undo
31	31	}
32	32
33	33	protected function prepareDrink($orderNumber, $type, $iced){
34		- $drink = new Drink($orderNumber, $type, $iced);
35		- return $drink;
	34	+ $drink = new Drink($orderNumber, $type, $iced);
	35	+ return $drink;
36	36	}
37	37
38	38	protected function printAction($cold, $orderNr){
39		- if($cold){
40		- $type = 'cold';
41		- $count = $this->coldDrinkCounter;
42		- }else{
43		- $type = 'hot';
44		- $count = $this->hotDrinkCounter;
45		- }
46		- $total = $this->coldDrinkCounter + $this->hotDrinkCounter;
	39	+ if($cold){
	40	+ $type = 'cold';
	41	+ $count = $this->coldDrinkCounter;
	42	+ }else{
	43	+ $type = 'hot';
	44	+ $count = $this->hotDrinkCounter;
	45	+ }
	46	+ $total = $this->coldDrinkCounter + $this->hotDrinkCounter;
47	47	echo PEIP_LINE_SEPARATOR."Barista: prepared $type drink (total #$total- $type #$count) for order #$orderNr";
48	48	flush();
49	49	}

		@@ -30,16 +30,16 @@
		block discarded – undo
30	30	return $this->prepareDrink($orderItem['order'], $orderItem['type'], true);
31	31	}
32	32
33		- protected function prepareDrink($orderNumber, $type, $iced){
	33	+ protected function prepareDrink($orderNumber, $type, $iced) {
34	34	$drink = new Drink($orderNumber, $type, $iced);
35	35	return $drink;
36	36	}
37	37
38		- protected function printAction($cold, $orderNr){
39		- if($cold){
	38	+ protected function printAction($cold, $orderNr) {
	39	+ if ($cold) {
40	40	$type = 'cold';
41	41	$count = $this->coldDrinkCounter;
42		- }else{
	42	+ }else {
43	43	$type = 'hot';
44	44	$count = $this->hotDrinkCounter;
45	45	}

		@@ -39,7 +39,7 @@
		block discarded – undo
39	39	if($cold){
40	40	$type = 'cold';
41	41	$count = $this->coldDrinkCounter;
42		- }else{
	42	+ } else{
43	43	$type = 'hot';
44	44	$count = $this->hotDrinkCounter;
45	45	}

		@@ -2,40 +2,40 @@
		block discarded – undo
2	2
3	3	class Order {
4	4
5		- protected
6		- $items = array(),
7		- $orderNumber;
8		- protected static $orderCount = 0;
	5	+ protected
	6	+ $items = array(),
	7	+ $orderNumber;
	8	+ protected static $orderCount = 0;
9	9
10		- public function __construct(){
11		- self::$orderCount++;
12		- $this->orderNumber = self::$orderCount;
13		- }
	10	+ public function __construct(){
	11	+ self::$orderCount++;
	12	+ $this->orderNumber = self::$orderCount;
	13	+ }
14	14
15		- public function getOrderNumber(){
16		- return $this->orderNumber;
17		- }
	15	+ public function getOrderNumber(){
	16	+ return $this->orderNumber;
	17	+ }
18	18
19		- public function addItem($type, $number, $iced = false){
20		- $this->items[] =
21		- array(
22		- 'type' => $type,
23		- 'number' => $number,
24		- 'iced' => $iced
25		- );
26		- }
	19	+ public function addItem($type, $number, $iced = false){
	20	+ $this->items[] =
	21	+ array(
	22	+ 'type' => $type,
	23	+ 'number' => $number,
	24	+ 'iced' => $iced
	25	+ );
	26	+ }
27	27
28		- public function getItems(){
29		- return $this->items;
30		- }
	28	+ public function getItems(){
	29	+ return $this->items;
	30	+ }
31	31
32		- public function getTotalCount(){
33		- $x = 0;
34		- foreach($this->items as $item){
35		- $x += (int)$item['number'];
36		- }
37		- return $x;
38		- }
	32	+ public function getTotalCount(){
	33	+ $x = 0;
	34	+ foreach($this->items as $item){
	35	+ $x += (int)$item['number'];
	36	+ }
	37	+ return $x;
	38	+ }
39	39
40	40
41	41

		@@ -7,16 +7,16 @@ discard block
		block discarded – undo
7	7	$orderNumber;
8	8	protected static $orderCount = 0;
9	9
10		- public function __construct(){
	10	+ public function __construct() {
11	11	self::$orderCount++;
12	12	$this->orderNumber = self::$orderCount;
13	13	}
14	14
15		- public function getOrderNumber(){
	15	+ public function getOrderNumber() {
16	16	return $this->orderNumber;
17	17	}
18	18
19		- public function addItem($type, $number, $iced = false){
	19	+ public function addItem($type, $number, $iced = false) {
20	20	$this->items[] =
21	21	array(
22	22	'type' => $type,
		@@ -25,13 +25,13 @@ discard block
		block discarded – undo
25	25	);
26	26	}
27	27
28		- public function getItems(){
	28	+ public function getItems() {
29	29	return $this->items;
30	30	}
31	31
32		- public function getTotalCount(){
	32	+ public function getTotalCount() {
33	33	$x = 0;
34		- foreach($this->items as $item){
	34	+ foreach ($this->items as $item) {
35	35	$x += (int)$item['number'];
36	36	}
37	37	return $x;