Merge branch 'release/1.0.0'

Author: jimmypuckett

.travis.yml

@@ -1,26 +1,23 @@
 language: php
 
 php:
-  - 5.5.9
-  - 5.5
-  - 5.6
-  - 7.0
   - 7.1
+  - 7.2
 
 env:
   global:
     - setup=basic
 
 matrix:
   include:
-    - php: 7.0
-      env: setup=lowest
-    - php: 7.0
-      env: setup=stable
     - php: 7.1
       env: setup=lowest
     - php: 7.1
       env: setup=stable
+    - php: 7.2
+      env: setup=lowest
+    - php: 7.2
+      env: setup=stable
 
 sudo: false
 

VERSION

@@ -1 +1 @@
-0.8.0
+1.0.0

composer.json

@@ -17,19 +17,20 @@
     ],
     "require": {
         "php": ">=5.5.0",
-        "illuminate/cache": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*",
-        "illuminate/routing": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*",
-        "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*",
+        "illuminate/cache": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
+        "illuminate/routing": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
+        "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
         "mobiledetect/mobiledetectlib": "~2.8",
         "ua-parser/uap-php": "~3.4.1"
     },
     "require-dev": {
-        "illuminate/http": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*",
-        "mockery/mockery": "~0.9.1",
-        "phpunit/phpunit": "~4.0|~5.0",
+        "illuminate/http": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
+        "mockery/mockery": "^1",
+        "phpunit/phpunit": "~7.0",
         "psy/psysh": "^0.5.1",
-        "satooshi/php-coveralls": "^0.6.1|^1",
-        "symfony/var-dumper": "~2.7|~3.0"
+        "satooshi/php-coveralls": "^1",
+        "symfony/thanks": "^1.0",
+        "symfony/var-dumper": "~3.0"
     },
     "autoload": {
         "files": [

phpunit.xml.dist

@@ -41,10 +41,6 @@
         </whitelist>
     </filter>
 
-    <listeners>
-        <listener class="\Mockery\Adapter\Phpunit\TestListener"></listener>
-    </listeners>
-
     <logging>
         <log type="coverage-html"
              target="./build/coverage"

tests/FilterServiceProviderTest.php

@@ -71,27 +71,4 @@ public function it_does_nothing_in_the_register_method()
     {
         $this->assertNull($this->service_provider->register());
     }
-
-    /**
-     * @test
-     */
-    public function it_performs_a_boot_method()
-    {
-        /*$this->application_mock->shouldReceive('publishes')
-                               ->once()
-                               ->with([
-                                   '/some/path/browserfilter.php',
-                               ])
-                               ->andReturnNull();
-
-        $this->application_mock->shouldReceive('mergeConfigFrom')
-                               ->once()
-                               ->withArgs([
-                                   '/config/browserfilter.php',
-                                   'browserfilter',
-                               ])
-                               ->andReturnNull();*/
-
-        $this->service_provider->boot();
-    }
 }

tests/TestCase.php

@@ -2,22 +2,15 @@
 
 namespace Spinen\BrowserFilter;
 
-use Mockery;
-use PHPUnit_Framework_TestCase;
+use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
+use PHPUnit\Framework\TestCase as PHPUnitTestCase;
 
 /**
  * Class TestCase
  *
  * @package Spinen\BrowserFilter
  */
-abstract class TestCase extends PHPUnit_Framework_TestCase
+abstract class TestCase extends PHPUnitTestCase
 {
-    public function tearDown()
-    {
-        if (class_exists('Mockery')) {
-            Mockery::close();
-        }
-
-        parent::tearDown();
-    }
+    use MockeryPHPUnitIntegration;
 }