@@ -57,7 +57,8 @@ |
||
57 | 57 | */ |
58 | 58 | class E4xx_StoryShouldFail extends Exxx_Exception |
59 | 59 | { |
60 | - public function __construct() { |
|
60 | + public function __construct() |
|
61 | + { |
|
61 | 62 | $msg = "Story should fail"; |
62 | 63 | parent::__construct(400, $msg, $msg); |
63 | 64 | } |
@@ -57,7 +57,8 @@ |
||
57 | 57 | */ |
58 | 58 | class E4xx_StoryShouldFail extends Exxx_Exception |
59 | 59 | { |
60 | - public function __construct() { |
|
60 | + public function __construct() |
|
61 | + { |
|
61 | 62 | $msg = "Story should fail"; |
62 | 63 | parent::__construct(400, $msg, $msg); |
63 | 64 | } |
@@ -1137,8 +1137,7 @@ |
||
1137 | 1137 | public function getOneAction() |
1138 | 1138 | { |
1139 | 1139 | // do we have any callbacks to pick from? |
1140 | - if (count($this->actionsCallbacks) == 0) |
|
1141 | - { |
|
1140 | + if (count($this->actionsCallbacks) == 0) { |
|
1142 | 1141 | throw new E5xx_NoStoryActions($this->getName()); |
1143 | 1142 | } |
1144 | 1143 |
@@ -700,6 +700,7 @@ |
||
700 | 700 | } |
701 | 701 | |
702 | 702 | /** |
703 | + * @param integer $version |
|
703 | 704 | * @return Story |
704 | 705 | */ |
705 | 706 | public function requiresStoryplayerVersion($version) |
@@ -527,7 +527,7 @@ discard block |
||
527 | 527 | public function getScenario() |
528 | 528 | { |
529 | 529 | if ($this->storyScenario === null) { |
530 | - return [ "this story has not supplied a scenario; call \$story->setScenario() in your test."]; |
|
530 | + return ["this story has not supplied a scenario; call \$story->setScenario() in your test."]; |
|
531 | 531 | } |
532 | 532 | |
533 | 533 | return $this->storyScenario; |
@@ -682,18 +682,18 @@ discard block |
||
682 | 682 | // tell the template which story it is being used with |
683 | 683 | $tmpl->setStory($this); |
684 | 684 | |
685 | - $tmpl->hasTestCanRunCheck() && $this->addTestCanRunCheck($tmpl->getTestCanRunCheck()); |
|
686 | - $tmpl->hasTestSetup() && $this->addTestSetup($tmpl->getTestSetup()); |
|
687 | - $tmpl->hasTestTeardown() && $this->addTestTeardown($tmpl->getTestTeardown()); |
|
688 | - $tmpl->hasPerPhaseSetup() && $this->addPerPhaseSetup($tmpl->getPerPhaseSetup()); |
|
689 | - $tmpl->hasPerPhaseTeardown() && $this->addPerPhaseTeardown($tmpl->getPerPhaseTeardown()); |
|
690 | - $tmpl->hasDeviceSetup() && $this->addDeviceSetup($tmpl->getDeviceSetup()); |
|
691 | - $tmpl->hasDeviceTeardown() && $this->addDeviceTeardown($tmpl->getDeviceTeardown()); |
|
692 | - $tmpl->hasHints() && $this->addHints($tmpl->getHints()); |
|
693 | - $tmpl->hasPreTestPrediction() && $this->addPreTestPrediction($tmpl->getPreTestPrediction()); |
|
694 | - $tmpl->hasPreTestInspection() && $this->addPreTestInspection($tmpl->getPreTestInspection()); |
|
695 | - $tmpl->hasAction() && $this->addAction($tmpl->getAction()); |
|
696 | - $tmpl->hasPostTestInspection() && $this->addPostTestInspection($tmpl->getPostTestInspection()); |
|
685 | + $tmpl->hasTestCanRunCheck() && $this->addTestCanRunCheck($tmpl->getTestCanRunCheck()); |
|
686 | + $tmpl->hasTestSetup() && $this->addTestSetup($tmpl->getTestSetup()); |
|
687 | + $tmpl->hasTestTeardown() && $this->addTestTeardown($tmpl->getTestTeardown()); |
|
688 | + $tmpl->hasPerPhaseSetup() && $this->addPerPhaseSetup($tmpl->getPerPhaseSetup()); |
|
689 | + $tmpl->hasPerPhaseTeardown() && $this->addPerPhaseTeardown($tmpl->getPerPhaseTeardown()); |
|
690 | + $tmpl->hasDeviceSetup() && $this->addDeviceSetup($tmpl->getDeviceSetup()); |
|
691 | + $tmpl->hasDeviceTeardown() && $this->addDeviceTeardown($tmpl->getDeviceTeardown()); |
|
692 | + $tmpl->hasHints() && $this->addHints($tmpl->getHints()); |
|
693 | + $tmpl->hasPreTestPrediction() && $this->addPreTestPrediction($tmpl->getPreTestPrediction()); |
|
694 | + $tmpl->hasPreTestInspection() && $this->addPreTestInspection($tmpl->getPreTestInspection()); |
|
695 | + $tmpl->hasAction() && $this->addAction($tmpl->getAction()); |
|
696 | + $tmpl->hasPostTestInspection() && $this->addPostTestInspection($tmpl->getPostTestInspection()); |
|
697 | 697 | |
698 | 698 | // remember this template for future use |
699 | 699 | $this->storyTemplates[] = $tmpl; |
@@ -57,7 +57,8 @@ |
||
57 | 57 | */ |
58 | 58 | class E5xx_NotImplemented extends E5xx_ProseException |
59 | 59 | { |
60 | - public function __construct($methodName) { |
|
60 | + public function __construct($methodName) |
|
61 | + { |
|
61 | 62 | $msg = "Method '{$methodName}' has not been implemented yet"; |
62 | 63 | parent::__construct(500, $msg, $msg); |
63 | 64 | } |
@@ -77,8 +77,7 @@ |
||
77 | 77 | |
78 | 78 | return $return; |
79 | 79 | } |
80 | - catch (Exception $e) |
|
81 | - { |
|
80 | + catch (Exception $e) { |
|
82 | 81 | throw new E5xx_ActionFailed(__METHOD__, $e->getMessage()); |
83 | 82 | } |
84 | 83 | } |
@@ -9,14 +9,14 @@ |
||
9 | 9 | |
10 | 10 | $group1 = $testEnv->newGroup('vagrant', new Vagrant_GroupAdapter); |
11 | 11 | $group1->newHost('default', new Vagrant_VirtualboxHostAdapter) |
12 | - ->setOperatingSystem(new CentOS_6_HostAdapter) |
|
13 | - ->setRoles([ |
|
12 | + ->setOperatingSystem(new CentOS_6_HostAdapter) |
|
13 | + ->setRoles([ |
|
14 | 14 | "host_target", |
15 | 15 | "upload_target", |
16 | 16 | "ssl_target", |
17 | 17 | "zmq_target", |
18 | 18 | ]) |
19 | - ->setStorySettings((object)[ |
|
19 | + ->setStorySettings((object)[ |
|
20 | 20 | "host" => (object)[ |
21 | 21 | "expected" => "successfully retrieved this storySetting :)", |
22 | 22 | ], |
@@ -9,14 +9,14 @@ |
||
9 | 9 | |
10 | 10 | $group1 = $testEnv->newGroup('vagrant', new Vagrant_GroupAdapter); |
11 | 11 | $group1->newHost('default', new Vagrant_VirtualboxHostAdapter) |
12 | - ->setOperatingSystem(new CentOS_7_HostAdapter) |
|
13 | - ->setRoles([ |
|
12 | + ->setOperatingSystem(new CentOS_7_HostAdapter) |
|
13 | + ->setRoles([ |
|
14 | 14 | "host_target", |
15 | 15 | "upload_target", |
16 | 16 | "ssl_target", |
17 | 17 | "zmq_target", |
18 | 18 | ]) |
19 | - ->setStorySettings((object)[ |
|
19 | + ->setStorySettings((object)[ |
|
20 | 20 | "host" => (object)[ |
21 | 21 | "expected" => "successfully retrieved this storySetting :)", |
22 | 22 | ], |
@@ -20,24 +20,24 @@ |
||
20 | 20 | |
21 | 21 | $events = 0; |
22 | 22 | while(true) { |
23 | - try { |
|
24 | - $readable = $writeable = []; |
|
25 | - $events = $poller->poll($readable, $writeable, -1); |
|
26 | - } |
|
27 | - catch (Exception $e) { |
|
28 | - // do nothing |
|
29 | - } |
|
23 | + try { |
|
24 | + $readable = $writeable = []; |
|
25 | + $events = $poller->poll($readable, $writeable, -1); |
|
26 | + } |
|
27 | + catch (Exception $e) { |
|
28 | + // do nothing |
|
29 | + } |
|
30 | 30 | |
31 | - if ($events > 0) { |
|
32 | - foreach($readable as $r) { |
|
33 | - if ($r === $single['in']) { |
|
34 | - $msg = $r->recv(); |
|
35 | - $single['out']->send($msg); |
|
36 | - } |
|
37 | - else { |
|
38 | - $msg = $r->recvmulti(); |
|
39 | - $multi['out']->sendmulti($msg); |
|
40 | - } |
|
41 | - } |
|
42 | - } |
|
31 | + if ($events > 0) { |
|
32 | + foreach($readable as $r) { |
|
33 | + if ($r === $single['in']) { |
|
34 | + $msg = $r->recv(); |
|
35 | + $single['out']->send($msg); |
|
36 | + } |
|
37 | + else { |
|
38 | + $msg = $r->recvmulti(); |
|
39 | + $multi['out']->sendmulti($msg); |
|
40 | + } |
|
41 | + } |
|
42 | + } |
|
43 | 43 | } |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | $single = array(); |
6 | 6 | $single['in'] = $context->getSocket(ZMQ::SOCKET_PULL); |
7 | 7 | $single['out'] = $context->getSocket(ZMQ::SOCKET_PUSH); |
8 | -$multi = array(); |
|
8 | +$multi = array(); |
|
9 | 9 | $multi['in'] = $context->getSocket(ZMQ::SOCKET_PULL); |
10 | 10 | $multi['out'] = $context->getSocket(ZMQ::SOCKET_PUSH); |
11 | 11 | |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | $poller->add($multi['in'], ZMQ::POLL_IN); |
20 | 20 | |
21 | 21 | $events = 0; |
22 | -while(true) { |
|
22 | +while (true) { |
|
23 | 23 | try { |
24 | 24 | $readable = $writeable = []; |
25 | 25 | $events = $poller->poll($readable, $writeable, -1); |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | } |
30 | 30 | |
31 | 31 | if ($events > 0) { |
32 | - foreach($readable as $r) { |
|
32 | + foreach ($readable as $r) { |
|
33 | 33 | if ($r === $single['in']) { |
34 | 34 | $msg = $r->recv(); |
35 | 35 | $single['out']->send($msg); |
@@ -134,7 +134,7 @@ |
||
134 | 134 | * a separate config file for each test environment. The original |
135 | 135 | * runtime-v2.json file is then deleted from disk. |
136 | 136 | * |
137 | - * @param BaseObject $config |
|
137 | + * @param BaseObject $oldConfig |
|
138 | 138 | * @return void |
139 | 139 | */ |
140 | 140 | protected function splitUpConfig($oldConfig) |
@@ -145,7 +145,7 @@ |
||
145 | 145 | } |
146 | 146 | |
147 | 147 | // yes we do |
148 | - foreach($oldConfig->storyplayer->tables->hosts as $testEnvName => $hosts) { |
|
148 | + foreach ($oldConfig->storyplayer->tables->hosts as $testEnvName => $hosts) { |
|
149 | 149 | // our new per-test-env config file |
150 | 150 | $newConfig = new TestEnvironmentRuntimeConfig(); |
151 | 151 | $newConfig->setName($testEnvName); |
@@ -70,8 +70,7 @@ |
||
70 | 70 | static $configDir = null; |
71 | 71 | |
72 | 72 | // do we have a configDir remembered yet? |
73 | - if (!$configDir) |
|
74 | - { |
|
73 | + if (!$configDir) { |
|
75 | 74 | $configDir = getcwd() . '/.storyplayer'; |
76 | 75 | } |
77 | 76 |