Merge branch 'main' into dependabot/composer/syntatis/coding-standard…

…-tw-1.3
syntatis · Jul 21, 2024 · 1c720b4 · 1c720b4
2 parents 84e55f4 + 06a0b3f
commit 1c720b4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,7 +53,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        wp: ['5.*', '6.5'] # WordPress 6.6 requires 7.2.
 
     env:
       WP_DB_TEST_NAME: wp_test
@@ -114,6 +115,7 @@ jobs:
 
       - name: Install dependencies
         run: |
+          composer require "wp-phpunit/wp-phpunit:${{ matrix.wp }}" "roots/wordpress:${{ matrix.wp }}" --no-interaction --no-update --dev
           composer remove syntatis/coding-standard rector/rector --dev
           composer install --prefer-dist
 

diff --git a/app/Parser.php b/app/Parser.php
@@ -872,7 +872,7 @@ protected function sanitize_requires_version($version)
 				// x.y or x.y.z
 				! preg_match('!^\d+\.\d(\.\d+)?$!', $version) ||
 				// Allow plugins to mark themselves as requireing Stable+0.1 (trunk/master) but not higher
-				( defined('WP_CORE_STABLE_BRANCH') && ( (float) $version > (float) WP_CORE_STABLE_BRANCH + 0.1 ) )
+				defined('WP_CORE_STABLE_BRANCH') && ( (float) $version > (float) WP_CORE_STABLE_BRANCH + 0.1 )
 			) {
 				$this->warnings['requires_header_ignored'] = true;
 				// Ignore the readme value.

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -17,8 +17,8 @@
 	<!-- Show the warning but exit with 0. The Warning is fine -->
 	<config name="ignore_warnings_on_exit" value="1"/>
 
-	<!-- Check for cross-version support for PHP 7.2 or higher. Requires PHPCompatibility -->
-	<config name="testVersion" value="7.2-"/>
+	<!-- Check for cross-version support for PHP 7.0 or higher. Requires PHPCompatibility -->
+	<config name="testVersion" value="7.0-"/>
 
 	<!-- Include full Doctrine Coding Standard -->
 	<rule ref="Syntatis"/>
@@ -42,6 +42,9 @@
 	<rule ref="Generic.PHP.ForbiddenFunctions">
 	  	<exclude name="Generic.PHP.ForbiddenFunctions.Found"/>
 	</rule>
+	<rule ref="Generic.CodeAnalysis.RequireExplicitBooleanOperatorPrecedence">
+	  	<exclude name="Generic.CodeAnalysis.RequireExplicitBooleanOperatorPrecedence.MissingParentheses"/>
+	</rule>
 	<rule ref="Squiz.NamingConventions.ValidVariableName">
 	  	<exclude name="Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps"/>
 	  	<exclude name="Squiz.NamingConventions.ValidVariableName.NotCamelCaps"/>