diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..9ab59b180fb670006ac910a2bc4524a1376dcea0 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,15 @@ + +# Ignore developer files when exporting +.gitattributes export-ignore +.gitignore export-ignore +.gitlab-ci.yml export-ignore +.phive export-ignore +captainhook.json export-ignore +phpcs.xml.dist export-ignore +phpstan-baseline.neon export-ignore +phpstan.dist.neon export-ignore +phpunit.dist.xml export-ignore +tests export-ignore + +# Explicitly set file type and line endings for PHP files, improves git diff output +*.php text eol=lf diff=php \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b8d20acb6c365ad8036a7b36d47dabd876d08efa..b5a64b401e554341447c74d7cf93a89ac95a3fdb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,17 @@ include: - - project: 'quiqqer/stabilization/semantic-release' - file: '/ci-templates/.gitlab-ci.yml' + - component: dev.quiqqer.com/quiqqer/stabilization/ci-cd-components/quiqqer-package-bundle/quiqqer-package-bundle@main + +# Remove the entire phpunit-php8.1 block, to allow PHPUnit to run on PHP 8.1 in your pipeline +phpunit-php8.1: + rules: + - when: never + +# Remove the entire phpunit-php8.2 block, to allow PHPUnit to run on PHP 8.2 in your pipeline +phpunit-php8.2: + rules: + - when: never + +# Remove the entire phpunit-php8.3 block, to allow PHPUnit to run on PHP 8.3 in your pipeline +phpunit-php8.3: + rules: + - when: never \ No newline at end of file diff --git a/.phive/phars.xml b/.phive/phars.xml index a1315a09b4adad780a9c5e52f74835c708c5c7d5..5bfa092bfad10dad9d23240281a5a2041acb815b 100644 --- a/.phive/phars.xml +++ b/.phive/phars.xml @@ -1,4 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <phive xmlns="https://phar.io/phive"> - <phar name="phpstan" version="^1.10.67" installed="1.10.67" location="./tools/phpstan" copy="false"/> + <phar name="phpstan" version="1.11.8" installed="1.11.8" location="./tools/phpstan" copy="false"/> + <phar name="phpunit" version="^10.5.20" installed="10.5.20" location="./tools/phpunit" copy="false"/> + <phar name="phpcs" version="^3.10.1" installed="3.10.1" location="./tools/phpcs" copy="false"/> + <phar name="phpcbf" version="^3.10.1" installed="3.10.1" location="./tools/phpcbf" copy="false"/> + <phar name="captainhook" version="^5.23.3" installed="5.23.3" location="./tools/captainhook" copy="false"/> </phive> diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000000000000000000000000000000000000..4a69a59b440e5beec561eca1e341509bd5a18688 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,3 @@ +# Contributing + +This package follows the [QUIQQER contribution guidelines](https://dev.quiqqer.com/quiqqer/stabilization/documentation/-/wikis/home). \ No newline at end of file diff --git a/captainhook.json b/captainhook.json new file mode 100644 index 0000000000000000000000000000000000000000..3702e1a358868bedd5ff4c7eae40bb1abb589267 --- /dev/null +++ b/captainhook.json @@ -0,0 +1,13 @@ +{ + "pre-commit": { + "enabled": true, + "actions": [ + { + "action": "\\CaptainHook\\App\\Hook\\PHP\\Action\\Linting" + }, + { + "action": "composer test" + } + ] + } +} \ No newline at end of file diff --git a/composer.json b/composer.json index 585d7667dbd846779d7b267ddf61deffe991b86b..a76e90092a0a8484721ca83ed31050f0476f960e 100644 --- a/composer.json +++ b/composer.json @@ -27,5 +27,47 @@ "psr-4": { "QUI\\ERP\\Order\\Guest\\": "src/QUI/ERP/Order/Guest" } + }, + "scripts": { + "test": [ + "@dev:lint", + "@dev:phpunit" + ], + "dev:phpunit": "./tools/phpunit", + "dev:lint": [ + "@dev:lint:phpstan", + "@dev:lint:style" + ], + "dev:lint:phpstan": "./tools/phpstan", + "dev:lint:style": "./tools/phpcs", + "dev:lint:style:fix": "./tools/phpcbf", + "dev:init": [ + "@dev:init:check-requirements", + "@dev:init:tools", + "@dev:init:git-hooks" + ], + "dev:init:check-requirements": [ + "which composer > /dev/null || (echo 'Error: composer has to be globally installed'; exit 1)", + "which phive > /dev/null || (echo 'Error: PHIVE has to be globally installed'; exit 1)" + ], + "dev:init:tools": "phive install --temporary", + "dev:init:git-hooks": "./tools/captainhook install --only-enabled --force" + }, + "scripts-aliases": { + "test": [ + "dev:test" + ] + }, + "scripts-descriptions": { + "test": "Runs linting, static analysis, and unit tests.", + "dev:phpunit": "Run PHPUnit test suites", + "dev:lint": "Run PHPStan and code style check", + "dev:lint:phpstan": "Run PHPStan", + "dev:lint:style": "Run code style check (PHP_CodeSniffer)", + "dev:lint:style:fix": "Try to fix code style errors automatically", + "dev:init": "Initialize the developer tooling (tools and git hooks)", + "dev:init:check-requirements": "Check if the necessary requirements are met", + "dev:init:tools": "Install all developer tools (requires PHIVE)", + "dev:init:git-hooks": "Install all git hooks (may require tools to be installed)" } } diff --git a/phpcs.xml.dist b/phpcs.xml.dist new file mode 100644 index 0000000000000000000000000000000000000000..d48084fbdc86a2dbfb78dd89ab2e0b0ff2322ba7 --- /dev/null +++ b/phpcs.xml.dist @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<ruleset> + <!-- Use PSR-12 ruleset --> + <rule ref="PSR12"/> + + <!-- Only scan *.php files --> + <arg name="extensions" value="php"/> + + <!-- Ignore warnings --> + <arg name="warning-severity" value="0"/> + + <!-- Process 64 (or number of CPU cores) files in parallel --> + <arg name="parallel" value="64"/> + + <!-- Output relative file paths, by setting the current folder as the basepath --> + <arg name="basepath" value="."/> + + <!-- Show colored output --> + <arg name="colors"/> + + <!-- Scan everything in the current folder --> + <file>.</file> +</ruleset> diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7b7222a6417b31adc494b431f12f3faac2ef831d 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -0,0 +1,91 @@ +parameters: + ignoreErrors: + - + message: "#^Call to method post\\(\\) on an unknown class QUI\\\\ERP\\\\Accounting\\\\Invoice\\\\InvoiceTemporary\\.$#" + count: 1 + path: ajax/frontend/submitCustomerData.php + + - + message: "#^Call to method sendTo\\(\\) on an unknown class QUI\\\\ERP\\\\Accounting\\\\Invoice\\\\Invoice\\.$#" + count: 1 + path: ajax/frontend/submitCustomerData.php + + - + message: "#^Call to static method getMissingAddressData\\(\\) on an unknown class QUI\\\\ERP\\\\Accounting\\\\Invoice\\\\Utils\\\\Invoice\\.$#" + count: 1 + path: ajax/frontend/submitCustomerData.php + + - + message: "#^Call to static method getMissingAttributeMessage\\(\\) on an unknown class QUI\\\\ERP\\\\Accounting\\\\Invoice\\\\Utils\\\\Invoice\\.$#" + count: 1 + path: ajax/frontend/submitCustomerData.php + + - + message: "#^Class QUI\\\\ERP\\\\Accounting\\\\Invoice\\\\Invoice not found\\.$#" + count: 1 + path: ajax/frontend/submitCustomerData.php + + - + message: "#^Class QUI\\\\ERP\\\\Accounting\\\\Invoice\\\\InvoiceTemporary not found\\.$#" + count: 1 + path: ajax/frontend/submitCustomerData.php + + - + message: "#^Call to static method getMissingAddressData\\(\\) on an unknown class QUI\\\\ERP\\\\Accounting\\\\Invoice\\\\Utils\\\\Invoice\\.$#" + count: 1 + path: src/QUI/ERP/Order/Guest/Controls/MissingAddressData.php + + - + message: "#^Call to an undefined method QUI\\\\ERP\\\\Order\\\\AbstractOrder\\:\\:save\\(\\)\\.$#" + count: 2 + path: src/QUI/ERP/Order/Guest/EventHandler.php + + - + message: "#^Call to an undefined method QUI\\\\Interfaces\\\\Projects\\\\Site\\:\\:getUrlRewrittenWithHost\\(\\)\\.$#" + count: 1 + path: src/QUI/ERP/Order/Guest/EventHandler.php + + - + message: "#^Call to an undefined method QUI\\\\Interfaces\\\\Users\\\\User\\:\\:getGuestOrderId\\(\\)\\.$#" + count: 1 + path: src/QUI/ERP/Order/Guest/EventHandler.php + + - + message: "#^Call to static method getMissingAddressData\\(\\) on an unknown class QUI\\\\ERP\\\\Accounting\\\\Invoice\\\\Utils\\\\Invoice\\.$#" + count: 1 + path: src/QUI/ERP/Order/Guest/EventHandler.php + + - + message: "#^Class QUI\\\\ERP\\\\Shipping\\\\Order\\\\Shipping not found\\.$#" + count: 1 + path: src/QUI/ERP/Order/Guest/EventHandler.php + + - + message: "#^Method QUI\\\\ERP\\\\Order\\\\Guest\\\\EventHandler\\:\\:extendMail\\(\\) with return type void returns null but should not return anything\\.$#" + count: 1 + path: src/QUI/ERP/Order/Guest/EventHandler.php + + - + message: "#^Method QUI\\\\ERP\\\\Order\\\\Guest\\\\EventHandler\\:\\:onOrderProcessGetOrder\\(\\) should return QUI\\\\ERP\\\\Order\\\\OrderInProcess\\|null but returns QUI\\\\ERP\\\\Order\\\\Order\\.$#" + count: 1 + path: src/QUI/ERP/Order/Guest/EventHandler.php + + - + message: "#^Method QUI\\\\ERP\\\\Order\\\\Guest\\\\EventHandler\\:\\:onQuiqqerOrderClear\\(\\) with return type void returns null but should not return anything\\.$#" + count: 1 + path: src/QUI/ERP/Order/Guest/EventHandler.php + + - + message: "#^Parameter \\#1 \\$code of method QUI\\\\Interfaces\\\\Users\\\\User\\:\\:activate\\(\\) expects string, false given\\.$#" + count: 1 + path: src/QUI/ERP/Order/Guest/GuestOrder.php + + - + message: "#^Parameter \\#1 \\$groupId of method QUI\\\\Interfaces\\\\Users\\\\User\\:\\:addToGroup\\(\\) expects int, string given\\.$#" + count: 2 + path: src/QUI/ERP/Order/Guest/GuestOrder.php + + - + message: "#^Parameter \\#2 \\$User of class QUI\\\\ERP\\\\Address constructor expects QUI\\\\ERP\\\\User\\|null, \\$this\\(QUI\\\\ERP\\\\Order\\\\Guest\\\\GuestOrderUser\\) given\\.$#" + count: 1 + path: src/QUI/ERP/Order/Guest/GuestOrderUser.php diff --git a/phpstan.dist.neon b/phpstan.dist.neon index 8cc97b4ab76c2f002e9fdb8ae1a6eb5d5eaf999d..57bd9a666e7487b8ffa63fc74b9d645480d85c22 100644 --- a/phpstan.dist.neon +++ b/phpstan.dist.neon @@ -2,10 +2,11 @@ includes: - phpstan-baseline.neon parameters: - level: 1 + level: 5 paths: - src - ajax + tipsOfTheDay: false bootstrapFiles: - tests/phpstan-bootstrap.php diff --git a/phpunit.dist.xml b/phpunit.dist.xml new file mode 100644 index 0000000000000000000000000000000000000000..f6c7becf0c12757beb871a9333e2d81e02aa7cae --- /dev/null +++ b/phpunit.dist.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<phpunit bootstrap="tests/phpunit-bootstrap.php"> + <testsuites> + <testsuite name="Tests"> + <directory>tests/</directory> + </testsuite> + </testsuites> +</phpunit> diff --git a/src/QUI/ERP/Order/Guest/GuestOrder.php b/src/QUI/ERP/Order/Guest/GuestOrder.php index ee5211bad567fe5020c119b92f8bdc1829b1157b..c5b6c5fad7fbdddfe911e839646daf9022a1c478 100644 --- a/src/QUI/ERP/Order/Guest/GuestOrder.php +++ b/src/QUI/ERP/Order/Guest/GuestOrder.php @@ -17,7 +17,7 @@ class GuestOrder { const FLAG = 'guest-order-is-guest'; const EMAIL = 'guest-order-email'; - + const CUSTOMER_UUID = 'guest-customer_uuid'; const CUSTOMER_ID = 'guest-customer_id'; diff --git a/tests/phpunit-bootstrap.php b/tests/phpunit-bootstrap.php new file mode 100644 index 0000000000000000000000000000000000000000..eca92fd67bed8ae4ec424ed82d300119d792f042 --- /dev/null +++ b/tests/phpunit-bootstrap.php @@ -0,0 +1,11 @@ +<?php + +if (!defined('QUIQQER_SYSTEM')) { + define('QUIQQER_SYSTEM', true); +} + +if (!defined('QUIQQER_AJAX')) { + define('QUIQQER_AJAX', true); +} + +require_once __DIR__ . '/../../../../bootstrap.php';