Merge branch 'release/2.3.0'

spinen · Apr 3, 2020 · ce2587d · ce2587d
2 parents 55f50aa + 0891286
commit ce2587d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,9 @@ matrix:
     - php: 7.3
     - php: 7.3
       env: SETUP=lowest
+    - php: 7.4
+    - php: 7.4
+      env: SETUP=lowest
 
 sudo: false
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.2.0
+2.3.0
diff --git a/composer.json b/composer.json
@@ -21,16 +21,16 @@
     ],
     "require": {
         "php": ">=7.2",
-        "illuminate/contracts": "~5.5|~6",
-        "illuminate/support": "~5.5|~6",
+        "illuminate/contracts": "~5.5|~6|~7",
+        "illuminate/support": "~5.5|~6|~7",
         "phayes/geophp": "~1.2"
     },
     "require-dev": {
-        "mockery/mockery": "^1",
-        "phpunit/phpunit": "~7.0.1|~8.0",
-        "psy/psysh": "^0.9.0",
+        "mockery/mockery": "^1.3.1",
+        "phpunit/phpunit": "^8.4|^9.0",
+        "psy/psysh": "^0.10",
         "symfony/thanks": "^1.1",
-        "symfony/var-dumper": "~3.0|^4.2"
+        "symfony/var-dumper": "^5.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -14,7 +14,7 @@
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
-         processIsolation="true"
+         processIsolation="false"
          stopOnFailure="false"
          verbose="true">
 
@@ -48,7 +48,6 @@
              showOnlySummary="true"
              showUncoveredFiles="false"/>
         <log type="coverage-clover" target="build/phpunit/logs/clover.xml"/>
-        <log type="json" target="./build/phpunit/logs/logfile.json"/>
         <log type="junit" target="./build/phpunit/logs/junit.xml"/>
     </logging>
 </phpunit>
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -28,7 +28,7 @@ abstract class TestCase extends PHPUnitTestCase
      *
      * @return void
      */
-    protected function mockArrayIterator(MockInterface $mock, array $items)
+    protected function mockArrayIterator(MockInterface $mock, array $items): void
     {
         if ($mock instanceof ArrayAccess) {
             foreach ($items as $key => $val) {