Merge branch 'develop' into add-woocommerce-blueprint-support

Author: mmaymo

.ddev/bin/carriers-extractor.js

@@ -0,0 +1,57 @@
+#!/bin/bash
+#ddev-generated
+# PayPal Carriers Extractor Command
+## Description: Extract PayPal carrier data using Playwright
+
+## Usage: carriers-extractor
+## Example: ddev carriers-extractor
+
+
+cd /var/www/html || exit 1
+PRE="sudo -u pwuser PLAYWRIGHT_BROWSERS_PATH=0 "
+
+# Check if the carriers-extractor.js file exists
+if [ ! -f ".ddev/bin/carriers-extractor.js" ]; then
+    echo "❌ Error: carriers-extractor.js not found in project root"
+    echo "Please make sure the carriers-extractor.js file is in your project root directory"
+    exit 1
+fi
+
+# Check if Playwright is installed
+if [ ! -d "node_modules/playwright" ] && [ ! -d "${PLAYWRIGHT_TEST_DIR}/node_modules/playwright" ]; then
+    echo "❌ Error: Playwright is not installed"
+    echo "Please run 'ddev playwright-install' first to install Playwright"
+    exit 1
+fi
+
+
+# Install Playwright browsers if not already installed
+if [ ! -d "node_modules/playwright-core/.local-browsers" ]; then
+    echo "🎭 Installing Playwright browsers..."
+    $PRE npx playwright install --with-deps chromium >/dev/null
+fi
+
+
+echo "🚀 Starting PayPal carriers extraction..."
+echo "📡 Fetching data from: https://developer.paypal.com/docs/tracking/reference/carriers/"
+echo ""
+
+# Run the carriers extractor script
+$PRE node .ddev/bin/carriers-extractor.js
+
+if [ $? -eq 0 ]; then
+    echo ""
+    echo "📄 Generated file: carriers_data.php in the root of the project"
+    echo ""
+
+    echo "⏭️ Next steps:"
+    echo "1. Copy the array from carriers_data.php into your PayPal Payments plugin in \`modules/ppcp-order-tracking/carriers.php\`"
+    echo "2. Run \`yarn run ddev:fix-lint modules/ppcp-order-tracking/carriers.php\` to format the file."
+    echo "3. Run \`yarn run ddev:unit-tests\` to be sure nothing is broken :)"
+    echo "3. Remove the temporary carries_data.php from the root of the project"
+    echo "4. Review and commit your changes"
+
+else
+    echo "❌ Extraction failed. Please check the error messages above."
+    exit 1
+fi

.ddev/commands/playwright/carriers-extractor

@@ -1,30 +1,18 @@
 #!/bin/bash
 
 show-help() {
-	echo -e "\nDelete all posts -p [post type]"
-	echo -e "\tExample: ddev wp-cleanup -p shop_order,product"
 	echo -e "\nDelete all logs -l [wp-content path]"
 	echo -e "\tExample: ddev wp-cleanup -l uploads/wc-logs\n"
 }
 
-delete-posts() {
-	for post in $(wp post list --post_type=$1 --format=ids --path=.ddev/wordpress); do
-		wp post delete $post --force --path=.ddev/wordpress
-	done
-}
-
 delete-logs() {
 	rm .ddev/wordpress/wp-content/$1/*.log
 }
 
 declare -i param_counter=0
 
-while getopts "p:l:h" arg; do
+while getopts "l:h" arg; do
 	case $arg in
-	p)
-		delete-posts $OPTARG
-		param_counter+=1
-		;;
 	l)
 		delete-logs $OPTARG
 		param_counter+=1

.ddev/commands/web/wp-cleanup

@@ -0,0 +1,62 @@
+#!/bin/bash
+
+show-help() {
+	echo -e "\nReset the WordPress database and reinstall WordPress"
+	echo -e "\tExample: ddev wp-reset"
+	echo -e "\nRemove all plugins --clean-plugins"
+	echo -e "\tExample: ddev wp-reset --clean-plugins\n"
+}
+
+remove-plugins() {
+	echo "Deactivating all plugins..."
+	wp plugin deactivate --all --path=.ddev/wordpress
+
+	echo "Deleting all plugins..."
+	wp plugin delete --all --path=.ddev/wordpress
+}
+
+reset-database() {
+	echo "Resetting database..."
+	wp db reset --yes --path=.ddev/wordpress
+
+	if [ "$1" = "clean-plugins" ]; then
+		remove-plugins
+	fi
+
+	echo "Installing WordPress..."
+	wp core install \
+		--url="${DDEV_PRIMARY_URL}" \
+		--title="${WP_TITLE}" \
+		--admin_user="${ADMIN_USER}" \
+		--admin_password="${ADMIN_PASS}" \
+		--admin_email="${ADMIN_EMAIL}" \
+		--path=.ddev/wordpress
+
+	echo "Database reset and WordPress installation completed!"
+}
+
+clean_plugins=false
+
+while [[ $# -gt 0 ]]; do
+	case $1 in
+	--clean-plugins)
+		clean_plugins=true
+		shift
+		;;
+	-h|--help)
+		show-help
+		exit 0
+		;;
+	*)
+		echo "Unknown option: $1"
+		show-help
+		exit 1
+		;;
+	esac
+done
+
+if [ "$clean_plugins" = true ]; then
+	reset-database "clean-plugins"
+else
+	reset-database
+fi

.ddev/commands/web/wp-reset

@@ -19,15 +19,15 @@ hooks:
   pre-start:
     - exec-host: "mkdir -p .ddev/wordpress/wp-content/plugins/${DDEV_PROJECT}"
 web_environment:
-  - WP_VERSION=6.7.1
+  - WP_VERSION=6.8.2
   - WP_LOCALE=en_US
   - WP_TITLE=WooCommerce PayPal Payments
-  - WP_MULTISITE=true
+  - WP_MULTISITE=false
   - WP_MULTISITE_SLUGS=de,es
   - ADMIN_USER=admin
   - ADMIN_PASS=admin
   - ADMIN_EMAIL=admin@example.com
-  - WC_VERSION=9.5.1
+  - WC_VERSION=10.1.2
 
 # Key features of ddev's config.yaml:
 

.ddev/config.yaml

@@ -0,0 +1,4 @@
+services:
+    web:
+        volumes:
+            - ../coverage:/var/www/html/.ddev/wordpress/coverage:ro

.ddev/docker-compose.phpunit.yaml

@@ -1,4 +1,3 @@
-version: '3.6'
 services:
     web:
         volumes:

.ddev/docker-compose.wp-plugin.yaml

@@ -3,17 +3,17 @@
 .gitattributes
 .gitignore
 .eslintrc
-.ddev
+.ddev*
 .git*
 .phpstorm*
-.idea
+.idea*
 *.env*
 .psalm*
-tests
+tests*
 *.xml*
 .phpunit.result.cache
 babel.config.json
-node_modules
+node_modules*
 modules/*/resources/css
 modules/*/resources/js/**/*.js
 *.lock
@@ -28,7 +28,8 @@ assets-compiler.json
 patchwork.json
 .babelrc
 README.md
-wordpress_org_assets
+wordpress_org_assets*
 .DS_Store
 auth.json
 *.log
+scoper.inc.php

.distignore

@@ -0,0 +1,15 @@
+# CODEOWNERS file for PayPal Payments Plugin
+# This file defines code owners who will automatically be requested for review
+# when a pull request touches files matching the specified patterns.
+
+# Global owners - will be requested for review on all changes
+# @Dinamiko is listed first as dev lead, followed by team members in alphabetical order
+* @Dinamiko @AlexP11223 @danieldudzic @hmouhtar @Narek13 @puntope @stracker-phil
+
+# You can also add specific patterns for different parts of the codebase:
+# Examples (uncomment and modify as needed):
+# /src/                    @Dinamiko @stracker-phil
+# /tests/                  @AlexP11223 @hmouhtar
+# /assets/                 @danieldudzic @puntope
+# /.github/workflows/      @Narek13
+# /docs/                   @Dinamiko

.github/CODEOWNERS

@@ -0,0 +1,136 @@
+name: E2E Tests
+
+on:
+  workflow_dispatch:
+    inputs:
+      update-workflows:
+        description: 'Weather generate new snapshots'
+        type: boolean
+        default: false
+      wp-rc-version:
+        description: 'WordPress version for Release Candidate (i.e. 6.3-RC3)'
+      wc-rc-version:
+        description: 'WooCommerce version for Release Candidate (i.e. 8.0.0-rc.1)'
+      test-suite:
+        description: 'Test suite to run'
+        required: true
+        default: 'critical'
+        type: choice
+        options:
+          - critical
+          - onboarding
+          - all
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: Build package
+    uses: inpsyde/reusable-workflows/.github/workflows/build-plugin-archive.yml@a9af34f34e95cbe18703198c7e972e97ebcd7473
+    with:
+      PHP_VERSION: 7.4
+      NODE_VERSION: 22
+      PLUGIN_MAIN_FILE: ./woocommerce-paypal-payments.php
+      PLUGIN_VERSION: 3.0.0
+      PLUGIN_FOLDER_NAME: woocommerce-paypal-payments
+      ARCHIVE_NAME: woocommerce-paypal-payments
+      COMPILE_ASSETS_ARGS: '-vv --env=root'
+
+  E2ETests:
+    name: E2E Tests
+    needs: build
+    runs-on: ubuntu-latest
+    env:
+      FORCE_COLOR: 2
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Download artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: woocommerce-paypal-payments
+          path: ./tests/qa/resources/files
+
+      - name: Create and upload zip file
+        working-directory: ./tests/qa/resources/files
+        run: |
+          zip -r ./woocommerce-paypal-payments.zip ./woocommerce-paypal-payments
+          rm -rf woocommerce-paypal-payments
+
+      - name: Configure npm for GitHub Packages
+        working-directory: ./tests/qa
+        run: |
+          # Create clean .npmrc
+          echo "@inpsyde:registry=https://npm.pkg.github.com" > .npmrc
+          echo "//npm.pkg.github.com/:_authToken=${{ secrets.NPM_SYDE }}" >> .npmrc
+
+      - name: Install Environment
+        working-directory: ./tests/qa
+        run: npm run setup:env
+        env:
+          COMPOSER_AUTH: '${{ secrets.COMPOSER_AUTH_SYDE }}'
+
+      - name: Install WP release candidate (optional)
+        if: github.event.inputs.wp-rc-version != ''
+        working-directory: ./tests/qa
+        env:
+          INPUT_WP_RC_VERSION: ${{ github.event.inputs.wp-rc-version }}
+        run: |
+          npm run -- wp-env run tests-cli -- wp core update --version="${INPUT_WP_RC_VERSION}"
+          npm run -- wp-env run tests-cli -- wp core update-db
+
+      - name: Install WC release candidate (optional)
+        if: github.event.inputs.wc-rc-version != ''
+        working-directory: ./tests/qa
+        env:
+          INPUT_WC_RC_VERSION: ${{ github.event.inputs.wc-rc-version }}
+        run: |
+          npm run -- wp-env run tests-cli -- wp plugin update woocommerce --version="${INPUT_WC_RC_VERSION}"
+          npm run -- wp-env run tests-cli -- wp wc update
+
+      - name: Install Tests
+        working-directory: ./tests/qa
+        run: npm run setup:tests
+
+      - name: Create .env file
+        working-directory: ./tests/qa
+        run: |
+          echo "${{ secrets.QA_ENV_FILE }}" > .env
+
+      - name: Run E2E tests
+        working-directory: ./tests/qa
+        run: |
+          if [ "${{ github.event.inputs.update_snapshots }}" == "true" ]; then
+            npm run tests:${{ github.event.inputs.test-suite }} -- --update-snapshots
+          else
+            npm run tests:${{ github.event.inputs.test-suite }}
+          fi
+
+      - name: Archive updated snapshots
+        if: github.event.inputs.update_snapshots == 'true'
+        uses: actions/upload-artifact@v4
+        with:
+          name: snapshots
+          path: tests/qa/snapshots
+          if-no-files-found: warn
+          retention-days: 5
+
+      - name: Archive Playwright Report
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: playwright-test-results
+          path: tests/qa/playwright-report
+          if-no-files-found: ignore
+          retention-days: 5
+
+      - name: Archive Test Results
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-results
+          path: tests/qa/test-results/
+          if-no-files-found: ignore
+          retention-days: 5