Merge pull request #975 from szepeviktor/follow-psr4

Fix file names as per PSR-4
mollie · Jan 3, 2025 · 1a3e23e · 1a3e23e
2 parents e6a8f52 + d9a8a74
commit 1a3e23e
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 60 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           coverage: none
-          tools: composer:v1
+          tools: composer:v2
 
       - name: Validate composer.json and composer.lock
         run: composer validate
@@ -28,14 +28,14 @@ jobs:
         run: composer update --prefer-dist --no-progress
 
       - name: dump autoload
-        run: composer dump-autoload
+        run: composer dump-autoload --dev --optimize --strict-psr
 
       - name: check syntax
         run: find src -name '*.php' | xargs -n 1 -P4 php -l
 
       - name: Run PHPUnit
         run: ./vendor/bin/phpunit
-        
+
       - name: Run Psalm
         run: ./vendor/bin/psalm --show-info=false --threads=2
 

diff --git a/composer.lock b/composer.lock
diff --git a/tests/php/Stubs/enqueue_scripts.php → tests/overrides/enqueue_scripts.php b/tests/php/Stubs/enqueue_scripts.php → tests/overrides/enqueue_scripts.php
diff --git a/tests/php/Stubs/woocommerce.php → tests/overrides/woocommerce.php b/tests/php/Stubs/woocommerce.php → tests/overrides/woocommerce.php
diff --git a/...ayButton/DataToAppleButtonScriptsTest.php → ...lePayButton/ApplePayDirectHandlerTest.php b/...ayButton/DataToAppleButtonScriptsTest.php → ...lePayButton/ApplePayDirectHandlerTest.php
diff --git a/tests/php/Functional/PaymentMethod/PaymentMethodTest.php b/tests/php/Functional/PaymentMethod/PaymentMethodTest.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace php\Functional\PaymentMethod;
+namespace Mollie\WooCommerceTests\Functional\PaymentMethod;
 
 
 use Mollie\WooCommerce\Gateway\Surcharge;

diff --git a/tests/php/Functional/Shared/SurchargeHandlerTest.php b/tests/php/Functional/Shared/SurchargeHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace php\Functional\Shared;
+namespace Mollie\WooCommerceTests\Functional\Shared;
 
 
 use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;

diff --git a/tests/php/Stubs/stubs.php b/tests/php/Stubs/stubs.php
diff --git a/tests/php/bootstrap.php b/tests/php/bootstrap.php
@@ -7,7 +7,10 @@
     die('Please install via Composer before running tests.');
 }
 
-require_once __DIR__ . '/Stubs/stubs.php';
+require_once __DIR__ . '/../overrides/enqueue_scripts.php';
+require_once __DIR__ . '/../overrides/woocommerce.php';
+require_once __DIR__ . '/Stubs/varPolylangTestsStubs.php';
+
 require_once $vendor . 'brain/monkey/inc/patchwork-loader.php';
 require_once $vendor . 'autoload.php';