small refactor

fix travis version for L5.3

Author: lopadova

.travis.yml

@@ -49,7 +49,7 @@ before_install:
   - if [[ $LARAVEL_VERSION == '5.3' ]]; then composer create-project laravel/laravel:$LARAVEL_VERSION --stability dev; fi
   - composer update
   - cd ./laravel
-  - composer require padosoft/laravel-test:1.1.*
+  - composer require padosoft/laravel-test:1.*
   - composer require padosoft/test:0.1.*
   - composer require padosoft/laravel-composer-security dev-master
   - if [[ $LARAVEL_VERSION == '5.0' ]]; then composer require mockery/mockery; fi

src/ComposerSecurityCheck.php

@@ -111,29 +111,27 @@ private function hardWork($argument, $option)
      */
     private function notifyResult($mail, $nomailok, $tuttoOk)
     {
-
         //print to console
         $this->table($this->headersTableConsole, $this->tableVulnerabilities);
 
-        $nomailok_bool = false;
-
-        if ($nomailok!='' && strtolower($nomailok)=='true') {
-            $nomailok_bool = true;
-        }
-
         //send email
-        if(!$nomailok_bool || !$tuttoOk) {
+        if (!$tuttoOk || $nomailok == '' || strtolower($nomailok) != 'true') {
             $this->sendEmail($mail, $tuttoOk);
         }
 
-        if ($tuttoOk) {
+        $this->notify($tuttoOk);
+    }
+
+
+    private function notify($result)
+    {
+        if ($result) {
             return $this->notifyOK();
         }
 
         $this->notifyKO();
     }
 
-
     private function notifyOK()
     {
         $esito = Config::get('composer-security-check.mailSubjectSuccess');
@@ -168,11 +166,11 @@ private function findFilesComposerLock($path)
         $file = new FileHelper();
         $lockFiles = array();
         foreach ($file->adjustPath($path) as $item) {
-            $lockFiles = array_merge($lockFiles,$file->findFiles($item, 'composer.lock'));
+            $lockFiles = array_merge($lockFiles, $file->findFiles($item, 'composer.lock'));
         }
 
 
-        if(!is_array($lockFiles)){
+        if (!is_array($lockFiles)) {
             $lockFiles = array();
         }
 
@@ -211,7 +209,8 @@ private function checkFile($fileLock, $whitelist)
 
         foreach ($response as $key => $vulnerability) {
 
-            $this->tableVulnerabilities = array_merge($this->tableVulnerabilities, $sensiolab->checkResponse($key, $vulnerability, $tuttoOk));
+            $this->tableVulnerabilities = array_merge($this->tableVulnerabilities,
+                $sensiolab->checkResponse($key, $vulnerability, $tuttoOk));
         }
 
         return $tuttoOk;

src/SensiolabHelper.php

@@ -79,15 +79,15 @@ public function getSensiolabVulnerabilties($fileLock)
             $this->command->error("ClientException!\nMessage: " . $e->getMessage());
             $colorTag = $this->getColorTagForStatusCode($e->getResponse()->getStatusCode());
             $this->command->line("HTTP StatusCode: <{$colorTag}>" . $e->getResponse()->getStatusCode() . "<{$colorTag}>");
-            $this->printMessage($e->getResponse());
+            $this->printMessage($e->getResponse() === null ? '' : $e->getResponse());
             $this->printMessage($e->getRequest());
         } catch (\GuzzleHttp\Exception\RequestException $e) {
             $this->command->error("RequestException!\nMessage: " . $e->getMessage());
             $this->printMessage($e->getRequest());
             if ($e->hasResponse()) {
                 $colorTag = $this->getColorTagForStatusCode($e->getResponse()->getStatusCode());
                 $this->command->line("HTTP StatusCode: <{$colorTag}>" . $e->getResponse()->getStatusCode() . "<{$colorTag}>");
-                $this->printMessage($e->getResponse());
+                $this->printMessage($e->getResponse() === null ? '' : $e->getResponse());
             }
         }
         return $response;
@@ -162,14 +162,19 @@ private function addVerboseLog($msg, $error = false)
     /**
      * @param \Psr\Http\Message\MessageInterface $message
      *
+     * @throws \RuntimeException
      */
     private function printMessage(\Psr\Http\Message\MessageInterface $message)
     {
         $type = '';
         if (is_a($message, '\Psr\Http\Message\RequestInterface')) {
             $type = 'REQUEST';
-        } else if (is_a($message, '\Psr\Http\Message\ResponseInterface')) {
-            $type = 'RESPONSE';
+            $body = $message->getBody();
+        } else {
+            if (is_a($message, '\Psr\Http\Message\ResponseInterface')) {
+                $type = 'RESPONSE';
+                $body = $message->getBody()->getContents();
+            }
         }
         $this->command->info("$type:");
         $headers = '';
@@ -178,9 +183,11 @@ private function printMessage(\Psr\Http\Message\MessageInterface $message)
         }
         $this->command->comment($headers);
         if ($type == 'REQUEST') {
-            $this->command->comment($message->getBody());
-        } else if ($type == 'RESPONSE') {
-            $this->command->comment($message->getBody()->getContents());
+            $this->command->comment($body);
+        } else {
+            if ($type == 'RESPONSE') {
+                $this->command->comment($body);
+            }
         }
     }