@@ -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); |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | |
92 | 92 | if ($url['url'] instanceof UriInterface) { |
93 | 93 | $urlObject = $url['url']; |
94 | - }else { |
|
94 | + } else { |
|
95 | 95 | $urlObject = new Uri($url['url']); |
96 | 96 | } |
97 | 97 | |
@@ -112,20 +112,20 @@ discard block |
||
112 | 112 | /* @var \Ivory\HttpAdapter\HttpAdapterException $exception */ |
113 | 113 | |
114 | 114 | $mainUri = $request->getUri(); |
115 | - $this->redirects[(string)$mainUri->getScheme() . '://' . $mainUri->getHost() . $corruptUrl] = (string)$mainUri; |
|
115 | + $this->redirects[(string) $mainUri->getScheme().'://'.$mainUri->getHost().$corruptUrl] = (string) $mainUri; |
|
116 | 116 | |
117 | - $this->urls[] = ['url' => $mainUri->getScheme() . '://' . $mainUri->getHost() . $corruptUrl, 'system' => $url['system']]; |
|
118 | - $this->urlStack[] = ['url' => $mainUri->getScheme() . '://' . $mainUri->getHost() . $corruptUrl, 'system' => $url['system']]; |
|
117 | + $this->urls[] = ['url' => $mainUri->getScheme().'://'.$mainUri->getHost().$corruptUrl, 'system' => $url['system']]; |
|
118 | + $this->urlStack[] = ['url' => $mainUri->getScheme().'://'.$mainUri->getHost().$corruptUrl, 'system' => $url['system']]; |
|
119 | 119 | |
120 | 120 | return $this->next(); |
121 | 121 | } |
122 | 122 | |
123 | 123 | // the error handling should be done withing the calling class |
124 | - echo "\n " . $exception->getMessage() . "\n"; |
|
124 | + echo "\n ".$exception->getMessage()."\n"; |
|
125 | 125 | |
126 | 126 | return $this->next(); |
127 | 127 | } else { |
128 | - $errorMessages .= $exception->getMessage() . "\n"; |
|
128 | + $errorMessages .= $exception->getMessage()."\n"; |
|
129 | 129 | } |
130 | 130 | } |
131 | 131 | if ($errorMessages !== '') { |
@@ -138,8 +138,8 @@ discard block |
||
138 | 138 | |
139 | 139 | public function getOriginUri(UriInterface $uri) |
140 | 140 | { |
141 | - if (array_key_exists((string)$uri, $this->redirects)) { |
|
142 | - return $this->urls[$this->redirects[(string)$uri]]['url']; |
|
141 | + if (array_key_exists((string) $uri, $this->redirects)) { |
|
142 | + return $this->urls[$this->redirects[(string) $uri]]['url']; |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | return $uri; |
@@ -152,11 +152,11 @@ discard block |
||
152 | 152 | |
153 | 153 | public function getSystem(UriInterface $uri) |
154 | 154 | { |
155 | - if (array_key_exists((string)$uri, $this->redirects)) { |
|
156 | - return $this->urls[$this->redirects[(string)$uri]]['system']; |
|
155 | + if (array_key_exists((string) $uri, $this->redirects)) { |
|
156 | + return $this->urls[$this->redirects[(string) $uri]]['system']; |
|
157 | 157 | } |
158 | 158 | |
159 | - return $this->urls[(string)$uri]['system']; |
|
159 | + return $this->urls[(string) $uri]['system']; |
|
160 | 160 | } |
161 | 161 | |
162 | 162 | public function getSystems() |
@@ -27,13 +27,13 @@ |
||
27 | 27 | |
28 | 28 | foreach ($urls as $url) { |
29 | 29 | |
30 | - $idnUrl = $url->getScheme() . '://' . idn_to_ascii($url->getHost()) . $url->getPath(); |
|
30 | + $idnUrl = $url->getScheme().'://'.idn_to_ascii($url->getHost()).$url->getPath(); |
|
31 | 31 | |
32 | 32 | if (!filter_var($idnUrl, FILTER_VALIDATE_URL)) { |
33 | - $invalidUrls[] = (string)$url; |
|
33 | + $invalidUrls[] = (string) $url; |
|
34 | 34 | } |
35 | 35 | } |
36 | 36 | |
37 | - $this->assert(count($invalidUrls) === 0, 'Invalid urls found (' . implode(', ', $invalidUrls) . ').'); |
|
37 | + $this->assert(count($invalidUrls) === 0, 'Invalid urls found ('.implode(', ', $invalidUrls).').'); |
|
38 | 38 | } |
39 | 39 | } |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | private function getEndpoint(Uri $uri) |
16 | 16 | { |
17 | 17 | // return str_replace('#url#', urlencode('https://webhook.koalamon.com'), self::ENDPOINT); |
18 | - return str_replace('#url#', urlencode((string)$uri), self::ENDPOINT); |
|
18 | + return str_replace('#url#', urlencode((string) $uri), self::ENDPOINT); |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | public function validate(Response $response) |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | ))); |
35 | 35 | |
36 | 36 | if (property_exists($result, 'error')) { |
37 | - $checkResult = new CheckResult(CheckResult::STATUS_FAILURE, 'Google mobile friendly test was not passed. Error "' . $result->error->message . '"'); |
|
37 | + $checkResult = new CheckResult(CheckResult::STATUS_FAILURE, 'Google mobile friendly test was not passed. Error "'.$result->error->message.'"'); |
|
38 | 38 | $checkResult->addAttribute(new Attribute('Google response', json_encode($result), true)); |
39 | 39 | return $checkResult; |
40 | 40 | } |
@@ -42,9 +42,9 @@ discard block |
||
42 | 42 | $passResult = $result->ruleGroups->USABILITY; |
43 | 43 | |
44 | 44 | if (!$passResult->pass) { |
45 | - return new CheckResult(CheckResult::STATUS_FAILURE, 'Google mobile friendly test was not passed. Score ' . $passResult->score . '/100.', (int)$passResult->score); |
|
45 | + return new CheckResult(CheckResult::STATUS_FAILURE, 'Google mobile friendly test was not passed. Score '.$passResult->score.'/100.', (int) $passResult->score); |
|
46 | 46 | } |
47 | 47 | |
48 | - return new CheckResult(CheckResult::STATUS_SUCCESS, 'Google mobile friendly test passed. Score ' . $passResult->score . '/100.', (int)$passResult->score); |
|
48 | + return new CheckResult(CheckResult::STATUS_SUCCESS, 'Google mobile friendly test passed. Score '.$passResult->score.'/100.', (int) $passResult->score); |
|
49 | 49 | } |
50 | 50 | } |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | foreach ($this->results as $results) { |
119 | 119 | foreach ($results as $result) { |
120 | 120 | /* @var CheckResult $result */ |
121 | - $tool = 'Smoke' . $result->getRuleName(); |
|
121 | + $tool = 'Smoke'.$result->getRuleName(); |
|
122 | 122 | $checks[$tool][] = $result; |
123 | 123 | } |
124 | 124 | } |
@@ -130,19 +130,19 @@ discard block |
||
130 | 130 | continue; |
131 | 131 | } |
132 | 132 | |
133 | - $message = 'The smoke test for #system_name# failed (Rule: ' . $toolName . ').<ul>'; |
|
133 | + $message = 'The smoke test for #system_name# failed (Rule: '.$toolName.').<ul>'; |
|
134 | 134 | $status = Event::STATUS_SUCCESS; |
135 | 135 | $failureCount = 0; |
136 | - $identifier = $toolName . '_' . $this->system; |
|
136 | + $identifier = $toolName.'_'.$this->system; |
|
137 | 137 | |
138 | 138 | foreach ($results as $result) { |
139 | 139 | /** @var CheckResult $result */ |
140 | 140 | if ($result->getStatus() === CheckResult::STATUS_FAILURE) { |
141 | 141 | $comingFrom = ''; |
142 | 142 | if ($this->addComingFrom && $this->retriever->getComingFrom($result->getResponse()->getUri())) { |
143 | - $comingFrom = ', coming from: ' . $this->retriever->getComingFrom($result->getResponse()->getUri()); |
|
143 | + $comingFrom = ', coming from: '.$this->retriever->getComingFrom($result->getResponse()->getUri()); |
|
144 | 144 | } |
145 | - $message .= '<li>' . $result->getMessage() . ' (url: ' . (string)$result->getResponse()->getUri() . $comingFrom . ')</li>'; |
|
145 | + $message .= '<li>'.$result->getMessage().' (url: '.(string) $result->getResponse()->getUri().$comingFrom.')</li>'; |
|
146 | 146 | ++$failureCount; |
147 | 147 | } |
148 | 148 | } |
@@ -150,9 +150,9 @@ discard block |
||
150 | 150 | $status = Event::STATUS_FAILURE; |
151 | 151 | $message .= '</ul>'; |
152 | 152 | $firstResult = array_pop($results); |
153 | - $attributes[] = new Attribute('html-content', (string)$firstResult->getResponse()->getBody(), true); |
|
153 | + $attributes[] = new Attribute('html-content', (string) $firstResult->getResponse()->getBody(), true); |
|
154 | 154 | } else { |
155 | - $message = 'All checks for system "#system_name#" succeeded [SmokeBasic:' . $toolName . '].'; |
|
155 | + $message = 'All checks for system "#system_name#" succeeded [SmokeBasic:'.$toolName.'].'; |
|
156 | 156 | } |
157 | 157 | |
158 | 158 | $this->send($identifier, $this->system, $message, $status, $failureCount, $this->tool, $this->system, $attributes); |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | foreach ($results as $result) { |
166 | 166 | /* @var CheckResult $result */ |
167 | 167 | |
168 | - $identifier = '_' . $this->getIdentifier($result); |
|
168 | + $identifier = '_'.$this->getIdentifier($result); |
|
169 | 169 | $tool = $this->getPrefix($result->getRuleName()); |
170 | 170 | |
171 | 171 | $component = $this->getComponent($result->getRuleName()); |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | |
174 | 174 | $attributes = array(); |
175 | 175 | if ($result->getStatus() == CheckResult::STATUS_FAILURE) { |
176 | - $attributes[] = new Attribute('html content', (string)$result->getResponse()->getBody(), true); |
|
176 | + $attributes[] = new Attribute('html content', (string) $result->getResponse()->getBody(), true); |
|
177 | 177 | $attributes[] = new Attribute('http status code', $result->getResponse()->getStatusCode()); |
178 | 178 | } |
179 | 179 | |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | $this->send( |
192 | 192 | $identifier, |
193 | 193 | $currentSystem, |
194 | - $result->getMessage() . ' (url: ' . (string)$result->getResponse()->getUri() . ')', |
|
194 | + $result->getMessage().' (url: '.(string) $result->getResponse()->getUri().')', |
|
195 | 195 | $result->getStatus(), |
196 | 196 | $result->getValue(), |
197 | 197 | $tool, |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | |
205 | 205 | private function getIdentifier(CheckResult $result) |
206 | 206 | { |
207 | - return $this->tool . '_' . $result->getRuleName(); |
|
207 | + return $this->tool.'_'.$result->getRuleName(); |
|
208 | 208 | } |
209 | 209 | |
210 | 210 | private function getPrefix($string) |
@@ -58,10 +58,10 @@ discard block |
||
58 | 58 | */ |
59 | 59 | protected function writeSmokeCredentials($url = null) |
60 | 60 | { |
61 | - $this->output->writeln("\n Smoke " . SMOKE_VERSION . " by Nils Langner\n"); |
|
61 | + $this->output->writeln("\n Smoke ".SMOKE_VERSION." by Nils Langner\n"); |
|
62 | 62 | |
63 | 63 | if ($url) { |
64 | - $this->output->writeln(' <info>Scanning ' . $url . "</info>\n"); |
|
64 | + $this->output->writeln(' <info>Scanning '.$url."</info>\n"); |
|
65 | 65 | } |
66 | 66 | } |
67 | 67 | |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | $httpClient->disableCache(); |
128 | 128 | } |
129 | 129 | |
130 | - $fileContent = (string)$httpClient->get($configFile)->getBody(); |
|
130 | + $fileContent = (string) $httpClient->get($configFile)->getBody(); |
|
131 | 131 | |
132 | 132 | if ($httpClient instanceof CacheAware) { |
133 | 133 | $httpClient->enableCache(); |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | if (file_exists($configFile)) { |
137 | 137 | $fileContent = file_get_contents($configFile); |
138 | 138 | } else { |
139 | - throw new \RuntimeException("Config file was not found ('" . $configFile . "')."); |
|
139 | + throw new \RuntimeException("Config file was not found ('".$configFile."')."); |
|
140 | 140 | } |
141 | 141 | } |
142 | 142 | $configArray = EnvAwareYaml::parse($fileContent); |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | */ |
42 | 42 | private function serializeResponse(Response $response) |
43 | 43 | { |
44 | - $array = ['object' => serialize($response), 'body' => (string)$response->getBody()]; |
|
44 | + $array = ['object' => serialize($response), 'body' => (string) $response->getBody()]; |
|
45 | 45 | return serialize($array); |
46 | 46 | } |
47 | 47 | |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | |
65 | 65 | private function getHash($uri, $headers, $method = "") |
66 | 66 | { |
67 | - return md5(json_encode((string)$uri) . json_encode($headers) . strtolower($method)); |
|
67 | + return md5(json_encode((string) $uri).json_encode($headers).strtolower($method)); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | private function cacheResponse($key, Response $response) |
@@ -24,13 +24,13 @@ |
||
24 | 24 | |
25 | 25 | foreach ($this->checkedHeaders as $headerConfig) { |
26 | 26 | if (!$response->hasHeader($headerConfig['key'])) { |
27 | - throw new ValidationFailedException('Header not found (' . $headerConfig['key'] . ')'); |
|
27 | + throw new ValidationFailedException('Header not found ('.$headerConfig['key'].')'); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | $currentValue = $response->getHeader($headerConfig['key'])[0]; |
31 | 31 | |
32 | - if (!preg_match('%' . $headerConfig['value'] . '%', $currentValue, $matches)) { |
|
33 | - throw new ValidationFailedException('Header "' . $headerConfig['key'] . '" does not match "' . $headerConfig['value'] . '". Current value is "' . $currentValue . '"'); |
|
32 | + if (!preg_match('%'.$headerConfig['value'].'%', $currentValue, $matches)) { |
|
33 | + throw new ValidationFailedException('Header "'.$headerConfig['key'].'" does not match "'.$headerConfig['value'].'". Current value is "'.$currentValue.'"'); |
|
34 | 34 | } |
35 | 35 | } |
36 | 36 | } |
@@ -26,19 +26,19 @@ |
||
26 | 26 | $validTo = date('d.m.Y H:i:s', $certInfo['validTo_time_t']); |
27 | 27 | |
28 | 28 | if ($certInfo['validFrom_time_t'] > time() || $certInfo['validTo_time_t'] < time()) { |
29 | - $errorMessage = 'Certificate is expired. [' . $validFrom . ' - ' . $validTo . ']'; |
|
29 | + $errorMessage = 'Certificate is expired. ['.$validFrom.' - '.$validTo.']'; |
|
30 | 30 | |
31 | 31 | $result = new CheckResult(CheckResult::STATUS_FAILURE, $errorMessage); |
32 | 32 | $result->addAttribute(new Attribute('certificate information', json_encode($certInfo), true)); |
33 | 33 | return $result; |
34 | - } elseif ($certInfo['validTo_time_t'] < strtotime('+' . $this->expireWarningTime . 'days')) { |
|
35 | - $errorMessage = 'Certificate warning, expires in less than ' . $this->expireWarningTime . ' days. Certificate expires at: ' . $validTo; |
|
34 | + } elseif ($certInfo['validTo_time_t'] < strtotime('+'.$this->expireWarningTime.'days')) { |
|
35 | + $errorMessage = 'Certificate warning, expires in less than '.$this->expireWarningTime.' days. Certificate expires at: '.$validTo; |
|
36 | 36 | |
37 | 37 | $result = new CheckResult(CheckResult::STATUS_FAILURE, $errorMessage); |
38 | 38 | $result->addAttribute(new Attribute('certificate information', json_encode($certInfo), true)); |
39 | 39 | return $result; |
40 | 40 | } |
41 | 41 | |
42 | - return new CheckResult(CheckResult::STATUS_SUCCESS, 'The certificate does not expire within the next ' . $this->expireWarningTime . ' days. Expire date: ' . $validTo . '.'); |
|
42 | + return new CheckResult(CheckResult::STATUS_SUCCESS, 'The certificate does not expire within the next '.$this->expireWarningTime.' days. Expire date: '.$validTo.'.'); |
|
43 | 43 | } |
44 | 44 | } |