insideout10 / wordlift-plugin

src/wordlift/videoobject/class-video-processor.php

Indentation +206 added lines, -206 removed lines

@@ -14,211 +14,211 @@
 
 class Video_Processor {
 
-	/**
-	 * @var array<Client>
-	 */
-	private $api_clients;
-
-	public function __construct() {
-		$this->api_clients = array(
-			Client_Factory::get_client( Client_Factory::YOUTUBE ),
-			Client_Factory::get_client( Client_Factory::VIMEO )
-		);
-	}
-
-	private function get_data_for_videos( $embedded_videos ) {
-
-		$youtube_videos = $this->get_youtube_videos( $embedded_videos );
-
-		$youtube_provider = Provider_Factory::get_provider( Provider_Factory::YOUTUBE );
-		$youtube_videos   = $youtube_provider->get_videos_data( $youtube_videos );
-
-		$vimeo_videos = $this->get_vimeo_videos( $embedded_videos );
-
-		$vimeo_provider = Provider_Factory::get_provider( Provider_Factory::VIMEO );
-		$vimeo_videos   = $vimeo_provider->get_videos_data( $vimeo_videos );
-
-		return array_merge( $youtube_videos, $vimeo_videos );
-
-	}
-
-
-	private function get_video_ids( $video_urls ) {
-		$clients   = $this->api_clients;
-		$video_ids = array();
-		foreach ( $clients as $client ) {
-			$ids = $client->get_video_ids( $video_urls );
-			if ( $ids ) {
-				$video_ids = array_merge( $video_ids, $ids );
-			}
-		}
-
-		return array_unique( $video_ids );
-	}
-
-
-	/**
-	 * @param $storage Storage
-	 * @param $post_id int
-	 * @param $embedded_videos array<Embedded_Video>
-	 */
-	private function remove_videos_from_store_if_not_present_in_content( $storage, $post_id, $embedded_videos ) {
-
-		$videos_to_be_deleted = $this->get_videos_to_be_deleted( $storage, $post_id, $embedded_videos );
-		$storage->remove_videos( $videos_to_be_deleted, $post_id );
-
-	}
-
-	/**
-	 * @param Storage $storage
-	 * @param $post_id
-	 * @param array $embedded_videos
-	 *
-	 * @return array An array of videos which exist on storage, not on post content.
-	 */
-	private function get_videos_to_be_deleted( Storage $storage, $post_id, array $embedded_videos ) {
-		$videos_in_store     = $storage->get_all_videos( $post_id );
-		$embedded_video_urls = array_map( function ( $embedded_video ) {
-			/**
-			 * @var $embedded_video Embedded_Video
-			 */
-			return $embedded_video->get_url();
-		}, $embedded_videos );
-
-		/**
-		 * Previously we are checking if the captured url is content_url to delete it from the storage
-		 * but this might not work well if we want to support multiple URL formats, we extract the video
-		 * ids for embedded URLs.
-		 */
-		$embedded_video_ids = $this->get_video_ids( $embedded_video_urls );
-
-		$that = $this;
-
-		return array_filter( $videos_in_store, function ( $video ) use ( $embedded_video_ids, $embedded_video_urls, $that ) {
-			/**
-			 * If the video id doesnt exist on the content then we need to return it
-			 * in order to delete that video.
-			 */
-			return count( array_intersect(
-					$that->get_video_ids( array( $video->id ) ),
-					$embedded_video_ids
-				) ) === 0;
-
-		} );
-	}
-
-	/**
-	 * @param \WP_Post $post
-	 * @param $post_id
-	 */
-	public function process_video_urls( \WP_Post $post, $post_id ) {
-
-		$parser = Parser_Factory::get_parser_from_content( $post->post_content );
-
-		$embedded_videos = $parser->get_videos( $post_id );
-
-		/**
-		 * Filters the embedded videos on post contet, custom plugins can add their video urls
-		 * by constructing \Default_Embedded_Video or implement Embedded_Video class
-		 *
-		 * @param $embedded_videos array<Embedded_Video>
-		 * @param $post_id int The post id for the videoobject is processed.
-		 *
-		 * @return array<Embedded_Video>
-		 * @since 3.31.4
-		 * Filter name : wl_videoobject_embedded_videos
-		 */
-		$embedded_videos = apply_filters( 'wl_videoobject_embedded_videos', $embedded_videos, $post_id );
-
-		$storage = Video_Storage_Factory::get_storage();
-
-		// Before sending api requests we need to check if there are any videos in
-		// store which is not present on post content, remove them if there are
-		// any
-		$this->remove_videos_from_store_if_not_present_in_content( $storage, $post_id, $embedded_videos );
-
-		$embedded_videos = $this->get_videos_without_existing_data( $storage, $post_id, $embedded_videos );
-
-		// Return early after removing all the videos.
-		if ( ! $embedded_videos ) {
-			return;
-		}
-
-		$videos = $this->get_data_for_videos( $embedded_videos );
-
-		if ( ! $videos ) {
-			return;
-		}
-
-		foreach ( $videos as $video ) {
-			$storage->add_video( $post_id, $video );
-		}
-	}
-
-	/**
-	 * @param $storage Storage
-	 * @param $post_id int
-	 * @param $embedded_videos array<Embedded_Video>
-	 *
-	 * @return array<Embedded_Video> Return array of embedded videos which are not in store.
-	 */
-	private function get_videos_without_existing_data( $storage, $post_id, $embedded_videos ) {
-		$videos_in_store    = $storage->get_all_videos( $post_id );
-		$video_urls_in_store = array_map( function ( $video ) {
-			return $video->id;
-		}, $videos_in_store );
-
-		$video_ids_in_store = $this->get_video_ids( $video_urls_in_store );
-
-		$that = $this;
-
-		return array_filter( $embedded_videos, function ( $embedded_video ) use ( $video_ids_in_store, $that ) {
-			/**
-			 * If the video id exist on content, not on storage then
-			 * we need to fetch the data.
-			 */
-			return count( array_intersect(
-					$that->get_video_ids( array(  $embedded_video->get_url() ) ),
-					$video_ids_in_store
-				) ) === 0;
-		} );
-	}
-
-	/**
-	 * @param $embedded_videos
-	 *
-	 * @return array
-	 */
-	private function get_youtube_videos( $embedded_videos ) {
-		return array_filter( $embedded_videos, function ( $embedded_video ) {
-			/**
-			 * it should have youtube.com or youtu.be in the url
-			 *
-			 * @param $embedded_video Embedded_Video
-			 */
-			$video_url = $embedded_video->get_url();
-
-			return strpos( $video_url, "youtube.com" ) !== false ||
-			       strpos( $video_url, "youtu.be" ) !== false;
-		} );
-	}
-
-	/**
-	 * @param $embedded_videos
-	 *
-	 * @return array
-	 */
-	private function get_vimeo_videos( $embedded_videos ) {
-		return array_filter( $embedded_videos, function ( $embedded_video ) {
-			/**
-			 * it should have vimeo.com in the url
-			 *
-			 * @param $embedded_video Embedded_Video
-			 */
-			$video_url = $embedded_video->get_url();
-
-			return strpos( $video_url, "vimeo.com" ) !== false;
-		} );
-	}
+    /**
+     * @var array<Client>
+     */
+    private $api_clients;
+
+    public function __construct() {
+        $this->api_clients = array(
+            Client_Factory::get_client( Client_Factory::YOUTUBE ),
+            Client_Factory::get_client( Client_Factory::VIMEO )
+        );
+    }
+
+    private function get_data_for_videos( $embedded_videos ) {
+
+        $youtube_videos = $this->get_youtube_videos( $embedded_videos );
+
+        $youtube_provider = Provider_Factory::get_provider( Provider_Factory::YOUTUBE );
+        $youtube_videos   = $youtube_provider->get_videos_data( $youtube_videos );
+
+        $vimeo_videos = $this->get_vimeo_videos( $embedded_videos );
+
+        $vimeo_provider = Provider_Factory::get_provider( Provider_Factory::VIMEO );
+        $vimeo_videos   = $vimeo_provider->get_videos_data( $vimeo_videos );
+
+        return array_merge( $youtube_videos, $vimeo_videos );
+
+    }
+
+
+    private function get_video_ids( $video_urls ) {
+        $clients   = $this->api_clients;
+        $video_ids = array();
+        foreach ( $clients as $client ) {
+            $ids = $client->get_video_ids( $video_urls );
+            if ( $ids ) {
+                $video_ids = array_merge( $video_ids, $ids );
+            }
+        }
+
+        return array_unique( $video_ids );
+    }
+
+
+    /**
+     * @param $storage Storage
+     * @param $post_id int
+     * @param $embedded_videos array<Embedded_Video>
+     */
+    private function remove_videos_from_store_if_not_present_in_content( $storage, $post_id, $embedded_videos ) {
+
+        $videos_to_be_deleted = $this->get_videos_to_be_deleted( $storage, $post_id, $embedded_videos );
+        $storage->remove_videos( $videos_to_be_deleted, $post_id );
+
+    }
+
+    /**
+     * @param Storage $storage
+     * @param $post_id
+     * @param array $embedded_videos
+     *
+     * @return array An array of videos which exist on storage, not on post content.
+     */
+    private function get_videos_to_be_deleted( Storage $storage, $post_id, array $embedded_videos ) {
+        $videos_in_store     = $storage->get_all_videos( $post_id );
+        $embedded_video_urls = array_map( function ( $embedded_video ) {
+            /**
+             * @var $embedded_video Embedded_Video
+             */
+            return $embedded_video->get_url();
+        }, $embedded_videos );
+
+        /**
+         * Previously we are checking if the captured url is content_url to delete it from the storage
+         * but this might not work well if we want to support multiple URL formats, we extract the video
+         * ids for embedded URLs.
+         */
+        $embedded_video_ids = $this->get_video_ids( $embedded_video_urls );
+
+        $that = $this;
+
+        return array_filter( $videos_in_store, function ( $video ) use ( $embedded_video_ids, $embedded_video_urls, $that ) {
+            /**
+             * If the video id doesnt exist on the content then we need to return it
+             * in order to delete that video.
+             */
+            return count( array_intersect(
+                    $that->get_video_ids( array( $video->id ) ),
+                    $embedded_video_ids
+                ) ) === 0;
+
+        } );
+    }
+
+    /**
+     * @param \WP_Post $post
+     * @param $post_id
+     */
+    public function process_video_urls( \WP_Post $post, $post_id ) {
+
+        $parser = Parser_Factory::get_parser_from_content( $post->post_content );
+
+        $embedded_videos = $parser->get_videos( $post_id );
+
+        /**
+         * Filters the embedded videos on post contet, custom plugins can add their video urls
+         * by constructing \Default_Embedded_Video or implement Embedded_Video class
+         *
+         * @param $embedded_videos array<Embedded_Video>
+         * @param $post_id int The post id for the videoobject is processed.
+         *
+         * @return array<Embedded_Video>
+         * @since 3.31.4
+         * Filter name : wl_videoobject_embedded_videos
+         */
+        $embedded_videos = apply_filters( 'wl_videoobject_embedded_videos', $embedded_videos, $post_id );
+
+        $storage = Video_Storage_Factory::get_storage();
+
+        // Before sending api requests we need to check if there are any videos in
+        // store which is not present on post content, remove them if there are
+        // any
+        $this->remove_videos_from_store_if_not_present_in_content( $storage, $post_id, $embedded_videos );
+
+        $embedded_videos = $this->get_videos_without_existing_data( $storage, $post_id, $embedded_videos );
+
+        // Return early after removing all the videos.
+        if ( ! $embedded_videos ) {
+            return;
+        }
+
+        $videos = $this->get_data_for_videos( $embedded_videos );
+
+        if ( ! $videos ) {
+            return;
+        }
+
+        foreach ( $videos as $video ) {
+            $storage->add_video( $post_id, $video );
+        }
+    }
+
+    /**
+     * @param $storage Storage
+     * @param $post_id int
+     * @param $embedded_videos array<Embedded_Video>
+     *
+     * @return array<Embedded_Video> Return array of embedded videos which are not in store.
+     */
+    private function get_videos_without_existing_data( $storage, $post_id, $embedded_videos ) {
+        $videos_in_store    = $storage->get_all_videos( $post_id );
+        $video_urls_in_store = array_map( function ( $video ) {
+            return $video->id;
+        }, $videos_in_store );
+
+        $video_ids_in_store = $this->get_video_ids( $video_urls_in_store );
+
+        $that = $this;
+
+        return array_filter( $embedded_videos, function ( $embedded_video ) use ( $video_ids_in_store, $that ) {
+            /**
+             * If the video id exist on content, not on storage then
+             * we need to fetch the data.
+             */
+            return count( array_intersect(
+                    $that->get_video_ids( array(  $embedded_video->get_url() ) ),
+                    $video_ids_in_store
+                ) ) === 0;
+        } );
+    }
+
+    /**
+     * @param $embedded_videos
+     *
+     * @return array
+     */
+    private function get_youtube_videos( $embedded_videos ) {
+        return array_filter( $embedded_videos, function ( $embedded_video ) {
+            /**
+             * it should have youtube.com or youtu.be in the url
+             *
+             * @param $embedded_video Embedded_Video
+             */
+            $video_url = $embedded_video->get_url();
+
+            return strpos( $video_url, "youtube.com" ) !== false ||
+                   strpos( $video_url, "youtu.be" ) !== false;
+        } );
+    }
+
+    /**
+     * @param $embedded_videos
+     *
+     * @return array
+     */
+    private function get_vimeo_videos( $embedded_videos ) {
+        return array_filter( $embedded_videos, function ( $embedded_video ) {
+            /**
+             * it should have vimeo.com in the url
+             *
+             * @param $embedded_video Embedded_Video
+             */
+            $video_url = $embedded_video->get_url();
+
+            return strpos( $video_url, "vimeo.com" ) !== false;
+        } );
+    }
 
 }
\ No newline at end of file

Spacing +55 added lines, -55 removed lines

@@ -21,39 +21,39 @@ 
 
 	public function __construct() {
 		$this->api_clients = array(
-			Client_Factory::get_client( Client_Factory::YOUTUBE ),
-			Client_Factory::get_client( Client_Factory::VIMEO )
+			Client_Factory::get_client(Client_Factory::YOUTUBE),
+			Client_Factory::get_client(Client_Factory::VIMEO)
 		);
 	}
 
-	private function get_data_for_videos( $embedded_videos ) {
+	private function get_data_for_videos($embedded_videos) {
 
-		$youtube_videos = $this->get_youtube_videos( $embedded_videos );
+		$youtube_videos = $this->get_youtube_videos($embedded_videos);
 
-		$youtube_provider = Provider_Factory::get_provider( Provider_Factory::YOUTUBE );
-		$youtube_videos   = $youtube_provider->get_videos_data( $youtube_videos );
+		$youtube_provider = Provider_Factory::get_provider(Provider_Factory::YOUTUBE);
+		$youtube_videos   = $youtube_provider->get_videos_data($youtube_videos);
 
-		$vimeo_videos = $this->get_vimeo_videos( $embedded_videos );
+		$vimeo_videos = $this->get_vimeo_videos($embedded_videos);
 
-		$vimeo_provider = Provider_Factory::get_provider( Provider_Factory::VIMEO );
-		$vimeo_videos   = $vimeo_provider->get_videos_data( $vimeo_videos );
+		$vimeo_provider = Provider_Factory::get_provider(Provider_Factory::VIMEO);
+		$vimeo_videos   = $vimeo_provider->get_videos_data($vimeo_videos);
 
-		return array_merge( $youtube_videos, $vimeo_videos );
+		return array_merge($youtube_videos, $vimeo_videos);
 
 	}
 
 
-	private function get_video_ids( $video_urls ) {
+	private function get_video_ids($video_urls) {
 		$clients   = $this->api_clients;
 		$video_ids = array();
-		foreach ( $clients as $client ) {
-			$ids = $client->get_video_ids( $video_urls );
-			if ( $ids ) {
-				$video_ids = array_merge( $video_ids, $ids );
+		foreach ($clients as $client) {
+			$ids = $client->get_video_ids($video_urls);
+			if ($ids) {
+				$video_ids = array_merge($video_ids, $ids);
 			}
 		}
 
-		return array_unique( $video_ids );
+		return array_unique($video_ids);
 	}
 
 
@@ -62,10 +62,10 @@ 
 	 * @param $post_id int
 	 * @param $embedded_videos array<Embedded_Video>
 	 */
-	private function remove_videos_from_store_if_not_present_in_content( $storage, $post_id, $embedded_videos ) {
+	private function remove_videos_from_store_if_not_present_in_content($storage, $post_id, $embedded_videos) {
 
-		$videos_to_be_deleted = $this->get_videos_to_be_deleted( $storage, $post_id, $embedded_videos );
-		$storage->remove_videos( $videos_to_be_deleted, $post_id );
+		$videos_to_be_deleted = $this->get_videos_to_be_deleted($storage, $post_id, $embedded_videos);
+		$storage->remove_videos($videos_to_be_deleted, $post_id);
 
 	}
 
@@ -76,33 +76,33 @@ 
 	 *
 	 * @return array An array of videos which exist on storage, not on post content.
 	 */
-	private function get_videos_to_be_deleted( Storage $storage, $post_id, array $embedded_videos ) {
-		$videos_in_store     = $storage->get_all_videos( $post_id );
-		$embedded_video_urls = array_map( function ( $embedded_video ) {
+	private function get_videos_to_be_deleted(Storage $storage, $post_id, array $embedded_videos) {
+		$videos_in_store     = $storage->get_all_videos($post_id);
+		$embedded_video_urls = array_map(function($embedded_video) {
 			/**
 			 * @var $embedded_video Embedded_Video
 			 */
 			return $embedded_video->get_url();
-		}, $embedded_videos );
+		}, $embedded_videos);
 
 		/**
 		 * Previously we are checking if the captured url is content_url to delete it from the storage
 		 * but this might not work well if we want to support multiple URL formats, we extract the video
 		 * ids for embedded URLs.
 		 */
-		$embedded_video_ids = $this->get_video_ids( $embedded_video_urls );
+		$embedded_video_ids = $this->get_video_ids($embedded_video_urls);
 
 		$that = $this;
 
-		return array_filter( $videos_in_store, function ( $video ) use ( $embedded_video_ids, $embedded_video_urls, $that ) {
+		return array_filter($videos_in_store, function($video) use ($embedded_video_ids, $embedded_video_urls, $that) {
 			/**
 			 * If the video id doesnt exist on the content then we need to return it
 			 * in order to delete that video.
 			 */
-			return count( array_intersect(
-					$that->get_video_ids( array( $video->id ) ),
+			return count(array_intersect(
+					$that->get_video_ids(array($video->id)),
 					$embedded_video_ids
-				) ) === 0;
+				)) === 0;
 
 		} );
 	}
@@ -111,11 +111,11 @@ 
 	 * @param \WP_Post $post
 	 * @param $post_id
 	 */
-	public function process_video_urls( \WP_Post $post, $post_id ) {
+	public function process_video_urls(\WP_Post $post, $post_id) {
 
-		$parser = Parser_Factory::get_parser_from_content( $post->post_content );
+		$parser = Parser_Factory::get_parser_from_content($post->post_content);
 
-		$embedded_videos = $parser->get_videos( $post_id );
+		$embedded_videos = $parser->get_videos($post_id);
 
 		/**
 		 * Filters the embedded videos on post contet, custom plugins can add their video urls
@@ -128,30 +128,30 @@ 
 		 * @since 3.31.4
 		 * Filter name : wl_videoobject_embedded_videos
 		 */
-		$embedded_videos = apply_filters( 'wl_videoobject_embedded_videos', $embedded_videos, $post_id );
+		$embedded_videos = apply_filters('wl_videoobject_embedded_videos', $embedded_videos, $post_id);
 
 		$storage = Video_Storage_Factory::get_storage();
 
 		// Before sending api requests we need to check if there are any videos in
 		// store which is not present on post content, remove them if there are
 		// any
-		$this->remove_videos_from_store_if_not_present_in_content( $storage, $post_id, $embedded_videos );
+		$this->remove_videos_from_store_if_not_present_in_content($storage, $post_id, $embedded_videos);
 
-		$embedded_videos = $this->get_videos_without_existing_data( $storage, $post_id, $embedded_videos );
+		$embedded_videos = $this->get_videos_without_existing_data($storage, $post_id, $embedded_videos);
 
 		// Return early after removing all the videos.
-		if ( ! $embedded_videos ) {
+		if ( ! $embedded_videos) {
 			return;
 		}
 
-		$videos = $this->get_data_for_videos( $embedded_videos );
+		$videos = $this->get_data_for_videos($embedded_videos);
 
-		if ( ! $videos ) {
+		if ( ! $videos) {
 			return;
 		}
 
-		foreach ( $videos as $video ) {
-			$storage->add_video( $post_id, $video );
+		foreach ($videos as $video) {
+			$storage->add_video($post_id, $video);
 		}
 	}
 
@@ -162,25 +162,25 @@ 
 	 *
 	 * @return array<Embedded_Video> Return array of embedded videos which are not in store.
 	 */
-	private function get_videos_without_existing_data( $storage, $post_id, $embedded_videos ) {
-		$videos_in_store    = $storage->get_all_videos( $post_id );
-		$video_urls_in_store = array_map( function ( $video ) {
+	private function get_videos_without_existing_data($storage, $post_id, $embedded_videos) {
+		$videos_in_store = $storage->get_all_videos($post_id);
+		$video_urls_in_store = array_map(function($video) {
 			return $video->id;
-		}, $videos_in_store );
+		}, $videos_in_store);
 
-		$video_ids_in_store = $this->get_video_ids( $video_urls_in_store );
+		$video_ids_in_store = $this->get_video_ids($video_urls_in_store);
 
 		$that = $this;
 
-		return array_filter( $embedded_videos, function ( $embedded_video ) use ( $video_ids_in_store, $that ) {
+		return array_filter($embedded_videos, function($embedded_video) use ($video_ids_in_store, $that) {
 			/**
 			 * If the video id exist on content, not on storage then
 			 * we need to fetch the data.
 			 */
-			return count( array_intersect(
-					$that->get_video_ids( array(  $embedded_video->get_url() ) ),
+			return count(array_intersect(
+					$that->get_video_ids(array($embedded_video->get_url())),
 					$video_ids_in_store
-				) ) === 0;
+				)) === 0;
 		} );
 	}
 
@@ -189,8 +189,8 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_youtube_videos( $embedded_videos ) {
-		return array_filter( $embedded_videos, function ( $embedded_video ) {
+	private function get_youtube_videos($embedded_videos) {
+		return array_filter($embedded_videos, function($embedded_video) {
 			/**
 			 * it should have youtube.com or youtu.be in the url
 			 *
@@ -198,8 +198,8 @@ 
 			 */
 			$video_url = $embedded_video->get_url();
 
-			return strpos( $video_url, "youtube.com" ) !== false ||
-			       strpos( $video_url, "youtu.be" ) !== false;
+			return strpos($video_url, "youtube.com") !== false ||
+			       strpos($video_url, "youtu.be") !== false;
 		} );
 	}
 
@@ -208,8 +208,8 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_vimeo_videos( $embedded_videos ) {
-		return array_filter( $embedded_videos, function ( $embedded_video ) {
+	private function get_vimeo_videos($embedded_videos) {
+		return array_filter($embedded_videos, function($embedded_video) {
 			/**
 			 * it should have vimeo.com in the url
 			 *
@@ -217,7 +217,7 @@ 
 			 */
 			$video_url = $embedded_video->get_url();
 
-			return strpos( $video_url, "vimeo.com" ) !== false;
+			return strpos($video_url, "vimeo.com") !== false;
 		} );
 	}
 

src/wordlift/videoobject/provider/client/class-vimeo-client.php

Indentation +46 added lines, -46 removed lines

@@ -11,71 +11,71 @@
  */
 class Vimeo_Client extends Singleton implements Client {
 
-	static $requests_sent = 0;
+    static $requests_sent = 0;
 
-	const VIMEO_URL_REGEX = '/https?:\/\/(?:www\.|player\.)?vimeo.com\/(?:channels\/(?:\w+\/)?|groups\/([^\/]*)\/videos\/|album\/(\d+)\/video\/|video\/|)(\d+)(?:$|\/|\?)/';
+    const VIMEO_URL_REGEX = '/https?:\/\/(?:www\.|player\.)?vimeo.com\/(?:channels\/(?:\w+\/)?|groups\/([^\/]*)\/videos\/|album\/(\d+)\/video\/|video\/|)(\d+)(?:$|\/|\?)/';
 
 
-	public function get_data( $video_urls ) {
+    public function get_data( $video_urls ) {
 
-		$vimeo_ids = $this->get_video_ids($video_urls);
+        $vimeo_ids = $this->get_video_ids($video_urls);
 
-		$vimeo_api_ids = array_map( function ( $item ) {
-			return '/videos/' . $item;
-		}, $vimeo_ids );
+        $vimeo_api_ids = array_map( function ( $item ) {
+            return '/videos/' . $item;
+        }, $vimeo_ids );
 
-		$ids = join( ",", $vimeo_api_ids );
+        $ids = join( ",", $vimeo_api_ids );
 
-		if ( ! $ids ) {
-			return array();
-		}
+        if ( ! $ids ) {
+            return array();
+        }
 
-		$api_url = $this->get_api_url() . "/videos/";
-		$api_url = add_query_arg( array(
-			'uris'   => $ids,
-			'fields' => 'name,description,link,uri,duration,release_time,pictures,stats'
-		), $api_url );
+        $api_url = $this->get_api_url() . "/videos/";
+        $api_url = add_query_arg( array(
+            'uris'   => $ids,
+            'fields' => 'name,description,link,uri,duration,release_time,pictures,stats'
+        ), $api_url );
 
 
-		$response = wp_remote_get( $api_url, array(
-			'headers' => array(
-				'Authorization' => 'bearer ' . $this->get_api_key()
-			)
-		) );
+        $response = wp_remote_get( $api_url, array(
+            'headers' => array(
+                'Authorization' => 'bearer ' . $this->get_api_key()
+            )
+        ) );
 
-		self::$requests_sent += 1;
+        self::$requests_sent += 1;
 
-		return wp_remote_retrieve_body( $response );
-	}
+        return wp_remote_retrieve_body( $response );
+    }
 
-	public static function get_api_key() {
-		return get_option( self::get_api_key_option_name(), false );
-	}
+    public static function get_api_key() {
+        return get_option( self::get_api_key_option_name(), false );
+    }
 
-	public static function get_api_key_option_name() {
-		return '_wl_videoobject_vimeo_api_key';
-	}
+    public static function get_api_key_option_name() {
+        return '_wl_videoobject_vimeo_api_key';
+    }
 
-	public function get_api_url() {
-		return 'https://api.vimeo.com';
-	}
+    public function get_api_url() {
+        return 'https://api.vimeo.com';
+    }
 
-	public function get_video_ids( $video_urls ) {
+    public function get_video_ids( $video_urls ) {
 
-		$that = $this;
+        $that = $this;
 
-		return array_filter( array_map( function ( $video_url ) use ( $that ) {
-			if ( ! $video_url ) {
-				return false;
-			}
-			preg_match( $that::VIMEO_URL_REGEX, $video_url, $matches );
+        return array_filter( array_map( function ( $video_url ) use ( $that ) {
+            if ( ! $video_url ) {
+                return false;
+            }
+            preg_match( $that::VIMEO_URL_REGEX, $video_url, $matches );
 
-			if ( ! array_key_exists( 3, $matches ) ) {
-				return false;
-			}
+            if ( ! array_key_exists( 3, $matches ) ) {
+                return false;
+            }
 
-			return $matches[3];
+            return $matches[3];
 
-		}, $video_urls ) );
-	}
+        }, $video_urls ) );
+    }
 }
\ No newline at end of file

Spacing +20 added lines, -20 removed lines

@@ -16,40 +16,40 @@ 
 	const VIMEO_URL_REGEX = '/https?:\/\/(?:www\.|player\.)?vimeo.com\/(?:channels\/(?:\w+\/)?|groups\/([^\/]*)\/videos\/|album\/(\d+)\/video\/|video\/|)(\d+)(?:$|\/|\?)/';
 
 
-	public function get_data( $video_urls ) {
+	public function get_data($video_urls) {
 
 		$vimeo_ids = $this->get_video_ids($video_urls);
 
-		$vimeo_api_ids = array_map( function ( $item ) {
-			return '/videos/' . $item;
-		}, $vimeo_ids );
+		$vimeo_api_ids = array_map(function($item) {
+			return '/videos/'.$item;
+		}, $vimeo_ids);
 
-		$ids = join( ",", $vimeo_api_ids );
+		$ids = join(",", $vimeo_api_ids);
 
-		if ( ! $ids ) {
+		if ( ! $ids) {
 			return array();
 		}
 
-		$api_url = $this->get_api_url() . "/videos/";
-		$api_url = add_query_arg( array(
+		$api_url = $this->get_api_url()."/videos/";
+		$api_url = add_query_arg(array(
 			'uris'   => $ids,
 			'fields' => 'name,description,link,uri,duration,release_time,pictures,stats'
-		), $api_url );
+		), $api_url);
 
 
-		$response = wp_remote_get( $api_url, array(
+		$response = wp_remote_get($api_url, array(
 			'headers' => array(
-				'Authorization' => 'bearer ' . $this->get_api_key()
+				'Authorization' => 'bearer '.$this->get_api_key()
 			)
-		) );
+		));
 
 		self::$requests_sent += 1;
 
-		return wp_remote_retrieve_body( $response );
+		return wp_remote_retrieve_body($response);
 	}
 
 	public static function get_api_key() {
-		return get_option( self::get_api_key_option_name(), false );
+		return get_option(self::get_api_key_option_name(), false);
 	}
 
 	public static function get_api_key_option_name() {
@@ -60,22 +60,22 @@ 
 		return 'https://api.vimeo.com';
 	}
 
-	public function get_video_ids( $video_urls ) {
+	public function get_video_ids($video_urls) {
 
 		$that = $this;
 
-		return array_filter( array_map( function ( $video_url ) use ( $that ) {
-			if ( ! $video_url ) {
+		return array_filter(array_map(function($video_url) use ($that) {
+			if ( ! $video_url) {
 				return false;
 			}
-			preg_match( $that::VIMEO_URL_REGEX, $video_url, $matches );
+			preg_match($that::VIMEO_URL_REGEX, $video_url, $matches);
 
-			if ( ! array_key_exists( 3, $matches ) ) {
+			if ( ! array_key_exists(3, $matches)) {
 				return false;
 			}
 
 			return $matches[3];
 
-		}, $video_urls ) );
+		}, $video_urls));
 	}
 }
\ No newline at end of file

src/wordlift/videoobject/provider/client/class-client.php

Indentation +28 added lines, -28 removed lines

@@ -6,37 +6,37 @@
  * This acts as interface for api clients
  */
 interface Client {
-	/**
-	 *
-	 * @param $video_urls array<string> Array of urls.
-	 *
-	 * Response body or false if the request cant be made or failed.
-	 * @return string | false
-	 */
-	public function get_data( $video_urls );
+    /**
+     *
+     * @param $video_urls array<string> Array of urls.
+     *
+     * Response body or false if the request cant be made or failed.
+     * @return string | false
+     */
+    public function get_data( $video_urls );
 
-	/**
-	 * @return string
-	 */
-	public static function get_api_key();
-	/**
-	 * Returns the option where the api key is stored.
-	 * @return string
-	 */
-	public static function get_api_key_option_name();
+    /**
+     * @return string
+     */
+    public static function get_api_key();
+    /**
+     * Returns the option where the api key is stored.
+     * @return string
+     */
+    public static function get_api_key_option_name();
 
-	/**
-	 * The api base url.
-	 * @return string
-	 */
-	public function get_api_url();
+    /**
+     * The api base url.
+     * @return string
+     */
+    public function get_api_url();
 
 
-	/**
-	 * Get video ids from URLs.
-	 * @param $video_urls array<string>
-	 * @return array<string>
-	 */
-	public function get_video_ids(  $video_urls  );
+    /**
+     * Get video ids from URLs.
+     * @param $video_urls array<string>
+     * @return array<string>
+     */
+    public function get_video_ids(  $video_urls  );
 
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 	 * Response body or false if the request cant be made or failed.
 	 * @return string | false
 	 */
-	public function get_data( $video_urls );
+	public function get_data($video_urls);
 
 	/**
 	 * @return string
@@ -37,6 +37,6 @@ 
 	 * @param $video_urls array<string>
 	 * @return array<string>
 	 */
-	public function get_video_ids(  $video_urls  );
+	public function get_video_ids($video_urls);
 
 }
\ No newline at end of file

src/wordlift/videoobject/provider/client/class-youtube-client.php

Indentation +43 added lines, -43 removed lines

@@ -11,70 +11,70 @@
  */
 class Youtube_Client extends Singleton implements Client {
 
-	const YOUTUBE_REGEX = '/(?:https?:\/\/)?(?:youtu\.be\/|(?:www\.|m\.)?youtube\.com\/(?:watch|v|embed)(?:\.php)?(?:\?.*v=|\/))([a-zA-Z0-9\_-]+)/m';
+    const YOUTUBE_REGEX = '/(?:https?:\/\/)?(?:youtu\.be\/|(?:www\.|m\.)?youtube\.com\/(?:watch|v|embed)(?:\.php)?(?:\?.*v=|\/))([a-zA-Z0-9\_-]+)/m';
 
-	static $requests_sent = 0;
+    static $requests_sent = 0;
 
-	public static function get_api_key_option_name() {
-		return "__wl_video_object_youtube_api_key";
-	}
+    public static function get_api_key_option_name() {
+        return "__wl_video_object_youtube_api_key";
+    }
 
-	public static function get_api_key() {
-		return get_option( self::get_api_key_option_name(), false );
-	}
+    public static function get_api_key() {
+        return get_option( self::get_api_key_option_name(), false );
+    }
 
-	public function get_api_url() {
-		return 'https://www.googleapis.com/youtube/v3/videos';
-	}
+    public function get_api_url() {
+        return 'https://www.googleapis.com/youtube/v3/videos';
+    }
 
 
-	public function get_data( $video_urls ) {
-		$video_ids = $this->get_video_ids_as_string( $video_urls );
-		$url       = add_query_arg( array(
-			'part' => 'snippet,contentDetails,statistics,liveStreamingDetails',
-			'id'   => $video_ids,
-			'key'  => $this->get_api_key()
-		), $this->get_api_url() );
+    public function get_data( $video_urls ) {
+        $video_ids = $this->get_video_ids_as_string( $video_urls );
+        $url       = add_query_arg( array(
+            'part' => 'snippet,contentDetails,statistics,liveStreamingDetails',
+            'id'   => $video_ids,
+            'key'  => $this->get_api_key()
+        ), $this->get_api_url() );
 
-		$response = wp_remote_get( $url );
+        $response = wp_remote_get( $url );
 
-		self::$requests_sent += 1;
+        self::$requests_sent += 1;
 
-		return wp_remote_retrieve_body( $response );
-	}
+        return wp_remote_retrieve_body( $response );
+    }
 
 
-	private function get_video_ids_as_string( $video_urls ) {
-		// validate the urls.
-		$video_urls = array_filter( $video_urls, function ( $url ) {
-			return filter_var( $url, FILTER_VALIDATE_URL );
-		} );
+    private function get_video_ids_as_string( $video_urls ) {
+        // validate the urls.
+        $video_urls = array_filter( $video_urls, function ( $url ) {
+            return filter_var( $url, FILTER_VALIDATE_URL );
+        } );
 
-		// extract the video ids.
-		return join( ",", $this->get_video_ids( $video_urls ) );
-	}
+        // extract the video ids.
+        return join( ",", $this->get_video_ids( $video_urls ) );
+    }
 
 
-	public function get_video_ids( $video_urls ) {
+    public function get_video_ids( $video_urls ) {
 
-		$regex = self::YOUTUBE_REGEX;
+        $regex = self::YOUTUBE_REGEX;
 
-		$video_ids = array_map( function ( $url ) use ( $regex ) {
-			$matches = array();
-			preg_match( $regex, $url, $matches );
+        $video_ids = array_map( function ( $url ) use ( $regex ) {
+            $matches = array();
+            preg_match( $regex, $url, $matches );
 
-			// Return video id or return false.
-			if ( isset( $matches[1] ) && is_string( $matches[1] ) ) {
-				return $matches[1];
-			}
+            // Return video id or return false.
+            if ( isset( $matches[1] ) && is_string( $matches[1] ) ) {
+                return $matches[1];
+            }
 
-			return false;
+            return false;
 
-		}, $video_urls );
+        }, $video_urls );
 
-		return array_values( array_filter( $video_ids ) );
+        return array_values( array_filter( $video_ids ) );
 
-	}
+    }
 
 
 }
\ No newline at end of file

Spacing +17 added lines, -17 removed lines

@@ -20,7 +20,7 @@ 
 	}
 
 	public static function get_api_key() {
-		return get_option( self::get_api_key_option_name(), false );
+		return get_option(self::get_api_key_option_name(), false);
 	}
 
 	public function get_api_url() {
@@ -28,51 +28,51 @@ 
 	}
 
 
-	public function get_data( $video_urls ) {
-		$video_ids = $this->get_video_ids_as_string( $video_urls );
-		$url       = add_query_arg( array(
+	public function get_data($video_urls) {
+		$video_ids = $this->get_video_ids_as_string($video_urls);
+		$url       = add_query_arg(array(
 			'part' => 'snippet,contentDetails,statistics,liveStreamingDetails',
 			'id'   => $video_ids,
 			'key'  => $this->get_api_key()
-		), $this->get_api_url() );
+		), $this->get_api_url());
 
-		$response = wp_remote_get( $url );
+		$response = wp_remote_get($url);
 
 		self::$requests_sent += 1;
 
-		return wp_remote_retrieve_body( $response );
+		return wp_remote_retrieve_body($response);
 	}
 
 
-	private function get_video_ids_as_string( $video_urls ) {
+	private function get_video_ids_as_string($video_urls) {
 		// validate the urls.
-		$video_urls = array_filter( $video_urls, function ( $url ) {
-			return filter_var( $url, FILTER_VALIDATE_URL );
+		$video_urls = array_filter($video_urls, function($url) {
+			return filter_var($url, FILTER_VALIDATE_URL);
 		} );
 
 		// extract the video ids.
-		return join( ",", $this->get_video_ids( $video_urls ) );
+		return join(",", $this->get_video_ids($video_urls));
 	}
 
 
-	public function get_video_ids( $video_urls ) {
+	public function get_video_ids($video_urls) {
 
 		$regex = self::YOUTUBE_REGEX;
 
-		$video_ids = array_map( function ( $url ) use ( $regex ) {
+		$video_ids = array_map(function($url) use ($regex) {
 			$matches = array();
-			preg_match( $regex, $url, $matches );
+			preg_match($regex, $url, $matches);
 
 			// Return video id or return false.
-			if ( isset( $matches[1] ) && is_string( $matches[1] ) ) {
+			if (isset($matches[1]) && is_string($matches[1])) {
 				return $matches[1];
 			}
 
 			return false;
 
-		}, $video_urls );
+		}, $video_urls);
 
-		return array_values( array_filter( $video_ids ) );
+		return array_values(array_filter($video_ids));
 
 	}