Merge pull request #9 from mikemand/guzzle-7-support

Add support for Guzzle 7, drop support for PHP 5

.gitignore

@@ -5,3 +5,4 @@ composer.lock
 composer.phar
 build
 vendor
+.phpunit.result.cache

.travis.yml

@@ -3,10 +3,9 @@ language: php
 sudo: false
 
 php:
-  - 5.6
-  - 7.0
-  - 7.1
   - 7.2
+  - 7.3
+  - 7.4
 
 before_script:
   - travis_retry composer self-update

composer.json

@@ -5,7 +5,7 @@
         "flysystem",
         "google-drive",
         "translated",
-				"extended"
+        "extended"
     ],
     "license": "Apache-2.0",
     "authors": [
@@ -16,20 +16,20 @@
         {
             "name": "Mitja Spes",
             "email": "mitja@lxnav.com"
-        }	
+        }
     ],
     "require": {
-        "php": ">=5.6.4",
+        "php": "^7.2",
         "ext-mbstring": "*",
-        "guzzlehttp/guzzle": ">=6.3 <7.0",
-        "league/flysystem": ">=1.0 < 2.0",
-        "google/apiclient": ">=2.2 <3.0"
+        "guzzlehttp/guzzle": "^6.3 | ^7.0",
+        "league/flysystem": "^1.0",
+        "google/apiclient": "^2.2"
     },
     "suggest": {
         "nao-pon/flysystem-cached-extra": "Required for elFinder"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.0|~6.0|~7.0"
+        "phpunit/phpunit": "^9.3"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -1,29 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
          colors="true"
          verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
+>
     <testsuites>
         <testsuite name="Flysystem Google Drive Adapter Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
+    <coverage processUncoveredFiles="true">
+        <include>
             <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
     <logging>
-        <log type="tap" target="build/report.tap"/>
-        <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
-        <log type="coverage-text" target="build/coverage.txt"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
+        <junit outputFile="build/junit.xml"/>
+        <teamcity outputFile="build/teamcity.txt"/>
+        <testdoxHtml outputFile="build/testdox.html"/>
+        <testdoxText outputFile="build/testdox.txt"/>
+        <testdoxXml outputFile="build/testdox.xml"/>
+        <text outputFile="build/logfile.txt"/>
     </logging>
 </phpunit>

tests/GoogleDriveAdapterTests.php

@@ -1,11 +1,13 @@
 <?php
 
-class GoogleDriveTests extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class GoogleDriveAdapterTests extends TestCase
 {
-  // TBD
+    // TBD
 
     public function testTrueIsTrue()
     {
-    $this->assertTrue(true);
+        $this->assertTrue(true);
     }
 }