Skip to content

Commit

Permalink
Merge pull request #6031 from Automattic/staging
Browse files Browse the repository at this point in the history
Production release: v20241203.0
  • Loading branch information
luiztiago authored Dec 3, 2024
2 parents 6729596 + c1eaf61 commit 11a1a15
Show file tree
Hide file tree
Showing 31 changed files with 893 additions and 764 deletions.
2 changes: 1 addition & 1 deletion .github/actions/run-wp-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ runs:
"${PHPUNIT}" ${OPTIONS}
- name: Upload coverage report
uses: codecov/codecov-action@v5.0.2
uses: codecov/codecov-action@v5.0.7
with:
files: ${{ inputs.coverage-file }}
flags: ${{ inputs.coverage-flags }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ jobs:
uses: actions/checkout@v4.2.2

- name: Initialize CodeQL
uses: github/codeql-action/init@v3.27.4
uses: github/codeql-action/init@v3.27.5
with:
languages: ${{ matrix.language }}
config-file: ./.github/codeql-config.yml

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3.27.4
uses: github/codeql-action/analyze@v3.27.5
2 changes: 1 addition & 1 deletion .github/workflows/core-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
echo "GITHUB_EVENT_NAME=pull_request" >> "wordpress/.env"
- name: Set up Node.js
uses: actions/setup-node@v4.0.4
uses: actions/setup-node@v4.1.0
with:
node-version-file: 'wordpress/.nvmrc'
cache: npm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:
uses: actions/checkout@v4.2.2

- name: Review dependencies
uses: actions/dependency-review-action@v4.4.0
uses: actions/dependency-review-action@v4.5.0
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
uses: ./.github/actions/prepare-source

- name: Setup Node
uses: actions/setup-node@v4.0.4
uses: actions/setup-node@v4.1.0
with:
node-version: 'lts/*'
cache: npm
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
uses: actions/checkout@v4.2.2

- name: Setup Node
uses: actions/setup-node@v4.0.4
uses: actions/setup-node@v4.1.0
with:
node-version: 'lts/*'
cache: npm
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
fail-fast: 'true'

- name: Setup Node
uses: actions/setup-node@v4.0.4
uses: actions/setup-node@v4.1.0
with:
node-version: 'lts/*'
cache: npm
Expand All @@ -54,7 +54,7 @@ jobs:
uses: actions/checkout@v4.2.2

- name: Setup Node
uses: actions/setup-node@v4.0.4
uses: actions/setup-node@v4.1.0
with:
node-version: 'lts/*'
cache: npm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/search-dev-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
token: ${{ secrets.WPCOM_VIP_BOT_TOKEN }}

- name: Setup Node
uses: actions/setup-node@v4.0.4
uses: actions/setup-node@v4.1.0
with:
node-version: 'lts/*'
cache: npm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/search-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
uses: ./.github/actions/prepare-source

- name: "Install node v${{ env.NODE_VERSION }}"
uses: actions/setup-node@v4.0.4
uses: actions/setup-node@v4.1.0
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
Expand Down
40 changes: 20 additions & 20 deletions __tests__/e2e/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"erusev/parsedown": "1.7.4",
"dms/phpunit-arraysubset-asserts": "0.5.0",
"yoast/phpunit-polyfills": "3.0.0",
"johnpbloch/wordpress-core": "6.7.0",
"wp-phpunit/wp-phpunit": "6.7.0",
"johnpbloch/wordpress-core": "6.7.1",
"wp-phpunit/wp-phpunit": "6.7.1",
"wp-cli/wp-cli": "2.11.0"
},
"config": {
Expand Down
24 changes: 12 additions & 12 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion drop-ins/wp-memcached/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"phpunit/phpunit": "^9.5",
"vimeo/psalm": "^5.0",
"wp-phpunit/wp-phpunit": "^6.1",
"yoast/phpunit-polyfills": "^1.0"
"yoast/phpunit-polyfills": "^1.1"
},
"license": "MIT",
"authors": [
Expand Down
20 changes: 11 additions & 9 deletions drop-ins/wp-memcached/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 2 additions & 13 deletions drop-ins/wp-memcached/includes/wp-object-cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -370,15 +370,9 @@ public function get( $key, $group = 'default', $force = false, &$found = null )
return $value;
}

// For a non-persistant group, if it's not in local cache then it just doesn't exist.
if ( $this->is_non_persistent_group( $group ) ) {
// This is a bit suboptimal, but keeping for back-compat for now.
$found = false;

$this->cache[ $key ] = [
'value' => false,
'found' => false,
];

$this->group_ops_stats( 'get_local', $key, $group, null, null, 'not_in_local' );

return false;
Expand Down Expand Up @@ -431,12 +425,7 @@ public function get_multiple( $keys, $group = 'default', $force = false ) {

$this->group_ops_stats( 'get_local', $cache_key, $group, null, null, 'local' );
} elseif ( $this->is_non_persistent_group( $group ) ) {
$return[ $key ] = false;
$return_cache[ $cache_key ] = [
'value' => false,
'found' => false,
];

$return[ $key ] = false;
$this->group_ops_stats( 'get_local', $cache_key, $group, null, null, 'not_in_local' );
} else {
$uncached_keys[ $key ] = $cache_key;
Expand Down
Loading

0 comments on commit 11a1a15

Please sign in to comment.