Merge pull request #2945 from 10up/tests/phpcs-unified-call

Check PHP compatibility while linting + PR annotations
10up · Aug 12, 2022 · 1d0dde0 · 1d0dde0
2 parents f934509 + bfe5738
commit 1d0dde0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 57 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -73,11 +73,14 @@ jobs:
     - name: Set PHP version
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.2'
+        php-version: '7.4'
         coverage: none
 
     - name: composer install
       run: composer install
 
     - name: PHPCS check
-      run: composer run lint
+      uses: chekalsky/phpcs-action@v1
+      with:
+        enable_warnings: true
+        phpcs_bin_path: './vendor/bin/phpcs elasticpress.php includes --runtime-set testVersion 7.0-'
diff --git a/.github/workflows/php-compatibility.yml b/.github/workflows/php-compatibility.yml
diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
     "yoast/phpunit-polyfills": "1.x-dev"
   },
   "scripts": {
-    "lint": "phpcs elasticpress.php includes",
+    "lint": "phpcs elasticpress.php includes --runtime-set testVersion 7.0-",
     "lint-fix": "phpcbf elasticpress.php includes",
     "test": "phpunit",
     "test-single-site": "phpunit -c single-site.xml.dist",

diff --git a/includes/classes/Indexable/Term/QueryIntegration.php b/includes/classes/Indexable/Term/QueryIntegration.php
@@ -241,6 +241,7 @@ protected function format_hits_as_terms( $terms, $new_terms, $query_vars ) {
 			}
 
 			$term->elasticsearch = true; // Super useful for debugging.
+
 			$term = new \WP_Term( $term ); // Necessary for WordPress actions that expect WP_Term as the object type.
 
 			if ( $term ) {

diff --git a/phpcs.xml b/phpcs.xml
@@ -5,4 +5,5 @@
   <rule ref="10up-Default">
     <exclude name="WordPress.WP.GlobalVariablesOverride.Prohibited" />
   </rule>
+  <rule ref="PHPCompatibilityWP" />
 </ruleset>