Travis with multiple Laravel versions (#38)

* test travis

* replace before_script by before_install

* remove mockery

* update travis

* updates

* dispatcher updates

* updates

* updates

* updates

* updates

* updates

Author: aivis

.travis.yml

@@ -1,13 +1,49 @@
 language: php
 
+cache:
+  directories:
+    - $HOME/.cache/pip
+    - $HOME/.composer/cache/files
+
 php:
   - 7.0
   - 7.1
   - 7.2
   - 7.3
 
-before_script:
+env:
+  - ILLUMINATE_VERSION=5.1.* PHPUNIT_VERSION=~4.0
+  - ILLUMINATE_VERSION=5.2.* PHPUNIT_VERSION=~4.0
+  - ILLUMINATE_VERSION=5.3.* PHPUNIT_VERSION=~5.0
+  - ILLUMINATE_VERSION=5.4.* PHPUNIT_VERSION=~5.7
+  - ILLUMINATE_VERSION=5.5.* PHPUNIT_VERSION=~6.0
+  - ILLUMINATE_VERSION=5.6.* PHPUNIT_VERSION=~7.0
+  - ILLUMINATE_VERSION=5.7.* PHPUNIT_VERSION=~7.0
+  - ILLUMINATE_VERSION=5.8.* PHPUNIT_VERSION=^7.5
+
+matrix:
+  exclude:
+    # 5.5 & 7.0
+    - php: 7.0
+      env: ILLUMINATE_VERSION=5.6.* PHPUNIT_VERSION=~7.0
+    - php: 7.0
+      env: ILLUMINATE_VERSION=5.7.* PHPUNIT_VERSION=~7.0
+    - php: 7.0
+      env: ILLUMINATE_VERSION=5.8.* PHPUNIT_VERSION=^7.5
+    # 5.4 & 7.1
+    - php: 7.1
+      env: ILLUMINATE_VERSION=5.1.* PHPUNIT_VERSION=~4.0
+    - php: 7.1
+      env: ILLUMINATE_VERSION=5.2.* PHPUNIT_VERSION=~4.0
+    - php: 7.1
+      env: ILLUMINATE_VERSION=5.3.* PHPUNIT_VERSION=~5.0
+
+before_install:
   - travis_retry composer self-update
-  - travis_retry composer install --prefer-source --no-interaction --dev
+  - composer require "illuminate/support:${ILLUMINATE_VERSION}" --no-update --prefer-dist
+  - composer require "orchestra/testbench:${ILLUMINATE_VERSION/5\./3\.}" --no-update --prefer-dist
+  - composer require "phpunit/phpunit:${PHPUNIT_VERSION}" --no-update --prefer-dist
+
+install: travis_retry composer install --no-interaction --prefer-dist
 
 script: vendor/bin/phpunit

composer.json

@@ -16,8 +16,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "~6.0",
-        "mockery/mockery": "^0.9.4",
-        "orchestra/testbench": "^3.5"
+        "orchestra/testbench": "^3.5",
+        "mockery/mockery": "^1.2"
     },
     "autoload": {
 		"psr-0": {

src/Understand/UnderstandLaravel5/FieldProvider.php

@@ -417,14 +417,29 @@ protected function getPostDataArray()
             return null;
         }
 
-        if ( ! $this->request->request instanceof \IteratorAggregate)
+        $source = null;
+
+        if (method_exists($this->request, 'json') && method_exists($this->request, 'isJson') && $this->request->isJson())
         {
-            return null;
+            $source = $this->request->json();
+        }
+        else if ($this->request->request instanceof \IteratorAggregate)
+        {
+            $source = $this->request->request;
+        }
+        else
+        {
+            return;
+        }
+
+        if ( ! $source)
+        {
+            return;
         }
 
         $postData = [];
 
-        foreach($this->request->request as $key => $value)
+        foreach($source as $key => $value)
         {
             try
             {

tests/EventListenerTest.php

@@ -1,6 +1,8 @@
 <?php
 
+use Illuminate\Foundation\Application;
 use Illuminate\Queue\Events\JobProcessing;
+use Illuminate\Support\Str;
 use Understand\UnderstandLaravel5\Logger;
 use Understand\UnderstandLaravel5\Handlers\CallbackHandler;
 
@@ -17,7 +19,7 @@ protected function getPackageProviders($app)
     {
         return ['Understand\UnderstandLaravel5\UnderstandLaravel5ServiceProvider'];
     }
-    
+
     /**
      * Test event listener
      *
@@ -57,17 +59,26 @@ public function testEventListener()
      */
     public function testRegenerateToken()
     {
-        $payload = 'test';
-        $connectionName = 'sync';
-        $queue = 'sync';
-
         $initialToken = $this->app['understand.tokenProvider']->getToken();
 
         $this->assertEquals($initialToken, $this->app['understand.tokenProvider']->getToken());
 
-        $job = new \Illuminate\Queue\Jobs\SyncJob($this->app, $payload, $connectionName, $queue);
+        $event = 'illuminate.queue.after';
+
+        if (class_exists('Illuminate\Queue\Events\JobProcessing'))
+        {
+            $job = new \Illuminate\Queue\Jobs\SyncJob($this->app, 'test', 'sync', 'sync');
+            $event = new JobProcessing('sync', $job, ['only 5.2 requires the third parameter']);
+        }
 
-        $this->app['events']->dispatch(new JobProcessing($connectionName, $job));
+        if (method_exists($this->app['events'], 'dispatch'))
+        {
+            $this->app['events']->dispatch($event);
+        }
+        else
+        {
+            $this->app['events']->fire($event);
+        }
 
         $this->assertNotEmpty($initialToken);
         $this->assertNotEquals($initialToken, $this->app['understand.tokenProvider']->getToken());
@@ -80,16 +91,26 @@ public function testRegenerateToken()
      */
     public function testDataCollectorResetsToken()
     {
-        $payload = 'test';
-        $connectionName = 'sync';
-        $queue = 'sync';
-
         $this->app['understand.dataCollector']->setInArray('test', 1);
 
         $this->assertEquals([1], $this->app['understand.dataCollector']->getByKey('test'));
 
-        $job = new \Illuminate\Queue\Jobs\SyncJob($this->app, $payload, $connectionName, $queue);
-        $this->app['events']->dispatch(new JobProcessing($connectionName, $job));
+        $event = 'illuminate.queue.after';
+
+        if (class_exists('Illuminate\Queue\Events\JobProcessing'))
+        {
+            $job = new \Illuminate\Queue\Jobs\SyncJob($this->app, 'test', 'sync', 'sync');
+            $event = new JobProcessing('sync', $job, ['only 5.2 requires the third parameter']);
+        }
+
+        if (method_exists($this->app['events'], 'dispatch'))
+        {
+            $this->app['events']->dispatch($event);
+        }
+        else
+        {
+            $this->app['events']->fire($event);
+        }
 
         $this->assertEmpty($this->app['understand.dataCollector']->getByKey('test'));
     }
@@ -259,7 +280,7 @@ public function testLoggerMessageBoolean()
         $this->assertSame($called, 1);
         $this->assertTrue($messageSame);
     }
-    
+
     /**
      * @return void
      */

tests/ExceptionEncoderTest.php

@@ -1,6 +1,6 @@
 <?php
 
-use PHPUnit\Framework\TestCase;
+use Orchestra\Testbench\TestCase;
 
 class ExceptionEncoderTest extends TestCase
 {

tests/FieldProviderTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Foundation\AliasLoader;
+use Illuminate\Support\Str;
 
 class FieldProviderTest extends Orchestra\Testbench\TestCase
 {
@@ -33,39 +34,39 @@ public function testExtend()
     public function testLaravelAuth()
     {
         $userId = 23452345;
-        
+
         \Illuminate\Support\Facades\Auth::shouldReceive('id')->once()->andReturn($userId);
-        
+
         $currentUserId = $this->app['understand.fieldProvider']->getUserId();
-        
+
         $this->assertSame($userId, $currentUserId);
     }
-    
+
     public function testSentinelGetUser()
     {
         $loader = AliasLoader::getInstance();
         $loader->alias('Sentinel', '\Illuminate\Support\Facades\Auth');
-        
+
         $user = new stdClass();
         $user->id = 423523;
-        
+
         \Illuminate\Support\Facades\Auth::shouldReceive('getUser')->once()->andReturn($user);
-        
+
         $currentUserId = $this->app['understand.fieldProvider']->getUserId();
 
         $this->assertSame($user->id, $currentUserId);
     }
-        
+
     public function testSentryGetUser()
     {
         $loader = AliasLoader::getInstance();
         $loader->alias('Sentry', '\Illuminate\Support\Facades\Auth');
-        
+
         $user = new stdClass();
         $user->id = 545;
-        
+
         \Illuminate\Support\Facades\Auth::shouldReceive('getUser')->once()->andReturn($user);
-        
+
         $currentUserId = $this->app['understand.fieldProvider']->getUserId();
 
         $this->assertSame($user->id, $currentUserId);
@@ -117,6 +118,8 @@ public function testEnableQueryBindings()
 
     public function testGetServerIp()
     {
+        \Illuminate\Support\Facades\Route::get('/', function() {});
+
         $this->call('GET', '/', [], [], [], ['SERVER_ADDR' => '127.0 0.1']);
 
         $ip = $this->app['understand.fieldProvider']->getServerIp();
@@ -126,6 +129,8 @@ public function testGetServerIp()
 
     public function testQueryString()
     {
+        \Illuminate\Support\Facades\Route::get('/test', function() {});
+
         $this->call('GET', '/test?query=123&password=1234');
 
         $queryString = $this->app['understand.fieldProvider']->getQueryStringArray();
@@ -136,6 +141,8 @@ public function testQueryString()
 
     public function testPostRequestParameters()
     {
+        \Illuminate\Support\Facades\Route::post('/', function() {});
+
         $this->call('POST', '/', ['test' => 'a', 'password' => 'b']);
 
         $postData = $this->app['understand.fieldProvider']->getPostDataArray();
@@ -146,6 +153,13 @@ public function testPostRequestParameters()
 
     public function testJsonRequest()
     {
+        if ( ! method_exists($this, 'json'))
+        {
+            return $this->markTestSkipped('The test base class does not support json requests');
+        }
+
+        \Illuminate\Support\Facades\Route::post('/', function() {});
+
         $this->json('POST', '/', ['test' => 'b', 'password' => 'test']);
 
         $jsonData = $this->app['understand.fieldProvider']->getPostDataArray();
@@ -156,6 +170,8 @@ public function testJsonRequest()
 
     public function testQueryStringDisabled()
     {
+        \Illuminate\Support\Facades\Route::get('/test', function() {});
+
         $this->app['config']->set('understand-laravel.query_string_enabled', false);
 
         $this->call('GET', '/test?query=123&password=1234');
@@ -167,6 +183,8 @@ public function testQueryStringDisabled()
 
     public function testPostRequestParametersDisabled()
     {
+        \Illuminate\Support\Facades\Route::post('/', function() {});
+
         $this->app['config']->set('understand-laravel.post_data_enabled', false);
 
         $this->call('POST', '/', ['test' => 'a', 'password' => 'b']);

tests/TestFileReaderTest.php

@@ -1,7 +1,7 @@
 <?php
 
 use Understand\UnderstandLaravel5\ExceptionEncoder;
-use PHPUnit\Framework\TestCase;
+use Orchestra\Testbench\TestCase;
 
 class TestFileReaderTest extends TestCase
 {

tests/TokenProviderTest.php

@@ -1,6 +1,6 @@
 <?php
 
-use PHPUnit\Framework\TestCase;
+use Orchestra\Testbench\TestCase;
 
 class TokenProviderTest extends TestCase
 {