insideout10 / wordlift-plugin

src/admin/wordlift_admin_ajax_related_posts.php

Indentation +60 added lines, -60 removed lines

@@ -19,66 +19,66 @@
  */
 function wordlift_ajax_related_posts( $http_raw_data = null ) {
 
-	// Extract filtering conditions
-	if ( ! isset( $_GET["post_id"] ) || ! is_numeric( $_GET["post_id"] ) ) {
-		wp_die( 'Post id missing or invalid!' );
-
-		return;
-	}
-
-	// Get the current post
-	$post_id = (int) $_GET["post_id"];
-	$post    = get_post( $post_id );
-
-	Wordlift_Log_Service::get_logger( 'wordlift_ajax_related_posts' )->trace( "Going to find posts related to current with post id: $post_id ..." );
-
-	// Extract filtering conditions
-	$filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents( "php://input" ) : $http_raw_data;
-	$filtering_entity_uris = json_decode( $filtering_entity_uris );
-
-	$content_service      = Wordpress_Content_Service::get_instance();
-	$filtering_entity_ids = array_filter( array_map( function ( $uri ) use ( $content_service ) {
-		$content = $content_service->get_by_entity_id( $uri );
-		if ( isset( $content ) && is_a( $content->get_bag(), '\WP_Post' ) ) {
-			return $content->get_bag()->ID;
-		} else {
-			return null;
-		}
-	}, $filtering_entity_uris ) );
-
-	$related_posts = array();
-
-	// If the current post is an entity, related posts to the current entity are
-	// returned.
-	$entity_service = Wordlift_Entity_Service::get_instance();
-
-	if ( $entity_service->is_entity( $post->ID ) ) {
-		$filtering_entity_ids = array( $post_id );
-	}
-
-	if ( ! empty( $filtering_entity_ids ) ) {
-
-		$related_posts = Wordlift_Relation_Service::get_instance()
-		                                          ->get_article_subjects( $filtering_entity_ids, '*', null, 'publish', array( $post_id ), 5 );
-
-		foreach ( $related_posts as $post_obj ) {
-
-			/**
-			 * Use the thumbnail.
-			 *
-			 * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
-			 * @see https://github.com/insideout10/wordlift-plugin/issues/837
-			 *
-			 * @since 3.19.3 We're using the medium size image.
-			 */
-			$thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
-			$post_obj->thumbnail = ( $thumbnail ) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-			$post_obj->link      = get_edit_post_link( $post_obj->ID, 'none' );
-			$post_obj->permalink = get_post_permalink( $post_obj->ID );
-		}
-	}
-
-	wl_core_send_json( $related_posts );
+    // Extract filtering conditions
+    if ( ! isset( $_GET["post_id"] ) || ! is_numeric( $_GET["post_id"] ) ) {
+        wp_die( 'Post id missing or invalid!' );
+
+        return;
+    }
+
+    // Get the current post
+    $post_id = (int) $_GET["post_id"];
+    $post    = get_post( $post_id );
+
+    Wordlift_Log_Service::get_logger( 'wordlift_ajax_related_posts' )->trace( "Going to find posts related to current with post id: $post_id ..." );
+
+    // Extract filtering conditions
+    $filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents( "php://input" ) : $http_raw_data;
+    $filtering_entity_uris = json_decode( $filtering_entity_uris );
+
+    $content_service      = Wordpress_Content_Service::get_instance();
+    $filtering_entity_ids = array_filter( array_map( function ( $uri ) use ( $content_service ) {
+        $content = $content_service->get_by_entity_id( $uri );
+        if ( isset( $content ) && is_a( $content->get_bag(), '\WP_Post' ) ) {
+            return $content->get_bag()->ID;
+        } else {
+            return null;
+        }
+    }, $filtering_entity_uris ) );
+
+    $related_posts = array();
+
+    // If the current post is an entity, related posts to the current entity are
+    // returned.
+    $entity_service = Wordlift_Entity_Service::get_instance();
+
+    if ( $entity_service->is_entity( $post->ID ) ) {
+        $filtering_entity_ids = array( $post_id );
+    }
+
+    if ( ! empty( $filtering_entity_ids ) ) {
+
+        $related_posts = Wordlift_Relation_Service::get_instance()
+                                                    ->get_article_subjects( $filtering_entity_ids, '*', null, 'publish', array( $post_id ), 5 );
+
+        foreach ( $related_posts as $post_obj ) {
+
+            /**
+             * Use the thumbnail.
+             *
+             * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
+             * @see https://github.com/insideout10/wordlift-plugin/issues/837
+             *
+             * @since 3.19.3 We're using the medium size image.
+             */
+            $thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
+            $post_obj->thumbnail = ( $thumbnail ) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
+            $post_obj->link      = get_edit_post_link( $post_obj->ID, 'none' );
+            $post_obj->permalink = get_post_permalink( $post_obj->ID );
+        }
+    }
+
+    wl_core_send_json( $related_posts );
 
 }
 

Spacing +22 added lines, -22 removed lines

@@ -17,34 +17,34 @@ 
  * @since 3.0.0
  *
  */
-function wordlift_ajax_related_posts( $http_raw_data = null ) {
+function wordlift_ajax_related_posts($http_raw_data = null) {
 
 	// Extract filtering conditions
-	if ( ! isset( $_GET["post_id"] ) || ! is_numeric( $_GET["post_id"] ) ) {
-		wp_die( 'Post id missing or invalid!' );
+	if ( ! isset($_GET["post_id"]) || ! is_numeric($_GET["post_id"])) {
+		wp_die('Post id missing or invalid!');
 
 		return;
 	}
 
 	// Get the current post
 	$post_id = (int) $_GET["post_id"];
-	$post    = get_post( $post_id );
+	$post    = get_post($post_id);
 
-	Wordlift_Log_Service::get_logger( 'wordlift_ajax_related_posts' )->trace( "Going to find posts related to current with post id: $post_id ..." );
+	Wordlift_Log_Service::get_logger('wordlift_ajax_related_posts')->trace("Going to find posts related to current with post id: $post_id ...");
 
 	// Extract filtering conditions
-	$filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents( "php://input" ) : $http_raw_data;
-	$filtering_entity_uris = json_decode( $filtering_entity_uris );
+	$filtering_entity_uris = (null == $http_raw_data) ? file_get_contents("php://input") : $http_raw_data;
+	$filtering_entity_uris = json_decode($filtering_entity_uris);
 
 	$content_service      = Wordpress_Content_Service::get_instance();
-	$filtering_entity_ids = array_filter( array_map( function ( $uri ) use ( $content_service ) {
-		$content = $content_service->get_by_entity_id( $uri );
-		if ( isset( $content ) && is_a( $content->get_bag(), '\WP_Post' ) ) {
+	$filtering_entity_ids = array_filter(array_map(function($uri) use ($content_service) {
+		$content = $content_service->get_by_entity_id($uri);
+		if (isset($content) && is_a($content->get_bag(), '\WP_Post')) {
 			return $content->get_bag()->ID;
 		} else {
 			return null;
 		}
-	}, $filtering_entity_uris ) );
+	}, $filtering_entity_uris));
 
 	$related_posts = array();
 
@@ -52,16 +52,16 @@ 
 	// returned.
 	$entity_service = Wordlift_Entity_Service::get_instance();
 
-	if ( $entity_service->is_entity( $post->ID ) ) {
-		$filtering_entity_ids = array( $post_id );
+	if ($entity_service->is_entity($post->ID)) {
+		$filtering_entity_ids = array($post_id);
 	}
 
-	if ( ! empty( $filtering_entity_ids ) ) {
+	if ( ! empty($filtering_entity_ids)) {
 
 		$related_posts = Wordlift_Relation_Service::get_instance()
-		                                          ->get_article_subjects( $filtering_entity_ids, '*', null, 'publish', array( $post_id ), 5 );
+		                                          ->get_article_subjects($filtering_entity_ids, '*', null, 'publish', array($post_id), 5);
 
-		foreach ( $related_posts as $post_obj ) {
+		foreach ($related_posts as $post_obj) {
 
 			/**
 			 * Use the thumbnail.
@@ -71,15 +71,15 @@ 
 			 *
 			 * @since 3.19.3 We're using the medium size image.
 			 */
-			$thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
-			$post_obj->thumbnail = ( $thumbnail ) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-			$post_obj->link      = get_edit_post_link( $post_obj->ID, 'none' );
-			$post_obj->permalink = get_post_permalink( $post_obj->ID );
+			$thumbnail           = get_the_post_thumbnail_url($post_obj, 'medium');
+			$post_obj->thumbnail = ($thumbnail) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
+			$post_obj->link      = get_edit_post_link($post_obj->ID, 'none');
+			$post_obj->permalink = get_post_permalink($post_obj->ID);
 		}
 	}
 
-	wl_core_send_json( $related_posts );
+	wl_core_send_json($related_posts);
 
 }
 
-add_action( 'wp_ajax_wordlift_related_posts', 'wordlift_ajax_related_posts' );
+add_action('wp_ajax_wordlift_related_posts', 'wordlift_ajax_related_posts');

src/admin/partials/wordlift-admin-setup.php

Indentation +33 added lines, -33 removed lines

@@ -16,40 +16,40 @@ 
 
 	<?php
 
-	// Enqueue wp.media functions.
-	wp_enqueue_media();
+    // Enqueue wp.media functions.
+    wp_enqueue_media();
 
-	// Enqueue styles and scripts.
-	wp_enqueue_style( 'wl-font-awesome', plugin_dir_url( dirname( dirname( __FILE__ ) ) ) . 'css/font-awesome.min.css' );
-	wp_enqueue_style( 'wordlift-admin-setup', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-admin-setup.css', array(
-		'wp-admin',
-		'wl-font-awesome',
-	) );
-	wp_enqueue_script( 'wordlift-admin-setup', plugin_dir_url( dirname( __FILE__ ) ) . 'js/1/setup.js', array( 'jquery' ) );
+    // Enqueue styles and scripts.
+    wp_enqueue_style( 'wl-font-awesome', plugin_dir_url( dirname( dirname( __FILE__ ) ) ) . 'css/font-awesome.min.css' );
+    wp_enqueue_style( 'wordlift-admin-setup', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-admin-setup.css', array(
+        'wp-admin',
+        'wl-font-awesome',
+    ) );
+    wp_enqueue_script( 'wordlift-admin-setup', plugin_dir_url( dirname( __FILE__ ) ) . 'js/1/setup.js', array( 'jquery' ) );
 
-	//Get wp_permalink structure
-	$permalink_structure = get_option( 'permalink_structure' );
+    //Get wp_permalink structure
+    $permalink_structure = get_option( 'permalink_structure' );
 
-	// Set configuration settings.
-	wp_localize_script( 'wordlift-admin-setup', '_wlAdminSetup', array(
-		'ajaxUrl'   => parse_url( self_admin_url( 'admin-ajax.php' ), PHP_URL_PATH ),
-		'action'    => 'wl_validate_key',
-		'permalink' => $permalink_structure,
-		'media'     => array(
-			'title'  => __( 'WordLift Choose Logo', 'wordlift' ),
-			'button' => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
-		),
-	) );
+    // Set configuration settings.
+    wp_localize_script( 'wordlift-admin-setup', '_wlAdminSetup', array(
+        'ajaxUrl'   => parse_url( self_admin_url( 'admin-ajax.php' ), PHP_URL_PATH ),
+        'action'    => 'wl_validate_key',
+        'permalink' => $permalink_structure,
+        'media'     => array(
+            'title'  => __( 'WordLift Choose Logo', 'wordlift' ),
+            'button' => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
+        ),
+    ) );
 
-	// Finally print styles and scripts.
-	do_action( 'admin_print_scripts' );
-	wp_print_styles();
-	wp_print_scripts();
+    // Finally print styles and scripts.
+    do_action( 'admin_print_scripts' );
+    wp_print_styles();
+    wp_print_scripts();
 
-	for ( $i = 1; $i <= 6; $i ++ ) {
-		include 'admin-setup/step-' . $i . '.php';
-	}
-	?>
+    for ( $i = 1; $i <= 6; $i ++ ) {
+        include 'admin-setup/step-' . $i . '.php';
+    }
+    ?>
 </head>
 <body>
 
@@ -73,10 +73,10 @@ 
         <div class="viewport"></div>
     </form>
 	<?php
-	if ( function_exists( 'wp_print_media_templates' ) ) {
-		wp_print_media_templates();
-	}
-	?>
+    if ( function_exists( 'wp_print_media_templates' ) ) {
+        wp_print_media_templates();
+    }
+    ?>
 </div>
 
 </body>

Spacing +19 added lines, -19 removed lines

@@ -12,7 +12,7 @@ 
     <!-- Defining responsive ambient. -->
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <title><?php esc_html_e( 'WordLift Setup', 'wordlift' ); ?></title>
+    <title><?php esc_html_e('WordLift Setup', 'wordlift'); ?></title>
 
 	<?php
 
@@ -20,34 +20,34 @@ 
 	wp_enqueue_media();
 
 	// Enqueue styles and scripts.
-	wp_enqueue_style( 'wl-font-awesome', plugin_dir_url( dirname( dirname( __FILE__ ) ) ) . 'css/font-awesome.min.css' );
-	wp_enqueue_style( 'wordlift-admin-setup', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-admin-setup.css', array(
+	wp_enqueue_style('wl-font-awesome', plugin_dir_url(dirname(dirname(__FILE__))).'css/font-awesome.min.css');
+	wp_enqueue_style('wordlift-admin-setup', plugin_dir_url(dirname(__FILE__)).'css/wordlift-admin-setup.css', array(
 		'wp-admin',
 		'wl-font-awesome',
-	) );
-	wp_enqueue_script( 'wordlift-admin-setup', plugin_dir_url( dirname( __FILE__ ) ) . 'js/1/setup.js', array( 'jquery' ) );
+	));
+	wp_enqueue_script('wordlift-admin-setup', plugin_dir_url(dirname(__FILE__)).'js/1/setup.js', array('jquery'));
 
 	//Get wp_permalink structure
-	$permalink_structure = get_option( 'permalink_structure' );
+	$permalink_structure = get_option('permalink_structure');
 
 	// Set configuration settings.
-	wp_localize_script( 'wordlift-admin-setup', '_wlAdminSetup', array(
-		'ajaxUrl'   => parse_url( self_admin_url( 'admin-ajax.php' ), PHP_URL_PATH ),
+	wp_localize_script('wordlift-admin-setup', '_wlAdminSetup', array(
+		'ajaxUrl'   => parse_url(self_admin_url('admin-ajax.php'), PHP_URL_PATH),
 		'action'    => 'wl_validate_key',
 		'permalink' => $permalink_structure,
 		'media'     => array(
-			'title'  => __( 'WordLift Choose Logo', 'wordlift' ),
-			'button' => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
+			'title'  => __('WordLift Choose Logo', 'wordlift'),
+			'button' => array('text' => __('Choose Logo', 'wordlift')),
 		),
-	) );
+	));
 
 	// Finally print styles and scripts.
-	do_action( 'admin_print_scripts' );
+	do_action('admin_print_scripts');
 	wp_print_styles();
 	wp_print_scripts();
 
-	for ( $i = 1; $i <= 6; $i ++ ) {
-		include 'admin-setup/step-' . $i . '.php';
+	for ($i = 1; $i <= 6; $i++) {
+		include 'admin-setup/step-'.$i.'.php';
 	}
 	?>
 </head>
@@ -55,25 +55,25 @@ 
 
 <div class="wl-container">
 
-    <a href="<?php echo esc_url( admin_url() ); ?>"
+    <a href="<?php echo esc_url(admin_url()); ?>"
        class="fa fa-times wl-close"></a>
 
     <header>
         <h1><img class="wizard-logo"
-                 src="<?php echo esc_attr( plugin_dir_url( dirname( dirname( __FILE__ ) ) ) . 'images/logo-wl-transparent-240x90.png' ); ?>"/>
+                 src="<?php echo esc_attr(plugin_dir_url(dirname(dirname(__FILE__))).'images/logo-wl-transparent-240x90.png'); ?>"/>
         </h1>
         <img class="shapes"
-             src="<?php echo esc_attr( plugin_dir_url( dirname( dirname( __FILE__ ) ) ) . 'images/shapes.png' ); ?>"/>
+             src="<?php echo esc_attr(plugin_dir_url(dirname(dirname(__FILE__))).'images/shapes.png'); ?>"/>
     </header>
 
 
     <form method="post">
-		<?php wp_nonce_field( 'wl-save-configuration' ); ?>
+		<?php wp_nonce_field('wl-save-configuration'); ?>
         <input type="hidden" name="action" value="wl-save-configuration"/>
         <div class="viewport"></div>
     </form>
 	<?php
-	if ( function_exists( 'wp_print_media_templates' ) ) {
+	if (function_exists('wp_print_media_templates')) {
 		wp_print_media_templates();
 	}
 	?>

src/wordlift/content/wordpress/class-wordpress-content.php

Indentation +60 added lines, -60 removed lines

@@ -10,73 +10,73 @@
 
 class Wordpress_Content implements Content {
 
-	/**
-	 * The actual content.
-	 *
-	 * @var WP_Post|WP_Term|WP_User $bag
-	 */
-	private $bag;
+    /**
+     * The actual content.
+     *
+     * @var WP_Post|WP_Term|WP_User $bag
+     */
+    private $bag;
 
-	/**
-	 * Creates a WordPress content instance.
-	 *
-	 * @param WP_Post|WP_Term|WP_User $bag
-	 */
-	public function __construct( $bag ) {
-		$this->bag = $bag;
-	}
+    /**
+     * Creates a WordPress content instance.
+     *
+     * @param WP_Post|WP_Term|WP_User $bag
+     */
+    public function __construct( $bag ) {
+        $this->bag = $bag;
+    }
 
-	/**
-	 * The actual content.
-	 *
-	 * @return WP_Post|WP_Term|WP_User
-	 */
-	function get_bag() {
-		return $this->bag;
-	}
+    /**
+     * The actual content.
+     *
+     * @return WP_Post|WP_Term|WP_User
+     */
+    function get_bag() {
+        return $this->bag;
+    }
 
-	function get_id() {
-		switch ( get_class( $this->bag ) ) {
-			case 'WP_Post':
-			case 'WP_User':
-				return $this->bag->ID;
-			case 'WP_Term':
-				return $this->bag->term_id;
-		}
+    function get_id() {
+        switch ( get_class( $this->bag ) ) {
+            case 'WP_Post':
+            case 'WP_User':
+                return $this->bag->ID;
+            case 'WP_Term':
+                return $this->bag->term_id;
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	function get_object_type_enum() {
-		return Object_Type_Enum::from_wordpress_instance( $this->bag );
-	}
+    function get_object_type_enum() {
+        return Object_Type_Enum::from_wordpress_instance( $this->bag );
+    }
 
-	function get_permalink() {
-		switch ( get_class( $this->bag ) ) {
-			case 'WP_Post':
-				return get_permalink( $this->get_bag()->ID );
-			case 'WP_User':
-				return get_author_posts_url( $this->get_bag()->ID );
-			case 'WP_Term':
-				return get_term_link( $this->bag->term_id );
-		}
+    function get_permalink() {
+        switch ( get_class( $this->bag ) ) {
+            case 'WP_Post':
+                return get_permalink( $this->get_bag()->ID );
+            case 'WP_User':
+                return get_author_posts_url( $this->get_bag()->ID );
+            case 'WP_Term':
+                return get_term_link( $this->bag->term_id );
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	function get_edit_link() {
-		switch ( get_class( $this->bag ) ) {
-			case 'WP_Post':
-				// We need to return & character as &, by default context is set to display.
-				// so &  will be returned as & breaking header location redirects.
-				// By setting context to none we prevent this issue.
-				return get_edit_post_link( $this->get_bag()->ID, 'none' );
-			case 'WP_User':
-				return get_edit_user_link( $this->get_bag()->ID );
-			case 'WP_Term':
-				return get_edit_term_link( $this->bag->term_id );
-		}
+    function get_edit_link() {
+        switch ( get_class( $this->bag ) ) {
+            case 'WP_Post':
+                // We need to return & character as &, by default context is set to display.
+                // so &  will be returned as & breaking header location redirects.
+                // By setting context to none we prevent this issue.
+                return get_edit_post_link( $this->get_bag()->ID, 'none' );
+            case 'WP_User':
+                return get_edit_user_link( $this->get_bag()->ID );
+            case 'WP_Term':
+                return get_edit_term_link( $this->bag->term_id );
+        }
 
-		return null;
-	}
+        return null;
+    }
 }
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -22,7 +22,7 @@ 
 	 *
 	 * @param WP_Post|WP_Term|WP_User $bag
 	 */
-	public function __construct( $bag ) {
+	public function __construct($bag) {
 		$this->bag = $bag;
 	}
 
@@ -36,7 +36,7 @@ 
 	}
 
 	function get_id() {
-		switch ( get_class( $this->bag ) ) {
+		switch (get_class($this->bag)) {
 			case 'WP_Post':
 			case 'WP_User':
 				return $this->bag->ID;
@@ -48,33 +48,33 @@ 
 	}
 
 	function get_object_type_enum() {
-		return Object_Type_Enum::from_wordpress_instance( $this->bag );
+		return Object_Type_Enum::from_wordpress_instance($this->bag);
 	}
 
 	function get_permalink() {
-		switch ( get_class( $this->bag ) ) {
+		switch (get_class($this->bag)) {
 			case 'WP_Post':
-				return get_permalink( $this->get_bag()->ID );
+				return get_permalink($this->get_bag()->ID);
 			case 'WP_User':
-				return get_author_posts_url( $this->get_bag()->ID );
+				return get_author_posts_url($this->get_bag()->ID);
 			case 'WP_Term':
-				return get_term_link( $this->bag->term_id );
+				return get_term_link($this->bag->term_id);
 		}
 
 		return null;
 	}
 
 	function get_edit_link() {
-		switch ( get_class( $this->bag ) ) {
+		switch (get_class($this->bag)) {
 			case 'WP_Post':
 				// We need to return & character as &, by default context is set to display.
 				// so &  will be returned as & breaking header location redirects.
 				// By setting context to none we prevent this issue.
-				return get_edit_post_link( $this->get_bag()->ID, 'none' );
+				return get_edit_post_link($this->get_bag()->ID, 'none');
 			case 'WP_User':
-				return get_edit_user_link( $this->get_bag()->ID );
+				return get_edit_user_link($this->get_bag()->ID);
 			case 'WP_Term':
-				return get_edit_term_link( $this->bag->term_id );
+				return get_edit_term_link($this->bag->term_id);
 		}
 
 		return null;

src/install/class-wordlift-install-service.php

Indentation +164 added lines, -164 removed lines

@@ -18,172 +18,172 @@
  */
 class Wordlift_Install_Service {
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * The singleton instance.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Install_Service $instance A {@link Wordlift_Install_Service} instance.
-	 */
-	private static $instance;
-
-	/**
-	 * @var array
-	 */
-	private $installs;
-
-	/**
-	 * Wordlift_Install_Service constructor.
-	 *
-	 * @since 3.18.0
-	 */
-	public function __construct() {
-
-		/** Installs. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-1-0-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-10-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-12-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-14-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-15-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-18-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-18-3.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-19-5.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-20-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-23-4.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-24-2.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-all-entity-types.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-package-type.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-25-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-27-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-27-1.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-28-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-32-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-33-9.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-36-0.php';
-		// Get the install services.
-		$this->installs = array(
-			new Wordlift_Install_1_0_0(),
-			new Wordlift_Install_3_10_0(),
-			new Wordlift_Install_3_12_0(),
-			new Wordlift_Install_3_14_0(),
-			new Wordlift_Install_3_15_0(),
-			new Wordlift_Install_3_18_0(),
-			new Wordlift_Install_3_18_3(),
-			new Wordlift_Install_3_19_5(),
-			new Wordlift_Install_3_20_0(),
-			/*
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * The singleton instance.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Install_Service $instance A {@link Wordlift_Install_Service} instance.
+     */
+    private static $instance;
+
+    /**
+     * @var array
+     */
+    private $installs;
+
+    /**
+     * Wordlift_Install_Service constructor.
+     *
+     * @since 3.18.0
+     */
+    public function __construct() {
+
+        /** Installs. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-1-0-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-10-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-12-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-14-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-15-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-18-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-18-3.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-19-5.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-20-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-23-4.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-24-2.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-all-entity-types.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-package-type.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-25-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-27-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-27-1.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-28-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-32-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-33-9.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-36-0.php';
+        // Get the install services.
+        $this->installs = array(
+            new Wordlift_Install_1_0_0(),
+            new Wordlift_Install_3_10_0(),
+            new Wordlift_Install_3_12_0(),
+            new Wordlift_Install_3_14_0(),
+            new Wordlift_Install_3_15_0(),
+            new Wordlift_Install_3_18_0(),
+            new Wordlift_Install_3_18_3(),
+            new Wordlift_Install_3_19_5(),
+            new Wordlift_Install_3_20_0(),
+            /*
 			 * This should be enabled with #852.
 			 */
-			// new Wordlift_Install_All_Entity_Types(),
-			new Wordlift_Install_Package_Type(),
-			new Wordlift_Install_3_23_4(),
-			new Wordlift_Install_3_24_2(),
-			new Wordlift_Install_3_25_0(),
-			new Wordlift_Install_3_27_0(),
-			new Wordlift_Install_3_27_1(),
-			new Wordlift_Install_3_28_0(),
-			// Add column to represent term
-			new Wordlift_Install_3_32_0(),
-			// Add the entities table.
-			new Wordlift_Install_3_33_9(),
-			// When woocommerce extension installed, acf4so should be installed automatically.
-			new Wordlift_Install_3_36_0()
-		);
-		self::$instance = $this;
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		add_action( 'init', array( $this, 'install' ) );
-
-	}
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @since 3.18.0
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Loop thought all versions and install the updates.
-	 *
-	 * @return void
-	 * @since 3.18.0
-	 *
-	 * @since 3.20.0 use a transient to avoid concurrent installation calls.
-	 */
-	public function install() {
-
-		$version = null;
-
-		if ( $this->install_required() && false === get_transient( '_wl_installing' ) ) {
-			set_transient( '_wl_installing', true, 5 * MINUTE_IN_SECONDS );
-			/** @var Wordlift_Install $install */
-			foreach ( $this->installs as $install ) {
-				// Get the install version.
-				$version = $install->get_version();
-
-				if ( version_compare( $version, $this->get_current_version(), '>' )
-				     || $install->must_install() ) {
-					$class_name = get_class( $install );
-
-					$this->log->info( "Current version is {$this->get_current_version()}, installing $class_name..." );
-					// Install version.
-					$install->install();
-
-
-					$this->log->info( "$class_name installed." );
-
-					// Bump the version.
-					update_option( 'wl_db_version', $version );
-				}
-
-			}
-
-			@delete_transient( '_wl_installing' );
-
-		}
-
-	}
-
-	private function install_required() {
-
-		/** @var Wordlift_Install $install */
-		foreach ( $this->installs as $install ) {
-			// Get the install version.
-			$version = $install->get_version();
-
-			if ( version_compare( $version, $this->get_current_version(), '>' )
-			     || $install->must_install() ) {
-				return true;
-			}
-
-		}
-
-		return false;
-	}
-
-	/**
-	 * Retrieve the current db version.
-	 *
-	 * @return type
-	 */
-	private function get_current_version() {
-		return get_option( 'wl_db_version', '0.0.0' );
-	}
+            // new Wordlift_Install_All_Entity_Types(),
+            new Wordlift_Install_Package_Type(),
+            new Wordlift_Install_3_23_4(),
+            new Wordlift_Install_3_24_2(),
+            new Wordlift_Install_3_25_0(),
+            new Wordlift_Install_3_27_0(),
+            new Wordlift_Install_3_27_1(),
+            new Wordlift_Install_3_28_0(),
+            // Add column to represent term
+            new Wordlift_Install_3_32_0(),
+            // Add the entities table.
+            new Wordlift_Install_3_33_9(),
+            // When woocommerce extension installed, acf4so should be installed automatically.
+            new Wordlift_Install_3_36_0()
+        );
+        self::$instance = $this;
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        add_action( 'init', array( $this, 'install' ) );
+
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @since 3.18.0
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Loop thought all versions and install the updates.
+     *
+     * @return void
+     * @since 3.18.0
+     *
+     * @since 3.20.0 use a transient to avoid concurrent installation calls.
+     */
+    public function install() {
+
+        $version = null;
+
+        if ( $this->install_required() && false === get_transient( '_wl_installing' ) ) {
+            set_transient( '_wl_installing', true, 5 * MINUTE_IN_SECONDS );
+            /** @var Wordlift_Install $install */
+            foreach ( $this->installs as $install ) {
+                // Get the install version.
+                $version = $install->get_version();
+
+                if ( version_compare( $version, $this->get_current_version(), '>' )
+                     || $install->must_install() ) {
+                    $class_name = get_class( $install );
+
+                    $this->log->info( "Current version is {$this->get_current_version()}, installing $class_name..." );
+                    // Install version.
+                    $install->install();
+
+
+                    $this->log->info( "$class_name installed." );
+
+                    // Bump the version.
+                    update_option( 'wl_db_version', $version );
+                }
+
+            }
+
+            @delete_transient( '_wl_installing' );
+
+        }
+
+    }
+
+    private function install_required() {
+
+        /** @var Wordlift_Install $install */
+        foreach ( $this->installs as $install ) {
+            // Get the install version.
+            $version = $install->get_version();
+
+            if ( version_compare( $version, $this->get_current_version(), '>' )
+                 || $install->must_install() ) {
+                return true;
+            }
+
+        }
+
+        return false;
+    }
+
+    /**
+     * Retrieve the current db version.
+     *
+     * @return type
+     */
+    private function get_current_version() {
+        return get_option( 'wl_db_version', '0.0.0' );
+    }
 
 
 }

Spacing +37 added lines, -37 removed lines

@@ -49,27 +49,27 @@ 
 	public function __construct() {
 
 		/** Installs. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-1-0-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-10-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-12-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-14-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-15-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-18-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-18-3.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-19-5.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-20-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-23-4.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-24-2.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-all-entity-types.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-package-type.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-25-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-27-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-27-1.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-28-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-32-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-33-9.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-36-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-1-0-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-10-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-12-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-14-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-15-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-18-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-18-3.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-19-5.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-20-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-23-4.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-24-2.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-all-entity-types.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-package-type.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-25-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-27-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-27-1.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-28-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-32-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-33-9.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-36-0.php';
 		// Get the install services.
 		$this->installs = array(
 			new Wordlift_Install_1_0_0(),
@@ -101,9 +101,9 @@ 
 		);
 		self::$instance = $this;
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
-		add_action( 'init', array( $this, 'install' ) );
+		add_action('init', array($this, 'install'));
 
 	}
 
@@ -129,31 +129,31 @@ 
 
 		$version = null;
 
-		if ( $this->install_required() && false === get_transient( '_wl_installing' ) ) {
-			set_transient( '_wl_installing', true, 5 * MINUTE_IN_SECONDS );
+		if ($this->install_required() && false === get_transient('_wl_installing')) {
+			set_transient('_wl_installing', true, 5 * MINUTE_IN_SECONDS);
 			/** @var Wordlift_Install $install */
-			foreach ( $this->installs as $install ) {
+			foreach ($this->installs as $install) {
 				// Get the install version.
 				$version = $install->get_version();
 
-				if ( version_compare( $version, $this->get_current_version(), '>' )
-				     || $install->must_install() ) {
-					$class_name = get_class( $install );
+				if (version_compare($version, $this->get_current_version(), '>')
+				     || $install->must_install()) {
+					$class_name = get_class($install);
 
-					$this->log->info( "Current version is {$this->get_current_version()}, installing $class_name..." );
+					$this->log->info("Current version is {$this->get_current_version()}, installing $class_name...");
 					// Install version.
 					$install->install();
 
 
-					$this->log->info( "$class_name installed." );
+					$this->log->info("$class_name installed.");
 
 					// Bump the version.
-					update_option( 'wl_db_version', $version );
+					update_option('wl_db_version', $version);
 				}
 
 			}
 
-			@delete_transient( '_wl_installing' );
+			@delete_transient('_wl_installing');
 
 		}
 
@@ -162,12 +162,12 @@ 
 	private function install_required() {
 
 		/** @var Wordlift_Install $install */
-		foreach ( $this->installs as $install ) {
+		foreach ($this->installs as $install) {
 			// Get the install version.
 			$version = $install->get_version();
 
-			if ( version_compare( $version, $this->get_current_version(), '>' )
-			     || $install->must_install() ) {
+			if (version_compare($version, $this->get_current_version(), '>')
+			     || $install->must_install()) {
 				return true;
 			}
 
@@ -182,7 +182,7 @@ 
 	 * @return type
 	 */
 	private function get_current_version() {
-		return get_option( 'wl_db_version', '0.0.0' );
+		return get_option('wl_db_version', '0.0.0');
 	}
 
 

src/install/class-wordlift-install-3-36-0.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 
 /**
  * @since 3.36.0
@@ -15,10 +15,10 @@ 
 
 	public function install() {
 
-		$is_woocommerce_extension_installed = defined( 'WL_WOO_VERSION' );
+		$is_woocommerce_extension_installed = defined('WL_WOO_VERSION');
 
-		if ( $is_woocommerce_extension_installed ) {
-			do_action( 'wl_install_and_activate_advanced-custom-fields-for-schema-org' );
+		if ($is_woocommerce_extension_installed) {
+			do_action('wl_install_and_activate_advanced-custom-fields-for-schema-org');
 		}
 	}
 

Indentation +10 added lines, -10 removed lines

@@ -8,18 +8,18 @@
  */
 class Wordlift_Install_3_36_0 extends Wordlift_Install {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	protected static $version = '3.36.1';
+    /**
+     * {@inheritdoc}
+     */
+    protected static $version = '3.36.1';
 
-	public function install() {
+    public function install() {
 
-		$is_woocommerce_extension_installed = defined( 'WL_WOO_VERSION' );
+        $is_woocommerce_extension_installed = defined( 'WL_WOO_VERSION' );
 
-		if ( $is_woocommerce_extension_installed ) {
-			do_action( 'wl_install_and_activate_advanced-custom-fields-for-schema-org' );
-		}
-	}
+        if ( $is_woocommerce_extension_installed ) {
+            do_action( 'wl_install_and_activate_advanced-custom-fields-for-schema-org' );
+        }
+    }
 
 }

src/modules/acf4so/includes/Installer.php

Indentation +71 added lines, -71 removed lines

@@ -7,77 +7,77 @@
 
 class Installer {
 
-	/**
-	 * @var Plugin
-	 */
-	private $plugin;
-	/**
-	 * @var Plugin_Upgrader
-	 */
-	private $upgrader;
-
-	/**
-	 * @param $plugin Plugin
-	 * @param $upgrader Plugin_Upgrader
-	 */
-	function __construct( Plugin_Upgrader $upgrader, Plugin $plugin ) {
-		$this->upgrader = $upgrader;
-		$this->plugin   = $plugin;
-	}
-
-	function install() {
-
-		if ( $this->plugin->is_plugin_installed() ) {
-			return;
-		}
-
-		try {
-			wp_cache_flush();
-			$this->upgrader->install( $this->plugin->get_zip_url() );
-		} catch ( \Exception $e ) {
-			error_log( "Error caught when installing plugin " . $this->plugin->get_slug() . " error: " . $e->getMessage() );
-		}
-	}
-
-	function activate() {
-		if ( $this->plugin->is_plugin_activated() ) {
-			return;
-		}
-		activate_plugin( $this->plugin->get_slug() );
-	}
-
-	public function install_and_activate_on_entity_type_change( $new_value, $old_value ) {
-		if ( ! $new_value ) {
-			return;
-		}
-		$this->install_and_activate();
-	}
-
-	public function install_and_activate() {
-		ob_start();
-		$this->install();
-		$this->activate();
-		ob_end_clean();
-	}
-
-	public function admin_ajax_install_and_activate() {
-
-		$this->install_and_activate();
-
-		if ( $this->plugin->is_plugin_installed() && $this->plugin->is_plugin_activated() ) {
-			wp_send_json_success(null, 200);
-		}
-
-		wp_send_json_error(null, 400);
-	}
-
-
-	public function register_hooks() {
-		add_action( 'wl_feature__change__entity-types-professional', [ $this, 'install_and_activate_on_entity_type_change' ], 10, 2 );
-		add_action( 'wl_feature__change__entity-types-business', [ $this, 'install_and_activate_on_entity_type_change' ], 10, 2 );
-		add_action( "wp_ajax_wl_install_and_activate_{$this->plugin->get_name()}", [ $this, 'admin_ajax_install_and_activate' ] );
-		add_action("wl_install_and_activate_{$this->plugin->get_name()}", [ $this, 'install_and_activate'] );
-	}
+    /**
+     * @var Plugin
+     */
+    private $plugin;
+    /**
+     * @var Plugin_Upgrader
+     */
+    private $upgrader;
+
+    /**
+     * @param $plugin Plugin
+     * @param $upgrader Plugin_Upgrader
+     */
+    function __construct( Plugin_Upgrader $upgrader, Plugin $plugin ) {
+        $this->upgrader = $upgrader;
+        $this->plugin   = $plugin;
+    }
+
+    function install() {
+
+        if ( $this->plugin->is_plugin_installed() ) {
+            return;
+        }
+
+        try {
+            wp_cache_flush();
+            $this->upgrader->install( $this->plugin->get_zip_url() );
+        } catch ( \Exception $e ) {
+            error_log( "Error caught when installing plugin " . $this->plugin->get_slug() . " error: " . $e->getMessage() );
+        }
+    }
+
+    function activate() {
+        if ( $this->plugin->is_plugin_activated() ) {
+            return;
+        }
+        activate_plugin( $this->plugin->get_slug() );
+    }
+
+    public function install_and_activate_on_entity_type_change( $new_value, $old_value ) {
+        if ( ! $new_value ) {
+            return;
+        }
+        $this->install_and_activate();
+    }
+
+    public function install_and_activate() {
+        ob_start();
+        $this->install();
+        $this->activate();
+        ob_end_clean();
+    }
+
+    public function admin_ajax_install_and_activate() {
+
+        $this->install_and_activate();
+
+        if ( $this->plugin->is_plugin_installed() && $this->plugin->is_plugin_activated() ) {
+            wp_send_json_success(null, 200);
+        }
+
+        wp_send_json_error(null, 400);
+    }
+
+
+    public function register_hooks() {
+        add_action( 'wl_feature__change__entity-types-professional', [ $this, 'install_and_activate_on_entity_type_change' ], 10, 2 );
+        add_action( 'wl_feature__change__entity-types-business', [ $this, 'install_and_activate_on_entity_type_change' ], 10, 2 );
+        add_action( "wp_ajax_wl_install_and_activate_{$this->plugin->get_name()}", [ $this, 'admin_ajax_install_and_activate' ] );
+        add_action("wl_install_and_activate_{$this->plugin->get_name()}", [ $this, 'install_and_activate'] );
+    }
 
 
 }

Spacing +14 added lines, -14 removed lines

@@ -20,34 +20,34 @@ 
 	 * @param $plugin Plugin
 	 * @param $upgrader Plugin_Upgrader
 	 */
-	function __construct( Plugin_Upgrader $upgrader, Plugin $plugin ) {
+	function __construct(Plugin_Upgrader $upgrader, Plugin $plugin) {
 		$this->upgrader = $upgrader;
 		$this->plugin   = $plugin;
 	}
 
 	function install() {
 
-		if ( $this->plugin->is_plugin_installed() ) {
+		if ($this->plugin->is_plugin_installed()) {
 			return;
 		}
 
 		try {
 			wp_cache_flush();
-			$this->upgrader->install( $this->plugin->get_zip_url() );
-		} catch ( \Exception $e ) {
-			error_log( "Error caught when installing plugin " . $this->plugin->get_slug() . " error: " . $e->getMessage() );
+			$this->upgrader->install($this->plugin->get_zip_url());
+		} catch (\Exception $e) {
+			error_log("Error caught when installing plugin ".$this->plugin->get_slug()." error: ".$e->getMessage());
 		}
 	}
 
 	function activate() {
-		if ( $this->plugin->is_plugin_activated() ) {
+		if ($this->plugin->is_plugin_activated()) {
 			return;
 		}
-		activate_plugin( $this->plugin->get_slug() );
+		activate_plugin($this->plugin->get_slug());
 	}
 
-	public function install_and_activate_on_entity_type_change( $new_value, $old_value ) {
-		if ( ! $new_value ) {
+	public function install_and_activate_on_entity_type_change($new_value, $old_value) {
+		if ( ! $new_value) {
 			return;
 		}
 		$this->install_and_activate();
@@ -64,7 +64,7 @@ 
 
 		$this->install_and_activate();
 
-		if ( $this->plugin->is_plugin_installed() && $this->plugin->is_plugin_activated() ) {
+		if ($this->plugin->is_plugin_installed() && $this->plugin->is_plugin_activated()) {
 			wp_send_json_success(null, 200);
 		}
 
@@ -73,10 +73,10 @@ 
 
 
 	public function register_hooks() {
-		add_action( 'wl_feature__change__entity-types-professional', [ $this, 'install_and_activate_on_entity_type_change' ], 10, 2 );
-		add_action( 'wl_feature__change__entity-types-business', [ $this, 'install_and_activate_on_entity_type_change' ], 10, 2 );
-		add_action( "wp_ajax_wl_install_and_activate_{$this->plugin->get_name()}", [ $this, 'admin_ajax_install_and_activate' ] );
-		add_action("wl_install_and_activate_{$this->plugin->get_name()}", [ $this, 'install_and_activate'] );
+		add_action('wl_feature__change__entity-types-professional', [$this, 'install_and_activate_on_entity_type_change'], 10, 2);
+		add_action('wl_feature__change__entity-types-business', [$this, 'install_and_activate_on_entity_type_change'], 10, 2);
+		add_action("wp_ajax_wl_install_and_activate_{$this->plugin->get_name()}", [$this, 'admin_ajax_install_and_activate']);
+		add_action("wl_install_and_activate_{$this->plugin->get_name()}", [$this, 'install_and_activate']);
 	}
 
 

src/modules/acf4so/includes/Notices.php

Indentation +55 added lines, -55 removed lines

@@ -4,68 +4,68 @@ 
 
 class Notices {
 
-	/**
-	 * @var Plugin
-	 */
-	private $acf4so_plugin;
+    /**
+     * @var Plugin
+     */
+    private $acf4so_plugin;
 
-	function __construct( Plugin $plugin ) {
-		$this->acf4so_plugin = $plugin;
-	}
+    function __construct( Plugin $plugin ) {
+        $this->acf4so_plugin = $plugin;
+    }
 
-	public function register_hooks() {
-		add_action( 'admin_notices', [ $this, 'admin_notices' ] );
-	}
+    public function register_hooks() {
+        add_action( 'admin_notices', [ $this, 'admin_notices' ] );
+    }
 
-	public function admin_notices() {
+    public function admin_notices() {
 
-		$is_package_type_supported = $this->is_package_type_supported();
+        $is_package_type_supported = $this->is_package_type_supported();
 
-		$is_woocommerce_plugin_installed = defined( 'WL_WOO_VERSION' );
+        $is_woocommerce_plugin_installed = defined( 'WL_WOO_VERSION' );
 
-		if ( ! $is_package_type_supported && ! $is_woocommerce_plugin_installed ) {
-			// Dont display notice.
-			return;
-		}
+        if ( ! $is_package_type_supported && ! $is_woocommerce_plugin_installed ) {
+            // Dont display notice.
+            return;
+        }
 
-		/**
-		 * 1. When package type is supported and acf4so not installed or activated then the notice should appear.
-		 * 2. When woocommerce plugin installed and acf4so not installed or activated then the notice should appear.
-		 */
-		if ( ! $this->acf4so_plugin->is_plugin_installed() ) {
-			$this->display_notice(
-				__( "WordLift detected that <b>Advanced Custom Fields for Schema.org</b> is not installed and, you're loosing out on full Schema.org support.", 'wordlift' ),
-				__( 'Reinstall & Activate', 'wordlift' )
-			);
+        /**
+         * 1. When package type is supported and acf4so not installed or activated then the notice should appear.
+         * 2. When woocommerce plugin installed and acf4so not installed or activated then the notice should appear.
+         */
+        if ( ! $this->acf4so_plugin->is_plugin_installed() ) {
+            $this->display_notice(
+                __( "WordLift detected that <b>Advanced Custom Fields for Schema.org</b> is not installed and, you're loosing out on full Schema.org support.", 'wordlift' ),
+                __( 'Reinstall & Activate', 'wordlift' )
+            );
 
-			// Dont display notice.
-			return;
-		}
+            // Dont display notice.
+            return;
+        }
 
-		if ( ! $this->acf4so_plugin->is_plugin_activated() ) {
-			$this->display_notice(
-				__( "WordLift detected that <b>Advanced Custom Fields for Schema.org</b> is deactivated and, you're loosing out on full Schema.org support.", 'wordlift' ),
-				__( 'Reactivate', 'wordlift' )
-			);
+        if ( ! $this->acf4so_plugin->is_plugin_activated() ) {
+            $this->display_notice(
+                __( "WordLift detected that <b>Advanced Custom Fields for Schema.org</b> is deactivated and, you're loosing out on full Schema.org support.", 'wordlift' ),
+                __( 'Reactivate', 'wordlift' )
+            );
 
-			return;
-		}
+            return;
+        }
 
-	}
+    }
 
 
-	private function display_notice( $message, $button_text ) {
+    private function display_notice( $message, $button_text ) {
 
-		$installation_success_message = __(
-			'</p>WordLift: <b>Advanced Custom Fields for Schema.org</b> plugin installed and activated.</p>',
-			'wordlift'
-		);
+        $installation_success_message = __(
+            '</p>WordLift: <b>Advanced Custom Fields for Schema.org</b> plugin installed and activated.</p>',
+            'wordlift'
+        );
 
-		$installing_message          = __( 'Installing <span class="spinner is-active"></span>', 'wordlift' );
-		$installation_failed_message = __( '<p>Wordlift: Advanced Custom Fields for Schema.org</b> Installation failed, please retry or contact support@wordlift.io</p>' .
-		                                   '<button class="button action" onclick="wordliftInstallAcf4so(this)">Retry</button>', 'wordlift' );
+        $installing_message          = __( 'Installing <span class="spinner is-active"></span>', 'wordlift' );
+        $installation_failed_message = __( '<p>Wordlift: Advanced Custom Fields for Schema.org</b> Installation failed, please retry or contact support@wordlift.io</p>' .
+                                            '<button class="button action" onclick="wordliftInstallAcf4so(this)">Retry</button>', 'wordlift' );
 
-		?>
+        ?>
 
         <script>
             window.addEventListener("load", function () {
@@ -101,14 +101,14 @@ 
             <br/>
         </div>
 		<?php
-	}
-
-	/**
-	 * @return bool
-	 */
-	private function is_package_type_supported() {
-		return apply_filters( 'wl_feature__enable__entity-types-professional', false ) ||
-		       apply_filters( 'wl_feature__enable__entity-types-business', false );
-	}
+    }
+
+    /**
+     * @return bool
+     */
+    private function is_package_type_supported() {
+        return apply_filters( 'wl_feature__enable__entity-types-professional', false ) ||
+               apply_filters( 'wl_feature__enable__entity-types-business', false );
+    }
 
 }
\ No newline at end of file

Spacing +18 added lines, -18 removed lines

@@ -9,21 +9,21 @@ 
 	 */
 	private $acf4so_plugin;
 
-	function __construct( Plugin $plugin ) {
+	function __construct(Plugin $plugin) {
 		$this->acf4so_plugin = $plugin;
 	}
 
 	public function register_hooks() {
-		add_action( 'admin_notices', [ $this, 'admin_notices' ] );
+		add_action('admin_notices', [$this, 'admin_notices']);
 	}
 
 	public function admin_notices() {
 
 		$is_package_type_supported = $this->is_package_type_supported();
 
-		$is_woocommerce_plugin_installed = defined( 'WL_WOO_VERSION' );
+		$is_woocommerce_plugin_installed = defined('WL_WOO_VERSION');
 
-		if ( ! $is_package_type_supported && ! $is_woocommerce_plugin_installed ) {
+		if ( ! $is_package_type_supported && ! $is_woocommerce_plugin_installed) {
 			// Dont display notice.
 			return;
 		}
@@ -32,20 +32,20 @@ 
 		 * 1. When package type is supported and acf4so not installed or activated then the notice should appear.
 		 * 2. When woocommerce plugin installed and acf4so not installed or activated then the notice should appear.
 		 */
-		if ( ! $this->acf4so_plugin->is_plugin_installed() ) {
+		if ( ! $this->acf4so_plugin->is_plugin_installed()) {
 			$this->display_notice(
-				__( "WordLift detected that <b>Advanced Custom Fields for Schema.org</b> is not installed and, you're loosing out on full Schema.org support.", 'wordlift' ),
-				__( 'Reinstall & Activate', 'wordlift' )
+				__("WordLift detected that <b>Advanced Custom Fields for Schema.org</b> is not installed and, you're loosing out on full Schema.org support.", 'wordlift'),
+				__('Reinstall & Activate', 'wordlift')
 			);
 
 			// Dont display notice.
 			return;
 		}
 
-		if ( ! $this->acf4so_plugin->is_plugin_activated() ) {
+		if ( ! $this->acf4so_plugin->is_plugin_activated()) {
 			$this->display_notice(
-				__( "WordLift detected that <b>Advanced Custom Fields for Schema.org</b> is deactivated and, you're loosing out on full Schema.org support.", 'wordlift' ),
-				__( 'Reactivate', 'wordlift' )
+				__("WordLift detected that <b>Advanced Custom Fields for Schema.org</b> is deactivated and, you're loosing out on full Schema.org support.", 'wordlift'),
+				__('Reactivate', 'wordlift')
 			);
 
 			return;
@@ -54,16 +54,16 @@ 
 	}
 
 
-	private function display_notice( $message, $button_text ) {
+	private function display_notice($message, $button_text) {
 
 		$installation_success_message = __(
 			'</p>WordLift: <b>Advanced Custom Fields for Schema.org</b> plugin installed and activated.</p>',
 			'wordlift'
 		);
 
-		$installing_message          = __( 'Installing <span class="spinner is-active"></span>', 'wordlift' );
-		$installation_failed_message = __( '<p>Wordlift: Advanced Custom Fields for Schema.org</b> Installation failed, please retry or contact support@wordlift.io</p>' .
-		                                   '<button class="button action" onclick="wordliftInstallAcf4so(this)">Retry</button>', 'wordlift' );
+		$installing_message          = __('Installing <span class="spinner is-active"></span>', 'wordlift');
+		$installation_failed_message = __('<p>Wordlift: Advanced Custom Fields for Schema.org</b> Installation failed, please retry or contact support@wordlift.io</p>'.
+		                                   '<button class="button action" onclick="wordliftInstallAcf4so(this)">Retry</button>', 'wordlift');
 
 		?>
 
@@ -72,7 +72,7 @@ 
                 const pluginInstallationNotice = document.getElementById("wordlift_acf4so_plugin_installation_notice")
                 const installPlugin = (ajaxUrl) => fetch(`${ajaxUrl}?action=wl_install_and_activate_advanced-custom-fields-for-schema-org`)
                     .then(response => response.ok ? response.json() : Promise.reject())
-                const ajaxUrl = "<?php echo esc_html( parse_url( admin_url( 'admin-ajax.php' ), PHP_URL_PATH ) ); ?>"
+                const ajaxUrl = "<?php echo esc_html(parse_url(admin_url('admin-ajax.php'), PHP_URL_PATH)); ?>"
                 window.wordliftInstallAcf4so = function (installBtn) {
                     installBtn.innerHTML = `<?php echo $installing_message ?>`
                     installPlugin(ajaxUrl)
@@ -94,7 +94,7 @@ 
             <p>
 				<?php echo $message; ?>
                 <button class="button action right" onclick="wordliftInstallAcf4so(this)">
-					<?php esc_html_e( $button_text ); ?>
+					<?php esc_html_e($button_text); ?>
 
                 </button>
             </p>
@@ -107,8 +107,8 @@ 
 	 * @return bool
 	 */
 	private function is_package_type_supported() {
-		return apply_filters( 'wl_feature__enable__entity-types-professional', false ) ||
-		       apply_filters( 'wl_feature__enable__entity-types-business', false );
+		return apply_filters('wl_feature__enable__entity-types-professional', false) ||
+		       apply_filters('wl_feature__enable__entity-types-business', false);
 	}
 
 }
\ No newline at end of file

src/includes/class-wordlift-jsonld-website-converter.php

Indentation +57 added lines, -57 removed lines

@@ -15,70 +15,70 @@
  */
 class Wordlift_Website_Jsonld_Converter extends Wordlift_Post_To_Jsonld_Converter {
 
-	/**
-	 * Convert the home/blog page to a JSON-LD array.
-	 *
-	 * @return array A JSON-LD array.
-	 * @since 3.14.0
-	 *
-	 */
-	public function create_schema() {
+    /**
+     * Convert the home/blog page to a JSON-LD array.
+     *
+     * @return array A JSON-LD array.
+     * @since 3.14.0
+     *
+     */
+    public function create_schema() {
 
-		// Create new jsonld.
-		$home_url = home_url( '/' );
+        // Create new jsonld.
+        $home_url = home_url( '/' );
 
-		$jsonld = array(
-			'@context'      => 'http://schema.org',
-			'@type'         => 'WebSite',
-			'@id'           => "$home_url#website",
-			'name'          => html_entity_decode( get_bloginfo( 'name' ), ENT_QUOTES ),
-			'alternateName' => html_entity_decode( get_bloginfo( 'description' ), ENT_QUOTES ),
-			'url'           => $home_url,
-		);
+        $jsonld = array(
+            '@context'      => 'http://schema.org',
+            '@type'         => 'WebSite',
+            '@id'           => "$home_url#website",
+            'name'          => html_entity_decode( get_bloginfo( 'name' ), ENT_QUOTES ),
+            'alternateName' => html_entity_decode( get_bloginfo( 'description' ), ENT_QUOTES ),
+            'url'           => $home_url,
+        );
 
-		// Add publisher information.
-		$this->set_publisher( $jsonld );
+        // Add publisher information.
+        $this->set_publisher( $jsonld );
 
-		// Add search action.
-		$this->set_search_action( $jsonld );
+        // Add search action.
+        $this->set_search_action( $jsonld );
 
-		/**
-		 * Call the `wl_website_jsonld` filter.
-		 *
-		 * @param array $jsonld The JSON-LD structure.
-		 *
-		 * @since 3.14.0
-		 *
-		 * @api
-		 *
-		 */
-		return apply_filters( 'wl_website_jsonld', $jsonld );
-	}
+        /**
+         * Call the `wl_website_jsonld` filter.
+         *
+         * @param array $jsonld The JSON-LD structure.
+         *
+         * @since 3.14.0
+         *
+         * @api
+         *
+         */
+        return apply_filters( 'wl_website_jsonld', $jsonld );
+    }
 
-	/**
-	 * Add SearchAction part to the schema
-	 *
-	 * @param array $params The parameters array.
-	 *
-	 * @since 3.14.0
-	 *
-	 */
-	private function set_search_action( &$params ) {
-		/**
-		 * Filter: 'wl_jsonld_search_url' - Allows filtering of the search URL.
-		 *
-		 * @since  3.14.0
-		 * @api    string $search_url The search URL for this site with a `{search_term_string}` variable.
-		 */
-		$search_url = apply_filters( 'wl_jsonld_search_url', home_url( '/' ) . '?s={search_term_string}' );
+    /**
+     * Add SearchAction part to the schema
+     *
+     * @param array $params The parameters array.
+     *
+     * @since 3.14.0
+     *
+     */
+    private function set_search_action( &$params ) {
+        /**
+         * Filter: 'wl_jsonld_search_url' - Allows filtering of the search URL.
+         *
+         * @since  3.14.0
+         * @api    string $search_url The search URL for this site with a `{search_term_string}` variable.
+         */
+        $search_url = apply_filters( 'wl_jsonld_search_url', home_url( '/' ) . '?s={search_term_string}' );
 
-		// Add search action
-		$params['potentialAction'] = array(
-			'@type'       => 'SearchAction',
-			'target'      => $search_url,
-			'query-input' => 'required name=search_term_string',
-		);
+        // Add search action
+        $params['potentialAction'] = array(
+            '@type'       => 'SearchAction',
+            'target'      => $search_url,
+            'query-input' => 'required name=search_term_string',
+        );
 
-	}
+    }
 
 }

Spacing +8 added lines, -8 removed lines

@@ -25,22 +25,22 @@ 
 	public function create_schema() {
 
 		// Create new jsonld.
-		$home_url = home_url( '/' );
+		$home_url = home_url('/');
 
 		$jsonld = array(
 			'@context'      => 'http://schema.org',
 			'@type'         => 'WebSite',
 			'@id'           => "$home_url#website",
-			'name'          => html_entity_decode( get_bloginfo( 'name' ), ENT_QUOTES ),
-			'alternateName' => html_entity_decode( get_bloginfo( 'description' ), ENT_QUOTES ),
+			'name'          => html_entity_decode(get_bloginfo('name'), ENT_QUOTES),
+			'alternateName' => html_entity_decode(get_bloginfo('description'), ENT_QUOTES),
 			'url'           => $home_url,
 		);
 
 		// Add publisher information.
-		$this->set_publisher( $jsonld );
+		$this->set_publisher($jsonld);
 
 		// Add search action.
-		$this->set_search_action( $jsonld );
+		$this->set_search_action($jsonld);
 
 		/**
 		 * Call the `wl_website_jsonld` filter.
@@ -52,7 +52,7 @@ 
 		 * @api
 		 *
 		 */
-		return apply_filters( 'wl_website_jsonld', $jsonld );
+		return apply_filters('wl_website_jsonld', $jsonld);
 	}
 
 	/**
@@ -63,14 +63,14 @@ 
 	 * @since 3.14.0
 	 *
 	 */
-	private function set_search_action( &$params ) {
+	private function set_search_action(&$params) {
 		/**
 		 * Filter: 'wl_jsonld_search_url' - Allows filtering of the search URL.
 		 *
 		 * @since  3.14.0
 		 * @api    string $search_url The search URL for this site with a `{search_term_string}` variable.
 		 */
-		$search_url = apply_filters( 'wl_jsonld_search_url', home_url( '/' ) . '?s={search_term_string}' );
+		$search_url = apply_filters('wl_jsonld_search_url', home_url('/').'?s={search_term_string}');
 
 		// Add search action
 		$params['potentialAction'] = array(

src/includes/class-wordlift-abstract-post-to-jsonld-converter.php

Indentation +374 added lines, -374 removed lines

@@ -23,400 +23,400 @@
  */
 abstract class Wordlift_Abstract_Post_To_Jsonld_Converter implements Wordlift_Post_Converter {
 
-	/**
-	 * The JSON-LD context.
-	 *
-	 * @since 3.10.0
-	 */
-	const CONTEXT = 'http://schema.org';
-
-	/**
-	 * A {@link Wordlift_Entity_Type_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access protected
-	 * @var \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
-	 */
-	protected $entity_type_service;
-
-	/**
-	 * A {@link Wordlift_User_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service A {@link Wordlift_User_Service} instance.
-	 */
-	protected $user_service;
-
-	/**
-	 * A {@link Wordlift_Attachment_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var \Wordlift_Attachment_Service $attachment_service A {@link Wordlift_Attachment_Service} instance.
-	 */
-	protected $attachment_service;
-
-	/**
-	 * @var Wordlift_Property_Getter
-	 */
-	private $property_getter;
-
-	/**
-	 * Wordlift_Post_To_Jsonld_Converter constructor.
-	 *
-	 * @param \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
-	 * @param \Wordlift_User_Service $user_service A {@link Wordlift_User_Service} instance.
-	 * @param \Wordlift_Attachment_Service $attachment_service A {@link Wordlift_Attachment_Service} instance.
-	 * @param \Wordlift_Property_Getter $property_getter
-	 *
-	 * @since 3.10.0
-	 *
-	 */
-	public function __construct( $entity_type_service, $user_service, $attachment_service, $property_getter ) {
-		$this->entity_type_service = $entity_type_service;
-		$this->user_service        = $user_service;
-		$this->attachment_service  = $attachment_service;
-		$this->property_getter     = $property_getter;
-	}
-
-	/**
-	 * Convert the provided {@link WP_Post} to a JSON-LD array. Any entity reference
-	 * found while processing the post is set in the $references array.
-	 *
-	 * @param int $post_id The post id.
-	 * @param array $references An array of entity references.
-	 * @param array $references_infos
-	 *
-	 * @return array A JSON-LD array.
-	 * @since 3.10.0
-	 */
-	public function convert( $post_id, &$references = array(), &$references_infos = array() ) {
-
-		// Get the post instance.
-		$post = get_post( $post_id );
-		if ( null === $post ) {
-			// Post not found.
-			return null;
-		}
-
-		// Get the post URI @id.
-		$id = Wordlift_Entity_Service::get_instance()->get_uri( $post->ID );
-		if ( is_null( $id ) ) {
-			$id = 'get_uri returned null, dataset is ' . wl_configuration_get_redlink_dataset_uri();
-		}
-
-		/*
+    /**
+     * The JSON-LD context.
+     *
+     * @since 3.10.0
+     */
+    const CONTEXT = 'http://schema.org';
+
+    /**
+     * A {@link Wordlift_Entity_Type_Service} instance.
+     *
+     * @since  3.10.0
+     * @access protected
+     * @var \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
+     */
+    protected $entity_type_service;
+
+    /**
+     * A {@link Wordlift_User_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var \Wordlift_User_Service $user_service A {@link Wordlift_User_Service} instance.
+     */
+    protected $user_service;
+
+    /**
+     * A {@link Wordlift_Attachment_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var \Wordlift_Attachment_Service $attachment_service A {@link Wordlift_Attachment_Service} instance.
+     */
+    protected $attachment_service;
+
+    /**
+     * @var Wordlift_Property_Getter
+     */
+    private $property_getter;
+
+    /**
+     * Wordlift_Post_To_Jsonld_Converter constructor.
+     *
+     * @param \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
+     * @param \Wordlift_User_Service $user_service A {@link Wordlift_User_Service} instance.
+     * @param \Wordlift_Attachment_Service $attachment_service A {@link Wordlift_Attachment_Service} instance.
+     * @param \Wordlift_Property_Getter $property_getter
+     *
+     * @since 3.10.0
+     *
+     */
+    public function __construct( $entity_type_service, $user_service, $attachment_service, $property_getter ) {
+        $this->entity_type_service = $entity_type_service;
+        $this->user_service        = $user_service;
+        $this->attachment_service  = $attachment_service;
+        $this->property_getter     = $property_getter;
+    }
+
+    /**
+     * Convert the provided {@link WP_Post} to a JSON-LD array. Any entity reference
+     * found while processing the post is set in the $references array.
+     *
+     * @param int $post_id The post id.
+     * @param array $references An array of entity references.
+     * @param array $references_infos
+     *
+     * @return array A JSON-LD array.
+     * @since 3.10.0
+     */
+    public function convert( $post_id, &$references = array(), &$references_infos = array() ) {
+
+        // Get the post instance.
+        $post = get_post( $post_id );
+        if ( null === $post ) {
+            // Post not found.
+            return null;
+        }
+
+        // Get the post URI @id.
+        $id = Wordlift_Entity_Service::get_instance()->get_uri( $post->ID );
+        if ( is_null( $id ) ) {
+            $id = 'get_uri returned null, dataset is ' . wl_configuration_get_redlink_dataset_uri();
+        }
+
+        /*
 		 * The `types` variable holds one or more entity types. The `type` variable isn't used anymore.
 		 *
 		 * @since 3.20.0 We support more than one entity type.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		//		// Get the entity @type. We consider `post` BlogPostings.
-		//		$type = $this->entity_type_service->get( $post_id );
-		$types = $this->entity_type_service->get_names( $post_id );
-		$type  = self::make_one( $types );
-
-		// Prepare the response.
-		$jsonld = array(
-			'@context'    => self::CONTEXT,
-			'@id'         => $id,
-			'@type'       => $type,
-			'description' => Wordlift_Post_Excerpt_Helper::get_text_excerpt( $post ),
-		);
-
-		// Set the `mainEntityOfPage` property if the post has some contents.
-		/*
+        //		// Get the entity @type. We consider `post` BlogPostings.
+        //		$type = $this->entity_type_service->get( $post_id );
+        $types = $this->entity_type_service->get_names( $post_id );
+        $type  = self::make_one( $types );
+
+        // Prepare the response.
+        $jsonld = array(
+            '@context'    => self::CONTEXT,
+            '@id'         => $id,
+            '@type'       => $type,
+            'description' => Wordlift_Post_Excerpt_Helper::get_text_excerpt( $post ),
+        );
+
+        // Set the `mainEntityOfPage` property if the post has some contents.
+        /*
 		 * Apply the `wl_post_content` filter, in case 3rd parties want to change the post content, e.g.
 		 * because the content is written elsewhere.
 		 *
 		 * @since 3.20.0
 		 */
-		$post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
-		if ( ! empty( $post_content ) ) {
-			// We're setting the `mainEntityOfPage` to signal which one is the
-			// main entity for the specified URL. It might be however that the
-			// post/page is actually about another specific entity. How WL deals
-			// with that hasn't been defined yet (see https://github.com/insideout10/wordlift-plugin/issues/451).
-			//
-			// See http://schema.org/mainEntityOfPage
-			//
-			// No need to specify `'@type' => 'WebPage'.
-			//
-			// See https://github.com/insideout10/wordlift-plugin/issues/451.
-			$jsonld['mainEntityOfPage'] = get_the_permalink( $post->ID );
-
-			/**
-			 * @see https://github.com/insideout10/wordlift-plugin/issues/1207
-			 *
-			 * @since 3.27.7
-			 */
-			if ( in_array( $type, array( 'Occupation', 'OccupationAggregationByEmployer' ) ) ) {
-				$jsonld['mainEntityOfPage'] = array(
-					'@type'        => 'WebPage',
-					'lastReviewed' => get_post_time( 'Y-m-d\TH:i:sP', true, $post, false )
-				);
-			}
-		};
-
-		$this->set_images( $this->attachment_service, $post, $jsonld );
-
-		// Get the entities referenced by this post and set it to the `references`
-		// array so that the caller can do further processing, such as printing out
-		// more of those references.
-		$references_without_locations = Object_Relation_Service::get_instance()
-		                                                       ->get_references( $post_id, Object_Type_Enum::POST );
-
-		/*
+        $post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
+        if ( ! empty( $post_content ) ) {
+            // We're setting the `mainEntityOfPage` to signal which one is the
+            // main entity for the specified URL. It might be however that the
+            // post/page is actually about another specific entity. How WL deals
+            // with that hasn't been defined yet (see https://github.com/insideout10/wordlift-plugin/issues/451).
+            //
+            // See http://schema.org/mainEntityOfPage
+            //
+            // No need to specify `'@type' => 'WebPage'.
+            //
+            // See https://github.com/insideout10/wordlift-plugin/issues/451.
+            $jsonld['mainEntityOfPage'] = get_the_permalink( $post->ID );
+
+            /**
+             * @see https://github.com/insideout10/wordlift-plugin/issues/1207
+             *
+             * @since 3.27.7
+             */
+            if ( in_array( $type, array( 'Occupation', 'OccupationAggregationByEmployer' ) ) ) {
+                $jsonld['mainEntityOfPage'] = array(
+                    '@type'        => 'WebPage',
+                    'lastReviewed' => get_post_time( 'Y-m-d\TH:i:sP', true, $post, false )
+                );
+            }
+        };
+
+        $this->set_images( $this->attachment_service, $post, $jsonld );
+
+        // Get the entities referenced by this post and set it to the `references`
+        // array so that the caller can do further processing, such as printing out
+        // more of those references.
+        $references_without_locations = Object_Relation_Service::get_instance()
+                                                                ->get_references( $post_id, Object_Type_Enum::POST );
+
+        /*
 		 * Add the locations to the references.
 		 *
 		 * @since 3.19.5
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/858.
 		 */
-		// A reference to use in closure.
-		$entity_type_service = $this->entity_type_service;
-		$locations           = array_reduce( $references_without_locations, function ( $carry, $reference ) use ( $entity_type_service ) {
-			/**
-			 * @var $reference Reference
-			 */
-			// @see https://schema.org/location for the schema.org types using the `location` property.
-			if ( ! $entity_type_service->has_entity_type( $reference->get_id(), 'http://schema.org/Action' )
-			     && ! $entity_type_service->has_entity_type( $reference->get_id(), 'http://schema.org/Event' )
-			     && ! $entity_type_service->has_entity_type( $reference->get_id(), 'http://schema.org/Organization' ) ) {
-
-				return $carry;
-			}
-			$post_location_ids        = get_post_meta( $reference->get_id(), Wordlift_Schema_Service::FIELD_LOCATION );
-			$post_location_references = array_map( function ( $post_id ) {
-				return new Post_Reference( $post_id );
-			}, $post_location_ids );
-
-			return array_merge( $carry, $post_location_references );
-		}, array() );
-
-		// Merge the references with the referenced locations if any.
-		$references = array_merge( $references_without_locations, $locations );
-
-		return $jsonld;
-	}
-
-	/**
-	 * If the provided value starts with the schema.org context, we remove the schema.org
-	 * part since it is set with the '@context'.
-	 *
-	 * @param string $value The property value.
-	 *
-	 * @return string The property value without the context.
-	 * @since 3.10.0
-	 *
-	 */
-	public function relative_to_context( $value ) {
-
-		return 0 === strpos( $value, self::CONTEXT . '/' ) ? substr( $value, strlen( self::CONTEXT ) + 1 ) : $value;
-	}
-
-	/**
-	 * Set the images, by looking for embedded images, for images loaded via the
-	 * gallery and for the featured image.
-	 *
-	 * Uses the cache service to store the results of this function for a day.
-	 *
-	 * @param $attachment_service Wordlift_Attachment_Service
-	 * @param WP_Post $post The target {@link WP_Post}.
-	 * @param array $jsonld The JSON-LD array.
-	 *
-	 * @since 3.10.0
-	 */
-	public static function set_images( $attachment_service, $post, &$jsonld ) {
-
-		// Prepare the attachment ids array.
-		$ids = array();
-
-		// Set the thumbnail id as first attachment id, if any.
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
-		if ( '' !== $thumbnail_id && 0 !== $thumbnail_id ) {
-			$ids[] = $thumbnail_id;
-		}
-
-		// For the time being the following is being removed since the query
-		// initiated by `get_image_embeds` is consuming lots of CPU.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/689.
-		//
-		// Get the embeds, removing existing ids.
-		if ( apply_filters( 'wl_feature__enable__image-embeds', false ) ) {
-			$embeds = array_diff( $attachment_service->get_image_embeds( $post->post_content ), $ids );
-		} else {
-			$embeds = array();
-		}
-
-		// Get the gallery, removing existing ids.
-		$gallery = array_diff( $attachment_service->get_gallery( $post ), $ids, $embeds );
-
-		// Map the attachment ids to images' data structured for schema.org use.
-		$images_with_sizes = array_filter(
-			array_reduce( array_merge( $ids, $embeds, $gallery ),
-				function ( $carry, $item ) {
-					/*
+        // A reference to use in closure.
+        $entity_type_service = $this->entity_type_service;
+        $locations           = array_reduce( $references_without_locations, function ( $carry, $reference ) use ( $entity_type_service ) {
+            /**
+             * @var $reference Reference
+             */
+            // @see https://schema.org/location for the schema.org types using the `location` property.
+            if ( ! $entity_type_service->has_entity_type( $reference->get_id(), 'http://schema.org/Action' )
+                 && ! $entity_type_service->has_entity_type( $reference->get_id(), 'http://schema.org/Event' )
+                 && ! $entity_type_service->has_entity_type( $reference->get_id(), 'http://schema.org/Organization' ) ) {
+
+                return $carry;
+            }
+            $post_location_ids        = get_post_meta( $reference->get_id(), Wordlift_Schema_Service::FIELD_LOCATION );
+            $post_location_references = array_map( function ( $post_id ) {
+                return new Post_Reference( $post_id );
+            }, $post_location_ids );
+
+            return array_merge( $carry, $post_location_references );
+        }, array() );
+
+        // Merge the references with the referenced locations if any.
+        $references = array_merge( $references_without_locations, $locations );
+
+        return $jsonld;
+    }
+
+    /**
+     * If the provided value starts with the schema.org context, we remove the schema.org
+     * part since it is set with the '@context'.
+     *
+     * @param string $value The property value.
+     *
+     * @return string The property value without the context.
+     * @since 3.10.0
+     *
+     */
+    public function relative_to_context( $value ) {
+
+        return 0 === strpos( $value, self::CONTEXT . '/' ) ? substr( $value, strlen( self::CONTEXT ) + 1 ) : $value;
+    }
+
+    /**
+     * Set the images, by looking for embedded images, for images loaded via the
+     * gallery and for the featured image.
+     *
+     * Uses the cache service to store the results of this function for a day.
+     *
+     * @param $attachment_service Wordlift_Attachment_Service
+     * @param WP_Post $post The target {@link WP_Post}.
+     * @param array $jsonld The JSON-LD array.
+     *
+     * @since 3.10.0
+     */
+    public static function set_images( $attachment_service, $post, &$jsonld ) {
+
+        // Prepare the attachment ids array.
+        $ids = array();
+
+        // Set the thumbnail id as first attachment id, if any.
+        $thumbnail_id = get_post_thumbnail_id( $post->ID );
+        if ( '' !== $thumbnail_id && 0 !== $thumbnail_id ) {
+            $ids[] = $thumbnail_id;
+        }
+
+        // For the time being the following is being removed since the query
+        // initiated by `get_image_embeds` is consuming lots of CPU.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/689.
+        //
+        // Get the embeds, removing existing ids.
+        if ( apply_filters( 'wl_feature__enable__image-embeds', false ) ) {
+            $embeds = array_diff( $attachment_service->get_image_embeds( $post->post_content ), $ids );
+        } else {
+            $embeds = array();
+        }
+
+        // Get the gallery, removing existing ids.
+        $gallery = array_diff( $attachment_service->get_gallery( $post ), $ids, $embeds );
+
+        // Map the attachment ids to images' data structured for schema.org use.
+        $images_with_sizes = array_filter(
+            array_reduce( array_merge( $ids, $embeds, $gallery ),
+                function ( $carry, $item ) {
+                    /*
 					* @todo: we're not sure that we're getting attachment data here, we
 					* should filter `false`s.
 					*/
 
-					$sources = array_merge(
-						Wordlift_Image_Service::get_sources( $item ),
-						array( wp_get_attachment_image_src( $item, 'full' ) )
-					);
-
-					$sources_with_image = array_filter( $sources, function ( $source ) {
-						return ! empty( $source[0] );
-					} );
-
-					// Get the attachment data.
-					// $attachment = wp_get_attachment_image_src( $item, 'full' );
-
-					// var_dump( array( "sources-$item" => Wordlift_Image_Service::get_sources( $item ) ) );
-
-					// Bail if image is not found.
-					// In some cases, you can delete the image from the database
-					// or from uploads dir, but the image id still exists as featured image
-					// or in [gallery] shortcode.
-					//					if ( empty( $attachment[0] ) ) {
-					if ( empty( $sources_with_image ) ) {
-						return $carry;
-					}
-
-					// Merge the arrays.
-					return array_merge(
-						$carry,
-						$sources_with_image
-					);
-				}
-				// Initial array.
-				, array() )
-		);
-
-		// Refactor data as per schema.org specifications.
-		$images = array_map( function ( $attachment ) {
-			return Wordlift_Abstract_Post_To_Jsonld_Converter::set_image_size(
-				array(
-					'@type' => 'ImageObject',
-					'url'   => $attachment[0],
-				), $attachment
-			);
-		}, $images_with_sizes );
-
-		// Add images if present.
-		if ( 0 < count( $images ) ) {
-			$jsonld['image'] = $images;
-		}
-
-	}
-
-	/**
-	 * If the provided array of values contains only one value, then one single
-	 * value is returned, otherwise the original array is returned.
-	 *
-	 * @param array $value An array of values.
-	 *
-	 * @return mixed|array A single value or the original array.
-	 * @since 3.20.0 The function has been moved from {@link Wordlift_Entity_Post_To_Jsonld_Converter} to
-	 *  {@link Wordlift_Abstract_Post_To_Jsonld_Converter}.
-	 * @since  3.8.0
-	 * @access private
-	 *
-	 */
-	protected static function make_one( $value ) {
-
-		return 1 === count( $value ) ? $value[0] : $value;
-	}
-
-	/**
-	 * Process the provided array by adding the width / height if the values
-	 * are available and are greater than 0.
-	 *
-	 * @param array $image The `ImageObject` array.
-	 * @param array $attachment The attachment array.
-	 *
-	 * @return array The enriched `ImageObject` array.
-	 * @since 3.14.0
-	 *
-	 */
-	public static function set_image_size( $image, $attachment ) {
-
-		// If you specify a "width" or "height" value you should leave out
-		// 'px'. For example: "width":"4608px" should be "width":"4608".
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/451.
-		if ( isset( $attachment[1] ) && is_numeric( $attachment[1] ) && 0 < $attachment[1] ) {
-			$image['width'] = $attachment[1];
-		}
-
-		if ( isset( $attachment[2] ) && is_numeric( $attachment[2] ) && 0 < $attachment[2] ) {
-			$image['height'] = $attachment[2];
-		}
-
-		return $image;
-	}
-
-
-	/**
-	 * Add data to the JSON-LD using the `custom_fields` array which contains the definitions of property
-	 * for the post entity type.
-	 *
-	 * @param array $jsonld The JSON-LD array.
-	 * @param array $fields The entity types field array.
-	 * @param WP_Post $post The target {@link WP_Post} instance.
-	 * @param array $references The references array.
-	 *
-	 * @since 3.20.0 This code moved from the above function `convert`, used for entity types defined in
-	 *  the {@link Wordlift_Schema_Service} class.
-	 *
-	 */
-	protected function process_type_custom_fields( &$jsonld, $fields, $post, &$references, &$references_infos ) {
-
-		// Set a reference to use in closures.
-		$converter = $this;
-
-		// Try each field on the entity.
-		foreach ( $fields as $key => $value ) {
-
-			// Get the predicate.
-			$name = $this->relative_to_context( $value['predicate'] );
-
-			// Get the value, the property service will get the right extractor
-			// for that property.
-			$value = $this->property_getter->get( $post->ID, $key, Object_Type_Enum::POST );
-
-			if ( empty( $value ) ) {
-				continue;
-			}
-
-			// Map the value to the property name.
-			// If we got an array with just one value, we return that one value.
-			// If we got a Wordlift_Property_Entity_Reference we get the URL.
-			$jsonld[ $name ] = self::make_one( array_map( function ( $item ) use ( $converter, &$references, &$references_infos ) {
-
-				if ( $item instanceof Wordlift_Property_Entity_Reference ) {
-
-					$url = $item->get_url();
-
-					// The refactored converters require the entity id.
-					$references[] = $item->get_id();
-
-					$references_infos[] = array( 'reference' => $item );
-
-					return array(
-						'@id' => $url,
-					);
-				}
-
-				return $converter->relative_to_context( $item );
-			}, $value ) );
-
-		}
-
-	}
+                    $sources = array_merge(
+                        Wordlift_Image_Service::get_sources( $item ),
+                        array( wp_get_attachment_image_src( $item, 'full' ) )
+                    );
+
+                    $sources_with_image = array_filter( $sources, function ( $source ) {
+                        return ! empty( $source[0] );
+                    } );
+
+                    // Get the attachment data.
+                    // $attachment = wp_get_attachment_image_src( $item, 'full' );
+
+                    // var_dump( array( "sources-$item" => Wordlift_Image_Service::get_sources( $item ) ) );
+
+                    // Bail if image is not found.
+                    // In some cases, you can delete the image from the database
+                    // or from uploads dir, but the image id still exists as featured image
+                    // or in [gallery] shortcode.
+                    //					if ( empty( $attachment[0] ) ) {
+                    if ( empty( $sources_with_image ) ) {
+                        return $carry;
+                    }
+
+                    // Merge the arrays.
+                    return array_merge(
+                        $carry,
+                        $sources_with_image
+                    );
+                }
+                // Initial array.
+                , array() )
+        );
+
+        // Refactor data as per schema.org specifications.
+        $images = array_map( function ( $attachment ) {
+            return Wordlift_Abstract_Post_To_Jsonld_Converter::set_image_size(
+                array(
+                    '@type' => 'ImageObject',
+                    'url'   => $attachment[0],
+                ), $attachment
+            );
+        }, $images_with_sizes );
+
+        // Add images if present.
+        if ( 0 < count( $images ) ) {
+            $jsonld['image'] = $images;
+        }
+
+    }
+
+    /**
+     * If the provided array of values contains only one value, then one single
+     * value is returned, otherwise the original array is returned.
+     *
+     * @param array $value An array of values.
+     *
+     * @return mixed|array A single value or the original array.
+     * @since 3.20.0 The function has been moved from {@link Wordlift_Entity_Post_To_Jsonld_Converter} to
+     *  {@link Wordlift_Abstract_Post_To_Jsonld_Converter}.
+     * @since  3.8.0
+     * @access private
+     *
+     */
+    protected static function make_one( $value ) {
+
+        return 1 === count( $value ) ? $value[0] : $value;
+    }
+
+    /**
+     * Process the provided array by adding the width / height if the values
+     * are available and are greater than 0.
+     *
+     * @param array $image The `ImageObject` array.
+     * @param array $attachment The attachment array.
+     *
+     * @return array The enriched `ImageObject` array.
+     * @since 3.14.0
+     *
+     */
+    public static function set_image_size( $image, $attachment ) {
+
+        // If you specify a "width" or "height" value you should leave out
+        // 'px'. For example: "width":"4608px" should be "width":"4608".
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/451.
+        if ( isset( $attachment[1] ) && is_numeric( $attachment[1] ) && 0 < $attachment[1] ) {
+            $image['width'] = $attachment[1];
+        }
+
+        if ( isset( $attachment[2] ) && is_numeric( $attachment[2] ) && 0 < $attachment[2] ) {
+            $image['height'] = $attachment[2];
+        }
+
+        return $image;
+    }
+
+
+    /**
+     * Add data to the JSON-LD using the `custom_fields` array which contains the definitions of property
+     * for the post entity type.
+     *
+     * @param array $jsonld The JSON-LD array.
+     * @param array $fields The entity types field array.
+     * @param WP_Post $post The target {@link WP_Post} instance.
+     * @param array $references The references array.
+     *
+     * @since 3.20.0 This code moved from the above function `convert`, used for entity types defined in
+     *  the {@link Wordlift_Schema_Service} class.
+     *
+     */
+    protected function process_type_custom_fields( &$jsonld, $fields, $post, &$references, &$references_infos ) {
+
+        // Set a reference to use in closures.
+        $converter = $this;
+
+        // Try each field on the entity.
+        foreach ( $fields as $key => $value ) {
+
+            // Get the predicate.
+            $name = $this->relative_to_context( $value['predicate'] );
+
+            // Get the value, the property service will get the right extractor
+            // for that property.
+            $value = $this->property_getter->get( $post->ID, $key, Object_Type_Enum::POST );
+
+            if ( empty( $value ) ) {
+                continue;
+            }
+
+            // Map the value to the property name.
+            // If we got an array with just one value, we return that one value.
+            // If we got a Wordlift_Property_Entity_Reference we get the URL.
+            $jsonld[ $name ] = self::make_one( array_map( function ( $item ) use ( $converter, &$references, &$references_infos ) {
+
+                if ( $item instanceof Wordlift_Property_Entity_Reference ) {
+
+                    $url = $item->get_url();
+
+                    // The refactored converters require the entity id.
+                    $references[] = $item->get_id();
+
+                    $references_infos[] = array( 'reference' => $item );
+
+                    return array(
+                        '@id' => $url,
+                    );
+                }
+
+                return $converter->relative_to_context( $item );
+            }, $value ) );
+
+        }
+
+    }
 
 }

Spacing +62 added lines, -62 removed lines

@@ -73,7 +73,7 @@ 
 	 * @since 3.10.0
 	 *
 	 */
-	public function __construct( $entity_type_service, $user_service, $attachment_service, $property_getter ) {
+	public function __construct($entity_type_service, $user_service, $attachment_service, $property_getter) {
 		$this->entity_type_service = $entity_type_service;
 		$this->user_service        = $user_service;
 		$this->attachment_service  = $attachment_service;
@@ -91,19 +91,19 @@ 
 	 * @return array A JSON-LD array.
 	 * @since 3.10.0
 	 */
-	public function convert( $post_id, &$references = array(), &$references_infos = array() ) {
+	public function convert($post_id, &$references = array(), &$references_infos = array()) {
 
 		// Get the post instance.
-		$post = get_post( $post_id );
-		if ( null === $post ) {
+		$post = get_post($post_id);
+		if (null === $post) {
 			// Post not found.
 			return null;
 		}
 
 		// Get the post URI @id.
-		$id = Wordlift_Entity_Service::get_instance()->get_uri( $post->ID );
-		if ( is_null( $id ) ) {
-			$id = 'get_uri returned null, dataset is ' . wl_configuration_get_redlink_dataset_uri();
+		$id = Wordlift_Entity_Service::get_instance()->get_uri($post->ID);
+		if (is_null($id)) {
+			$id = 'get_uri returned null, dataset is '.wl_configuration_get_redlink_dataset_uri();
 		}
 
 		/*
@@ -115,15 +115,15 @@ 
 		 */
 		//		// Get the entity @type. We consider `post` BlogPostings.
 		//		$type = $this->entity_type_service->get( $post_id );
-		$types = $this->entity_type_service->get_names( $post_id );
-		$type  = self::make_one( $types );
+		$types = $this->entity_type_service->get_names($post_id);
+		$type  = self::make_one($types);
 
 		// Prepare the response.
 		$jsonld = array(
 			'@context'    => self::CONTEXT,
 			'@id'         => $id,
 			'@type'       => $type,
-			'description' => Wordlift_Post_Excerpt_Helper::get_text_excerpt( $post ),
+			'description' => Wordlift_Post_Excerpt_Helper::get_text_excerpt($post),
 		);
 
 		// Set the `mainEntityOfPage` property if the post has some contents.
@@ -133,8 +133,8 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		$post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
-		if ( ! empty( $post_content ) ) {
+		$post_content = apply_filters('wl_post_content', $post->post_content, $post);
+		if ( ! empty($post_content)) {
 			// We're setting the `mainEntityOfPage` to signal which one is the
 			// main entity for the specified URL. It might be however that the
 			// post/page is actually about another specific entity. How WL deals
@@ -145,28 +145,28 @@ 
 			// No need to specify `'@type' => 'WebPage'.
 			//
 			// See https://github.com/insideout10/wordlift-plugin/issues/451.
-			$jsonld['mainEntityOfPage'] = get_the_permalink( $post->ID );
+			$jsonld['mainEntityOfPage'] = get_the_permalink($post->ID);
 
 			/**
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/1207
 			 *
 			 * @since 3.27.7
 			 */
-			if ( in_array( $type, array( 'Occupation', 'OccupationAggregationByEmployer' ) ) ) {
+			if (in_array($type, array('Occupation', 'OccupationAggregationByEmployer'))) {
 				$jsonld['mainEntityOfPage'] = array(
 					'@type'        => 'WebPage',
-					'lastReviewed' => get_post_time( 'Y-m-d\TH:i:sP', true, $post, false )
+					'lastReviewed' => get_post_time('Y-m-d\TH:i:sP', true, $post, false)
 				);
 			}
 		};
 
-		$this->set_images( $this->attachment_service, $post, $jsonld );
+		$this->set_images($this->attachment_service, $post, $jsonld);
 
 		// Get the entities referenced by this post and set it to the `references`
 		// array so that the caller can do further processing, such as printing out
 		// more of those references.
 		$references_without_locations = Object_Relation_Service::get_instance()
-		                                                       ->get_references( $post_id, Object_Type_Enum::POST );
+		                                                       ->get_references($post_id, Object_Type_Enum::POST);
 
 		/*
 		 * Add the locations to the references.
@@ -177,27 +177,27 @@ 
 		 */
 		// A reference to use in closure.
 		$entity_type_service = $this->entity_type_service;
-		$locations           = array_reduce( $references_without_locations, function ( $carry, $reference ) use ( $entity_type_service ) {
+		$locations           = array_reduce($references_without_locations, function($carry, $reference) use ($entity_type_service) {
 			/**
 			 * @var $reference Reference
 			 */
 			// @see https://schema.org/location for the schema.org types using the `location` property.
-			if ( ! $entity_type_service->has_entity_type( $reference->get_id(), 'http://schema.org/Action' )
-			     && ! $entity_type_service->has_entity_type( $reference->get_id(), 'http://schema.org/Event' )
-			     && ! $entity_type_service->has_entity_type( $reference->get_id(), 'http://schema.org/Organization' ) ) {
+			if ( ! $entity_type_service->has_entity_type($reference->get_id(), 'http://schema.org/Action')
+			     && ! $entity_type_service->has_entity_type($reference->get_id(), 'http://schema.org/Event')
+			     && ! $entity_type_service->has_entity_type($reference->get_id(), 'http://schema.org/Organization')) {
 
 				return $carry;
 			}
-			$post_location_ids        = get_post_meta( $reference->get_id(), Wordlift_Schema_Service::FIELD_LOCATION );
-			$post_location_references = array_map( function ( $post_id ) {
-				return new Post_Reference( $post_id );
-			}, $post_location_ids );
+			$post_location_ids        = get_post_meta($reference->get_id(), Wordlift_Schema_Service::FIELD_LOCATION);
+			$post_location_references = array_map(function($post_id) {
+				return new Post_Reference($post_id);
+			}, $post_location_ids);
 
-			return array_merge( $carry, $post_location_references );
-		}, array() );
+			return array_merge($carry, $post_location_references);
+		}, array());
 
 		// Merge the references with the referenced locations if any.
-		$references = array_merge( $references_without_locations, $locations );
+		$references = array_merge($references_without_locations, $locations);
 
 		return $jsonld;
 	}
@@ -212,9 +212,9 @@ 
 	 * @since 3.10.0
 	 *
 	 */
-	public function relative_to_context( $value ) {
+	public function relative_to_context($value) {
 
-		return 0 === strpos( $value, self::CONTEXT . '/' ) ? substr( $value, strlen( self::CONTEXT ) + 1 ) : $value;
+		return 0 === strpos($value, self::CONTEXT.'/') ? substr($value, strlen(self::CONTEXT) + 1) : $value;
 	}
 
 	/**
@@ -229,14 +229,14 @@ 
 	 *
 	 * @since 3.10.0
 	 */
-	public static function set_images( $attachment_service, $post, &$jsonld ) {
+	public static function set_images($attachment_service, $post, &$jsonld) {
 
 		// Prepare the attachment ids array.
 		$ids = array();
 
 		// Set the thumbnail id as first attachment id, if any.
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
-		if ( '' !== $thumbnail_id && 0 !== $thumbnail_id ) {
+		$thumbnail_id = get_post_thumbnail_id($post->ID);
+		if ('' !== $thumbnail_id && 0 !== $thumbnail_id) {
 			$ids[] = $thumbnail_id;
 		}
 
@@ -246,31 +246,31 @@ 
 		// See https://github.com/insideout10/wordlift-plugin/issues/689.
 		//
 		// Get the embeds, removing existing ids.
-		if ( apply_filters( 'wl_feature__enable__image-embeds', false ) ) {
-			$embeds = array_diff( $attachment_service->get_image_embeds( $post->post_content ), $ids );
+		if (apply_filters('wl_feature__enable__image-embeds', false)) {
+			$embeds = array_diff($attachment_service->get_image_embeds($post->post_content), $ids);
 		} else {
 			$embeds = array();
 		}
 
 		// Get the gallery, removing existing ids.
-		$gallery = array_diff( $attachment_service->get_gallery( $post ), $ids, $embeds );
+		$gallery = array_diff($attachment_service->get_gallery($post), $ids, $embeds);
 
 		// Map the attachment ids to images' data structured for schema.org use.
 		$images_with_sizes = array_filter(
-			array_reduce( array_merge( $ids, $embeds, $gallery ),
-				function ( $carry, $item ) {
+			array_reduce(array_merge($ids, $embeds, $gallery),
+				function($carry, $item) {
 					/*
 					* @todo: we're not sure that we're getting attachment data here, we
 					* should filter `false`s.
 					*/
 
 					$sources = array_merge(
-						Wordlift_Image_Service::get_sources( $item ),
-						array( wp_get_attachment_image_src( $item, 'full' ) )
+						Wordlift_Image_Service::get_sources($item),
+						array(wp_get_attachment_image_src($item, 'full'))
 					);
 
-					$sources_with_image = array_filter( $sources, function ( $source ) {
-						return ! empty( $source[0] );
+					$sources_with_image = array_filter($sources, function($source) {
+						return ! empty($source[0]);
 					} );
 
 					// Get the attachment data.
@@ -283,7 +283,7 @@ 
 					// or from uploads dir, but the image id still exists as featured image
 					// or in [gallery] shortcode.
 					//					if ( empty( $attachment[0] ) ) {
-					if ( empty( $sources_with_image ) ) {
+					if (empty($sources_with_image)) {
 						return $carry;
 					}
 
@@ -294,21 +294,21 @@ 
 					);
 				}
 				// Initial array.
-				, array() )
+				, array())
 		);
 
 		// Refactor data as per schema.org specifications.
-		$images = array_map( function ( $attachment ) {
+		$images = array_map(function($attachment) {
 			return Wordlift_Abstract_Post_To_Jsonld_Converter::set_image_size(
 				array(
 					'@type' => 'ImageObject',
 					'url'   => $attachment[0],
 				), $attachment
 			);
-		}, $images_with_sizes );
+		}, $images_with_sizes);
 
 		// Add images if present.
-		if ( 0 < count( $images ) ) {
+		if (0 < count($images)) {
 			$jsonld['image'] = $images;
 		}
 
@@ -327,9 +327,9 @@ 
 	 * @access private
 	 *
 	 */
-	protected static function make_one( $value ) {
+	protected static function make_one($value) {
 
-		return 1 === count( $value ) ? $value[0] : $value;
+		return 1 === count($value) ? $value[0] : $value;
 	}
 
 	/**
@@ -343,17 +343,17 @@ 
 	 * @since 3.14.0
 	 *
 	 */
-	public static function set_image_size( $image, $attachment ) {
+	public static function set_image_size($image, $attachment) {
 
 		// If you specify a "width" or "height" value you should leave out
 		// 'px'. For example: "width":"4608px" should be "width":"4608".
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/451.
-		if ( isset( $attachment[1] ) && is_numeric( $attachment[1] ) && 0 < $attachment[1] ) {
+		if (isset($attachment[1]) && is_numeric($attachment[1]) && 0 < $attachment[1]) {
 			$image['width'] = $attachment[1];
 		}
 
-		if ( isset( $attachment[2] ) && is_numeric( $attachment[2] ) && 0 < $attachment[2] ) {
+		if (isset($attachment[2]) && is_numeric($attachment[2]) && 0 < $attachment[2]) {
 			$image['height'] = $attachment[2];
 		}
 
@@ -374,46 +374,46 @@ 
 	 *  the {@link Wordlift_Schema_Service} class.
 	 *
 	 */
-	protected function process_type_custom_fields( &$jsonld, $fields, $post, &$references, &$references_infos ) {
+	protected function process_type_custom_fields(&$jsonld, $fields, $post, &$references, &$references_infos) {
 
 		// Set a reference to use in closures.
 		$converter = $this;
 
 		// Try each field on the entity.
-		foreach ( $fields as $key => $value ) {
+		foreach ($fields as $key => $value) {
 
 			// Get the predicate.
-			$name = $this->relative_to_context( $value['predicate'] );
+			$name = $this->relative_to_context($value['predicate']);
 
 			// Get the value, the property service will get the right extractor
 			// for that property.
-			$value = $this->property_getter->get( $post->ID, $key, Object_Type_Enum::POST );
+			$value = $this->property_getter->get($post->ID, $key, Object_Type_Enum::POST);
 
-			if ( empty( $value ) ) {
+			if (empty($value)) {
 				continue;
 			}
 
 			// Map the value to the property name.
 			// If we got an array with just one value, we return that one value.
 			// If we got a Wordlift_Property_Entity_Reference we get the URL.
-			$jsonld[ $name ] = self::make_one( array_map( function ( $item ) use ( $converter, &$references, &$references_infos ) {
+			$jsonld[$name] = self::make_one(array_map(function($item) use ($converter, &$references, &$references_infos) {
 
-				if ( $item instanceof Wordlift_Property_Entity_Reference ) {
+				if ($item instanceof Wordlift_Property_Entity_Reference) {
 
 					$url = $item->get_url();
 
 					// The refactored converters require the entity id.
 					$references[] = $item->get_id();
 
-					$references_infos[] = array( 'reference' => $item );
+					$references_infos[] = array('reference' => $item);
 
 					return array(
 						'@id' => $url,
 					);
 				}
 
-				return $converter->relative_to_context( $item );
-			}, $value ) );
+				return $converter->relative_to_context($item);
+			}, $value));
 
 		}