Bump friendsofphp/php-cs-fixer from 3.10.0 to 3.11.0

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/static.yml

@@ -0,0 +1,55 @@
+name: Static Analysis
+
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+    branches: [ develop ]
+
+jobs:
+  cs:
+    runs-on: ubuntu-latest
+
+    name: Code Style
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: 8.0
+        tools: composer:v2
+        coverage: none
+
+    - name: Install Dependencies
+      run: composer update --no-interaction --no-progress --ansi
+
+    - name: Run PHP-CS-Fixer
+      run: vendor/bin/php-cs-fixer fix -v --allow-risky=yes --dry-run --ansi
+
+  phpstan:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        dependency-version: [prefer-lowest, prefer-stable]
+
+    name: PHPStan ${{ matrix.dependency-version }}
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: 8.0
+        tools: composer:v2
+        coverage: none
+
+    - name: Install Dependencies
+      run: composer update --prefer-stable --no-interaction --no-progress --ansi
+
+    - name: Run PHPStan
+      run: vendor/bin/phpstan analyse --no-progress --ansi

.github/workflows/tests.yml

@@ -0,0 +1,47 @@
+name: Run Tests
+
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+    branches: [ develop ]
+
+jobs:
+  ci:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        php: ['8.0', '8.1']
+        dependency-version: [prefer-lowest, prefer-stable]
+        exclude:
+          - php: 8.1
+            dependency-version: prefer-lowest
+          - php: 8.1
+            os: macos-latest
+          - php: 8.1
+            os: windows-latest
+
+
+    name: PHP ${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php }}
+        tools: composer:v2
+        coverage: none
+
+    - name: Setup Problem Matches
+      run: |
+        echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+        echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+    - name: Install PHP dependencies
+      run: composer update --${{ matrix.dependency-version }} --no-interaction --no-progress --ansi
+
+    - name: Unit Tests
+      run: ./vendor/bin/phpunit --colors=always

.gitignore

@@ -1,2 +1,4 @@
 vendor/
 composer.phar
+.php-cs-fixer.cache
+.phpunit.result.cache

.php-cs-fixer.dist.php

@@ -0,0 +1,29 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__ . DIRECTORY_SEPARATOR . 'QuickPay')
+    ->in(__DIR__ . DIRECTORY_SEPARATOR . 'Tests')
+    ->append(['.php-cs-fixer.dist.php']);
+
+$rules = [
+    '@Symfony'               => true,
+    '@PSR2'                  => true,
+    'phpdoc_to_comment'      => false,
+    'array_syntax'           => ['syntax' => 'short'],
+    'yoda_style'             => false,
+    'binary_operator_spaces' => [
+        'operators' => [
+            '=>' => 'align',
+            '='  => 'align',
+        ],
+    ],
+    'concat_space'            => ['spacing' => 'one'],
+    'not_operator_with_space' => false,
+];
+
+$rules['increment_style'] = ['style' => 'post'];
+
+return (new PhpCsFixer\Config())
+    ->setUsingCache(true)
+    ->setRules($rules)
+    ->setFinder($finder);

QuickPay/API/Client.php

@@ -1,67 +1,37 @@
 <?php
+
 namespace QuickPay\API;
 
-/**
- * @class       QuickPay_Client
- * @since       0.1.0
- * @package     QuickPay
- * @category    Class
- * @author      Patrick Tolvstein, Perfect Solution ApS
- * @docs        http://tech.quickpay.net/api/
- */
+use CurlHandle;
+use QuickPay\API\Exceptions\GenericException;
+
 class Client
 {
-    /**
-     * Contains cURL instance
-     *
-     * @access public
-     */
-    public $ch;
-
-    /**
-     * Contains the authentication string
-     *
-     * @access protected
-     */
-    protected $auth_string;
+    public CurlHandle $ch;
+    protected ?string $auth_string;
+    protected array $headers = [];
 
-    /**
-     * Contains the headers
-     *
-     * @access protected
-     */
-    protected $headers = array();
-
-    /**
-     * __construct function.
-     *
-     * Instantiate object
-     *
-     * @access public
-     */
-    public function __construct($auth_string = '', $additional_headers = array())
+    public function __construct(?string $auth_string = '', array $additional_headers = [])
     {
-        // Check if lib cURL is enabled
         if (!function_exists('curl_init')) {
-            throw new Exception('Lib cURL must be enabled on the server');
+            throw new GenericException('Lib cURL must be enabled on the server');
         }
 
         // Save authentication string
         $this->auth_string = $auth_string;
 
         // Create cURL instance.
         $this->ch = curl_init();
-        curl_setopt_array($this->ch, array(
+        curl_setopt_array($this->ch, [
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_SSL_VERIFYPEER => true,
-            CURLOPT_HTTPAUTH => CURLAUTH_BASIC
-        ));
+            CURLOPT_HTTPAUTH       => CURLAUTH_BASIC,
+        ]);
 
-        // Default headers
-        $this->headers = array(
+        $this->headers = [
             'Accept-Version: v10',
             'Accept: application/json',
-        );
+        ];
         if (!empty($this->auth_string)) {
             $this->headers[] = 'Authorization: Basic ' . base64_encode($this->auth_string);
         }
@@ -70,32 +40,19 @@ public function __construct($auth_string = '', $additional_headers = array())
         $this->setHeaders($additional_headers);
     }
 
-    /**
-     * Shutdown function.
-     *
-     * Closes the current cURL connection
-     *
-     * @access public
-     */
-    public function shutdown()
+    public function shutdown(): void
     {
         if (!empty($this->ch)) {
             curl_close($this->ch);
         }
     }
 
-    /**
-     * Set additional headers for cURL request.
-     *
-     * @param string[] $additional_headers
-     * @access public
-     * @return bool
-     */
-    public function setHeaders($additional_headers)
+    public function setHeaders(array $additional_headers): bool
     {
         if (!empty($additional_headers)) {
             $this->headers = array_merge($this->headers, $additional_headers);
         }
+
         return curl_setopt($this->ch, CURLOPT_HTTPHEADER, $this->headers);
     }
 }

QuickPay/API/Constants.php

@@ -1,19 +1,9 @@
 <?php
+
 namespace QuickPay\API;
 
-/**
- * @class       QuickPay_Constants
- * @since       0.1.0
- * @package     QuickPay
- * @category    Class
- * @author      Patrick Tolvstein, Perfect Solution ApS
- * @docs        http://tech.quickpay.net/api/
- */
 class Constants
 {
-    /**
-     * API DEFINITIONS
-     */
-    const API_URL = 'https://api.quickpay.net/';
-    const API_VERSION = '10';
+    public const API_URL     = 'https://api.quickpay.net/';
+    public const API_VERSION = '10';
 }

QuickPay/API/Exceptions/GenericException.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace QuickPay\API\Exceptions;
+
+class GenericException extends \Exception
+{
+    public function __construct(string $message, int $code = 0, self $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+    }
+}

QuickPay/API/Exceptions/TimeoutException.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace QuickPay\API\Exceptions;
+
+class TimeoutException extends GenericException
+{
+    public function __construct(string $message, int $code = 0, self $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+    }
+}