Changeset 13900 for trunk/src/bp-core/classes/class-bp-embed.php

Timestamp:

06/02/2024 07:12:25 PM (2 years ago)

Author:

espellcaste

Message:

WPCS: Part VIII: miscellaneous fixes for some of the files of the core component.

Follow-up to [13883], [13886], [13887], [13888], [13891], [13892], [13893]

See #9164 and #7228

File:

• trunk/src/bp-core/classes/class-bp-embed.php (modified) (10 diffs)

trunk/src/bp-core/classes/class-bp-embed.php

@@ -71 +71 @@
          * for oEmbed parsing.
          *
-         *
          * @param array  $attr Shortcode attributes.
          * @param string $url  The URL attempting to be embeded.
@@ -77 +76 @@
          */
         public function shortcode( $attr, $url = '' ) {
-                if ( empty( $url ) )
+                if ( empty( $url ) ) {
                         return '';
+                }
 
                 $rawattr = $attr;
@@ -95 +95 @@
                         foreach ( $handlers as $hid => $handler ) {
                                 if ( preg_match( $handler['regex'], $url, $matches ) && is_callable( $handler['callback'] ) ) {
-                                        if ( false !== $return = call_user_func( $handler['callback'], $matches, $attr, $url, $rawattr ) ) {
+                                        $return = call_user_func( $handler['callback'], $matches, $attr, $url, $rawattr );
+                                        if ( false !== $return ) {
 
                                                 /**
@@ -102 +103 @@
                                                  * @since 1.5.0
                                                  *
-                                                 * @param string $return Handler callback for the oEmbed.
+                                                 * @param mixed  $return Handler callback for the oEmbed.
                                                  * @param string $url    URL attempting to be embedded.
                                                  * @param array  $attr   Shortcode attributes.
@@ -117 +118 @@
                  * @since 1.5.0
                  *
-                 * @param int $value Value of zero.
+                 * @param int $embed_post_id Embed object id. Default is 0.
                  */
                 $id = apply_filters( 'embed_post_id', 0 );
@@ -138 +139 @@
                 // Set up a new WP oEmbed object to check URL with registered oEmbed providers.
                 if ( file_exists( ABSPATH . WPINC . '/class-wp-oembed.php' ) ) {
-                        require_once( ABSPATH . WPINC . '/class-wp-oembed.php' );
+                        require_once ABSPATH . WPINC . '/class-wp-oembed.php';
                 } else {
                         // class-oembed.php is deprecated in WordPress 5.3.0.
-                        require_once( ABSPATH . WPINC . '/class-oembed.php' );
+                        require_once ABSPATH . WPINC . '/class-oembed.php';
                 }
 
@@ -148 +149 @@
                 // If oEmbed discovery is true, skip oEmbed provider check.
                 $is_oembed_link = false;
-                if ( !$attr['discover'] ) {
+                if ( ! $attr['discover'] ) {
                         foreach ( (array) $oembed_obj->providers as $provider_matchmask => $provider ) {
-                                $regex = ( $is_regex = $provider[1] ) ? $provider_matchmask : '#' . str_replace( '___wildcard___', '(.+)', preg_quote( str_replace( '*', '___wildcard___', $provider_matchmask ), '#' ) ) . '#i';
-
-                                if ( preg_match( $regex, $url ) )
+                                $regex = ( $provider[1] ) ? $provider_matchmask : '#' . str_replace( '___wildcard___', '(.+)', preg_quote( str_replace( '*', '___wildcard___', $provider_matchmask ), '#' ) ) . '#i';
+
+                                if ( preg_match( $regex, $url ) ) {
                                         $is_oembed_link = true;
+                                }
                         }
 
                         // If url doesn't match a WP oEmbed provider, stop parsing.
-                        if ( !$is_oembed_link )
+                        if ( ! $is_oembed_link ) {
                                 return $this->maybe_make_link( $url );
+                        }
                 }
 
@@ -183 +186 @@
 
                 if ( $id ) {
-                        // Setup the cachekey.
+                        // Setup the cache key.
                         $cachekey = '_oembed_' . md5( $url . serialize( $attr ) );
 
@@ -204 +207 @@
 
                         // Grab cache and return it if available.
-                        if ( !empty( $cache ) ) {
+                        if ( ! empty( $cache ) ) {
 
                                 /**
@@ -218 +221 @@
                                 return apply_filters( 'bp_embed_oembed_html', $cache, $url, $attr, $rawattr );
 
-                        // If no cache, ping the oEmbed provider and cache the result.
+                                // If no cache, ping the oEmbed provider and cache the result.
                         } else {
-                                $html = wp_oembed_get( $url, $attr );
+                                $html  = wp_oembed_get( $url, $attr );
                                 $cache = ( $html ) ? $html : $url;