phmLabs / Smoke

src/Rules/Json/JsonPathExistsRule.php

Spacing +3 added lines, -3 removed lines

@@ -73,17 +73,17 @@
 
             if ($jsonValue === false || (is_array($jsonValue) && empty($jsonValue))) {
                 $error = true;
-                $noCorrectJsonPaths[] = $path['pattern'] . ' (JSON Path not found)';
+                $noCorrectJsonPaths[] = $path['pattern'].' (JSON Path not found)';
             }
             if ($this->checkRelation($path['relation'], $path['value'], $count) === false) {
                 $error = true;
-                $noCorrectJsonPaths[] = $path['pattern'] . ' (number of JSONPaths is not correct corresponding to the given relation/value)';
+                $noCorrectJsonPaths[] = $path['pattern'].' (number of JSONPaths is not correct corresponding to the given relation/value)';
             }
         }
 
         if ($error === true) {
             $allNoCorrectJsonPaths = implode('", "', $noCorrectJsonPaths);
-            throw new ValidationFailedException('Disonances with JSON Paths "' . $allNoCorrectJsonPaths . '!');
+            throw new ValidationFailedException('Disonances with JSON Paths "'.$allNoCorrectJsonPaths.'!');
         }
     }
 }

src/Rules/Http/HttpsCertificateAuthorityRule.php

Spacing +2 added lines, -2 removed lines

@@ -23,10 +23,10 @@
     {
         if (array_key_exists('issuer', $certInfo) and array_key_exists('CN', $certInfo['issuer'])) {
             if ($certInfo['issuer']['CN'] !== $this->authorityName) {
-                throw new ValidationFailedException('Expected authority was "' . $this->authorityName . '", "' . $certInfo['issuer']['CN'] . '" found.');
+                throw new ValidationFailedException('Expected authority was "'.$this->authorityName.'", "'.$certInfo['issuer']['CN'].'" found.');
             }
         } else {
-            throw new ValidationFailedException('Expected authority was "' . $this->authorityName . '". No authority found.');
+            throw new ValidationFailedException('Expected authority was "'.$this->authorityName.'". No authority found.');
         }
     }
 }

src/Yaml/EnvAwareYaml.php

Spacing +2 added lines, -2 removed lines

@@ -12,10 +12,10 @@
 
         foreach ($matches[1] as $varName) {
             if (!getenv($varName)) {
-                throw new \RuntimeException('The mandatory env variable (' . $varName . ') from the config file was not set.');
+                throw new \RuntimeException('The mandatory env variable ('.$varName.') from the config file was not set.');
             }
 
-            $fileContent = str_replace('${' . $varName . '}', getenv($varName), $fileContent);
+            $fileContent = str_replace('${'.$varName.'}', getenv($varName), $fileContent);
         }
 
         return Yaml::parse($fileContent);

src/Extensions/SmokeReporter/Reporter/WarmUpLiveReporter.php

Spacing +2 added lines, -2 removed lines

@@ -22,14 +22,14 @@
         if (count($results) > 0) {
             ++$this->urlCount;
             $firstResult = array_pop($results);
-            $this->output->writeln('   ' . (string) $firstResult->getResponse()->getUri());
+            $this->output->writeln('   '.(string) $firstResult->getResponse()->getUri());
             $this->output->writeln('');
         }
     }
 
     public function finish()
     {
-        $this->output->writeln('   <comment>Warm up finished. ' . $this->urlCount . ' urls visited.</comment>');
+        $this->output->writeln('   <comment>Warm up finished. '.$this->urlCount.' urls visited.</comment>');
         $this->output->writeln('');
     }
 }

src/Rules/Json/JsonSchema/JsonSchemaRule.php

Spacing +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
     {
         $data = json_decode($response->getBody());
         if ($data === null) {
-            throw new ValidationFailedException("The given JSON data can not be validated (last error: '" . $this->json_errors[json_last_error()] . "').");
+            throw new ValidationFailedException("The given JSON data can not be validated (last error: '".$this->json_errors[json_last_error()]."').");
         } else {
             $errorStatus = false;
             $messageParts = array();
@@ -50,14 +50,14 @@ 
                     $errorStatus = true;
                     $errorMessage = '';
                     foreach ($validator->getErrors() as $error) {
-                        $errorMessage = $errorMessage . sprintf("[%s] %s\n", $error['property'], $error['message']);
+                        $errorMessage = $errorMessage.sprintf("[%s] %s\n", $error['property'], $error['message']);
                     }
-                    $messageParts[] = $jsonSchemaFile['jsonfilename'] . ' - ' . $jsonSchemaFile['jsonfileurl'] . '(last error: ' . $errorMessage . ').';
+                    $messageParts[] = $jsonSchemaFile['jsonfilename'].' - '.$jsonSchemaFile['jsonfileurl'].'(last error: '.$errorMessage.').';
                 }
             }
 
             if ($errorStatus === true) {
-                $message = 'JSON file (' . (string) $response->getUri() . ')  does not validate against the following JSON Schema files: ' . implode(', ', $messageParts);
+                $message = 'JSON file ('.(string) $response->getUri().')  does not validate against the following JSON Schema files: '.implode(', ', $messageParts);
                 throw new ValidationFailedException($message);
             }
         }

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use JsonSchema\Validator;
 use Psr\Http\Message\ResponseInterface;
-use whm\Smoke\Http\Response;
 use whm\Smoke\Rules\StandardRule;
 use whm\Smoke\Rules\ValidationFailedException;
 

src/Scanner/Scanner.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
             } catch (ValidationFailedException $e) {
                 $result = new CheckResult(CheckResult::STATUS_FAILURE, $e->getMessage());
             } catch (\Exception $e) {
-                $result = new CheckResult(CheckResult::STATUS_FAILURE, 'An error occured: ' . $e->getMessage());
+                $result = new CheckResult(CheckResult::STATUS_FAILURE, 'An error occured: '.$e->getMessage());
             }
 
             $result->setResponse($response);

src/Extensions/SmokeReporter/Reporter/LeankoalaReporter.php

Doc Comments +3 added lines, -3 removed lines

@@ -198,12 +198,12 @@
     }
 
     /**
-     * @param $identifier
+     * @param string $identifier
      * @param $system
-     * @param $message
+     * @param string $message
      * @param $status
      * @param $value
-     * @param $tool
+     * @param string $tool
      * @param $component
      * @param Attribute[] $attributes
      */

Spacing +11 added lines, -11 removed lines

@@ -118,7 +118,7 @@ 
         foreach ($this->results as $results) {
             foreach ($results as $result) {
                 /* @var CheckResult $result */
-                $tool = 'Smoke' . $result->getRuleName();
+                $tool = 'Smoke'.$result->getRuleName();
                 $checks[$tool][] = $result;
             }
         }
@@ -130,19 +130,19 @@ 
                 continue;
             }
 
-            $message = 'The smoke test for #system_name# failed (Rule: ' . $toolName . ').<ul>';
+            $message = 'The smoke test for #system_name# failed (Rule: '.$toolName.').<ul>';
             $status = Event::STATUS_SUCCESS;
             $failureCount = 0;
-            $identifier = $toolName . '_' . $this->system;
+            $identifier = $toolName.'_'.$this->system;
 
             foreach ($results as $result) {
                 /** @var CheckResult $result */
                 if ($result->getStatus() === CheckResult::STATUS_FAILURE) {
                     $comingFrom = '';
                     if ($this->addComingFrom && $this->retriever->getComingFrom($result->getResponse()->getUri())) {
-                        $comingFrom = ', coming from: ' . $this->retriever->getComingFrom($result->getResponse()->getUri());
+                        $comingFrom = ', coming from: '.$this->retriever->getComingFrom($result->getResponse()->getUri());
                     }
-                    $message .= '<li>' . $result->getMessage() . ' (url: ' . (string)$result->getResponse()->getUri() . $comingFrom . ')</li>';
+                    $message .= '<li>'.$result->getMessage().' (url: '.(string) $result->getResponse()->getUri().$comingFrom.')</li>';
                     ++$failureCount;
                 }
             }
@@ -150,9 +150,9 @@ 
                 $status = Event::STATUS_FAILURE;
                 $message .= '</ul>';
                 $firstResult = array_pop($results);
-                $attributes[] = new Attribute('html-content', (string)$firstResult->getResponse()->getBody(), true);
+                $attributes[] = new Attribute('html-content', (string) $firstResult->getResponse()->getBody(), true);
             } else {
-                $message = 'All checks for system "#system_name#" succeeded [SmokeBasic:' . $toolName . '].';
+                $message = 'All checks for system "#system_name#" succeeded [SmokeBasic:'.$toolName.'].';
             }
 
             $this->send($identifier, $this->system, $message, $status, $failureCount, $this->tool, $this->system, $attributes);
@@ -165,7 +165,7 @@ 
             foreach ($results as $result) {
                 /* @var CheckResult $result */
 
-                $identifier = '_' . $this->getIdentifier($result);
+                $identifier = '_'.$this->getIdentifier($result);
                 $tool = $this->getPrefix($result->getRuleName());
 
                 $component = $this->getComponent($result->getRuleName());
@@ -173,7 +173,7 @@ 
 
                 $attributes = array();
                 if ($result->getStatus() == CheckResult::STATUS_FAILURE) {
-                    $attributes[] = new Attribute('html content', (string)$result->getResponse()->getBody(), true);
+                    $attributes[] = new Attribute('html content', (string) $result->getResponse()->getBody(), true);
                     $attributes[] = new Attribute('http status code', $result->getResponse()->getStatusCode());
                 }
 
@@ -191,7 +191,7 @@ 
                 $this->send(
                     $identifier,
                     $currentSystem,
-                    $result->getMessage() . ' (url: ' . (string)$result->getResponse()->getUri() . ')',
+                    $result->getMessage().' (url: '.(string) $result->getResponse()->getUri().')',
                     $result->getStatus(),
                     $result->getValue(),
                     $tool,
@@ -204,7 +204,7 @@ 
 
     private function getIdentifier(CheckResult $result)
     {
-        return $this->tool . '_' . $result->getRuleName();
+        return $this->tool.'_'.$result->getRuleName();
     }
 
     private function getPrefix($string)

src/Rules/Html/InvalidUrlsRule.php

Spacing +3 added lines, -3 removed lines

@@ -27,13 +27,13 @@
 
         foreach ($urls as $url) {
 
-            $idnUrl = $url->getScheme() . '://' . idn_to_ascii($url->getHost()) .  $url->getPath();
+            $idnUrl = $url->getScheme().'://'.idn_to_ascii($url->getHost()).$url->getPath();
 
             if (!filter_var($idnUrl, FILTER_VALIDATE_URL)) {
-                $invalidUrls[] = (string)$url;
+                $invalidUrls[] = (string) $url;
             }
         }
 
-        $this->assert(count($invalidUrls) === 0, 'Invalid urls found (' . implode(', ', $invalidUrls) . ').');
+        $this->assert(count($invalidUrls) === 0, 'Invalid urls found ('.implode(', ', $invalidUrls).').');
     }
 }

src/Rules/Http/Header/ExistsRule.php

Spacing +3 added lines, -3 removed lines

@@ -24,13 +24,13 @@
 
         foreach ($this->checkedHeaders as $headerConfig) {
             if (!$response->hasHeader($headerConfig['key'])) {
-                throw new ValidationFailedException('Header not found (' . $headerConfig['key'] . ')');
+                throw new ValidationFailedException('Header not found ('.$headerConfig['key'].')');
             }
 
             $currentValue = $response->getHeader($headerConfig['key'])[0];
 
-            if (!preg_match('%' . $headerConfig['value'] . '%', $currentValue, $matches)) {
-                throw new ValidationFailedException('Header "' . $headerConfig['key'] . '" does not match "' . $headerConfig['value'] . '". Current value is "' . $currentValue . '"');
+            if (!preg_match('%'.$headerConfig['value'].'%', $currentValue, $matches)) {
+                throw new ValidationFailedException('Header "'.$headerConfig['key'].'" does not match "'.$headerConfig['value'].'". Current value is "'.$currentValue.'"');
             }
         }
     }