KnpLabs / Gaufrette

src/Gaufrette/Adapter/AclAwareAmazonS3.php

Doc Comments +3 added lines

@@ -186,6 +186,9 @@
         return $this->users;
     }
 
+    /**
+     * @param string $key
+     */
     private function updateAcl($key)
     {
         $response = $this->s3->set_object_acl($this->bucketName, $key, $this->getAcl());

Spacing +5 added lines, -5 removed lines

@@ -5,7 +5,7 @@ 
 use AmazonS3 as AmazonClient;
 use Gaufrette\Adapter;
 
-@trigger_error('The ' . __NAMESPACE__ . '\AclAwareAmazonS3 adapter is deprecated since version 0.4 and will be removed in 1.0. Use the AwsS3 adapter instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\AclAwareAmazonS3 adapter is deprecated since version 0.4 and will be removed in 1.0. Use the AwsS3 adapter instead.', E_USER_DEPRECATED);
 
 /**
  * Makes the AmazonS3 adapter ACL aware. Uses the AWS SDK for PHP v1.x.
@@ -37,7 +37,7 @@ 
 
     public function setAclConstant($constant)
     {
-        if (!defined($constant = 'AmazonS3::ACL_' . strtoupper($constant))) {
+        if (!defined($constant = 'AmazonS3::ACL_'.strtoupper($constant))) {
             throw new \InvalidArgumentException(sprintf('The ACL constant "%s" does not exist on AmazonS3.', $constant));
         }
 
@@ -53,13 +53,13 @@ 
                 throw new \InvalidArgumentException(sprintf('setUsers() expects an array where each item contains a "permission" key, but got %s.', json_encode($user)));
             }
 
-            if (!defined($constant = 'AmazonS3::GRANT_' . strtoupper($user['permission']))) {
+            if (!defined($constant = 'AmazonS3::GRANT_'.strtoupper($user['permission']))) {
                 throw new \InvalidArgumentException('The permission must be the suffix for one of the AmazonS3::GRANT_ constants.');
             }
             $user['permission'] = constant($constant);
 
             if (isset($user['group'])) {
-                if (!defined($constant = 'AmazonS3::USERS_' . strtoupper($user['group']))) {
+                if (!defined($constant = 'AmazonS3::USERS_'.strtoupper($user['group']))) {
                     throw new \InvalidArgumentException('The group must be the suffix for one of the AmazonS3::USERS_ constants.');
                 }
                 $user['id'] = constant($constant);
@@ -191,7 +191,7 @@ 
     {
         $response = $this->s3->set_object_acl($this->bucketName, $key, $this->getAcl());
         if (200 != $response->status) {
-            throw new \RuntimeException('S3-ACL change failed: ' . print_r($response, true));
+            throw new \RuntimeException('S3-ACL change failed: '.print_r($response, true));
         }
     }
 }

src/Gaufrette/Adapter/AzureBlobStorage.php

Doc Comments +2 added lines, -2 removed lines

@@ -458,7 +458,7 @@ 
     }
 
     /**
-     * @param string|resource $content
+     * @param string $content
      *
      * @return string
      */
@@ -476,7 +476,7 @@ 
     /**
      * @param string $key
      *
-     * @return array
+     * @return string[]
      * @throws \InvalidArgumentException
      */
     private function tokenizeKey($key)

Spacing +3 added lines, -3 removed lines

@@ -273,7 +273,7 @@ 
                 $containersList = $this->blobProxy->listContainers();
 
                 return call_user_func_array('array_merge', array_map(
-                    function (Container $container) {
+                    function(Container $container) {
                         $containerName = $container->getName();
 
                         return $this->fetchBlobs($containerName, $containerName);
@@ -567,10 +567,10 @@ 
         $blobList = $this->blobProxy->listBlobs($containerName);
 
         return array_map(
-            function (Blob $blob) use ($prefix) {
+            function(Blob $blob) use ($prefix) {
                 $name = $blob->getName();
                 if (null !== $prefix) {
-                    $name = $prefix . '/' . $name;
+                    $name = $prefix.'/'.$name;
                 }
 
                 return $name;

src/Gaufrette/Adapter/AwsS3.php

Doc Comments +6 added lines

@@ -307,6 +307,9 @@ 
         return true;
     }
 
+    /**
+     * @param string $key
+     */
     protected function getOptions($key, array $options = [])
     {
         $options['ACL'] = $this->options['acl'];
@@ -322,6 +325,9 @@ 
         return $options;
     }
 
+    /**
+     * @return string
+     */
     protected function computePath($key)
     {
         if (empty($this->options['directory'])) {

Spacing +2 added lines, -2 removed lines

@@ -139,7 +139,7 @@ 
         $this->ensureBucketExists();
         $options = $this->getOptions(
             $targetKey,
-            ['CopySource' => $this->bucket . '/' . $this->computePath($sourceKey)]
+            ['CopySource' => $this->bucket.'/'.$this->computePath($sourceKey)]
         );
 
         try {
@@ -268,7 +268,7 @@ 
     {
         $result = $this->service->listObjects([
             'Bucket' => $this->bucket,
-            'Prefix' => rtrim($this->computePath($key), '/') . '/',
+            'Prefix' => rtrim($this->computePath($key), '/').'/',
             'MaxKeys' => 1,
         ]);
         if (isset($result['Contents'])) {

src/Gaufrette/Filesystem.php

Doc Comments +1 added lines

@@ -241,6 +241,7 @@
 
     /**
      * {@inheritdoc}
+     * @param string $key
      */
     public function createFile($key)
     {

src/Gaufrette/Adapter/PhpseclibSftp.php

Spacing +2 added lines, -2 removed lines

@@ -200,7 +200,7 @@ 
 
     protected function computePath($key)
     {
-        return $this->directory . '/' . ltrim($key, '/');
+        return $this->directory.'/'.ltrim($key, '/');
     }
 
     protected function fetchKeys($directory = '', $onlyKeys = true)
@@ -218,7 +218,7 @@ 
                 continue;
             }
 
-            $path = ltrim($directory . '/' . $filename, '/');
+            $path = ltrim($directory.'/'.$filename, '/');
             if (isset($stat['type']) && $stat['type'] === NET_SFTP_TYPE_DIRECTORY) {
                 $keys['dirs'][] = $path;
             } else {

src/Gaufrette/Adapter/GridFS.php

Spacing +2 added lines, -2 removed lines

@@ -171,7 +171,7 @@ 
         if (isset($this->metadata[$key])) {
             return $this->metadata[$key];
         }
-        $meta = $this->bucket->findOne(['filename' => $key], ['projection' => ['metadata' => 1,'_id' => 0]]);
+        $meta = $this->bucket->findOne(['filename' => $key], ['projection' => ['metadata' => 1, '_id' => 0]]);
 
         if ($meta === null || !isset($meta['metadata'])) {
             return [];
@@ -215,7 +215,7 @@ 
         if (!$this->exists($key)) {
             return false;
         }
-        $size = $this->bucket->findOne(['filename' => $key], ['projection' => ['length' => 1,'_id' => 0]]);
+        $size = $this->bucket->findOne(['filename' => $key], ['projection' => ['length' => 1, '_id' => 0]]);
         if (!isset($size['length'])) {
             return false;
         }

src/Gaufrette/Adapter/Ftp.php

Spacing +11 added lines, -11 removed lines

@@ -125,13 +125,13 @@ 
         $this->ensureDirectoryExists($this->directory, $this->create);
 
         $file = $this->computePath($key);
-        $lines = ftp_rawlist($this->getConnection(), '-al ' . \Gaufrette\Util\Path::dirname($file));
+        $lines = ftp_rawlist($this->getConnection(), '-al '.\Gaufrette\Util\Path::dirname($file));
 
         if (false === $lines) {
             return false;
         }
 
-        $pattern = '{(?<!->) ' . preg_quote(basename($file)) . '( -> |$)}m';
+        $pattern = '{(?<!->) '.preg_quote(basename($file)).'( -> |$)}m';
         foreach ($lines as $line) {
             if (preg_match($pattern, $line)) {
                 return true;
@@ -238,7 +238,7 @@ 
         $directory = preg_replace('/^[\/]*([^\/].*)$/', '/$1', $directory);
 
         $items = $this->parseRawlist(
-            ftp_rawlist($this->getConnection(), '-al ' . $this->directory . $directory) ?: []
+            ftp_rawlist($this->getConnection(), '-al '.$this->directory.$directory) ?: []
         );
 
         $fileData = $dirs = [];
@@ -249,7 +249,7 @@ 
 
             $item = [
                 'name' => $itemData['name'],
-                'path' => trim(($directory ? $directory . '/' : '') . $itemData['name'], '/'),
+                'path' => trim(($directory ? $directory.'/' : '').$itemData['name'], '/'),
                 'time' => $itemData['time'],
                 'size' => $itemData['size'],
             ];
@@ -381,13 +381,13 @@ 
     {
         $directory = preg_replace('/^[\/]*([^\/].*)$/', '/$1', $directory);
 
-        $lines = ftp_rawlist($this->getConnection(), '-alR ' . $this->directory . $directory);
+        $lines = ftp_rawlist($this->getConnection(), '-alR '.$this->directory.$directory);
 
         if (false === $lines) {
             return ['keys' => [], 'dirs' => []];
         }
 
-        $regexDir = '/' . preg_quote($this->directory . $directory, '/') . '\/?(.+):$/u';
+        $regexDir = '/'.preg_quote($this->directory.$directory, '/').'\/?(.+):$/u';
         $regexItem = '/^(?:([d\-\d])\S+)\s+\S+(?:(?:\s+\S+){5})?\s+(\S+)\s+(.+?)$/';
 
         $prevLine = null;
@@ -411,7 +411,7 @@ 
                     continue;
                 }
 
-                $path = ltrim($directory . '/' . $name, '/');
+                $path = ltrim($directory.'/'.$name, '/');
 
                 if ('d' === $tokens[1] || '<dir>' === $tokens[2]) {
                     $keys['dirs'][] = $path;
@@ -451,13 +451,13 @@ 
             $infos = preg_split("/[\s]+/", $line, 9);
 
             if ($this->isLinuxListing($infos)) {
-                $infos[7] = (strrpos($infos[7], ':') != 2) ? ($infos[7] . ' 00:00') : (date('Y') . ' ' . $infos[7]);
+                $infos[7] = (strrpos($infos[7], ':') != 2) ? ($infos[7].' 00:00') : (date('Y').' '.$infos[7]);
                 if ('total' !== $infos[0]) {
                     $parsed[] = [
                         'perms' => $infos[0],
                         'num' => $infos[1],
                         'size' => $infos[4],
-                        'time' => strtotime($infos[5] . ' ' . $infos[6] . '. ' . $infos[7]),
+                        'time' => strtotime($infos[5].' '.$infos[6].'. '.$infos[7]),
                         'name' => $infos[8],
                     ];
                 }
@@ -467,7 +467,7 @@ 
                     'perms' => $isDir ? 'd' : '-',
                     'num' => '',
                     'size' => $isDir ? '' : $infos[2],
-                    'time' => strtotime($infos[0] . ' ' . $infos[1]),
+                    'time' => strtotime($infos[0].' '.$infos[1]),
                     'name' => $infos[3],
                 ];
             }
@@ -483,7 +483,7 @@ 
      */
     private function computePath($key)
     {
-        return rtrim($this->directory, '/') . '/' . $key;
+        return rtrim($this->directory, '/').'/'.$key;
     }
 
     /**

Indentation +2 added lines, -2 removed lines

@@ -264,8 +264,8 @@
         $this->fileData = array_merge($fileData, $this->fileData);
 
         return [
-           'keys' => array_keys($fileData),
-           'dirs' => $dirs,
+            'keys' => array_keys($fileData),
+            'dirs' => $dirs,
         ];
     }
 

src/Gaufrette/Adapter/AmazonS3.php

Spacing +4 added lines, -4 removed lines

@@ -5,7 +5,7 @@ 
 use AmazonS3 as AmazonClient;
 use Gaufrette\Adapter;
 
-@trigger_error('The ' . __NAMESPACE__ . '\AmazonS3 adapter is deprecated since version 0.4 and will be removed in 1.0. Use the AwsS3 adapter instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\AmazonS3 adapter is deprecated since version 0.4 and will be removed in 1.0. Use the AwsS3 adapter instead.', E_USER_DEPRECATED);
 
 /**
  * Amazon S3 adapter using the AWS SDK for PHP v1.x.
@@ -125,11 +125,11 @@ 
         $this->ensureBucketExists();
 
         $response = $this->service->copy_object(
-            [ // source
+            [// source
                 'bucket' => $this->bucket,
                 'filename' => $this->computePath($sourceKey),
             ],
-            [ // target
+            [// target
                 'bucket' => $this->bucket,
                 'filename' => $this->computePath($targetKey),
             ],
@@ -236,7 +236,7 @@ 
      */
     public function isDirectory($key)
     {
-        if ($this->exists($key . '/')) {
+        if ($this->exists($key.'/')) {
             return true;
         }
 

src/Gaufrette/Adapter/GoogleCloudStorage.php

Spacing +1 added lines, -1 removed lines

@@ -270,7 +270,7 @@
      */
     public function isDirectory($key)
     {
-        if ($this->exists($key . '/')) {
+        if ($this->exists($key.'/')) {
             return true;
         }
 

Doc Comments +6 added lines, -1 removed lines

@@ -355,6 +355,11 @@ 
         }
     }
 
+    /**
+     * @param string $key
+     *
+     * @return string
+     */
     protected function computePath($key)
     {
         if (empty($this->options['directory'])) {
@@ -368,7 +373,7 @@ 
      * @param string $path
      * @param array  $options
      *
-     * @return bool|\Google_Service_Storage_StorageObject
+     * @return string
      */
     private function getObjectData($path, $options = [])
     {