Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release/T25.imp' into fix/TEC-5322
Browse files Browse the repository at this point in the history
…-wp-67-packages
  • Loading branch information
lucatume committed Jan 10, 2025
2 parents 2a346e9 + 70e7580 commit c2c711c
Show file tree
Hide file tree
Showing 44 changed files with 8,805 additions and 4,147 deletions.
1 change: 1 addition & 0 deletions .distfiles
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,4 @@
/vendor/vendor-prefixed/autoload-classmap.php
/vendor/vendor-prefixed/autoload.php
/vendor/vendor-prefixed/stellarwp/**/*
/vendor/woocommerce/action-scheduler/**/*.php
14 changes: 5 additions & 9 deletions .github/workflows/tests-php-eva.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ on: [ pull_request ]
jobs:
test:
strategy:
fail-fast: false
matrix:
suite: [ eva_integration, restv1, restv1_et, end2end ]
suite: [ restv1, end2end ]
runs-on: ubuntu-latest
steps:
# ------------------------------------------------------------------------------
Expand Down Expand Up @@ -41,7 +42,7 @@ jobs:
if: steps.skip.outputs.value != 1
with:
repository: stellarwp/slic
ref: main
ref: 1.8.0
path: slic
fetch-depth: 1
# ------------------------------------------------------------------------------
Expand Down Expand Up @@ -322,12 +323,6 @@ jobs:
docker network prune -f
${SLIC_BIN} use events-pro
${SLIC_BIN} composer install --no-dev
# --------------------------------------------------------------------------
# Install and activate WooCommerce
# ------------------------------------------------------------------------------
- name: Install WooCommerce
if: steps.skip.outputs.value != 1
run: ${SLIC_BIN} site-cli plugin install woocommerce --version='8.2.2'
# ------------------------------------------------------------------------------
# Install and activate Easy Digital Downloads
# ------------------------------------------------------------------------------
Expand All @@ -350,13 +345,14 @@ jobs:
run: |
${SLIC_BIN} use the-events-calendar/common
${SLIC_BIN} composer install
- name: Init the WordPress container
- name: Init the WordPress container and Set up a theme
if: steps.skip.outputs.value != 1
run: |
${SLIC_BIN} up wordpress
${SLIC_BIN} wp core version
${SLIC_BIN} wp core update --force --version=6.5
${SLIC_BIN} wp core version
${SLIC_BIN} wp theme install twentytwenty --activate
- name: Run suite tests
if: steps.skip.outputs.value != 1
run: ${SLIC_BIN} run ${{ matrix.suite }}
Expand Down
392 changes: 392 additions & 0 deletions .github/workflows/tests-php-with-woo.yml

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion .github/workflows/tests-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,14 @@ jobs:
# ------------------------------------------------------------------------------
# Update WordPress version to our min required.
# ------------------------------------------------------------------------------
- name: Init the WordPress container
- name: Init the WordPress container and set up a theme
if: steps.skip.outputs.value != 1
run: |
${SLIC_BIN} up wordpress
${SLIC_BIN} wp core version
${SLIC_BIN} wp core update --force --version=6.5
${SLIC_BIN} wp core version
${SLIC_BIN} wp theme install twentytwenty --activate
- name: Run suite tests
if: steps.skip.outputs.value != 1
run: ${SLIC_BIN} run ${{ matrix.suite }}
4 changes: 4 additions & 0 deletions changelog/feat-move-as-to-common
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: tweak

Move Action Scheduler into Common instead of TEC. [TEC-5345]
4 changes: 4 additions & 0 deletions changelog/fix-PUE_Notices_duplication
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fix

Improved data sanitization for tribe_pue_key_notices to prevent memory exhaustion errors caused by corrupted data. [ET-2277]
4 changes: 4 additions & 0 deletions changelog/fix-TEC-5086_deprecated_notice
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fix

Resolve warning about deprecation of passing null to version_compare function.
4 changes: 4 additions & 0 deletions changelog/tweak-TEC-5332_transients
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: tweak

When installing new plugins `TEC_IS_ANY_LICENSE_VALID_TRANSIENT` will update correctly. [TEC-5332]
14 changes: 8 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,26 @@
"stellarwp/telemetry": "^2.3.1",
"stellarwp/assets": "1.4.2",
"stellarwp/admin-notices": "^1.1",
"stellarwp/uplink": "2.2.2"
"stellarwp/uplink": "2.2.2",
"woocommerce/action-scheduler": "3.8.1"
},
"require-dev": {
"automattic/vipwpcs": "^3.0",
"wp-cli/wp-cli": ">=2.0 <3.0.0",
"bordoni/phpass": "0.3.5",
"codeception/codeception": "^2.5.5",
"codeception/codeception": "^4.0.0",
"cweagans/composer-patches": "^1.7",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
"fakerphp/faker": "^1.23",
"lucatume/codeception-snapshot-assertions": "^0.2.4",
"lucatume/codeception-snapshot-assertions": "^0.4.0",
"lucatume/function-mocker-le": "^1.0",
"lucatume/wp-browser": "^3.0.14",
"lucatume/wp-browser": "^3.5.0",
"stellarwp/coding-standards": "dev-main",
"the-events-calendar/tec-testing-facilities": "dev-master",
"wp-cli/checksum-command": "1.0.5",
"wp-cli/checksum-command": "2.0.0",
"wp-coding-standards/wpcs": "^3.0.0",
"automattic/jetpack-changelogger": "^4.2"
"automattic/jetpack-changelogger": "^4.2",
"codeception/module-rest": "^2.0"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit c2c711c

Please sign in to comment.