@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Symfony\Component\Console\Output\OutputInterface; |
| 6 | 6 | use whm\Smoke\Config\Configuration; |
| 7 | -use whm\Smoke\Extensions\SmokeResponseRetriever\Retriever\Retriever; |
|
| 8 | 7 | use whm\Smoke\Rules\CheckResult; |
| 9 | 8 | |
| 10 | 9 | |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | $this->resultFile = $resultFile; |
| 29 | 29 | |
| 30 | 30 | if ($templateDir === null) { |
| 31 | - $this->templateDir = __DIR__ . '/templates'; |
|
| 31 | + $this->templateDir = __DIR__.'/templates'; |
|
| 32 | 32 | } else { |
| 33 | 33 | $this->templateDir = $templateDir; |
| 34 | 34 | } |
@@ -66,9 +66,9 @@ discard block |
||
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | if (!file_put_contents($this->resultFile, $html)) { |
| 69 | - $this->output->writeln("<error>HTML Reporter extension: Could not write result file to " . $this->resultFile ."</error>"); |
|
| 69 | + $this->output->writeln("<error>HTML Reporter extension: Could not write result file to ".$this->resultFile."</error>"); |
|
| 70 | 70 | } else { |
| 71 | - $this->output->writeln("<info>HTML Reporter extension:</info> Result file written to " . $this->resultFile); |
|
| 71 | + $this->output->writeln("<info>HTML Reporter extension:</info> Result file written to ".$this->resultFile); |
|
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | const STATUS_SUCCESS = 'success'; |
| 53 | 53 | const STATUS_FAILURE = 'failure'; |
| 54 | 54 | |
| 55 | - public function init($apiKey, Configuration $_configuration, OutputInterface $_output, $server = 'https://webhook.koalamon.com', $system = '', $identifier = '', $tool = '', $url ='') |
|
| 55 | + public function init($apiKey, Configuration $_configuration, OutputInterface $_output, $server = 'https://webhook.koalamon.com', $system = '', $identifier = '', $tool = '', $url = '') |
|
| 56 | 56 | { |
| 57 | 57 | $httpClient = new \GuzzleHttp\Client(); |
| 58 | 58 | |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | public function processResults($results) |
| 83 | 83 | { |
| 84 | 84 | foreach ($results as $result) { |
| 85 | - if($result->getStatus() == CheckResult::STATUS_SUCCESS) { |
|
| 85 | + if ($result->getStatus() == CheckResult::STATUS_SUCCESS) { |
|
| 86 | 86 | $this->success++; |
| 87 | 87 | } else { |
| 88 | 88 | $this->failed++; |
@@ -93,8 +93,8 @@ discard block |
||
| 93 | 93 | public function finish() |
| 94 | 94 | { |
| 95 | 95 | $message = 'Checks: '; |
| 96 | - $message .= $this->success . ' succeeded, '; |
|
| 97 | - $message .= $this->failed . ' failed. '; |
|
| 96 | + $message .= $this->success.' succeeded, '; |
|
| 97 | + $message .= $this->failed.' failed. '; |
|
| 98 | 98 | |
| 99 | 99 | if ($this->failed > 0) { |
| 100 | 100 | $status = Event::STATUS_FAILURE; |
@@ -129,8 +129,8 @@ discard block |
||
| 129 | 129 | $this->reporter->sendEvent($event); |
| 130 | 130 | } catch (KoalamonException $e) { |
| 131 | 131 | $this->output->writeln("\n <error> Error sending result to leankoala. </error>"); |
| 132 | - $this->output->writeln(' Url: ' . $e->getUrl()); |
|
| 133 | - $this->output->writeln(' Payload: ' . $e->getPayload()); |
|
| 132 | + $this->output->writeln(' Url: '.$e->getUrl()); |
|
| 133 | + $this->output->writeln(' Payload: '.$e->getPayload()); |
|
| 134 | 134 | $this->output->writeln(""); |
| 135 | 135 | } catch (\Exception $e) { |
| 136 | 136 | $this->output->writeln($e->getMessage()); |
@@ -97,7 +97,7 @@ |
||
| 97 | 97 | } catch (ValidationFailedException $e) { |
| 98 | 98 | $result = new CheckResult(CheckResult::STATUS_FAILURE, $e->getMessage()); |
| 99 | 99 | } catch (\Exception $e) { |
| 100 | - $result = new CheckResult(CheckResult::STATUS_FAILURE, 'An error occured: ' . $e->getMessage()); |
|
| 100 | + $result = new CheckResult(CheckResult::STATUS_FAILURE, 'An error occured: '.$e->getMessage()); |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | $this->eventDispatcher->simpleNotify('Scanner.CheckResponse.Rule', array('checkResult' => $result, 'ruleName' => $name)); |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use phm\HttpWebdriverClient\Http\Client\Guzzle\GuzzleClient as phmGuzzleClient; |
| 6 | 6 | use phm\HttpWebdriverClient\Http\Client\Decorator\FileCacheDecorator; |
| 7 | -use phm\HttpWebdriverClient\Http\Client\Decorator\LoggerDecorator; |
|
| 8 | 7 | use phm\HttpWebdriverClient\Http\Client\HttpClient; |
| 9 | 8 | use Psr\Http\Message\RequestInterface; |
| 10 | 9 | |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | private function initConfigArray(array $configArray, array $defaultSettings = null) |
| 68 | 68 | { |
| 69 | 69 | if ($defaultSettings === null) { |
| 70 | - $defaultSettings = Yaml::parse(file_get_contents(__DIR__ . '/../settings/' . self::DEFAULT_SETTINGS)); |
|
| 70 | + $defaultSettings = Yaml::parse(file_get_contents(__DIR__.'/../settings/'.self::DEFAULT_SETTINGS)); |
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | if (count($configArray) === 0) { |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | if ($this->hasSection($section)) { |
| 170 | 170 | return $this->configArray[$section]; |
| 171 | 171 | } else { |
| 172 | - throw new \RuntimeException('The section (' . $section . ') you are trying to access does not exist.'); |
|
| 172 | + throw new \RuntimeException('The section ('.$section.') you are trying to access does not exist.'); |
|
| 173 | 173 | } |
| 174 | 174 | } |
| 175 | 175 | |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | if (array_key_exists($name, $this->extensions)) { |
| 179 | 179 | return $this->extensions[$name]; |
| 180 | 180 | } else { |
| 181 | - throw new \RuntimeException('The extension ("' . $name . '") you are trying to access does not exist. Registered extensions are: ' . implode(' ,', array_keys($this->extensions)) . '.'); |
|
| 181 | + throw new \RuntimeException('The extension ("'.$name.'") you are trying to access does not exist. Registered extensions are: '.implode(' ,', array_keys($this->extensions)).'.'); |
|
| 182 | 182 | } |
| 183 | 183 | } |
| 184 | 184 | |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | try { |
| 204 | 204 | $client = Init::initialize($this->configArray['client']); |
| 205 | 205 | } catch (\Exception $e) { |
| 206 | - throw new ConfigurationException('Error initializing client (' . $e->getMessage() . ')'); |
|
| 206 | + throw new ConfigurationException('Error initializing client ('.$e->getMessage().')'); |
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | return $client; |
@@ -36,12 +36,12 @@ |
||
| 36 | 36 | if ($cookieCount > $this->maxCookies) { |
| 37 | 37 | $result = new CheckResult( |
| 38 | 38 | CheckResult::STATUS_FAILURE, |
| 39 | - $cookieCount . ' cookies were stored (limit was ' . $this->maxCookies . ').', |
|
| 39 | + $cookieCount.' cookies were stored (limit was '.$this->maxCookies.').', |
|
| 40 | 40 | $cookieCount); |
| 41 | 41 | } else { |
| 42 | 42 | $result = new CheckResult( |
| 43 | 43 | CheckResult::STATUS_SUCCESS, |
| 44 | - $cookieCount . ' cookies were stored (limit was ' . $this->maxCookies . ').', |
|
| 44 | + $cookieCount.' cookies were stored (limit was '.$this->maxCookies.').', |
|
| 45 | 45 | $cookieCount); |
| 46 | 46 | } |
| 47 | 47 | |
@@ -18,7 +18,6 @@ |
||
| 18 | 18 | private $maxCookies; |
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | - * @param int $maxDuration The maximum duration a http call is allowed to take (time to first byte) |
|
| 22 | 21 | */ |
| 23 | 22 | public function init($maxElements = 20) |
| 24 | 23 | { |
@@ -18,18 +18,18 @@ |
||
| 18 | 18 | */ |
| 19 | 19 | protected function doValidation(ResponseInterface $response) |
| 20 | 20 | { |
| 21 | - $document = new Document((string)$response->getBody(), false); |
|
| 21 | + $document = new Document((string) $response->getBody(), false); |
|
| 22 | 22 | $urls = $document->getDependencies($response->getUri()); |
| 23 | 23 | $invalidUrls = array(); |
| 24 | 24 | |
| 25 | 25 | foreach ($urls as $url) { |
| 26 | - $idnUrl = $url->getScheme() . '://' . idn_to_ascii($url->getHost()) . $url->getPath(); |
|
| 26 | + $idnUrl = $url->getScheme().'://'.idn_to_ascii($url->getHost()).$url->getPath(); |
|
| 27 | 27 | |
| 28 | 28 | if (!filter_var($idnUrl, FILTER_VALIDATE_URL)) { |
| 29 | - $invalidUrls[] = (string)$url; |
|
| 29 | + $invalidUrls[] = (string) $url; |
|
| 30 | 30 | } |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - $this->assert(count($invalidUrls) === 0, 'Invalid urls found (' . implode(', ', $invalidUrls) . ').'); |
|
| 33 | + $this->assert(count($invalidUrls) === 0, 'Invalid urls found ('.implode(', ', $invalidUrls).').'); |
|
| 34 | 34 | } |
| 35 | 35 | } |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | |
| 24 | 24 | public function doValidation(ResponseInterface $response) |
| 25 | 25 | { |
| 26 | - $content = (string)$response->getBody(); |
|
| 26 | + $content = (string) $response->getBody(); |
|
| 27 | 27 | |
| 28 | 28 | $domDocument = new \DOMDocument(); |
| 29 | 29 | @$domDocument->loadHTML($content); |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | try { |
| 41 | 41 | $selectorAsXPath = $converter->toXPath($selector['pattern']); |
| 42 | 42 | } catch (\Exception $e) { |
| 43 | - throw new ValidationFailedException('Invalid css selector (' . $selector['pattern'] . ').'); |
|
| 43 | + throw new ValidationFailedException('Invalid css selector ('.$selector['pattern'].').'); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | $count = $domXPath->query($selectorAsXPath)->length; |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | if ($error === true) { |
| 55 | 55 | $allNotFoundSelectors = implode('", "', $snotFoundSelectors); |
| 56 | 56 | |
| 57 | - throw new ValidationFailedException('CSS Selector "' . $allNotFoundSelectors . '" not found in DOM.'); |
|
| 57 | + throw new ValidationFailedException('CSS Selector "'.$allNotFoundSelectors.'" not found in DOM.'); |
|
| 58 | 58 | } |
| 59 | 59 | } |
| 60 | 60 | } |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | && strpos($response->getContentType(), 'pdf') === false |
| 27 | 27 | && strpos($response->getContentType(), 'postscript') === false |
| 28 | 28 | && strpos($response->getContentType(), 'zip') === false |
| 29 | - && strlen((string)$response->getBody()) >= $this->minFileSize |
|
| 29 | + && strlen((string) $response->getBody()) >= $this->minFileSize |
|
| 30 | 30 | ) { |
| 31 | 31 | if (!$response->hasHeader('Content-Encoding') || $response->getHeader('Content-Encoding')[0] !== 'gzip') { |
| 32 | 32 | throw new ValidationFailedException('gzip compression not active'); |