@@ -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); |
@@ -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 | } |
@@ -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); |
@@ -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) |
@@ -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 | } |
@@ -41,12 +41,12 @@ discard block |
||
| 41 | 41 | public function init($filters = array(), $filterFile = '', $exclusive = array()) |
| 42 | 42 | { |
| 43 | 43 | if (count($exclusive) > 0 && (count($filters) > 0 || $filterFile !== '')) { |
| 44 | - throw new \RuntimeException("It's not possible to define filter lists and an exclusive list at the same time [Extension: " . get_class($this) . '].'); |
|
| 44 | + throw new \RuntimeException("It's not possible to define filter lists and an exclusive list at the same time [Extension: ".get_class($this).'].'); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | if ($filterFile !== '') { |
| 48 | 48 | if (!file_exists($filterFile)) { |
| 49 | - throw new \RuntimeException('Filter file not found: ' . $filterFile); |
|
| 49 | + throw new \RuntimeException('Filter file not found: '.$filterFile); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | $filterElements = EnvAwareYaml::parse(file_get_contents($filterFile)); |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | */ |
| 86 | 86 | public function isFiltered(Event $event, $ruleName, UriAwareResponse $response) |
| 87 | 87 | { |
| 88 | - $uri = (string)$this->retriever->getOriginUri($response->getUri()); |
|
| 88 | + $uri = (string) $this->retriever->getOriginUri($response->getUri()); |
|
| 89 | 89 | |
| 90 | 90 | if ($this->currentModus === self::MODUS_FILTER) { |
| 91 | 91 | $isFiltered = $this->isFilteredByFilter($ruleName, $uri); |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | private function isFilteredByFilter($ruleName, $uri) |
| 105 | 105 | { |
| 106 | 106 | foreach ($this->filters as $filter) { |
| 107 | - if ($ruleName === $filter['rule'] && 0 < preg_match('$' . $filter['uri'] . '$', $uri)) { |
|
| 107 | + if ($ruleName === $filter['rule'] && 0 < preg_match('$'.$filter['uri'].'$', $uri)) { |
|
| 108 | 108 | return true; |
| 109 | 109 | } |
| 110 | 110 | } |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | $failures = 0; |
| 60 | 60 | |
| 61 | 61 | if ($this->retriever instanceof CrawlingRetriever) { |
| 62 | - $startPage = (string)$this->retriever->getStartPage(); |
|
| 62 | + $startPage = (string) $this->retriever->getStartPage(); |
|
| 63 | 63 | } else { |
| 64 | 64 | $startPage = ''; |
| 65 | 65 | } |
@@ -80,8 +80,8 @@ discard block |
||
| 80 | 80 | $testCase->addFailure(new Failure($ruleName, $message)); |
| 81 | 81 | |
| 82 | 82 | if ($this->retriever instanceof CrawlingRetriever) { |
| 83 | - $stackTrace = $result->getUrl() . ' coming from ' . (string)$this->retriever->getComingFrom($result->getUrl()) . PHP_EOL; |
|
| 84 | - $stackTrace .= ' - ' . $message . " [rule: $ruleName]"; |
|
| 83 | + $stackTrace = $result->getUrl().' coming from '.(string) $this->retriever->getComingFrom($result->getUrl()).PHP_EOL; |
|
| 84 | + $stackTrace .= ' - '.$message." [rule: $ruleName]"; |
|
| 85 | 85 | $testCase->setSystemOut($stackTrace); |
| 86 | 86 | } |
| 87 | 87 | } |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | |
| 93 | 93 | file_put_contents($this->filename, $xUnitReport->toXml()); |
| 94 | 94 | |
| 95 | - $this->output->writeln(' <info>Writing XUnit Output to file:</info> ' . $this->filename); |
|
| 95 | + $this->output->writeln(' <info>Writing XUnit Output to file:</info> '.$this->filename); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | public function processResults($results) |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | if ($response instanceof ContentTypeAwareResponse) { |
| 25 | 25 | if (strpos($response->getContentType(), 'image') === false |
| 26 | 26 | && strpos($response->getContentType(), 'pdf') === false |
| 27 | - && strlen((string)$response->getBody()) >= $this->minFileSize |
|
| 27 | + && strlen((string) $response->getBody()) >= $this->minFileSize |
|
| 28 | 28 | ) { |
| 29 | 29 | if (!$response->hasHeader('Content-Encoding') || $response->getHeader('Content-Encoding')[0] !== 'gzip') { |
| 30 | 30 | throw new ValidationFailedException('gzip compression not active'); |