insideout10 / wordlift-plugin

src/js/dist/gutenberg-faq-plugin.asset.php

Indentation +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <?php return array(
-	'dependencies' => array( 'wp-polyfill', 'wp-rich-text' ),
-	'version'      => '18770cde607d785a81b65ef98e409669',
+    'dependencies' => array( 'wp-polyfill', 'wp-rich-text' ),
+    'version'      => '18770cde607d785a81b65ef98e409669',
 );

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <?php return array(
-	'dependencies' => array( 'wp-polyfill', 'wp-rich-text' ),
+	'dependencies' => array('wp-polyfill', 'wp-rich-text'),
 	'version'      => '18770cde607d785a81b65ef98e409669',
 );

src/js/dist/edit.asset.php

Indentation +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <?php return array(
-	'dependencies' => array( 'react', 'react-dom', 'wp-hooks', 'wp-polyfill' ),
-	'version'      => '422a9f1d32f6983d4bb7c971a14c8225',
+    'dependencies' => array( 'react', 'react-dom', 'wp-hooks', 'wp-polyfill' ),
+    'version'      => '422a9f1d32f6983d4bb7c971a14c8225',
 );

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <?php return array(
-	'dependencies' => array( 'react', 'react-dom', 'wp-hooks', 'wp-polyfill' ),
+	'dependencies' => array('react', 'react-dom', 'wp-hooks', 'wp-polyfill'),
 	'version'      => '422a9f1d32f6983d4bb7c971a14c8225',
 );

src/js/dist/videoobject.asset.php

Indentation +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <?php return array(
-	'dependencies' => array( 'react', 'react-dom', 'wp-hooks', 'wp-i18n', 'wp-polyfill' ),
-	'version'      => 'e8856addb978d2ab9bef838754938ce8',
+    'dependencies' => array( 'react', 'react-dom', 'wp-hooks', 'wp-i18n', 'wp-polyfill' ),
+    'version'      => 'e8856addb978d2ab9bef838754938ce8',
 );

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <?php return array(
-	'dependencies' => array( 'react', 'react-dom', 'wp-hooks', 'wp-i18n', 'wp-polyfill' ),
+	'dependencies' => array('react', 'react-dom', 'wp-hooks', 'wp-i18n', 'wp-polyfill'),
 	'version'      => 'e8856addb978d2ab9bef838754938ce8',
 );

src/js/dist/faq.asset.php

Indentation +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <?php return array(
-	'dependencies' => array( 'react', 'react-dom', 'wp-polyfill' ),
-	'version'      => '0df9b7715acd39056c8ca1e24dedb4b1',
+    'dependencies' => array( 'react', 'react-dom', 'wp-polyfill' ),
+    'version'      => '0df9b7715acd39056c8ca1e24dedb4b1',
 );

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <?php return array(
-	'dependencies' => array( 'react', 'react-dom', 'wp-polyfill' ),
+	'dependencies' => array('react', 'react-dom', 'wp-polyfill'),
 	'version'      => '0df9b7715acd39056c8ca1e24dedb4b1',
 );

src/js/dist/bundle.asset.php

Indentation +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <?php return array(
-	'dependencies' => array( 'wp-polyfill' ),
-	'version'      => 'dc74b50aef496ca5fcca1eda880e38a1',
+    'dependencies' => array( 'wp-polyfill' ),
+    'version'      => 'dc74b50aef496ca5fcca1eda880e38a1',
 );

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <?php return array(
-	'dependencies' => array( 'wp-polyfill' ),
+	'dependencies' => array('wp-polyfill'),
 	'version'      => 'dc74b50aef496ca5fcca1eda880e38a1',
 );

src/admin/class-wordlift-entity-list-service.php

Indentation +299 added lines, -299 removed lines

@@ -20,310 +20,310 @@
  */
 class Wordlift_Entity_List_Service {
 
-	/**
-	 * Size of the entity thumbnail in pixels
-	 *
-	 * @since  3.3.0
-	 */
-	const THUMB_SIZE = 50;
-
-	/**
-	 * A {@link Wordlift_Rating_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var \Wordlift_Rating_Service $rating_service A {@link Wordlift_Rating_Service} instance.
-	 */
-	private $rating_service;
-
-	/**
-	 * Create a Wordlift_Entity_List_Service.
-	 *
-	 * @param \Wordlift_Rating_Service $rating_service A {@link Wordlift_Rating_Service} instance.
-	 *
-	 * @since 3.3.0
-	 */
-	public function __construct( $rating_service ) {
-
-		$this->rating_service = $rating_service;
-
-	}
-
-	/**
-	 * Detects if the entities list admin screen is being displayed
-	 *
-	 * @return bool True if the screen is being displayed, false otherwis.
-	 *
-	 * @since 3.15.0
-	 */
-	private function is_entity_list_screen() {
-
-		// Run only on admin page.
-		if ( ! is_admin() ) {
-			return false;
-		}
-
-		// Return safely if get_current_screen() is not defined (yet).
-		if ( false === function_exists( 'get_current_screen' ) ) {
-			return false;
-		}
-
-		// Only apply on entity list page, only if this is the main query and if the wl-classification-scope query param is set.
-		$screen = get_current_screen();
-
-		// If there is any valid screen nothing to do.
-		if ( null === $screen ) {
-			return false;
-		}
-
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $screen->post_type ) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Register custom columns for entity listing in backend.
-	 *
-	 * @see   https://codex.wordpress.org/Plugin_API/Action_Reference/manage_posts_custom_column
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param array $columns the default columns.
-	 *
-	 * @return array Enhanced columns array.
-	 */
-	public function register_custom_columns( $columns ) {
-
-		// Bail out if custom columns disabled via hook
-		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( ! apply_filters( 'wl_feature__enable__custom-columns', true ) ) {
-			return $columns;
-		}
-
-		// Take away first column and keep a reference,
-		// so we can later insert the thumbnail between the first and the rest of columns.
-		$columns_cb = $columns['cb'];
-		unset( $columns['cb'] );
-
-		// Thumbnails column is inserted in second place, while the related posts on the end.
-		$columns = array_merge(
-			array( 'cb' => $columns_cb ),                      // re-add first column
-			array( 'wl_column_thumbnail' => __( 'Image', 'wordlift' ) ),        // thumb
-			$columns,                                                               // default columns (without the first)
-			array( 'wl_column_related_posts' => __( 'Related Posts', 'wordlift' ) ), // related posts
-			array( 'wl_column_rating' => __( 'Rating', 'wordlift' ) ) // related posts
-		);
-
-		return $columns;
-	}
-
-	/**
-	 * Render custom columns.
-	 *
-	 * @see   https://codex.wordpress.org/Plugin_API/Action_Reference/manage_$post_type_posts_custom_column
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param string $column The current column.
-	 * @param int    $entity_id An entity post id.
-	 */
-	public function render_custom_columns( $column, $entity_id ) {
-
-		switch ( $column ) {
-
-			case 'wl_column_related_posts':
-				echo count( wl_core_get_related_post_ids( $entity_id ) );
-				break;
-
-			case 'wl_column_thumbnail':
-				$edit_link = get_edit_post_link( $entity_id );
-				$thumb     = get_the_post_thumbnail(
-					$entity_id,
-					array(
-						self::THUMB_SIZE,
-						self::THUMB_SIZE,
-					)
-				);
-
-				if ( ! $thumb ) {
-					$thumb = sprintf( '<img src="%s" width="%d">', WL_DEFAULT_THUMBNAIL_PATH, self::THUMB_SIZE );
-				}
-
-				echo wp_kses(
-					sprintf( '<a href="%s">%s</a>', esc_url( $edit_link ), $thumb ),
-					array(
-						'a'   => array( 'href' => array() ),
-						'img' => array(
-							'src'   => array(),
-							'width' => array(),
-						),
-					)
-				);
-				break;
-
-			case 'wl_column_rating':
-				$rating = $this->rating_service->get_rating_for( $entity_id );
-				echo '<i class="wl-traffic-light wl-tl-' . esc_attr( $rating['traffic_light_score'] ) . '">' . esc_html( $rating['percentage_score'] ) . '%</i>';
-				break;
-		}
-
-	}
-
-	/**
-	 * Add wl-classification-scope select box before the 'Filter' button.
-	 *
-	 * @since 3.3.0
-	 */
-	public function restrict_manage_posts_classification_scope() {
-
-		if ( ! $this->is_entity_list_screen() ) {
-			return;
-		}
-
-		// Was a W already selected?
-		$selected = isset( $_GET['wl-classification-scope'] ) ? //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			sanitize_text_field( wp_unslash( (string) $_GET['wl-classification-scope'] ) ) : ''; //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-
-		// Print select box with the 4W
-		$all_w = array(
-			"All 'W'"         => __( "All 'W'", 'wordlift' ),
-			WL_WHAT_RELATION  => __( 'What', 'wordlift' ),
-			WL_WHO_RELATION   => __( 'Who', 'wordlift' ),
-			WL_WHERE_RELATION => __( 'Where', 'wordlift' ),
-			WL_WHEN_RELATION  => __( 'When', 'wordlift' ),
-		);
-		echo '<select name="wl-classification-scope" id="wl-dropdown-classification-scope">';
-		foreach ( $all_w as $v => $w ) {
-			$default = ( $selected === $v ) ? 'selected' : '';
-			echo sprintf( '<option value="%s" %s >%s</option>', esc_attr( $v ), esc_html( $default ), esc_html( $w ) );
-		}
-		echo '</select>';
-	}
-
-	/**
-	 * Server side response operations for the classification filter set in
-	 * *restrict_manage_posts_classification_scope_filter*.
-	 *
-	 * @param array $clauses WP main query clauses.
-	 *
-	 * @return array Modified clauses.
-	 * @since 3.3.0
-	 */
-	public function posts_clauses_classification_scope( $clauses ) {
-
-		if ( ! ( $this->is_entity_list_screen() && is_main_query() && isset( $_GET['wl-classification-scope'] ) ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			return $clauses;
-		}
-
-		// Check a valid W was requested.
-		$requested_w = sanitize_text_field( wp_unslash( (string) $_GET['wl-classification-scope'] ) ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-
-		$all_w = array(
-			WL_WHAT_RELATION,
-			WL_WHO_RELATION,
-			WL_WHERE_RELATION,
-			WL_WHEN_RELATION,
-		);
-
-		if ( ! in_array( $requested_w, $all_w, true ) ) {
-			return $clauses;
-		}
-
-		global $wpdb;
-
-		$wl_relation_table = wl_core_get_relation_instances_table_name();
-
-		// Change WP main query clauses.
-		$clauses['join']     .= "INNER JOIN {$wl_relation_table} ON {$wpdb->posts}.ID = {$wl_relation_table}.object_id";
-		$clauses['where']    .= $wpdb->prepare( "AND {$wl_relation_table}.predicate = %s", $requested_w );
-		$clauses['distinct'] .= 'DISTINCT';
-
-		return $clauses;
-	}
-
-	/**
-	 * Amend the "all entities" list admin screen with entities from other
-	 * post types, not only the entities one.
-	 *
-	 * @param WP_Query $query The WP_Query instance (passed by reference).
-	 *
-	 * @since 3.15.0
-	 */
-	public function pre_get_posts( $query ) {
-
-		if ( ! ( $this->is_entity_list_screen() && $query->is_main_query() ) ) {
-			return;
-		}
-
-		// Add to the post type all the types considered to be valid post types.
-		$query->set( 'post_type', Wordlift_Entity_Service::valid_entity_post_types() );
-
-		// Do not show however entities of type `Article`.
-		$query->set(
-			'tax_query',
-			array(
-				'relation' => 'AND',
-				array(
-					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-					'operator' => 'EXISTS',
-				),
-				array(
-					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-					'field'    => 'slug',
-					'terms'    => 'article',
-					'operator' => 'NOT IN',
-				),
-			)
-		);
-
-	}
-
-	/**
-	 * An hack to fix wrong post type on the entities list admin screen.
-	 *
-	 * This is hooked on the admin entity list page load hook and sets the
-	 * post type to "entity" as it is expected on that page.
-	 *
-	 * @since 3.15.0
-	 */
-	public function load_edit() {
-
-		// Return safely if get_current_screen() is not defined (yet).
-		if ( false === function_exists( 'get_current_screen' ) ) {
-			return;
-		}
-
-		// Only apply on entity list page, only if this is the main query and if the wl-classification-scope query param is set.
-		$screen = get_current_screen();
-
-		// If there is any valid screen nothing to do.
-		if ( null === $screen ) {
-			return;
-		}
-
-		if ( ! ( Wordlift_Entity_Service::TYPE_NAME === $screen->post_type && is_main_query() ) ) {
-			return;
-		}
-
-		/*
+    /**
+     * Size of the entity thumbnail in pixels
+     *
+     * @since  3.3.0
+     */
+    const THUMB_SIZE = 50;
+
+    /**
+     * A {@link Wordlift_Rating_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var \Wordlift_Rating_Service $rating_service A {@link Wordlift_Rating_Service} instance.
+     */
+    private $rating_service;
+
+    /**
+     * Create a Wordlift_Entity_List_Service.
+     *
+     * @param \Wordlift_Rating_Service $rating_service A {@link Wordlift_Rating_Service} instance.
+     *
+     * @since 3.3.0
+     */
+    public function __construct( $rating_service ) {
+
+        $this->rating_service = $rating_service;
+
+    }
+
+    /**
+     * Detects if the entities list admin screen is being displayed
+     *
+     * @return bool True if the screen is being displayed, false otherwis.
+     *
+     * @since 3.15.0
+     */
+    private function is_entity_list_screen() {
+
+        // Run only on admin page.
+        if ( ! is_admin() ) {
+            return false;
+        }
+
+        // Return safely if get_current_screen() is not defined (yet).
+        if ( false === function_exists( 'get_current_screen' ) ) {
+            return false;
+        }
+
+        // Only apply on entity list page, only if this is the main query and if the wl-classification-scope query param is set.
+        $screen = get_current_screen();
+
+        // If there is any valid screen nothing to do.
+        if ( null === $screen ) {
+            return false;
+        }
+
+        if ( Wordlift_Entity_Service::TYPE_NAME !== $screen->post_type ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Register custom columns for entity listing in backend.
+     *
+     * @see   https://codex.wordpress.org/Plugin_API/Action_Reference/manage_posts_custom_column
+     *
+     * @since 3.3.0
+     *
+     * @param array $columns the default columns.
+     *
+     * @return array Enhanced columns array.
+     */
+    public function register_custom_columns( $columns ) {
+
+        // Bail out if custom columns disabled via hook
+        // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+        if ( ! apply_filters( 'wl_feature__enable__custom-columns', true ) ) {
+            return $columns;
+        }
+
+        // Take away first column and keep a reference,
+        // so we can later insert the thumbnail between the first and the rest of columns.
+        $columns_cb = $columns['cb'];
+        unset( $columns['cb'] );
+
+        // Thumbnails column is inserted in second place, while the related posts on the end.
+        $columns = array_merge(
+            array( 'cb' => $columns_cb ),                      // re-add first column
+            array( 'wl_column_thumbnail' => __( 'Image', 'wordlift' ) ),        // thumb
+            $columns,                                                               // default columns (without the first)
+            array( 'wl_column_related_posts' => __( 'Related Posts', 'wordlift' ) ), // related posts
+            array( 'wl_column_rating' => __( 'Rating', 'wordlift' ) ) // related posts
+        );
+
+        return $columns;
+    }
+
+    /**
+     * Render custom columns.
+     *
+     * @see   https://codex.wordpress.org/Plugin_API/Action_Reference/manage_$post_type_posts_custom_column
+     *
+     * @since 3.3.0
+     *
+     * @param string $column The current column.
+     * @param int    $entity_id An entity post id.
+     */
+    public function render_custom_columns( $column, $entity_id ) {
+
+        switch ( $column ) {
+
+            case 'wl_column_related_posts':
+                echo count( wl_core_get_related_post_ids( $entity_id ) );
+                break;
+
+            case 'wl_column_thumbnail':
+                $edit_link = get_edit_post_link( $entity_id );
+                $thumb     = get_the_post_thumbnail(
+                    $entity_id,
+                    array(
+                        self::THUMB_SIZE,
+                        self::THUMB_SIZE,
+                    )
+                );
+
+                if ( ! $thumb ) {
+                    $thumb = sprintf( '<img src="%s" width="%d">', WL_DEFAULT_THUMBNAIL_PATH, self::THUMB_SIZE );
+                }
+
+                echo wp_kses(
+                    sprintf( '<a href="%s">%s</a>', esc_url( $edit_link ), $thumb ),
+                    array(
+                        'a'   => array( 'href' => array() ),
+                        'img' => array(
+                            'src'   => array(),
+                            'width' => array(),
+                        ),
+                    )
+                );
+                break;
+
+            case 'wl_column_rating':
+                $rating = $this->rating_service->get_rating_for( $entity_id );
+                echo '<i class="wl-traffic-light wl-tl-' . esc_attr( $rating['traffic_light_score'] ) . '">' . esc_html( $rating['percentage_score'] ) . '%</i>';
+                break;
+        }
+
+    }
+
+    /**
+     * Add wl-classification-scope select box before the 'Filter' button.
+     *
+     * @since 3.3.0
+     */
+    public function restrict_manage_posts_classification_scope() {
+
+        if ( ! $this->is_entity_list_screen() ) {
+            return;
+        }
+
+        // Was a W already selected?
+        $selected = isset( $_GET['wl-classification-scope'] ) ? //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            sanitize_text_field( wp_unslash( (string) $_GET['wl-classification-scope'] ) ) : ''; //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+
+        // Print select box with the 4W
+        $all_w = array(
+            "All 'W'"         => __( "All 'W'", 'wordlift' ),
+            WL_WHAT_RELATION  => __( 'What', 'wordlift' ),
+            WL_WHO_RELATION   => __( 'Who', 'wordlift' ),
+            WL_WHERE_RELATION => __( 'Where', 'wordlift' ),
+            WL_WHEN_RELATION  => __( 'When', 'wordlift' ),
+        );
+        echo '<select name="wl-classification-scope" id="wl-dropdown-classification-scope">';
+        foreach ( $all_w as $v => $w ) {
+            $default = ( $selected === $v ) ? 'selected' : '';
+            echo sprintf( '<option value="%s" %s >%s</option>', esc_attr( $v ), esc_html( $default ), esc_html( $w ) );
+        }
+        echo '</select>';
+    }
+
+    /**
+     * Server side response operations for the classification filter set in
+     * *restrict_manage_posts_classification_scope_filter*.
+     *
+     * @param array $clauses WP main query clauses.
+     *
+     * @return array Modified clauses.
+     * @since 3.3.0
+     */
+    public function posts_clauses_classification_scope( $clauses ) {
+
+        if ( ! ( $this->is_entity_list_screen() && is_main_query() && isset( $_GET['wl-classification-scope'] ) ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            return $clauses;
+        }
+
+        // Check a valid W was requested.
+        $requested_w = sanitize_text_field( wp_unslash( (string) $_GET['wl-classification-scope'] ) ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+
+        $all_w = array(
+            WL_WHAT_RELATION,
+            WL_WHO_RELATION,
+            WL_WHERE_RELATION,
+            WL_WHEN_RELATION,
+        );
+
+        if ( ! in_array( $requested_w, $all_w, true ) ) {
+            return $clauses;
+        }
+
+        global $wpdb;
+
+        $wl_relation_table = wl_core_get_relation_instances_table_name();
+
+        // Change WP main query clauses.
+        $clauses['join']     .= "INNER JOIN {$wl_relation_table} ON {$wpdb->posts}.ID = {$wl_relation_table}.object_id";
+        $clauses['where']    .= $wpdb->prepare( "AND {$wl_relation_table}.predicate = %s", $requested_w );
+        $clauses['distinct'] .= 'DISTINCT';
+
+        return $clauses;
+    }
+
+    /**
+     * Amend the "all entities" list admin screen with entities from other
+     * post types, not only the entities one.
+     *
+     * @param WP_Query $query The WP_Query instance (passed by reference).
+     *
+     * @since 3.15.0
+     */
+    public function pre_get_posts( $query ) {
+
+        if ( ! ( $this->is_entity_list_screen() && $query->is_main_query() ) ) {
+            return;
+        }
+
+        // Add to the post type all the types considered to be valid post types.
+        $query->set( 'post_type', Wordlift_Entity_Service::valid_entity_post_types() );
+
+        // Do not show however entities of type `Article`.
+        $query->set(
+            'tax_query',
+            array(
+                'relation' => 'AND',
+                array(
+                    'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                    'operator' => 'EXISTS',
+                ),
+                array(
+                    'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                    'field'    => 'slug',
+                    'terms'    => 'article',
+                    'operator' => 'NOT IN',
+                ),
+            )
+        );
+
+    }
+
+    /**
+     * An hack to fix wrong post type on the entities list admin screen.
+     *
+     * This is hooked on the admin entity list page load hook and sets the
+     * post type to "entity" as it is expected on that page.
+     *
+     * @since 3.15.0
+     */
+    public function load_edit() {
+
+        // Return safely if get_current_screen() is not defined (yet).
+        if ( false === function_exists( 'get_current_screen' ) ) {
+            return;
+        }
+
+        // Only apply on entity list page, only if this is the main query and if the wl-classification-scope query param is set.
+        $screen = get_current_screen();
+
+        // If there is any valid screen nothing to do.
+        if ( null === $screen ) {
+            return;
+        }
+
+        if ( ! ( Wordlift_Entity_Service::TYPE_NAME === $screen->post_type && is_main_query() ) ) {
+            return;
+        }
+
+        /*
 		 * The main wp initialization sets the post type to the post type used in the main query,
 		 * but the admin edit pages fail to handle such a situation gracefully.
 		 * Since this is exactly what we do on the entity page, we have to reset
 		 * the global $post_type variable to the "entity" value after the modifications
 		 * initialization was finished.
 		 */
-		add_action(
-			'wp',
-			function () {
-				global $post_type;
-				$post_type = Wordlift_Entity_Service::TYPE_NAME; //phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
-			},
-			10,
-			0
-		);
-
-	}
+        add_action(
+            'wp',
+            function () {
+                global $post_type;
+                $post_type = Wordlift_Entity_Service::TYPE_NAME; //phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+            },
+            10,
+            0
+        );
+
+    }
 
 }

Spacing +46 added lines, -46 removed lines

@@ -43,7 +43,7 @@ 
 	 *
 	 * @since 3.3.0
 	 */
-	public function __construct( $rating_service ) {
+	public function __construct($rating_service) {
 
 		$this->rating_service = $rating_service;
 
@@ -59,12 +59,12 @@ 
 	private function is_entity_list_screen() {
 
 		// Run only on admin page.
-		if ( ! is_admin() ) {
+		if ( ! is_admin()) {
 			return false;
 		}
 
 		// Return safely if get_current_screen() is not defined (yet).
-		if ( false === function_exists( 'get_current_screen' ) ) {
+		if (false === function_exists('get_current_screen')) {
 			return false;
 		}
 
@@ -72,11 +72,11 @@ 
 		$screen = get_current_screen();
 
 		// If there is any valid screen nothing to do.
-		if ( null === $screen ) {
+		if (null === $screen) {
 			return false;
 		}
 
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $screen->post_type ) {
+		if (Wordlift_Entity_Service::TYPE_NAME !== $screen->post_type) {
 			return false;
 		}
 
@@ -94,26 +94,26 @@ 
 	 *
 	 * @return array Enhanced columns array.
 	 */
-	public function register_custom_columns( $columns ) {
+	public function register_custom_columns($columns) {
 
 		// Bail out if custom columns disabled via hook
 		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( ! apply_filters( 'wl_feature__enable__custom-columns', true ) ) {
+		if ( ! apply_filters('wl_feature__enable__custom-columns', true)) {
 			return $columns;
 		}
 
 		// Take away first column and keep a reference,
 		// so we can later insert the thumbnail between the first and the rest of columns.
 		$columns_cb = $columns['cb'];
-		unset( $columns['cb'] );
+		unset($columns['cb']);
 
 		// Thumbnails column is inserted in second place, while the related posts on the end.
 		$columns = array_merge(
-			array( 'cb' => $columns_cb ),                      // re-add first column
-			array( 'wl_column_thumbnail' => __( 'Image', 'wordlift' ) ),        // thumb
-			$columns,                                                               // default columns (without the first)
-			array( 'wl_column_related_posts' => __( 'Related Posts', 'wordlift' ) ), // related posts
-			array( 'wl_column_rating' => __( 'Rating', 'wordlift' ) ) // related posts
+			array('cb' => $columns_cb), // re-add first column
+			array('wl_column_thumbnail' => __('Image', 'wordlift')), // thumb
+			$columns, // default columns (without the first)
+			array('wl_column_related_posts' => __('Related Posts', 'wordlift')), // related posts
+			array('wl_column_rating' => __('Rating', 'wordlift')) // related posts
 		);
 
 		return $columns;
@@ -129,16 +129,16 @@ 
 	 * @param string $column The current column.
 	 * @param int    $entity_id An entity post id.
 	 */
-	public function render_custom_columns( $column, $entity_id ) {
+	public function render_custom_columns($column, $entity_id) {
 
-		switch ( $column ) {
+		switch ($column) {
 
 			case 'wl_column_related_posts':
-				echo count( wl_core_get_related_post_ids( $entity_id ) );
+				echo count(wl_core_get_related_post_ids($entity_id));
 				break;
 
 			case 'wl_column_thumbnail':
-				$edit_link = get_edit_post_link( $entity_id );
+				$edit_link = get_edit_post_link($entity_id);
 				$thumb     = get_the_post_thumbnail(
 					$entity_id,
 					array(
@@ -147,14 +147,14 @@ 
 					)
 				);
 
-				if ( ! $thumb ) {
-					$thumb = sprintf( '<img src="%s" width="%d">', WL_DEFAULT_THUMBNAIL_PATH, self::THUMB_SIZE );
+				if ( ! $thumb) {
+					$thumb = sprintf('<img src="%s" width="%d">', WL_DEFAULT_THUMBNAIL_PATH, self::THUMB_SIZE);
 				}
 
 				echo wp_kses(
-					sprintf( '<a href="%s">%s</a>', esc_url( $edit_link ), $thumb ),
+					sprintf('<a href="%s">%s</a>', esc_url($edit_link), $thumb),
 					array(
-						'a'   => array( 'href' => array() ),
+						'a'   => array('href' => array()),
 						'img' => array(
 							'src'   => array(),
 							'width' => array(),
@@ -164,8 +164,8 @@ 
 				break;
 
 			case 'wl_column_rating':
-				$rating = $this->rating_service->get_rating_for( $entity_id );
-				echo '<i class="wl-traffic-light wl-tl-' . esc_attr( $rating['traffic_light_score'] ) . '">' . esc_html( $rating['percentage_score'] ) . '%</i>';
+				$rating = $this->rating_service->get_rating_for($entity_id);
+				echo '<i class="wl-traffic-light wl-tl-'.esc_attr($rating['traffic_light_score']).'">'.esc_html($rating['percentage_score']).'%</i>';
 				break;
 		}
 
@@ -178,26 +178,26 @@ 
 	 */
 	public function restrict_manage_posts_classification_scope() {
 
-		if ( ! $this->is_entity_list_screen() ) {
+		if ( ! $this->is_entity_list_screen()) {
 			return;
 		}
 
 		// Was a W already selected?
-		$selected = isset( $_GET['wl-classification-scope'] ) ? //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			sanitize_text_field( wp_unslash( (string) $_GET['wl-classification-scope'] ) ) : ''; //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		$selected = isset($_GET['wl-classification-scope']) ? //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			sanitize_text_field(wp_unslash((string) $_GET['wl-classification-scope'])) : ''; //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 
 		// Print select box with the 4W
 		$all_w = array(
-			"All 'W'"         => __( "All 'W'", 'wordlift' ),
-			WL_WHAT_RELATION  => __( 'What', 'wordlift' ),
-			WL_WHO_RELATION   => __( 'Who', 'wordlift' ),
-			WL_WHERE_RELATION => __( 'Where', 'wordlift' ),
-			WL_WHEN_RELATION  => __( 'When', 'wordlift' ),
+			"All 'W'"         => __("All 'W'", 'wordlift'),
+			WL_WHAT_RELATION  => __('What', 'wordlift'),
+			WL_WHO_RELATION   => __('Who', 'wordlift'),
+			WL_WHERE_RELATION => __('Where', 'wordlift'),
+			WL_WHEN_RELATION  => __('When', 'wordlift'),
 		);
 		echo '<select name="wl-classification-scope" id="wl-dropdown-classification-scope">';
-		foreach ( $all_w as $v => $w ) {
-			$default = ( $selected === $v ) ? 'selected' : '';
-			echo sprintf( '<option value="%s" %s >%s</option>', esc_attr( $v ), esc_html( $default ), esc_html( $w ) );
+		foreach ($all_w as $v => $w) {
+			$default = ($selected === $v) ? 'selected' : '';
+			echo sprintf('<option value="%s" %s >%s</option>', esc_attr($v), esc_html($default), esc_html($w));
 		}
 		echo '</select>';
 	}
@@ -211,14 +211,14 @@ 
 	 * @return array Modified clauses.
 	 * @since 3.3.0
 	 */
-	public function posts_clauses_classification_scope( $clauses ) {
+	public function posts_clauses_classification_scope($clauses) {
 
-		if ( ! ( $this->is_entity_list_screen() && is_main_query() && isset( $_GET['wl-classification-scope'] ) ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		if ( ! ($this->is_entity_list_screen() && is_main_query() && isset($_GET['wl-classification-scope']))) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			return $clauses;
 		}
 
 		// Check a valid W was requested.
-		$requested_w = sanitize_text_field( wp_unslash( (string) $_GET['wl-classification-scope'] ) ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		$requested_w = sanitize_text_field(wp_unslash((string) $_GET['wl-classification-scope'])); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 
 		$all_w = array(
 			WL_WHAT_RELATION,
@@ -227,7 +227,7 @@ 
 			WL_WHEN_RELATION,
 		);
 
-		if ( ! in_array( $requested_w, $all_w, true ) ) {
+		if ( ! in_array($requested_w, $all_w, true)) {
 			return $clauses;
 		}
 
@@ -237,7 +237,7 @@ 
 
 		// Change WP main query clauses.
 		$clauses['join']     .= "INNER JOIN {$wl_relation_table} ON {$wpdb->posts}.ID = {$wl_relation_table}.object_id";
-		$clauses['where']    .= $wpdb->prepare( "AND {$wl_relation_table}.predicate = %s", $requested_w );
+		$clauses['where']    .= $wpdb->prepare("AND {$wl_relation_table}.predicate = %s", $requested_w);
 		$clauses['distinct'] .= 'DISTINCT';
 
 		return $clauses;
@@ -251,14 +251,14 @@ 
 	 *
 	 * @since 3.15.0
 	 */
-	public function pre_get_posts( $query ) {
+	public function pre_get_posts($query) {
 
-		if ( ! ( $this->is_entity_list_screen() && $query->is_main_query() ) ) {
+		if ( ! ($this->is_entity_list_screen() && $query->is_main_query())) {
 			return;
 		}
 
 		// Add to the post type all the types considered to be valid post types.
-		$query->set( 'post_type', Wordlift_Entity_Service::valid_entity_post_types() );
+		$query->set('post_type', Wordlift_Entity_Service::valid_entity_post_types());
 
 		// Do not show however entities of type `Article`.
 		$query->set(
@@ -291,7 +291,7 @@ 
 	public function load_edit() {
 
 		// Return safely if get_current_screen() is not defined (yet).
-		if ( false === function_exists( 'get_current_screen' ) ) {
+		if (false === function_exists('get_current_screen')) {
 			return;
 		}
 
@@ -299,11 +299,11 @@ 
 		$screen = get_current_screen();
 
 		// If there is any valid screen nothing to do.
-		if ( null === $screen ) {
+		if (null === $screen) {
 			return;
 		}
 
-		if ( ! ( Wordlift_Entity_Service::TYPE_NAME === $screen->post_type && is_main_query() ) ) {
+		if ( ! (Wordlift_Entity_Service::TYPE_NAME === $screen->post_type && is_main_query())) {
 			return;
 		}
 
@@ -316,7 +316,7 @@ 
 		 */
 		add_action(
 			'wp',
-			function () {
+			function() {
 				global $post_type;
 				$post_type = Wordlift_Entity_Service::TYPE_NAME; //phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
 			},

src/admin/class-wordlift-entity-types-taxonomy-walker.php

Indentation +109 added lines, -109 removed lines

@@ -10,7 +10,7 @@ 
  * @subpackage Wordlift/includes
  */
 if ( ! class_exists( 'Walker_Category_Checklist' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/template.php';
+    require_once ABSPATH . 'wp-admin/includes/template.php';
 }
 
 /**
@@ -24,113 +24,113 @@ 
 // phpcs:ignore Generic.Classes.DuplicateClassName.Found
 class Wordlift_Entity_Types_Taxonomy_Walker extends Walker_Category_Checklist {
 
-	/**
-	 * Entity taxonomy metabox must show exclusive options, no checkboxes.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param       $args     {
-	 *                        An array of arguments.
-	 *
-	 * @type string $taxonomy The taxonomy name.
-	 *              }
-	 *
-	 * @return array An array of arguments, with this walker in case the taxonomy is the Entity Type taxonomy.
-	 */
-	public function terms_checklist_args( $args ) {
-
-		if ( ! isset( $args['taxonomy'] ) || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
-			return $args;
-		}
-
-		// We override the way WP prints the taxonomy metabox HTML.
-		$args['walker']        = $this;
-		$args['checked_ontop'] = false;
-
-		return $args;
-
-	}
-
-	/**
-	 * Change checkboxes to radios.
-	 *
-	 * $max_depth = -1 means flatly display every element.
-	 * $max_depth = 0 means display all levels.
-	 * $max_depth > 0 specifies the number of display levels.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param array $elements  An array of elements.
-	 * @param int   $max_depth The maximum hierarchical depth.
-	 *
-	 * @param array $args      Additional arguments.
-	 *
-	 * @return string The hierarchical item output.
-	 */
-	public function walk( $elements, $max_depth, $args = array() ) {
-
-		// `max_depth` force to -1 to display a flat taxonomy.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/305
-		$output = parent::walk( $elements, - 1, $args );
-
-		$output = str_replace(
-			array( 'type="checkbox"', "type='checkbox'" ),
-			array( 'type="radio"', "type='radio'" ),
-			$output
-		);
-
-		return $output;
-	}
-
-	/**
-	 * Start the element output, output nothing in case of article term.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string $output   Passed by reference. Used to append additional content.
-	 * @param object $category The current term object.
-	 * @param int    $depth    Depth of the term in reference to parents. Default 0.
-	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
-	 * @param int    $id       ID of the current term.
-	 */
-	public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
-		global $post;
-
-		if ( ! isset( $post ) ) {
-			return;
-		}
-
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
-			 || 'article' !== $category->slug
-			 || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
-			parent::start_el( $output, $category, $depth, $args, $id );
-		}
-	}
-
-	/**
-	 * End the element output, output nothing in case of article term.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string $output   Passed by reference. Used to append additional content.
-	 * @param object $category The current term object.
-	 * @param int    $depth    Depth of the term in reference to parents. Default 0.
-	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
-	 */
-	public function end_el( &$output, $category, $depth = 0, $args = array() ) {
-		global $post;
-
-		if ( ! isset( $post ) ) {
-			return;
-		}
-
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
-			 || 'article' !== $category->slug
-			 || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
-			parent::end_el( $output, $category, $depth, $args );
-		}
-
-	}
+    /**
+     * Entity taxonomy metabox must show exclusive options, no checkboxes.
+     *
+     * @since 3.1.0
+     *
+     * @param       $args     {
+     *                        An array of arguments.
+     *
+     * @type string $taxonomy The taxonomy name.
+     *              }
+     *
+     * @return array An array of arguments, with this walker in case the taxonomy is the Entity Type taxonomy.
+     */
+    public function terms_checklist_args( $args ) {
+
+        if ( ! isset( $args['taxonomy'] ) || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
+            return $args;
+        }
+
+        // We override the way WP prints the taxonomy metabox HTML.
+        $args['walker']        = $this;
+        $args['checked_ontop'] = false;
+
+        return $args;
+
+    }
+
+    /**
+     * Change checkboxes to radios.
+     *
+     * $max_depth = -1 means flatly display every element.
+     * $max_depth = 0 means display all levels.
+     * $max_depth > 0 specifies the number of display levels.
+     *
+     * @since 3.1.0
+     *
+     * @param array $elements  An array of elements.
+     * @param int   $max_depth The maximum hierarchical depth.
+     *
+     * @param array $args      Additional arguments.
+     *
+     * @return string The hierarchical item output.
+     */
+    public function walk( $elements, $max_depth, $args = array() ) {
+
+        // `max_depth` force to -1 to display a flat taxonomy.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/305
+        $output = parent::walk( $elements, - 1, $args );
+
+        $output = str_replace(
+            array( 'type="checkbox"', "type='checkbox'" ),
+            array( 'type="radio"', "type='radio'" ),
+            $output
+        );
+
+        return $output;
+    }
+
+    /**
+     * Start the element output, output nothing in case of article term.
+     *
+     * @since 3.15.0
+     *
+     * @param string $output   Passed by reference. Used to append additional content.
+     * @param object $category The current term object.
+     * @param int    $depth    Depth of the term in reference to parents. Default 0.
+     * @param array  $args     An array of arguments. @see wp_terms_checklist()
+     * @param int    $id       ID of the current term.
+     */
+    public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
+        global $post;
+
+        if ( ! isset( $post ) ) {
+            return;
+        }
+
+        if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
+             || 'article' !== $category->slug
+             || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
+            parent::start_el( $output, $category, $depth, $args, $id );
+        }
+    }
+
+    /**
+     * End the element output, output nothing in case of article term.
+     *
+     * @since 3.15.0
+     *
+     * @param string $output   Passed by reference. Used to append additional content.
+     * @param object $category The current term object.
+     * @param int    $depth    Depth of the term in reference to parents. Default 0.
+     * @param array  $args     An array of arguments. @see wp_terms_checklist()
+     */
+    public function end_el( &$output, $category, $depth = 0, $args = array() ) {
+        global $post;
+
+        if ( ! isset( $post ) ) {
+            return;
+        }
+
+        if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
+             || 'article' !== $category->slug
+             || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
+            parent::end_el( $output, $category, $depth, $args );
+        }
+
+    }
 
 }

Spacing +18 added lines, -18 removed lines

@@ -9,8 +9,8 @@ 
  * @package    Wordlift
  * @subpackage Wordlift/includes
  */
-if ( ! class_exists( 'Walker_Category_Checklist' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/template.php';
+if ( ! class_exists('Walker_Category_Checklist')) {
+	require_once ABSPATH.'wp-admin/includes/template.php';
 }
 
 /**
@@ -37,9 +37,9 @@ 
 	 *
 	 * @return array An array of arguments, with this walker in case the taxonomy is the Entity Type taxonomy.
 	 */
-	public function terms_checklist_args( $args ) {
+	public function terms_checklist_args($args) {
 
-		if ( ! isset( $args['taxonomy'] ) || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
+		if ( ! isset($args['taxonomy']) || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy']) {
 			return $args;
 		}
 
@@ -67,16 +67,16 @@ 
 	 *
 	 * @return string The hierarchical item output.
 	 */
-	public function walk( $elements, $max_depth, $args = array() ) {
+	public function walk($elements, $max_depth, $args = array()) {
 
 		// `max_depth` force to -1 to display a flat taxonomy.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/305
-		$output = parent::walk( $elements, - 1, $args );
+		$output = parent::walk($elements, - 1, $args);
 
 		$output = str_replace(
-			array( 'type="checkbox"', "type='checkbox'" ),
-			array( 'type="radio"', "type='radio'" ),
+			array('type="checkbox"', "type='checkbox'"),
+			array('type="radio"', "type='radio'"),
 			$output
 		);
 
@@ -94,17 +94,17 @@ 
 	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
 	 * @param int    $id       ID of the current term.
 	 */
-	public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el(&$output, $category, $depth = 0, $args = array(), $id = 0) {
 		global $post;
 
-		if ( ! isset( $post ) ) {
+		if ( ! isset($post)) {
 			return;
 		}
 
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
+		if (Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
 			 || 'article' !== $category->slug
-			 || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
-			parent::start_el( $output, $category, $depth, $args, $id );
+			 || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy']) {
+			parent::start_el($output, $category, $depth, $args, $id);
 		}
 	}
 
@@ -118,17 +118,17 @@ 
 	 * @param int    $depth    Depth of the term in reference to parents. Default 0.
 	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
 	 */
-	public function end_el( &$output, $category, $depth = 0, $args = array() ) {
+	public function end_el(&$output, $category, $depth = 0, $args = array()) {
 		global $post;
 
-		if ( ! isset( $post ) ) {
+		if ( ! isset($post)) {
 			return;
 		}
 
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
+		if (Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
 			 || 'article' !== $category->slug
-			 || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
-			parent::end_el( $output, $category, $depth, $args );
+			 || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy']) {
+			parent::end_el($output, $category, $depth, $args);
 		}
 
 	}

src/admin/class-wordlift-admin-post-edit-page.php

Indentation +290 added lines, -290 removed lines

@@ -20,131 +20,131 @@ 
  */
 class Wordlift_Admin_Post_Edit_Page {
 
-	/**
-	 * Constants to be used instead of text inside FAQ
-	 * helper methods.
-	 */
-	const GUTENBERG       = 'gutenberg';
-	const TINY_MCE        = 'tiny_mce';
-	const FAQ_LIST_BOX_ID = 'wl-faq-meta-list-box';
-
-	/** Constant to be used for translation domain */
-	const WORDLIFT_TEXT_DOMAIN = 'wordlift';
-
-	/**
-	 * The {@link Wordlift} plugin instance.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @var \Wordlift $plugin The {@link Wordlift} plugin instance.
-	 */
-	private $plugin;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since 3.15.4
-	 *
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * Create the {@link Wordlift_Admin_Post_Edit_Page} instance.
-	 *
-	 * @param \Wordlift $plugin The {@link Wordlift} plugin instance.
-	 *
-	 * @since 3.11.0
-	 */
-	public function __construct( $plugin ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_scripts_gutenberg' ) );
-
-		// Bail out if we're in the UX Builder editor.
-		if ( $this->is_ux_builder_editor() ) {
-			$this->log->info( 'WordLift will not show, since we are in UX Builder editor.' );
-
-			return;
-		}
-
-		// Define the callbacks.
-		$callback = array( $this, 'enqueue_scripts' );
-		// Set a hook to enqueue scripts only when the edit page is displayed.
-		add_action( 'admin_print_scripts-post.php', $callback );
-		add_action( 'admin_print_scripts-post-new.php', $callback );
-
-		$this->plugin = $plugin;
-	}
-
-	/**
-	 * Check whether the current post opens with G'berg or not.
-	 *
-	 * @return bool True if G'berg is used otherwise false.
-	 * @since 3.22.3
-	 */
-	public function is_gutenberg_page() {
-		if ( function_exists( 'is_gutenberg_page' ) && is_gutenberg_page() ) {
-			// The Gutenberg plugin is on.
-			return true;
-		}
-
-		$current_screen = get_current_screen();
-		if ( method_exists( $current_screen, 'is_block_editor' ) && $current_screen->is_block_editor() ) {
-			// Gutenberg page on 5+.
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Check if we're in UX builder.
-	 *
-	 * @see   https://github.com/insideout10/wordlift-plugin/issues/691
-	 *
-	 * @since 3.15.4
-	 *
-	 * @return bool True if we're in UX builder, otherwise false.
-	 */
-	private function is_ux_builder_editor() {
-
-		return function_exists( 'ux_builder_is_editor' )
-			   && ux_builder_is_editor();
-	}
-
-	/**
-	 * Enqueue scripts and styles for the edit page.
-	 *
-	 * @since 3.11.0
-	 */
-	public function enqueue_scripts() {
-
-		// Dequeue potentially conflicting ontrapages angular scripts which any *are not* used on the edit screen.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/832
-		wp_dequeue_script( 'ontrapagesAngular' );
-		wp_dequeue_script( 'ontrapagesApp' );
-		wp_dequeue_script( 'ontrapagesController' );
-
-		// Bail out if this is G'berg.
-		if ( $this->is_gutenberg_page() ) {
-			return;
-		}
-
-		// If Gutenberg is enabled for the post, do not load the legacy edit.js.
-		if ( function_exists( 'use_block_editor_for_post' ) && use_block_editor_for_post( get_post() ) ) {
-			return;
-		}
-
-		// Bail out if classification sidebar is not enabled via hook
-		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( ! apply_filters( 'wl_feature__enable__classification-sidebar', true ) ) {
-			return;
-		}
-
-		/*
+    /**
+     * Constants to be used instead of text inside FAQ
+     * helper methods.
+     */
+    const GUTENBERG       = 'gutenberg';
+    const TINY_MCE        = 'tiny_mce';
+    const FAQ_LIST_BOX_ID = 'wl-faq-meta-list-box';
+
+    /** Constant to be used for translation domain */
+    const WORDLIFT_TEXT_DOMAIN = 'wordlift';
+
+    /**
+     * The {@link Wordlift} plugin instance.
+     *
+     * @since 3.11.0
+     *
+     * @var \Wordlift $plugin The {@link Wordlift} plugin instance.
+     */
+    private $plugin;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since 3.15.4
+     *
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * Create the {@link Wordlift_Admin_Post_Edit_Page} instance.
+     *
+     * @param \Wordlift $plugin The {@link Wordlift} plugin instance.
+     *
+     * @since 3.11.0
+     */
+    public function __construct( $plugin ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_scripts_gutenberg' ) );
+
+        // Bail out if we're in the UX Builder editor.
+        if ( $this->is_ux_builder_editor() ) {
+            $this->log->info( 'WordLift will not show, since we are in UX Builder editor.' );
+
+            return;
+        }
+
+        // Define the callbacks.
+        $callback = array( $this, 'enqueue_scripts' );
+        // Set a hook to enqueue scripts only when the edit page is displayed.
+        add_action( 'admin_print_scripts-post.php', $callback );
+        add_action( 'admin_print_scripts-post-new.php', $callback );
+
+        $this->plugin = $plugin;
+    }
+
+    /**
+     * Check whether the current post opens with G'berg or not.
+     *
+     * @return bool True if G'berg is used otherwise false.
+     * @since 3.22.3
+     */
+    public function is_gutenberg_page() {
+        if ( function_exists( 'is_gutenberg_page' ) && is_gutenberg_page() ) {
+            // The Gutenberg plugin is on.
+            return true;
+        }
+
+        $current_screen = get_current_screen();
+        if ( method_exists( $current_screen, 'is_block_editor' ) && $current_screen->is_block_editor() ) {
+            // Gutenberg page on 5+.
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if we're in UX builder.
+     *
+     * @see   https://github.com/insideout10/wordlift-plugin/issues/691
+     *
+     * @since 3.15.4
+     *
+     * @return bool True if we're in UX builder, otherwise false.
+     */
+    private function is_ux_builder_editor() {
+
+        return function_exists( 'ux_builder_is_editor' )
+               && ux_builder_is_editor();
+    }
+
+    /**
+     * Enqueue scripts and styles for the edit page.
+     *
+     * @since 3.11.0
+     */
+    public function enqueue_scripts() {
+
+        // Dequeue potentially conflicting ontrapages angular scripts which any *are not* used on the edit screen.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/832
+        wp_dequeue_script( 'ontrapagesAngular' );
+        wp_dequeue_script( 'ontrapagesApp' );
+        wp_dequeue_script( 'ontrapagesController' );
+
+        // Bail out if this is G'berg.
+        if ( $this->is_gutenberg_page() ) {
+            return;
+        }
+
+        // If Gutenberg is enabled for the post, do not load the legacy edit.js.
+        if ( function_exists( 'use_block_editor_for_post' ) && use_block_editor_for_post( get_post() ) ) {
+            return;
+        }
+
+        // Bail out if classification sidebar is not enabled via hook
+        // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+        if ( ! apply_filters( 'wl_feature__enable__classification-sidebar', true ) ) {
+            return;
+        }
+
+        /*
 		 * Enqueue the edit screen JavaScript. The `wordlift-admin.bundle.js` file
 		 * is scheduled to replace the older `wordlift-admin.min.js` once client-side
 		 * code is properly refactored.
@@ -153,178 +153,178 @@ 
 		 *
 		 * @since 3.20.0 edit.js has been migrated to the new webpack configuration.
 		 */
-		$script_name = plugin_dir_url( __DIR__ ) . 'js/dist/edit';
-
-		/**
-		 * Scripts_Helper introduced.
-		 *
-		 * @since 3.25.0 Scripts are loaded using script helper to ensure WP 4.4 compatibiility.
-		 * @since 3.25.1 The handle is used to hook the wp_localize_script for the _wlEntityTypes global object.
-		 */
-		Scripts_Helper::enqueue_based_on_wordpress_version(
-			'wl-classic-editor',
-			$script_name,
-			array(
-				$this->plugin->get_plugin_name(),
-				'jquery',
-				// Require wp.ajax.
-				'wp-util',
-				// @@todo: provide the following dependencies when we're in WP < 5.0 (i.e. when these dependencies aren't already defined).
-				'react',
-				'react-dom',
-				'wp-element',
-				'wp-polyfill',
-				/*
+        $script_name = plugin_dir_url( __DIR__ ) . 'js/dist/edit';
+
+        /**
+         * Scripts_Helper introduced.
+         *
+         * @since 3.25.0 Scripts are loaded using script helper to ensure WP 4.4 compatibiility.
+         * @since 3.25.1 The handle is used to hook the wp_localize_script for the _wlEntityTypes global object.
+         */
+        Scripts_Helper::enqueue_based_on_wordpress_version(
+            'wl-classic-editor',
+            $script_name,
+            array(
+                $this->plugin->get_plugin_name(),
+                'jquery',
+                // Require wp.ajax.
+                'wp-util',
+                // @@todo: provide the following dependencies when we're in WP < 5.0 (i.e. when these dependencies aren't already defined).
+                'react',
+                'react-dom',
+                'wp-element',
+                'wp-polyfill',
+                /*
 				* Angular isn't loaded anymore remotely, but it is loaded within wordlift-reloaded.js.
 				*
 				* See https://github.com/insideout10/wordlift-plugin/issues/865.
 				*
 				* @since 3.19.6
 				*/
-				// Require Angular.
-				// 'wl-angular',
-				// 'wl-angular-geolocation',
-				// 'wl-angular-touch',
-				// 'wl-angular-animate',
-				/**
-				 * We need the `wp.hooks` global to allow the edit.js script to send actions.
-				 *
-				 * @since 3.23.0
-				 */
-				'wp-hooks',
-			)
-		);
-
-		wp_enqueue_style( 'wl-classic-editor', "$script_name.css", array(), $this->plugin->get_version() );
-		// Disable Faq Editor.
-		// $this->load_faq_scripts_and_styles();
-		// $this->load_faq_settings( self::TINY_MCE );
-	}
-
-	/**
-	 * Enqueue the scripts and styles needed for FAQ
-	 */
-	private function load_faq_scripts_and_styles() {
-		wp_enqueue_style(
-			'wl-faq-metabox-style',
-			plugin_dir_url( __DIR__ ) . 'js/dist/faq.css',
-			array(),
-			WORDLIFT_VERSION
-		);
-		Scripts_Helper::enqueue_based_on_wordpress_version(
-			'wl-faq-metabox-script',
-			plugin_dir_url( __DIR__ ) . 'js/dist/faq',
-			array( 'wp-polyfill' ),
-			true
-		);
-	}
-
-	/**
-	 * Get FAQ settings array
-	 *
-	 * @return array
-	 */
-	public function get_faq_settings() {
-		return array(
-			'restUrl'                 => get_rest_url( null, WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faq' ),
-			'listBoxId'               => self::FAQ_LIST_BOX_ID,
-			'nonce'                   => wp_create_nonce( 'wp_rest' ),
-			'postId'                  => get_the_ID(),
-			// Translation for warning, error message.
-			/* translators: %s: The invalid tag. */
-			'invalidTagMessage'       => sprintf( __( 'Invalid tags %s is present in answer', 'wordlift' ), '{INVALID_TAGS}' ),
-			/* translators: %s: The word count limit warning. */
-			'invalidWordCountMessage' => sprintf( __( 'Answer word count must not exceed %s words', 'wordlift' ), '{ANSWER_WORD_COUNT_WARNING_LIMIT}' ),
-			'questionText'            => __( 'Question', 'wordlift' ),
-			'answerText'              => __( 'Answer', 'wordlift' ),
-			'addQuestionOrAnswerText' => __( 'Add Question / Answer', 'wordlift' ),
-			'addQuestionText'         => __( 'Add Question', 'wordlift' ),
-			'addAnswerText'           => __( 'Add Answer', 'wordlift' ),
-			'noFaqItemsText'          => __( 'Highlight a question in content, then click Add Question.', 'wordlift' ),
-			'updatingText'            => __( 'Updating...', 'wordlift' ),
-		);
-	}
-
-	/**
-	 * Load FAQ settings to the add/edit post page
-	 *
-	 * @param $editor string specifying which text editor needed to be used.
-	 */
-	private function load_faq_settings( $editor ) {
-		// This script also provides translations to gutenberg.
-		wp_localize_script( 'wl-faq-metabox-script', '_wlFaqSettings', $this->get_faq_settings() );
-
-		// Enqueue the FAQ style
-		if ( self::GUTENBERG === $editor ) {
-			Scripts_Helper::enqueue_based_on_wordpress_version(
-				'wl-faq-gutenberg-plugin',
-				plugin_dir_url( __DIR__ ) . 'js/dist/block-editor-faq-plugin',
-				array( 'wp-polyfill' ),
-				true
-			);
-		}
-	}
-
-	/**
-	 * Enqueue scripts and styles for the gutenberg edit page.
-	 *
-	 * @since 3.21.0
-	 */
-	public function enqueue_scripts_gutenberg() {
-		// Load FAQ settings. - Disabled for now
-		// $this->load_faq_scripts_and_styles();
-		// $this->load_faq_settings( self::GUTENBERG );
-
-		wp_register_script(
-			'wl-block-editor',
-			plugin_dir_url( __DIR__ ) . 'js/dist/block-editor.js',
-			array(
-				'react',
-				'wordlift',
-				'wp-hooks',
-				'wp-data',
-				'wp-rich-text',
-				'wp-blocks',
-				'wp-plugins',
-				'wp-edit-post',
-			),
-			$this->plugin->get_version(),
-			false
-		);
-		wp_localize_script(
-			'wl-block-editor',
-			'_wlBlockEditorSettings',
-			array(
-				'root'  => esc_url_raw( rest_url() ),
-				'nonce' => wp_create_nonce( 'wp_rest' ),
-			)
-		);
-
-		/*
+                // Require Angular.
+                // 'wl-angular',
+                // 'wl-angular-geolocation',
+                // 'wl-angular-touch',
+                // 'wl-angular-animate',
+                /**
+                 * We need the `wp.hooks` global to allow the edit.js script to send actions.
+                 *
+                 * @since 3.23.0
+                 */
+                'wp-hooks',
+            )
+        );
+
+        wp_enqueue_style( 'wl-classic-editor', "$script_name.css", array(), $this->plugin->get_version() );
+        // Disable Faq Editor.
+        // $this->load_faq_scripts_and_styles();
+        // $this->load_faq_settings( self::TINY_MCE );
+    }
+
+    /**
+     * Enqueue the scripts and styles needed for FAQ
+     */
+    private function load_faq_scripts_and_styles() {
+        wp_enqueue_style(
+            'wl-faq-metabox-style',
+            plugin_dir_url( __DIR__ ) . 'js/dist/faq.css',
+            array(),
+            WORDLIFT_VERSION
+        );
+        Scripts_Helper::enqueue_based_on_wordpress_version(
+            'wl-faq-metabox-script',
+            plugin_dir_url( __DIR__ ) . 'js/dist/faq',
+            array( 'wp-polyfill' ),
+            true
+        );
+    }
+
+    /**
+     * Get FAQ settings array
+     *
+     * @return array
+     */
+    public function get_faq_settings() {
+        return array(
+            'restUrl'                 => get_rest_url( null, WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faq' ),
+            'listBoxId'               => self::FAQ_LIST_BOX_ID,
+            'nonce'                   => wp_create_nonce( 'wp_rest' ),
+            'postId'                  => get_the_ID(),
+            // Translation for warning, error message.
+            /* translators: %s: The invalid tag. */
+            'invalidTagMessage'       => sprintf( __( 'Invalid tags %s is present in answer', 'wordlift' ), '{INVALID_TAGS}' ),
+            /* translators: %s: The word count limit warning. */
+            'invalidWordCountMessage' => sprintf( __( 'Answer word count must not exceed %s words', 'wordlift' ), '{ANSWER_WORD_COUNT_WARNING_LIMIT}' ),
+            'questionText'            => __( 'Question', 'wordlift' ),
+            'answerText'              => __( 'Answer', 'wordlift' ),
+            'addQuestionOrAnswerText' => __( 'Add Question / Answer', 'wordlift' ),
+            'addQuestionText'         => __( 'Add Question', 'wordlift' ),
+            'addAnswerText'           => __( 'Add Answer', 'wordlift' ),
+            'noFaqItemsText'          => __( 'Highlight a question in content, then click Add Question.', 'wordlift' ),
+            'updatingText'            => __( 'Updating...', 'wordlift' ),
+        );
+    }
+
+    /**
+     * Load FAQ settings to the add/edit post page
+     *
+     * @param $editor string specifying which text editor needed to be used.
+     */
+    private function load_faq_settings( $editor ) {
+        // This script also provides translations to gutenberg.
+        wp_localize_script( 'wl-faq-metabox-script', '_wlFaqSettings', $this->get_faq_settings() );
+
+        // Enqueue the FAQ style
+        if ( self::GUTENBERG === $editor ) {
+            Scripts_Helper::enqueue_based_on_wordpress_version(
+                'wl-faq-gutenberg-plugin',
+                plugin_dir_url( __DIR__ ) . 'js/dist/block-editor-faq-plugin',
+                array( 'wp-polyfill' ),
+                true
+            );
+        }
+    }
+
+    /**
+     * Enqueue scripts and styles for the gutenberg edit page.
+     *
+     * @since 3.21.0
+     */
+    public function enqueue_scripts_gutenberg() {
+        // Load FAQ settings. - Disabled for now
+        // $this->load_faq_scripts_and_styles();
+        // $this->load_faq_settings( self::GUTENBERG );
+
+        wp_register_script(
+            'wl-block-editor',
+            plugin_dir_url( __DIR__ ) . 'js/dist/block-editor.js',
+            array(
+                'react',
+                'wordlift',
+                'wp-hooks',
+                'wp-data',
+                'wp-rich-text',
+                'wp-blocks',
+                'wp-plugins',
+                'wp-edit-post',
+            ),
+            $this->plugin->get_version(),
+            false
+        );
+        wp_localize_script(
+            'wl-block-editor',
+            '_wlBlockEditorSettings',
+            array(
+                'root'  => esc_url_raw( rest_url() ),
+                'nonce' => wp_create_nonce( 'wp_rest' ),
+            )
+        );
+
+        /*
 		 * @since 3.25.1 The hook is used by the wp_localize_script to register the _wlEntityTypes global object.
 		 */
-		wp_enqueue_style(
-			'wl-block-editor',
-			plugin_dir_url( __DIR__ ) . 'js/dist/block-editor.css',
-			array(),
-			$this->plugin->get_version()
-		);
-
-		wp_enqueue_script(
-			'wl-autocomplete-select',
-			plugin_dir_url( __DIR__ ) . 'js/dist/autocomplete-select.js',
-			array(),
-			$this->plugin->get_version(),
-			true
-		);
-
-		wp_enqueue_style(
-			'wl-autocomplete-select',
-			plugin_dir_url( __DIR__ ) . 'js/dist/autocomplete-select.css',
-			array(),
-			$this->plugin->get_version()
-		);
-
-	}
+        wp_enqueue_style(
+            'wl-block-editor',
+            plugin_dir_url( __DIR__ ) . 'js/dist/block-editor.css',
+            array(),
+            $this->plugin->get_version()
+        );
+
+        wp_enqueue_script(
+            'wl-autocomplete-select',
+            plugin_dir_url( __DIR__ ) . 'js/dist/autocomplete-select.js',
+            array(),
+            $this->plugin->get_version(),
+            true
+        );
+
+        wp_enqueue_style(
+            'wl-autocomplete-select',
+            plugin_dir_url( __DIR__ ) . 'js/dist/autocomplete-select.css',
+            array(),
+            $this->plugin->get_version()
+        );
+
+    }
 
 }

Spacing +44 added lines, -44 removed lines

@@ -56,24 +56,24 @@ 
 	 *
 	 * @since 3.11.0
 	 */
-	public function __construct( $plugin ) {
+	public function __construct($plugin) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
-		add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_scripts_gutenberg' ) );
+		add_action('enqueue_block_editor_assets', array($this, 'enqueue_scripts_gutenberg'));
 
 		// Bail out if we're in the UX Builder editor.
-		if ( $this->is_ux_builder_editor() ) {
-			$this->log->info( 'WordLift will not show, since we are in UX Builder editor.' );
+		if ($this->is_ux_builder_editor()) {
+			$this->log->info('WordLift will not show, since we are in UX Builder editor.');
 
 			return;
 		}
 
 		// Define the callbacks.
-		$callback = array( $this, 'enqueue_scripts' );
+		$callback = array($this, 'enqueue_scripts');
 		// Set a hook to enqueue scripts only when the edit page is displayed.
-		add_action( 'admin_print_scripts-post.php', $callback );
-		add_action( 'admin_print_scripts-post-new.php', $callback );
+		add_action('admin_print_scripts-post.php', $callback);
+		add_action('admin_print_scripts-post-new.php', $callback);
 
 		$this->plugin = $plugin;
 	}
@@ -85,13 +85,13 @@ 
 	 * @since 3.22.3
 	 */
 	public function is_gutenberg_page() {
-		if ( function_exists( 'is_gutenberg_page' ) && is_gutenberg_page() ) {
+		if (function_exists('is_gutenberg_page') && is_gutenberg_page()) {
 			// The Gutenberg plugin is on.
 			return true;
 		}
 
 		$current_screen = get_current_screen();
-		if ( method_exists( $current_screen, 'is_block_editor' ) && $current_screen->is_block_editor() ) {
+		if (method_exists($current_screen, 'is_block_editor') && $current_screen->is_block_editor()) {
 			// Gutenberg page on 5+.
 			return true;
 		}
@@ -110,7 +110,7 @@ 
 	 */
 	private function is_ux_builder_editor() {
 
-		return function_exists( 'ux_builder_is_editor' )
+		return function_exists('ux_builder_is_editor')
 			   && ux_builder_is_editor();
 	}
 
@@ -124,23 +124,23 @@ 
 		// Dequeue potentially conflicting ontrapages angular scripts which any *are not* used on the edit screen.
 		//
 		// @see https://github.com/insideout10/wordlift-plugin/issues/832
-		wp_dequeue_script( 'ontrapagesAngular' );
-		wp_dequeue_script( 'ontrapagesApp' );
-		wp_dequeue_script( 'ontrapagesController' );
+		wp_dequeue_script('ontrapagesAngular');
+		wp_dequeue_script('ontrapagesApp');
+		wp_dequeue_script('ontrapagesController');
 
 		// Bail out if this is G'berg.
-		if ( $this->is_gutenberg_page() ) {
+		if ($this->is_gutenberg_page()) {
 			return;
 		}
 
 		// If Gutenberg is enabled for the post, do not load the legacy edit.js.
-		if ( function_exists( 'use_block_editor_for_post' ) && use_block_editor_for_post( get_post() ) ) {
+		if (function_exists('use_block_editor_for_post') && use_block_editor_for_post(get_post())) {
 			return;
 		}
 
 		// Bail out if classification sidebar is not enabled via hook
 		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( ! apply_filters( 'wl_feature__enable__classification-sidebar', true ) ) {
+		if ( ! apply_filters('wl_feature__enable__classification-sidebar', true)) {
 			return;
 		}
 
@@ -153,7 +153,7 @@ 
 		 *
 		 * @since 3.20.0 edit.js has been migrated to the new webpack configuration.
 		 */
-		$script_name = plugin_dir_url( __DIR__ ) . 'js/dist/edit';
+		$script_name = plugin_dir_url(__DIR__).'js/dist/edit';
 
 		/**
 		 * Scripts_Helper introduced.
@@ -195,7 +195,7 @@ 
 			)
 		);
 
-		wp_enqueue_style( 'wl-classic-editor', "$script_name.css", array(), $this->plugin->get_version() );
+		wp_enqueue_style('wl-classic-editor', "$script_name.css", array(), $this->plugin->get_version());
 		// Disable Faq Editor.
 		// $this->load_faq_scripts_and_styles();
 		// $this->load_faq_settings( self::TINY_MCE );
@@ -207,14 +207,14 @@ 
 	private function load_faq_scripts_and_styles() {
 		wp_enqueue_style(
 			'wl-faq-metabox-style',
-			plugin_dir_url( __DIR__ ) . 'js/dist/faq.css',
+			plugin_dir_url(__DIR__).'js/dist/faq.css',
 			array(),
 			WORDLIFT_VERSION
 		);
 		Scripts_Helper::enqueue_based_on_wordpress_version(
 			'wl-faq-metabox-script',
-			plugin_dir_url( __DIR__ ) . 'js/dist/faq',
-			array( 'wp-polyfill' ),
+			plugin_dir_url(__DIR__).'js/dist/faq',
+			array('wp-polyfill'),
 			true
 		);
 	}
@@ -226,22 +226,22 @@ 
 	 */
 	public function get_faq_settings() {
 		return array(
-			'restUrl'                 => get_rest_url( null, WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faq' ),
+			'restUrl'                 => get_rest_url(null, WL_REST_ROUTE_DEFAULT_NAMESPACE.'/faq'),
 			'listBoxId'               => self::FAQ_LIST_BOX_ID,
-			'nonce'                   => wp_create_nonce( 'wp_rest' ),
+			'nonce'                   => wp_create_nonce('wp_rest'),
 			'postId'                  => get_the_ID(),
 			// Translation for warning, error message.
 			/* translators: %s: The invalid tag. */
-			'invalidTagMessage'       => sprintf( __( 'Invalid tags %s is present in answer', 'wordlift' ), '{INVALID_TAGS}' ),
+			'invalidTagMessage'       => sprintf(__('Invalid tags %s is present in answer', 'wordlift'), '{INVALID_TAGS}'),
 			/* translators: %s: The word count limit warning. */
-			'invalidWordCountMessage' => sprintf( __( 'Answer word count must not exceed %s words', 'wordlift' ), '{ANSWER_WORD_COUNT_WARNING_LIMIT}' ),
-			'questionText'            => __( 'Question', 'wordlift' ),
-			'answerText'              => __( 'Answer', 'wordlift' ),
-			'addQuestionOrAnswerText' => __( 'Add Question / Answer', 'wordlift' ),
-			'addQuestionText'         => __( 'Add Question', 'wordlift' ),
-			'addAnswerText'           => __( 'Add Answer', 'wordlift' ),
-			'noFaqItemsText'          => __( 'Highlight a question in content, then click Add Question.', 'wordlift' ),
-			'updatingText'            => __( 'Updating...', 'wordlift' ),
+			'invalidWordCountMessage' => sprintf(__('Answer word count must not exceed %s words', 'wordlift'), '{ANSWER_WORD_COUNT_WARNING_LIMIT}'),
+			'questionText'            => __('Question', 'wordlift'),
+			'answerText'              => __('Answer', 'wordlift'),
+			'addQuestionOrAnswerText' => __('Add Question / Answer', 'wordlift'),
+			'addQuestionText'         => __('Add Question', 'wordlift'),
+			'addAnswerText'           => __('Add Answer', 'wordlift'),
+			'noFaqItemsText'          => __('Highlight a question in content, then click Add Question.', 'wordlift'),
+			'updatingText'            => __('Updating...', 'wordlift'),
 		);
 	}
 
@@ -250,16 +250,16 @@ 
 	 *
 	 * @param $editor string specifying which text editor needed to be used.
 	 */
-	private function load_faq_settings( $editor ) {
+	private function load_faq_settings($editor) {
 		// This script also provides translations to gutenberg.
-		wp_localize_script( 'wl-faq-metabox-script', '_wlFaqSettings', $this->get_faq_settings() );
+		wp_localize_script('wl-faq-metabox-script', '_wlFaqSettings', $this->get_faq_settings());
 
 		// Enqueue the FAQ style
-		if ( self::GUTENBERG === $editor ) {
+		if (self::GUTENBERG === $editor) {
 			Scripts_Helper::enqueue_based_on_wordpress_version(
 				'wl-faq-gutenberg-plugin',
-				plugin_dir_url( __DIR__ ) . 'js/dist/block-editor-faq-plugin',
-				array( 'wp-polyfill' ),
+				plugin_dir_url(__DIR__).'js/dist/block-editor-faq-plugin',
+				array('wp-polyfill'),
 				true
 			);
 		}
@@ -277,7 +277,7 @@ 
 
 		wp_register_script(
 			'wl-block-editor',
-			plugin_dir_url( __DIR__ ) . 'js/dist/block-editor.js',
+			plugin_dir_url(__DIR__).'js/dist/block-editor.js',
 			array(
 				'react',
 				'wordlift',
@@ -295,8 +295,8 @@ 
 			'wl-block-editor',
 			'_wlBlockEditorSettings',
 			array(
-				'root'  => esc_url_raw( rest_url() ),
-				'nonce' => wp_create_nonce( 'wp_rest' ),
+				'root'  => esc_url_raw(rest_url()),
+				'nonce' => wp_create_nonce('wp_rest'),
 			)
 		);
 
@@ -305,14 +305,14 @@ 
 		 */
 		wp_enqueue_style(
 			'wl-block-editor',
-			plugin_dir_url( __DIR__ ) . 'js/dist/block-editor.css',
+			plugin_dir_url(__DIR__).'js/dist/block-editor.css',
 			array(),
 			$this->plugin->get_version()
 		);
 
 		wp_enqueue_script(
 			'wl-autocomplete-select',
-			plugin_dir_url( __DIR__ ) . 'js/dist/autocomplete-select.js',
+			plugin_dir_url(__DIR__).'js/dist/autocomplete-select.js',
 			array(),
 			$this->plugin->get_version(),
 			true
@@ -320,7 +320,7 @@ 
 
 		wp_enqueue_style(
 			'wl-autocomplete-select',
-			plugin_dir_url( __DIR__ ) . 'js/dist/autocomplete-select.css',
+			plugin_dir_url(__DIR__).'js/dist/autocomplete-select.css',
 			array(),
 			$this->plugin->get_version()
 		);

src/admin/class-wordlift-admin-settings-analytics-page.php

Indentation +303 added lines, -303 removed lines

@@ -18,308 +18,308 @@
  */
 class Wordlift_Admin_Settings_Analytics_Page extends Wordlift_Admin_Page {
 
-	/**
-	 * A singleton instance of the Notice service.
-	 *
-	 * @since  3.21.0
-	 * @access private
-	 * @var \Wordlift_Admin_Settings_Analytics_Page $instance A singleton instance of a {@link Wordlift_Admin_Settings_Analytics_Page} class.
-	 */
-	private static $instance;
-
-	/**
-	 * A {@link Wordlift_Admin_Input_Element} element renderer.
-	 *
-	 * @since  3.21.0
-	 * @access private
-	 * @var \Wordlift_Admin_Input_Element $input_element An {@link Wordlift_Admin_Input_Element} element renderer.
-	 */
-	private $input_element;
-
-	/**
-	 * A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
-	 *
-	 * @since  3.21.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Radio_Input_Element $radio_input_element A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
-	 */
-	private $radio_input_element;
-
-	/**
-	 * Create a {@link Wordlift_Admin_Settings_Page} instance.
-	 *
-	 * @param \Wordlift_Admin_Input_Element       $input_element An input element class to output input boxes in a settings form.
-	 * @param \Wordlift_Admin_Radio_Input_Element $radio_input_element A radio element input class for use in a settings form.
-	 *
-	 * @since 3.21.0
-	 */
-	public function __construct( $input_element, $radio_input_element ) {
-
-		// Set a reference to the UI elements.
-		$this->input_element       = $input_element;
-		$this->radio_input_element = $radio_input_element;
-
-		// Adds this page to the main admin settings tabbed menu.
-		add_filter( 'wl_admin_page_tabs', array( $this, 'add_admin_page_tab' ) );
-
-		self::$instance = $this;
-	}
-
-	/**
-	 * Get the singleton instance of the Notice service.
-	 *
-	 * @return \Wordlift_Admin_Settings_Page The singleton instance of the settings page service.
-	 * @since 3.21.0
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	protected function get_parent_slug() {
-
-		return 'wl_admin_menu';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	protected function get_capability() {
-
-		return 'manage_options';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function get_page_title() {
-
-		return __( 'WorldLift Analytics Settings', 'wordlift' );
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function get_menu_title() {
-
-		return __( 'Analytics Settings', 'wordlift' );
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function get_menu_slug() {
-
-		return 'wl_configuration_admin_analytics_menu';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function get_partial_name() {
-
-		return 'wordlift-admin-settings-analytics-page.php';
-	}
-
-	/**
-	 * Returns the string to use for the tab slug on main admin settings page.
-	 *
-	 * @method get_admin_page_tab_slug
-	 * @return string
-	 * @since  3.21.0
-	 */
-	public function get_admin_page_tab_slug() {
-		return 'analytics';
-	}
-
-	/**
-	 * Adds pages to the tabs menu on the main admin settings page.
-	 *
-	 * @method add_admin_page_tab
-	 * @param array $tabs an array of tab titles and slugs to use when building a tabbed menu on option pages.
-	 *
-	 * @since  3.21.0
-	 */
-	public function add_admin_page_tab( $tabs ) {
-		if ( apply_filters( 'wl_feature__enable__analytics', true ) ) {
-			$tabs[] = array(
-				'title' => $this->get_menu_title(),
-				'slug'  => $this->get_admin_page_tab_slug(),
-			);
-		}
-
-		return $tabs;
-	}
-
-	/**
-	 * Configure all the configuration parameters.
-	 *
-	 * Called by the *admin_init* hook.
-	 *
-	 * @since 3.21.0
-	 */
-	public function admin_init() {
-
-		// Register WordLift's analytics settings with our in class sanitizer.
-		register_setting(
-			'wl_analytics_settings',
-			'wl_analytics_settings',
-			array( $this, 'sanitize_callback' )
-		);
-
-		// Add the analytics settings setction.
-		add_settings_section(
-			'wl_analytics_settings_section',
-			'',
-			'',
-			'wl_analytics_settings'
-		);
-
-		// Add a toggle to determine if analytics functions are enabled or not.
-		// NOTE: this uses yes/no rather than true/false.
-		add_settings_field(
-			'wl-analytics-enabled',
-			__( 'Enable Analytics', 'wordlift' ),
-			array( $this->radio_input_element, 'render' ),
-			'wl_analytics_settings',
-			'wl_analytics_settings_section',
-			array(
-				'id'          => 'wl-analytics-enable',
-				'name'        => 'wl_analytics_settings[' . Wordlift_Configuration_Service::ANALYTICS_ENABLE . ']',
-				'value'       => Wordlift_Configuration_Service::get_instance()->is_analytics_enable() ? 'yes' : 'no',
-				'description' => __( 'Toggle on/off the default values.', 'wordlift' ),
-			)
-		);
-
-		/**
-		 * A basic number field that will accept anything from 1 to 20.
-		 *
-		 * Represents the custom dim number for the uri.
-		 */
-		add_settings_field(
-			'wl-analytics-entity-uri-dimension',
-			__( 'Entity URI dimension', 'wordlift' ),
-			array( $this->input_element, 'render' ),
-			'wl_analytics_settings',
-			'wl_analytics_settings_section',
-			array(
-				'id'          => 'wl-analytics-entity-uri-dimension',
-				'name'        => 'wl_analytics_settings[' . Wordlift_Configuration_Service::ANALYTICS_ENTITY_URI_DIMENSION . ']',
-				'type'        => 'number',
-				'value'       => Wordlift_Configuration_Service::get_instance()->get_analytics_entity_uri_dimension(),
-				'description' => __( 'Entity URI dimesion', 'wordlift' ),
-			)
-		);
-
-		/**
-		 * A basic number field that will accept anything from 1 to 20.
-		 *
-		 * Represents the custom dim number for the type.
-		 */
-		add_settings_field(
-			'wl-analytics-entity-type-dimension',
-			__( 'Entity Type dimension', 'wordlift' ),
-			array( $this->input_element, 'render' ),
-			'wl_analytics_settings',
-			'wl_analytics_settings_section',
-			array(
-				'id'          => 'wl-analytics-entity-type-dimension',
-				'name'        => 'wl_analytics_settings[' . Wordlift_Configuration_Service::ANALYTICS_ENTITY_TYPE_DIMENSION . ']',
-				'type'        => 'number',
-				'value'       => Wordlift_Configuration_Service::get_instance()->get_analytics_entity_type_dimension(),
-				'description' => __( 'Entity Type dimension', 'wordlift' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Validates an entity uri based on an integer passed.
-	 *
-	 * TODO: Needs a feedback method to pass back error messages.
-	 *
-	 * @method validate_entity_uri
-	 * @param string $uri a sting representing an entity ID that can be converted to a uri.
-	 *
-	 * @return int
-	 * @since 3.21.0
-	 */
-	public function validate_entity_uri( $uri ) {
-		// Basic validation is to ensure number is between 1 and 20.
-		// NOTE: certain analytics accounts have a much higher value - as many
-		// as 200 are allowed.
-		if ( (int) $uri < 1 || (int) $uri > 20 ) {
-			// if we are out of range then pass the default value.
-			$uri = Wordlift_Configuration_Service::get_instance()->get_analytics_entity_uri_dimension();
-		}
-
-		return absint( $uri );
-	}
-
-	/**
-	 * Validates an entity type.
-	 *
-	 * TODO: Needs a feedback method to pass back error messages.
-	 *
-	 * @method validate_entity_type
-	 * @param string $type This is an entity type ID in string form - really a number.
-	 *
-	 * @return int
-	 * @since  3.21.0
-	 */
-	public function validate_entity_type( $type ) {
-		// Basic validation is to ensure number is between 1 and 20.
-		// NOTE: certain analytics accounts have a much higher value - as many
-		// as 200 are allowed.
-		if ( (int) $type < 1 || (int) $type > 20 ) {
-			// if we are out of range then pass the default value.
-			$type = Wordlift_Configuration_Service::get_instance()->get_analytics_entity_type_dimension();
-		}
-
-		return absint( $type );
-	}
-
-	/**
-	 * Sanitize the configuration settings to be stored.
-	 *
-	 * If a new entity is being created for the publisher, create it and set The
-	 * publisher setting.
-	 *
-	 * @param array $input The configuration settings array.
-	 *
-	 * @return array The sanitized input array.
-	 * @since 3.21.0
-	 */
-	public function sanitize_callback( $input ) {
-		if ( ! check_admin_referer( 'wl_analytics_settings-options' ) ) {
-			// Any failing nonce checks already die().
-			return;
-		}
-
-		/**
-		 * Validate and sanitize the $inputs and store them in $output saved.
-		 */
-		$output = array();
-		if ( isset( $input['analytics_enable'] ) ) {
-			$output['analytics_enable'] = ( 'yes' === $input['analytics_enable'] ) ? 'yes' : 'no';
-		}
-		if ( isset( $input['analytics_entity_uri_dimension'] ) ) {
-			$output['analytics_entity_uri_dimension'] = (int) $this->validate_entity_uri( $input['analytics_entity_uri_dimension'] );
-		}
-		if ( isset( $input['analytics_entity_type_dimension'] ) ) {
-			// This dimension cannot be the same as the one set above. If it is
-			// then zero it out and it will fail validation.
-			if ( isset( $output['analytics_entity_uri_dimension'] ) && $output['analytics_entity_uri_dimension'] === (int) $input['analytics_entity_type_dimension'] ) {
-				$input['analytics_entity_type_dimension'] = 0;
-			}
-			$output['analytics_entity_type_dimension'] = (int) $this->validate_entity_type( $input['analytics_entity_type_dimension'] );
-		}
-
-		// return items added to the output for saving.
-		return $output;
-	}
+    /**
+     * A singleton instance of the Notice service.
+     *
+     * @since  3.21.0
+     * @access private
+     * @var \Wordlift_Admin_Settings_Analytics_Page $instance A singleton instance of a {@link Wordlift_Admin_Settings_Analytics_Page} class.
+     */
+    private static $instance;
+
+    /**
+     * A {@link Wordlift_Admin_Input_Element} element renderer.
+     *
+     * @since  3.21.0
+     * @access private
+     * @var \Wordlift_Admin_Input_Element $input_element An {@link Wordlift_Admin_Input_Element} element renderer.
+     */
+    private $input_element;
+
+    /**
+     * A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
+     *
+     * @since  3.21.0
+     * @access protected
+     * @var \Wordlift_Admin_Radio_Input_Element $radio_input_element A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
+     */
+    private $radio_input_element;
+
+    /**
+     * Create a {@link Wordlift_Admin_Settings_Page} instance.
+     *
+     * @param \Wordlift_Admin_Input_Element       $input_element An input element class to output input boxes in a settings form.
+     * @param \Wordlift_Admin_Radio_Input_Element $radio_input_element A radio element input class for use in a settings form.
+     *
+     * @since 3.21.0
+     */
+    public function __construct( $input_element, $radio_input_element ) {
+
+        // Set a reference to the UI elements.
+        $this->input_element       = $input_element;
+        $this->radio_input_element = $radio_input_element;
+
+        // Adds this page to the main admin settings tabbed menu.
+        add_filter( 'wl_admin_page_tabs', array( $this, 'add_admin_page_tab' ) );
+
+        self::$instance = $this;
+    }
+
+    /**
+     * Get the singleton instance of the Notice service.
+     *
+     * @return \Wordlift_Admin_Settings_Page The singleton instance of the settings page service.
+     * @since 3.21.0
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function get_parent_slug() {
+
+        return 'wl_admin_menu';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function get_capability() {
+
+        return 'manage_options';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function get_page_title() {
+
+        return __( 'WorldLift Analytics Settings', 'wordlift' );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function get_menu_title() {
+
+        return __( 'Analytics Settings', 'wordlift' );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function get_menu_slug() {
+
+        return 'wl_configuration_admin_analytics_menu';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function get_partial_name() {
+
+        return 'wordlift-admin-settings-analytics-page.php';
+    }
+
+    /**
+     * Returns the string to use for the tab slug on main admin settings page.
+     *
+     * @method get_admin_page_tab_slug
+     * @return string
+     * @since  3.21.0
+     */
+    public function get_admin_page_tab_slug() {
+        return 'analytics';
+    }
+
+    /**
+     * Adds pages to the tabs menu on the main admin settings page.
+     *
+     * @method add_admin_page_tab
+     * @param array $tabs an array of tab titles and slugs to use when building a tabbed menu on option pages.
+     *
+     * @since  3.21.0
+     */
+    public function add_admin_page_tab( $tabs ) {
+        if ( apply_filters( 'wl_feature__enable__analytics', true ) ) {
+            $tabs[] = array(
+                'title' => $this->get_menu_title(),
+                'slug'  => $this->get_admin_page_tab_slug(),
+            );
+        }
+
+        return $tabs;
+    }
+
+    /**
+     * Configure all the configuration parameters.
+     *
+     * Called by the *admin_init* hook.
+     *
+     * @since 3.21.0
+     */
+    public function admin_init() {
+
+        // Register WordLift's analytics settings with our in class sanitizer.
+        register_setting(
+            'wl_analytics_settings',
+            'wl_analytics_settings',
+            array( $this, 'sanitize_callback' )
+        );
+
+        // Add the analytics settings setction.
+        add_settings_section(
+            'wl_analytics_settings_section',
+            '',
+            '',
+            'wl_analytics_settings'
+        );
+
+        // Add a toggle to determine if analytics functions are enabled or not.
+        // NOTE: this uses yes/no rather than true/false.
+        add_settings_field(
+            'wl-analytics-enabled',
+            __( 'Enable Analytics', 'wordlift' ),
+            array( $this->radio_input_element, 'render' ),
+            'wl_analytics_settings',
+            'wl_analytics_settings_section',
+            array(
+                'id'          => 'wl-analytics-enable',
+                'name'        => 'wl_analytics_settings[' . Wordlift_Configuration_Service::ANALYTICS_ENABLE . ']',
+                'value'       => Wordlift_Configuration_Service::get_instance()->is_analytics_enable() ? 'yes' : 'no',
+                'description' => __( 'Toggle on/off the default values.', 'wordlift' ),
+            )
+        );
+
+        /**
+         * A basic number field that will accept anything from 1 to 20.
+         *
+         * Represents the custom dim number for the uri.
+         */
+        add_settings_field(
+            'wl-analytics-entity-uri-dimension',
+            __( 'Entity URI dimension', 'wordlift' ),
+            array( $this->input_element, 'render' ),
+            'wl_analytics_settings',
+            'wl_analytics_settings_section',
+            array(
+                'id'          => 'wl-analytics-entity-uri-dimension',
+                'name'        => 'wl_analytics_settings[' . Wordlift_Configuration_Service::ANALYTICS_ENTITY_URI_DIMENSION . ']',
+                'type'        => 'number',
+                'value'       => Wordlift_Configuration_Service::get_instance()->get_analytics_entity_uri_dimension(),
+                'description' => __( 'Entity URI dimesion', 'wordlift' ),
+            )
+        );
+
+        /**
+         * A basic number field that will accept anything from 1 to 20.
+         *
+         * Represents the custom dim number for the type.
+         */
+        add_settings_field(
+            'wl-analytics-entity-type-dimension',
+            __( 'Entity Type dimension', 'wordlift' ),
+            array( $this->input_element, 'render' ),
+            'wl_analytics_settings',
+            'wl_analytics_settings_section',
+            array(
+                'id'          => 'wl-analytics-entity-type-dimension',
+                'name'        => 'wl_analytics_settings[' . Wordlift_Configuration_Service::ANALYTICS_ENTITY_TYPE_DIMENSION . ']',
+                'type'        => 'number',
+                'value'       => Wordlift_Configuration_Service::get_instance()->get_analytics_entity_type_dimension(),
+                'description' => __( 'Entity Type dimension', 'wordlift' ),
+            )
+        );
+
+    }
+
+    /**
+     * Validates an entity uri based on an integer passed.
+     *
+     * TODO: Needs a feedback method to pass back error messages.
+     *
+     * @method validate_entity_uri
+     * @param string $uri a sting representing an entity ID that can be converted to a uri.
+     *
+     * @return int
+     * @since 3.21.0
+     */
+    public function validate_entity_uri( $uri ) {
+        // Basic validation is to ensure number is between 1 and 20.
+        // NOTE: certain analytics accounts have a much higher value - as many
+        // as 200 are allowed.
+        if ( (int) $uri < 1 || (int) $uri > 20 ) {
+            // if we are out of range then pass the default value.
+            $uri = Wordlift_Configuration_Service::get_instance()->get_analytics_entity_uri_dimension();
+        }
+
+        return absint( $uri );
+    }
+
+    /**
+     * Validates an entity type.
+     *
+     * TODO: Needs a feedback method to pass back error messages.
+     *
+     * @method validate_entity_type
+     * @param string $type This is an entity type ID in string form - really a number.
+     *
+     * @return int
+     * @since  3.21.0
+     */
+    public function validate_entity_type( $type ) {
+        // Basic validation is to ensure number is between 1 and 20.
+        // NOTE: certain analytics accounts have a much higher value - as many
+        // as 200 are allowed.
+        if ( (int) $type < 1 || (int) $type > 20 ) {
+            // if we are out of range then pass the default value.
+            $type = Wordlift_Configuration_Service::get_instance()->get_analytics_entity_type_dimension();
+        }
+
+        return absint( $type );
+    }
+
+    /**
+     * Sanitize the configuration settings to be stored.
+     *
+     * If a new entity is being created for the publisher, create it and set The
+     * publisher setting.
+     *
+     * @param array $input The configuration settings array.
+     *
+     * @return array The sanitized input array.
+     * @since 3.21.0
+     */
+    public function sanitize_callback( $input ) {
+        if ( ! check_admin_referer( 'wl_analytics_settings-options' ) ) {
+            // Any failing nonce checks already die().
+            return;
+        }
+
+        /**
+         * Validate and sanitize the $inputs and store them in $output saved.
+         */
+        $output = array();
+        if ( isset( $input['analytics_enable'] ) ) {
+            $output['analytics_enable'] = ( 'yes' === $input['analytics_enable'] ) ? 'yes' : 'no';
+        }
+        if ( isset( $input['analytics_entity_uri_dimension'] ) ) {
+            $output['analytics_entity_uri_dimension'] = (int) $this->validate_entity_uri( $input['analytics_entity_uri_dimension'] );
+        }
+        if ( isset( $input['analytics_entity_type_dimension'] ) ) {
+            // This dimension cannot be the same as the one set above. If it is
+            // then zero it out and it will fail validation.
+            if ( isset( $output['analytics_entity_uri_dimension'] ) && $output['analytics_entity_uri_dimension'] === (int) $input['analytics_entity_type_dimension'] ) {
+                $input['analytics_entity_type_dimension'] = 0;
+            }
+            $output['analytics_entity_type_dimension'] = (int) $this->validate_entity_type( $input['analytics_entity_type_dimension'] );
+        }
+
+        // return items added to the output for saving.
+        return $output;
+    }
 
 }

Spacing +34 added lines, -34 removed lines

@@ -53,14 +53,14 @@ 
 	 *
 	 * @since 3.21.0
 	 */
-	public function __construct( $input_element, $radio_input_element ) {
+	public function __construct($input_element, $radio_input_element) {
 
 		// Set a reference to the UI elements.
 		$this->input_element       = $input_element;
 		$this->radio_input_element = $radio_input_element;
 
 		// Adds this page to the main admin settings tabbed menu.
-		add_filter( 'wl_admin_page_tabs', array( $this, 'add_admin_page_tab' ) );
+		add_filter('wl_admin_page_tabs', array($this, 'add_admin_page_tab'));
 
 		self::$instance = $this;
 	}
@@ -97,7 +97,7 @@ 
 	 */
 	public function get_page_title() {
 
-		return __( 'WorldLift Analytics Settings', 'wordlift' );
+		return __('WorldLift Analytics Settings', 'wordlift');
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public function get_menu_title() {
 
-		return __( 'Analytics Settings', 'wordlift' );
+		return __('Analytics Settings', 'wordlift');
 	}
 
 	/**
@@ -143,8 +143,8 @@ 
 	 *
 	 * @since  3.21.0
 	 */
-	public function add_admin_page_tab( $tabs ) {
-		if ( apply_filters( 'wl_feature__enable__analytics', true ) ) {
+	public function add_admin_page_tab($tabs) {
+		if (apply_filters('wl_feature__enable__analytics', true)) {
 			$tabs[] = array(
 				'title' => $this->get_menu_title(),
 				'slug'  => $this->get_admin_page_tab_slug(),
@@ -167,7 +167,7 @@ 
 		register_setting(
 			'wl_analytics_settings',
 			'wl_analytics_settings',
-			array( $this, 'sanitize_callback' )
+			array($this, 'sanitize_callback')
 		);
 
 		// Add the analytics settings setction.
@@ -182,15 +182,15 @@ 
 		// NOTE: this uses yes/no rather than true/false.
 		add_settings_field(
 			'wl-analytics-enabled',
-			__( 'Enable Analytics', 'wordlift' ),
-			array( $this->radio_input_element, 'render' ),
+			__('Enable Analytics', 'wordlift'),
+			array($this->radio_input_element, 'render'),
 			'wl_analytics_settings',
 			'wl_analytics_settings_section',
 			array(
 				'id'          => 'wl-analytics-enable',
-				'name'        => 'wl_analytics_settings[' . Wordlift_Configuration_Service::ANALYTICS_ENABLE . ']',
+				'name'        => 'wl_analytics_settings['.Wordlift_Configuration_Service::ANALYTICS_ENABLE.']',
 				'value'       => Wordlift_Configuration_Service::get_instance()->is_analytics_enable() ? 'yes' : 'no',
-				'description' => __( 'Toggle on/off the default values.', 'wordlift' ),
+				'description' => __('Toggle on/off the default values.', 'wordlift'),
 			)
 		);
 
@@ -201,16 +201,16 @@ 
 		 */
 		add_settings_field(
 			'wl-analytics-entity-uri-dimension',
-			__( 'Entity URI dimension', 'wordlift' ),
-			array( $this->input_element, 'render' ),
+			__('Entity URI dimension', 'wordlift'),
+			array($this->input_element, 'render'),
 			'wl_analytics_settings',
 			'wl_analytics_settings_section',
 			array(
 				'id'          => 'wl-analytics-entity-uri-dimension',
-				'name'        => 'wl_analytics_settings[' . Wordlift_Configuration_Service::ANALYTICS_ENTITY_URI_DIMENSION . ']',
+				'name'        => 'wl_analytics_settings['.Wordlift_Configuration_Service::ANALYTICS_ENTITY_URI_DIMENSION.']',
 				'type'        => 'number',
 				'value'       => Wordlift_Configuration_Service::get_instance()->get_analytics_entity_uri_dimension(),
-				'description' => __( 'Entity URI dimesion', 'wordlift' ),
+				'description' => __('Entity URI dimesion', 'wordlift'),
 			)
 		);
 
@@ -221,16 +221,16 @@ 
 		 */
 		add_settings_field(
 			'wl-analytics-entity-type-dimension',
-			__( 'Entity Type dimension', 'wordlift' ),
-			array( $this->input_element, 'render' ),
+			__('Entity Type dimension', 'wordlift'),
+			array($this->input_element, 'render'),
 			'wl_analytics_settings',
 			'wl_analytics_settings_section',
 			array(
 				'id'          => 'wl-analytics-entity-type-dimension',
-				'name'        => 'wl_analytics_settings[' . Wordlift_Configuration_Service::ANALYTICS_ENTITY_TYPE_DIMENSION . ']',
+				'name'        => 'wl_analytics_settings['.Wordlift_Configuration_Service::ANALYTICS_ENTITY_TYPE_DIMENSION.']',
 				'type'        => 'number',
 				'value'       => Wordlift_Configuration_Service::get_instance()->get_analytics_entity_type_dimension(),
-				'description' => __( 'Entity Type dimension', 'wordlift' ),
+				'description' => __('Entity Type dimension', 'wordlift'),
 			)
 		);
 
@@ -247,16 +247,16 @@ 
 	 * @return int
 	 * @since 3.21.0
 	 */
-	public function validate_entity_uri( $uri ) {
+	public function validate_entity_uri($uri) {
 		// Basic validation is to ensure number is between 1 and 20.
 		// NOTE: certain analytics accounts have a much higher value - as many
 		// as 200 are allowed.
-		if ( (int) $uri < 1 || (int) $uri > 20 ) {
+		if ((int) $uri < 1 || (int) $uri > 20) {
 			// if we are out of range then pass the default value.
 			$uri = Wordlift_Configuration_Service::get_instance()->get_analytics_entity_uri_dimension();
 		}
 
-		return absint( $uri );
+		return absint($uri);
 	}
 
 	/**
@@ -270,16 +270,16 @@ 
 	 * @return int
 	 * @since  3.21.0
 	 */
-	public function validate_entity_type( $type ) {
+	public function validate_entity_type($type) {
 		// Basic validation is to ensure number is between 1 and 20.
 		// NOTE: certain analytics accounts have a much higher value - as many
 		// as 200 are allowed.
-		if ( (int) $type < 1 || (int) $type > 20 ) {
+		if ((int) $type < 1 || (int) $type > 20) {
 			// if we are out of range then pass the default value.
 			$type = Wordlift_Configuration_Service::get_instance()->get_analytics_entity_type_dimension();
 		}
 
-		return absint( $type );
+		return absint($type);
 	}
 
 	/**
@@ -293,8 +293,8 @@ 
 	 * @return array The sanitized input array.
 	 * @since 3.21.0
 	 */
-	public function sanitize_callback( $input ) {
-		if ( ! check_admin_referer( 'wl_analytics_settings-options' ) ) {
+	public function sanitize_callback($input) {
+		if ( ! check_admin_referer('wl_analytics_settings-options')) {
 			// Any failing nonce checks already die().
 			return;
 		}
@@ -303,19 +303,19 @@ 
 		 * Validate and sanitize the $inputs and store them in $output saved.
 		 */
 		$output = array();
-		if ( isset( $input['analytics_enable'] ) ) {
-			$output['analytics_enable'] = ( 'yes' === $input['analytics_enable'] ) ? 'yes' : 'no';
+		if (isset($input['analytics_enable'])) {
+			$output['analytics_enable'] = ('yes' === $input['analytics_enable']) ? 'yes' : 'no';
 		}
-		if ( isset( $input['analytics_entity_uri_dimension'] ) ) {
-			$output['analytics_entity_uri_dimension'] = (int) $this->validate_entity_uri( $input['analytics_entity_uri_dimension'] );
+		if (isset($input['analytics_entity_uri_dimension'])) {
+			$output['analytics_entity_uri_dimension'] = (int) $this->validate_entity_uri($input['analytics_entity_uri_dimension']);
 		}
-		if ( isset( $input['analytics_entity_type_dimension'] ) ) {
+		if (isset($input['analytics_entity_type_dimension'])) {
 			// This dimension cannot be the same as the one set above. If it is
 			// then zero it out and it will fail validation.
-			if ( isset( $output['analytics_entity_uri_dimension'] ) && $output['analytics_entity_uri_dimension'] === (int) $input['analytics_entity_type_dimension'] ) {
+			if (isset($output['analytics_entity_uri_dimension']) && $output['analytics_entity_uri_dimension'] === (int) $input['analytics_entity_type_dimension']) {
 				$input['analytics_entity_type_dimension'] = 0;
 			}
-			$output['analytics_entity_type_dimension'] = (int) $this->validate_entity_type( $input['analytics_entity_type_dimension'] );
+			$output['analytics_entity_type_dimension'] = (int) $this->validate_entity_type($input['analytics_entity_type_dimension']);
 		}
 
 		// return items added to the output for saving.