Merge pull request #8 from ahaskioglu-valiton/update-to-php-81

PHP 8.1
valiton · Jun 20, 2024 · 2319949 · 2319949
2 parents 79162eb + 1756497
commit 2319949
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 118 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,25 +3,26 @@ name: CI
 on: [push, pull_request]
 
 jobs:
-  build-test-71:
+  build-test-74:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
 
       - uses: php-actions/composer@v6
         with:
-          version: 1
-          php_version: "7.1"
+          version: 2
+          php_version: "7.4"
 
       - name: PHPUnit Tests
         uses: php-actions/phpunit@v3
         with:
-          version: 7
-          php_version: "7.1"
+          version: 9
+          php_version: "7.4"
           configuration: phpunit.xml.dist
           bootstrap: vendor/autoload.php
-  build-test-74:
+
+  build-test-81:
     runs-on: ubuntu-latest
 
     steps:
@@ -30,12 +31,12 @@ jobs:
       - uses: php-actions/composer@v6
         with:
           version: 2
-          php_version: "7.4"
+          php_version: "8.1"
 
       - name: PHPUnit Tests
         uses: php-actions/phpunit@v3
         with:
-          version: 7
-          php_version: "7.4"
+          version: 9
+          php_version: "8.1"
           configuration: phpunit.xml.dist
           bootstrap: vendor/autoload.php
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/Action/Api/ConvertGiropayErrorsAction.php b/Action/Api/ConvertGiropayErrorsAction.php
@@ -36,7 +36,7 @@ public function execute($request)
         $response = $request->getResponse();
 
         if (Api::STATUS_ERROR != $response[Api::FIELD_STATUS]
-            || !array_key_exists(Api::FIELD_PAYMENT_METHOD, $model)
+            || !$model[Api::FIELD_PAYMENT_METHOD]
             || $model[Api::FIELD_PAYMENT_METHOD] != Api::PAYMENT_METHOD_GIROPAY
         ) {
             return;

diff --git a/Tests/Action/Api/GetSepaMandatePdfActionTest.php b/Tests/Action/Api/GetSepaMandatePdfActionTest.php
@@ -2,10 +2,7 @@
 
 namespace Valiton\Payum\Payone\Tests\Action\Api;
 
-use GuzzleHttp\Client;
-use Payum\Core\Bridge\Guzzle\HttpClient;
 use Valiton\Payum\Payone\Action\Api\GetSepaMandatePdfAction;
-use Valiton\Payum\Payone\Api;
 use Valiton\Payum\Payone\Request\Api\GetSepaMandatePdf;
 use Valiton\Payum\Payone\Tests\Action\AbstractActionTest;
 

diff --git a/Tests/ApiTest.php b/Tests/ApiTest.php
@@ -7,9 +7,8 @@
 use Payum\Core\Bridge\Guzzle\HttpClient;
 use Payum\Core\HttpClientInterface;
 use Payum\Core\Tests\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\StreamInterface;
 use Valiton\Payum\Payone\Api;
 
 class ApiTest extends TestCase
@@ -96,7 +95,7 @@ public function testDecodeBodyHandlesNewlineInMandateText()
             Api::FIELD_LAST_NAME => 'Mustermann',
         ]);
 
-        $this->assertInternalType('array', $response);
+        $this->assertIsArray($response);
         $this->assertArrayHasKey(Api::FIELD_MANDATE_TEXT, $response);
         $this->assertStringStartsWith('<div class="mandatetext">', $response[Api::FIELD_MANDATE_TEXT]);
         $this->assertStringEndsWith('</div>', $response[Api::FIELD_MANDATE_TEXT]);
@@ -204,15 +203,15 @@ protected function createHttpClient()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|HttpClientInterface
+     * @return MockObject|HttpClientInterface
      */
     protected function createHttpClientMock()
     {
         return $this->createMock(HttpClientInterface::class);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|HttpClientInterface
+     * @return MockObject|HttpClientInterface
      */
     protected function createSuccessHttpClientStub($responseBody = '')
     {

diff --git a/Tests/PayoneGatewayFactoryTest.php b/Tests/PayoneGatewayFactoryTest.php
@@ -29,28 +29,6 @@ public function couldBeConstructedWithoutAnyArguments()
         new PayoneGatewayFactory();
     }
 
-    /**
-     * @test
-     */
-    public function shouldCreateCoreGatewayFactoryIfNotPassed()
-    {
-        $factory = new PayoneGatewayFactory();
-
-        $this->assertAttributeInstanceOf(CoreGatewayFactory::class, 'coreGatewayFactory', $factory);
-    }
-
-    /**
-     * @test
-     */
-    public function shouldUseCoreGatewayFactoryPassedAsSecondArgument()
-    {
-        $coreGatewayFactory = $this->createMock(GatewayFactoryInterface::class);
-
-        $factory = new PayoneGatewayFactory(array(), $coreGatewayFactory);
-
-        $this->assertAttributeSame($coreGatewayFactory, 'coreGatewayFactory', $factory);
-    }
-
     /**
      * @test
      */
@@ -66,12 +44,6 @@ public function shouldAllowCreateGateway()
         ]);
 
         $this->assertInstanceOf('Payum\Core\Gateway', $gateway);
-
-        $this->assertAttributeNotEmpty('apis', $gateway);
-        $this->assertAttributeNotEmpty('actions', $gateway);
-
-        $extensions = $this->readAttribute($gateway, 'extensions');
-        $this->assertAttributeNotEmpty('extensions', $extensions);
     }
 
     /**

diff --git a/composer.json b/composer.json
@@ -14,13 +14,14 @@
         }
     ],
     "require": {
-        "php": ">=7.1.3",
+        "php": ">=7.3 | ^8.1",
         "payum/core": "^1.7",
         "psr/log": "^1.0",
-        "php-http/guzzle7-adapter": "^1.0"
+        "php-http/guzzle7-adapter": "^1.0",
+        "php-http/message-factory": "^1.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0"
+        "phpunit/phpunit": "^9.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,30 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
-        backupGlobals="false"
-        backupStaticAttributes="false"
-        colors="true"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
-        processIsolation="false"
-        stopOnFailure="false"
-        bootstrap="Tests/bootstrap.php"
->
-    <testsuites>
-        <testsuite name="Payum Extension Test Suite for PAYONE">
-            <directory>./Tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" bootstrap="Tests/bootstrap.php">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <testsuites>
+    <testsuite name="Payum Extension Test Suite for PAYONE">
+      <directory>./Tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>