Refactoring according to SensioInsights analysis, correction of autol…

…oad for test cases, where tests classes should be autoloaded in dev

.gitignore

@@ -1 +1,3 @@
 /vendor/
+composer.lock
+composer.phar

README.md

@@ -1,5 +1,6 @@
 # Laravel 5 IBM Watson Translate
 
+[![StyleCI](https://styleci.io/repos/50762162/shield?style=flat)](https://styleci.io/repos/50762162)
 [![Build Status](https://travis-ci.org/findbrok/laravel-watson-translate.svg?branch=master)](https://travis-ci.org/findbrok/laravel-watson-translate)
 [![Latest Stable Version](https://poser.pugx.org/findbrok/laravel-watson-translate/v/stable)](https://packagist.org/packages/findbrok/laravel-watson-translate) 
 [![Total Downloads](https://poser.pugx.org/findbrok/laravel-watson-translate/downloads)](https://packagist.org/packages/findbrok/laravel-watson-translate) 

composer.json

@@ -11,8 +11,8 @@
     ],
     "require": {
         "php": ">=5.5.0",
-        "laravel/framework": "~5.0|~5.1|~5.2",
-        "findbrok/php-watson-api-bridge": "^1.0"
+        "laravel/framework": "5.0.*|5.1.*|5.2.*",
+        "findbrok/php-watson-api-bridge": "1.0.*"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",
@@ -22,12 +22,20 @@
         "guzzlehttp/guzzle": "~5.3|~6.0|~6.2"
     },
     "autoload": {
-        "classmap": [
-            "tests/TestCase.php"
-        ],
         "psr-4": {
-            "FindBrok\\WatsonTranslate\\": "src/",
+            "FindBrok\\WatsonTranslate\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
             "FindBrok\\WatsonTranslate\\Tests\\": "tests/"
         }
-    }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

src/Presenters/ResultsCollection.php

@@ -88,7 +88,7 @@ public function languagesNames($asCollection = false)
         $languagesName = collect($this->collectResults()->get('languages'))->transform(function ($item) {
             return isset($item['name']) ? $item['name'] : null;
         })->reject(function ($item) {
-            return $item == null;
+            return is_null($item);
         });
 
         //No language
@@ -113,7 +113,7 @@ public function languagesCodes($asCollection = false)
         $languagesCodes = collect($this->collectResults()->get('languages'))->transform(function ($item) {
             return isset($item['language']) ? $item['language'] : null;
         })->reject(function ($item) {
-            return $item == null;
+            return is_null($item);
         });
 
         //No language

src/Translator.php

@@ -28,7 +28,7 @@ public function textTranslate($text)
             'target'    => $this->to,
             'text'      => $text,
         ])->reject(function ($item) {
-            return $item == null || $item == '';
+            return is_null($item) || empty($item);
         })->all())->getBody()->getContents();
         //Return translator object
         return $this;
@@ -51,7 +51,7 @@ public function bulkTranslate($text )
             'target'    => $this->to,
             'text'      => $text
         ])->reject(function ($item) {
-            return $item == null || $item == '';
+            return is_null($item) || empty($item);
         })->all())->getBody()->getContents();
         //Return translator object
         return $this;
@@ -111,7 +111,7 @@ public function listModels($defaultOnly = null, $sourceFilter = null, $targetFil
                                   'target'    => $targetFilter,
                                   'default'   => $defaultOnly,
                               ])->reject(function ($item) {
-                                  return $item == null || $item == '';
+                                  return is_null($item) || empty($item);
                               })->all())->getBody()->getContents();
         //Return translator object
         return $this;

tests/TestCase.php → tests/TestTranslator.php

@@ -1,15 +1,45 @@
 <?php
 
 use FindBrok\WatsonTranslate\Tests\Mocks\MockResponses;
-use Orchestra\Testbench\TestCase as TestBenchTestCase;
+use Orchestra\Testbench\TestCase;
 
 /**
  * Class TestCase
  */
-class TestCase extends TestBenchTestCase
+class TestTranslator extends TestCase
 {
     /**
-     * Setup
+     * Mock Responses
+     *
+     * @var MockResponses
+     */
+    protected $mockResponses;
+
+    /**
+     * Translator class to use
+     *
+     * @var string
+     */
+    protected $translatorClass;
+
+    /**
+     * Translator instance
+     *
+     * @var mixed
+     */
+    protected $translator;
+
+    /**
+     * Watson Bridge
+     *
+     * @var \FindBrok\WatsonBridge\Bridge
+     */
+    protected $bridge;
+
+    /**
+     * Setup the test environment.
+     *
+     * @return void
      */
     public function setUp()
     {