NTR: add monolog channel (#922)

* NTR: add monolog channel * NTR: update lock file * NTR: fix tests * NTR: fix path * NTR: fix command * NTR: fix command * NTR: test integration tets * NTR: test pipeline * NTR: fix * NTR: fix pipeline * NTR: try with composer * NTR: add phpunit * NTR: remove integration tests * NTR: fix pipeline * NTR: CS fix --------- Co-authored-by: Vitalij Mik <[email protected]>
mollie · Jan 15, 2025 · de77c58 · de77c58
1 parent de914c0
commit de77c58
Show file tree

Hide file tree

Showing 52 changed files with 870 additions and 468 deletions.
diff --git a/.github/actions/run-e2e/action.yml b/.github/actions/run-e2e/action.yml
@@ -138,6 +138,8 @@ runs:
 
     # --------------------------------------------------------------------------------------------------------------------------------------
 
+
+
     - name: Install Cypress
       if: ${{ inputs.RUN_CYPRESS == 'true' }}
       shell: bash

diff --git a/.php_cs.php b/.php_cs.php
@@ -2,6 +2,7 @@
 
 $finder = \PhpCsFixer\Finder::create()->in([
     __DIR__ . '/src',
+    __DIR__ . '/shopware',
     __DIR__.'/tests/PHPUnit',
 ]);
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,4 +10,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Features
 - Return over Shopware Commercial plugins is now transfered to Mollie when the Return status is set to "Done" and can be cancelled with the "Cancelled" status. Please note that the refund cannot be cancelled after two hours.
 ### Changes
-- Minimum Supported Shopware version is now 6.4.5.0
+- Minimum Supported Shopware version is now 6.4.5.0
+- Add new monolog channel "mollie". You can now add custom handler and assign them to the mollie channel
diff --git a/composer.json b/composer.json
@@ -42,12 +42,15 @@
     },
     "autoload": {
         "psr-4": {
+            "Mollie\\Shopware\\": "shopware/",
             "Kiener\\MolliePayments\\": "src/",
             "Mollie\\Api\\": "vendor_manual/mollie/mollie-api-php/src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
+            "Mollie\\Unit\\": "tests/Unit/",
+            "Mollie\\Integration\\": "tests/Integration/",
             "MolliePayments\\Tests\\": "tests/PHPUnit/",
             "MolliePayments\\PHPStan\\": "tests/PHPStan/",
             "MolliePayments\\Fixtures\\": "tests/Fixtures/"
@@ -70,7 +73,7 @@
         "shopware/elasticsearch": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9",
         "phpstan/phpstan": "1.10.0",
         "friendsofphp/php-cs-fixer": "^2.18",
         "phpcompatibility/php-compatibility": "^9.3",

diff --git a/composer.lock b/composer.lock
diff --git a/makefile b/makefile
@@ -94,10 +94,13 @@ stan: ##2 Starts the PHPStan Analyser
 	@php vendor/bin/phpstan analyse -c ./.phpstan.neon
 
 phpunit: ##2 Starts all PHPUnit Tests
-	@XDEBUG_MODE=coverage php vendor/bin/phpunit --configuration=phpunit.xml --coverage-html ./.reports/phpunit/coverage
+	@XDEBUG_MODE=coverage php vendor/bin/phpunit --testsuite unit --configuration=phpunit.xml --coverage-html ./.reports/phpunit/coverage
+
+phpintegration: ##2 Starts all PHPUnit Tests
+	@XDEBUG_MODE=coverage cd ../../.. && php vendor/bin/phpunit --testsuite integration --configuration=custom/plugins/MolliePayments/phpunit.xml
 
 infection: ##2 Starts all Infection/Mutation tests
-	@XDEBUG_MODE=coverage php vendor/bin/infection --configuration=./.infection.json --log-verbosity=all --debug
+	@XDEBUG_MODE=coverage php vendor/bin/infection --configuration=./.infection.json --log-verbosity=all --debug --test-framework-options="--testsuite=unit --no-coverage"
 
 insights: ##2 Starts the PHPInsights Analyser
 	@php vendor/bin/phpinsights analyse --no-interaction
@@ -151,6 +154,7 @@ pr: ##2 Prepares everything for a Pull Request
 	@make phpmin -B
 	@make stan -B
 	@make phpunit -B
+	@make phpintegration -B
 	@make jest -B
 	@make eslint mode=no-dry-run -B
 	@make stylelint -B

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,23 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
-         bootstrap="./vendor/autoload.php"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
+         bootstrap="./tests/bootstrap/index.php"
          cacheResult="false"
          colors="true"
          executionOrder="random"
-         resolveDependencies="true"
 >
+    <php>
+        <ini name="error_reporting" value="-1"/>
+        <server name="KERNEL_CLASS" value="Shopware\Core\Kernel"/>
+        <env name="APP_ENV" value="test"/>
+        <env name="APP_DEBUG" value="1"/>
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
+    </php>
 
     <testsuites>
-        <testsuite name="MolliePayments Tests">
+        <testsuite name="unit">
             <directory>./tests/PHPUnit</directory>
+            <directory>./tests/Unit</directory>
+        </testsuite>
+        <testsuite name="integration">
+            <directory>./tests/Integration</directory>
         </testsuite>
     </testsuites>
 
     <coverage>
         <include>
-            <directory>./src</directory>
+            <directory suffix=".php">./src</directory>
+            <directory suffix=".php">./shopware</directory>
         </include>
     </coverage>
+
 
 </phpunit>