SDK-2452 updated php-fixer lint errors to match standarts (#64)

* SDK-2452 updated php-fixer lint errors to match standarts * SDK-2452 updated yoti-sdk and php versions
getyoti · Apr 26, 2024 · d493a4e · d493a4e
1 parent 296ed39
commit d493a4e
Show file tree

Hide file tree

Showing 32 changed files with 43 additions and 37 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -42,7 +42,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ 7.4, 7.3, 7.2, 7.1 ]
+        php-version: [ 7.4, 8.0 ]
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -0,0 +1,28 @@
+<?php
+$finder = PhpCsFixer\Finder::create()
+    ->exclude('Protobuf')
+    ->in(__DIR__ . '/src')
+    ->in(__DIR__ . '/tests')
+;
+
+$config = new PhpCsFixer\Config();
+$config
+    ->setRiskyAllowed(true)
+    ->setRules([
+        'array_syntax' => ['syntax' => 'short'],
+        'no_unused_imports' => true,
+        'ordered_imports' => [
+            'imports_order' => [
+                'const',
+                'class',
+                'function',
+            ],
+        ],
+        'php_unit_fqcn_annotation' => true,
+        'phpdoc_return_self_reference' => true,
+        'phpdoc_scalar' => true,
+    ])
+    ->setFinder($finder)
+;
+
+return $config;
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -32,7 +32,7 @@ composer coverage-clover
 We follow the [PSR-12 Style Guide](https://www.php-fig.org/psr/psr-12/), which
 is configured in [.phpcs.xml.dist](.phpcs.xml.dist).
 
-Additional checks are configured in [.php_cs.dist](.php_cs.dist) - See
+Additional checks are configured in [.php-cs-fixer.dist](.php-cs-fixer.dist.php) - See
 <https://cs.symfony.com/> for further information.
 
 Coding style can be verified by running:

diff --git a/composer.json b/composer.json
@@ -1,25 +1,25 @@
 {
   "name": "yoti/yoti-php-sdk-sandbox",
   "description": "Yoti PHP SDK Sandbox",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "keywords": [
     "yoti",
     "sdk"
   ],
   "homepage": "https://yoti.com",
   "license": "MIT",
   "require": {
-    "php": "^7.1 || ^8.0",
-    "yoti/yoti-php-sdk": "^3.1"
+    "php": "^7.4 || ^8.0 || ^8.1",
+    "yoti/yoti-php-sdk": "^4.2.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^7.5 || ^8.5 || ^9.3",
     "squizlabs/php_codesniffer": "^3.4",
-    "friendsofphp/php-cs-fixer": "^2.15",
     "brainmaestro/composer-git-hooks": "^2.8",
     "phpstan/phpstan-strict-rules": "^0.12.1",
     "phpstan/extension-installer": "^1.0",
-    "symfony/phpunit-bridge": "^5.1"
+    "symfony/phpunit-bridge": "^5.1",
+    "friendsofphp/php-cs-fixer": "^3.54"
   },
   "autoload": {
     "psr-4": {
@@ -38,7 +38,7 @@
     "coverage-html": "phpunit --coverage-html ./coverage/report",
     "lint": [
       "phpcs",
-      "php-cs-fixer fix --config=.php_cs.dist -v --dry-run --using-cache=no --diff-format=udiff --ansi",
+      "php-cs-fixer fix --config=.php-cs-fixer.dist.php -v --dry-run --using-cache=no",
       "phpstan analyse"
     ],
     "post-install-cmd": "cghooks add --ignore-lock",
@@ -48,5 +48,10 @@
     "hooks": {
         "pre-commit": "composer test && composer lint"
     }
+  },
+  "config": {
+    "allow-plugins": {
+      "phpstan/extension-installer": true
+    }
   }
 }
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,9 +1,9 @@
 sonar.host.url = https://sonarcloud.io
 sonar.organization = getyoti
 
-sonar.projectKey = getyoti:php-sandbox
+sonar.projectKey = getyoti_yoti-php-sdk-sandbox
 sonar.projectName = PHP SDK Sandbox
-sonar.projectVersion = 1.6.0
+sonar.projectVersion = 1.6.1
 
 sonar.language = php
 sonar.sources=src

diff --git a/src/DocScan/Request/Check/Report/SandboxBreakdown.php b/src/DocScan/Request/Check/Report/SandboxBreakdown.php
@@ -9,7 +9,6 @@
 
 class SandboxBreakdown implements \JsonSerializable
 {
-
     /**
      * @var string
      */

diff --git a/src/DocScan/Request/Check/Report/SandboxCheckReport.php b/src/DocScan/Request/Check/Report/SandboxCheckReport.php
@@ -6,7 +6,6 @@
 
 class SandboxCheckReport implements \JsonSerializable
 {
-
     /**
      * @var SandboxRecommendation
      */

diff --git a/src/DocScan/Request/Check/Report/SandboxDetail.php b/src/DocScan/Request/Check/Report/SandboxDetail.php
@@ -6,7 +6,6 @@
 
 class SandboxDetail implements \JsonSerializable
 {
-
     /**
      * @var string
      */

diff --git a/src/DocScan/Request/Check/Report/SandboxRecommendation.php b/src/DocScan/Request/Check/Report/SandboxRecommendation.php
@@ -8,7 +8,6 @@
 
 class SandboxRecommendation implements \JsonSerializable
 {
-
     /**
      * @var string|null
      */

diff --git a/src/DocScan/Request/Check/Report/SandboxRecommendationBuilder.php b/src/DocScan/Request/Check/Report/SandboxRecommendationBuilder.php
@@ -6,7 +6,6 @@
 
 class SandboxRecommendationBuilder
 {
-
     /**
      * @var string
      */

diff --git a/src/DocScan/Request/Check/SandboxCheck.php b/src/DocScan/Request/Check/SandboxCheck.php
@@ -6,7 +6,6 @@
 
 class SandboxCheck implements \JsonSerializable
 {
-
     /**
      * @var SandboxCheckResult
      */

diff --git a/src/DocScan/Request/Check/SandboxCheckBuilder.php b/src/DocScan/Request/Check/SandboxCheckBuilder.php
@@ -10,7 +10,6 @@
 
 abstract class SandboxCheckBuilder
 {
-
     /**
      * @var SandboxRecommendation
      */

diff --git a/src/DocScan/Request/Check/SandboxCheckResult.php b/src/DocScan/Request/Check/SandboxCheckResult.php
@@ -8,7 +8,6 @@
 
 class SandboxCheckResult implements \JsonSerializable
 {
-
     /**
      * @var SandboxCheckReport
      */

diff --git a/src/DocScan/Request/Check/SandboxDocumentAuthenticityCheck.php b/src/DocScan/Request/Check/SandboxDocumentAuthenticityCheck.php
@@ -6,5 +6,4 @@
 
 class SandboxDocumentAuthenticityCheck extends SandboxDocumentCheck
 {
-
 }
diff --git a/src/DocScan/Request/Check/SandboxDocumentAuthenticityCheckBuilder.php b/src/DocScan/Request/Check/SandboxDocumentAuthenticityCheckBuilder.php
@@ -6,7 +6,6 @@
 
 class SandboxDocumentAuthenticityCheckBuilder extends SandboxDocumentCheckBuilder
 {
-
     /**
      * @return SandboxDocumentAuthenticityCheck
      */

diff --git a/src/DocScan/Request/Check/SandboxDocumentFaceMatchCheck.php b/src/DocScan/Request/Check/SandboxDocumentFaceMatchCheck.php
@@ -6,5 +6,4 @@
 
 class SandboxDocumentFaceMatchCheck extends SandboxDocumentCheck
 {
-
 }
diff --git a/src/DocScan/Request/Check/SandboxDocumentFaceMatchCheckBuilder.php b/src/DocScan/Request/Check/SandboxDocumentFaceMatchCheckBuilder.php
@@ -6,7 +6,6 @@
 
 class SandboxDocumentFaceMatchCheckBuilder extends SandboxDocumentCheckBuilder
 {
-
     /**
      * @return SandboxDocumentFaceMatchCheck
      */

diff --git a/src/DocScan/Request/Check/SandboxDocumentTextDataCheckBuilder.php b/src/DocScan/Request/Check/SandboxDocumentTextDataCheckBuilder.php
@@ -6,7 +6,6 @@
 
 class SandboxDocumentTextDataCheckBuilder extends SandboxDocumentCheckBuilder
 {
-
     /**
      * @var array<string, mixed>|null
      */

diff --git a/src/DocScan/Request/Check/SandboxDocumentTextDataCheckResult.php b/src/DocScan/Request/Check/SandboxDocumentTextDataCheckResult.php
@@ -8,7 +8,6 @@
 
 class SandboxDocumentTextDataCheckResult extends SandboxCheckResult
 {
-
     /**
      * @var array<string, mixed>|null
      */

diff --git a/src/DocScan/Request/Check/SandboxSupplementaryDocumentTextDataCheckResult.php b/src/DocScan/Request/Check/SandboxSupplementaryDocumentTextDataCheckResult.php
@@ -8,7 +8,6 @@
 
 class SandboxSupplementaryDocumentTextDataCheckResult extends SandboxCheckResult
 {
-
     /**
      * @var array<string, mixed>|null
      */

diff --git a/src/DocScan/Request/Check/SandboxThirdPartyIdentityCheck.php b/src/DocScan/Request/Check/SandboxThirdPartyIdentityCheck.php
@@ -6,5 +6,4 @@
 
 class SandboxThirdPartyIdentityCheck extends SandboxDocumentCheck
 {
-
 }
diff --git a/src/DocScan/Request/Check/SandboxThirdPartyIdentityCheckBuilder.php b/src/DocScan/Request/Check/SandboxThirdPartyIdentityCheckBuilder.php
@@ -6,7 +6,6 @@
 
 class SandboxThirdPartyIdentityCheckBuilder extends SandboxDocumentCheckBuilder
 {
-
     /**
      * @return SandboxThirdPartyIdentityCheck
      */

diff --git a/src/DocScan/Request/SandboxResponseConfig.php b/src/DocScan/Request/SandboxResponseConfig.php
@@ -8,7 +8,6 @@
 
 class SandboxResponseConfig implements \JsonSerializable
 {
-
     /**
      * @var SandboxTaskResults|null
      */

diff --git a/src/DocScan/Request/SandboxResponseConfigBuilder.php b/src/DocScan/Request/SandboxResponseConfigBuilder.php
@@ -6,7 +6,6 @@
 
 class SandboxResponseConfigBuilder
 {
-
     /**
      * @var SandboxTaskResults
      */

diff --git a/tests/DocScan/Request/Check/Report/SandboxBreakdownTest.php b/tests/DocScan/Request/Check/Report/SandboxBreakdownTest.php
@@ -13,7 +13,6 @@
  */
 class SandboxBreakdownTest extends TestCase
 {
-
     private const SOME_SUB_CHECK = 'someSubCheck';
     private const SOME_RESULT = 'someResult';
 

diff --git a/tests/DocScan/Request/Check/Report/SandboxDetailTest.php b/tests/DocScan/Request/Check/Report/SandboxDetailTest.php
@@ -12,7 +12,6 @@
  */
 class SandboxDetailTest extends TestCase
 {
-
     private const SOME_NAME = 'someName';
     private const SOME_VALUE = 'someValue';
 

diff --git a/tests/DocScan/Request/Check/Report/SandboxRecommendationTest.php b/tests/DocScan/Request/Check/Report/SandboxRecommendationTest.php
@@ -12,7 +12,6 @@
  */
 class SandboxRecommendationTest extends TestCase
 {
-
     private const SOME_VALUE = 'someValue';
     private const SOME_REASON = 'someReason';
     private const SOME_RECOVERY_SUGGESTION = 'someRecoverySuggestion';

diff --git a/tests/DocScan/Request/Check/SandboxDocumentAuthenticityCheckBuilderTest.php b/tests/DocScan/Request/Check/SandboxDocumentAuthenticityCheckBuilderTest.php
@@ -14,7 +14,6 @@
 
 class SandboxDocumentAuthenticityCheckBuilderTest extends TestCase
 {
-
     /**
      * @var MockObject|SandboxRecommendation
      */

diff --git a/tests/DocScan/Request/Check/SandboxDocumentFaceMatchCheckBuilderTest.php b/tests/DocScan/Request/Check/SandboxDocumentFaceMatchCheckBuilderTest.php
@@ -14,7 +14,6 @@
 
 class SandboxDocumentFaceMatchCheckBuilderTest extends TestCase
 {
-
     /**
      * @var MockObject|SandboxRecommendation
      */

diff --git a/tests/DocScan/Request/Check/SandboxIdDocumentComparisonCheckBuilderTest.php b/tests/DocScan/Request/Check/SandboxIdDocumentComparisonCheckBuilderTest.php
@@ -14,7 +14,6 @@
 
 class SandboxIdDocumentComparisonCheckBuilderTest extends TestCase
 {
-
     /**
      * @var MockObject|SandboxRecommendation
      */

diff --git a/tests/DocScan/Request/Check/SandboxZoomLivenessCheckBuilderTest.php b/tests/DocScan/Request/Check/SandboxZoomLivenessCheckBuilderTest.php
@@ -14,7 +14,6 @@
 
 class SandboxZoomLivenessCheckBuilderTest extends TestCase
 {
-
     /**
      * @var MockObject|SandboxRecommendation
      */

diff --git a/tests/DocScan/Request/SandboxTaskResultsTest.php b/tests/DocScan/Request/SandboxTaskResultsTest.php
@@ -14,7 +14,6 @@
  */
 class SandboxTaskResultsTest extends TestCase
 {
-
     /**
      * @test
      * @covers ::__construct