Merge pull request #21424 from Yoast/deprecate-wordproof

Deprecate the Wordproof feature

admin/formatter/class-metabox-formatter.php

@@ -179,7 +179,6 @@ private function get_defaults() {
  'show_markers' => apply_filters( 'wpseo_enable_assessment_markers', true ),
  'zapierIntegrationActive' => WPSEO_Options::get( 'zapier_integration_active', false ) ? 1 : 0,
  'zapierConnectedStatus' => ! empty( WPSEO_Options::get( 'zapier_subscription', [] ) ) ? 1 : 0,
- 'wordproofIntegrationActive' => YoastSEO()->helpers->wordproof->is_active() ? 1 : 0,
  'getJetpackBoostPrePublishLink' => WPSEO_Shortlinker::get( 'https://yoa.st/jetpack-boost-get-prepublish?domain=' . $host ),
  'upgradeJetpackBoostPrePublishLink' => WPSEO_Shortlinker::get( 'https://yoa.st/jetpack-boost-upgrade-prepublish?domain=' . $host ),
  'woocommerceUpsellSchemaLink' => WPSEO_Shortlinker::get( 'https://yoa.st/product-schema-metabox' ),

admin/metabox/class-metabox.php

@@ -208,12 +208,6 @@ public static function translate_meta_boxes() {
  '<a href="https://googlewebmastercentral.blogspot.com/2009/12/handling-legitimate-cross-domain.html" target="_blank" rel="noopener">',
  WPSEO_Admin_Utils::get_new_tab_message() . '</a>'
  );
- /* translators: %s expands to the post type name. */
- WPSEO_Meta::$meta_fields['advanced']['wordproof_timestamp']['title'] = __( 'Timestamp this %s', 'wordpress-seo' );
- WPSEO_Meta::$meta_fields['advanced']['wordproof_timestamp']['description'] = __( 'Use WordProof to timestamp this page to comply with legal regulations and join the fight for a more transparant and accountable internet.', 'wordpress-seo' );
- WPSEO_Meta::$meta_fields['advanced']['wordproof_timestamp']['options']['0'] = __( 'Off', 'wordpress-seo' );
- WPSEO_Meta::$meta_fields['advanced']['wordproof_timestamp']['options']['1'] = __( 'On', 'wordpress-seo' );
- WPSEO_Meta::$meta_fields['advanced']['wordproof_timestamp']['type'] = 'hidden';
 
  WPSEO_Meta::$meta_fields['advanced']['redirect']['title'] = __( '301 Redirect', 'wordpress-seo' );
  WPSEO_Meta::$meta_fields['advanced']['redirect']['description'] = __( 'The URL that this page should redirect to.', 'wordpress-seo' );

admin/tracking/class-tracking-settings-data.php

@@ -226,7 +226,6 @@ class WPSEO_Tracking_Settings_Data implements WPSEO_Collection {
  'search_cleanup_patterns',
  'search_character_limit',
  'redirect_search_pretty_urls',
- 'wordproof_integration_active',
  'indexables_overview_state',
  'deny_search_crawling',
  'deny_wp_json_crawling',

composer.json

@@ -36,7 +36,6 @@
  "psr/log": "^1.0",
  "symfony/config": "^3.4",
  "symfony/dependency-injection": "^3.4",
- "wordproof/wordpress-sdk": "1.3.5",
  "yoast/wp-test-utils": "^1.2",
  "yoast/yoastcs": "^3.1.0"
  },
@@ -92,7 +91,7 @@
  "Yoast\\WP\\SEO\\Composer\\Actions::check_coding_standards"
  ],
  "check-cs-thresholds": [
- "@putenv YOASTCS_THRESHOLD_ERRORS=2523",
+ "@putenv YOASTCS_THRESHOLD_ERRORS=2514",
  "@putenv YOASTCS_THRESHOLD_WARNINGS=253",
  "Yoast\\WP\\SEO\\Composer\\Actions::check_cs_thresholds"
  ],
@@ -135,8 +134,7 @@
  ],
  "prefix-dependencies": [
  "composer prefix-oauth2-client",
- "composer prefix-symfony",
- "composer prefix-wordproof"
+ "composer prefix-symfony"
  ],
  "prefix-oauth2-client": [
  "@php ./vendor/humbug/php-scoper/bin/php-scoper add-prefix --prefix=YoastSEO_Vendor --output-dir=./vendor_prefixed/symfony/deprecation-contracts --config=config/php-scoper/deprecation-contracts.inc.php --force --quiet",
@@ -147,9 +145,6 @@
  "prefix-symfony": [
  "@php ./vendor/humbug/php-scoper/bin/php-scoper add-prefix --prefix=YoastSEO_Vendor --output-dir=./vendor_prefixed/symfony/dependency-injection --config=config/php-scoper/dependency-injection.inc.php --force --quiet"
  ],
- "prefix-wordproof": [
- "@php ./vendor/humbug/php-scoper/bin/php-scoper add-prefix --prefix=YoastSEO_Vendor --output-dir=./vendor_prefixed/wordproof/wordpress-sdk --config=config/php-scoper/wordproof.inc.php --force --quiet"
- ],
  "compile-di": [
  "rm -f ./src/generated/container.php",
  "rm -f ./src/generated/container.php.meta",

config/dependency-injection/deprecated-classes.php

@@ -19,23 +19,26 @@
  */
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Yoast\WP\SEO\Actions\Indexables_Page_Action;
-use Yoast\WP\SEO\Conditionals\Indexables_Page_Conditional;
-use Yoast\WP\SEO\Conditionals\Schema_Blocks_Conditional;
-use Yoast\WP\SEO\Helpers\Indexables_Page_Helper;
-use Yoast\WP\SEO\Integrations\Admin\Indexables_Page_Integration;
+use Yoast\WP\SEO\Conditionals\Third_Party\Wordproof_Integration_Active_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\Integrations\Admin\Old_Premium_Integration;
-use Yoast\WP\SEO\Integrations\Admin\Social_Templates_Integration;
-use Yoast\WP\SEO\Integrations\Schema_Blocks;
 use Yoast\WP\SEO\Integrations\Third_Party\Wincher;
+use Yoast\WP\SEO\Integrations\Third_Party\Wordproof;
 use Yoast\WP\SEO\Integrations\Third_Party\Wordproof_Integration_Toggle;
-use Yoast\WP\SEO\Routes\Indexables_Page_Route;
-use Yoast\WP\SEO\Schema_Templates\Assets\Icons;
 
 $deprecated_classes = [
- Old_Premium_Integration::class => '20.10',
- Wincher::class => '21.6',
- Wordproof_Integration_Toggle::class => '21.6',
+ Old_Premium_Integration::class => '20.10',
+ Wincher::class => '21.6',
+ Wordproof_Integration_Toggle::class => '21.6',
+ Wordproof::class => '22.10',
+ Wordproof_Integration_Active_Conditional::class => '22.10',
+ Wordproof_Plugin_Inactive_Conditional::class => '22.10',
+ Wordproof_App_Config::class => '22.10',
+ Wordproof_Translations::class => '22.10',
+ Wordproof_Helper::class => '22.10',
 ];
 
 foreach ( $deprecated_classes as $original_class => $version ) {

config/grunt/task-config/copy.js

@@ -34,7 +34,6 @@ module.exports = {
  "lib/**",
  "vendor/**",
  "vendor_prefixed/**/*.php",
- "vendor_prefixed/wordproof/wordpress-sdk/build/**/*.js",
  "index.php",
  "license.txt",
  "readme.txt",

config/webpack/paths.js

@@ -51,7 +51,6 @@ const getEntries = ( sourceDirectory = "./packages/js/src" ) => ( {
  "used-keywords-assessment": `${ sourceDirectory }/used-keywords-assessment.js`,
  "react-select": `${ sourceDirectory }/externals/react-select.js`,
  workouts: `${ sourceDirectory }/workouts.js`,
- "wordproof-uikit": `${ sourceDirectory }/wordproof-uikit.js`,
  "frontend-inspector-resources": `${ sourceDirectory }/frontend-inspector-resources.js`,
 } );
 

css/src/modal.css

@@ -506,35 +506,3 @@
 .yoast-related-keyphrases-modal__chart {
  display: block;
 }
-
-.yoast-wordproof-modal {
- max-width: 380px;
- text-align: center;
-}
-
-.yoast-wordproof-modal-image {
- display: flex;
- justify-content: center;
- margin-block: 40px;
-}
-
-.yoast-wordproof-modal-svg__webhook-failed {
- width: 100%;
-}
-
-.yoast-wordproof-modal-svg__success {
- width: 175px;
-}
-
-.yoast-wordproof-modal-action {
- display: flex;
- justify-content: center;
- margin-top: 40px;
- margin-bottom: 10px;
-}
-
-/* Override default button padding. */
-.yoast-wordproof-modal-action.yoast-wordproof-modal-action > button {
- padding-left: 20px;
- padding-right: 20px;
-}

inc/options/class-wpseo-option-ms.php

@@ -128,7 +128,6 @@ public function __construct() {
  "{$allow_prefix}search_cleanup_emoji" => true,
  "{$allow_prefix}search_cleanup_patterns" => true,
  "{$allow_prefix}redirect_search_pretty_urls" => true,
- "{$allow_prefix}wordproof_integration_active" => false,
  "{$allow_prefix}algolia_integration_active" => true,
  ];
 

inc/options/class-wpseo-option-wpseo.php

@@ -95,8 +95,6 @@ class WPSEO_Option_Wpseo extends WPSEO_Option {
  'wincher_tokens' => [],
  'wincher_automatically_add_keyphrases' => false,
  'wincher_website_id' => '',
- 'wordproof_integration_active' => false,
- 'wordproof_integration_changed' => false,
  'first_time_install' => false,
  'should_redirect_after_install_free' => false,
  'activation_redirect_timestamp_free' => 0,
@@ -454,13 +452,6 @@ protected function validate_option( $dirty, $clean, $old ) {
  }
  break;
 
- case 'wordproof_integration_active':
- $clean[ $key ] = ( isset( $dirty[ $key ] ) ? WPSEO_Utils::validate_bool( $dirty[ $key ] ) : false );
- // If the setting has changed, record it.
- if ( $old[ $key ] !== $clean[ $key ] ) {
- $clean['wordproof_integration_changed'] = true;
- }
- break;
  case 'last_known_no_unindexed':
  $clean[ $key ] = $old[ $key ];
 

packages/js/.eslintrc.js

@@ -38,8 +38,6 @@ module.exports = {
  // Because `main` in `package.json` points to the `build/index.js` (in the UI library), which is not present before building.
  // As we are dealing with our source, not the actual NPM download, due to the monorepo setup.
  "^@yoast/(ui-library|schema-blocks|style-guide|components|helpers|search-metadata-previews|social-metadata-forms|replacement-variable-editor|analysis-report|feature-flag)$",
- // In a similar fashion as the above. Ignore the PHP dependency for WordProof, or we have to install the PHP dependencies.
- "vendor_prefixed/wordproof",
  "^@wordpress/(annotations|api|edit-post|sanitize)$",
  "^jquery$",
  "yoastseo",

packages/js/package.json

@@ -30,7 +30,6 @@
  "@wordpress/rich-text": "^3.25.3",
  "@wordpress/server-side-render": "^1.21.1",
  "@wordpress/url": "^3.17.0",
- "@wordproof/uikit": "1.0.41",
  "@yoast/analysis-report": "^1.21.0",
  "@yoast/components": "^2.19.0",
  "@yoast/feature-flag": "^0.5.2",