Merge pull request #3 from gloomy/master

Add PSR12 and fix outstanding issues

Author: codemash-io

.gitattributes

@@ -0,0 +1,2 @@
+# Linux/unix/MacOs line endings
+* text eol=lf

.github/workflows/php.yml

@@ -41,5 +41,8 @@ jobs:
         if: steps.composer-cache.outputs.cache-hit != 'true'
         run: composer install --prefer-dist --no-progress --no-suggest
 
+      - name: Run phpcs
+        run: composer run-script phpcs src
+
       - name: Run phpunit
-        run: ./vendor/bin/phpunit
+        run: composer run-script test

composer.json

@@ -11,7 +11,8 @@
     "guzzlehttp/guzzle": "^7.0.1"
   },
   "require-dev": {
-    "phpunit/phpunit": "^8.5"
+    "phpunit/phpunit": "^8.5",
+    "squizlabs/php_codesniffer": "*"
   },
   "autoload": {
     "psr-4": {
@@ -28,6 +29,8 @@
     }
   },
   "scripts": {
-    "test": "phpunit"
+    "test": "phpunit",
+    "phpcs": "phpcs",
+    "phpcbf": "phpcbf"
   }
 }

composer.lock

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<ruleset name="CodeMash.Php code standarts">
+    <description>The coding standard for CodeMash PHP SDK project</description>
+    <arg name="extensions" value="php"/>
+    <arg value="p"/> <!-- progress -->
+    <rule ref="PSR12">
+    </rule>
+</ruleset>

phpcs.xml

@@ -179,13 +179,17 @@ public function updateOne(array $params): array
     {
         $params = CodemashDbParams::prepUpdateOneParams($params);
 
-        $response = $this->client->request('PATCH', $this->uriPrefix . $params['collectionName'] . '/' . $params['id'], [
-            'headers' => [
-                'Accept' => 'application/json',
-                'Content-Type' => 'application/json',
-            ],
-            'body' => toJson($params),
-        ]);
+        $response = $this->client->request(
+            'PATCH',
+            $this->uriPrefix . $params['collectionName'] . '/' . $params['id'],
+            [
+                'headers' => [
+                    'Accept' => 'application/json',
+                    'Content-Type' => 'application/json',
+                ],
+                'body' => toJson($params),
+            ]
+        );
 
         return $response['result'];
     }
@@ -236,13 +240,17 @@ public function deleteOne(array $params): array
     {
         $params = CodemashDbParams::prepDeleteOneParams($params);
 
-        $response = $this->client->request('DELETE', $this->uriPrefix . $params['collectionName'] . '/' . $params['id'], [
-            'headers' => [
-                'Accept' => 'application/json',
-                'Content-Type' => 'application/json',
-            ],
-            'body' => toJson($params),
-        ]);
+        $response = $this->client->request(
+            'DELETE',
+            $this->uriPrefix . $params['collectionName'] . '/' . $params['id'],
+            [
+                'headers' => [
+                    'Accept' => 'application/json',
+                    'Content-Type' => 'application/json',
+                ],
+                'body' => toJson($params),
+            ]
+        );
 
         return $response['result'];
     }
@@ -312,13 +320,17 @@ public function getTaxonomyTerms(array $params): array
     {
         $params = CodemashDbParams::prepGetTaxonomyTerms($params);
 
-        $response = $this->client->request('GET', $this->uriPrefix . '/taxonomies/' . $params['taxonomyName'] . '/terms', [
-            'headers' => [
-                'Accept' => 'application/json',
-                'Content-Type' => 'application/json',
-            ],
-            'body' => toJson($params),
-        ]);
+        $response = $this->client->request(
+            'GET',
+            $this->uriPrefix . '/taxonomies/' . $params['taxonomyName'] . '/terms',
+            [
+                'headers' => [
+                    'Accept' => 'application/json',
+                    'Content-Type' => 'application/json',
+                ],
+                'body' => toJson($params),
+            ]
+        );
 
         return $response['result'];
     }

src/CodemashDb.php

@@ -97,7 +97,11 @@ public function uploadRecordFile(array $params): array
 
         $options = $this->prepUploadFileOptions($params);
 
-        $response = $this->client->request('POST', $this->uriPrefix . 'db/' . $params['collectionName'] . '/files', $options);
+        $response = $this->client->request(
+            'POST',
+            $this->uriPrefix . 'db/' . $params['collectionName'] . '/files',
+            $options
+        );
 
         return $response['result'];
     }

src/CodemashFile.php

@@ -144,7 +144,7 @@ public static function prepGetAggregateParams(array $params): array
         return [
             'collectionName' => $params['collectionName'],
             'id' => $params['id'] ?? null,
-            'pipeline' => ! empty ($params['pipeline']) ? array_map('toJson', $params['pipeline']) : null,
+            'pipeline' => ! empty($params['pipeline']) ? array_map('toJson', $params['pipeline']) : null,
             'tokens' => ! empty($params['tokens']) ? (object) ($params['tokens']) : null,
         ];
     }