tidal /
PEIP
@@ -71,7 +71,7 @@ |
||
| 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 @@ |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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); |
@@ -64,7 +64,6 @@ |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 @@ |
||
| 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 |
||
| 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 |
||
| 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 @@ |
||
| 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 |
||
| 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 |
||
| 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){
|
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | * @param object $config configuration object for the pollable channel. |
| 43 | 43 | * @return \PEIP\INF\Channel\Channel the created pollable channel instance |
| 44 | 44 | */ |
| 45 | - public function createChannel($config){
|
|
| 45 | + public function createChannel($config) {
|
|
| 46 | 46 | return $this->doCreateChannel($config, '\PEIP\Channel\PollableChannel'); |
| 47 | 47 | } |
| 48 | 48 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | * @param object $config configuration object for the subscribable channel. |
| 55 | 55 | * @return \PEIP\INF\Channel\Channel the created subscribable channel instance |
| 56 | 56 | */ |
| 57 | - public function createSubscribableChannel($config){
|
|
| 57 | + public function createSubscribableChannel($config) {
|
|
| 58 | 58 | return $this->doCreateChannel($config, '\PEIP\Channel\PublishSubscribeChannel'); |
| 59 | 59 | } |
| 60 | 60 | |
@@ -67,9 +67,9 @@ discard block |
||
| 67 | 67 | * @param $additionalArguments additional arguments for the channel constructor (without first arg = id) |
| 68 | 68 | * @return \PEIP\INF\Channel\Channel the created channel instance |
| 69 | 69 | */ |
| 70 | - public function doCreateChannel($config, $defaultChannelClass, array $additionalArguments = array()){
|
|
| 70 | + public function doCreateChannel($config, $defaultChannelClass, array $additionalArguments = array()) {
|
|
| 71 | 71 | $id = (string)$config['id']; |
| 72 | - if($id != ''){
|
|
| 72 | + if ($id != '') {
|
|
| 73 | 73 | array_unshift($additionalArguments, $id); |
| 74 | 74 | $channel = $this->buildAndModify($config, $additionalArguments, $defaultChannelClass); |
| 75 | 75 | //$this->channelRegistry->register($channel); |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | * @param string $defaultClass the class to use if none is set in config. |
| 88 | 88 | * @return object the gateway instance |
| 89 | 89 | */ |
| 90 | - public function createGateway($config, $defaultClass = false){
|
|
| 90 | + public function createGateway($config, $defaultClass = false) {
|
|
| 91 | 91 | $args = array( |
| 92 | 92 | $this->getRequestChannel($config), |
| 93 | 93 | $this->getReplyChannel($config) |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | * @param string $defaultClass the class to use if none is set in config. |
| 112 | 112 | * @return object the router instance |
| 113 | 113 | */ |
| 114 | - public function createRouter($config, $defaultClass = false){
|
|
| 114 | + public function createRouter($config, $defaultClass = false) {
|
|
| 115 | 115 | $resolver = $config['channel_resolver'] ? (string)$config['channel_resolver'] : $this->channelRegistry; |
| 116 | 116 | return $this->buildAndModify($config, array( |
| 117 | 117 | $resolver, |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | * @param object $config configuration object for the splitter. |
| 129 | 129 | * @return object the splitter instance |
| 130 | 130 | */ |
| 131 | - public function createSplitter($config){
|
|
| 131 | + public function createSplitter($config) {
|
|
| 132 | 132 | return $this->createReplyMessageHandler($config); |
| 133 | 133 | } |
| 134 | 134 | |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | * @param object $config configuration object for the transformer. |
| 142 | 142 | * @return object the transformer instance |
| 143 | 143 | */ |
| 144 | - public function createTransformer($config){
|
|
| 144 | + public function createTransformer($config) {
|
|
| 145 | 145 | return $this->createReplyMessageHandler($config); |
| 146 | 146 | } |
| 147 | 147 | |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | * @param object $config configuration object for the aggregator. |
| 155 | 155 | * @return object the aggregator instance |
| 156 | 156 | */ |
| 157 | - public function createAggregator($config){
|
|
| 157 | + public function createAggregator($config) {
|
|
| 158 | 158 | return $this->createReplyMessageHandler($config); |
| 159 | 159 | } |
| 160 | 160 | |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | * @param object $config configuration object for the wiretap. |
| 168 | 168 | * @return object the wiretap instance |
| 169 | 169 | */ |
| 170 | - public function createWiretap($config){
|
|
| 170 | + public function createWiretap($config) {
|
|
| 171 | 171 | return $this->createReplyMessageHandler($config, '\PEIP\Listener\Wiretap'); |
| 172 | 172 | } |
| 173 | 173 | |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | * @param string $defaultClass the class to use if none is set in config. |
| 181 | 181 | * @return object the reply-message-handler instance |
| 182 | 182 | */ |
| 183 | - public function createReplyMessageHandler($config, $defaultClass = false){
|
|
| 183 | + public function createReplyMessageHandler($config, $defaultClass = false) {
|
|
| 184 | 184 | return $this->buildAndModify($config, $this->getReplyHandlerArguments($config), $defaultClass); |
| 185 | 185 | } |
| 186 | 186 | |
@@ -193,12 +193,12 @@ discard block |
||
| 193 | 193 | * @param string $defaultClass the class to use if none is set in config. |
| 194 | 194 | * @return object the service-activator instance |
| 195 | 195 | */ |
| 196 | - public function createServiceActivator($config, $defaultClass = false){
|
|
| 196 | + public function createServiceActivator($config, $defaultClass = false) {
|
|
| 197 | 197 | $method = (string)$config['method']; |
| 198 | 198 | $service = $this->context->getServiceProvider()->provideService((string)$config['ref']); |
| 199 | - if($method && $service){
|
|
| 199 | + if ($method && $service) {
|
|
| 200 | 200 | $args = $this->getReplyHandlerArguments($config); |
| 201 | - array_unshift($args,array( |
|
| 201 | + array_unshift($args, array( |
|
| 202 | 202 | $service, |
| 203 | 203 | $method |
| 204 | 204 | )); |
@@ -215,12 +215,12 @@ discard block |
||
| 215 | 215 | * @param object $config configuration object to create arguments from. |
| 216 | 216 | * @return mixed build arguments |
| 217 | 217 | */ |
| 218 | - protected function getReplyHandlerArguments($config){
|
|
| 218 | + protected function getReplyHandlerArguments($config) {
|
|
| 219 | 219 | $args = array( |
| 220 | 220 | $this->doGetChannel('input', $config),
|
| 221 | 221 | $this->doGetChannel('output', $config)
|
| 222 | 222 | ); |
| 223 | - if($args[0] == NULL){
|
|
| 223 | + if ($args[0] == NULL) {
|
|
| 224 | 224 | throw new \RuntimeException('Could not receive input channel.');
|
| 225 | 225 | } |
| 226 | 226 | return $args; |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | * @param object $config configuration object to return request-channel from. |
| 236 | 236 | * @return \PEIP\INF\Channel\Channel request-channel |
| 237 | 237 | */ |
| 238 | - protected function getRequestChannel($config){
|
|
| 238 | + protected function getRequestChannel($config) {
|
|
| 239 | 239 | return $this->doGetChannel('request', $config);
|
| 240 | 240 | } |
| 241 | 241 | |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | * @param object $config configuration object to return reply-channel from. |
| 249 | 249 | * @return \PEIP\INF\Channel\Channel reply-channel |
| 250 | 250 | */ |
| 251 | - protected function getReplyChannel($config){
|
|
| 251 | + protected function getReplyChannel($config) {
|
|
| 252 | 252 | return $this->doGetChannel('reply', $config);
|
| 253 | 253 | } |
| 254 | 254 | |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | * @param object $config configuration object to return channel from. |
| 262 | 262 | * @return \PEIP\INF\Channel\Channel reply-channel |
| 263 | 263 | */ |
| 264 | - public function doGetChannel($type, $config){
|
|
| 264 | + public function doGetChannel($type, $config) {
|
|
| 265 | 265 | $channelName = isset($config[$type."_channel"]) |
| 266 | 266 | ? $config[$type."_channel"] |
| 267 | 267 | : $config["default_".$type."_channel"]; |
@@ -112,6 +112,9 @@ |
||
| 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) |
@@ -63,17 +63,17 @@ discard block |
||
| 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 |
||
| 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 | |
@@ -119,7 +119,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 | |
@@ -12,7 +12,6 @@ |
||
| 12 | 12 | * @author timo |
| 13 | 13 | */ |
| 14 | 14 | use PEIP\Context\XMLContext; |
| 15 | -use PEIP\Plugins\BasePlugin; |
|
| 16 | 15 | |
| 17 | 16 | class ServiceProvider extends \PEIP\Service\ServiceContainer {
|
| 18 | 17 | |
@@ -14,7 +14,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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,16 +83,16 @@ discard block |
||
| 83 | 83 | * @see XMLContext::includeContext |
| 84 | 84 | * @access protected |
| 85 | 85 | */ |
| 86 | - protected function initNodeBuilders(){
|
|
| 86 | + protected function initNodeBuilders() {
|
|
| 87 | 87 | $builders = array( |
| 88 | 88 | 'service' => 'initService' |
| 89 | 89 | ); |
| 90 | - foreach($builders as $nodeName => $method){
|
|
| 90 | + foreach ($builders as $nodeName => $method) {
|
|
| 91 | 91 | $this->registerNodeBuilder($nodeName, array($this, $method)); |
| 92 | 92 | } |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - public function addConfig($config){
|
|
| 95 | + public function addConfig($config) {
|
|
| 96 | 96 | $this->doFireEvent( |
| 97 | 97 | self::EVENT_BEFORE_ADD_CONFIG, |
| 98 | 98 | array( |
@@ -111,15 +111,15 @@ discard block |
||
| 111 | 111 | ); |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | - public function provideService($key){
|
|
| 114 | + public function provideService($key) {
|
|
| 115 | 115 | $this->doFireEvent(self::EVENT_BEFORE_PROVIDE_SERVICE, array( |
| 116 | 116 | self::HEADER_KEY=>$key) |
| 117 | 117 | ); |
| 118 | 118 | |
| 119 | - if($this->hasService($key)){
|
|
| 120 | - $service = $this->getService($key); |
|
| 121 | - }else{
|
|
| 122 | - $service = $this->createService($key); |
|
| 119 | + if ($this->hasService($key)) {
|
|
| 120 | + $service = $this->getService($key); |
|
| 121 | + }else {
|
|
| 122 | + $service = $this->createService($key); |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | $this->doFireEvent(self::EVENT_AFTER_PROVIDE_SERVICE, array( |
@@ -130,16 +130,16 @@ discard block |
||
| 130 | 130 | return $service; |
| 131 | 131 | } |
| 132 | 132 | |
| 133 | - protected function createService($key){
|
|
| 133 | + protected function createService($key) {
|
|
| 134 | 134 | $this->doFireEvent(self::EVENT_BEFORE_CREATE_SERVICE, array( |
| 135 | 135 | self::HEADER_KEY=>$key) |
| 136 | 136 | ); |
| 137 | 137 | $errorMessage = ''; |
| 138 | 138 | $config = $this->getServiceConfig($key); |
| 139 | 139 | |
| 140 | - if($config){
|
|
| 140 | + if ($config) {
|
|
| 141 | 141 | $node = $this->buildNode($config); |
| 142 | - if($node){
|
|
| 142 | + if ($node) {
|
|
| 143 | 143 | $this->setService( |
| 144 | 144 | $key, |
| 145 | 145 | $node |
@@ -150,11 +150,11 @@ discard block |
||
| 150 | 150 | )); |
| 151 | 151 | |
| 152 | 152 | return $node; |
| 153 | - }else{
|
|
| 153 | + }else {
|
|
| 154 | 154 | $errorMessage = 'COULD NOT BUILD NODE FOR KEY: '.$key; |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | - }else{
|
|
| 157 | + }else {
|
|
| 158 | 158 | $errorMessage = 'NO CONFIG FOR KEY: '.$key; |
| 159 | 159 | } |
| 160 | 160 | $this->doFireEvent(self::EVENT_CREATE_SERVICE_ERROR, array( |
@@ -164,8 +164,8 @@ discard block |
||
| 164 | 164 | return NULL; |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | - public function getServiceConfig($key){
|
|
| 168 | - if(!isset($this->ids[$key])){
|
|
| 167 | + public function getServiceConfig($key) {
|
|
| 168 | + if (!isset($this->ids[$key])) {
|
|
| 169 | 169 | return false; |
| 170 | 170 | } |
| 171 | 171 | return $this->config[$this->ids[$key]]; |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | * @param object $config configuration-node |
| 181 | 181 | * @return void |
| 182 | 182 | */ |
| 183 | - protected function buildNode($config){
|
|
| 183 | + protected function buildNode($config) {
|
|
| 184 | 184 | $nodeName = (string)$config['type']; |
| 185 | 185 | |
| 186 | 186 | $this->doFireEvent(self::EVENT_BEFORE_BUILD_NODE, array( |
@@ -188,20 +188,20 @@ discard block |
||
| 188 | 188 | self::HEADER_NODE_NAME=> $nodeName |
| 189 | 189 | )); |
| 190 | 190 | // call the builder method registered for the node. |
| 191 | - if(array_key_exists($nodeName, $this->nodeBuilders)){
|
|
| 191 | + if (array_key_exists($nodeName, $this->nodeBuilders)) {
|
|
| 192 | 192 | |
| 193 | 193 | $nodeInstance = call_user_func($this->nodeBuilders[$nodeName], $config); |
| 194 | - if(is_object($nodeInstance)){
|
|
| 194 | + if (is_object($nodeInstance)) {
|
|
| 195 | 195 | $this->doFireEvent(self::EVENT_BUILD_NODE_SUCCESS, array( |
| 196 | 196 | self::HEADER_NODE_CONFIG=>$config, |
| 197 | 197 | self::HEADER_NODE_NAME=> $nodeName, |
| 198 | 198 | self::HEADER_NODE => $nodeInstance |
| 199 | 199 | )); |
| 200 | 200 | return $nodeInstance; |
| 201 | - }else{
|
|
| 201 | + }else {
|
|
| 202 | 202 | $errorMessage = 'BUILDER RETURNED NO OBJECT FOR NODE-TYPE: '.$nodeName; |
| 203 | 203 | } |
| 204 | - }else{
|
|
| 204 | + }else {
|
|
| 205 | 205 | $errorMessage = 'NO BUILDER FOUND FOR NODE-TYPE: '.$nodeName; |
| 206 | 206 | } |
| 207 | 207 | |
@@ -212,27 +212,27 @@ discard block |
||
| 212 | 212 | )); |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | - protected function getIdFromConfig($config){
|
|
| 215 | + protected function getIdFromConfig($config) {
|
|
| 216 | 216 | $id = ''; |
| 217 | - if(isset($config[$this->idAttribute])){
|
|
| 217 | + if (isset($config[$this->idAttribute])) {
|
|
| 218 | 218 | $id = trim((string)($config[$this->idAttribute])); |
| 219 | 219 | } |
| 220 | 220 | return $id; |
| 221 | 221 | } |
| 222 | 222 | |
| 223 | - protected function getCountConfig(){
|
|
| 223 | + protected function getCountConfig() {
|
|
| 224 | 224 | return count($this->config); |
| 225 | 225 | } |
| 226 | 226 | |
| 227 | - protected function doAddConfig($config){
|
|
| 227 | + protected function doAddConfig($config) {
|
|
| 228 | 228 | $countConfig = $this->getCountConfig(); |
| 229 | 229 | $this->config[$countConfig] = $config; |
| 230 | 230 | return $countConfig; |
| 231 | 231 | } |
| 232 | 232 | |
| 233 | - protected function doRegisterConfig($config){
|
|
| 234 | - $id = $this->getIdFromConfig($config); |
|
| 235 | - if($id != ''){
|
|
| 233 | + protected function doRegisterConfig($config) {
|
|
| 234 | + $id = $this->getIdFromConfig($config); |
|
| 235 | + if ($id != '') {
|
|
| 236 | 236 | $this->ids[$id] = $this->getCountConfig() - 1; |
| 237 | 237 | } |
| 238 | 238 | return $id; |
@@ -31,19 +31,19 @@ |
||
| 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 @@ |
||
| 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 @@ |
||
| 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 @@ |
||
| 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 |
||
| 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 |
||
| 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; |
@@ -2,14 +2,14 @@ |
||
| 2 | 2 | |
| 3 | 3 | class Delivery { |
| 4 | 4 | |
| 5 | - protected |
|
| 6 | - $deliveredDrinks, |
|
| 7 | - $orderNumber; |
|
| 5 | + protected |
|
| 6 | + $deliveredDrinks, |
|
| 7 | + $orderNumber; |
|
| 8 | 8 | |
| 9 | - public function __construct(array $deliveredDrinks){ |
|
| 10 | - $this->deliveredDrinks = $deliveredDrinks; |
|
| 11 | - $this->orderNumber = $deliveredDrinks[0]->getOrderNumber(); |
|
| 12 | - } |
|
| 9 | + public function __construct(array $deliveredDrinks){ |
|
| 10 | + $this->deliveredDrinks = $deliveredDrinks; |
|
| 11 | + $this->orderNumber = $deliveredDrinks[0]->getOrderNumber(); |
|
| 12 | + } |
|
| 13 | 13 | |
| 14 | 14 | |
| 15 | 15 | |
@@ -6,7 +6,7 @@ |
||
| 6 | 6 | $deliveredDrinks, |
| 7 | 7 | $orderNumber; |
| 8 | 8 | |
| 9 | - public function __construct(array $deliveredDrinks){ |
|
| 9 | + public function __construct(array $deliveredDrinks) { |
|
| 10 | 10 | $this->deliveredDrinks = $deliveredDrinks; |
| 11 | 11 | $this->orderNumber = $deliveredDrinks[0]->getOrderNumber(); |
| 12 | 12 | } |
@@ -3,30 +3,30 @@ |
||
| 3 | 3 | |
| 4 | 4 | class Drink { |
| 5 | 5 | |
| 6 | - protected |
|
| 7 | - $orderNumber, |
|
| 8 | - $type, |
|
| 9 | - $iced; |
|
| 6 | + protected |
|
| 7 | + $orderNumber, |
|
| 8 | + $type, |
|
| 9 | + $iced; |
|
| 10 | 10 | |
| 11 | - public function __construct($orderNumber, $type, $iced){ |
|
| 12 | - $this->orderNumber = $orderNumber; |
|
| 13 | - $this->type = $type; |
|
| 14 | - $this->iced = $iced; |
|
| 15 | - } |
|
| 11 | + public function __construct($orderNumber, $type, $iced){ |
|
| 12 | + $this->orderNumber = $orderNumber; |
|
| 13 | + $this->type = $type; |
|
| 14 | + $this->iced = $iced; |
|
| 15 | + } |
|
| 16 | 16 | |
| 17 | - public function getType(){ |
|
| 18 | - return $this->type; |
|
| 19 | - } |
|
| 17 | + public function getType(){ |
|
| 18 | + return $this->type; |
|
| 19 | + } |
|
| 20 | 20 | |
| 21 | - public function getIced(){ |
|
| 22 | - return $this->iced; |
|
| 23 | - } |
|
| 21 | + public function getIced(){ |
|
| 22 | + return $this->iced; |
|
| 23 | + } |
|
| 24 | 24 | |
| 25 | - public function getOrderNumber(){ |
|
| 26 | - return $this->orderNumber; |
|
| 27 | - } |
|
| 25 | + public function getOrderNumber(){ |
|
| 26 | + return $this->orderNumber; |
|
| 27 | + } |
|
| 28 | 28 | |
| 29 | - public function __sleep() |
|
| 29 | + public function __sleep() |
|
| 30 | 30 | { |
| 31 | 31 | return array('orderNumber', 'type', 'iced'); |
| 32 | 32 | } |
@@ -8,21 +8,21 @@ |
||
| 8 | 8 | $type, |
| 9 | 9 | $iced; |
| 10 | 10 | |
| 11 | - public function __construct($orderNumber, $type, $iced){ |
|
| 11 | + public function __construct($orderNumber, $type, $iced) { |
|
| 12 | 12 | $this->orderNumber = $orderNumber; |
| 13 | 13 | $this->type = $type; |
| 14 | 14 | $this->iced = $iced; |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | - public function getType(){ |
|
| 17 | + public function getType() { |
|
| 18 | 18 | return $this->type; |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | - public function getIced(){ |
|
| 21 | + public function getIced() { |
|
| 22 | 22 | return $this->iced; |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | - public function getOrderNumber(){ |
|
| 25 | + public function getOrderNumber() { |
|
| 26 | 26 | return $this->orderNumber; |
| 27 | 27 | } |
| 28 | 28 | |
