Merge pull request #448 from beyondwords-io/s-7155-plugin-v600

Plugin v6.0.0

Author: galbus

.github/workflows/main.yml

@@ -24,12 +24,12 @@ jobs:
       # ######################################
       # PHP
       # ######################################
-      - name: Setup PHP 8.0
+      - name: Setup PHP 8.1
         uses: shivammathur/setup-php@v2
         # env:
         #   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          php-version: '8.0'
+          php-version: '8.1'
           extensions: mbstring intl
           tools: composer, wp-cli
 
@@ -40,7 +40,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: /tmp/composer-cache
-          key: ${{ runner.os }}-php8.0-no-dev-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-php8.1-no-dev-${{ hashFiles('**/composer.lock') }}
 
       - name: Install Composer dependencies (no-dev)
         run: composer install --no-dev --ignore-platform-reqs --optimize-autoloader --profile
@@ -184,7 +184,7 @@ jobs:
         phpunit-version: ['10']
         operating-system: ['ubuntu-latest']
         include:
-        - php-version: '8.0'
+        - php-version: '8.1'
           phpunit-version: '9'
           operating-system: ['ubuntu-latest']
 
@@ -220,14 +220,14 @@ jobs:
         uses: actions/cache@v4
         with:
           path: /tmp/composer-cache
-          key: ${{ runner.os }}-php8.0-dev-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-php8.1-dev-${{ hashFiles('**/composer.lock') }}
 
       - name: Install Composer dependencies (dev)
         uses: php-actions/composer@v6
         with:
           dev: yes
           args: --ignore-platform-reqs --optimize-autoloader --profile
-          php_version: '8.0'
+          php_version: '8.1'
 
       - name: Check PHP Version
         run: php -v
@@ -260,7 +260,7 @@ jobs:
         run: bash bin/install-wp-tests.sh ${{ env.DB_DATABASE }} ${{ env.DB_USER }} ${{ env.DB_PASSWORD }}
 
       - name: Run PHPUnit Tests
-        run: ./vendor/bin/phpunit -c ./phpunit.ci.xml
+        run: ./vendor/bin/phpunit
         env:
           BEYONDWORDS_API_URL: "${{ secrets.BEYONDWORDS_API_URL }}"
           BEYONDWORDS_TESTS_API_KEY: "${{ secrets.BEYONDWORDS_TESTS_API_KEY }}"
@@ -337,11 +337,9 @@ jobs:
       fail-fast: false
       matrix:
         php-version: ['8.4']
-        phpunit-version: ['10']
         operating-system: ['ubuntu-latest']
         include:
-        - php-version: '8.0'
-          phpunit-version: '9'
+        - php-version: '8.1'
           operating-system: ['ubuntu-latest']
 
     env:
@@ -369,20 +367,20 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
-          tools: phpunit:${{ matrix.phpunit-version }}, composer, wp-cli
+          tools: composer, wp-cli
 
       - name: Cache Composer dependencies
         uses: actions/cache@v4
         with:
           path: /tmp/composer-cache
-          key: ${{ runner.os }}-php8.0-dev-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-php8.1-dev-${{ hashFiles('**/composer.lock') }}
 
       - name: Install Composer dependencies (dev)
         uses: php-actions/composer@v6
         with:
           dev: yes
           args: --ignore-platform-reqs --optimize-autoloader --profile
-          php_version: '8.0'
+          php_version: '8.1'
 
       - name: Check PHP Version
         run: php -v
@@ -514,6 +512,7 @@ jobs:
         uses: cypress-io/github-action@v6
         with:
           browser: chrome
+          headed: true # Temporarily set to headed to help with debugging
           project: ${{ github.workspace }}
           # parallel: true # This will only work on Cypress Cloud
           install: false

.mockoon/beyondwords-api.json

@@ -119,13 +119,6 @@
           "filePath": "",
           "sendFileAsBody": false,
           "rules": [
-            {
-              "target": "header",
-              "modifier": "Content-Type",
-              "value": "application/json",
-              "operator": "equals",
-              "invert": false
-            },
             {
               "target": "header",
               "modifier": "X-Api-Key",
@@ -276,7 +269,7 @@
         },
         {
           "uuid": "ecdb7657-8a38-4380-937e-54204529d2e5",
-          "body": "{\n  \"id\": \"9279c9e0-e0b5-4789-9040-f44478ed3e9e\",\n  \"title\": \"{{body 'title' 'Title'}}\",\n  \"type\": \"auto_segment\",\n  \"source_id\": \"{{body 'source_id' '90e4cbff-6382-4a88-adc5-1eb3ffa16c6d'}}\",\n  \"source_url\": \"{{body 'source_url' 'https://example.com'}}\",\n  \"author\": \"{{body 'author' 'Jane Smith'}}\",\n  \"image_url\": \"{{body 'image' 'https://example.com/image.jpg'}}\",\n  \"audio\": [\n    {\n      \"id\": 12192819,\n      \"content_type\": \"application/x-mpegURL\",\n      \"url\": \"https://beyondwords-cdn-b7fyckdeejejb6dj.a03.azurefd.net/audio/projects/9969/podcasts/3161419/media/e8219ee2f3465d6834984f9ae607a81e.m3u8\",\n      \"duration\": 2685,\n      \"base64_file\": null,\n      \"variant\": \"article\"\n    },\n    {\n      \"id\": 12192811,\n      \"content_type\": \"audio/mpeg\",\n      \"url\": \"https://beyondwords-cdn-b7fyckdeejejb6dj.a03.azurefd.net/audio/projects/9969/podcasts/3161419/media/fd7108e13a7c7fee6820a1b07bb676e0_compiled.mp3\",\n      \"duration\": 2712,\n      \"base64_file\": null,\n      \"variant\": \"article\"\n    }\n  ],\n  \"video\": [],\n  \"ads_enabled\": true,\n  \"is_copy\": false,\n  \"title_voice_id\": 2517,\n  \"summary_voice_id\": 2517,\n  \"body_voice_id\": 2517,\n  \"title_enabled\": true,\n  \"body_enabled\": true,\n  \"summary_enabled\": true,\n  \"summary_title_enabled\": false,\n  \"summarization\": {\n    \"audio\": [],\n    \"video\": []\n  },\n  \"background_track\": null,\n  \"language\": \"{{body 'language' 'en_US'}}\",\n  \"preview_token\": \"d9ce36ea-ddc4-4611-b60c-4f90ed0fc082\",\n  \"status\": \"processed\",\n  \"metadata\": {\n    \"categories\": [\n      \"News\", \n      \"Audio\"\n    ]\n  },\n  \"created\": \"2022-01-02T23:59:59Z\",\n  \"updated\": \"2022-03-04T00:00:00Z\",\n  \"published\": true,\n  \"publish_date\": \"2099-12-31T23:59:59Z\",\n  \"auto_segment_updates_enabled\": false,\n  \"ai_summary_updates_enabled\": true,\n  \"summary\": \"{{body 'summary' 'Summary'}}\",\n  \"body\": \"<p>Test.</p>\",\n  \"summarization_settings\": null,\n  \"video_settings\": null\n}",
+          "body": "{\n  \"id\": \"9279c9e0-e0b5-4789-9040-f44478ed3e9e\",\n  \"title\": \"{{body 'title' 'Title'}}\",\n  \"type\": \"auto_segment\",\n  \"source_id\": \"{{body 'source_id' '90e4cbff-6382-4a88-adc5-1eb3ffa16c6d'}}\",\n  \"source_url\": \"{{body 'source_url' 'https://example.com'}}\",\n  \"author\": \"{{body 'author' 'Jane Smith'}}\",\n  \"image_url\": \"{{body 'image' 'https://example.com/image.jpg'}}\",\n  \"audio\": [\n    {\n      \"id\": 12192819,\n      \"content_type\": \"application/x-mpegURL\",\n      \"url\": \"https://beyondwords-cdn-b7fyckdeejejb6dj.a03.azurefd.net/audio/projects/9969/podcasts/3161419/media/e8219ee2f3465d6834984f9ae607a81e.m3u8\",\n      \"duration\": 2685,\n      \"base64_file\": null,\n      \"variant\": \"article\"\n    },\n    {\n      \"id\": 12192811,\n      \"content_type\": \"audio/mpeg\",\n      \"url\": \"https://beyondwords-cdn-b7fyckdeejejb6dj.a03.azurefd.net/audio/projects/9969/podcasts/3161419/media/fd7108e13a7c7fee6820a1b07bb676e0_compiled.mp3\",\n      \"duration\": 2712,\n      \"base64_file\": null,\n      \"variant\": \"article\"\n    }\n  ],\n  \"video\": [],\n  \"ads_enabled\": true,\n  \"is_copy\": false,\n  \"title_voice_id\": 2517,\n  \"summary_voice_id\": 2517,\n  \"body_voice_id\": 2517,\n  \"title_enabled\": true,\n  \"body_enabled\": true,\n  \"summary_enabled\": true,\n  \"summary_title_enabled\": false,\n  \"summarization\": {\n    \"audio\": [],\n    \"video\": []\n  },\n  \"background_track\": null,\n  \"language\": \"{{body 'language' 'en_US'}}\",\n  \"preview_token\": \"d9ce36ea-ddc4-4611-b60c-4f90ed0fc082\",\n  \"status\": \"processed\",\n  \"metadata\": {\n    \"categories\": [\n      \"News\", \n      \"Audio\"\n    ]\n  },\n  \"created\": \"2022-01-02T23:59:59Z\",\n  \"updated\": \"2022-03-04T00:00:00Z\",\n  \"published\": true,\n  \"publish_date\": \"2099-12-31T23:59:59Z\",\n  \"auto_segment_updates_enabled\": true,\n  \"ai_summary_updates_enabled\": true,\n  \"summary\": \"{{body 'summary' 'Summary'}}\",\n  \"body\": \"<p>Test.</p>\",\n  \"summarization_settings\": null,\n  \"video_settings\": null\n}",
           "latency": 0,
           "statusCode": 200,
           "label": "OK",
@@ -414,7 +407,7 @@
         },
         {
           "uuid": "52762211-f2da-4e53-a68f-74883e69e862",
-          "body": "{\n  \"id\": \"9279c9e0-e0b5-4789-9040-f44478ed3e9e\",\n  \"title\": \"{{body 'title' 'Title'}}\",\n  \"type\": \"auto_segment\",\n  \"source_id\": \"{{body 'source_id' '90e4cbff-6382-4a88-adc5-1eb3ffa16c6d'}}\",\n  \"source_url\": \"{{body 'source_url' 'https://example.com'}}\",\n  \"author\": \"{{body 'author' 'Jane Smith'}}\",\n  \"image_url\": \"{{body 'image' 'https://example.com/image.jpg'}}\",\n  \"audio\": [\n    {\n      \"id\": 12192819,\n      \"content_type\": \"application/x-mpegURL\",\n      \"url\": \"https://beyondwords-cdn-b7fyckdeejejb6dj.a03.azurefd.net/audio/projects/9969/podcasts/3161419/media/e8219ee2f3465d6834984f9ae607a81e.m3u8\",\n      \"duration\": 2685,\n      \"base64_file\": null,\n      \"variant\": \"article\"\n    },\n    {\n      \"id\": 12192811,\n      \"content_type\": \"audio/mpeg\",\n      \"url\": \"https://beyondwords-cdn-b7fyckdeejejb6dj.a03.azurefd.net/audio/projects/9969/podcasts/3161419/media/fd7108e13a7c7fee6820a1b07bb676e0_compiled.mp3\",\n      \"duration\": 2712,\n      \"base64_file\": null,\n      \"variant\": \"article\"\n    }\n  ],\n  \"video\": [],\n  \"ads_enabled\": true,\n  \"is_copy\": false,\n  \"title_voice_id\": 2517,\n  \"summary_voice_id\": 2517,\n  \"body_voice_id\": 2517,\n  \"title_enabled\": true,\n  \"body_enabled\": true,\n  \"summary_enabled\": true,\n  \"summary_title_enabled\": false,\n  \"summarization\": {\n    \"audio\": [],\n    \"video\": []\n  },\n  \"background_track\": null,\n  \"language\": \"{{body 'language' 'en_US'}}\",\n  \"preview_token\": \"d9ce36ea-ddc4-4611-b60c-4f90ed0fc082\",\n  \"status\": \"processed\",\n  \"metadata\": {\n    \"categories\": [\n      \"News\", \n      \"Audio\"\n    ]\n  },\n  \"created\": \"2022-01-02T23:59:59Z\",\n  \"updated\": \"2022-03-04T00:00:00Z\",\n  \"published\": true,\n  \"publish_date\": \"2099-12-31T23:59:59Z\",\n  \"auto_segment_updates_enabled\": false,\n  \"ai_summary_updates_enabled\": true,\n  \"summary\": \"{{body 'summary' 'Summary'}}\",\n  \"body\": \"<p>Test.</p>\",\n  \"summarization_settings\": null,\n  \"video_settings\": null\n}",
+          "body": "{\n  \"id\": \"9279c9e0-e0b5-4789-9040-f44478ed3e9e\",\n  \"title\": \"{{body 'title' 'Title'}}\",\n  \"type\": \"auto_segment\",\n  \"source_id\": \"{{body 'source_id' '90e4cbff-6382-4a88-adc5-1eb3ffa16c6d'}}\",\n  \"source_url\": \"{{body 'source_url' 'https://example.com'}}\",\n  \"author\": \"{{body 'author' 'Jane Smith'}}\",\n  \"image_url\": \"{{body 'image' 'https://example.com/image.jpg'}}\",\n  \"audio\": [\n    {\n      \"id\": 12192819,\n      \"content_type\": \"application/x-mpegURL\",\n      \"url\": \"https://beyondwords-cdn-b7fyckdeejejb6dj.a03.azurefd.net/audio/projects/9969/podcasts/3161419/media/e8219ee2f3465d6834984f9ae607a81e.m3u8\",\n      \"duration\": 2685,\n      \"base64_file\": null,\n      \"variant\": \"article\"\n    },\n    {\n      \"id\": 12192811,\n      \"content_type\": \"audio/mpeg\",\n      \"url\": \"https://beyondwords-cdn-b7fyckdeejejb6dj.a03.azurefd.net/audio/projects/9969/podcasts/3161419/media/fd7108e13a7c7fee6820a1b07bb676e0_compiled.mp3\",\n      \"duration\": 2712,\n      \"base64_file\": null,\n      \"variant\": \"article\"\n    }\n  ],\n  \"video\": [],\n  \"ads_enabled\": true,\n  \"is_copy\": false,\n  \"title_voice_id\": 2517,\n  \"summary_voice_id\": 2517,\n  \"body_voice_id\": 2517,\n  \"title_enabled\": true,\n  \"body_enabled\": true,\n  \"summary_enabled\": true,\n  \"summary_title_enabled\": false,\n  \"summarization\": {\n    \"audio\": [],\n    \"video\": []\n  },\n  \"background_track\": null,\n  \"language\": \"{{body 'language' 'en_US'}}\",\n  \"preview_token\": \"d9ce36ea-ddc4-4611-b60c-4f90ed0fc082\",\n  \"status\": \"processed\",\n  \"metadata\": {\n    \"categories\": [\n      \"News\", \n      \"Audio\"\n    ]\n  },\n  \"created\": \"2022-01-02T23:59:59Z\",\n  \"updated\": \"2022-03-04T00:00:00Z\",\n  \"published\": true,\n  \"publish_date\": \"2099-12-31T23:59:59Z\",\n  \"auto_segment_updates_enabled\": true,\n  \"ai_summary_updates_enabled\": true,\n  \"summary\": \"{{body 'summary' 'Summary'}}\",\n  \"body\": \"<p>Test.</p>\",\n  \"summarization_settings\": null,\n  \"video_settings\": null\n}",
           "latency": 0,
           "statusCode": 200,
           "label": "OK",
@@ -720,13 +713,6 @@
           "filePath": "",
           "sendFileAsBody": false,
           "rules": [
-            {
-              "target": "header",
-              "modifier": "Content-Type",
-              "value": "application/json",
-              "operator": "equals",
-              "invert": false
-            },
             {
               "target": "header",
               "modifier": "X-Api-Key",
@@ -962,13 +948,6 @@
           "filePath": "",
           "sendFileAsBody": false,
           "rules": [
-            {
-              "target": "header",
-              "modifier": "Content-Type",
-              "value": "application/json",
-              "operator": "equals",
-              "invert": false
-            },
             {
               "target": "header",
               "modifier": "X-Api-Key",

.nvmrc

@@ -1 +1 @@
-v20.11.0
+v24.8.0

README.md

@@ -5,7 +5,7 @@
 [![Github Actions Workflow](https://github.com/beyondwords-io/wordpress-plugin/actions/workflows/main.yml/badge.svg?branch=main)](https://github.com/beyondwords-io/wordpress-plugin/actions/workflows/main.yml)
 [![PHPUnit Code Coverage](https://beyondwords-io.github.io/wordpress-plugin/coverage-badge.svg)](https://beyondwords-io.github.io/wordpress-plugin/dashboard.html)
 [![Supported WordPress Versions](https://img.shields.io/static/v1?label=&message=5.8+-+6.8&color=blue&logo=wordpress&logoColor=white)](https://wordpress.org/)
-[![Supported PHP Versions](https://img.shields.io/static/v1?label=&message=8.0+-+8.4&color=777bb4&logo=php&logoColor=white)](https://www.php.net/)
+[![Supported PHP Versions](https://img.shields.io/static/v1?label=&message=8.1+-+8.4&color=777bb4&logo=php&logoColor=white)](https://www.php.net/)
 
 ##  Description
 

composer.json

@@ -7,34 +7,35 @@
     "require": {
         "php": ">=8.0",
         "symfony/dom-crawler": "^5.4",
-        "symfony/property-access": "^7.1"
+        "symfony/property-access": "^5.4"
     },
     "require-dev": {
-        "automattic/vipwpcs": "^2.3.3",
-        "behat/behat": "^3.13",
+        "automattic/vipwpcs": "^3.0.1",
+        "behat/behat": "^3.24",
         "bordoni/phpass": "^0.3.6",
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
-        "doctrine/instantiator": "^1.5",
-        "ergebnis/composer-normalize": "2.28.3",
-        "php-parallel-lint/php-parallel-lint": "^1.3.2",
-        "phpmd/phpmd": "^2.13",
-        "phpro/grumphp": "^1.16",
+        "dealerdirect/phpcodesniffer-composer-installer": "^1.1.2",
+        "doctrine/instantiator": "^2.0",
+        "ergebnis/composer-normalize": "^2.48.2",
+        "php-parallel-lint/php-parallel-lint": "^1.4",
+        "phpmd/phpmd": "^2.15",
+        "phpro/grumphp": "^2.15",
         "phpunit/phpunit": "^9.6",
+        "rector/rector": "^2.2",
         "rregeer/phpunit-coverage-check": "^0.3.1",
-        "squizlabs/php_codesniffer": "^3.7.2",
-        "symfony/css-selector": "^5.4",
-        "symfony/error-handler": "^5.4",
-        "symfony/filesystem": "^5.4",
-        "symfony/finder": "^5.4",
-        "symfony/http-client": "^5.4",
-        "symfony/polyfill-mbstring": "^1.27",
-        "symfony/string": "^5.4",
-        "symfony/translation-contracts": "^2.5",
-        "symfony/var-exporter": "^5.4",
-        "vlucas/phpdotenv": "^5.5",
-        "wp-cli/wp-cli-bundle": "^2.7.1",
-        "wp-graphql/wp-graphql-testcase": "^2.3",
-        "yoast/phpunit-polyfills": "^2.0"
+        "squizlabs/php_codesniffer": "^3.9.2",
+        "symfony/css-selector": "^7.3",
+        "symfony/error-handler": "^7.3",
+        "symfony/filesystem": "^7.3",
+        "symfony/finder": "^7.3",
+        "symfony/http-client": "^7.3",
+        "symfony/polyfill-mbstring": "^1.33",
+        "symfony/string": "^7.3",
+        "symfony/translation-contracts": "^3.6",
+        "symfony/var-exporter": "^7.3",
+        "vlucas/phpdotenv": "^5.6",
+        "wp-cli/wp-cli-bundle": "^2.12",
+        "wp-phpunit/wp-phpunit": "^5.9",
+        "yoast/phpunit-polyfills": "^4.0"
     },
     "prefer-stable": true,
     "autoload": {
@@ -52,7 +53,6 @@
             "php-parallel-lint/php-parallel-lint": false,
             "phpmd/phpmd": true,
             "phpro/grumphp": true,
-            "phpunit/phpunit": true,
             "rregeer/phpunit-coverage-check": true,
             "squizlabs/php_codesniffer": true,
             "symfony/*": false,
@@ -67,8 +67,8 @@
         "sort-packages": true
     },
     "scripts": {
-        "test:coverage-check": "./vendor/bin/coverage-check ./tests/phpunit/_report/clover.xml 55",
-        "test:coverage-check-percentage": "./vendor/bin/coverage-check ./tests/phpunit/_report/clover.xml 55 --only-percentage | sed 's/[^0-9.]*//g'",
+        "test:coverage-check": "./vendor/bin/coverage-check ./tests/phpunit/_report/clover.xml 80",
+        "test:coverage-check-percentage": "./vendor/bin/coverage-check ./tests/phpunit/_report/clover.xml 80 --only-percentage | sed 's/[^0-9.]*//g'",
         "test:phpunit": [
             "yarn wp-env run tests-cli --env-cwd=wp-content/plugins/speechkit ./vendor/bin/phpunit -c phpunit.xml",
             "@test:coverage-check"