Merge pull request #198 from PAYONE-GmbH/feature/PAYONE-136

Feature/payone 136

.github/workflows/main.yml

@@ -1,6 +1,13 @@
 name: Tests
 
-on: [ push, pull_request, workflow_dispatch ]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+  workflow_dispatch:
 
 jobs:
   ci-legacy:
@@ -14,7 +21,7 @@ jobs:
     name: Shopware ${{ matrix.shopware-versions }} on PHP ${{ matrix.php-versions }}
     services:
       mysql:
-        image: mariadb:10.5.9
+        image: mysql:5.7.38
         env:
           MYSQL_ROOT_PASSWORD: root
         ports:
@@ -60,7 +67,9 @@ jobs:
         run: |
           cd /tmp/shopware
           composer dumpautoload -d /tmp/shopware/custom/plugins/PayonePayment
-          /tmp/shopware/vendor/bin/phpunit --configuration /tmp/shopware/custom/plugins/PayonePayment/phpunit.xml.dist
+          /tmp/shopware/vendor/bin/phpunit \
+            --testdox \
+            --configuration /tmp/shopware/custom/plugins/PayonePayment/phpunit-legacy.xml.dist
   ci-current:
     runs-on: ubuntu-latest
     strategy:
@@ -72,7 +81,7 @@ jobs:
     name: Shopware ${{ matrix.shopware-versions }} on PHP ${{ matrix.php-versions }}
     services:
       mysql:
-        image: mariadb:10.5.9
+        image: mysql:5.7.38
         env:
           MYSQL_ROOT_PASSWORD: root
         ports:
@@ -117,4 +126,8 @@ jobs:
           php bin/console plugin:install --activate PayonePayment
       - name: PHPUnit
         run: |
-          /tmp/shopware/custom/plugins/PayonePayment/vendor/bin/phpunit --configuration /tmp/shopware/custom/plugins/PayonePayment/phpunit.xml.dist
+          PROJECT_ROOT=/tmp/shopware \
+            TEST_DATABASE_URL="mysql://root:[email protected]:3306/shopware" \
+            /tmp/shopware/custom/plugins/PayonePayment/vendor/bin/phpunit \
+            --testdox \
+            --configuration /tmp/shopware/custom/plugins/PayonePayment/phpunit.xml.dist

.php_cs.dist

@@ -4,7 +4,8 @@ require 'vendor/autoload.php';
 
 $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__ . '/src')
-    ->in(__DIR__ . '/tests');
+    ->in(__DIR__ . '/tests')
+    ->in(__DIR__ . '/tests_legacy');
 
 return K10r\Codestyle\PHP72::create($finder, [
     // Allow multiline throw expressions

composer.json

@@ -32,7 +32,7 @@
     "k10r/codestyle": "^1.0",
     "phpstan/phpstan": "^0.12",
     "phpstan/phpstan-phpunit": "^0.12",
-    "phpunit/phpunit": "9.5.2"
+    "phpunit/phpunit": "^9.5"
   },
   "autoload": {
     "psr-4": {
@@ -41,7 +41,8 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "PayonePayment\\Test\\": "tests/"
+      "PayonePayment\\": "tests/",
+      "PayonePayment\\Test\\": "tests_legacy/"
     }
   },
   "config": {