From 776c6f62c795864dd6df1fa21b398728c6735da3 Mon Sep 17 00:00:00 2001 From: Marijn Bent Date: Wed, 16 Mar 2022 23:06:47 +0700 Subject: [PATCH 01/12] remove wordproof environment override --- src/config/wordproof-app-config.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/config/wordproof-app-config.php b/src/config/wordproof-app-config.php index 7fb419c9cd1..0985a1fe205 100644 --- a/src/config/wordproof-app-config.php +++ b/src/config/wordproof-app-config.php @@ -19,13 +19,4 @@ class WordProof_App_Config extends DefaultAppConfig { public function getPartner() { return 'yoast'; } - - /** - * Returns the environment. - * - * @return string The environment. - */ - public function getEnvironment() { - return 'staging'; - } } From c4aaa57ad342acbe3b7ee891ff889e3f25090eef Mon Sep 17 00:00:00 2001 From: Marijn Bent Date: Thu, 17 Mar 2022 15:43:09 +0700 Subject: [PATCH 02/12] remove capital p --- .../wordproof-plugin-inactive-conditional.php | 2 +- src/config/wordproof-app-config.php | 2 +- src/config/wordproof-translations.php | 2 +- src/helpers/wordproof-helper.php | 6 ++--- .../wordproof-integration-toggle.php | 12 +++++----- src/integrations/third-party/wordproof.php | 24 +++++++++---------- .../watchers/option-wpseo-watcher.php | 8 +++---- .../watchers/option-wpseo-watcher-test.php | 4 ++-- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/conditionals/third-party/wordproof-plugin-inactive-conditional.php b/src/conditionals/third-party/wordproof-plugin-inactive-conditional.php index 98ac4b5687e..a92b1172396 100644 --- a/src/conditionals/third-party/wordproof-plugin-inactive-conditional.php +++ b/src/conditionals/third-party/wordproof-plugin-inactive-conditional.php @@ -7,7 +7,7 @@ /** * Conditional that is met when the WordProof Timestamp plugin is inactive. */ -class WordProof_Plugin_Inactive_Conditional implements Conditional { +class Wordproof_Plugin_Inactive_Conditional implements Conditional { /** * Returns whether or not the WordProof Timestamp plugin is active. diff --git a/src/config/wordproof-app-config.php b/src/config/wordproof-app-config.php index 7fb419c9cd1..c28d3e0ad63 100644 --- a/src/config/wordproof-app-config.php +++ b/src/config/wordproof-app-config.php @@ -9,7 +9,7 @@ * * @package Yoast\WP\SEO\Config */ -class WordProof_App_Config extends DefaultAppConfig { +class Wordproof_App_Config extends DefaultAppConfig { /** * Returns the partner. diff --git a/src/config/wordproof-translations.php b/src/config/wordproof-translations.php index 3e13c5e9569..3920f91162d 100644 --- a/src/config/wordproof-translations.php +++ b/src/config/wordproof-translations.php @@ -9,7 +9,7 @@ * * @package Yoast\WP\SEO\Config */ -class WordProof_Translations implements TranslationsInterface { +class Wordproof_Translations implements TranslationsInterface { /** * Returns no balance notice translation. diff --git a/src/helpers/wordproof-helper.php b/src/helpers/wordproof-helper.php index 7b891581bde..ee248da4feb 100644 --- a/src/helpers/wordproof-helper.php +++ b/src/helpers/wordproof-helper.php @@ -3,12 +3,12 @@ namespace Yoast\WP\SEO\Helpers; use Yoast\WP\SEO\Conditionals\Non_Multisite_Conditional; -use Yoast\WP\SEO\Conditionals\Third_Party\WordProof_Plugin_Inactive_Conditional; +use Yoast\WP\SEO\Conditionals\Third_Party\Wordproof_Plugin_Inactive_Conditional; /** * A helper object for WordProof integration. */ -class WordProof_Helper { +class Wordproof_Helper { /** * Holds the Current Page helper instance. @@ -62,7 +62,7 @@ public function remove_site_options() { * @return bool|string Returns if the integration should be disabled. */ public function integration_is_disabled( $return_conditional = false ) { - $conditionals = [ new WordProof_Plugin_Inactive_Conditional(), new Non_Multisite_Conditional() ]; + $conditionals = [ new Wordproof_Plugin_Inactive_Conditional(), new Non_Multisite_Conditional() ]; foreach ( $conditionals as $conditional ) { if ( ! $conditional->is_met() ) { diff --git a/src/integrations/third-party/wordproof-integration-toggle.php b/src/integrations/third-party/wordproof-integration-toggle.php index c94b66106e7..5e955ecba55 100644 --- a/src/integrations/third-party/wordproof-integration-toggle.php +++ b/src/integrations/third-party/wordproof-integration-toggle.php @@ -5,10 +5,10 @@ use WordProof\SDK\Helpers\PostMetaHelper; use WordProof\SDK\WordPressSDK; use Yoast\WP\SEO\Conditionals\Admin_Conditional; -use Yoast\WP\SEO\Conditionals\Third_Party\WordProof_Plugin_Inactive_Conditional; +use Yoast\WP\SEO\Conditionals\Third_Party\Wordproof_Plugin_Inactive_Conditional; use Yoast\WP\SEO\Config\WordProofAppConfig; use Yoast\WP\SEO\Config\WordProofTranslations; -use Yoast\WP\SEO\Helpers\WordProof_Helper; +use Yoast\WP\SEO\Helpers\Wordproof_Helper; use Yoast\WP\SEO\Integrations\Integration_Interface; /** @@ -16,21 +16,21 @@ * * @package Yoast\WP\SEO\Integrations\Third_Party */ -class WordProof_Integration_Toggle implements Integration_Interface { +class Wordproof_Integration_Toggle implements Integration_Interface { /** * The WordProof helper instance. * - * @var WordProof_Helper $wordproof The helper instance. + * @var Wordproof_Helper $wordproof The helper instance. */ protected $wordproof; /** * The WordProof integration toggle constructor. * - * @param WordProof_Helper $wordproof The WordProof helper instance. + * @param Wordproof_Helper $wordproof The WordProof helper instance. */ - public function __construct( WordProof_Helper $wordproof ) { + public function __construct(Wordproof_Helper $wordproof ) { $this->wordproof = $wordproof; } diff --git a/src/integrations/third-party/wordproof.php b/src/integrations/third-party/wordproof.php index 1e630fe8791..8cf79e5ac40 100644 --- a/src/integrations/third-party/wordproof.php +++ b/src/integrations/third-party/wordproof.php @@ -5,10 +5,10 @@ use WordProof\SDK\Helpers\PostMetaHelper; use WordProof\SDK\WordPressSDK; use Yoast\WP\SEO\Conditionals\Non_Multisite_Conditional; -use Yoast\WP\SEO\Conditionals\Third_Party\WordProof_Plugin_Inactive_Conditional; -use Yoast\WP\SEO\Config\WordProof_App_Config; -use Yoast\WP\SEO\Config\WordProof_Translations; -use Yoast\WP\SEO\Helpers\WordProof_Helper; +use Yoast\WP\SEO\Conditionals\Third_Party\Wordproof_Plugin_Inactive_Conditional; +use Yoast\WP\SEO\Config\Wordproof_App_Config; +use Yoast\WP\SEO\Config\Wordproof_Translations; +use Yoast\WP\SEO\Helpers\Wordproof_Helper; use Yoast\WP\SEO\Integrations\Integration_Interface; /** @@ -16,10 +16,10 @@ * * @package Yoast\WP\SEO\Integrations\Third_Party */ -class WordProof implements Integration_Interface { +class Wordproof implements Integration_Interface { /** - * The Yoast meta key used to save if a post should be timestamped. + * The Yoast meta key used to save if a post shiould be timestamped. * * @var string The Yoast meta key used to save if a post should be timestamped. */ @@ -28,16 +28,16 @@ class WordProof implements Integration_Interface { /** * The WordProof helper instance. * - * @var WordProof_Helper $wordproof The helper instance. + * @var Wordproof_Helper $wordproof The helper instance. */ protected $wordproof; /** * The WordProof integration constructor. * - * @param WordProof_Helper $wordproof The WordProof helper instance. + * @param Wordproof_Helper $wordproof The WordProof helper instance. */ - public function __construct( WordProof_Helper $wordproof ) { + public function __construct(Wordproof_Helper $wordproof ) { $this->wordproof = $wordproof; } @@ -47,7 +47,7 @@ public function __construct( WordProof_Helper $wordproof ) { * @return array */ public static function get_conditionals() { - return [ WordProof_Plugin_Inactive_Conditional::class, Non_Multisite_Conditional::class ]; + return [ Wordproof_Plugin_Inactive_Conditional::class, Non_Multisite_Conditional::class ]; } /** @@ -94,8 +94,8 @@ public function register_hooks() { */ public function sdk_setup() { - $config = new WordProof_App_Config(); - $translations = new WordProof_Translations(); + $config = new Wordproof_App_Config(); + $translations = new Wordproof_Translations(); WordPressSDK::getInstance( $config, $translations ) ->certificate() diff --git a/src/integrations/watchers/option-wpseo-watcher.php b/src/integrations/watchers/option-wpseo-watcher.php index c4250ea3af0..044d64484df 100644 --- a/src/integrations/watchers/option-wpseo-watcher.php +++ b/src/integrations/watchers/option-wpseo-watcher.php @@ -3,7 +3,7 @@ namespace Yoast\WP\SEO\Integrations\Watchers; use Yoast\WP\SEO\Conditionals\No_Conditionals; -use Yoast\WP\SEO\Helpers\WordProof_Helper; +use Yoast\WP\SEO\Helpers\Wordproof_Helper; use Yoast\WP\SEO\Integrations\Integration_Interface; /** @@ -18,16 +18,16 @@ class Option_Wpseo_Watcher implements Integration_Interface { /** * Holds the WordProof helper instance. * - * @var WordProof_Helper + * @var Wordproof_Helper */ protected $wordproof; /** * The constructor for a watcher of WPSEO options. * - * @param WordProof_Helper $wordproof The WordProof helper instance. + * @param Wordproof_Helper $wordproof The WordProof helper instance. */ - public function __construct( WordProof_Helper $wordproof ) { + public function __construct(Wordproof_Helper $wordproof ) { $this->wordproof = $wordproof; } diff --git a/tests/unit/integrations/watchers/option-wpseo-watcher-test.php b/tests/unit/integrations/watchers/option-wpseo-watcher-test.php index ea95ccbdc7e..5856ce9ad92 100644 --- a/tests/unit/integrations/watchers/option-wpseo-watcher-test.php +++ b/tests/unit/integrations/watchers/option-wpseo-watcher-test.php @@ -5,7 +5,7 @@ use Brain\Monkey; use Mockery; use Yoast\WP\SEO\Helpers\Options_Helper; -use Yoast\WP\SEO\Helpers\WordProof_Helper; +use Yoast\WP\SEO\Helpers\Wordproof_Helper; use Yoast\WP\SEO\Integrations\Watchers\Option_Wpseo_Watcher; use Yoast\WP\SEO\Surfaces\Helpers_Surface; use Yoast\WP\SEO\Tests\Unit\TestCase; @@ -31,7 +31,7 @@ class Option_Wpseo_Watcher_Test extends TestCase { protected function set_up() { parent::set_up(); - $this->instance = new Option_Wpseo_Watcher( Mockery::mock( WordProof_Helper::class ) ); + $this->instance = new Option_Wpseo_Watcher( Mockery::mock( Wordproof_Helper::class ) ); } /** From 0889cad27a6a1e6d3798febbe10d55137ccac136 Mon Sep 17 00:00:00 2001 From: Igor <35524806+igorschoester@users.noreply.github.com> Date: Thu, 17 Mar 2022 10:05:00 +0100 Subject: [PATCH 03/12] Fix CS --- .../third-party/wordproof-integration-toggle.php | 5 +---- src/integrations/third-party/wordproof.php | 2 +- src/integrations/watchers/option-wpseo-watcher.php | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/integrations/third-party/wordproof-integration-toggle.php b/src/integrations/third-party/wordproof-integration-toggle.php index 5e955ecba55..0ccad999e3e 100644 --- a/src/integrations/third-party/wordproof-integration-toggle.php +++ b/src/integrations/third-party/wordproof-integration-toggle.php @@ -2,10 +2,7 @@ namespace Yoast\WP\SEO\Integrations\Third_Party; -use WordProof\SDK\Helpers\PostMetaHelper; -use WordProof\SDK\WordPressSDK; use Yoast\WP\SEO\Conditionals\Admin_Conditional; -use Yoast\WP\SEO\Conditionals\Third_Party\Wordproof_Plugin_Inactive_Conditional; use Yoast\WP\SEO\Config\WordProofAppConfig; use Yoast\WP\SEO\Config\WordProofTranslations; use Yoast\WP\SEO\Helpers\Wordproof_Helper; @@ -30,7 +27,7 @@ class Wordproof_Integration_Toggle implements Integration_Interface { * * @param Wordproof_Helper $wordproof The WordProof helper instance. */ - public function __construct(Wordproof_Helper $wordproof ) { + public function __construct( Wordproof_Helper $wordproof ) { $this->wordproof = $wordproof; } diff --git a/src/integrations/third-party/wordproof.php b/src/integrations/third-party/wordproof.php index 8cf79e5ac40..c1c41e7af5a 100644 --- a/src/integrations/third-party/wordproof.php +++ b/src/integrations/third-party/wordproof.php @@ -37,7 +37,7 @@ class Wordproof implements Integration_Interface { * * @param Wordproof_Helper $wordproof The WordProof helper instance. */ - public function __construct(Wordproof_Helper $wordproof ) { + public function __construct( Wordproof_Helper $wordproof ) { $this->wordproof = $wordproof; } diff --git a/src/integrations/watchers/option-wpseo-watcher.php b/src/integrations/watchers/option-wpseo-watcher.php index 044d64484df..b248e612c86 100644 --- a/src/integrations/watchers/option-wpseo-watcher.php +++ b/src/integrations/watchers/option-wpseo-watcher.php @@ -27,7 +27,7 @@ class Option_Wpseo_Watcher implements Integration_Interface { * * @param Wordproof_Helper $wordproof The WordProof helper instance. */ - public function __construct(Wordproof_Helper $wordproof ) { + public function __construct( Wordproof_Helper $wordproof ) { $this->wordproof = $wordproof; } From abab482312422ec46a4514ce2caf2b497e52578c Mon Sep 17 00:00:00 2001 From: Marijn Bent Date: Wed, 16 Mar 2022 20:33:14 +0700 Subject: [PATCH 04/12] wordproof/wordpress-sdk 1.2.13 --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index b513b8f5c13..1a46e51947e 100644 --- a/composer.lock +++ b/composer.lock @@ -159,16 +159,16 @@ }, { "name": "wordproof/wordpress-sdk", - "version": "1.2.12", + "version": "1.2.13", "source": { "type": "git", "url": "https://github.com/wordproof/wordpress-sdk.git", - "reference": "6b2422571fb7d9a21be8ec707a1e41d0dac46045" + "reference": "48b57b8b820ad89ce30d485978a1298ce21fd5fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wordproof/wordpress-sdk/zipball/6b2422571fb7d9a21be8ec707a1e41d0dac46045", - "reference": "6b2422571fb7d9a21be8ec707a1e41d0dac46045", + "url": "https://api.github.com/repos/wordproof/wordpress-sdk/zipball/48b57b8b820ad89ce30d485978a1298ce21fd5fd", + "reference": "48b57b8b820ad89ce30d485978a1298ce21fd5fd", "shasum": "" }, "require": { @@ -204,9 +204,9 @@ "description": "WordPress SDK", "support": { "issues": "https://github.com/wordproof/wordpress-sdk/issues", - "source": "https://github.com/wordproof/wordpress-sdk/tree/1.2.12" + "source": "https://github.com/wordproof/wordpress-sdk/tree/1.2.13" }, - "time": "2022-03-14T13:56:47+00:00" + "time": "2022-03-16T12:23:34+00:00" }, { "name": "yoast/i18n-module", From f32fd5d1ba10a7fb078d82e4cef88d84658d4edf Mon Sep 17 00:00:00 2001 From: Marijn Bent Date: Wed, 16 Mar 2022 20:54:04 +0700 Subject: [PATCH 05/12] wordproof/wordpress-sdk 1.2.14 --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 1a46e51947e..7a123518a8a 100644 --- a/composer.lock +++ b/composer.lock @@ -159,16 +159,16 @@ }, { "name": "wordproof/wordpress-sdk", - "version": "1.2.13", + "version": "1.2.14", "source": { "type": "git", "url": "https://github.com/wordproof/wordpress-sdk.git", - "reference": "48b57b8b820ad89ce30d485978a1298ce21fd5fd" + "reference": "c4b4313bf62e33316b430a038edb920123f21f73" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wordproof/wordpress-sdk/zipball/48b57b8b820ad89ce30d485978a1298ce21fd5fd", - "reference": "48b57b8b820ad89ce30d485978a1298ce21fd5fd", + "url": "https://api.github.com/repos/wordproof/wordpress-sdk/zipball/c4b4313bf62e33316b430a038edb920123f21f73", + "reference": "c4b4313bf62e33316b430a038edb920123f21f73", "shasum": "" }, "require": { @@ -204,9 +204,9 @@ "description": "WordPress SDK", "support": { "issues": "https://github.com/wordproof/wordpress-sdk/issues", - "source": "https://github.com/wordproof/wordpress-sdk/tree/1.2.13" + "source": "https://github.com/wordproof/wordpress-sdk/tree/1.2.14" }, - "time": "2022-03-16T12:23:34+00:00" + "time": "2022-03-16T13:53:15+00:00" }, { "name": "yoast/i18n-module", From 1113ffae01f3845c97072767123ccc643582a8ff Mon Sep 17 00:00:00 2001 From: Marijn Bent Date: Thu, 17 Mar 2022 00:18:26 +0700 Subject: [PATCH 06/12] remove integration for users that cannot publish pages and posts --- ...can-publish-posts-and-pages-conditional.php | 18 ++++++++++++++++++ src/helpers/wordproof-helper.php | 5 +++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 src/conditionals/user-can-publish-posts-and-pages-conditional.php diff --git a/src/conditionals/user-can-publish-posts-and-pages-conditional.php b/src/conditionals/user-can-publish-posts-and-pages-conditional.php new file mode 100644 index 00000000000..e1ea3a1e081 --- /dev/null +++ b/src/conditionals/user-can-publish-posts-and-pages-conditional.php @@ -0,0 +1,18 @@ +is_met() ) { From 565b6de3d42da09924edccddf9ba660a480558c2 Mon Sep 17 00:00:00 2001 From: Marijn Bent Date: Thu, 17 Mar 2022 00:18:26 +0700 Subject: [PATCH 07/12] Revert "remove integration for users that cannot publish pages and posts" This reverts commit af54c9ce751f65329b54ad52b1d82934bd4be86d. --- ...can-publish-posts-and-pages-conditional.php | 18 ------------------ src/helpers/wordproof-helper.php | 3 +-- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 src/conditionals/user-can-publish-posts-and-pages-conditional.php diff --git a/src/conditionals/user-can-publish-posts-and-pages-conditional.php b/src/conditionals/user-can-publish-posts-and-pages-conditional.php deleted file mode 100644 index e1ea3a1e081..00000000000 --- a/src/conditionals/user-can-publish-posts-and-pages-conditional.php +++ /dev/null @@ -1,18 +0,0 @@ -is_met() ) { From 9227c6ab76cdd359445b74b58cbe92f96260061f Mon Sep 17 00:00:00 2001 From: Marijn Bent Date: Thu, 17 Mar 2022 00:18:26 +0700 Subject: [PATCH 08/12] Revert "Revert "remove integration for users that cannot publish pages and posts"" This reverts commit c977c52bb30cdce616c875241bacfd4c4391d4b3. --- ...can-publish-posts-and-pages-conditional.php | 18 ++++++++++++++++++ src/helpers/wordproof-helper.php | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 src/conditionals/user-can-publish-posts-and-pages-conditional.php diff --git a/src/conditionals/user-can-publish-posts-and-pages-conditional.php b/src/conditionals/user-can-publish-posts-and-pages-conditional.php new file mode 100644 index 00000000000..e1ea3a1e081 --- /dev/null +++ b/src/conditionals/user-can-publish-posts-and-pages-conditional.php @@ -0,0 +1,18 @@ +is_met() ) { From 6f7cee49c1a1bfc794803d946938f4c8d2af984f Mon Sep 17 00:00:00 2001 From: Marijn Bent Date: Thu, 17 Mar 2022 11:49:15 +0700 Subject: [PATCH 09/12] wordproof/wordpress-sdk 1.2.15 --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 7a123518a8a..a1f591082e9 100644 --- a/composer.lock +++ b/composer.lock @@ -159,16 +159,16 @@ }, { "name": "wordproof/wordpress-sdk", - "version": "1.2.14", + "version": "1.2.15", "source": { "type": "git", "url": "https://github.com/wordproof/wordpress-sdk.git", - "reference": "c4b4313bf62e33316b430a038edb920123f21f73" + "reference": "2dd9b6eba15e07896630d21619b4e5ab56598282" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wordproof/wordpress-sdk/zipball/c4b4313bf62e33316b430a038edb920123f21f73", - "reference": "c4b4313bf62e33316b430a038edb920123f21f73", + "url": "https://api.github.com/repos/wordproof/wordpress-sdk/zipball/2dd9b6eba15e07896630d21619b4e5ab56598282", + "reference": "2dd9b6eba15e07896630d21619b4e5ab56598282", "shasum": "" }, "require": { @@ -204,9 +204,9 @@ "description": "WordPress SDK", "support": { "issues": "https://github.com/wordproof/wordpress-sdk/issues", - "source": "https://github.com/wordproof/wordpress-sdk/tree/1.2.14" + "source": "https://github.com/wordproof/wordpress-sdk/tree/1.2.15" }, - "time": "2022-03-16T13:53:15+00:00" + "time": "2022-03-17T04:46:49+00:00" }, { "name": "yoast/i18n-module", From c7c4821085282173668c59af379b305fd80fc032 Mon Sep 17 00:00:00 2001 From: nolledgeable Date: Thu, 17 Mar 2022 10:44:38 +0100 Subject: [PATCH 10/12] Redo capitalisation change in Wordproof helper --- src/helpers/wordproof-helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/helpers/wordproof-helper.php b/src/helpers/wordproof-helper.php index 545504f107f..ccc2c3f2f12 100644 --- a/src/helpers/wordproof-helper.php +++ b/src/helpers/wordproof-helper.php @@ -3,7 +3,7 @@ namespace Yoast\WP\SEO\Helpers; use Yoast\WP\SEO\Conditionals\Non_Multisite_Conditional; -use Yoast\WP\SEO\Conditionals\Third_Party\WordProof_Plugin_Inactive_Conditional; +use Yoast\WP\SEO\Conditionals\Third_Party\Wordproof_Plugin_Inactive_Conditional; use Yoast\WP\SEO\Conditionals\User_Can_Publish_Posts_And_Pages_Conditional; /** @@ -63,7 +63,7 @@ public function remove_site_options() { * @return bool|string Returns if the integration should be disabled. */ public function integration_is_disabled( $return_conditional = false ) { - $conditionals = [ new WordProof_Plugin_Inactive_Conditional(), new Non_Multisite_Conditional(), new User_Can_Publish_Posts_And_Pages_Conditional() ]; + $conditionals = [ new Wordproof_Plugin_Inactive_Conditional(), new Non_Multisite_Conditional(), new User_Can_Publish_Posts_And_Pages_Conditional() ]; foreach ( $conditionals as $conditional ) { if ( ! $conditional->is_met() ) { From 9d0ede06505f0b9d5468e68a66e2d3f58aa06139 Mon Sep 17 00:00:00 2001 From: YoastBot CI Date: Thu, 17 Mar 2022 10:08:32 +0000 Subject: [PATCH 11/12] Bump Gutenberg supported version. --- admin/class-gutenberg-compatibility.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/class-gutenberg-compatibility.php b/admin/class-gutenberg-compatibility.php index 64669cc16a1..688a8d1fb22 100644 --- a/admin/class-gutenberg-compatibility.php +++ b/admin/class-gutenberg-compatibility.php @@ -15,14 +15,14 @@ class WPSEO_Gutenberg_Compatibility { * * @var string */ - const CURRENT_RELEASE = '12.7.2'; + const CURRENT_RELEASE = '12.8.0'; /** * The minimally supported version of Gutenberg by the plugin. * * @var string */ - const MINIMUM_SUPPORTED = '12.7.2'; + const MINIMUM_SUPPORTED = '12.8.0'; /** * Holds the current version. From ce64450b2c7d1442af06d6c07c2dab67959d9da5 Mon Sep 17 00:00:00 2001 From: YoastBot CI Date: Thu, 17 Mar 2022 10:08:37 +0000 Subject: [PATCH 12/12] Bump version to 18.4-RC6 --- package.json | 2 +- wp-seo-main.php | 2 +- wp-seo.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index e29bacb5efc..d551d55f6b6 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "typescript": "^4.2.4" }, "yoast": { - "pluginVersion": "18.4-RC5" + "pluginVersion": "18.4-RC6" }, "version": "0.0.0" } diff --git a/wp-seo-main.php b/wp-seo-main.php index 2479b34ad86..22df039d3e2 100644 --- a/wp-seo-main.php +++ b/wp-seo-main.php @@ -15,7 +15,7 @@ * {@internal Nobody should be able to overrule the real version number as this can cause * serious issues with the options, so no if ( ! defined() ).}} */ -define( 'WPSEO_VERSION', '18.4-RC5' ); +define( 'WPSEO_VERSION', '18.4-RC6' ); if ( ! defined( 'WPSEO_PATH' ) ) { diff --git a/wp-seo.php b/wp-seo.php index 562424cfbe9..56ddd636d87 100644 --- a/wp-seo.php +++ b/wp-seo.php @@ -8,7 +8,7 @@ * * @wordpress-plugin * Plugin Name: Yoast SEO - * Version: 18.4-RC5 + * Version: 18.4-RC6 * Plugin URI: https://yoa.st/1uj * Description: The first true all-in-one SEO solution for WordPress, including on-page content analysis, XML sitemaps and much more. * Author: Team Yoast