@@ -12,10 +12,10 @@ |
||
12 | 12 | |
13 | 13 | foreach ($matches[1] as $varName) { |
14 | 14 | if (!getenv($varName)) { |
15 | - throw new \RuntimeException('The mandatory env variable (' . $varName . ') from the config file was not set.'); |
|
15 | + throw new \RuntimeException('The mandatory env variable ('.$varName.') from the config file was not set.'); |
|
16 | 16 | } |
17 | 17 | |
18 | - $fileContent = str_replace('${' . $varName . '}', getenv($varName), $fileContent); |
|
18 | + $fileContent = str_replace('${'.$varName.'}', getenv($varName), $fileContent); |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | return Yaml::parse($fileContent); |
@@ -27,13 +27,13 @@ |
||
27 | 27 | if ($response->getDuration() > $this->maxDuration) { |
28 | 28 | return new CheckResult( |
29 | 29 | CheckResult::STATUS_FAILURE, |
30 | - 'The http request took ' . (int) $response->getDuration() . ' milliseconds (limit was ' . $this->maxDuration . 'ms).', |
|
30 | + 'The http request took '.(int) $response->getDuration().' milliseconds (limit was '.$this->maxDuration.'ms).', |
|
31 | 31 | (int) $response->getDuration()); |
32 | 32 | } |
33 | 33 | |
34 | 34 | return new CheckResult( |
35 | 35 | CheckResult::STATUS_SUCCESS, |
36 | - 'The http request took ' . (int) $response->getDuration() . ' milliseconds.', |
|
36 | + 'The http request took '.(int) $response->getDuration().' milliseconds.', |
|
37 | 37 | (int) $response->getDuration()); |
38 | 38 | } |
39 | 39 | } |
@@ -25,13 +25,13 @@ |
||
25 | 25 | $validTo = date('d.m.Y H:i:s', $certInfo['validTo_time_t']); |
26 | 26 | |
27 | 27 | if ($certInfo['validFrom_time_t'] > time() || $certInfo['validTo_time_t'] < time()) { |
28 | - $errorMessage = 'Certificate is expired. [' . $validFrom . ' - ' . $validTo . ']'; |
|
28 | + $errorMessage = 'Certificate is expired. ['.$validFrom.' - '.$validTo.']'; |
|
29 | 29 | return new CheckResult(CheckResult::STATUS_FAILURE, $errorMessage); |
30 | - } elseif ($certInfo['validTo_time_t'] < strtotime('+' . $this->expireWarningTime . 'days')) { |
|
31 | - $errorMessage = 'Certificate warning, expires in less than ' . $this->expireWarningTime . ' days. Certificate expires at: ' . $validTo; |
|
30 | + } elseif ($certInfo['validTo_time_t'] < strtotime('+'.$this->expireWarningTime.'days')) { |
|
31 | + $errorMessage = 'Certificate warning, expires in less than '.$this->expireWarningTime.' days. Certificate expires at: '.$validTo; |
|
32 | 32 | return new CheckResult(CheckResult::STATUS_FAILURE, $errorMessage, 0); |
33 | 33 | } |
34 | 34 | |
35 | - return new CheckResult(CheckResult::STATUS_SUCCESS, 'The certificate does not expire within the next ' . $this->expireWarningTime . ' days. Expire date: ' . $validTo . '.'); |
|
35 | + return new CheckResult(CheckResult::STATUS_SUCCESS, 'The certificate does not expire within the next '.$this->expireWarningTime.' days. Expire date: '.$validTo.'.'); |
|
36 | 36 | } |
37 | 37 | } |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | foreach ($this->results as $results) { |
111 | 111 | foreach ($results as $result) { |
112 | 112 | /* @var CheckResult $result */ |
113 | - $tool = 'Smoke' . $result->getRuleName(); |
|
113 | + $tool = 'Smoke'.$result->getRuleName(); |
|
114 | 114 | $checks[$tool][] = $result; |
115 | 115 | } |
116 | 116 | } |
@@ -120,19 +120,19 @@ discard block |
||
120 | 120 | continue; |
121 | 121 | } |
122 | 122 | |
123 | - $message = 'The smoke test for #system_name# failed (Rule: ' . $toolName . ').<ul>'; |
|
123 | + $message = 'The smoke test for #system_name# failed (Rule: '.$toolName.').<ul>'; |
|
124 | 124 | $status = Event::STATUS_SUCCESS; |
125 | 125 | $failureCount = 0; |
126 | - $identifier = $toolName . '_' . $this->system; |
|
126 | + $identifier = $toolName.'_'.$this->system; |
|
127 | 127 | |
128 | 128 | foreach ($results as $result) { |
129 | 129 | /** @var CheckResult $result */ |
130 | 130 | if ($result->getStatus() === CheckResult::STATUS_FAILURE) { |
131 | 131 | $comingFrom = ''; |
132 | 132 | if ($this->addComingFrom && $this->retriever->getComingFrom($result->getResponse()->getUri())) { |
133 | - $comingFrom = ', coming from: ' . $this->retriever->getComingFrom($result->getResponse()->getUri()); |
|
133 | + $comingFrom = ', coming from: '.$this->retriever->getComingFrom($result->getResponse()->getUri()); |
|
134 | 134 | } |
135 | - $message .= '<li>' . $result->getMessage() . ' (url: ' . (string)$result->getResponse()->getUri() . $comingFrom . ')</li>'; |
|
135 | + $message .= '<li>'.$result->getMessage().' (url: '.(string) $result->getResponse()->getUri().$comingFrom.')</li>'; |
|
136 | 136 | ++$failureCount; |
137 | 137 | } |
138 | 138 | } |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | $status = Event::STATUS_FAILURE; |
141 | 141 | $message .= '</ul>'; |
142 | 142 | } else { |
143 | - $message = 'All checks for system "#system_name#" succeeded [SmokeBasic:' . $toolName . '].'; |
|
143 | + $message = 'All checks for system "#system_name#" succeeded [SmokeBasic:'.$toolName.'].'; |
|
144 | 144 | } |
145 | 145 | |
146 | 146 | $this->send($identifier, $this->system, $message, $status, $failureCount, $this->tool, $this->system); |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | foreach ($results as $result) { |
154 | 154 | /* @var CheckResult $result */ |
155 | 155 | |
156 | - $identifier = '_' . $this->getIdentifier($result); |
|
156 | + $identifier = '_'.$this->getIdentifier($result); |
|
157 | 157 | $tool = $this->getPrefix($result->getRuleName()); |
158 | 158 | |
159 | 159 | $component = $this->getComponent($result->getRuleName()); |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | $this->send( |
163 | 163 | $identifier, |
164 | 164 | $system, |
165 | - $result->getMessage() . ' (url: ' . (string)$result->getResponse()->getUri() . ')', |
|
165 | + $result->getMessage().' (url: '.(string) $result->getResponse()->getUri().')', |
|
166 | 166 | $result->getStatus(), |
167 | 167 | $result->getValue(), |
168 | 168 | $tool, |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | |
175 | 175 | private function getIdentifier(CheckResult $result) |
176 | 176 | { |
177 | - return $this->tool . '_' . $result->getRuleName(); |
|
177 | + return $this->tool.'_'.$result->getRuleName(); |
|
178 | 178 | } |
179 | 179 | |
180 | 180 | private function getPrefix($string) |
@@ -182,6 +182,11 @@ |
||
182 | 182 | return substr($string, 0, strpos($string, '_')); |
183 | 183 | } |
184 | 184 | |
185 | + /** |
|
186 | + * @param string $identifier |
|
187 | + * @param string $message |
|
188 | + * @param string $tool |
|
189 | + */ |
|
185 | 190 | private function send($identifier, $system, $message, $status, $value, $tool, $component) |
186 | 191 | { |
187 | 192 | if ($status !== CheckResult::STATUS_NONE) { |
@@ -34,15 +34,15 @@ |
||
34 | 34 | ))); |
35 | 35 | |
36 | 36 | if (property_exists($result, 'error')) { |
37 | - throw new ValidationFailedException('Google mobile friendly test was not passed. Error "' . $result->error->message . '"'); |
|
37 | + throw new ValidationFailedException('Google mobile friendly test was not passed. Error "'.$result->error->message.'"'); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | $passResult = $result->ruleGroups->USABILITY; |
41 | 41 | |
42 | 42 | if (!$passResult->pass) { |
43 | - return new CheckResult(CheckResult::STATUS_FAILURE, 'Google mobile friendly test was not passed. Score ' . $passResult->score . '/100.', (int) $passResult->score); |
|
43 | + return new CheckResult(CheckResult::STATUS_FAILURE, 'Google mobile friendly test was not passed. Score '.$passResult->score.'/100.', (int) $passResult->score); |
|
44 | 44 | } |
45 | 45 | |
46 | - return new CheckResult(CheckResult::STATUS_SUCCESS, 'Google mobile friendly test passed. Score ' . $passResult->score . '/100.', (int) $passResult->score); |
|
46 | + return new CheckResult(CheckResult::STATUS_SUCCESS, 'Google mobile friendly test passed. Score '.$passResult->score.'/100.', (int) $passResult->score); |
|
47 | 47 | } |
48 | 48 | } |
@@ -22,14 +22,14 @@ |
||
22 | 22 | if (count($results) > 0) { |
23 | 23 | ++$this->urlCount; |
24 | 24 | $firstResult = array_pop($results); |
25 | - $this->output->writeln(' ' . (string) $firstResult->getResponse()->getUri()); |
|
25 | + $this->output->writeln(' '.(string) $firstResult->getResponse()->getUri()); |
|
26 | 26 | $this->output->writeln(''); |
27 | 27 | } |
28 | 28 | } |
29 | 29 | |
30 | 30 | public function finish() |
31 | 31 | { |
32 | - $this->output->writeln(' <comment>Warm up finished. ' . $this->urlCount . ' urls visited.</comment>'); |
|
32 | + $this->output->writeln(' <comment>Warm up finished. '.$this->urlCount.' urls visited.</comment>'); |
|
33 | 33 | $this->output->writeln(''); |
34 | 34 | } |
35 | 35 | } |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | { |
35 | 35 | $data = json_decode($response->getBody()); |
36 | 36 | if ($data === null) { |
37 | - throw new ValidationFailedException("The given JSON data can not be validated (last error: '" . $this->json_errors[json_last_error()] . "')."); |
|
37 | + throw new ValidationFailedException("The given JSON data can not be validated (last error: '".$this->json_errors[json_last_error()]."')."); |
|
38 | 38 | } else { |
39 | 39 | $errorStatus = false; |
40 | 40 | $messageParts = array(); |
@@ -50,14 +50,14 @@ discard block |
||
50 | 50 | $errorStatus = true; |
51 | 51 | $errorMessage = ''; |
52 | 52 | foreach ($validator->getErrors() as $error) { |
53 | - $errorMessage = $errorMessage . sprintf("[%s] %s\n", $error['property'], $error['message']); |
|
53 | + $errorMessage = $errorMessage.sprintf("[%s] %s\n", $error['property'], $error['message']); |
|
54 | 54 | } |
55 | - $messageParts[] = $jsonSchemaFile['jsonfilename'] . ' - ' . $jsonSchemaFile['jsonfileurl'] . '(last error: ' . $errorMessage . ').'; |
|
55 | + $messageParts[] = $jsonSchemaFile['jsonfilename'].' - '.$jsonSchemaFile['jsonfileurl'].'(last error: '.$errorMessage.').'; |
|
56 | 56 | } |
57 | 57 | } |
58 | 58 | |
59 | 59 | if ($errorStatus === true) { |
60 | - $message = 'JSON file (' . (string) $response->getUri() . ') does not validate against the following JSON Schema files: ' . implode(', ', $messageParts); |
|
60 | + $message = 'JSON file ('.(string) $response->getUri().') does not validate against the following JSON Schema files: '.implode(', ', $messageParts); |
|
61 | 61 | throw new ValidationFailedException($message); |
62 | 62 | } |
63 | 63 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | public function doValidation(Response $response) |
25 | 25 | { |
26 | 26 | $domDocument = new \DOMDocument(); |
27 | - @$domDocument->loadHTML((string)$response->getBody()); |
|
27 | + @$domDocument->loadHTML((string) $response->getBody()); |
|
28 | 28 | |
29 | 29 | $domXPath = new \DOMXPath($domDocument); |
30 | 30 | |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | try { |
38 | 38 | $selectorAsXPath = $converter->toXPath($selector['pattern']); |
39 | 39 | } catch (\Exception $e) { |
40 | - throw new ValidationFailedException('Invalid css selector (' . $selector['pattern'] . ').'); |
|
40 | + throw new ValidationFailedException('Invalid css selector ('.$selector['pattern'].').'); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | $count = $domXPath->query($selectorAsXPath)->length; |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | if ($error === true) { |
52 | 52 | $allNotFoundSelectors = implode('", "', $snotFoundSelectors); |
53 | 53 | |
54 | - throw new ValidationFailedException('CSS Selector "' . $allNotFoundSelectors . '" not found in DOM.'); |
|
54 | + throw new ValidationFailedException('CSS Selector "'.$allNotFoundSelectors.'" not found in DOM.'); |
|
55 | 55 | } |
56 | 56 | } |
57 | 57 | } |
@@ -96,7 +96,7 @@ |
||
96 | 96 | } catch (ValidationFailedException $e) { |
97 | 97 | $result = new CheckResult(CheckResult::STATUS_FAILURE, $e->getMessage()); |
98 | 98 | } catch (\Exception $e) { |
99 | - $result = new CheckResult(CheckResult::STATUS_FAILURE, 'An error occured: ' . $e->getMessage()); |
|
99 | + $result = new CheckResult(CheckResult::STATUS_FAILURE, 'An error occured: '.$e->getMessage()); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | $result->setResponse($response); |