From 02c1d1ce4d1f0ae33b6256d9e742eb13bb4635f9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 17 Dec 2023 18:52:14 +0000 Subject: [PATCH 1/2] chore(deps): update devdependencies (non-major) --- composer.json | 4 ++-- composer.lock | 66 +++++++++++++++++++++++++-------------------------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/composer.json b/composer.json index 9086338..da4ad91 100644 --- a/composer.json +++ b/composer.json @@ -22,11 +22,11 @@ }, "require-dev": { "automattic/vipwpcs": "^3.0", - "johnpbloch/wordpress-core": "^6.4.1", + "johnpbloch/wordpress-core": "^6.4.2", "php-stubs/wordpress-stubs": "^6.4.1", "phpcompatibility/phpcompatibility-wp": "^2.1.4", "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.16.0", + "vimeo/psalm": "^5.18.0", "yoast/phpunit-polyfills": "^2.0" }, "config": { diff --git a/composer.lock b/composer.lock index 8ef031e..831f116 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1572a824acf617ca93d7ec86fec92dd1", + "content-hash": "a01e9ebd94a8e2869f243b950bff41db", "packages": [ { "name": "composer/installers", @@ -975,16 +975,16 @@ }, { "name": "fidry/cpu-core-counter", - "version": "0.5.1", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/theofidry/cpu-core-counter.git", - "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623" + "reference": "85193c0b0cb5c47894b5eaec906e946f054e7077" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/b58e5a3933e541dc286cc91fc4f3898bbc6f1623", - "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/85193c0b0cb5c47894b5eaec906e946f054e7077", + "reference": "85193c0b0cb5c47894b5eaec906e946f054e7077", "shasum": "" }, "require": { @@ -992,13 +992,13 @@ }, "require-dev": { "fidry/makefile": "^0.2.0", + "fidry/php-cs-fixer-config": "^1.1.2", "phpstan/extension-installer": "^1.2.0", "phpstan/phpstan": "^1.9.2", "phpstan/phpstan-deprecation-rules": "^1.0.0", "phpstan/phpstan-phpunit": "^1.2.2", "phpstan/phpstan-strict-rules": "^1.4.4", - "phpunit/phpunit": "^9.5.26 || ^8.5.31", - "theofidry/php-cs-fixer-config": "^1.0", + "phpunit/phpunit": "^8.5.31 || ^9.5.26", "webmozarts/strict-phpunit": "^7.5" }, "type": "library", @@ -1024,7 +1024,7 @@ ], "support": { "issues": "https://github.com/theofidry/cpu-core-counter/issues", - "source": "https://github.com/theofidry/cpu-core-counter/tree/0.5.1" + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.0.0" }, "funding": [ { @@ -1032,20 +1032,20 @@ "type": "github" } ], - "time": "2022-12-24T12:35:10+00:00" + "time": "2023-09-17T21:38:23+00:00" }, { "name": "johnpbloch/wordpress-core", - "version": "6.4.1", + "version": "6.4.2", "source": { "type": "git", "url": "https://github.com/johnpbloch/wordpress-core.git", - "reference": "bc7bf692e02d9d18c81ab167ef6e9036d0becde0" + "reference": "00ea636cf89fd17daacbc3862f368a2782267825" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/johnpbloch/wordpress-core/zipball/bc7bf692e02d9d18c81ab167ef6e9036d0becde0", - "reference": "bc7bf692e02d9d18c81ab167ef6e9036d0becde0", + "url": "https://api.github.com/repos/johnpbloch/wordpress-core/zipball/00ea636cf89fd17daacbc3862f368a2782267825", + "reference": "00ea636cf89fd17daacbc3862f368a2782267825", "shasum": "" }, "require": { @@ -1053,7 +1053,7 @@ "php": ">=7.0.0" }, "provide": { - "wordpress/core-implementation": "6.4.1" + "wordpress/core-implementation": "6.4.2" }, "type": "wordpress-core", "notification-url": "https://packagist.org/downloads/", @@ -1080,7 +1080,7 @@ "source": "https://core.trac.wordpress.org/browser", "wiki": "https://codex.wordpress.org/" }, - "time": "2023-11-09T01:33:28+00:00" + "time": "2023-12-06T16:30:44+00:00" }, { "name": "myclabs/deep-copy", @@ -1194,16 +1194,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.17.1", + "version": "v4.18.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", "shasum": "" }, "require": { @@ -1244,9 +1244,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" }, - "time": "2023-08-13T19:53:39+00:00" + "time": "2023-12-10T21:03:43+00:00" }, { "name": "phar-io/manifest", @@ -1901,16 +1901,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.4", + "version": "1.24.5", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "6bd0c26f3786cd9b7c359675cb789e35a8e07496" + "reference": "fedf211ff14ec8381c9bf5714e33a7a552dd1acc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6bd0c26f3786cd9b7c359675cb789e35a8e07496", - "reference": "6bd0c26f3786cd9b7c359675cb789e35a8e07496", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fedf211ff14ec8381c9bf5714e33a7a552dd1acc", + "reference": "fedf211ff14ec8381c9bf5714e33a7a552dd1acc", "shasum": "" }, "require": { @@ -1942,9 +1942,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.4" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.5" }, - "time": "2023-11-26T18:29:22+00:00" + "time": "2023-12-16T09:33:33+00:00" }, { "name": "phpunit/php-code-coverage", @@ -4398,16 +4398,16 @@ }, { "name": "vimeo/psalm", - "version": "5.16.0", + "version": "5.18.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "2897ba636551a8cb61601cc26f6ccfbba6c36591" + "reference": "b113f3ed0259fd6e212d87c3df80eec95a6abf19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/2897ba636551a8cb61601cc26f6ccfbba6c36591", - "reference": "2897ba636551a8cb61601cc26f6ccfbba6c36591", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/b113f3ed0259fd6e212d87c3df80eec95a6abf19", + "reference": "b113f3ed0259fd6e212d87c3df80eec95a6abf19", "shasum": "" }, "require": { @@ -4426,7 +4426,7 @@ "ext-tokenizer": "*", "felixfbecker/advanced-json-rpc": "^3.1", "felixfbecker/language-server-protocol": "^1.5.2", - "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1", + "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1 || ^1.0.0", "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", "nikic/php-parser": "^4.16", "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", @@ -4504,7 +4504,7 @@ "issues": "https://github.com/vimeo/psalm/issues", "source": "https://github.com/vimeo/psalm" }, - "time": "2023-11-22T20:38:47+00:00" + "time": "2023-12-16T09:37:35+00:00" }, { "name": "webmozart/assert", From 9c64feff0a8844c606b6b9c25b3554a2bfc37880 Mon Sep 17 00:00:00 2001 From: Unsung Hero <66092015+myrotvorets-team@users.noreply.github.com> Date: Sun, 17 Dec 2023 20:56:28 +0200 Subject: [PATCH 2/2] Fix psalm issues --- index.php | 1 - wordpress.stubs | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/index.php b/index.php index a0f3bfb..16ec896 100644 --- a/index.php +++ b/index.php @@ -18,7 +18,6 @@ } elseif ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) { require_once __DIR__ . '/vendor/autoload.php'; } elseif ( file_exists( ABSPATH . 'vendor/autoload.php' ) ) { - /** @psalm-suppress UnresolvableInclude */ require_once ABSPATH . 'vendor/autoload.php'; } diff --git a/wordpress.stubs b/wordpress.stubs index 16bd294..12e922e 100644 --- a/wordpress.stubs +++ b/wordpress.stubs @@ -8,6 +8,8 @@ namespace { define( 'MONTH_IN_SECONDS', (int) ( 30 * DAY_IN_SECONDS ) ); define( 'YEAR_IN_SECONDS', (int) ( 365 * DAY_IN_SECONDS ) ); + define( 'ABSPATH', '/wp' ); + define( 'COOKIEPATH', expr ); define( 'COOKIE_DOMAIN', expr );