Merge branch 'master' of github.com:wcreateweb/wordpress-plugin into task/as3cf-compatibility

Author: tijmenbruggeman

.github/workflows/integration-tests.yml

@@ -3,7 +3,7 @@ name: Integration Tests
 on:
   push:
     branches:
-      - '**'
+      - 'master'
   pull_request:
     branches:
       - '**'
@@ -14,7 +14,14 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        wp-version: [67]
+        include:
+          - { wp: 40, php: 56 }
+          - { wp: 40, php: 70 }
+          - { wp: 57, php: 73 }
+          - { wp: 60, php: 73 }
+          - { wp: 63, php: 80 }
+          - { wp: 67, php: 82 }
+          - { wp: 67, php: 83 }
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -52,11 +59,11 @@ jobs:
         if: steps.playwright-cache.outputs.cache-hit != 'true'
 
       - name: Run script
-        run: ./bin/integration-tests ${{ matrix.wp-version }}
+        run: ./bin/integration-tests ${{ matrix.wp }} ${{ matrix.php}}
 
       - uses: actions/upload-artifact@v4
         if: ${{ !cancelled() }}
         with:
-          name: playwright-report
+          name: playwright-report-${{ matrix.wp }}-${{ matrix.php }}
           path: playwright-report/
           retention-days: 30

.travis.yml

@@ -1,6 +1,5 @@
 {
   "plugins": ["."],
-  "phpVersion": "7.2",
   "config": {
     "AWS_ENDPOINT": "http://host.docker.internal:4566",
     "AWS_USE_PATH_STYLE_ENDPOINT": "true",

.wp-env.json

@@ -20,16 +20,16 @@ Got questions or feedback? Let us know! Contact us at [email protected].
 * Node LTS
 
 ### Running the plugin in WordPress
-1. Run `bin/run-wordpress <version>`. E.g. `bin/run-wordpress 60`.
-2. Connect to Wordpress on port `80<version>` (e.g. port `8060`).
+1. Run `bin/run-wordpress <wordpress version> <php version>`. E.g. `bin/run-wordpress 60 73`.
+2. Connect to Wordpress on port `80<wordpress version>` (e.g. port `8060`).
 
 ### Running the unit tests
 1. Run `bin/unit-tests <optional path to file>`.
 
 ### Running the integration tests
 1. Install Docker 1.12 and docker-compose.
 2. Install npm dependancies
-3. Run `bin/integration-tests <version>`. E.g. `bin/integration-tests 60`.
+3. Run `bin/integration-tests <wordpress version> <php version>`. E.g. `bin/integration-tests 60 80`.
 
 ### Check if the code follows WordPress standard
 1. Run `bin/check-style` to make sure there are no errors.

README.md

@@ -14,13 +14,20 @@ if [ -z "${WORDPRESS_VERSION}" ]; then
     exit 1
   fi
 
-  version_input="$1"
+  wp_version_input="$1"
+  php_version_input="$2"
 
-  ## WordPress version ex. "6.7"
-  export WORDPRESS_VERSION_FULL="${version_input:0:1}.${version_input:1}"
+  ## PHP Version ex "80"
+  export PHP_VERSION="${php_version_input}"
+
+  ## PHP Version ex "80"
+  export PHP_VERSION_FULL="${PHP_VERSION:0:1}.${PHP_VERSION:1}"
 
   ## WordPress version ex "67"
-  export WORDPRESS_VERSION="${version_input}"
+  export WORDPRESS_VERSION="${wp_version_input}"
+
+  ## WordPress version ex. "6.7"
+  export WORDPRESS_VERSION_FULL="${WORDPRESS_VERSION:0:1}.${WORDPRESS_VERSION:1}"
 fi
 
 export MYSQL_PWD=root
@@ -29,8 +36,10 @@ export WORDPRESS_PORT=80${WORDPRESS_VERSION}
 export WORDPRESS_URL=http://wordpress
 export WP_ENV_TESTS_PORT=80${WORDPRESS_VERSION}
 export WP_ENV_CORE=WordPress/Wordpress#${WORDPRESS_VERSION_FULL}
+export WP_ENV_PHP_VERSION=${PHP_VERSION_FULL}
 export MOCK_PORT=8100
 
+
 function wait_for_service_port {
   while ! curl -s localhost:$1 > /dev/null; do
     sleep 0.25

bin/integration-tests

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+port="$1"
+
+MOCK_PORT=${port:-8100}
+
+docker build -t mock-webservice -f config/Dockerfile-mock-webservice .
+docker run -d --name tinify-mock-api -p ${MOCK_PORT}:80 -v $(pwd)/test/mock-tinypng-webservice:/var/www/html mock-webservice
+
+echo "To stop, run: bin/stop-mocks"

bin/run-mocks

@@ -10,18 +10,27 @@ if [ -z "${WORDPRESS_VERSION}" ]; then
     exit 1
   fi
 
-  version_input="$1"
-  
+  wp_version_input="$1"
+  php_version_input="$2"
+
   ## WordPress version ex. "6.7"
-  export WORDPRESS_VERSION_FULL="${version_input:0:1}.${version_input:1}"
+  export WORDPRESS_VERSION_FULL="${wp_version_input:0:1}.${wp_version_input:1}"
 
   ## WordPress version ex "67"
-  export WORDPRESS_VERSION="${version_input}"
+  export WORDPRESS_VERSION="${wp_version_input}"
 
+  ## PHP Version ex "80"
+  export PHP_VERSION="${php_version_input}"
+
+  ## PHP Version ex "80"
+  export PHP_VERSION_FULL="${PHP_VERSION:0:1}.${PHP_VERSION:1}"
+  
+  echo "Starting WordPress ${WORDPRESS_VERSION_FULL} on PHP ${PHP_VERSION_FULL}"
 fi
 
 export WP_ENV_TESTS_PORT=80${WORDPRESS_VERSION}
 export WP_ENV_CORE=WordPress/Wordpress#${WORDPRESS_VERSION_FULL}
+export WP_ENV_PHP_VERSION=${PHP_VERSION_FULL}
 
 npx wp-env start 
 

bin/run-wordpress

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker stop $(docker ps -q --filter "ancestor=mock-webservice")
+docker rm $(docker ps -a -q --filter "ancestor=mock-webservice")

bin/stop-mocks

@@ -4,7 +4,7 @@ export default defineConfig({
   testDir: './test',
   fullyParallel: false,
   forbidOnly: !!process.env.CI,
-  retries: 0,
+  retries: process.env.CI ? 1 : 0,
   workers: 1,
   reporter: 'html',
   use: {

playwright.config.ts

@@ -2,7 +2,7 @@
 Contributors: TinyPNG
 Donate link: https://tinypng.com/
 Tags: compress images, compression, image size, page speed, performance
-Requires at least: 4.7
+Requires at least: 4.0
 Tested up to: 6.7
 Stable tag: 3.4.6
 License: GPLv2 or later