@@ -234,8 +234,7 @@ |
||
234 | 234 | // |
235 | 235 | // if this fails, we do not know why |
236 | 236 | $success = mkdir($configDir, 0700, true); |
237 | - if (!$success) |
|
238 | - { |
|
237 | + if (!$success) { |
|
239 | 238 | // cannot create it - bail out now |
240 | 239 | throw new E4xx_ConfigPathCannotBeCreated($configDir); |
241 | 240 | } |
@@ -63,9 +63,9 @@ |
||
63 | 63 | { |
64 | 64 | public $runningTestEnvironmentsList; |
65 | 65 | |
66 | - public function initRunningTestEnvironmentsListSupport() |
|
67 | - { |
|
66 | + public function initRunningTestEnvironmentsListSupport() |
|
67 | + { |
|
68 | 68 | $this->runningTestEnvironmentsList = new RunningTestEnvironmentsList(); |
69 | 69 | $this->runningTestEnvironmentsList->findConfigs(); |
70 | - } |
|
70 | + } |
|
71 | 71 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | * @license http://www.opensource.org/licenses/bsd-license.php BSD License |
56 | 56 | * @link http://datasift.github.io/storyplayer |
57 | 57 | */ |
58 | -class FromArray extends Prose{ |
|
58 | +class FromArray extends Prose { |
|
59 | 59 | |
60 | 60 | /** |
61 | 61 | * Sets a value in an array for a . delimited path |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | public function setValueInArray(&$array, $path, $val) |
69 | 69 | { |
70 | 70 | $pathAsArray = fromString()->splitDotSeparatedPath($path); |
71 | - for ($i=&$array; $key=array_shift($pathAsArray); $i=&$i[$key]) { |
|
71 | + for ($i = &$array; $key = array_shift($pathAsArray); $i = &$i[$key]) { |
|
72 | 72 | if (!isset($i[$key])) { |
73 | 73 | $i[$key] = array(); |
74 | 74 | } |
@@ -55,7 +55,8 @@ |
||
55 | 55 | * @license http://www.opensource.org/licenses/bsd-license.php BSD License |
56 | 56 | * @link http://datasift.github.io/storyplayer |
57 | 57 | */ |
58 | -class FromArray extends Prose{ |
|
58 | +class FromArray extends Prose |
|
59 | +{ |
|
59 | 60 | |
60 | 61 | /** |
61 | 62 | * Sets a value in an array for a . delimited path |
@@ -55,7 +55,7 @@ |
||
55 | 55 | * @license http://www.opensource.org/licenses/bsd-license.php BSD License |
56 | 56 | * @link http://datasift.github.io/storyplayer |
57 | 57 | */ |
58 | -class FromString extends Prose{ |
|
58 | +class FromString extends Prose { |
|
59 | 59 | |
60 | 60 | /** |
61 | 61 | * Reduces a dot separated path e.g. fb.parent.context by one from |
@@ -55,7 +55,8 @@ discard block |
||
55 | 55 | * @license http://www.opensource.org/licenses/bsd-license.php BSD License |
56 | 56 | * @link http://datasift.github.io/storyplayer |
57 | 57 | */ |
58 | -class FromString extends Prose{ |
|
58 | +class FromString extends Prose |
|
59 | +{ |
|
59 | 60 | |
60 | 61 | /** |
61 | 62 | * Reduces a dot separated path e.g. fb.parent.context by one from |
@@ -71,9 +72,11 @@ discard block |
||
71 | 72 | $parts = $this->splitDotSeparatedPath($pathToReduce); |
72 | 73 | if (count($parts) == 0) { |
73 | 74 | return null; |
74 | - } else if (count($parts) == 1) { |
|
75 | + } |
|
76 | + else if (count($parts) == 1) { |
|
75 | 77 | return $parts[0]; |
76 | - } else { |
|
78 | + } |
|
79 | + else { |
|
77 | 80 | array_pop($parts); |
78 | 81 | return implode('.', $parts); |
79 | 82 | } |
@@ -72,7 +72,7 @@ |
||
72 | 72 | $log = usingLog()->startAction("add current test environment to targets table"); |
73 | 73 | |
74 | 74 | // get the details to add |
75 | - $testEnvSig = $this->st->getTestEnvironmentSignature(); |
|
75 | + $testEnvSig = $this->st->getTestEnvironmentSignature(); |
|
76 | 76 | |
77 | 77 | // add it |
78 | 78 | usingRuntimeTable($this->entryKey)->addItem(FromTargetsTable::SIGNATURE_KEY, $testEnvSig); |
@@ -9,7 +9,7 @@ |
||
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); |
|
12 | + ->setOperatingSystem(new CentOS_7_HostAdapter); |
|
13 | 13 | |
14 | 14 | $testEnv->setModuleSettings((object)[ |
15 | 15 | "http" => (object)[ |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | * |
74 | 74 | * @param array $actual |
75 | 75 | * the array to be tested |
76 | - * @return \Prose\AssertsArray |
|
76 | + * @return AssertsArray |
|
77 | 77 | */ |
78 | 78 | public static function assertsArray($actual) |
79 | 79 | { |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | * |
86 | 86 | * @param boolean $actual |
87 | 87 | * the data to be tested |
88 | - * @return \Prose\AssertsBoolean |
|
88 | + * @return AssertsBoolean |
|
89 | 89 | */ |
90 | 90 | public static function assertsBoolean($actual) |
91 | 91 | { |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | * |
98 | 98 | * @param double $actual |
99 | 99 | * the data to be tested |
100 | - * @return \Prose\AssertsDouble |
|
100 | + * @return AssertsDouble |
|
101 | 101 | */ |
102 | 102 | public static function assertsDouble($actual) |
103 | 103 | { |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | * |
110 | 110 | * @param int $actual |
111 | 111 | * the data to be tested |
112 | - * @return \Prose\AssertsInteger |
|
112 | + * @return AssertsInteger |
|
113 | 113 | */ |
114 | 114 | public static function assertsInteger($actual) |
115 | 115 | { |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | * |
122 | 122 | * @param object $actual |
123 | 123 | * the data to be tested |
124 | - * @return \Prose\AssertsObject |
|
124 | + * @return AssertsObject |
|
125 | 125 | */ |
126 | 126 | public static function assertsObject($actual) |
127 | 127 | { |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | * |
134 | 134 | * @param string $actual |
135 | 135 | * the data to be tested |
136 | - * @return \Prose\AssertsString |
|
136 | + * @return AssertsString |
|
137 | 137 | */ |
138 | 138 | public static function assertsString($actual) |
139 | 139 | { |
@@ -50,7 +50,6 @@ |
||
50 | 50 | /** |
51 | 51 | * Create a new story object |
52 | 52 | * |
53 | - * @param string $category the category that the story belongs to |
|
54 | 53 | * @return Story the new story object to use |
55 | 54 | */ |
56 | 55 | public static function newStory() |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | /** |
73 | 73 | * tick a checkbox or radio button if it has not yet been checked |
74 | 74 | * |
75 | - * @return \DataSift\Storyplayer\BrowserLib\SingleElementAction |
|
75 | + * @return SingleElementAction |
|
76 | 76 | */ |
77 | 77 | public function check() |
78 | 78 | { |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | * remove any content from an input box, or untick a checkbox or |
102 | 102 | * radio button |
103 | 103 | * |
104 | - * @return \DataSift\Storyplayer\BrowserLib\SingleElementAction |
|
104 | + * @return SingleElementAction |
|
105 | 105 | */ |
106 | 106 | public function clear() |
107 | 107 | { |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | /** |
133 | 133 | * Send a 'click' to the selected element |
134 | 134 | * |
135 | - * @return \DataSift\Storyplayer\BrowserLib\SingleElementAction |
|
135 | + * @return SingleElementAction |
|
136 | 136 | */ |
137 | 137 | public function click() |
138 | 138 | { |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | * |
155 | 155 | * @param string $label |
156 | 156 | * the human-readable text of the option to select |
157 | - * @return \DataSift\Storyplayer\BrowserLib\SingleElementAction |
|
157 | + * @return SingleElementAction |
|
158 | 158 | */ |
159 | 159 | public function select($label) |
160 | 160 | { |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | * |
186 | 186 | * @param string $text |
187 | 187 | * the text to type |
188 | - * @return \DataSift\Storyplayer\BrowserLib\SingleElementAction |
|
188 | + * @return SingleElementAction |
|
189 | 189 | */ |
190 | 190 | public function type($text) |
191 | 191 | { |
@@ -214,6 +214,9 @@ discard block |
||
214 | 214 | // |
215 | 215 | // ------------------------------------------------------------------ |
216 | 216 | |
217 | + /** |
|
218 | + * @param string $url |
|
219 | + */ |
|
217 | 220 | public function gotoPage($url) |
218 | 221 | { |
219 | 222 | // some shorthand to make things easier to read |
@@ -159,7 +159,7 @@ |
||
159 | 159 | */ |
160 | 160 | public function select($label) |
161 | 161 | { |
162 | - $action = function ($element, $elementName, $elementDesc) use ($label) { |
|
162 | + $action = function($element, $elementName, $elementDesc) use ($label) { |
|
163 | 163 | |
164 | 164 | // what are we doing? |
165 | 165 | $log = usingLog()->startAction("choose option '$label' from $elementDesc '$elementName'"); |
@@ -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 | } |