phmLabs / Smoke

src/Rules/Html/RegExExistsRule.php

Doc Comments -1 removed lines

@@ -15,7 +15,6 @@
     protected $contentTypes = array('text/html');
 
     /**
-     * @param int $string The string that the document must contain
      */
     public function init(array $regExs)
     {

Spacing +5 added lines, -5 removed lines

@@ -29,12 +29,12 @@ 
 
         foreach ($this->regExs as $regEx) {
             if ($regEx['isRegEx']) {
-                if (preg_match('^' . $regEx['pattern'] . '^', (string)$response->getBody()) === 0) {
-                    $errors[] = 'Regular expression: ' . $regEx['pattern'];
+                if (preg_match('^'.$regEx['pattern'].'^', (string) $response->getBody()) === 0) {
+                    $errors[] = 'Regular expression: '.$regEx['pattern'];
                 }
             } else {
-                if (preg_match('^' . preg_quote($regEx['pattern']) . '^', (string)$response->getBody()) === 0) {
-                    $errors[] = 'Text: ' . $regEx['pattern'];
+                if (preg_match('^'.preg_quote($regEx['pattern']).'^', (string) $response->getBody()) === 0) {
+                    $errors[] = 'Text: '.$regEx['pattern'];
                 }
             }
         }
@@ -43,7 +43,7 @@ 
             $errorString = 'The following text elements were not found: <ul>';
 
             foreach ($errors as $error) {
-                $errorString .= '<li>' . $error . '</li>';
+                $errorString .= '<li>'.$error.'</li>';
             }
 
             $errorString .= '</ul>';

src/Cli/Command/ExplainCommand.php

Spacing +4 added lines, -4 removed lines

@@ -37,15 +37,15 @@
 
         foreach ($rules as $name => $rule) {
             $info = Init::getInitInformationByClass(get_class($rule));
-            $output->writeln('  ' . $name . ':');
-            $output->writeln('    class: ' . get_class($rule));
-            $output->writeln('    description: ' . str_replace("\n", "\n                 ", $info['documentation']));
+            $output->writeln('  '.$name.':');
+            $output->writeln('    class: '.get_class($rule));
+            $output->writeln('    description: '.str_replace("\n", "\n                 ", $info['documentation']));
 
             if (count($info['parameters']) > 0) {
                 $output->writeln('    parameter:');
 
                 foreach ($info['parameters'] as $parameter) {
-                    $output->writeln('      ' . $parameter['name'] . ': ' . $parameter['description'] . ' (default: ' . $parameter['default'] . ')');
+                    $output->writeln('      '.$parameter['name'].': '.$parameter['description'].' (default: '.$parameter['default'].')');
                 }
             }
 

src/Cli/Command/ScanCommand.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
      */
     private function initConfiguration($num_urls, $run_level, Uri $uri, Dispatcher $dispatcher)
     {
-        $configArray = $this->getConfigArray(__DIR__ . '/../../settings/' . self::CONFIG_FILE);
+        $configArray = $this->getConfigArray(__DIR__.'/../../settings/'.self::CONFIG_FILE);
 
         $config = new Configuration($uri, $dispatcher, $configArray);
 

src/Cli/Command/WarmUpCommand.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
      */
     private function initConfiguration(Uri $uri, Dispatcher $dispatcher)
     {
-        $configArray = $this->getConfigArray(__DIR__ . '/../../settings/warmup.yml');
+        $configArray = $this->getConfigArray(__DIR__.'/../../settings/warmup.yml');
 
         $config = new Configuration($uri, $dispatcher, $configArray);
 

src/Extensions/SmokeStop/StopExtension.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
         if (array_key_exists($name, $this->stopStrategies)) {
             return $this->stopStrategies[$name];
         } else {
-            throw new \RuntimeException("Strategy ('" . $name . "') not found. Available strategies are " . implode(', ', array_keys($this->stopStrategies)));
+            throw new \RuntimeException("Strategy ('".$name."') not found. Available strategies are ".implode(', ', array_keys($this->stopStrategies)));
         }
     }
 }

src/Rules/Html/RegExNotExistsRule.php

Doc Comments -1 removed lines

@@ -15,7 +15,6 @@
     protected $contentTypes = array('text/html');
 
     /**
-     * @param int $string The string that the document must contain
      */
     public function init(array $regExs)
     {

Spacing +2 added lines, -2 removed lines

@@ -25,8 +25,8 @@
     protected function doValidation(ResponseInterface $response)
     {
         foreach ($this->regExs as $regEx) {
-            $this->assert(preg_match('^' . $regEx . '^', (string)$response->getBody()) === 0,
-                'The given regular expression (' . $regEx . ') was found in this document.');
+            $this->assert(preg_match('^'.$regEx.'^', (string) $response->getBody()) === 0,
+                'The given regular expression ('.$regEx.') was found in this document.');
         }
     }
 }

src/Rules/Http/HttpsRule.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
         $sslOptions = stream_context_create(array('ssl' => array('capture_peer_cert' => true)));
 
         $request = stream_socket_client(
-            'ssl://' . $host . ':443',
+            'ssl://'.$host.':443',
             $errno,
             $errstr,
             30,

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace whm\Smoke\Rules\Http;
 
 use Psr\Http\Message\ResponseInterface;
-use whm\Smoke\Http\Response;
 use whm\Smoke\Rules\Rule;
 
 abstract class HttpsRule implements Rule

src/Rules/Xml/XmlCheckRule.php

Spacing +2 added lines, -2 removed lines

@@ -21,8 +21,8 @@
         if (!$success) {
             $lastError = libxml_get_last_error();
 
-            throw new ValidationFailedException('The xml file ' . $response->getUri() . ' is not well formed (last error: ' .
-                str_replace("\n", '', $lastError->message) . ').');
+            throw new ValidationFailedException('The xml file '.$response->getUri().' is not well formed (last error: '.
+                str_replace("\n", '', $lastError->message).').');
         }
     }
 }

src/Extensions/SmokeReporter/Reporter/KoalamonReporter.php

Spacing +16 added lines, -16 removed lines

@@ -95,7 +95,7 @@ 
 
     public function finish()
     {
-        $this->output->writeln('Sending results to ' . $this->server . " ... \n");
+        $this->output->writeln('Sending results to '.$this->server." ... \n");
 
         if ($this->groupBy === 'prefix') {
             $this->sendGroupedByPrefix();
@@ -126,7 +126,7 @@ 
 
         foreach ($this->getRuleKeys() as $rule) {
             foreach ($systems as $system) {
-                $identifier = $this->tool . '_' . $this->getPrefix($rule) . '_' . $system;
+                $identifier = $this->tool.'_'.$this->getPrefix($rule).'_'.$system;
                 $failureMessages[$identifier]['message'] = '';
                 $failureMessages[$identifier]['system'] = $system;
                 $failureMessages[$identifier]['tool'] = $this->getPrefix($rule);
@@ -143,15 +143,15 @@ 
                         $system = $this->retriever->getSystem(($result->getUrl()));
                     }
 
-                    $identifer = $this->tool . '_' . $this->getPrefix($ruleLKey) . '_' . $system;
+                    $identifer = $this->tool.'_'.$this->getPrefix($ruleLKey).'_'.$system;
 
                     if ($failureMessages[$identifer]['message'] === '') {
-                        $failureMessages[$identifer]['message'] = 'The ' . $this->getPrefix($ruleLKey) . ' test for #system_name# failed.<ul>';
+                        $failureMessages[$identifer]['message'] = 'The '.$this->getPrefix($ruleLKey).' test for #system_name# failed.<ul>';
                     }
                     ++$counter[$identifer];
-                    $message = '<li>' . $message . '<br>url: ' . $result->getUrl();
+                    $message = '<li>'.$message.'<br>url: '.$result->getUrl();
                     if ($this->addComingFrom) {
-                        $message .= ', coming from: ' . $this->retriever->getComingFrom($result->getUrl());
+                        $message .= ', coming from: '.$this->retriever->getComingFrom($result->getUrl());
                     }
                     $message .= '</li>';
                     $failureMessages[$identifer]['message'] .= $message;
@@ -161,9 +161,9 @@ 
 
         foreach ($failureMessages as $key => $failureMessage) {
             if ($failureMessage['message'] !== '') {
-                $this->send($this->identifier . '_' . $key, $failureMessage['system'], $failureMessage['message'] . '</ul>', self::STATUS_FAILURE, '', $counter[$key], $failureMessage['tool']);
+                $this->send($this->identifier.'_'.$key, $failureMessage['system'], $failureMessage['message'].'</ul>', self::STATUS_FAILURE, '', $counter[$key], $failureMessage['tool']);
             } else {
-                $this->send($this->identifier . '_' . $key, $failureMessage['system'], '', self::STATUS_SUCCESS, '', 0, $failureMessage['tool']);
+                $this->send($this->identifier.'_'.$key, $failureMessage['system'], '', self::STATUS_SUCCESS, '', 0, $failureMessage['tool']);
             }
         }
     }
@@ -175,7 +175,7 @@ 
             $failedTests = array();
             if ($result->isFailure()) {
                 foreach ($result->getMessages() as $ruleLKey => $message) {
-                    $identifier = 'smoke_' . $ruleLKey . '_' . $result->getUrl();
+                    $identifier = 'smoke_'.$ruleLKey.'_'.$result->getUrl();
 
                     if ($this->system === '') {
                         $system = str_replace('http://', '', $result->getUrl());
@@ -188,7 +188,7 @@ 
             }
             foreach ($rules as $rule) {
                 if (!in_array($rule, $failedTests, true)) {
-                    $identifier = 'smoke_' . $rule . '_' . $result->getUrl();
+                    $identifier = 'smoke_'.$rule.'_'.$result->getUrl();
 
                     if ($this->systemUseRetriever) {
                         $system = $this->retriever->getSystem($result->getUrl());
@@ -197,7 +197,7 @@ 
                     } else {
                         $system = $this->system;
                     }
-                    $this->send($identifier, $system, 'smoke_' . $rule . '_' . $result->getUrl(), self::STATUS_SUCCESS, (string) $result->getUrl());
+                    $this->send($identifier, $system, 'smoke_'.$rule.'_'.$result->getUrl(), self::STATUS_SUCCESS, (string) $result->getUrl());
                 }
             }
         }
@@ -221,17 +221,17 @@ 
                         $system = $this->retriever->getSystem(new Uri($result->getUrl()));
                     }
                     if ($failureMessages[$ruleLKey] === '') {
-                        $failureMessages[$ruleLKey]['message'] = '    The smoke test for #system_name# failed (Rule: ' . $ruleLKey . ').<ul>';
+                        $failureMessages[$ruleLKey]['message'] = '    The smoke test for #system_name# failed (Rule: '.$ruleLKey.').<ul>';
                     }
                     ++$counter[$ruleLKey];
 
                     $comingFrom = '';
 
                     if ($this->addComingFrom && $this->retriever->getComingFrom($result->getUrl())) {
-                        $comingFrom = ', coming from: ' . $this->retriever->getComingFrom($result->getUrl());
+                        $comingFrom = ', coming from: '.$this->retriever->getComingFrom($result->getUrl());
                     }
 
-                    $failureMessages[$ruleLKey]['message'] .= '<li>' . $message . ' (url: ' . $result->getUrl() . $comingFrom . ')</li > ';
+                    $failureMessages[$ruleLKey]['message'] .= '<li>'.$message.' (url: '.$result->getUrl().$comingFrom.')</li > ';
                     $failureMessages[$ruleLKey]['system'] = $system;
                 }
             }
@@ -239,9 +239,9 @@ 
 
         foreach ($failureMessages as $key => $failureMessage) {
             if ($failureMessage !== '') {
-                $this->send($this->identifier . '_' . $key, $this->system, $failureMessage['message'] . ' </ul > ', self::STATUS_FAILURE, '', $counter[$key]);
+                $this->send($this->identifier.'_'.$key, $this->system, $failureMessage['message'].' </ul > ', self::STATUS_FAILURE, '', $counter[$key]);
             } else {
-                $this->send($this->identifier . '_' . $key, $this->system, '', self::STATUS_SUCCESS, '', 0);
+                $this->send($this->identifier.'_'.$key, $this->system, '', self::STATUS_SUCCESS, '', 0);
             }
         }
     }

Doc Comments +4 added lines

@@ -246,6 +246,10 @@
         }
     }
 
+    /**
+     * @param string $identifier
+     * @param string $message
+     */
     private function send($identifier, $system, $message, $status, $url = '', $value = 0, $tool = null)
     {
         if (is_null($tool)) {