@@ -62,6 +62,10 @@ |
||
62 | 62 | */ |
63 | 63 | class UsingPDODB extends Prose |
64 | 64 | { |
65 | + /** |
|
66 | + * @param \DataSift\Storyplayer\PlayerLib\StoryTeller $st |
|
67 | + * @param PDO[] $args |
|
68 | + */ |
|
65 | 69 | public function __construct($st, $args) |
66 | 70 | { |
67 | 71 | // call our parent first |
@@ -81,8 +81,7 @@ discard block |
||
81 | 81 | // what are we doing? |
82 | 82 | $log = usingLog()->startAction(["run SQL query:", $sql, "/ with params:", $params, "and driver params:", $driverParams]); |
83 | 83 | |
84 | - try |
|
85 | - { |
|
84 | + try { |
|
86 | 85 | // create a prepared statement |
87 | 86 | // |
88 | 87 | // we do this so that we can inject the $params into the SQL statement |
@@ -95,8 +94,7 @@ discard block |
||
95 | 94 | $log->endAction(); |
96 | 95 | return $stmt; |
97 | 96 | } |
98 | - catch (Exception $e) |
|
99 | - { |
|
97 | + catch (Exception $e) { |
|
100 | 98 | throw new E5xx_ActionFailed(__METHOD__, $e->getMessage()); |
101 | 99 | } |
102 | 100 | } |
@@ -106,8 +104,7 @@ discard block |
||
106 | 104 | // what are we doing? |
107 | 105 | $log = usingLog()->startAction(["run raw SQL query:", $sql, "with driver params: ", $driverParams]); |
108 | 106 | |
109 | - try |
|
110 | - { |
|
107 | + try { |
|
111 | 108 | // execute the prepared statement |
112 | 109 | // |
113 | 110 | // we do this directly so that you can (hopefully) attempt |
@@ -118,8 +115,7 @@ discard block |
||
118 | 115 | $log->endAction(); |
119 | 116 | return $stmt; |
120 | 117 | } |
121 | - catch (Exception $e) |
|
122 | - { |
|
118 | + catch (Exception $e) { |
|
123 | 119 | throw new E5xx_ActionFailed(__METHOD__, $e->getMessage()); |
124 | 120 | } |
125 | 121 | } |
@@ -129,15 +125,13 @@ discard block |
||
129 | 125 | // what are we doing? |
130 | 126 | $log = usingLog()->startAction("begin PDO database transaction"); |
131 | 127 | |
132 | - try |
|
133 | - { |
|
128 | + try { |
|
134 | 129 | $this->args[0]->beginTransaction(); |
135 | 130 | |
136 | 131 | // all done |
137 | 132 | $log->endAction(); |
138 | 133 | } |
139 | - catch (Exception $e) |
|
140 | - { |
|
134 | + catch (Exception $e) { |
|
141 | 135 | throw new E5xx_ActionFailed(__METHOD__, $e->getMessage()); |
142 | 136 | } |
143 | 137 | } |
@@ -147,15 +141,13 @@ discard block |
||
147 | 141 | // what are we doing? |
148 | 142 | $log = usingLog()->startAction("commit PDO database transaction"); |
149 | 143 | |
150 | - try |
|
151 | - { |
|
144 | + try { |
|
152 | 145 | $this->args[0]->commit(); |
153 | 146 | |
154 | 147 | // all done |
155 | 148 | $log->endAction(); |
156 | 149 | } |
157 | - catch (Exception $e) |
|
158 | - { |
|
150 | + catch (Exception $e) { |
|
159 | 151 | throw new E5xx_ActionFailed(__METHOD__, $e->getMessage()); |
160 | 152 | } |
161 | 153 | } |
@@ -165,15 +157,13 @@ discard block |
||
165 | 157 | // what are we doing? |
166 | 158 | $log = usingLog()->startAction("rollback PDO database transaction"); |
167 | 159 | |
168 | - try |
|
169 | - { |
|
160 | + try { |
|
170 | 161 | $this->args[0]->rollBack(); |
171 | 162 | |
172 | 163 | // all done |
173 | 164 | $log->endAction(); |
174 | 165 | } |
175 | - catch (Exception $e) |
|
176 | - { |
|
166 | + catch (Exception $e) { |
|
177 | 167 | throw new E5xx_ActionFailed(__METHOD__, $e->getMessage()); |
178 | 168 | } |
179 | 169 | } |
@@ -69,7 +69,7 @@ |
||
69 | 69 | * the group that we belong to |
70 | 70 | * @param string $hostId |
71 | 71 | * the alias for this host |
72 | - * @return object |
|
72 | + * @return Vagrant_VirtualboxHostDefinition |
|
73 | 73 | * a host definition to populate |
74 | 74 | */ |
75 | 75 | public function newHostDefinition(TestEnvironment_GroupDefinition $groupDef, $hostId) |
@@ -62,18 +62,18 @@ |
||
62 | 62 | |
63 | 63 | class Vagrant_VirtualboxHostAdapter extends Vagrant_HostAdapter |
64 | 64 | { |
65 | - /** |
|
66 | - * create an empty host definition for this kind of host |
|
67 | - * |
|
68 | - * @param TestEnvironment_GroupDefinition $groupDef |
|
69 | - * the group that we belong to |
|
70 | - * @param string $hostId |
|
71 | - * the alias for this host |
|
72 | - * @return object |
|
73 | - * a host definition to populate |
|
74 | - */ |
|
75 | - public function newHostDefinition(TestEnvironment_GroupDefinition $groupDef, $hostId) |
|
76 | - { |
|
77 | - return new Vagrant_VirtualboxHostDefinition($groupDef, $hostId, $this); |
|
78 | - } |
|
65 | + /** |
|
66 | + * create an empty host definition for this kind of host |
|
67 | + * |
|
68 | + * @param TestEnvironment_GroupDefinition $groupDef |
|
69 | + * the group that we belong to |
|
70 | + * @param string $hostId |
|
71 | + * the alias for this host |
|
72 | + * @return object |
|
73 | + * a host definition to populate |
|
74 | + */ |
|
75 | + public function newHostDefinition(TestEnvironment_GroupDefinition $groupDef, $hostId) |
|
76 | + { |
|
77 | + return new Vagrant_VirtualboxHostDefinition($groupDef, $hostId, $this); |
|
78 | + } |
|
79 | 79 | } |
80 | 80 | \ No newline at end of file |
@@ -302,7 +302,7 @@ |
||
302 | 302 | // do we skip destroying the test environment? |
303 | 303 | if ($this->st->getPersistTestEnvironment()) { |
304 | 304 | echo PHP_EOL . "* Warning: NOT destroying test environment" . PHP_EOL |
305 | - . " --reuse-target flag is set" . PHP_EOL; |
|
305 | + . " --reuse-target flag is set" . PHP_EOL; |
|
306 | 306 | } |
307 | 307 | |
308 | 308 | // cleanup |
@@ -218,8 +218,7 @@ |
||
218 | 218 | // $this->playerList contains one or more things to play |
219 | 219 | // |
220 | 220 | // let's play each of them in order |
221 | - foreach ($this->playerList as $player) |
|
222 | - { |
|
221 | + foreach ($this->playerList as $player) { |
|
223 | 222 | // execute each player in turn |
224 | 223 | // |
225 | 224 | // they may also have their own list of nested players |
@@ -231,7 +231,7 @@ |
||
231 | 231 | |
232 | 232 | // setup signal handling |
233 | 233 | pcntl_signal(SIGTERM, array($this, 'sigtermHandler')); |
234 | - pcntl_signal(SIGINT , array($this, 'sigtermHandler')); |
|
234 | + pcntl_signal(SIGINT, array($this, 'sigtermHandler')); |
|
235 | 235 | } |
236 | 236 | |
237 | 237 | /** |
@@ -61,7 +61,7 @@ |
||
61 | 61 | public function __construct() |
62 | 62 | { |
63 | 63 | $msg = "You need to use -s to specify which system to test." . PHP_EOL . PHP_EOL |
64 | - . "Use 'storyplayer --list-systems' to see the list of known systems under test."; |
|
64 | + . "Use 'storyplayer --list-systems' to see the list of known systems under test."; |
|
65 | 65 | parent::__construct(400, $msg, $msg); |
66 | 66 | } |
67 | 67 | } |
68 | 68 | \ No newline at end of file |
@@ -78,20 +78,20 @@ |
||
78 | 78 | |
79 | 79 | public function initBeforeModulesAvailable(CliEngine $engine, CliCommand $command, Injectables $injectables) |
80 | 80 | { |
81 | - // which colour mode are we in? |
|
82 | - switch ($engine->options->color) { |
|
83 | - case Feature_ColorSwitch::NO_COLOR: |
|
84 | - $injectables->output->disableColourSupport(); |
|
85 | - break; |
|
81 | + // which colour mode are we in? |
|
82 | + switch ($engine->options->color) { |
|
83 | + case Feature_ColorSwitch::NO_COLOR: |
|
84 | + $injectables->output->disableColourSupport(); |
|
85 | + break; |
|
86 | 86 | |
87 | - case Feature_ColorSwitch::ALWAYS_COLOR: |
|
88 | - $injectables->output->enforceColourSupport(); |
|
89 | - break; |
|
87 | + case Feature_ColorSwitch::ALWAYS_COLOR: |
|
88 | + $injectables->output->enforceColourSupport(); |
|
89 | + break; |
|
90 | 90 | |
91 | - case Feature_ColorSwitch::AUTO_COLOR: |
|
92 | - $injectables->output->enableColourSupport(); |
|
93 | - break; |
|
94 | - } |
|
91 | + case Feature_ColorSwitch::AUTO_COLOR: |
|
92 | + $injectables->output->enableColourSupport(); |
|
93 | + break; |
|
94 | + } |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | public function initAfterModulesAvailable(StoryTeller $st, CliEngine $engine, Injectables $injectables) |
@@ -94,8 +94,7 @@ |
||
94 | 94 | $engine->options->defines = new stdClass; |
95 | 95 | } |
96 | 96 | |
97 | - foreach ($params as $param) |
|
98 | - { |
|
97 | + foreach ($params as $param) { |
|
99 | 98 | // split up the setting |
100 | 99 | $parts = explode('=', $param); |
101 | 100 | $key = array_shift($parts); |
@@ -70,14 +70,14 @@ |
||
70 | 70 | { |
71 | 71 | public function addSwitches(CliCommand $command, $injectables) |
72 | 72 | { |
73 | - $command->addSwitches([ |
|
74 | - new Feature_PersistDeviceSwitch, |
|
75 | - ]); |
|
73 | + $command->addSwitches([ |
|
74 | + new Feature_PersistDeviceSwitch, |
|
75 | + ]); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | public function initBeforeModulesAvailable(CliEngine $engine, CliCommand $command, Injectables $injectables) |
79 | 79 | { |
80 | - // no-op |
|
80 | + // no-op |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | public function initAfterModulesAvailable(StoryTeller $st, CliEngine $engine, Injectables $injectables) |
@@ -70,14 +70,14 @@ |
||
70 | 70 | { |
71 | 71 | public function addSwitches(CliCommand $command, $injectables) |
72 | 72 | { |
73 | - $command->addSwitches([ |
|
74 | - new Feature_PersistProcessesSwitch, |
|
75 | - ]); |
|
73 | + $command->addSwitches([ |
|
74 | + new Feature_PersistProcessesSwitch, |
|
75 | + ]); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | public function initBeforeModulesAvailable(CliEngine $engine, CliCommand $command, Injectables $injectables) |
79 | 79 | { |
80 | - // no-op |
|
80 | + // no-op |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | public function initAfterModulesAvailable(StoryTeller $st, CliEngine $engine, Injectables $injectables) |
@@ -70,21 +70,21 @@ |
||
70 | 70 | { |
71 | 71 | public function addSwitches(CliCommand $command, $injectables) |
72 | 72 | { |
73 | - $command->addSwitches([ |
|
74 | - new Feature_PersistTargetSwitch, |
|
75 | - new Feature_ReuseTargetSwitch |
|
76 | - ]); |
|
73 | + $command->addSwitches([ |
|
74 | + new Feature_PersistTargetSwitch, |
|
75 | + new Feature_ReuseTargetSwitch |
|
76 | + ]); |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | public function initBeforeModulesAvailable(CliEngine $engine, CliCommand $command, Injectables $injectables) |
80 | 80 | { |
81 | - // no-op |
|
81 | + // no-op |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | public function initAfterModulesAvailable(StoryTeller $st, CliEngine $engine, Injectables $injectables) |
85 | 85 | { |
86 | - // shorthand |
|
87 | - $output = $injectables->output; |
|
86 | + // shorthand |
|
87 | + $output = $injectables->output; |
|
88 | 88 | |
89 | 89 | // are we keeping the test environment hanging around afterwards? |
90 | 90 | if (isset($engine->options->persistTarget) && $engine->options->persistTarget) |
@@ -87,8 +87,7 @@ discard block |
||
87 | 87 | $output = $injectables->output; |
88 | 88 | |
89 | 89 | // are we keeping the test environment hanging around afterwards? |
90 | - if (isset($engine->options->persistTarget) && $engine->options->persistTarget) |
|
91 | - { |
|
90 | + if (isset($engine->options->persistTarget) && $engine->options->persistTarget) { |
|
92 | 91 | $injectables->activeConfig->setData('storyplayer.phases.testEnvShutdown.TestEnvironmentDestruction', false); |
93 | 92 | $injectables->activeConfig->unsetData('storyplayer.phases.userAbort.TestEnvironmentDestruction'); |
94 | 93 | $st->setPersistTestEnvironment(); |
@@ -96,8 +95,7 @@ discard block |
||
96 | 95 | |
97 | 96 | // are we trying to use a test environment that has previously |
98 | 97 | // been persisted? |
99 | - if (isset($engine->options->reuseTarget) && $engine->options->reuseTarget) |
|
100 | - { |
|
98 | + if (isset($engine->options->reuseTarget) && $engine->options->reuseTarget) { |
|
101 | 99 | // does the target exist to be reused? |
102 | 100 | $output->setSilentMode(); |
103 | 101 | $hasTarget = $st->fromTargetsTable()->hasCurrentTestEnvironment(); |
@@ -128,8 +126,7 @@ discard block |
||
128 | 126 | // if we get here, then we do not need to create the test environment |
129 | 127 | $injectables->activeConfig->setData('storyplayer.phases.testEnvStartup.TestEnvironmentConstruction', false); |
130 | 128 | } |
131 | - else |
|
132 | - { |
|
129 | + else { |
|
133 | 130 | // do we already have this target? |
134 | 131 | // |
135 | 132 | // this can happen when the test environment was previously |