@@ -270,8 +270,8 @@ |
||
270 | 270 | public function logCliErrorWithException($msg, $e) |
271 | 271 | { |
272 | 272 | $this->write("*** error: $msg" . PHP_EOL . PHP_EOL |
273 | - . "This was caused by an unexpected exception " . get_class($e) . PHP_EOL . PHP_EOL |
|
274 | - . $e->getTraceAsString() . PHP_EOL); |
|
273 | + . "This was caused by an unexpected exception " . get_class($e) . PHP_EOL . PHP_EOL |
|
274 | + . $e->getTraceAsString() . PHP_EOL); |
|
275 | 275 | } |
276 | 276 | |
277 | 277 | /** |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | */ |
61 | 61 | class DevModeConsole extends Console |
62 | 62 | { |
63 | - protected $resultStrings = array(); |
|
63 | + protected $resultStrings = array(); |
|
64 | 64 | |
65 | 65 | public function __construct() |
66 | 66 | { |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | //$this->write('-------------------------------------------------------------' . PHP_EOL, $this->writer->commentStyle); |
125 | 125 | $this->write('----' . PHP_EOL, $this->writer->commentStyle); |
126 | 126 | $this->write("Result: "); |
127 | - if ($result->getPhaseGroupSucceeded()){ |
|
127 | + if ($result->getPhaseGroupSucceeded()) { |
|
128 | 128 | $this->write($resultString, $this->writer->successStyle); |
129 | 129 | } |
130 | 130 | else if ($result->getPhaseGroupFailed()) { |
@@ -124,7 +124,7 @@ |
||
124 | 124 | //$this->write('-------------------------------------------------------------' . PHP_EOL, $this->writer->commentStyle); |
125 | 125 | $this->write('----' . PHP_EOL, $this->writer->commentStyle); |
126 | 126 | $this->write("Result: "); |
127 | - if ($result->getPhaseGroupSucceeded()){ |
|
127 | + if ($result->getPhaseGroupSucceeded()) { |
|
128 | 128 | $this->write($resultString, $this->writer->successStyle); |
129 | 129 | } |
130 | 130 | else if ($result->getPhaseGroupFailed()) { |
@@ -209,8 +209,8 @@ |
||
209 | 209 | public function logCliErrorWithException($msg, $e) |
210 | 210 | { |
211 | 211 | echo "*** error: $msg" . PHP_EOL . PHP_EOL |
212 | - . "This was caused by an unexpected exception " . get_class($e) . PHP_EOL . PHP_EOL |
|
213 | - . $e->getTraceAsString(); |
|
212 | + . "This was caused by an unexpected exception " . get_class($e) . PHP_EOL . PHP_EOL |
|
213 | + . $e->getTraceAsString(); |
|
214 | 214 | } |
215 | 215 | |
216 | 216 | /** |
@@ -62,7 +62,7 @@ |
||
62 | 62 | { |
63 | 63 | public function __construct($testEnvironmentName, $groupId) |
64 | 64 | { |
65 | - $msg = "in test environment {$testEnvironmentName}: attempt to create two or more groups with the same group ID {$groupId}"; |
|
65 | + $msg = "in test environment {$testEnvironmentName}: attempt to create two or more groups with the same group ID {$groupId}"; |
|
66 | 66 | parent::__construct(400, $msg, $msg); |
67 | 67 | } |
68 | 68 | } |
69 | 69 | \ No newline at end of file |
@@ -62,7 +62,7 @@ |
||
62 | 62 | { |
63 | 63 | public function __construct($testEnvironmentName, $groupId, $hostId) |
64 | 64 | { |
65 | - $msg = "in test environment {$testEnvironmentName}, group {$groupId}, hostIds must all be strings, at least one " . gettype($hostId) . " found instead"; |
|
65 | + $msg = "in test environment {$testEnvironmentName}, group {$groupId}, hostIds must all be strings, at least one " . gettype($hostId) . " found instead"; |
|
66 | 66 | parent::__construct(400, $msg, $msg); |
67 | 67 | } |
68 | 68 | } |
69 | 69 | \ No newline at end of file |
@@ -62,7 +62,7 @@ |
||
62 | 62 | { |
63 | 63 | public function __construct($testEnvironmentName, $groupId, $hostId, $role) |
64 | 64 | { |
65 | - $msg = "in test environment {$testEnvironmentName}, group {$groupId}, host {$hostId}: roles must be an array of strings; contains at least one " . gettype($role) . " instead"; |
|
65 | + $msg = "in test environment {$testEnvironmentName}, group {$groupId}, host {$hostId}: roles must be an array of strings; contains at least one " . gettype($role) . " instead"; |
|
66 | 66 | parent::__construct(400, $msg, $msg); |
67 | 67 | } |
68 | 68 | } |
69 | 69 | \ No newline at end of file |
@@ -62,7 +62,7 @@ |
||
62 | 62 | { |
63 | 63 | public function __construct($testEnvironmentName, $groupId, $hostId, $roles) |
64 | 64 | { |
65 | - $msg = "in test environment {$testEnvironmentName}, group {$groupId}, host {$hostId}: roles must be an array; " . gettype($roles) . " received instead"; |
|
65 | + $msg = "in test environment {$testEnvironmentName}, group {$groupId}, host {$hostId}: roles must be an array; " . gettype($roles) . " received instead"; |
|
66 | 66 | parent::__construct(400, $msg, $msg); |
67 | 67 | } |
68 | 68 | } |
69 | 69 | \ No newline at end of file |
@@ -63,7 +63,7 @@ |
||
63 | 63 | { |
64 | 64 | public function __construct($testEnvironmentName, $groupId, $hostId, $hostManager, $groupAdapter) |
65 | 65 | { |
66 | - $msg = "in test environment {$testEnvironmentName}, group {$groupId}, host {$hostId}: host adapter '" . gettype($hostManager) . "' isn't compatible with group of type '" . gettype($groupAdapter) . "'"; |
|
66 | + $msg = "in test environment {$testEnvironmentName}, group {$groupId}, host {$hostId}: host adapter '" . gettype($hostManager) . "' isn't compatible with group of type '" . gettype($groupAdapter) . "'"; |
|
67 | 67 | parent::__construct(400, $msg, $msg); |
68 | 68 | } |
69 | 69 | } |
70 | 70 | \ No newline at end of file |
@@ -63,7 +63,7 @@ |
||
63 | 63 | { |
64 | 64 | public function __construct($testEnvironmentName, $groupId) |
65 | 65 | { |
66 | - $msg = "in test environment {$testEnvironmentName}, group {$groupId}: need a group adapter first"; |
|
66 | + $msg = "in test environment {$testEnvironmentName}, group {$groupId}: need a group adapter first"; |
|
67 | 67 | parent::__construct(400, $msg, $msg); |
68 | 68 | } |
69 | 69 | } |
70 | 70 | \ No newline at end of file |
@@ -58,34 +58,34 @@ |
||
58 | 58 | */ |
59 | 59 | class DeviceLib |
60 | 60 | { |
61 | - /** |
|
62 | - * @param \DataSift\Stone\ObjectLib\BaseObject $deviceDetails |
|
63 | - */ |
|
64 | - public static function getDeviceAdapter($deviceDetails) |
|
65 | - { |
|
66 | - // which namespace do our device adapters live in? |
|
67 | - $namespace = 'DataSift\Storyplayer\DeviceLib\\'; |
|
61 | + /** |
|
62 | + * @param \DataSift\Stone\ObjectLib\BaseObject $deviceDetails |
|
63 | + */ |
|
64 | + public static function getDeviceAdapter($deviceDetails) |
|
65 | + { |
|
66 | + // which namespace do our device adapters live in? |
|
67 | + $namespace = 'DataSift\Storyplayer\DeviceLib\\'; |
|
68 | 68 | |
69 | - // where do we want to get the device from? |
|
70 | - $adapterClass = $namespace . $deviceDetails->adapter . 'Adapter'; |
|
69 | + // where do we want to get the device from? |
|
70 | + $adapterClass = $namespace . $deviceDetails->adapter . 'Adapter'; |
|
71 | 71 | |
72 | - // do we have the adapter? |
|
73 | - if (!class_exists($adapterClass)) { |
|
74 | - throw new E4xx_NoSuchDeviceAdapter($deviceDetails->adapter); |
|
75 | - } |
|
72 | + // do we have the adapter? |
|
73 | + if (!class_exists($adapterClass)) { |
|
74 | + throw new E4xx_NoSuchDeviceAdapter($deviceDetails->adapter); |
|
75 | + } |
|
76 | 76 | |
77 | - // create the adapter |
|
78 | - $deviceAdapter = new $adapterClass; |
|
77 | + // create the adapter |
|
78 | + $deviceAdapter = new $adapterClass; |
|
79 | 79 | |
80 | - // is this an adapter we're happy with? |
|
81 | - if (!$deviceAdapter instanceof \DataSift\Storyplayer\DeviceLib\DeviceAdapter) { |
|
82 | - throw new E5xx_BadDeviceAdapter($adapterClass); |
|
83 | - } |
|
80 | + // is this an adapter we're happy with? |
|
81 | + if (!$deviceAdapter instanceof \DataSift\Storyplayer\DeviceLib\DeviceAdapter) { |
|
82 | + throw new E5xx_BadDeviceAdapter($adapterClass); |
|
83 | + } |
|
84 | 84 | |
85 | - // initialise the adapter |
|
86 | - $deviceAdapter->init($deviceDetails); |
|
85 | + // initialise the adapter |
|
86 | + $deviceAdapter->init($deviceDetails); |
|
87 | 87 | |
88 | - // all done |
|
89 | - return $deviceAdapter; |
|
90 | - } |
|
88 | + // all done |
|
89 | + return $deviceAdapter; |
|
90 | + } |
|
91 | 91 | } |
92 | 92 | \ No newline at end of file |