diff options
| -rw-r--r-- | .github/workflows/reusable-phpunit-tests-v1.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/test-old-branches.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/upgrade-testing.yml | 81 | ||||
| -rw-r--r-- | .version-support-mysql.json | 42 | ||||
| -rw-r--r-- | .version-support-php.json | 45 | ||||
| -rw-r--r-- | SECURITY.md | 8 | ||||
| -rw-r--r-- | src/wp-content/themes/twentysixteen/css/editor-blocks.css | 4 | ||||
| -rw-r--r-- | src/wp-includes/block-template-utils.php | 2 | ||||
| -rw-r--r-- | src/wp-includes/taxonomy.php | 4 |
9 files changed, 23 insertions, 167 deletions
diff --git a/.github/workflows/reusable-phpunit-tests-v1.yml b/.github/workflows/reusable-phpunit-tests-v1.yml index 5fd7d54d84..abfb1ee5b4 100644 --- a/.github/workflows/reusable-phpunit-tests-v1.yml +++ b/.github/workflows/reusable-phpunit-tests-v1.yml @@ -3,7 +3,7 @@ # # A reusable workflow that runs the PHPUnit test suite with the specified configuration. # -# This workflow is used by branches 4.1 through 5.1. +# This workflow is used by branches 4.7 through 5.1. ## name: Run PHPUnit tests diff --git a/.github/workflows/test-old-branches.yml b/.github/workflows/test-old-branches.yml index 6ec21ef1f1..a28eb2e913 100644 --- a/.github/workflows/test-old-branches.yml +++ b/.github/workflows/test-old-branches.yml @@ -47,7 +47,7 @@ jobs: branch: [ '6.8', '6.7', '6.6', '6.5', '6.4', '6.3', '6.2', '6.1','6.0', '5.9', '5.8', '5.7', '5.6', '5.5', '5.4', '5.3', '5.2', '5.1', '5.0', - '4.9', '4.8', '4.7', '4.6', '4.5', '4.4', '4.3', '4.2', '4.1' + '4.9', '4.8', '4.7' ] include: # PHP Compatibility testing was introduced in 5.5. diff --git a/.github/workflows/upgrade-testing.yml b/.github/workflows/upgrade-testing.yml index 166b9b5065..9694433b57 100644 --- a/.github/workflows/upgrade-testing.yml +++ b/.github/workflows/upgrade-testing.yml @@ -37,15 +37,15 @@ permissions: {} # Because the number of jobs spawned can quickly balloon out of control, the following methodology is applied when # building out the matrix below: # -# - The last two releases of WordPress are tested against all PHP/MySQL LTS version combinations and the most recent -# innovation release. +# - The two most recent releases of WordPress are tested against all PHP/MySQL LTS version combinations and the +# most recent innovation release. # - The next 6 oldest versions of WordPress are tested against both the oldest and newest releases of PHP currently # supported for both PHP 7 & 8 along with the oldest and newest MySQL LTS versions currently supported (no innovation # releases). At the current 3 releases per year pace, this accounts for 2 additional years worth of releases. # - Of the remaining versions of WordPress still receiving security updates, only test the ones where the database # version was updated since the previous major release. # - The oldest version of WordPress receiving security updates should always be tested against the same combinations as -# detailed for the last two releases. +# detailed for the two most recent releases. # Notes about chosen MySQL versions: # - Only the most recent innovation release should be included in testing. @@ -54,8 +54,8 @@ permissions: {} # - 5.6.x Docker containers are available and work, but 5.6 only accounts for ~2.3% of installs as of 12/6/2024.defaults: # - 5.7.x accounts for ~20% of installs, so this is used below instead. jobs: - # Tests the full list of PHP/MySQL combinations for the last two versions of WordPress. - upgrade-tests-last-two-releases: + # Tests the full list of PHP/MySQL combinations for the two most recent versions of WordPress. + upgrade-tests-recent-releases: name: ${{ matrix.wp }} to ${{ inputs.new-version && inputs.new-version || 'latest' }} uses: ./.github/workflows/reusable-upgrade-testing.yml if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }} @@ -89,7 +89,7 @@ jobs: new-version: ${{ inputs.new-version && inputs.new-version || 'latest' }} multisite: ${{ matrix.multisite }} - # Tests the remaining 6.x releases on the oldest and newest supported versions of PHP 7 & 8. + # Tests 6.x releases where the WordPress database version changed on the oldest and newest supported versions of PHP 7 & 8. upgrade-tests-wp-6x-mysql: name: ${{ matrix.wp }} to ${{ inputs.new-version && inputs.new-version || 'latest' }} uses: ./.github/workflows/reusable-upgrade-testing.yml @@ -101,7 +101,7 @@ jobs: php: [ '7.2', '7.4', '8.0', '8.4' ] db-type: [ 'mysql' ] db-version: [ '5.7', '8.4' ] - wp: [ '6.0', '6.1', '6.2', '6.3', '6.4', '6.5', '6.6' ] + wp: [ '6.0', '6.3', '6.4', '6.5' ] multisite: [ false, true ] exclude: @@ -172,67 +172,12 @@ jobs: new-version: ${{ inputs.new-version && inputs.new-version || 'latest' }} multisite: ${{ matrix.multisite }} - # Tests 4.x releases where the WordPress database version changed on the oldest and newest supported versions of PHP 7. - # - # The oldest version of WordPress receiving security updates should always be tested. - upgrade-tests-wp-4x-php-7x-mysql: - name: ${{ matrix.wp }} to ${{ inputs.new-version && inputs.new-version || 'latest' }} - uses: ./.github/workflows/reusable-upgrade-testing.yml - if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }} - strategy: - fail-fast: false - matrix: - os: [ 'ubuntu-24.04' ] - php: [ '7.2', '7.4' ] - db-type: [ 'mysql' ] - db-version: [ '5.7', '8.4' ] - wp: [ '4.1', '4.2', '4.3', '4.4', '4.5', '4.6', '4.7' ] - multisite: [ false, true ] - - exclude: - # The PHP <= 7.3/MySQL 8.4 jobs currently fail due to mysql_native_password being disabled by default. See https://core.trac.wordpress.org/ticket/61218. - - php: '7.2' - db-version: '8.4' - with: - os: ${{ matrix.os }} - php: ${{ matrix.php }} - db-type: ${{ matrix.db-type }} - db-version: ${{ matrix.db-version }} - wp: ${{ matrix.wp }} - new-version: ${{ inputs.new-version && inputs.new-version || 'latest' }} - multisite: ${{ matrix.multisite }} - - # Tests 4.x releases where the WordPress database version changed on the oldest and newest supported versions of PHP 8. - # - # The oldest version of WordPress receiving security updates should always be tested. + # The oldest version of WordPress receiving security updates should always be tested against + # the widest possible list of PHP/MySQL combinations. # - # WordPress 4.6-4.9 are excluded from PHP 8+ testing because of the following fatal errors: + # WordPress 4.7 is excluded from PHP 8+ testing because of the following fatal errors: # - Use of __autoload(). # - array/string offset with curly braces. - upgrade-tests-wp-4x-php-8x-mysql: - name: ${{ matrix.wp }} to ${{ inputs.new-version && inputs.new-version || 'latest' }} - uses: ./.github/workflows/reusable-upgrade-testing.yml - if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }} - strategy: - fail-fast: false - matrix: - os: [ 'ubuntu-24.04' ] - php: [ '8.0', '8.4' ] - db-type: [ 'mysql' ] - db-version: [ '5.7', '8.4' ] - wp: [ '4.1', '4.2', '4.3', '4.4', '4.5' ] - multisite: [ false, true ] - with: - os: ${{ matrix.os }} - php: ${{ matrix.php }} - db-type: ${{ matrix.db-type }} - db-version: ${{ matrix.db-version }} - wp: ${{ matrix.wp }} - new-version: ${{ inputs.new-version && inputs.new-version || 'latest' }} - multisite: ${{ matrix.multisite }} - - # The oldest version of WordPress receiving security updates should always be tested against - # the full list of PHP/MySQL combinations. upgrade-tests-oldest-wp-mysql: name: ${{ matrix.wp }} to ${{ inputs.new-version && inputs.new-version || 'latest' }} uses: ./.github/workflows/reusable-upgrade-testing.yml @@ -241,10 +186,10 @@ jobs: fail-fast: false matrix: os: [ 'ubuntu-24.04' ] - php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] + php: [ '7.2', '7.3', '7.4' ] db-type: [ 'mysql' ] db-version: [ '5.7', '8.0', '8.4', '9.3' ] - wp: [ '4.1' ] + wp: [ '4.7' ] multisite: [ false, true ] exclude: @@ -273,7 +218,7 @@ jobs: permissions: actions: read contents: read - needs: [ upgrade-tests-last-two-releases, upgrade-tests-wp-6x-mysql, upgrade-tests-wp-5x-php-7x-mysql, upgrade-tests-wp-5x-php-8x-mysql, upgrade-tests-wp-4x-php-7x-mysql, upgrade-tests-wp-4x-php-8x-mysql, upgrade-tests-oldest-wp-mysql ] + needs: [ upgrade-tests-recent-releases, upgrade-tests-wp-6x-mysql, upgrade-tests-wp-5x-php-7x-mysql, upgrade-tests-wp-5x-php-8x-mysql, upgrade-tests-oldest-wp-mysql ] if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }} with: calling_status: ${{ contains( needs.*.result, 'cancelled' ) && 'cancelled' || contains( needs.*.result, 'failure' ) && 'failure' || 'success' }} diff --git a/.version-support-mysql.json b/.version-support-mysql.json index e92216e416..09731cfef2 100644 --- a/.version-support-mysql.json +++ b/.version-support-mysql.json @@ -182,47 +182,5 @@ "5.5", "5.1", "5.0" - ], - "4-6": [ - "5.7", - "5.6", - "5.5", - "5.1", - "5.0" - ], - "4-5": [ - "5.7", - "5.6", - "5.5", - "5.1", - "5.0" - ], - "4-4": [ - "5.7", - "5.6", - "5.5", - "5.1", - "5.0" - ], - "4-3": [ - "5.7", - "5.6", - "5.5", - "5.1", - "5.0" - ], - "4-2": [ - "5.7", - "5.6", - "5.5", - "5.1", - "5.0" - ], - "4-1": [ - "5.7", - "5.6", - "5.5", - "5.1", - "5.0" ] } diff --git a/.version-support-php.json b/.version-support-php.json index 8d74dfd8de..b2298e7177 100644 --- a/.version-support-php.json +++ b/.version-support-php.json @@ -219,50 +219,5 @@ "5.6", "7.0", "7.1" - ], - "4-6": [ - "5.2", - "5.3", - "5.4", - "5.5", - "5.6", - "7.0" - ], - "4-5": [ - "5.2", - "5.3", - "5.4", - "5.5", - "5.6", - "7.0" - ], - "4-4": [ - "5.2", - "5.3", - "5.4", - "5.5", - "5.6", - "7.0" - ], - "4-3": [ - "5.2", - "5.3", - "5.4", - "5.5", - "5.6" - ], - "4-2": [ - "5.2", - "5.3", - "5.4", - "5.5", - "5.6" - ], - "4-1": [ - "5.2", - "5.3", - "5.4", - "5.5", - "5.6" ] } diff --git a/SECURITY.md b/SECURITY.md index 3bf3bfe3ed..da1c8b444c 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -32,13 +32,7 @@ Full details of the WordPress Security Policy and the list of covered projects a | 4.9.x | Yes | | 4.8.x | Yes | | 4.7.x | Yes | -| 4.6.x | Yes | -| 4.5.x | Yes | -| 4.4.x | Yes | -| 4.3.x | Yes | -| 4.2.x | Yes | -| 4.1.x | Yes | -| < 4.1.0 | No | +| < 4.7.0 | No | ## Reporting a Vulnerability diff --git a/src/wp-content/themes/twentysixteen/css/editor-blocks.css b/src/wp-content/themes/twentysixteen/css/editor-blocks.css index 0ab68afe8a..a8648668cd 100644 --- a/src/wp-content/themes/twentysixteen/css/editor-blocks.css +++ b/src/wp-content/themes/twentysixteen/css/editor-blocks.css @@ -370,6 +370,10 @@ figure[class*="wp-block-"] > figcaption { padding-right: 0; } +.wp-block-quote.is-style-plain { + border: none; +} + @media screen and (min-width: 44.375em) { .wp-block-quote.alignleft, .wp-block-quote.alignright { diff --git a/src/wp-includes/block-template-utils.php b/src/wp-includes/block-template-utils.php index 0659ade277..718eb31e33 100644 --- a/src/wp-includes/block-template-utils.php +++ b/src/wp-includes/block-template-utils.php @@ -437,7 +437,7 @@ function _get_block_templates_files( $template_type, $query = array() ) { if ( 'wp_template_part' === $template_type ) { $candidate = _add_block_template_part_area_info( $new_template_item ); - if ( ! isset( $area ) || ( isset( $area ) && $area === $candidate['area'] ) ) { + if ( ! isset( $area ) || $area === $candidate['area'] ) { $template_files[ $template_slug ] = $candidate; } } diff --git a/src/wp-includes/taxonomy.php b/src/wp-includes/taxonomy.php index a6c47e43ec..935212652c 100644 --- a/src/wp-includes/taxonomy.php +++ b/src/wp-includes/taxonomy.php @@ -2143,11 +2143,11 @@ function wp_delete_term( $term, $taxonomy, $args = array() ) { ) ); - if ( 1 === count( $terms ) && isset( $default ) ) { + if ( 1 === count( $terms ) ) { $terms = array( $default ); } else { $terms = array_diff( $terms, array( $term ) ); - if ( isset( $default ) && isset( $force_default ) && $force_default ) { + if ( isset( $force_default ) && $force_default ) { $terms = array_merge( $terms, array( $default ) ); } } |