@@ -4,8 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Ivory\HttpAdapter\HttpAdapterInterface; |
6 | 6 | use Psr\Http\Message\ResponseInterface; |
7 | -use whm\Smoke\Http\ClientAware; |
|
8 | -use whm\Smoke\Http\Response; |
|
9 | 7 | use whm\Smoke\Rules\Rule; |
10 | 8 | use whm\Smoke\Rules\ValidationFailedException; |
11 | 9 |
@@ -21,12 +21,12 @@ discard block |
||
21 | 21 | |
22 | 22 | public function validate(ResponseInterface $response) |
23 | 23 | { |
24 | - $url = $response->getUri()->getScheme() . '://' . $response->getUri()->getHost(); |
|
24 | + $url = $response->getUri()->getScheme().'://'.$response->getUri()->getHost(); |
|
25 | 25 | |
26 | 26 | if (substr_count($url, '/') === 2) { |
27 | - $filename = $robotsUrl = $url . '/robots.txt'; |
|
27 | + $filename = $robotsUrl = $url.'/robots.txt'; |
|
28 | 28 | } elseif (substr_count($url, '/') === 3) { |
29 | - $filename = $robotsUrl = $url . 'robots.txt'; |
|
29 | + $filename = $robotsUrl = $url.'robots.txt'; |
|
30 | 30 | } else { |
31 | 31 | return; |
32 | 32 | } |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | |
40 | 40 | $normalizedContent = $this->normalizeContent($content); |
41 | 41 | |
42 | - if (strpos($normalizedContent, 'user-agent:* disallow:/' . PHP_EOL) !== false) { |
|
42 | + if (strpos($normalizedContent, 'user-agent:* disallow:/'.PHP_EOL) !== false) { |
|
43 | 43 | throw new ValidationFailedException('The robots.txt contains disallow all (Disallow: /)'); |
44 | 44 | } |
45 | 45 |
@@ -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) |
@@ -22,7 +22,7 @@ |
||
22 | 22 | public function validate(ResponseInterface $response) |
23 | 23 | { |
24 | 24 | if ($response->getStatusCode() > $this->maxStatusCode) { |
25 | - throw new ValidationFailedException('Status code ' . $response->getStatusCode() . ' found.'); |
|
25 | + throw new ValidationFailedException('Status code '.$response->getStatusCode().' found.'); |
|
26 | 26 | } |
27 | 27 | } |
28 | 28 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | public function validate(ResponseInterface $response) |
27 | 27 | { |
28 | 28 | if ($response->getStatusCode() !== $this->expectedStatus) { |
29 | - throw new ValidationFailedException('Status code ' . $response->getStatusCode() . ' found, ' . $this->expectedStatus . ' expected.'); |
|
29 | + throw new ValidationFailedException('Status code '.$response->getStatusCode().' found, '.$this->expectedStatus.' expected.'); |
|
30 | 30 | } |
31 | 31 | } |
32 | 32 | } |
@@ -29,14 +29,14 @@ |
||
29 | 29 | if ($response->getDuration() > $this->maxDuration) { |
30 | 30 | return new CheckResult( |
31 | 31 | CheckResult::STATUS_FAILURE, |
32 | - 'The http request took ' . (int)$response->getDuration() . ' milliseconds (limit was ' . $this->maxDuration . 'ms).', |
|
33 | - (int)$response->getDuration()); |
|
32 | + 'The http request took '.(int) $response->getDuration().' milliseconds (limit was '.$this->maxDuration.'ms).', |
|
33 | + (int) $response->getDuration()); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | return new CheckResult( |
37 | 37 | CheckResult::STATUS_SUCCESS, |
38 | - 'The http request took ' . (int)$response->getDuration() . ' milliseconds.', |
|
39 | - (int)$response->getDuration()); |
|
38 | + 'The http request took '.(int) $response->getDuration().' milliseconds.', |
|
39 | + (int) $response->getDuration()); |
|
40 | 40 | } |
41 | 41 | } |
42 | 42 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | |
27 | 27 | protected function doValidation(ResponseInterface $response) |
28 | 28 | { |
29 | - $document = new Document((string)$response->getBody()); |
|
29 | + $document = new Document((string) $response->getBody()); |
|
30 | 30 | $files = $this->getFilesToCount($document, $response); |
31 | 31 | |
32 | 32 | $this->assert(count($files) <= $this->maxCount, sprintf($this->errorMessage, count($files))); |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | |
15 | 15 | private function getEndpoint(Uri $uri) |
16 | 16 | { |
17 | - return str_replace('#url#', urlencode((string)$uri), self::ENDPOINT); |
|
17 | + return str_replace('#url#', urlencode((string) $uri), self::ENDPOINT); |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | public function validate(ResponseInterface $response) |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | ))); |
34 | 34 | |
35 | 35 | if (property_exists($result, 'error')) { |
36 | - $checkResult = new CheckResult(CheckResult::STATUS_FAILURE, 'Google mobile friendly test was not passed. Error "' . $result->error->message . '"'); |
|
36 | + $checkResult = new CheckResult(CheckResult::STATUS_FAILURE, 'Google mobile friendly test was not passed. Error "'.$result->error->message.'"'); |
|
37 | 37 | $checkResult->addAttribute(new Attribute('Google response', json_encode($result), true)); |
38 | 38 | return $checkResult; |
39 | 39 | } |
@@ -41,9 +41,9 @@ discard block |
||
41 | 41 | $passResult = $result->ruleGroups->USABILITY; |
42 | 42 | |
43 | 43 | if (!$passResult->pass) { |
44 | - return new CheckResult(CheckResult::STATUS_FAILURE, 'Google mobile friendly test was not passed. Score ' . $passResult->score . '/100.', (int)$passResult->score); |
|
44 | + return new CheckResult(CheckResult::STATUS_FAILURE, 'Google mobile friendly test was not passed. Score '.$passResult->score.'/100.', (int) $passResult->score); |
|
45 | 45 | } |
46 | 46 | |
47 | - return new CheckResult(CheckResult::STATUS_SUCCESS, 'Google mobile friendly test passed. Score ' . $passResult->score . '/100.', (int)$passResult->score); |
|
47 | + return new CheckResult(CheckResult::STATUS_SUCCESS, 'Google mobile friendly test passed. Score '.$passResult->score.'/100.', (int) $passResult->score); |
|
48 | 48 | } |
49 | 49 | } |
@@ -27,6 +27,9 @@ discard block |
||
27 | 27 | $this->strictMode = $strictMode; |
28 | 28 | } |
29 | 29 | |
30 | + /** |
|
31 | + * @param boolean $isIndex |
|
32 | + */ |
|
30 | 33 | private function getSchema($isIndex) |
31 | 34 | { |
32 | 35 | if ($isIndex) { |
@@ -40,6 +43,10 @@ discard block |
||
40 | 43 | } |
41 | 44 | } |
42 | 45 | |
46 | + /** |
|
47 | + * @param string $body |
|
48 | + * @param string $filename |
|
49 | + */ |
|
43 | 50 | private function validateBody($body, $filename, $isIndex = true) |
44 | 51 | { |
45 | 52 | $dom = new \DOMDocument(); |
@@ -30,13 +30,13 @@ discard block |
||
30 | 30 | private function getSchema($isIndex) |
31 | 31 | { |
32 | 32 | if ($isIndex) { |
33 | - return __DIR__ . '/' . self::INDEX; |
|
33 | + return __DIR__.'/'.self::INDEX; |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | if ($this->strictMode) { |
37 | - return __DIR__ . '/' . self::SCHEMA; |
|
37 | + return __DIR__.'/'.self::SCHEMA; |
|
38 | 38 | } else { |
39 | - return __DIR__ . '/' . self::NON_STRICT_SCHEMA; |
|
39 | + return __DIR__.'/'.self::NON_STRICT_SCHEMA; |
|
40 | 40 | } |
41 | 41 | } |
42 | 42 | |
@@ -50,19 +50,19 @@ discard block |
||
50 | 50 | if (!$valid) { |
51 | 51 | $lastError = libxml_get_last_error(); |
52 | 52 | throw new ValidationFailedException( |
53 | - 'The given sitemap file (' . $filename . ') did not validate against the sitemap schema (last error: ' . str_replace("\n", '', $lastError->message) . ').'); |
|
53 | + 'The given sitemap file ('.$filename.') did not validate against the sitemap schema (last error: '.str_replace("\n", '', $lastError->message).').'); |
|
54 | 54 | } |
55 | 55 | } |
56 | 56 | |
57 | 57 | protected function doValidation(ResponseInterface $response) |
58 | 58 | { |
59 | - $body = (string)$response->getBody(); |
|
59 | + $body = (string) $response->getBody(); |
|
60 | 60 | |
61 | 61 | // sitemapindex or urlset |
62 | 62 | if (preg_match('/<sitemapindex/', $body)) { |
63 | - $this->validateBody($body, (string)$response->getUri()); |
|
63 | + $this->validateBody($body, (string) $response->getUri()); |
|
64 | 64 | } elseif (preg_match('/<urlset/', $body)) { |
65 | - $this->validateBody($body, (string)$response->getUri(), false); |
|
65 | + $this->validateBody($body, (string) $response->getUri(), false); |
|
66 | 66 | } |
67 | 67 | } |
68 | 68 | } |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | return; |
19 | 19 | } |
20 | 20 | |
21 | - $crawler = new Crawler((string)$response->getBody()); |
|
21 | + $crawler = new Crawler((string) $response->getBody()); |
|
22 | 22 | |
23 | 23 | $idList = $crawler->filterXPath('//*[@id!=""]'); |
24 | 24 | |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | |
37 | 37 | if (count($duplicatedIds) > 0) { |
38 | 38 | unset($duplicatedIds['']); |
39 | - throw new ValidationFailedException('Duplicate ids found (' . implode(', ', array_keys($duplicatedIds)) . ')'); |
|
39 | + throw new ValidationFailedException('Duplicate ids found ('.implode(', ', array_keys($duplicatedIds)).')'); |
|
40 | 40 | } |
41 | 41 | } |
42 | 42 | } |