style: #43 Slevomat

Author: shaunthegeek

composer.json

@@ -13,6 +13,7 @@
         "mockery/mockery": "^1.4",
         "phpmd/phpmd": "^2.10",
         "phpunit/phpunit": "^9.5",
+        "slevomat/coding-standard": "^7.0",
         "squizlabs/php_codesniffer": "^3.6"
     },
     "license": "Apache-2.0",
@@ -25,6 +26,13 @@
     "scripts": {
         "post-install-cmd": [
             "php -r \"if (is_dir('.git/hooks/')) {copy('.git-pre-commit', '.git/hooks/pre-commit'); chmod('.git/hooks/pre-commit', 0755);}\""
-        ]
+        ],
+        "lint": "phpcs --standard=phpcs.xml .",
+        "lint-fix": "phpcbf --standard=phpcs.xml ."
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }

composer.lock-php8.0

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 return [
 
     /*

lang/en/validation.php

@@ -1,9 +1,19 @@
 <?xml version="1.0"?>
-<ruleset name="PSR12-FOO">
-  <description>The PSR12 standard.</description>
+<ruleset name="PSR12-Slevomat">
   <exclude-pattern>/vendor/</exclude-pattern>
   <arg name="extensions" value="php" />
 
   <!-- Include the whole PSR12 standard -->
-  <rule ref="PSR12"/>
+  <rule ref="PSR12" />
+
+  <config name="installed_paths" value="../../slevomat/coding-standard" />
+  <rule ref="SlevomatCodingStandard.ControlStructures.DisallowYodaComparison" />
+  <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
+    <properties>
+      <property name="declareOnFirstLine" value="false" />
+      <property name="linesCountBeforeDeclare" value="1" />
+      <property name="linesCountAfterDeclare" value="1" />
+      <property name="spacesCountAroundEqualsSign" value="0" />
+    </properties>
+  </rule>
 </ruleset>

phpcs.xml

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Coding;
 
 use Coding\Exceptions\ValidationException;
@@ -14,7 +16,7 @@ public function __construct(Client $client = null)
         $this->client = $client ?? new Client();
     }
 
-    protected function validate(array $data, array $rules)
+    protected function validate(array $data, array $rules): void
     {
         $validator = Validator::getInstance()->make($data, $rules);
         if ($validator->fails()) {

src/Base.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Coding;
 
 use Coding\Exceptions\ApiError;
@@ -34,14 +36,14 @@ public function setHttpClient(ClientInterface $http): void
 
     public function getHttpClient(): ClientInterface
     {
-        if (null === $this->http) {
+        if (is_null($this->http)) {
             $this->http = new GuzzleClient();
         }
 
         return $this->http;
     }
 
-    public function request(string $action, array $data)
+    public function request(string $action, array $data): array
     {
         $params = ['Action' => $action];
         $response = $this->getHttpClient()->request('POST', $this->config['api_url'], [
@@ -52,14 +54,14 @@ public function request(string $action, array $data)
             ],
             'json' => array_merge($params, $data),
         ]);
-        $result = json_decode($response->getBody(), true);
+        $result = json_decode($response->getBody()->getContents(), true);
         if (isset($result['Response']['Error']['Message'])) {
             throw new ApiError($result['Response']['Error']['Message']);
         }
         return $result['Response'];
     }
 
-    public function requestProjectApi(string $action, array $data = [])
+    public function requestProjectApi(string $action, array $data = []): array
     {
         if (empty($this->config['project_name'])) {
             throw new ValidationException('Need set project name first.');
@@ -68,22 +70,22 @@ public function requestProjectApi(string $action, array $data = [])
         return $this->request($action, $data);
     }
 
-    public function setPersonalToken(string $token)
+    public function setPersonalToken(string $token): void
     {
         $this->config['personal_token'] = $token;
     }
 
-    public function setProjectName(string $projectName)
+    public function setProjectName(string $projectName): void
     {
         $this->config['project_name'] = $projectName;
     }
 
-    public function setProjectToken(string $token)
+    public function setProjectToken(string $token): void
     {
         $this->config['project_token'] = $token;
     }
 
-    private function getToken()
+    private function getToken(): string
     {
         if ($this->usePersonalToken) {
             if (empty($this->config['personal_token'])) {

src/Client.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Coding\Exceptions;
 
 use Exception;

src/Exceptions/ApiError.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Coding\Exceptions;
 
 use Exception;

src/Exceptions/ValidationException.php

@@ -1,12 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Coding;
 
 use Illuminate\Validation\Rule;
 
 class GitBranch extends Base
 {
-    public function index(array $data)
+    public function index(array $data): array
     {
         $this->validate($data, [
             'DepotId' => 'integer|required',

src/GitBranch.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Coding\Handlers;
 
 use Illuminate\Filesystem\Filesystem;