Merge branch 'release/3.4.0'

Author: ssfinney

.travis.yml

@@ -1,19 +1,22 @@
 language: php
 
 php:
-  - 7.0
   - 7.1
+  - 7.2
 
 env:
   global:
     - setup=basic
 
 matrix:
-  fast_finish: true
   include:
-    - php: 7.0
+    - php: 7.1
       env: setup=lowest
-    - php: 7.0
+    - php: 7.1
+      env: setup=stable
+    - php: 7.2
+      env: setup=lowest
+    - php: 7.2
       env: setup=stable
 
 sudo: false

VERSION

@@ -1 +1 @@
-3.3.0
+3.4.0

composer.json

@@ -15,16 +15,17 @@
         }
     ],
     "require": {
-        "php": ">=7",
+        "php": ">=7.1",
         "guzzlehttp/guzzle": "^6.2",
         "illuminate/support": "~5.3",
         "nesbot/carbon": "~1.20"
     },
     "require-dev": {
-        "mockery/mockery": "~0.9.4",
-        "phpunit/phpunit": "~5.4",
-        "psy/psysh": "0.7.*|0.8.*",
-        "satooshi/php-coveralls": "^1.0"
+        "mockery/mockery": "^1",
+        "phpunit/phpunit": "~7.0",
+        "psy/psysh": "0.8.*",
+        "satooshi/php-coveralls": "^1.0",
+        "symfony/thanks": "^1.0"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

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

tests/TestCase.php

@@ -5,33 +5,26 @@
 use ArrayAccess;
 use Countable;
 use Iterator;
-use Mockery;
+use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use Mockery\MockInterface;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase as PHPUnitTestCase;
 
 /**
  * Class TestCase
  *
  * @package Tests\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;
 
     /**
      * Helper to allow mocking of iterator classes.
      *
      * @link https://gist.github.com/VladaHejda/8299871
      *
      * @param MockInterface $mock
-     * @param array         $items
+     * @param array $items
      *
      * @return void
      */
@@ -80,7 +73,7 @@ protected function mockArrayIterator(MockInterface $mock, array $items)
 
             $mock->shouldReceive('next')
                  ->andReturnUsing(function () use (& $counter) {
-                     ++ $counter;
+                     ++$counter;
                  });
         }