Merge pull request #212 from EJTJ3/develop

Enhancement: Add support for PHP 8.0 and updated minimal php version to 7.3
bunq · Oct 12, 2021 · 071183f · 071183f
2 parents 26a8f23 + 01de34f
commit 071183f
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 68 deletions.
diff --git a/.gitignore b/.gitignore
@@ -82,3 +82,6 @@ tmp/
 
 # PhpCs
 .php_cs*
+
+# PHPUnit
+.phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -20,11 +20,12 @@
         }
     ],
     "require": {
-        "php": "^7.0.13",
+        "php": "^7.3 || ^8.0",
+        "composer-plugin-api": "~1.0 || ~2.0",
         "ext-curl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "guzzlehttp/guzzle": "~6"
+        "guzzlehttp/guzzle": "~7"
     },
     "autoload": {
         "psr-4": {
@@ -37,22 +38,20 @@
         }
     },
     "require-dev": {
-        "brianium/paratest": "^1.1",
+        "composer/composer": "^1.10.11 || ^2.0.1",
         "friendsofphp/php-cs-fixer": "^2.4",
-        "jakub-onderka/php-parallel-lint": "^0.9.2",
-        "phpro/grumphp": "^0.11.6",
-        "phpstan/phpstan": "^0.8",
-        "phpunit/phpunit": "^6.0.13",
-        "sebastian/phpcpd": "^3.0",
-        "sensiolabs/security-checker": "^5.0"
+        "php-parallel-lint/php-parallel-lint": "^1.2",
+        "phpro/grumphp": "^v1.3.0",
+        "phpstan/phpstan": "^0.12",
+        "phpunit/phpunit": "^9.5"
     },
     "bin": [
         "bin/bunq-install"
     ],
     "config": {
         "sort-packages": true,
         "platform": {
-            "php": "7.0.13"
+            "php": "7.3"
         }
     },
     "scripts": {

diff --git a/grumphp.yml b/grumphp.yml
@@ -1,50 +1,43 @@
-parameters:
-    bin_dir: "./vendor/bin"
-    git_dir: "."
-    hide_circumvention_tip: false
+grumphp:
     hooks_dir: ~
     hooks_preset: local
+    git_hook_variables:
+        VAGRANT_HOST_DIR: .
+        VAGRANT_PROJECT_DIR: /var/www
+        EXEC_GRUMPHP_COMMAND: exec
+    stop_on_failure: false
     ignore_unstaged_changes: false
-    process_async_limit: 10
-    process_async_wait: 1000
+    hide_circumvention_tip: false
     process_timeout: 300
-    stop_on_failure: true
+    parallel:
+        enabled: false
+    fixer:
+        enabled: true
+        fix_by_default: false
+    extensions: [ ]
     ascii:
         failed: ~
         succeeded: ~
     tasks:
-        composer:
-            file: ./composer.json
-            no_check_all: false
-            no_check_lock: false
-            no_check_publish: false
-            with_dependencies: false
-            strict: true
+        composer: ~
         git_blacklist:
             keywords:
                 - "die("
                 - "dump("
-                - "exit;"
                 - "print_r("
                 - "print_rr("
                 - "var_dump("
-            triggered_by: ['php']
-        phpcpd:
-            directory: '.'
-            exclude: ['vendor', 'src/Model/Generated']
-            names_exclude: []
-            fuzzy: false
-            min_lines: 5
-            min_tokens: 70
-            triggered_by: ['php']
+                - "exit;"
         phpcsfixer2:
             allow_risky: false
             cache_file: ~
-            config: ~
-            rules: []
-            using_cache: true
-            path_mode: ~
+            config: .php_cs
+            rules: [ ]
+            using_cache: ~
+            config_contains_finder: false
             verbose: true
+            diff: false
+            triggered_by: [ 'php' ]
         phplint:
             exclude: ['vendor']
             jobs: ~
@@ -55,13 +48,7 @@ parameters:
             group: []
             always_execute: false
         phpversion:
-            project: '5.6'
-        securitychecker:
-            lockfile: ./composer.lock
-            format: ~
-            end_point: ~
-            timeout: ~
-            run_always: true
+            project: '7.3'
         xmllint:
             ignore_patterns: []
             load_from_net: false

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,8 +1,10 @@
-<phpunit
-        bootstrap="./vendor/autoload.php"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd"
-        cacheTokens="false">
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </coverage>
     <testsuites>
         <testsuite name="ParaTest Fixtures">
             <directory>./tests/</directory>
@@ -11,9 +13,4 @@
             <directory>./tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
 </phpunit>
diff --git a/tests/BunqSdkTestBase.php b/tests/BunqSdkTestBase.php
@@ -91,7 +91,7 @@ class BunqSdkTestBase extends TestCase
 
     /**
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         static::createApiContext();
         BunqContext::loadApiContext(
@@ -111,7 +111,7 @@ protected static function createApiContext()
 
     /**
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->setSecondMonetaryAccountBank();
         $this->requestSpendingMoney();

diff --git a/tests/Http/PaginationScenarioTest.php b/tests/Http/PaginationScenarioTest.php
@@ -55,7 +55,7 @@ public function testApiScenarioPaymentListingWithPagination()
 
         $paymentsActual = array_merge($responsePreviousNext->getValue(), $responsePrevious->getValue());
 
-        $this->assertEquals($paymentsExpected, $paymentsActual);
+        static::assertEquals($paymentsExpected, $paymentsActual);
     }
 
     /**

diff --git a/tests/Http/PaginationTest.php b/tests/Http/PaginationTest.php
@@ -131,10 +131,11 @@ public function testGetUrlParamsNextPageFutureNoCount()
     }
 
     /**
-     * @expectedException \bunq\Exception\BunqException
      */
     public function testGetUrlParamsPreviousPageFromPaginationWithNoPreviousPage()
     {
+        $this->expectException('\bunq\Exception\BunqException');
+
         $pagination = $this->createPaginationWithAllPropertiesSet();
         $pagination->setOlderId(null);
 
@@ -143,10 +144,11 @@ public function testGetUrlParamsPreviousPageFromPaginationWithNoPreviousPage()
     }
 
     /**
-     * @expectedException \bunq\Exception\BunqException
      */
     public function testGetUrlParamsNextPageFromPaginationWithNoNextPage()
     {
+        $this->expectException('\bunq\Exception\BunqException');
+
         $pagination = $this->createPaginationWithAllPropertiesSet();
         $pagination->setNewerId(null);
         $pagination->setFutureId(null);

diff --git a/tests/Model/Core/NotificationFilterTest.php b/tests/Model/Core/NotificationFilterTest.php
@@ -82,9 +82,9 @@ public function testNotificationFilterClear()
         static::assertEmpty($allCreatedNotificationFilterUrlUser);
         static::assertEmpty($allCreatedNotificationFilterUrlMonetaryAccount);
 
-        static::assertEquals(0, count(NotificationFilterPushUserInternal::listing()->getValue()));
-        static::assertEquals(0, count(NotificationFilterUrlUserInternal::listing()->getValue()));
-        static::assertEquals(0, count(NotificationFilterUrlMonetaryAccountInternal::listing()->getValue()));
+        static::assertCount(0, NotificationFilterPushUserInternal::listing()->getValue());
+        static::assertCount(0, NotificationFilterUrlUserInternal::listing()->getValue());
+        static::assertCount(0, NotificationFilterUrlMonetaryAccountInternal::listing()->getValue());
     }
 
     /**

diff --git a/tests/Model/Generated/Endpoint/CardDebitTest.php b/tests/Model/Generated/Endpoint/CardDebitTest.php
@@ -55,7 +55,7 @@ class CardDebitTest extends BunqSdkTestBase
 
     /**
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         parent::setUpBeforeClass();
         $cardNamesAllowed = CardName::listing()->getValue();

diff --git a/tests/Model/Generated/Endpoint/DraftShareInviteBankQrCodeContentTest.php b/tests/Model/Generated/Endpoint/DraftShareInviteBankQrCodeContentTest.php
@@ -37,7 +37,7 @@ class DraftShareInviteBankQrCodeContentTest extends BunqSdkTestBase
 
     /**
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         parent::setUpBeforeClass();
         static::$expirationDate = date(self::FORMAT_MICROTIME, strtotime(self::EXPIRATION_ADDED_TIME));

diff --git a/tests/Model/Generated/Endpoint/MonetaryAccountBankTest.php b/tests/Model/Generated/Endpoint/MonetaryAccountBankTest.php
@@ -33,7 +33,7 @@ class MonetaryAccountBankTest extends BunqSdkTestBase
     /**
      *  Deletes the new created monetary account.
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         if (!is_null(static::$monetaryAccountBankToCloseId)) {
             MonetaryAccountBank::update(

diff --git a/tests/Model/Generated/Endpoint/SessionTest.php b/tests/Model/Generated/Endpoint/SessionTest.php
@@ -29,7 +29,7 @@ class SessionTest extends BunqSdkTestBase
     /**
      * Resets the session context after this test has ran.
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         sleep(self::SECONDS_TO_SLEEP);
         BunqContext::getApiContext()->resetSession();

diff --git a/tests/Model/Generated/Object/NotificationUrlTest.php b/tests/Model/Generated/Object/NotificationUrlTest.php
@@ -262,7 +262,7 @@ private function getNotificationUrlFromJson(string $jsonString): NotificationUrl
     /**
      * @param string[] $json
      *
-     * @return string
+     * @return string|false
      */
     private function getNotificationObjectJsonString(array $json)
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,7 @@ public function testApiScenarioPaymentListingWithPagination() @@
             $paymentsActual = array_merge($responsePreviousNext->getValue(), $responsePrevious->getValue());
-            $this->assertEquals($paymentsExpected, $paymentsActual);
+            static::assertEquals($paymentsExpected, $paymentsActual);
         }
         /**
@@ Expand Down @@