Merge pull request #5 from stof/improve_cs

Improve the php-cs-fixer configuration

Author: stof

.cache/generate/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

.cache/php-cs-fixer/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

.github/workflows/ci.yml

@@ -29,6 +29,19 @@ jobs:
               run: composer update --ansi --no-progress --prefer-dist --no-interaction
             - run: vendor/bin/phpstan analyze
 
+    coding_standards:
+        name: Coding standards
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+            - uses: shivammathur/setup-php@v2
+              with:
+                  coverage: none
+                  php-version: '8.1'
+            - name: Install dependencies
+              run: composer update --ansi --no-progress --prefer-dist --no-interaction
+            - run: vendor/bin/php-cs-fixer fix --dry-run --show-progress=dots --no-interaction
+
     tests:
         name: "Tests on PHP ${{ matrix.php }}${{ matrix.name_suffix }}"
         runs-on: ubuntu-latest

.gitignore

@@ -1,4 +1,4 @@
 /vendor/
 /composer.lock
 /phpunit.xml
-*.cache
+/.phpunit.result.cache

.php-cs-fixer.php

@@ -83,6 +83,7 @@
         'ordered_class_elements' => ['sort_algorithm' => 'none'],
         'class_attributes_separation' => ['elements' => ['property' => 'one', 'method' => 'one']],
         'array_indentation' => true,
+        'ternary_to_null_coalescing' => true,
     ])
     ->setFinder($finder)
 ;

src/ValueObject/CardInfo.php

@@ -25,7 +25,7 @@ final class CardInfo
     public function __construct(array $input)
     {
         $this->value = isset($input['value']) ? MoneyAmount::create($input['value']) : $this->throwException(new InvalidArgument('Missing required field "value".'));
-        $this->cardStatus = isset($input['cardStatus']) ? $input['cardStatus'] : $this->throwException(new InvalidArgument('Missing required field "cardStatus".'));
+        $this->cardStatus = $input['cardStatus'] ?? $this->throwException(new InvalidArgument('Missing required field "cardStatus".'));
     }
 
     /**

src/ValueObject/MoneyAmount.php

@@ -25,8 +25,8 @@ final class MoneyAmount
      */
     public function __construct(array $input)
     {
-        $this->amount = isset($input['amount']) ? $input['amount'] : $this->throwException(new InvalidArgument('Missing required field "amount".'));
-        $this->currencyCode = isset($input['currencyCode']) ? $input['currencyCode'] : $this->throwException(new InvalidArgument('Missing required field "currencyCode".'));
+        $this->amount = $input['amount'] ?? $this->throwException(new InvalidArgument('Missing required field "amount".'));
+        $this->currencyCode = $input['currencyCode'] ?? $this->throwException(new InvalidArgument('Missing required field "currencyCode".'));
     }
 
     /**

tests/Integration/AmazonIncentivesClientTest.php

@@ -115,7 +115,7 @@ public function testGetAvailableFunds(): void
 
     private function getClient(): AmazonIncentivesClient
     {
-        if (!isset($_SERVER['AMAZON_INCENTIVES_ACCESS_KEY'], $_SERVER['AMAZON_INCENTIVES_SECRET_KEY']) || $_SERVER['AMAZON_INCENTIVES_ACCESS_KEY'] === '' || $_SERVER['AMAZON_INCENTIVES_SECRET_KEY'] === '') {
+        if (!isset($_SERVER['AMAZON_INCENTIVES_ACCESS_KEY'], $_SERVER['AMAZON_INCENTIVES_SECRET_KEY']) || '' === $_SERVER['AMAZON_INCENTIVES_ACCESS_KEY'] || '' === $_SERVER['AMAZON_INCENTIVES_SECRET_KEY']) {
             self::markTestSkipped('Test credentials are not provided.');
         }
 
@@ -126,7 +126,7 @@ private function getClient(): AmazonIncentivesClient
 
     private function getPartnerId(): string
     {
-        if (!isset($_SERVER['AMAZON_INCENTIVES_PARTNER_ID']) || $_SERVER['AMAZON_INCENTIVES_PARTNER_ID'] === '') {
+        if (!isset($_SERVER['AMAZON_INCENTIVES_PARTNER_ID']) || '' === $_SERVER['AMAZON_INCENTIVES_PARTNER_ID']) {
             self::markTestSkipped('Test credentials are not provided.');
         }