BA-1121: refactor test suite

.github/workflows/codestyle.yml

@@ -1,35 +1,40 @@
-name: CheckStyleAndLint
+name: Code Style
 
 on:
   pull_request:
-    paths:
-      - "src/**.php"
-      - "example/**.php"
-
+    branches:
+      - master
+      - develop
 jobs:
-  phpcs:
+  php-cs-fixer:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        php: [7.4, 8.0, 8.1, 8.2, 8.3, 8.4]
-        stability: [prefer-stable]
 
-    name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.os }}
+    name: PHP CS Fixer
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+      - name: Checkout code
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php }}
-          tools: cs2pr, phplint, phpcs
+          php-version: '8.2'
+          extensions: json, pcre, fileinfo
+          coverage: none
+
+      - name: Get Composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache Composer dependencies
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-cs-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-cs-
 
-      - name: Run phplint
-        run: phplint --no-configuration --no-cache --no-interaction ./src/* ./example/*
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress
 
-      - name: Run phpcs
-        run: phpcs -q --report=checkstyle --standard=phpcs.xml --extensions=php ./src/* | cs2pr
+      - name: Run PHP CS Fixer
+        run: composer cs

.github/workflows/tests.yml

@@ -0,0 +1,45 @@
+name: Tests
+
+on:
+  pull_request:
+    branches:
+      - master
+      - develop
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+
+    name: PHP ${{ matrix.php }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: json, pcre, fileinfo
+          coverage: none
+
+      - name: Get Composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache Composer dependencies
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-${{ matrix.php }}-
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress
+
+      - name: Run tests
+        run: composer test

.php-cs-fixer.php

@@ -2,7 +2,7 @@
 $finder = Symfony\Component\Finder\Finder::create()
     ->in([
         __DIR__ . '/src',
-        __DIR__ . '/example'
+        __DIR__ . '/example',
     ])
     ->name('*.php')
     ->notPath('bootstrap/*')
@@ -17,23 +17,30 @@
         'array_syntax' => ['syntax' => 'short'],
         'ordered_imports' => ['sort_algorithm' => 'alpha'],
         'no_unused_imports' => true,
-        'not_operator_with_successor_space' => true,
+        'not_operator_with_successor_space' => false,
         'trailing_comma_in_multiline' => true,
         'phpdoc_scalar' => true,
         'unary_operator_spaces' => true,
         'binary_operator_spaces' => true,
         'blank_line_before_statement' => [
             'statements' => ['break', 'continue', 'declare', 'return', 'throw', 'try'],
         ],
+        'no_extra_blank_lines' => [
+            'tokens' => [
+                'extra',
+                'throw',
+                'use',
+            ],
+        ],
         'braces' => [
-            'allow_single_line_closure' => false,
+            'allow_single_line_closure' => true,
             'position_after_functions_and_oop_constructs' => 'next',
-            'position_after_anonymous_constructs' => 'next',
-            'position_after_control_structures' => 'next',
+            'position_after_anonymous_constructs' => 'same',
+            'position_after_control_structures' => 'same',
         ],
         'curly_braces_position' => [
             'classes_opening_brace' => 'next_line_unless_newline_at_signature_end',
-            'control_structures_opening_brace'  => 'next_line_unless_newline_at_signature_end'
+            'control_structures_opening_brace' => 'same_line',
         ],
         'phpdoc_single_line_var_spacing' => true,
         'phpdoc_var_without_name' => true,
@@ -43,4 +50,4 @@
         ],
         'single_trait_insert_per_statement' => true,
     ])
-    ->setFinder($finder);
+    ->setFinder($finder);

composer.json

@@ -19,7 +19,8 @@
         "symfony/var-dumper": "^5.4.9",
         "phpunit/phpunit": "^9.5",
         "vlucas/phpdotenv": "^5.4",
-        "friendsofphp/php-cs-fixer": "^3.13"
+        "friendsofphp/php-cs-fixer": "^3.13",
+        "mockery/mockery": "^1.6"
     },
     "authors": [{
         "name": "Buckaroo",
@@ -36,5 +37,12 @@
         "psr-4": {
             "Tests\\": "tests/"
         }
+    },
+    "scripts": {
+        "test": "phpunit",
+        "test:unit": "phpunit --testsuite Unit",
+        "test:feature": "phpunit --testsuite Feature",
+        "cs": "php-cs-fixer fix --dry-run --diff",
+        "cs:fix": "php-cs-fixer fix"
     }
 }

phpcs.xml

@@ -21,5 +21,8 @@
         <exclude-pattern>src/PaymentMethods/iDealProcessing/iDealProcessing.php</exclude-pattern>
     </rule>
 
+    <rule ref="PSR1.Methods.CamelCapsMethodName">
+        <exclude-pattern>tests/*</exclude-pattern>
+    </rule>
 
 </ruleset>

phpunit.xml

@@ -1,12 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <phpunit bootstrap="./vendor/autoload.php" colors="true">
     <testsuites>
-        <testsuite name="Unit tests">
-            <directory>tests</directory>
+        <testsuite name="Unit">
+            <directory suffix=".php">tests/Unit</directory>
+        </testsuite>
+        <testsuite name="Feature">
+            <directory suffix=".php">tests/Feature</directory>
         </testsuite>
     </testsuites>
 
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
+
     <php>
         <ini name="display_errors" value="stderr"/>
         <ini name="error_log" value="/dev/null"/>
+        <env name="BPE_WEBSITE_KEY" value="test_website_key_12345"/>
+        <env name="BPE_SECRET_KEY" value="test_secret_key_67890abcdef"/>
     </php>
 </phpunit>

src/Handlers/Reply/ReplyHandler.php

@@ -126,7 +126,7 @@ private function contains(string $needle, array $data, bool $strict = false): bo
                 return true;
             }
 
-            if (! $strict && str_contains($key, $needle))
+            if (! $strict && strpos($key, $needle) !== false)
             {
                 return true;
             }

src/Models/CustomParameters.php

@@ -25,7 +25,7 @@ class CustomParameters extends Model
     /**
      * @var array
      */
-    protected array $List;
+    protected array $List = [];
 
     /**
      * @param array|null $data

src/Transaction/Request/Request.php

@@ -67,13 +67,13 @@ public function offsetUnset($offset): void
     }
 
     /** Implement ArrayAccess */
-    public function offsetGet($offset): mixed
+    public function offsetGet($offset)
     {
         return isset($this->data[$offset]) ? $this->data[$offset] : null;
     }
 
     /** Implement JsonSerializable */
-    public function jsonSerialize(): mixed
+    public function jsonSerialize()
     {
         return $this->data;
     }

src/Transaction/Response/Response.php

@@ -63,7 +63,7 @@ public function offsetUnset($offset): void
     }
 
     /** Implement ArrayAccess */
-    public function offsetGet($offset): mixed
+    public function offsetGet($offset)
     {
         return isset($this->data[$offset]) ? $this->data[$offset] : null;
     }