upgrade to google cloud package + add unit tests (#36)

.travis.yml

@@ -1,10 +1,12 @@
 language: php
 
 php:
-  - 5.4
   - 5.5
   - 5.6
+  - 7.0
+  - 7.1
   - hhvm
+  - nightly
 
 before_install:
   - bash -c 'if [ "$TRAVIS_PHP_VERSION" == "hhvm" ]; then rm phpunit.xml; fi;'

README.md

@@ -16,28 +16,44 @@ composer require superbalist/flysystem-google-storage
 ## Usage
 
 ```php
-use Superbalist\Flysystem\GoogleStorage\GoogleStorageAdapter;
+use Google\Cloud\Storage\StorageClient;
 use League\Flysystem\Filesystem;
+use Superbalist\Flysystem\GoogleStorage\GoogleStorageAdapter;
 
-$credentials = new \Google_Auth_AssertionCredentials(
-    '[your service account]',
-    [\Google_Service_Storage::DEVSTORAGE_FULL_CONTROL],
-    file_get_contents('[[path to the p12 key file]]'),
-    '[[your secret]]'
-);
+/**
+ * The credentials will be auto-loaded by the Google Cloud Client.
+ *
+ * 1. The client will first look at the GOOGLE_APPLICATION_CREDENTIALS env var.
+ *    You can use ```putenv('GOOGLE_APPLICATION_CREDENTIALS=/path/to/service-account.json');``` to set the location of your credentials file.
+ *
+ * 2. The client will look for the credentials file at the following paths:
+ * - windows: %APPDATA%/gcloud/application_default_credentials.json
+ * - others: $HOME/.config/gcloud/application_default_credentials.json
+ *
+ * If running in Google App Engine, the built-in service account associated with the application will be used.
+ * If running in Google Compute Engine, the built-in service account associated with the virtual machine instance will be used.
+ */
+
+$storageClient = new StorageClient([
+    'projectId' => 'your-project-id',
+]);
+$bucket = $storageClient->bucket('your-bucket-name');
+
+$adapter = new GoogleStorageAdapter($storageClient, $bucket);
+
+$filesystem = new Filesystem($adapter);
 
-$client = new \Google_Client();
-$client->setAssertionCredentials($credentials);
-$client->setDeveloperKey('[[your developer key]]');
+/**
+ * The credentials are manually specified by passing in a keyFilePath.
+ */
 
-$service = new \Google_Service_Storage($client);
+$storageClient = new StorageClient([
+    'projectId' => 'your-project-id',
+    'keyFilePath' => '/path/to/service-account.json',
+]);
+$bucket = $storageClient->bucket('your-bucket-name');
 
-$adapter = new GoogleStorageAdapter($service, '[[your bucket name]]');
+$adapter = new GoogleStorageAdapter($storageClient, $bucket);
 
 $filesystem = new Filesystem($adapter);
 ```
-
-
-## TODO
-
-* Unit tests to be written

composer.json

@@ -9,9 +9,9 @@
 		}
 	],
 	"require": {
-		"php": ">=5.4.0",
+		"php": ">=5.5.0",
 		"league/flysystem": "~1.0",
-		"google/apiclient": "~1.1"
+		"google/cloud": "^0.8.0"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "~4.0",