Various: Fix PHP 8.1 warnings/errors (#35551)

kraftbj · anomiex · web-flow · commit 0dc7e0416561 · 2024-02-09T20:18:23.000Z
* Fix various PHP 8.1 warnings/errors

---------

Co-authored-by: Brad Jorsch &lt;anomiex@users.noreply.github.com&gt;
diff --git a/projects/packages/videopress/changelog/update-various-php81-issues b/projects/packages/videopress/changelog/update-various-php81-issues
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fixed various PHP warnings in PHP 8.1+
diff --git a/projects/packages/videopress/package.json b/projects/packages/videopress/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-videopress",
-	"version": "0.23.0",
+	"version": "0.23.1-alpha",
 	"description": "VideoPress package",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/videopress/#readme",
 	"bugs": {
diff --git a/projects/packages/videopress/src/class-package-version.php b/projects/packages/videopress/src/class-package-version.php
@@ -11,7 +11,7 @@
  * The Package_Version class.
  */
 class Package_Version {
-	const PACKAGE_VERSION = '0.23.0';
+	const PACKAGE_VERSION = '0.23.1-alpha';
 
 	const PACKAGE_SLUG = 'videopress';
 
diff --git a/projects/packages/videopress/src/class-wpcom-rest-api-v2-attachment-field-videopress.php b/projects/packages/videopress/src/class-wpcom-rest-api-v2-attachment-field-videopress.php
@@ -125,7 +125,7 @@ public function get( $attachment, $request ) { // phpcs:ignore VariableAnalysis.
 	 * @return string
 	 */
 	public function get_videopress_guid( $attachment_id, $blog_id ) {
-		return video_get_info_by_blogpostid( $blog_id, $attachment_id )->guid;
+		return video_get_info_by_blogpostid( $blog_id, $attachment_id )->guid ?? '';
 	}
 
 	/**
diff --git a/projects/packages/videopress/src/class-wpcom-rest-api-v2-attachment-videopress-data.php b/projects/packages/videopress/src/class-wpcom-rest-api-v2-attachment-videopress-data.php
@@ -202,7 +202,7 @@ public function get( $attachment, $request ) { // phpcs:ignore VariableAnalysis.
 	 * @param int $attachment_id Attachment ID.
 	 * @param int $blog_id Blog ID.
 	 *
-	 * @return string
+	 * @return array
 	 */
 	public function get_videopress_data( $attachment_id, $blog_id ) {
 		$info = video_get_info_by_blogpostid( $blog_id, $attachment_id );
@@ -233,8 +233,8 @@ public function get_videopress_data( $attachment_id, $blog_id ) {
 			'title'                    => $title,
 			'description'              => $description,
 			'caption'                  => $caption,
-			'guid'                     => $info->guid,
-			'rating'                   => $info->rating,
+			'guid'                     => $info->guid ?? null,
+			'rating'                   => $info->rating ?? null,
 			'allow_download'           =>
 				isset( $info->allow_download ) && $info->allow_download ? 1 : 0,
 			'display_embed'            =>
diff --git a/projects/plugins/jetpack/_inc/lib/class.media-summary.php b/projects/plugins/jetpack/_inc/lib/class.media-summary.php
@@ -146,6 +146,9 @@ public static function get( $post_id, $blog_id = 0, $args = array() ) {
 						break;
 					case 'youtube':
 						if ( 0 === $return['count']['video'] ) {
+							if ( ! isset( $extract['shortcode']['youtube']['id'][0] ) ) {
+								break;
+							}
 							$return['type']            = 'video';
 							$return['video']           = esc_url_raw( 'http://www.youtube.com/watch?feature=player_embedded&v=' . $extract['shortcode']['youtube']['id'][0] );
 							$return['image']           = self::get_video_poster( 'youtube', $extract['shortcode']['youtube']['id'][0] );
diff --git a/projects/plugins/jetpack/changelog/update-various-php81-issues b/projects/plugins/jetpack/changelog/update-various-php81-issues
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Fixed various PHP warnings for PHP 8.1+
diff --git a/projects/plugins/jetpack/class.json-api-endpoints.php b/projects/plugins/jetpack/class.json-api-endpoints.php
@@ -1297,18 +1297,18 @@ public function user_can_view_post( $post_id ) {
 
 		if ( 'inherit' === $post->post_status ) {
 			$parent_post     = get_post( $post->post_parent );
-			$post_status_obj = get_post_status_object( $parent_post->post_status );
+			$post_status_obj = get_post_status_object( $parent_post->post_status ?? $post->post_status );
 		} else {
 			$post_status_obj = get_post_status_object( $post->post_status );
 		}
 
-		if ( ! $post_status_obj->public ) {
+		if ( empty( $post_status_obj->public ) ) {
 			if ( is_user_logged_in() ) {
-				if ( $post_status_obj->protected ) {
+				if ( ! empty( $post_status_obj->protected ) ) {
 					if ( ! current_user_can( 'edit_post', $post->ID ) ) {
 						return new WP_Error( 'unauthorized', 'User cannot view post', 403 );
 					}
-				} elseif ( $post_status_obj->private ) {
+				} elseif ( ! empty( $post_status_obj->private ) ) {
 					if ( ! current_user_can( 'read_post', $post->ID ) ) {
 						return new WP_Error( 'unauthorized', 'User cannot view post', 403 );
 					}
diff --git a/projects/plugins/jetpack/class.json-api.php b/projects/plugins/jetpack/class.json-api.php
@@ -313,7 +313,7 @@ public function setup_inputs( $method = null, $url = null, $post_body = null ) {
 					$this->content_type = filter_var( wp_unslash( $_SERVER['HTTP_CONTENT_TYPE'] ) );
 				} elseif ( ! empty( $_SERVER['CONTENT_TYPE'] ) ) {
 					$this->content_type = filter_var( wp_unslash( $_SERVER['CONTENT_TYPE'] ) );
-				} elseif ( '{' === $this->post_body[0] ) {
+				} elseif ( isset( $this->post_body[0] ) && '{' === $this->post_body[0] ) {
 					$this->content_type = 'application/json';
 				} else {
 					$this->content_type = 'application/x-www-form-urlencoded';
@@ -424,9 +424,10 @@ public function serve( $exit = true ) {
 
 		// Normalize path and extract API version.
 		$this->path = untrailingslashit( $this->path );
-		preg_match( '#^/rest/v(\d+(\.\d+)*)#', $this->path, $matches );
-		$this->path    = substr( $this->path, strlen( $matches[0] ) );
-		$this->version = $matches[1];
+		if ( preg_match( '#^/rest/v(\d+(\.\d+)*)#', $this->path, $matches ) ) {
+			$this->path    = substr( $this->path, strlen( $matches[0] ) );
+			$this->version = $matches[1];
+		}
 
 		$allowed_methods = array( 'GET', 'POST' );
 		$four_oh_five    = false;
@@ -741,7 +742,7 @@ public static function serializable_error( $error ) {
 
 		$status_code = $error->get_error_data();
 
-		if ( is_array( $status_code ) ) {
+		if ( is_array( $status_code ) && isset( $status_code['status_code'] ) ) {
 			$status_code = $status_code['status_code'];
 		}
 
diff --git a/projects/plugins/jetpack/modules/masterbar/admin-menu/class-wpcom-admin-menu.php b/projects/plugins/jetpack/modules/masterbar/admin-menu/class-wpcom-admin-menu.php
@@ -245,10 +245,10 @@ public function get_upsell_nudge() {
 				'content'                      => $message->content['message'],
 				'cta'                          => $message->CTA['message'], // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 				'link'                         => $message->CTA['link'], // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-				'tracks_impression_event_name' => $message->tracks['display']['name'],
-				'tracks_impression_cta_name'   => $message->tracks['display']['props']['cta_name'],
-				'tracks_click_event_name'      => $message->tracks['click']['name'],
-				'tracks_click_cta_name'        => $message->tracks['click']['props']['cta_name'],
+				'tracks_impression_event_name' => $message->tracks['display']['name'] ?? null,
+				'tracks_impression_cta_name'   => $message->tracks['display']['props']['cta_name'] ?? null,
+				'tracks_click_event_name'      => $message->tracks['click']['name'] ?? null,
+				'tracks_click_cta_name'        => $message->tracks['click']['props']['cta_name'] ?? null,
 				'dismissible'                  => $message->is_dismissible,
 				'feature_class'                => $message->feature_class,
 				'id'                           => $message->id,
diff --git a/projects/plugins/jetpack/sal/class.json-api-token.php b/projects/plugins/jetpack/sal/class.json-api-token.php
@@ -115,14 +115,15 @@ public static function for_anonymous_user() {
 	 */
 	public static function from_rest_token( $token ) {
 		$user_id            = isset( $token['user_id'] ) ? $token['user_id'] : get_current_user_id();
-		$scope              = isset( $token['scope'] ) ? $token['scope'][0] : null;
+		$scope              = isset( $token['scope'][0] ) ? $token['scope'][0] : null;
 		$client_id          = isset( $token['client_id'] ) ? $token['client_id'] : null;
 		$external_user_id   = isset( $token['external_user_id'] ) ? $token['external_user_id'] : null;
 		$external_user_code = isset( $token['external_user_code'] ) ? $token['external_user_code'] : null;
 		$auth               = isset( $token['auth'] ) ? $token['auth'] : null;
+		$blog_id            = isset( $token['blog_id'] ) ? $token['blog_id'] : null;
 
 		return new SAL_Token(
-			$token['blog_id'],
+			$blog_id,
 			$user_id,
 			$scope, // there's only ever one scope in our current API implementation, auth or global.
 			$client_id,

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"private": true,`
`3`	`3`	`"name": "@automattic/jetpack-videopress",`
`4`		`- "version": "0.23.0",`
	`4`	`+ "version": "0.23.1-alpha",`
`5`	`5`	`"description": "VideoPress package",`
`6`	`6`	`"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/videopress/#readme",`
`7`	`7`	`"bugs": {`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public function get( $attachment, $request ) { // phpcs:ignore VariableAnalysis.`
`125`	`125`	`* @return string`
`126`	`126`	`*/`
`127`	`127`	`public function get_videopress_guid( $attachment_id, $blog_id ) {`
`128`		`- return video_get_info_by_blogpostid( $blog_id, $attachment_id )->guid;`
	`128`	`+ return video_get_info_by_blogpostid( $blog_id, $attachment_id )->guid ?? '';`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`/**`