Merge pull request #3436 from Automattic/trunk

Alpha release Sep 20

composer.json

@@ -18,7 +18,7 @@
 		"wp-coding-standards/wpcs": "^3.0",
 		"dealerdirect/phpcodesniffer-composer-installer": "*",
 		"phpcompatibility/phpcompatibility-wp": "*",
-		"yoast/phpunit-polyfills": "^2.0",
+		"yoast/phpunit-polyfills": "^3.0",
 		"phpunit/phpunit": "^7.0 || ^9.5"
 	},
 	"autoload": {

includes/class-newspack-image-credits.php

@@ -403,7 +403,7 @@ public static function get_default_settings( $key = null ) {
 				'key'         => 'newspack_image_credits_placeholder',
 				'label'       => __( 'Placeholder Image', 'newspack-image-credits' ),
 				'type'        => 'image',
-				'value'       => null,
+				'value'       => '',
 			],
 			[
 				'description' => __( 'Automatically populate image credits from EXIF or IPTC metadata when uploading new images.', 'newspack-image-credits' ),

includes/class-newspack.php

@@ -78,6 +78,14 @@ private function includes() {
 		include_once NEWSPACK_ABSPATH . 'includes/class-plugin-manager.php';
 		include_once NEWSPACK_ABSPATH . 'includes/class-theme-manager.php';
 		include_once NEWSPACK_ABSPATH . 'includes/class-admin-plugins-screen.php';
+		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/class-reader-activation-emails.php';
+		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/class-reader-activation.php';
+		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/class-reader-data.php';
+		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/sync/class-sync.php';
+		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/sync/class-metadata.php';
+		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/sync/class-woocommerce.php';
+		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/sync/class-esp-sync.php';
+		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/sync/class-esp-sync-admin.php';
 		include_once NEWSPACK_ABSPATH . 'includes/data-events/class-utils.php';
 		include_once NEWSPACK_ABSPATH . 'includes/data-events/class-data-events.php';
 		include_once NEWSPACK_ABSPATH . 'includes/data-events/class-webhooks.php';
@@ -86,17 +94,10 @@ private function includes() {
 		include_once NEWSPACK_ABSPATH . 'includes/data-events/class-popups.php';
 		include_once NEWSPACK_ABSPATH . 'includes/data-events/class-memberships.php';
 		include_once NEWSPACK_ABSPATH . 'includes/data-events/connectors/ga4/class-ga4.php';
-		include_once NEWSPACK_ABSPATH . 'includes/data-events/connectors/class-connector.php';
-		include_once NEWSPACK_ABSPATH . 'includes/data-events/connectors/class-mailchimp.php';
-		include_once NEWSPACK_ABSPATH . 'includes/data-events/connectors/class-activecampaign.php';
+		include_once NEWSPACK_ABSPATH . 'includes/data-events/connectors/class-esp-connector.php';
 		include_once NEWSPACK_ABSPATH . 'includes/data-events/class-woo-user-registration.php';
 		include_once NEWSPACK_ABSPATH . 'includes/class-api.php';
 		include_once NEWSPACK_ABSPATH . 'includes/class-profile.php';
-		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/class-reader-activation-emails.php';
-		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/class-reader-activation.php';
-		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/class-reader-data.php';
-		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/class-esp-sync.php';
-		include_once NEWSPACK_ABSPATH . 'includes/reader-activation/class-esp-sync-admin.php';
 		include_once NEWSPACK_ABSPATH . 'includes/class-recaptcha.php';
 		include_once NEWSPACK_ABSPATH . 'includes/class-magic-link.php';
 		include_once NEWSPACK_ABSPATH . 'includes/reader-revenue/stripe/class-stripe-connection.php';
@@ -154,7 +155,6 @@ private function includes() {
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-jetpack.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-gravityforms.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/google-site-kit/class-googlesitekit.php';
-		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-newspack-newsletters.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-mailchimp-for-woocommerce.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-onesignal.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-organic-profile-block.php';

includes/class-plugin-manager.php

@@ -314,14 +314,6 @@ public static function get_managed_plugins() {
 				'Download'    => 'wporg',
 				'EditPath'    => 'options-general.php?page=adstxt-settings',
 			],
-			'publisher-media-kit'         => [
-				'Name'        => \esc_html__( 'Publisher Media Kit', 'newspack' ),
-				'Description' => \esc_html__( 'Quick and easy option for small to medium sized publishers to digitize their media kit.', 'newspack' ),
-				'Author'      => \esc_html__( '10up', 'newspack' ),
-				'AuthorURI'   => \esc_url( 'https://10up.com' ),
-				'PluginURI'   => \esc_url( 'https://wordpress.org/plugins/publisher-media-kit/' ),
-				'Download'    => 'wporg',
-			],
 			'broadstreet'                 => [
 				'Name'        => \esc_html__( 'Broadstreet', 'newspack' ),
 				'Description' => \esc_html__( 'Integrate Broadstreet’s business directory and ad-serving features into your site.', 'newspack' ),

includes/configuration_managers/class-newspack-ads-configuration-manager.php

@@ -190,6 +190,61 @@ public function is_service_enabled( $service ) {
 		return get_option( Advertising_Wizard::NEWSPACK_ADVERTISING_SERVICE_PREFIX . $service, false );
 	}
 
+	/**
+	 * Get Media Kit page ID.
+	 */
+	public static function get_media_kit_page_id() {
+		$page_id = false;
+		try {
+			$page_id = \Newspack_Ads\Media_Kit::get_existing_page_id();
+		} catch ( \Throwable $th ) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedCatch
+			// Do nothing.
+		}
+		return $page_id;
+	}
+
+	/**
+	 * Get Media Kit page.
+	 */
+	public function get_media_kit_page_edit_url() {
+		$raw_url = get_edit_post_link( $this->get_media_kit_page_id(), '' );
+		if ( ! $raw_url ) {
+			return false;
+		}
+		$parsed_url = wp_parse_url( $raw_url );
+		return $parsed_url['path'] . '?' . $parsed_url['query'];
+	}
+
+	/**
+	 * Get Media Kit page status.
+	 */
+	public function get_media_kit_page_status() {
+		if ( method_exists( '\Newspack_Ads\Media_Kit', 'get_page_status' ) ) {
+			return \Newspack_Ads\Media_Kit::get_page_status();
+		}
+		return false;
+	}
+
+	/**
+	 * Create the Media Kit page.
+	 */
+	public function create_media_kit_page() {
+		if ( method_exists( '\Newspack_Ads\Media_Kit', 'create_media_kit_page' ) ) {
+			return \Newspack_Ads\Media_Kit::create_media_kit_page();
+		}
+		return false;
+	}
+
+	/**
+	 * Unpublish the Media Kit page.
+	 */
+	public function unpublish_media_kit_page() {
+		if ( method_exists( '\Newspack_Ads\Media_Kit', 'create_media_kit_page' ) ) {
+			return \Newspack_Ads\Media_Kit::create_media_kit_page();
+		}
+		return false;
+	}
+
 	/**
 	 * Configure Newspack Ads for Newspack use.
 	 *