Apply fixes from StyleCI (#50)

Author: matthewgoslett

phpunit.php

@@ -1,3 +1,3 @@
 <?php
 
-include __DIR__.'/vendor/autoload.php';
+include __DIR__ . '/vendor/autoload.php';

src/GoogleStorageAdapter.php

@@ -7,8 +7,8 @@
 use Google\Cloud\Storage\Bucket;
 use Google\Cloud\Storage\StorageClient;
 use Google\Cloud\Storage\StorageObject;
-use League\Flysystem\AdapterInterface;
 use League\Flysystem\Adapter\AbstractAdapter;
+use League\Flysystem\AdapterInterface;
 use League\Flysystem\Config;
 use League\Flysystem\Util;
 
@@ -83,6 +83,7 @@ public function setStorageApiUri($uri)
      * Return the storage api uri.
      *
      * @param string $uri
+     *
      * @return string
      */
     public function getStorageApiUri()
@@ -130,6 +131,7 @@ public function updateStream($path, $resource, Config $config)
      * Returns an array of options from the config.
      *
      * @param Config $config
+     *
      * @return array
      */
     protected function getOptionsFromConfig(Config $config)
@@ -143,7 +145,7 @@ protected function getOptionsFromConfig(Config $config)
             // we therefore default to private
             $options['predefinedAcl'] = $this->getPredefinedAclForVisibility(AdapterInterface::VISIBILITY_PRIVATE);
         }
-        
+
         if ($metadata = $config->get('metadata')) {
             $options['metadata'] = $metadata;
         }
@@ -157,6 +159,7 @@ protected function getOptionsFromConfig(Config $config)
      * @param string $path
      * @param string|resource $contents
      * @param Config $config
+     *
      * @return array
      */
     protected function upload($path, $contents, Config $config)
@@ -175,6 +178,7 @@ protected function upload($path, $contents, Config $config)
      * Returns a dictionary of object metadata from an object.
      *
      * @param StorageObject $object
+     *
      * @return array
      */
     protected function normaliseObject(StorageObject $object)
@@ -258,6 +262,7 @@ public function createDir($dirname, Config $config)
      * Returns a normalised directory name from the given path.
      *
      * @param string $dirname
+     *
      * @return string
      */
     protected function normaliseDirName($dirname)
@@ -274,7 +279,7 @@ public function setVisibility($path, $visibility)
 
         if ($visibility === AdapterInterface::VISIBILITY_PRIVATE) {
             $object->acl()->delete('allUsers');
-        } else if ($visibility === AdapterInterface::VISIBILITY_PUBLIC) {
+        } elseif ($visibility === AdapterInterface::VISIBILITY_PUBLIC) {
             $object->acl()->add('allUsers', Acl::ROLE_READER);
         }
 
@@ -375,7 +380,7 @@ public function getTimestamp($path)
     public function getVisibility($path)
     {
         return [
-            'visibility' => $this->getRawVisibility($path)
+            'visibility' => $this->getRawVisibility($path),
         ];
     }
 
@@ -385,6 +390,7 @@ public function getVisibility($path)
      * Note: The file must have `AdapterInterface::VISIBILITY_PUBLIC` visibility.
      *
      * @param string $path
+     *
      * @return string
      */
     public function getUrl($path)
@@ -396,6 +402,7 @@ public function getUrl($path)
 
     /**
      * @param string $path
+     *
      * @return string
      */
     protected function getRawVisibility($path)
@@ -415,6 +422,7 @@ protected function getRawVisibility($path)
      * Returns a storage object for the given path.
      *
      * @param string $path
+     *
      * @return \Google\Cloud\Storage\StorageObject
      */
     protected function getObject($path)
@@ -425,6 +433,7 @@ protected function getObject($path)
 
     /**
      * @param string $visibility
+     *
      * @return string
      */
     protected function getPredefinedAclForVisibility($visibility)

tests/GoogleStorageAdapterTests.php

@@ -12,16 +12,16 @@
 use Psr\Http\Message\StreamInterface;
 use Superbalist\Flysystem\GoogleStorage\GoogleStorageAdapter;
 
-class GoogleStorageTests extends \PHPUnit_Framework_TestCase
+class GoogleStorageAdapterTests extends \PHPUnit_Framework_TestCase
 {
-	public function testGetStorageClient()
-	{
-	    $storageClient = Mockery::mock(StorageClient::class);
+    public function testGetStorageClient()
+    {
+        $storageClient = Mockery::mock(StorageClient::class);
         $bucket = Mockery::mock(Bucket::class);
         $adapter = new GoogleStorageAdapter($storageClient, $bucket);
 
         $this->assertSame($storageClient, $adapter->getStorageClient());
-	}
+    }
 
     public function testGetBucket()
     {
@@ -54,7 +54,7 @@ public function testWrite()
                 [
                     'name' => 'prefix/file1.txt',
                     'predefinedAcl' => 'projectPrivate',
-                ]
+                ],
             ])
             ->once()
             ->andReturn($storageObject);
@@ -98,7 +98,7 @@ public function testWriteWithPrivateVisibility()
                 [
                     'name' => 'prefix/file1.txt',
                     'predefinedAcl' => 'projectPrivate',
-                ]
+                ],
             ])
             ->once()
             ->andReturn($storageObject);
@@ -142,7 +142,7 @@ public function testWriteWithPublicVisibility()
                 [
                     'name' => 'prefix/file1.txt',
                     'predefinedAcl' => 'publicRead',
-                ]
+                ],
             ])
             ->once()
             ->andReturn($storageObject);
@@ -188,7 +188,7 @@ public function testWriteStream()
                 [
                     'name' => 'prefix/file1.txt',
                     'predefinedAcl' => 'projectPrivate',
-                ]
+                ],
             ])
             ->once()
             ->andReturn($storageObject);