Completed
Push — master ( c49df7...90c7d4 )
by Nils
04:57
created
src/Extensions/SmokeReporter/Reporter/KoalamonReporter.php 2 patches
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 
96 96
     public function finish()
97 97
     {
98
-        $this->output->writeln('Sending results to ' . $this->server . " ... \n");
98
+        $this->output->writeln('Sending results to '.$this->server." ... \n");
99 99
 
100 100
         if ($this->groupBy === 'prefix') {
101 101
             $this->sendGroupedByPrefix();
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 
127 127
         foreach ($this->getRuleKeys() as $rule) {
128 128
             foreach ($systems as $system) {
129
-                $identifier = $this->tool . '_' . $this->getPrefix($rule) . '_' . $system;
129
+                $identifier = $this->tool.'_'.$this->getPrefix($rule).'_'.$system;
130 130
                 $failureMessages[$identifier]['message'] = '';
131 131
                 $failureMessages[$identifier]['system'] = $system;
132 132
                 $failureMessages[$identifier]['tool'] = $this->getPrefix($rule);
@@ -143,15 +143,15 @@  discard block
 block discarded – undo
143 143
                         $system = $this->retriever->getSystem(($result->getUrl()));
144 144
                     }
145 145
 
146
-                    $identifer = $this->tool . '_' . $this->getPrefix($ruleLKey) . '_' . $system;
146
+                    $identifer = $this->tool.'_'.$this->getPrefix($ruleLKey).'_'.$system;
147 147
 
148 148
                     if ($failureMessages[$identifer]['message'] === '') {
149
-                        $failureMessages[$identifer]['message'] = 'The ' . $this->getPrefix($ruleLKey) . ' test for #system_name# failed.<ul>';
149
+                        $failureMessages[$identifer]['message'] = 'The '.$this->getPrefix($ruleLKey).' test for #system_name# failed.<ul>';
150 150
                     }
151 151
                     ++$counter[$identifer];
152
-                    $message = '<li>' . $message . '<br>url: ' . $result->getUrl();
152
+                    $message = '<li>'.$message.'<br>url: '.$result->getUrl();
153 153
                     if ($this->addComingFrom) {
154
-                        $message .= ', coming from: ' . $this->retriever->getComingFrom($result->getUrl());
154
+                        $message .= ', coming from: '.$this->retriever->getComingFrom($result->getUrl());
155 155
                     }
156 156
                     $message .= '</li>';
157 157
                     $failureMessages[$identifer]['message'] .= $message;
@@ -161,9 +161,9 @@  discard block
 block discarded – undo
161 161
 
162 162
         foreach ($failureMessages as $key => $failureMessage) {
163 163
             if ($failureMessage['message'] !== '') {
164
-                $this->send($this->identifier . '_' . $key, $failureMessage['system'], $failureMessage['message'] . '</ul>', self::STATUS_FAILURE, '', $counter[$key], $failureMessage['tool']);
164
+                $this->send($this->identifier.'_'.$key, $failureMessage['system'], $failureMessage['message'].'</ul>', self::STATUS_FAILURE, '', $counter[$key], $failureMessage['tool']);
165 165
             } else {
166
-                $this->send($this->identifier . '_' . $key, $failureMessage['system'], '', self::STATUS_SUCCESS, '', 0, $failureMessage['tool']);
166
+                $this->send($this->identifier.'_'.$key, $failureMessage['system'], '', self::STATUS_SUCCESS, '', 0, $failureMessage['tool']);
167 167
             }
168 168
         }
169 169
     }
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
             $failedTests = array();
176 176
             if ($result->isFailure()) {
177 177
                 foreach ($result->getMessages() as $ruleLKey => $message) {
178
-                    $identifier = 'smoke_' . $ruleLKey . '_' . $result->getUrl();
178
+                    $identifier = 'smoke_'.$ruleLKey.'_'.$result->getUrl();
179 179
 
180 180
                     if ($this->system === '') {
181 181
                         $system = str_replace('http://', '', $result->getUrl());
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
             }
189 189
             foreach ($rules as $rule) {
190 190
                 if (!in_array($rule, $failedTests, true)) {
191
-                    $identifier = 'smoke_' . $rule . '_' . $result->getUrl();
191
+                    $identifier = 'smoke_'.$rule.'_'.$result->getUrl();
192 192
 
193 193
                     if ($this->systemUseRetriever) {
194 194
                         $system = $this->retriever->getSystem($result->getUrl());
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
                     } else {
198 198
                         $system = $this->system;
199 199
                     }
200
-                    $this->send($identifier, $system, 'smoke_' . $rule . '_' . $result->getUrl(), self::STATUS_SUCCESS, (string) $result->getUrl());
200
+                    $this->send($identifier, $system, 'smoke_'.$rule.'_'.$result->getUrl(), self::STATUS_SUCCESS, (string) $result->getUrl());
201 201
                 }
202 202
             }
203 203
         }
@@ -221,17 +221,17 @@  discard block
 block discarded – undo
221 221
                         $system = $this->retriever->getSystem(new Uri($result->getUrl()));
222 222
                     }
223 223
                     if ($failureMessages[$ruleLKey] === '') {
224
-                        $failureMessages[$ruleLKey]['message'] = '    The smoke test for #system_name# failed (Rule: ' . $ruleLKey . ').<ul>';
224
+                        $failureMessages[$ruleLKey]['message'] = '    The smoke test for #system_name# failed (Rule: '.$ruleLKey.').<ul>';
225 225
                     }
226 226
                     ++$counter[$ruleLKey];
227 227
 
228 228
                     $comingFrom = '';
229 229
 
230 230
                     if ($this->addComingFrom && $this->retriever->getComingFrom($result->getUrl())) {
231
-                        $comingFrom = ', coming from: ' . $this->retriever->getComingFrom($result->getUrl());
231
+                        $comingFrom = ', coming from: '.$this->retriever->getComingFrom($result->getUrl());
232 232
                     }
233 233
 
234
-                    $failureMessages[$ruleLKey]['message'] .= '<li>' . $message . ' (url: ' . $result->getUrl() . $comingFrom . ')</li > ';
234
+                    $failureMessages[$ruleLKey]['message'] .= '<li>'.$message.' (url: '.$result->getUrl().$comingFrom.')</li > ';
235 235
                     $failureMessages[$ruleLKey]['system'] = $system;
236 236
                 }
237 237
             }
@@ -239,9 +239,9 @@  discard block
 block discarded – undo
239 239
 
240 240
         foreach ($failureMessages as $key => $failureMessage) {
241 241
             if ($failureMessage !== '') {
242
-                $this->send($this->identifier . '_' . $key, $this->system, $failureMessage['message'] . ' </ul > ', self::STATUS_FAILURE, '', $counter[$key]);
242
+                $this->send($this->identifier.'_'.$key, $this->system, $failureMessage['message'].' </ul > ', self::STATUS_FAILURE, '', $counter[$key]);
243 243
             } else {
244
-                $this->send($this->identifier . '_' . $key, $this->system, '', self::STATUS_SUCCESS, '', 0);
244
+                $this->send($this->identifier.'_'.$key, $this->system, '', self::STATUS_SUCCESS, '', 0);
245 245
             }
246 246
         }
247 247
     }
Please login to merge, or discard this patch.
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -246,6 +246,10 @@
 block discarded – undo
246 246
         }
247 247
     }
248 248
 
249
+    /**
250
+     * @param string $identifier
251
+     * @param string $message
252
+     */
249 253
     private function send($identifier, $system, $message, $status, $url = '', $value = 0, $tool = null)
250 254
     {
251 255
         if (is_null($tool)) {
Please login to merge, or discard this patch.
src/Rules/Xml/XmlValidXsdRule.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,12 +39,12 @@
 block discarded – undo
39 39
                 $error = true;
40 40
                 $lastError = libxml_get_last_error();
41 41
 
42
-                $messageParts[] = $xsdFile['xsdfilename'] . ' - ' . $xsdFile['xsdfileurl'] . '(last error: ' . str_replace("\n", '', $lastError->message) . ').';
42
+                $messageParts[] = $xsdFile['xsdfilename'].' - '.$xsdFile['xsdfileurl'].'(last error: '.str_replace("\n", '', $lastError->message).').';
43 43
             }
44 44
         }
45 45
 
46 46
         if ($error === true) {
47
-            $message = 'XML file (' . $filename . ')  does not validate against the following XSD files: ' . implode(', ', $messageParts);
47
+            $message = 'XML file ('.$filename.')  does not validate against the following XSD files: '.implode(', ', $messageParts);
48 48
             throw new ValidationFailedException($message);
49 49
         }
50 50
     }
Please login to merge, or discard this patch.
src/Rules/Html/ClosingHtmlTagRule.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
     {
16 16
         if (($response->getStatus() < 300 || $response->getStatus() >= 400) && $response->getContentType() === 'text/html') {
17 17
             if (stripos($response->getBody(), '</html>') === false) {
18
-                throw new ValidationFailedException('Closing html tag is missing (document lengh: ' . strlen($response->getBody()) . ').');
18
+                throw new ValidationFailedException('Closing html tag is missing (document lengh: '.strlen($response->getBody()).').');
19 19
             }
20 20
         }
21 21
     }
Please login to merge, or discard this patch.
src/Rules/Seo/RobotsDisallowAllRule.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -49,6 +49,9 @@
 block discarded – undo
49 49
         }
50 50
     }
51 51
 
52
+    /**
53
+     * @param string $content
54
+     */
52 55
     private function normalizeContent($content)
53 56
     {
54 57
         $normalizedContent = strtolower($content);
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -20,12 +20,12 @@  discard block
 block discarded – undo
20 20
 
21 21
     public function validate(Response $response)
22 22
     {
23
-        $url = $response->getUri()->getScheme() . '://' . $response->getUri()->getHost();
23
+        $url = $response->getUri()->getScheme().'://'.$response->getUri()->getHost();
24 24
 
25 25
         if (substr_count($url, '/') === 2) {
26
-            $filename = $robotsUrl = $url . '/robots.txt';
26
+            $filename = $robotsUrl = $url.'/robots.txt';
27 27
         } elseif (substr_count($url, '/') === 3) {
28
-            $filename = $robotsUrl = $url . 'robots.txt';
28
+            $filename = $robotsUrl = $url.'robots.txt';
29 29
         } else {
30 30
             return;
31 31
         }
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 
41 41
         $normalizedContent = $this->normalizeContent($content);
42 42
 
43
-        if (strpos($normalizedContent, 'user-agent:* disallow:/' . PHP_EOL) !== false) {
43
+        if (strpos($normalizedContent, 'user-agent:* disallow:/'.PHP_EOL) !== false) {
44 44
             throw new ValidationFailedException('The robots.txt contains disallow all (Disallow: /)');
45 45
         }
46 46
 
Please login to merge, or discard this patch.
src/Extensions/SmokeReporter/Reporter/StandardCliReporter.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -72,6 +72,9 @@
 block discarded – undo
72 72
         $this->output->writeln('');
73 73
     }
74 74
 
75
+    /**
76
+     * @param integer $ruleKey
77
+     */
75 78
     private function getFailedUrls($ruleKey)
76 79
     {
77 80
         $failedUrls = array();
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -81,11 +81,11 @@  discard block
 block discarded – undo
81 81
                 /** @var CheckResult $result */
82 82
                 if ($result->getStatus() === CheckResult::STATUS_FAILURE) {
83 83
                     if ($ruleKey === $key) {
84
-                        $failedUrls[] = (string) $result->getResponse()->getUri() . ' - ' . $result->getMessage();
84
+                        $failedUrls[] = (string) $result->getResponse()->getUri().' - '.$result->getMessage();
85 85
                         ++$count;
86 86
                     }
87 87
                     if ($count > $this->maxResults) {
88
-                        $failedUrls[] = '... only the first ' . $this->maxResults . ' elements are shown.';
88
+                        $failedUrls[] = '... only the first '.$this->maxResults.' elements are shown.';
89 89
                         break;
90 90
                     }
91 91
                 }
@@ -104,15 +104,15 @@  discard block
 block discarded – undo
104 104
             $failedUrls = $this->getFailedUrls($ruleKey);
105 105
 
106 106
             if (count($failedUrls) > 0) {
107
-                $this->output->writeln('  <error> ' . get_class($rule) . ' </error>');
107
+                $this->output->writeln('  <error> '.get_class($rule).' </error>');
108 108
             } else {
109
-                $this->output->writeln('  <info> ' . get_class($rule) . ' </info>');
109
+                $this->output->writeln('  <info> '.get_class($rule).' </info>');
110 110
             }
111 111
 
112
-            $this->output->writeln('   ' . str_replace("\n", "\n   ", $info['documentation']) . "\n");
112
+            $this->output->writeln('   '.str_replace("\n", "\n   ", $info['documentation'])."\n");
113 113
 
114 114
             foreach ($failedUrls as $failedUrl) {
115
-                $this->output->writeln('   - ' . $failedUrl);
115
+                $this->output->writeln('   - '.$failedUrl);
116 116
             }
117 117
 
118 118
             $this->output->writeln('');
Please login to merge, or discard this patch.
src/Extensions/SmokeReporter/Reporter/LeankoalaReporter.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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)
Please login to merge, or discard this patch.
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -182,6 +182,11 @@
 block discarded – undo
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) {
Please login to merge, or discard this patch.
src/Extensions/SmokeReporter/Reporter/CliReporter.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -30,13 +30,13 @@
 block discarded – undo
30 30
 
31 31
     protected function renderFailure(CheckResult $result)
32 32
     {
33
-        $this->output->writeln('   <error> ' . (string) $result->getResponse()->getUri() . ' </error> coming from ' . (string) $this->retriever->getComingFrom($result->getResponse()->getUri()));
34
-        $this->output->writeln('    - ' . $result->getMessage() . ' [rule: ' . $result->getRuleName() . ']');
33
+        $this->output->writeln('   <error> '.(string) $result->getResponse()->getUri().' </error> coming from '.(string) $this->retriever->getComingFrom($result->getResponse()->getUri()));
34
+        $this->output->writeln('    - '.$result->getMessage().' [rule: '.$result->getRuleName().']');
35 35
         $this->output->writeln('');
36 36
     }
37 37
 
38 38
     protected function renderSuccess(CheckResult $result)
39 39
     {
40
-        $this->output->writeln('   <info> ' . (string) $result->getResponse()->getUri() . ' </info> all tests passed');
40
+        $this->output->writeln('   <info> '.(string) $result->getResponse()->getUri().' </info> all tests passed');
41 41
     }
42 42
 }
Please login to merge, or discard this patch.
src/Extensions/SmokeResponseRetriever/Retriever/Koalamon/Retriever.php 1 patch
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -43,6 +43,11 @@
 block discarded – undo
43 43
         return json_decode($systems->getBody(), true);
44 44
     }
45 45
 
46
+    /**
47
+     * @param string $url
48
+     *
49
+     * @return string
50
+     */
46 51
     private function prepareUrl($url)
47 52
     {
48 53
         $preparedUrl = str_replace('#project#', $this->project, $url);
Please login to merge, or discard this patch.
src/Rules/Json/JsonPathExistsRule.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -73,17 +73,17 @@
 block discarded – undo
73 73
 
74 74
             if ($jsonValue === false || (is_array($jsonValue) && empty($jsonValue))) {
75 75
                 $error = true;
76
-                $noCorrectJsonPaths[] = $path['pattern'] . ' (JSON Path not found)';
76
+                $noCorrectJsonPaths[] = $path['pattern'].' (JSON Path not found)';
77 77
             }
78 78
             if ($this->checkRelation($path['relation'], $path['value'], $count) === false) {
79 79
                 $error = true;
80
-                $noCorrectJsonPaths[] = $path['pattern'] . ' (number of JSONPaths is not correct corresponding to the given relation/value)';
80
+                $noCorrectJsonPaths[] = $path['pattern'].' (number of JSONPaths is not correct corresponding to the given relation/value)';
81 81
             }
82 82
         }
83 83
 
84 84
         if ($error === true) {
85 85
             $allNoCorrectJsonPaths = implode('", "', $noCorrectJsonPaths);
86
-            throw new ValidationFailedException('Disonances with JSON Paths "' . $allNoCorrectJsonPaths . '!');
86
+            throw new ValidationFailedException('Disonances with JSON Paths "'.$allNoCorrectJsonPaths.'!');
87 87
         }
88 88
     }
89 89
 }
Please login to merge, or discard this patch.