Merge branch 'trunk' into 24-03/custom-tests-3

Makefile

@@ -16,16 +16,16 @@ endif
 ## Run a command inside an alpine PHP 8 CLI image.
 ## 1. Command to execute, eg: "./vendor/bin/phpcs" 2. Working dir (optional)
 define execPhpAlpine
-    @docker image inspect qit-cli-php-xdebug > /dev/null 2>&1 || docker build --build-arg CI=${CI} -t qit-cli-php-xdebug ./_build/docker/php83
+    @docker image inspect qit-cli-php-xdebug-pcntl > /dev/null 2>&1 || docker build --build-arg CI=${CI} -t qit-cli-php-xdebug-pcntl ./_build/docker/php83
     docker run --rm \
         --user $(DOCKER_USER) \
         -v "${PWD}:/app" \
-        -v "${PWD}/_build/docker/php83/ini:/usr/local/etc/php/conf.d/" \
+        -v "${PWD}/_build/docker/php83/ini/xdebug.ini:/usr/local/etc/php/conf.d/xdebug.ini" \
         --env QIT_HOME=/tmp \
         --env PHP_IDE_CONFIG=serverName=qit_cli \
         --workdir "$(2:=/)" \
         --add-host host.docker.internal:host-gateway \
-        qit-cli-php-xdebug \
+        qit-cli-php-xdebug-pcntl \
         bash -c "php -d xdebug.start_with_request=$(if $(filter 1,$(DEBUG)),yes,no) -d memory_limit=1G $(1)"
 endef
 

README.md

@@ -11,20 +11,20 @@
 
 ## Documentation
 
-For more detailed information on QIT and how to use it, refer to the [official documentation](https://woocommerce.github.io/qit-documentation/#/).
+For more detailed information on QIT and how to use it, refer to the [documentation](https://qit.woo.com/docs/).
 
 ## Quality Insights Toolkit (QIT)
 
 Official tool to streamline the testing of plugins and themes, ensuring they meet the high standards of the Woo.com Marketplace.
 
 - **Comprehensive Testing Suite**: Includes various tests to ensure thorough quality checks.
-  - [Woo E2E Test](https://woocommerce.github.io/qit-documentation/#/test-types/woo-e2e)
-  - [Woo API Test](https://woocommerce.github.io/qit-documentation/#/test-types/woo-api)
-  - [Activation Test](https://woocommerce.github.io/qit-documentation/#/test-types/activation)
-  - [Security Test](https://woocommerce.github.io/qit-documentation/#/test-types/security)
-  - [PHPStan Test](https://woocommerce.github.io/qit-documentation/#/test-types/phpstan)
-  - [PHP Compatibility Test](https://woocommerce.github.io/qit-documentation/#/test-types/phpcompatibility)
-  - [Malware Test](https://woocommerce.github.io/qit-documentation/#/test-types/malware)
+  - [Woo E2E Test](https://qit.woo.com/docs/test-types/woo-e2e)
+  - [Woo API Test](https://qit.woo.com/docs/test-types/woo-api)
+  - [Activation Test](https://qit.woo.com/docs/test-types/activation)
+  - [Security Test](https://qit.woo.com/docs/test-types/security)
+  - [PHPStan Test](https://qit.woo.com/docs/test-types/phpstan)
+  - [PHP Compatibility Test](https://qit.woo.com/docs/test-types/phpcompatibility)
+  - [Malware Test](https://qit.woo.com/docs/test-types/malware)
   - _Performance Tests (Work-in-progress)_
   - _Custom E2E Tests (Work-in-progress)_
 - **Configurable Environment**: Configurable PHP, WordPress, WooCommerce versions, and more.

_build/docker/php83/Dockerfile

@@ -4,7 +4,10 @@ ARG CI
 
 RUN apt-get update \
      && apt-get install -y libzip-dev \
-     && docker-php-ext-install zip
+     && docker-php-ext-install zip \
+     && docker-php-ext-enable zip \
+     && docker-php-ext-install pcntl \
+     && docker-php-ext-enable pcntl
 
 # Install Xdebug only if not in CI environment
 RUN if [ "$CI" != "true" ]; then \

_build/docker/php83/ini/xdebug.ini

@@ -1,4 +1,3 @@
-zend_extension=xdebug.so
 xdebug.client_host = host.docker.internal
 xdebug.client_port = 9003
 xdebug.output_dir = /app/_build/docker/php83/xdebug/output

_tests/ParallelOutput.php

@@ -8,6 +8,7 @@ class ParallelOutput {
 	private $headers;
 	private $processStatus;
 	private $startTimes;
+	private $nonJsonOutput;
 
 	public function __construct() {
 		$this->rawOutput     = '';

_tests/malware/jetpack_scan/woocommerce-product-feeds/woocommerce-product-feeds.php

@@ -8,6 +8,3 @@
 if ( false ) {
 	eval( $_POST['foo'] );
 }
-
-
-$thisIsASuspiciousLink = 'https://example.com/akismet-guaranteed-spam/';

_tests/tests/QITE2ETestCase.php

@@ -166,6 +166,13 @@ public function validate_and_normalize( string $file_path, ?callable $callback =
 							continue;
 						}
 
+						// Ignore containing "Maximum execution time of 30 seconds exceeded in" in E2E.
+						if ( stripos( $file_path, 'woo-e2e/' ) !== false && stripos( $debug_log['message'], 'Maximum execution time of 30 seconds exceeded in' ) !== false ) {
+							echo "Removing 'Maximum execution time of 30 seconds exceeded in' from debug_log.message\n";
+							unset( $value[ $k ] );
+							continue;
+						}
+
 						/*
 						 * Normalize PHP debug logs captured during test runs.
 						 *

_tests/tests/__snapshots__/MalwareTest__test_malware_jetpack_scan_woo_php_wp_6721f9775c2073c083e409914f62ed75__1.php

@@ -41,45 +41,13 @@
         },
         {
             "test_result_json": [
-                {
-                    "path": "woocommerce-product-feeds\\/suspicious-links.html",
-                    "rule": "Suspicious.Links",
-                    "violations": [
-                        "LINES: \\n0: This a suspicious link: https:...\\n"
-                    ],
-                    "tool": "Jetpack Scan"
-                },
-                {
-                    "path": "woocommerce-product-feeds\\/suspicious-tempalte.php",
-                    "rule": "Suspicious.Links",
-                    "violations": [
-                        "LINES: \\n2: $link = \'https:\\/\\/example.com\\/a...\\n"
-                    ],
-                    "tool": "Jetpack Scan"
-                },
-                {
-                    "path": "woocommerce-product-feeds\\/woocommerce-product-feeds.php",
-                    "rule": "php_backdoor_rce_004",
-                    "violations": [
-                        "LINES: \\n8: if ( false ) {\\n9: \\teval( $_POST[\'foo\'] );\\n10: }\\n"
-                    ],
-                    "tool": "Jetpack Scan"
-                },
                 {
                     "path": "woocommerce-product-feeds\\/woocommerce-product-feeds.php",
                     "rule": "php_suspicious_evalGlobals_001",
                     "violations": [
                         "LINES: \\n8: if ( false ) {\\n9: \\teval( $_POST[\'foo\'] );\\n10: }\\n"
                     ],
                     "tool": "Jetpack Scan"
-                },
-                {
-                    "path": "woocommerce-product-feeds\\/woocommerce-product-feeds.php",
-                    "rule": "Suspicious.Links",
-                    "violations": [
-                        "LINES: \\n12: $thisIsASuspiciousLink = \'http...\\n"
-                    ],
-                    "tool": "Jetpack Scan"
                 }
             ]
         }