@@ -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 |
@@ -96,7 +96,7 @@ |
||
96 | 96 | { |
97 | 97 | // list the systems-under-test (if any) in a machine-friendly way |
98 | 98 | foreach ($this->sutList->getEntries() as $sutName) { |
99 | - echo $sutName->getName().PHP_EOL; |
|
99 | + echo $sutName->getName() . PHP_EOL; |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | // all done |
@@ -61,11 +61,11 @@ |
||
61 | 61 | public function __construct() |
62 | 62 | { |
63 | 63 | parent::__construct( |
64 | - 'DataSift\Storyplayer\DeviceLib\DeviceConfig', |
|
65 | - [ |
|
66 | - "storyplayer/devices", |
|
67 | - ".storyplayer/devices", |
|
68 | - ], |
|
64 | + 'DataSift\Storyplayer\DeviceLib\DeviceConfig', |
|
65 | + [ |
|
66 | + "storyplayer/devices", |
|
67 | + ".storyplayer/devices", |
|
68 | + ], |
|
69 | 69 | [ |
70 | 70 | new ConfigFinder(".*\\.json") |
71 | 71 | ] |
@@ -66,10 +66,10 @@ |
||
66 | 66 | public function __construct($searchFolder = 'storyplayer/test-environments') |
67 | 67 | { |
68 | 68 | parent::__construct( |
69 | - 'DataSift\Storyplayer\TestEnvironmentsLib\TestEnvironmentRuntimeConfig', |
|
70 | - [ |
|
71 | - "storyplayer/test-environments" |
|
72 | - ], |
|
69 | + 'DataSift\Storyplayer\TestEnvironmentsLib\TestEnvironmentRuntimeConfig', |
|
70 | + [ |
|
71 | + "storyplayer/test-environments" |
|
72 | + ], |
|
73 | 73 | [ |
74 | 74 | new ConfigFinder("/runtime.json") |
75 | 75 | ] |
@@ -61,11 +61,11 @@ |
||
61 | 61 | public function __construct() |
62 | 62 | { |
63 | 63 | return parent::__construct( |
64 | - 'DataSift\Storyplayer\SystemsUnderTestLib\SystemUnderTestConfig', |
|
65 | - [ |
|
66 | - "storyplayer/systems-under-test", |
|
67 | - ".storyplayer/systems-under-test", |
|
68 | - ], |
|
64 | + 'DataSift\Storyplayer\SystemsUnderTestLib\SystemUnderTestConfig', |
|
65 | + [ |
|
66 | + "storyplayer/systems-under-test", |
|
67 | + ".storyplayer/systems-under-test", |
|
68 | + ], |
|
69 | 69 | [ |
70 | 70 | new ConfigFinder(".*\\.json") |
71 | 71 | ] |
@@ -58,11 +58,11 @@ |
||
58 | 58 | public function __construct($searchFolder = '.storyplayer/test-environments') |
59 | 59 | { |
60 | 60 | parent::__construct( |
61 | - 'DataSift\Storyplayer\TestEnvironmentsLib\TestEnvironmentConfig', |
|
62 | - [ |
|
63 | - "storyplayer/test-environments", |
|
64 | - ".storyplayer/test-environments" |
|
65 | - ], |
|
61 | + 'DataSift\Storyplayer\TestEnvironmentsLib\TestEnvironmentConfig', |
|
62 | + [ |
|
63 | + "storyplayer/test-environments", |
|
64 | + ".storyplayer/test-environments" |
|
65 | + ], |
|
66 | 66 | [ |
67 | 67 | new ConfigFinder(".*(?<!runtime)\\.json$"), |
68 | 68 | new ConfigFinder("main.php$") |