Merge pull request #2416 from woocommerce/release/2.7.1

Release 2.7.1

.github/workflows/backlog-automation.yml

@@ -5,20 +5,19 @@ on:
     types:
       - opened
       - transferred
-  pull_request:
+  pull_request_target:
     types:
       - opened
 
-# Leverage project write access for dependabot.
-permissions:
-  repository-projects: write
-
 jobs:
   add-to-project:
     name: Add issue/PR to project
+    permissions:
+      contents: read
+      pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/add-to-project@v0.4.0
+      - uses: actions/add-to-project@v1.0.1
         with:
           project-url: https://github.com/orgs/woocommerce/projects/119
           github-token: ${{ secrets.BOT_GH_TOKEN }}

.github/workflows/branch-labels.yml

@@ -1,11 +1,15 @@
 name: Set PR Labels
 
 on:
-  pull_request:
+  pull_request_target:
     types: opened
+
 jobs:
   SetLabels:
+    permissions:
+      contents: read
+      pull-requests: write
     runs-on: ubuntu-latest
     steps:
       - name: Set Labels
-        uses: woocommerce/grow/branch-label@actions-v1
+        uses: woocommerce/grow/branch-label@actions-v2

.github/workflows/build.yml

@@ -20,15 +20,15 @@ jobs:
       FORCE_COLOR: 2
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Prepare PHP
-        uses: woocommerce/grow/prepare-php@actions-v1
+        uses: woocommerce/grow/prepare-php@actions-v2
         with:
           install-deps: "no"
 
       - name: Prepare node
-        uses: woocommerce/grow/prepare-node@actions-v1
+        uses: woocommerce/grow/prepare-node@actions-v2
         with:
           node-version-file: ".nvmrc"
           ignore-scripts: "no"
@@ -69,13 +69,13 @@ jobs:
 
       - name: Publish dev build to GitHub
         if: ${{ github.event_name == 'push' && github.ref_name == 'develop' }}
-        uses: woocommerce/grow/publish-extension-dev-build@actions-v1
+        uses: woocommerce/grow/publish-extension-dev-build@actions-v2
         with:
           extension-asset-path: google-listings-and-ads.zip
 
       - name: Publish build artifact
         if: ${{ ! ( github.event_name == 'push' && github.ref_name == 'develop' ) }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: google-listings-and-ads.zip
           path: ${{ github.workspace }}/google-listings-and-ads.zip

.github/workflows/e2e-tests.yml

@@ -26,15 +26,15 @@ jobs:
       FORCE_COLOR: 2
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Prepare PHP
-        uses: woocommerce/grow/prepare-php@actions-v1
+        uses: woocommerce/grow/prepare-php@actions-v2
         with:
           install-deps: "no"
 
       - name: Prepare node
-        uses: woocommerce/grow/prepare-node@actions-v1
+        uses: woocommerce/grow/prepare-node@actions-v2
         with:
           node-version-file: ".nvmrc"
           ignore-scripts: "no"
@@ -72,7 +72,7 @@ jobs:
 
       - name: Archive e2e failure screenshots
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
             name: e2e-screenshots
             path: tests/e2e/test-results/report/**/*.png

.github/workflows/js-css-linting.yml

@@ -28,15 +28,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Prepare node
-        uses: woocommerce/grow/prepare-node@actions-v1
+        uses: woocommerce/grow/prepare-node@actions-v2
         with:
           node-version-file: ".nvmrc"
 
       - name: Prepare annotation formatter
-        uses: woocommerce/grow/eslint-annotation@actions-v1
+        uses: woocommerce/grow/eslint-annotation@actions-v2
 
       - name: Lint JavaScript and annotate linting errors
         run: npm run lint:js -- --quiet --format ./eslintFormatter.cjs
@@ -46,15 +46,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Prepare node
-        uses: woocommerce/grow/prepare-node@actions-v1
+        uses: woocommerce/grow/prepare-node@actions-v2
         with:
           node-version-file: ".nvmrc"
 
       - name: Prepare annotation formatter
-        uses: woocommerce/grow/stylelint-annotation@actions-v1
+        uses: woocommerce/grow/stylelint-annotation@actions-v2
 
       - name: Lint CSS and annotate linting errors
         run: npm run lint:css -- --custom-formatter ./stylelintFormatter.cjs

.github/workflows/js-unit-tests.yml

@@ -29,19 +29,20 @@ jobs:
       FORCE_COLOR: 2
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Prepare node
-        uses: woocommerce/grow/prepare-node@actions-v1
+        uses: woocommerce/grow/prepare-node@actions-v2
         with:
           node-version-file: ".nvmrc"
 
       - name: Run JavaScript unit tests
         run: npm run test:js
 
       - name: Upload JS unit coverage report
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage/clover.xml
           flags: js-unit-tests
           name: js-coverage-report

.github/workflows/php-coding-standards.yml

@@ -23,10 +23,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Prepare PHP
-        uses: woocommerce/grow/prepare-php@actions-v1
+        uses: woocommerce/grow/prepare-php@actions-v2
         with:
           tools: cs2pr
 

.github/workflows/php-hook-documentation.yml

@@ -18,15 +18,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # Checks out a branch instead of a commit in detached HEAD state
           ref: ${{ github.head_ref }}
 
         # This generates the documentation string. The `id` property is used to reference the output in the next step.
       - name: Generate hook documentation
         id: generate-hook-docs
-        uses: woocommerce/grow/hook-documentation@actions-v1
+        uses: woocommerce/grow/hook-documentation@actions-v2
         with:
           source-directories: src/,views/,google-listings-and-ads.php,uninstall.php
 

.github/workflows/php-unit-tests.yml

@@ -44,12 +44,12 @@ jobs:
     steps:
       - name: Get Release versions from Wordpress
         id: wp
-        uses: woocommerce/grow/get-plugin-releases@actions-v1
+        uses: woocommerce/grow/get-plugin-releases@actions-v2
         with:
           slug: wordpress
       - name: Get Release versions from WooCommerce
         id: wc
-        uses: woocommerce/grow/get-plugin-releases@actions-v1
+        uses: woocommerce/grow/get-plugin-releases@actions-v2
         with:
           slug: woocommerce
 
@@ -77,20 +77,20 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - if: matrix.wc-versions == needs.GetMatrix.outputs.latest-wc-version && matrix.php == 8.2
         name: Set condition to generate coverage report (only on latest versions)
         run: echo "generate_coverage=true" >> $GITHUB_ENV
 
       - name: Prepare PHP
-        uses: woocommerce/grow/prepare-php@actions-v1
+        uses: woocommerce/grow/prepare-php@actions-v2
         with:
           php-version: "${{ matrix.php }}"
           coverage: "${{ env.generate_coverage == 'true' && 'xdebug' || 'none' }}"
 
       - name: Prepare MySQL
-        uses: woocommerce/grow/prepare-mysql@actions-v1
+        uses: woocommerce/grow/prepare-mysql@actions-v2
 
       - name: Install WP tests
         run: ./bin/install-wp-tests.sh wordpress_test root root localhost ${{ matrix.wp-version }} ${{ matrix.wc-versions }}
@@ -105,8 +105,9 @@ jobs:
 
       - if: env.generate_coverage == 'true'
         name: Upload PHP unit coverage report
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: tests/php-coverage/report.xml
           flags: php-unit-tests
           name: php-coverage-report
@@ -121,15 +122,15 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Prepare PHP
-        uses: woocommerce/grow/prepare-php@actions-v1
+        uses: woocommerce/grow/prepare-php@actions-v2
         with:
           php-version: "${{ inputs.php-version }}"
 
       - name: Prepare MySQL
-        uses: woocommerce/grow/prepare-mysql@actions-v1
+        uses: woocommerce/grow/prepare-mysql@actions-v2
 
       - name: Install WP tests
         env:

.github/workflows/post-release-merge.yml

@@ -15,4 +15,4 @@ jobs:
   MergeTrunkDevelopPR:
     runs-on: ubuntu-latest
     steps:
-      - uses: woocommerce/grow/merge-trunk-develop-pr@actions-v1
+      - uses: woocommerce/grow/merge-trunk-develop-pr@actions-v2

.github/workflows/prepare-release.yml

@@ -27,10 +27,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create branch & PR
-        uses: woocommerce/grow/prepare-extension-release@actions-v1
+        uses: woocommerce/grow/prepare-extension-release@actions-v2
         with:
           version: ${{ github.event.inputs.version }}
           type: ${{ github.event.inputs.type }}

.github/workflows/run-qit.yml

@@ -58,12 +58,12 @@ jobs:
     needs: build
     steps:
       - name: Download artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: google-listings-and-ads.zip
       - name: Run QIT Tests
         # Update it with more stable path once merged.
-        uses: woocommerce/grow/run-qit-extension@actions-v1
+        uses: woocommerce/grow/run-qit-extension@actions-v2
         with:
           qit-partner-user: ${{ secrets.QIT_PARTNER_USER }}
           qit-partner-secret: ${{ secrets.QIT_PARTNER_SECRET }}

README.md

@@ -180,6 +180,15 @@ npm run -- wp-env run tests-cli -- wp plugin update woocommerce --version=8.0.0-
 npm run -- wp-env run tests-cli -- wp wc update
 ```
 
+### Google Ads API Client Library 
+
+The new Google Ads API Client Library version is now available with PHP 7.4 support under this "legacy" branch.
+
+We are using it in [composer](https://github.com/woocommerce/google-listings-and-ads/blob/develop/composer.json#L15) 
+in order to support PHP 7.4.
+
+Going forward, Google will always add the prefix "legacy-" for the branch supporting PHP 7.4.
+
 ## Docs
 
 - [Usage Tracking](./src/Tracking/README.md)

changelog.txt

@@ -1,5 +1,10 @@
 *** WooCommerce Google Listings and Ads Changelog ***
 
+= 2.7.1 - 2024-05-29 =
+* Dev - Add info about  Legacy Google Ads API Client Library  in Readme.
+* Fix - Prevent PHP Warning when Statistics is null.
+* Update - Implement Account Request Review Requests in the extension.
+
 = 2.7.0 - 2024-05-14 =
 * Fix - Convert `lbs` to `lb` when mapping WC products to Google products.
 * Fix - E2E tests

google-listings-and-ads.php

@@ -3,7 +3,7 @@
  * Plugin Name: Google Listings and Ads
  * Plugin URL: https://wordpress.org/plugins/google-listings-and-ads/
  * Description: Native integration with Google that allows merchants to easily display their products across Google’s network.
- * Version: 2.7.0
+ * Version: 2.7.1
  * Author: WooCommerce
  * Author URI: https://woo.com/
  * Text Domain: google-listings-and-ads
@@ -30,7 +30,7 @@
 
 defined( 'ABSPATH' ) || exit;
 
-define( 'WC_GLA_VERSION', '2.7.0' ); // WRCS: DEFINED_VERSION.
+define( 'WC_GLA_VERSION', '2.7.1' ); // WRCS: DEFINED_VERSION.
 define( 'WC_GLA_MIN_PHP_VER', '7.4' );
 define( 'WC_GLA_MIN_WC_VER', '6.9' );
 

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "google-listings-and-ads",
 	"title": "Google Listings and Ads",
-	"version": "2.7.0",
+	"version": "2.7.1",
 	"description": "google-listings-and-ads",
 	"author": "Automattic",
 	"license": "GPL-3.0-or-later",

readme.txt

@@ -5,7 +5,7 @@ Requires at least: 5.9
 Tested up to: 6.5
 Requires PHP: 7.4
 Requires PHP Architecture: 64 Bits
-Stable tag: 2.7.0
+Stable tag: 2.7.1
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -111,6 +111,11 @@ Yes, you can run both at the same time, and we recommend it! In the US, advertis
 
 == Changelog ==
 
+= 2.7.1 - 2024-05-29 =
+* Dev - Add info about  Legacy Google Ads API Client Library  in Readme.
+* Fix - Prevent PHP Warning when Statistics is null.
+* Update - Implement Account Request Review Requests in the extension.
+
 = 2.7.0 - 2024-05-14 =
 * Fix - Convert `lbs` to `lb` when mapping WC products to Google products.
 * Fix - E2E tests
@@ -120,9 +125,4 @@ Yes, you can run both at the same time, and we recommend it! In the US, advertis
 = 2.6.9 - 2024-05-07 =
 * Tweak - Confirm issues are present when retrieving product status.
 
-= 2.6.8 - 2024-04-23 =
-* Tweak - Remove deprecated event properties marked as removable after Q1 2024 from the onboarding event tracking.
-* Tweak - Update tags in readme.txt.
-* Update - Restrict product types to be limited to only 10 when converting from categories.
-
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/google-listings-and-ads/trunk/changelog.txt).