php-opencloud · haphan · Mar 13, 2018 · Mar 13, 2018
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -1,13 +1,17 @@
 <?php
+
 if (!file_exists(__DIR__.'/src')) {
     exit(0);
 }
+
 return PhpCsFixer\Config::create()
     ->setRules(
         [
-            '@PSR2'                => true,
-            'array_syntax'         => ['syntax' => 'short'],
-            'protected_to_private' => false
+            '@PSR2'                  => true,
+            '@Symfony'               => true,
+            'array_syntax'           => ['syntax' => 'short'],
+            'binary_operator_spaces' => ['default' => 'align'],
+            'protected_to_private'   => false,
         ]
     )
     ->setUsingCache(false)

diff --git a/src/BlockStorage/v2/Api.php b/src/BlockStorage/v2/Api.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace OpenStack\BlockStorage\v2;
 
@@ -8,7 +10,7 @@ class Api extends AbstractApi
 {
     public function __construct()
     {
-        $this->params = new Params;
+        $this->params = new Params();
     }
 
     public function postVolumes(): array
@@ -37,9 +39,9 @@ public function getVolumes(): array
             'method' => 'GET',
             'path'   => 'volumes',
             'params' => [
-                'limit'  => $this->params->limit(),
-                'marker' => $this->params->marker(),
-                'sort'   => $this->params->sort(),
+                'limit'      => $this->params->limit(),
+                'marker'     => $this->params->marker(),
+                'sort'       => $this->params->sort(),
                 'allTenants' => $this->params->allTenants(),
             ],
         ];
@@ -62,11 +64,11 @@ public function getVolumesDetail(): array
     public function getVolume(): array
     {
         return [
-            'method'     => 'GET',
-            'path'       => 'volumes/{id}',
-            'params'     => [
-                'id' => $this->params->idPath()
-            ]
+            'method' => 'GET',
+            'path'   => 'volumes/{id}',
+            'params' => [
+                'id' => $this->params->idPath(),
+            ],
         ];
     }
 
@@ -139,10 +141,10 @@ public function postTypes(): array
     public function putType(): array
     {
         return [
-            'method' => 'PUT',
-            'path'   => 'types/{id}',
+            'method'  => 'PUT',
+            'path'    => 'types/{id}',
             'jsonKey' => 'volume_type',
-            'params' => [
+            'params'  => [
                 'id'    => $this->params->idPath(),
                 'name'  => $this->params->name('volume type'),
                 'specs' => $this->params->typeSpecs(),
@@ -171,10 +173,10 @@ public function deleteType(): array
     public function postSnapshots(): array
     {
         return [
-            'method' => 'POST',
-            'path'   => 'snapshots',
+            'method'  => 'POST',
+            'path'    => 'snapshots',
             'jsonKey' => 'snapshot',
-            'params' => [
+            'params'  => [
                 'volumeId'    => $this->params->volId(),
                 'force'       => $this->params->force(),
                 'name'        => $this->params->snapshotName(),
@@ -218,10 +220,10 @@ public function getSnapshot(): array
     public function putSnapshot(): array
     {
         return [
-            'method' => 'PUT',
-            'path'   => 'snapshots/{id}',
+            'method'  => 'PUT',
+            'path'    => 'snapshots/{id}',
             'jsonKey' => 'snapshot',
-            'params' => [
+            'params'  => [
                 'id'          => $this->params->idPath(),
                 'name'        => $this->params->snapshotName(),
                 'description' => $this->params->desc(),
@@ -265,8 +267,8 @@ public function getQuotaSet(): array
             'method' => 'GET',
             'path'   => 'os-quota-sets/{tenantId}',
             'params' => [
-                'tenantId' => $this->params->idPath('quota-sets')
-            ]
+                'tenantId' => $this->params->idPath('quota-sets'),
+            ],
         ];
     }
 
@@ -277,8 +279,8 @@ public function deleteQuotaSet(): array
             'path'    => 'os-quota-sets/{tenantId}',
             'jsonKey' => 'quota_set',
             'params'  => [
-                'tenantId' => $this->params->idPath('quota-sets')
-            ]
+                'tenantId' => $this->params->idPath('quota-sets'),
+            ],
         ];
     }
 
@@ -299,7 +301,7 @@ public function putQuotaSet(): array
                 'snapshotsIscsi'     => $this->params->quotaSetSnapshotsIscsi(),
                 'volumes'            => $this->params->quotaSetVolumes(),
                 'volumesIscsi'       => $this->params->quotaSetVolumesIscsi(),
-            ]
+            ],
         ];
     }
 }
diff --git a/src/BlockStorage/v2/Models/QuotaSet.php b/src/BlockStorage/v2/Models/QuotaSet.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace OpenStack\BlockStorage\v2\Models;
 
@@ -8,7 +10,7 @@
 use OpenStack\Common\Resource\Updateable;
 
 /**
- * Represents a BlockStorage v2 Quota Set
+ * Represents a BlockStorage v2 Quota Set.
  *
  * @property \OpenStack\BlockStorage\v2\Api $api
  */
@@ -51,22 +53,22 @@ class QuotaSet extends OperatorResource implements Retrievable, Updateable, Dele
         'per_volume_gigabytes' => 'perVolumeGigabytes',
         'snapshots_iscsi'      => 'snapshotsIscsi',
         'volumes_iscsi'        => 'volumesIscsi',
-        'id'                   => 'tenantId'
+        'id'                   => 'tenantId',
     ];
 
     protected $resourceKey = 'quota_set';
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function retrieve()
     {
-        $response = $this->execute($this->api->getQuotaSet(), ['tenantId' => (string)$this->tenantId]);
+        $response = $this->execute($this->api->getQuotaSet(), ['tenantId' => (string) $this->tenantId]);
         $this->populateFromResponse($response);
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function update()
     {
@@ -75,7 +77,7 @@ public function update()
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function delete()
     {

diff --git a/src/BlockStorage/v2/Models/Snapshot.php b/src/BlockStorage/v2/Models/Snapshot.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace OpenStack\BlockStorage\v2\Models;
 
@@ -45,28 +47,29 @@ class Snapshot extends OperatorResource implements Listable, Creatable, Updateab
     /** @var int */
     public $size;
 
-    protected $resourceKey = 'snapshot';
+    protected $resourceKey  = 'snapshot';
     protected $resourcesKey = 'snapshots';
-    protected $markerKey = 'id';
+    protected $markerKey    = 'id';
 
     protected $aliases = [
-        'volume_id'  => 'volumeId',
+        'volume_id' => 'volumeId',
     ];
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
-            'created_at' => new Alias('createdAt', \DateTimeImmutable::class)
+            'created_at' => new Alias('createdAt', \DateTimeImmutable::class),
         ];
     }
 
     public function populateFromResponse(ResponseInterface $response): self
     {
         parent::populateFromResponse($response);
         $this->metadata = $this->parseMetadata($response);
+
         return $this;
     }
 
@@ -84,6 +87,7 @@ public function retrieve()
     public function create(array $userOptions): Creatable
     {
         $response = $this->execute($this->api->postSnapshots(), $userOptions);
+
         return $this->populateFromResponse($response);
     }
 
@@ -99,8 +103,9 @@ public function delete()
 
     public function getMetadata(): array
     {
-        $response = $this->executeWithState($this->api->getSnapshotMetadata());
+        $response       = $this->executeWithState($this->api->getSnapshotMetadata());
         $this->metadata = $this->parseMetadata($response);
+
         return $this->metadata;
     }
 
@@ -120,6 +125,7 @@ public function resetMetadata(array $metadata)
     public function parseMetadata(ResponseInterface $response): array
     {
         $json = Utils::jsonDecode($response);
+
         return isset($json['metadata']) ? $json['metadata'] : [];
     }
 }
diff --git a/src/BlockStorage/v2/Models/Volume.php b/src/BlockStorage/v2/Models/Volume.php
@@ -1,4 +1,7 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
+
 namespace OpenStack\BlockStorage\v2\Models;
 
 use OpenStack\Common\Resource\Alias;
@@ -65,9 +68,9 @@ class Volume extends OperatorResource implements Creatable, Listable, Updateable
     /** @var array */
     public $volumeImageMetadata = [];
 
-    protected $resourceKey = 'volume';
+    protected $resourceKey  = 'volume';
     protected $resourcesKey = 'volumes';
-    protected $markerKey = 'id';
+    protected $markerKey    = 'id';
 
     protected $aliases = [
         'availability_zone'            => 'availabilityZone',
@@ -80,19 +83,20 @@ class Volume extends OperatorResource implements Creatable, Listable, Updateable
     ];
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
-            'created_at' => new Alias('createdAt', \DateTimeImmutable::class)
+            'created_at' => new Alias('createdAt', \DateTimeImmutable::class),
         ];
     }
 
     public function populateFromResponse(ResponseInterface $response): self
     {
         parent::populateFromResponse($response);
         $this->metadata = $this->parseMetadata($response);
+
         return $this;
     }
 
@@ -110,6 +114,7 @@ public function retrieve()
     public function create(array $userOptions): Creatable
     {
         $response = $this->execute($this->api->postVolumes(), $userOptions);
+
         return $this->populateFromResponse($response);
     }
 
@@ -126,8 +131,9 @@ public function delete()
 
     public function getMetadata(): array
     {
-        $response = $this->executeWithState($this->api->getVolumeMetadata());
+        $response       = $this->executeWithState($this->api->getVolumeMetadata());
         $this->metadata = $this->parseMetadata($response);
+
         return $this->metadata;
     }
 
@@ -147,6 +153,7 @@ public function resetMetadata(array $metadata)
     public function parseMetadata(ResponseInterface $response): array
     {
         $json = Utils::jsonDecode($response);
+
         return isset($json['metadata']) ? $json['metadata'] : [];
     }
 }
diff --git a/src/BlockStorage/v2/Models/VolumeAttachment.php b/src/BlockStorage/v2/Models/VolumeAttachment.php
@@ -1,4 +1,7 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
+
 namespace OpenStack\BlockStorage\v2\Models;
 
 use OpenStack\Common\Resource\Listable;
@@ -21,6 +24,6 @@ class VolumeAttachment extends OperatorResource implements Listable
     /** @var string */
     public $volumeId;
 
-    protected $resourceKey = 'volumeAttachment';
+    protected $resourceKey  = 'volumeAttachment';
     protected $resourcesKey = 'volumeAttachments';
 }
diff --git a/src/BlockStorage/v2/Models/VolumeType.php b/src/BlockStorage/v2/Models/VolumeType.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace OpenStack\BlockStorage\v2\Models;
 
@@ -30,6 +32,7 @@ class VolumeType extends OperatorResource implements Listable, Creatable, Update
     public function create(array $userOptions): Creatable
     {
         $response = $this->execute($this->api->postTypes(), $userOptions);
+
         return $this->populateFromResponse($response);
     }