insideout10 / wordlift-plugin

src/wordlift/autocomplete/class-all-autocomplete-service.php

Indentation +40 added lines, -40 removed lines

@@ -12,55 +12,55 @@
 
 class All_Autocomplete_Service implements Autocomplete_Service {
 
-	/**
-	 * One ore more {@link Autocomplete_Service} instances.
-	 *
-	 * @var Autocomplete_Service|Autocomplete_Service[] $autocomplete_services
-	 */
-	private $autocomplete_services;
+    /**
+     * One ore more {@link Autocomplete_Service} instances.
+     *
+     * @var Autocomplete_Service|Autocomplete_Service[] $autocomplete_services
+     */
+    private $autocomplete_services;
 
-	/**
-	 * All_Autocomplete_Service constructor.
-	 *
-	 * @param Autocomplete_Service|Autocomplete_Service[] $autocomplete_services
-	 */
-	public function __construct( $autocomplete_services ) {
+    /**
+     * All_Autocomplete_Service constructor.
+     *
+     * @param Autocomplete_Service|Autocomplete_Service[] $autocomplete_services
+     */
+    public function __construct( $autocomplete_services ) {
 
-		$this->autocomplete_services = (array) $autocomplete_services;
-	}
+        $this->autocomplete_services = (array) $autocomplete_services;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function query( $query, $scope, $excludes ) {
+    /**
+     * {@inheritDoc}
+     */
+    public function query( $query, $scope, $excludes ) {
 
-		/**
-		 * Filter to show local entities on the entity autocompletion field.
-		 *
-		 * @param $state bool
-		 *
-		 * @return bool Whether to show local entities in the page or not.
-		 * @since 3.26.1
-		 */
-		$show_local_entities = apply_filters( 'wl_show_local_entities', false );
+        /**
+         * Filter to show local entities on the entity autocompletion field.
+         *
+         * @param $state bool
+         *
+         * @return bool Whether to show local entities in the page or not.
+         * @since 3.26.1
+         */
+        $show_local_entities = apply_filters( 'wl_show_local_entities', false );
 
-		$autocomplete_services = $this->autocomplete_services;
+        $autocomplete_services = $this->autocomplete_services;
 
-		// Remove the local autocomplete services.
-		if ( ! $show_local_entities ) {
-			$autocomplete_services = array_filter( $autocomplete_services, function ( $service ) {
-				return ! $service instanceof Local_Autocomplete_Service;
-			} );
-		}
+        // Remove the local autocomplete services.
+        if ( ! $show_local_entities ) {
+            $autocomplete_services = array_filter( $autocomplete_services, function ( $service ) {
+                return ! $service instanceof Local_Autocomplete_Service;
+            } );
+        }
 
-		// Query each Autocomplete service and merge the results.
-		return array_reduce( $autocomplete_services, function ( $carry, $item ) use ( $query, $scope, $excludes ) {
+        // Query each Autocomplete service and merge the results.
+        return array_reduce( $autocomplete_services, function ( $carry, $item ) use ( $query, $scope, $excludes ) {
 
-			$results = $item->query( $query, $scope, $excludes );
+            $results = $item->query( $query, $scope, $excludes );
 
-			return array_merge( $carry, $results );
-		}, array() );
+            return array_merge( $carry, $results );
+        }, array() );
 
-	}
+    }
 
 }

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
 	 *
 	 * @param Autocomplete_Service|Autocomplete_Service[] $autocomplete_services
 	 */
-	public function __construct( $autocomplete_services ) {
+	public function __construct($autocomplete_services) {
 
 		$this->autocomplete_services = (array) $autocomplete_services;
 	}
@@ -32,7 +32,7 @@ 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function query( $query, $scope, $excludes ) {
+	public function query($query, $scope, $excludes) {
 
 		/**
 		 * Filter to show local entities on the entity autocompletion field.
@@ -42,24 +42,24 @@ 
 		 * @return bool Whether to show local entities in the page or not.
 		 * @since 3.26.1
 		 */
-		$show_local_entities = apply_filters( 'wl_show_local_entities', false );
+		$show_local_entities = apply_filters('wl_show_local_entities', false);
 
 		$autocomplete_services = $this->autocomplete_services;
 
 		// Remove the local autocomplete services.
-		if ( ! $show_local_entities ) {
-			$autocomplete_services = array_filter( $autocomplete_services, function ( $service ) {
+		if ( ! $show_local_entities) {
+			$autocomplete_services = array_filter($autocomplete_services, function($service) {
 				return ! $service instanceof Local_Autocomplete_Service;
 			} );
 		}
 
 		// Query each Autocomplete service and merge the results.
-		return array_reduce( $autocomplete_services, function ( $carry, $item ) use ( $query, $scope, $excludes ) {
+		return array_reduce($autocomplete_services, function($carry, $item) use ($query, $scope, $excludes) {
 
-			$results = $item->query( $query, $scope, $excludes );
+			$results = $item->query($query, $scope, $excludes);
 
-			return array_merge( $carry, $results );
-		}, array() );
+			return array_merge($carry, $results);
+		}, array());
 
 	}
 

src/includes/class-wordlift-autocomplete-adapter.php

Indentation +73 added lines, -73 removed lines

@@ -13,7 +13,7 @@ 
 use Wordlift\Autocomplete\Autocomplete_Service;
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -23,76 +23,76 @@ 
  */
 class Wordlift_Autocomplete_Adapter {
 
-	/**
-	 * The {@link Autocomplete_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var Autocomplete_Service $configuration_service The {@link Autocomplete_Service} instance.
-	 */
-	private $autocomplete_service;
-
-
-	/**
-	 * Wordlift_Autocomplete_Adapter constructor.
-	 *
-	 * @param Autocomplete_Service $autocomplete_service The {@link Autocomplete_Service} instance.
-	 *
-	 * @since 3.14.2
-	 *
-	 */
-	public function __construct( $autocomplete_service ) {
-		$this->autocomplete_service = $autocomplete_service;
-	}
-
-	/**
-	 * Handle the autocomplete ajax request.
-	 *
-	 * @since 3.15.0
-	 */
-	public function wl_autocomplete() {
-
-		check_ajax_referer( 'wl_autocomplete' );
-
-		// Return error if the query param is empty.
-		if ( ! empty( $_REQUEST['query'] ) ) { // Input var okay.
-			$query = sanitize_text_field( wp_unslash( $_REQUEST['query'] ) ); // Input var okay.
-		} else {
-			wp_send_json_error( array(
-				'message' => __( 'The query param is empty.', 'wordlift' ),
-			) );
-		}
-
-		// Get the exclude parameter.
-		$exclude = ! empty( $_REQUEST['exclude'] )
-			? sanitize_text_field( wp_unslash( $_REQUEST['exclude'] ) ) : '';
-
-		$scope = ! empty( $_REQUEST['scope'] )
-			? sanitize_text_field( wp_unslash( $_REQUEST['scope'] ) ) : WL_AUTOCOMPLETE_SCOPE;
-
-		/**
-		 * @since 3.26.1
-		 * Providing a way for term pages to show and save local entities.
-		 */
-		$show_local_entities = false;
-
-		if ( isset( $_REQUEST['show_local_entities'] )
-		     && ! empty( $_REQUEST['show_local_entities'] ) ) // Make request.
-		{
-			$show_local_entities = filter_var( $_REQUEST['show_local_entities'], FILTER_VALIDATE_BOOLEAN );
-		}
-
-		// Add the filter to check if we need to show local entities or not.
-		add_filter( 'wl_show_local_entities', function ( $state ) use ( $show_local_entities ) {
-			return $show_local_entities;
-		} );
-
-		$results = $this->autocomplete_service->query( $query, $scope, $exclude );
-
-		// Clear any buffer.
-		ob_clean();
-
-		wp_send_json_success( $results );
-
-	}
+    /**
+     * The {@link Autocomplete_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var Autocomplete_Service $configuration_service The {@link Autocomplete_Service} instance.
+     */
+    private $autocomplete_service;
+
+
+    /**
+     * Wordlift_Autocomplete_Adapter constructor.
+     *
+     * @param Autocomplete_Service $autocomplete_service The {@link Autocomplete_Service} instance.
+     *
+     * @since 3.14.2
+     *
+     */
+    public function __construct( $autocomplete_service ) {
+        $this->autocomplete_service = $autocomplete_service;
+    }
+
+    /**
+     * Handle the autocomplete ajax request.
+     *
+     * @since 3.15.0
+     */
+    public function wl_autocomplete() {
+
+        check_ajax_referer( 'wl_autocomplete' );
+
+        // Return error if the query param is empty.
+        if ( ! empty( $_REQUEST['query'] ) ) { // Input var okay.
+            $query = sanitize_text_field( wp_unslash( $_REQUEST['query'] ) ); // Input var okay.
+        } else {
+            wp_send_json_error( array(
+                'message' => __( 'The query param is empty.', 'wordlift' ),
+            ) );
+        }
+
+        // Get the exclude parameter.
+        $exclude = ! empty( $_REQUEST['exclude'] )
+            ? sanitize_text_field( wp_unslash( $_REQUEST['exclude'] ) ) : '';
+
+        $scope = ! empty( $_REQUEST['scope'] )
+            ? sanitize_text_field( wp_unslash( $_REQUEST['scope'] ) ) : WL_AUTOCOMPLETE_SCOPE;
+
+        /**
+         * @since 3.26.1
+         * Providing a way for term pages to show and save local entities.
+         */
+        $show_local_entities = false;
+
+        if ( isset( $_REQUEST['show_local_entities'] )
+             && ! empty( $_REQUEST['show_local_entities'] ) ) // Make request.
+        {
+            $show_local_entities = filter_var( $_REQUEST['show_local_entities'], FILTER_VALIDATE_BOOLEAN );
+        }
+
+        // Add the filter to check if we need to show local entities or not.
+        add_filter( 'wl_show_local_entities', function ( $state ) use ( $show_local_entities ) {
+            return $show_local_entities;
+        } );
+
+        $results = $this->autocomplete_service->query( $query, $scope, $exclude );
+
+        // Clear any buffer.
+        ob_clean();
+
+        wp_send_json_success( $results );
+
+    }
 }

Spacing +18 added lines, -18 removed lines

@@ -12,7 +12,7 @@ 
 
 use Wordlift\Autocomplete\Autocomplete_Service;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -41,7 +41,7 @@ 
 	 * @since 3.14.2
 	 *
 	 */
-	public function __construct( $autocomplete_service ) {
+	public function __construct($autocomplete_service) {
 		$this->autocomplete_service = $autocomplete_service;
 	}
 
@@ -52,23 +52,23 @@ 
 	 */
 	public function wl_autocomplete() {
 
-		check_ajax_referer( 'wl_autocomplete' );
+		check_ajax_referer('wl_autocomplete');
 
 		// Return error if the query param is empty.
-		if ( ! empty( $_REQUEST['query'] ) ) { // Input var okay.
-			$query = sanitize_text_field( wp_unslash( $_REQUEST['query'] ) ); // Input var okay.
+		if ( ! empty($_REQUEST['query'])) { // Input var okay.
+			$query = sanitize_text_field(wp_unslash($_REQUEST['query'])); // Input var okay.
 		} else {
-			wp_send_json_error( array(
-				'message' => __( 'The query param is empty.', 'wordlift' ),
-			) );
+			wp_send_json_error(array(
+				'message' => __('The query param is empty.', 'wordlift'),
+			));
 		}
 
 		// Get the exclude parameter.
-		$exclude = ! empty( $_REQUEST['exclude'] )
-			? sanitize_text_field( wp_unslash( $_REQUEST['exclude'] ) ) : '';
+		$exclude = ! empty($_REQUEST['exclude'])
+			? sanitize_text_field(wp_unslash($_REQUEST['exclude'])) : '';
 
-		$scope = ! empty( $_REQUEST['scope'] )
-			? sanitize_text_field( wp_unslash( $_REQUEST['scope'] ) ) : WL_AUTOCOMPLETE_SCOPE;
+		$scope = ! empty($_REQUEST['scope'])
+			? sanitize_text_field(wp_unslash($_REQUEST['scope'])) : WL_AUTOCOMPLETE_SCOPE;
 
 		/**
 		 * @since 3.26.1
@@ -76,23 +76,23 @@ 
 		 */
 		$show_local_entities = false;
 
-		if ( isset( $_REQUEST['show_local_entities'] )
-		     && ! empty( $_REQUEST['show_local_entities'] ) ) // Make request.
+		if (isset($_REQUEST['show_local_entities'])
+		     && ! empty($_REQUEST['show_local_entities'])) // Make request.
 		{
-			$show_local_entities = filter_var( $_REQUEST['show_local_entities'], FILTER_VALIDATE_BOOLEAN );
+			$show_local_entities = filter_var($_REQUEST['show_local_entities'], FILTER_VALIDATE_BOOLEAN);
 		}
 
 		// Add the filter to check if we need to show local entities or not.
-		add_filter( 'wl_show_local_entities', function ( $state ) use ( $show_local_entities ) {
+		add_filter('wl_show_local_entities', function($state) use ($show_local_entities) {
 			return $show_local_entities;
 		} );
 
-		$results = $this->autocomplete_service->query( $query, $scope, $exclude );
+		$results = $this->autocomplete_service->query($query, $scope, $exclude);
 
 		// Clear any buffer.
 		ob_clean();
 
-		wp_send_json_success( $results );
+		wp_send_json_success($results);
 
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -77,10 +77,12 @@
 		$show_local_entities = false;
 
 		if ( isset( $_REQUEST['show_local_entities'] )
-		     && ! empty( $_REQUEST['show_local_entities'] ) ) // Make request.
+		     && ! empty( $_REQUEST['show_local_entities'] ) ) {
+		    // Make request.
 		{
 			$show_local_entities = filter_var( $_REQUEST['show_local_entities'], FILTER_VALIDATE_BOOLEAN );
 		}
+		}
 
 		// Add the filter to check if we need to show local entities or not.
 		add_filter( 'wl_show_local_entities', function ( $state ) use ( $show_local_entities ) {

src/wordlift_editor.php

Indentation +25 added lines, -25 removed lines

@@ -9,32 +9,32 @@ 
  */
 function wordlift_mce_css( $mce_css ) {
 
-	/*
+    /*
 	 * Call the `wl_can_see_classification_box` filter to determine whether we can display the classification box.
 	 *
 	 * @since 3.20.3
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/914
 	 */
-	if ( ! apply_filters( 'wl_can_see_classification_box', true ) ) {
-		return $mce_css;
-	}
-
-	if ( ! empty( $mce_css ) ) {
-		$mce_css .= ',';
-	}
-
-	/**
-	 * Replacing the legacy `wordlift-reloaded.min.css` with tiny-mce.css.
-	 *
-	 * tiny-mce.css is generated using the new webpack project and its rules are shared with Gutenberg.
-	 *
-	 * @author David Riccitelli <david@wordlift.io>
-	 * @since 3.23.0
-	 */
-	$mce_css .= plugin_dir_url( __FILE__ ) . 'js/dist/tiny-mce.css';
-
-	return $mce_css;
+    if ( ! apply_filters( 'wl_can_see_classification_box', true ) ) {
+        return $mce_css;
+    }
+
+    if ( ! empty( $mce_css ) ) {
+        $mce_css .= ',';
+    }
+
+    /**
+     * Replacing the legacy `wordlift-reloaded.min.css` with tiny-mce.css.
+     *
+     * tiny-mce.css is generated using the new webpack project and its rules are shared with Gutenberg.
+     *
+     * @author David Riccitelli <david@wordlift.io>
+     * @since 3.23.0
+     */
+    $mce_css .= plugin_dir_url( __FILE__ ) . 'js/dist/tiny-mce.css';
+
+    return $mce_css;
 }
 
 // hook the TinyMCE custom styles function.
@@ -49,13 +49,13 @@ 
  */
 function wordlift_filter_tiny_mce_before_init( $options ) {
 
-	if ( ! isset( $options['extended_valid_elements'] ) ) {
-		$options['extended_valid_elements'] = '';
-	}
+    if ( ! isset( $options['extended_valid_elements'] ) ) {
+        $options['extended_valid_elements'] = '';
+    }
 
-	$options['extended_valid_elements'] .= ",span[*]";
+    $options['extended_valid_elements'] .= ",span[*]";
 
-	return $options;
+    return $options;
 }
 
 add_filter( 'tiny_mce_before_init', 'wordlift_filter_tiny_mce_before_init', PHP_INT_MAX );

Spacing +8 added lines, -8 removed lines

@@ -7,7 +7,7 @@ 
  *
  * @return string The updated list of styles, including the custom style provided by WordLift.
  */
-function wordlift_mce_css( $mce_css ) {
+function wordlift_mce_css($mce_css) {
 
 	/*
 	 * Call the `wl_can_see_classification_box` filter to determine whether we can display the classification box.
@@ -16,11 +16,11 @@ 
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/914
 	 */
-	if ( ! apply_filters( 'wl_can_see_classification_box', true ) ) {
+	if ( ! apply_filters('wl_can_see_classification_box', true)) {
 		return $mce_css;
 	}
 
-	if ( ! empty( $mce_css ) ) {
+	if ( ! empty($mce_css)) {
 		$mce_css .= ',';
 	}
 
@@ -32,13 +32,13 @@ 
 	 * @author David Riccitelli <david@wordlift.io>
 	 * @since 3.23.0
 	 */
-	$mce_css .= plugin_dir_url( __FILE__ ) . 'js/dist/tiny-mce.css';
+	$mce_css .= plugin_dir_url(__FILE__).'js/dist/tiny-mce.css';
 
 	return $mce_css;
 }
 
 // hook the TinyMCE custom styles function.
-add_filter( 'mce_css', 'wordlift_mce_css' );
+add_filter('mce_css', 'wordlift_mce_css');
 
 /**
  * Set TinyMCE options, in particular enable microdata tagging.
@@ -47,9 +47,9 @@ 
  *
  * @return mixed
  */
-function wordlift_filter_tiny_mce_before_init( $options ) {
+function wordlift_filter_tiny_mce_before_init($options) {
 
-	if ( ! isset( $options['extended_valid_elements'] ) ) {
+	if ( ! isset($options['extended_valid_elements'])) {
 		$options['extended_valid_elements'] = '';
 	}
 
@@ -58,4 +58,4 @@ 
 	return $options;
 }
 
-add_filter( 'tiny_mce_before_init', 'wordlift_filter_tiny_mce_before_init', PHP_INT_MAX );
+add_filter('tiny_mce_before_init', 'wordlift_filter_tiny_mce_before_init', PHP_INT_MAX);

src/wordlift/mappings/class-taxonomy-option.php

Indentation +39 added lines, -39 removed lines

@@ -14,58 +14,58 @@
  */
 class Taxonomy_Option {
 
-	/**
-	 * This value is used in rule field one and rule field two
-	 * options are linked to one by this value
-	 */
-	const PARENT_VALUE = 'taxonomy';
+    /**
+     * This value is used in rule field one and rule field two
+     * options are linked to one by this value
+     */
+    const PARENT_VALUE = 'taxonomy';
 
-	public function add_taxonomy_option() {
-		$this->add_rule_field_one_options();
-		$this->add_rule_field_two_options();
-	}
+    public function add_taxonomy_option() {
+        $this->add_rule_field_one_options();
+        $this->add_rule_field_two_options();
+    }
 
-	private function add_rule_field_one_options() {
+    private function add_rule_field_one_options() {
 
-		add_filter( 'wl_mappings_rule_field_one_options', function ( $rule_field_one_options ) {
+        add_filter( 'wl_mappings_rule_field_one_options', function ( $rule_field_one_options ) {
 
-			$rule_field_one_options[] = array(
-				'label'      => __( 'Taxonomy', 'wordlift' ),
-				'value'      => Taxonomy_Option::PARENT_VALUE,
-				// Left empty since these values are provided locally, not needed to be fetched from
-				// api.
-				'api_source' => ''
-			);
+            $rule_field_one_options[] = array(
+                'label'      => __( 'Taxonomy', 'wordlift' ),
+                'value'      => Taxonomy_Option::PARENT_VALUE,
+                // Left empty since these values are provided locally, not needed to be fetched from
+                // api.
+                'api_source' => ''
+            );
 
-			return $rule_field_one_options;
+            return $rule_field_one_options;
 
-		} );
-	}
+        } );
+    }
 
-	private function add_rule_field_two_options() {
+    private function add_rule_field_two_options() {
 
-		add_filter( 'wl_mappings_rule_field_two_options', function ( $rule_field_two_options ) {
+        add_filter( 'wl_mappings_rule_field_two_options', function ( $rule_field_two_options ) {
 
-			$taxonomies = get_object_taxonomies( 'post', 'objects' );
+            $taxonomies = get_object_taxonomies( 'post', 'objects' );
 
-			$taxonomy_options = array();
+            $taxonomy_options = array();
 
-			foreach ( $taxonomies as $item ) {
-				/**
-				 * $item Taxonomy
-				 */
-				$taxonomy_options[] = array(
-					'label'        => __( $item->label, 'wordlift' ),
-					'value'        => $item->name,
-					// The value of parent option on rule field one.
-					'parent_value' => Taxonomy_Option::PARENT_VALUE
-				);
-			}
+            foreach ( $taxonomies as $item ) {
+                /**
+                 * $item Taxonomy
+                 */
+                $taxonomy_options[] = array(
+                    'label'        => __( $item->label, 'wordlift' ),
+                    'value'        => $item->name,
+                    // The value of parent option on rule field one.
+                    'parent_value' => Taxonomy_Option::PARENT_VALUE
+                );
+            }
 
-			return array_merge( $rule_field_two_options, $taxonomy_options );
+            return array_merge( $rule_field_two_options, $taxonomy_options );
 
-		} );
+        } );
 
-	}
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -27,10 +27,10 @@ 
 
 	private function add_rule_field_one_options() {
 
-		add_filter( 'wl_mappings_rule_field_one_options', function ( $rule_field_one_options ) {
+		add_filter('wl_mappings_rule_field_one_options', function($rule_field_one_options) {
 
 			$rule_field_one_options[] = array(
-				'label'      => __( 'Taxonomy', 'wordlift' ),
+				'label'      => __('Taxonomy', 'wordlift'),
 				'value'      => Taxonomy_Option::PARENT_VALUE,
 				// Left empty since these values are provided locally, not needed to be fetched from
 				// api.
@@ -44,25 +44,25 @@ 
 
 	private function add_rule_field_two_options() {
 
-		add_filter( 'wl_mappings_rule_field_two_options', function ( $rule_field_two_options ) {
+		add_filter('wl_mappings_rule_field_two_options', function($rule_field_two_options) {
 
-			$taxonomies = get_object_taxonomies( 'post', 'objects' );
+			$taxonomies = get_object_taxonomies('post', 'objects');
 
 			$taxonomy_options = array();
 
-			foreach ( $taxonomies as $item ) {
+			foreach ($taxonomies as $item) {
 				/**
 				 * $item Taxonomy
 				 */
 				$taxonomy_options[] = array(
-					'label'        => __( $item->label, 'wordlift' ),
+					'label'        => __($item->label, 'wordlift'),
 					'value'        => $item->name,
 					// The value of parent option on rule field one.
 					'parent_value' => Taxonomy_Option::PARENT_VALUE
 				);
 			}
 
-			return array_merge( $rule_field_two_options, $taxonomy_options );
+			return array_merge($rule_field_two_options, $taxonomy_options);
 
 		} );
 

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

Indentation +18 added lines, -18 removed lines

@@ -14,19 +14,19 @@ 
 
 class Wordlift_Install_3_27_0 extends Wordlift_Install {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	protected static $version = '3.27.0';
+    /**
+     * {@inheritdoc}
+     */
+    protected static $version = '3.27.0';
 
-	/**
-	 * @inheritDoc
-	 */
-	public function install() {
+    /**
+     * @inheritDoc
+     */
+    public function install() {
 
-		global $wpdb;
+        global $wpdb;
 
-		$empty_post_name_query = "
+        $empty_post_name_query = "
 		    SELECT ID, post_title 
 		    FROM $wpdb->posts
 		    WHERE post_type = 'entity'
@@ -34,15 +34,15 @@ 
 		    AND post_name = ''
 		";
 
-		$posts_with_empty_post_name = $wpdb->get_results($empty_post_name_query, OBJECT);
+        $posts_with_empty_post_name = $wpdb->get_results($empty_post_name_query, OBJECT);
 
-		foreach ($posts_with_empty_post_name as $post){
-			wp_update_post(array(
-				'ID' => $post->ID,
-				'post_name' => sanitize_title( $post->post_title )
-			));
-		}
+        foreach ($posts_with_empty_post_name as $post){
+            wp_update_post(array(
+                'ID' => $post->ID,
+                'post_name' => sanitize_title( $post->post_title )
+            ));
+        }
 
-	}
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -36,10 +36,10 @@
 
 		$posts_with_empty_post_name = $wpdb->get_results($empty_post_name_query, OBJECT);
 
-		foreach ($posts_with_empty_post_name as $post){
+		foreach ($posts_with_empty_post_name as $post) {
 			wp_update_post(array(
 				'ID' => $post->ID,
-				'post_name' => sanitize_title( $post->post_title )
+				'post_name' => sanitize_title($post->post_title)
 			));
 		}
 

src/wordlift/mappings/formatters/class-acf-group-formatter.php

Indentation +16 added lines, -16 removed lines

@@ -9,23 +9,23 @@
  */
 class Acf_Group_Formatter {
 
-	public function __construct() {
-		// Hook in to format value filter and apply format value.
-		add_filter( 'wl_mapping_acf_format_value', array( $this, 'format_group_value' ), 10, 2 );
-	}
+    public function __construct() {
+        // Hook in to format value filter and apply format value.
+        add_filter( 'wl_mapping_acf_format_value', array( $this, 'format_group_value' ), 10, 2 );
+    }
 
-	public function format_group_value( $field_data, $field_type ) {
-		if ( $field_type !== 'group' ) {
-			// Return early if the field type is not group
-			return $field_data;
-		}
-		// we need to check if atleast one key is present.
-		$filtered_group_data = array_filter( $field_data, 'strlen' );
-		if ( ! $filtered_group_data ) {
-			return false;
-		}
+    public function format_group_value( $field_data, $field_type ) {
+        if ( $field_type !== 'group' ) {
+            // Return early if the field type is not group
+            return $field_data;
+        }
+        // we need to check if atleast one key is present.
+        $filtered_group_data = array_filter( $field_data, 'strlen' );
+        if ( ! $filtered_group_data ) {
+            return false;
+        }
 
-		return $filtered_group_data;
+        return $filtered_group_data;
 
-	}
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -11,17 +11,17 @@
 
 	public function __construct() {
 		// Hook in to format value filter and apply format value.
-		add_filter( 'wl_mapping_acf_format_value', array( $this, 'format_group_value' ), 10, 2 );
+		add_filter('wl_mapping_acf_format_value', array($this, 'format_group_value'), 10, 2);
 	}
 
-	public function format_group_value( $field_data, $field_type ) {
-		if ( $field_type !== 'group' ) {
+	public function format_group_value($field_data, $field_type) {
+		if ($field_type !== 'group') {
 			// Return early if the field type is not group
 			return $field_data;
 		}
 		// we need to check if atleast one key is present.
-		$filtered_group_data = array_filter( $field_data, 'strlen' );
-		if ( ! $filtered_group_data ) {
+		$filtered_group_data = array_filter($field_data, 'strlen');
+		if ( ! $filtered_group_data) {
 			return false;
 		}
 

src/public/class-wordlift-chord-shortcode.php

Indentation +155 added lines, -155 removed lines

@@ -16,93 +16,93 @@ 
  */
 class Wordlift_Chord_Shortcode extends Wordlift_Shortcode {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	const SHORTCODE = 'wl_chord';
-
-	/**
-	 * Create a {@link Wordlift_Chord_Shortcode} instance.
-	 *
-	 * @since      3.5.4
-	 */
-	public function __construct() {
-		parent::__construct();
-
-		// Hook to the `amp_post_template_css` to hide ourselves when in AMP
-		// rendering.
-		add_action( 'amp_post_template_css', array(
-			$this,
-			'amp_post_template_css',
-		) );
-		$this->register_block_type();
-
-	}
-
-	/**
-	 * Render shordcode.
-	 *
-	 * @param array $atts shortcode attributes.
-	 *
-	 * @return string The HTML output.
-	 */
-	public function render( $atts ) {
-
-		// extract attributes and set default values.
-		$chord_atts = shortcode_atts( array(
-			'width'      => '100%',
-			'height'     => '500px',
-			'main_color' => '000',
-			'depth'      => 2,
-			'global'     => false,
-		), $atts );
-
-		if ( $chord_atts['global'] ) {
-
-			$post_id = wl_shortcode_chord_most_referenced_entity_id();
-
-			if ( null === $post_id ) {
-				return 'WordLift Chord: no entities found.';
-			}
-
-			// Use the provided height if any, otherwise use a default of 200px.
-			//
-			// See https://github.com/insideout10/wordlift-plugin/issues/443.
-			$chord_atts['height'] = isset( $chord_atts['height'] ) ? $chord_atts['height'] : '200px';
-
-		} else {
-			$post_id = get_the_ID();
-		}
-
-		// Use the registered style which define an optional dependency to font-awesome.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/699
-		//		wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
-		wp_enqueue_style( 'wordlift-ui' );
-
-		// Adding javascript code.
-		wp_enqueue_script( 'd3', dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/d3/d3.min.js' );
-
-		$this->enqueue_scripts();
-
-		wp_localize_script( 'wordlift-ui', 'wl_chord_params', array(
-			'ajax_url' => admin_url( 'admin-ajax.php' ),
-			'action'   => 'wl_chord',
-		) );
-
-		// Escaping atts.
-		$esc_class  = esc_attr( 'wl-chord' );
-		$esc_id     = esc_attr( uniqid( 'wl-chord-' ) );
-		$esc_width  = esc_attr( $chord_atts['width'] );
-		$esc_height = esc_attr( $chord_atts['height'] );
-
-		$esc_post_id    = esc_attr( $post_id );
-		$esc_depth      = esc_attr( $chord_atts['depth'] );
-		$esc_main_color = esc_attr( $chord_atts['main_color'] );
-
-		// Building template.
-		// TODO: in the HTML code there are static CSS rules. Move them to the CSS file.
-		return <<<EOF
+    /**
+     * {@inheritdoc}
+     */
+    const SHORTCODE = 'wl_chord';
+
+    /**
+     * Create a {@link Wordlift_Chord_Shortcode} instance.
+     *
+     * @since      3.5.4
+     */
+    public function __construct() {
+        parent::__construct();
+
+        // Hook to the `amp_post_template_css` to hide ourselves when in AMP
+        // rendering.
+        add_action( 'amp_post_template_css', array(
+            $this,
+            'amp_post_template_css',
+        ) );
+        $this->register_block_type();
+
+    }
+
+    /**
+     * Render shordcode.
+     *
+     * @param array $atts shortcode attributes.
+     *
+     * @return string The HTML output.
+     */
+    public function render( $atts ) {
+
+        // extract attributes and set default values.
+        $chord_atts = shortcode_atts( array(
+            'width'      => '100%',
+            'height'     => '500px',
+            'main_color' => '000',
+            'depth'      => 2,
+            'global'     => false,
+        ), $atts );
+
+        if ( $chord_atts['global'] ) {
+
+            $post_id = wl_shortcode_chord_most_referenced_entity_id();
+
+            if ( null === $post_id ) {
+                return 'WordLift Chord: no entities found.';
+            }
+
+            // Use the provided height if any, otherwise use a default of 200px.
+            //
+            // See https://github.com/insideout10/wordlift-plugin/issues/443.
+            $chord_atts['height'] = isset( $chord_atts['height'] ) ? $chord_atts['height'] : '200px';
+
+        } else {
+            $post_id = get_the_ID();
+        }
+
+        // Use the registered style which define an optional dependency to font-awesome.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/699
+        //		wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
+        wp_enqueue_style( 'wordlift-ui' );
+
+        // Adding javascript code.
+        wp_enqueue_script( 'd3', dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/d3/d3.min.js' );
+
+        $this->enqueue_scripts();
+
+        wp_localize_script( 'wordlift-ui', 'wl_chord_params', array(
+            'ajax_url' => admin_url( 'admin-ajax.php' ),
+            'action'   => 'wl_chord',
+        ) );
+
+        // Escaping atts.
+        $esc_class  = esc_attr( 'wl-chord' );
+        $esc_id     = esc_attr( uniqid( 'wl-chord-' ) );
+        $esc_width  = esc_attr( $chord_atts['width'] );
+        $esc_height = esc_attr( $chord_atts['height'] );
+
+        $esc_post_id    = esc_attr( $post_id );
+        $esc_depth      = esc_attr( $chord_atts['depth'] );
+        $esc_main_color = esc_attr( $chord_atts['main_color'] );
+
+        // Building template.
+        // TODO: in the HTML code there are static CSS rules. Move them to the CSS file.
+        return <<<EOF
 <div class="$esc_class" 
 	id="$esc_id"
 	data-post-id="$esc_post_id"
@@ -115,75 +115,75 @@ 
         margin-bottom:10px">
 </div>
 EOF;
-	}
-
-	private function register_block_type() {
-
-		$scope = $this;
-
-		add_action( 'init', function () use ( $scope ) {
-			if ( ! function_exists( 'register_block_type' ) ) {
-				// Gutenberg is not active.
-				return;
-			}
-
-			register_block_type( 'wordlift/chord', array(
-				'editor_script'   => 'wl-block-editor',
-				'render_callback' => function ( $attributes ) use ( $scope ) {
-					$attr_code = '';
-					foreach ( $attributes as $key => $value ) {
-						$attr_code .= $key . '="' . htmlentities( $value ) . '" ';
-					}
-
-					return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
-				},
-				'attributes'      => array(
-					'width'      => array(
-						'type'    => 'string',
-						'default' => '100%',
-					),
-					'height'     => array(
-						'type'    => 'string',
-						'default' => '500px',
-					),
-					'main_color' => array(
-						'type'    => 'string',
-						'default' => '000',
-					),
-					'depth'      => array(
-						'type'    => 'number',
-						'default' => 2,
-					),
-					'global'     => array(
-						'type'    => 'boolean',
-						'default' => false,
-					),
-					'preview'     => array(
-						'type'    => 'boolean',
-						'default' => false,
-					),
-					'preview_src'     => array(
-						'type'    => 'string',
-						'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/chord.png',
-					),
-				),
-			) );
-		} );
-	}
-
-	/**
-	 * Customize the CSS when in AMP.
-	 *
-	 * See https://github.com/Automattic/amp-wp/blob/master/readme.md#custom-css
-	 *
-	 * @since 3.14.0
-	 */
-	public function amp_post_template_css( $amp_template ) {
-
-		// Hide the `wl-chord` when in AMP.
-		?>
+    }
+
+    private function register_block_type() {
+
+        $scope = $this;
+
+        add_action( 'init', function () use ( $scope ) {
+            if ( ! function_exists( 'register_block_type' ) ) {
+                // Gutenberg is not active.
+                return;
+            }
+
+            register_block_type( 'wordlift/chord', array(
+                'editor_script'   => 'wl-block-editor',
+                'render_callback' => function ( $attributes ) use ( $scope ) {
+                    $attr_code = '';
+                    foreach ( $attributes as $key => $value ) {
+                        $attr_code .= $key . '="' . htmlentities( $value ) . '" ';
+                    }
+
+                    return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+                },
+                'attributes'      => array(
+                    'width'      => array(
+                        'type'    => 'string',
+                        'default' => '100%',
+                    ),
+                    'height'     => array(
+                        'type'    => 'string',
+                        'default' => '500px',
+                    ),
+                    'main_color' => array(
+                        'type'    => 'string',
+                        'default' => '000',
+                    ),
+                    'depth'      => array(
+                        'type'    => 'number',
+                        'default' => 2,
+                    ),
+                    'global'     => array(
+                        'type'    => 'boolean',
+                        'default' => false,
+                    ),
+                    'preview'     => array(
+                        'type'    => 'boolean',
+                        'default' => false,
+                    ),
+                    'preview_src'     => array(
+                        'type'    => 'string',
+                        'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/chord.png',
+                    ),
+                ),
+            ) );
+        } );
+    }
+
+    /**
+     * Customize the CSS when in AMP.
+     *
+     * See https://github.com/Automattic/amp-wp/blob/master/readme.md#custom-css
+     *
+     * @since 3.14.0
+     */
+    public function amp_post_template_css( $amp_template ) {
+
+        // Hide the `wl-chord` when in AMP.
+        ?>
 		.wl-chord { display: none; }
 		<?php
-	}
+    }
 
 }

Spacing +30 added lines, -30 removed lines

@@ -31,10 +31,10 @@ 
 
 		// Hook to the `amp_post_template_css` to hide ourselves when in AMP
 		// rendering.
-		add_action( 'amp_post_template_css', array(
+		add_action('amp_post_template_css', array(
 			$this,
 			'amp_post_template_css',
-		) );
+		));
 		$this->register_block_type();
 
 	}
@@ -46,29 +46,29 @@ 
 	 *
 	 * @return string The HTML output.
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
 		// extract attributes and set default values.
-		$chord_atts = shortcode_atts( array(
+		$chord_atts = shortcode_atts(array(
 			'width'      => '100%',
 			'height'     => '500px',
 			'main_color' => '000',
 			'depth'      => 2,
 			'global'     => false,
-		), $atts );
+		), $atts);
 
-		if ( $chord_atts['global'] ) {
+		if ($chord_atts['global']) {
 
 			$post_id = wl_shortcode_chord_most_referenced_entity_id();
 
-			if ( null === $post_id ) {
+			if (null === $post_id) {
 				return 'WordLift Chord: no entities found.';
 			}
 
 			// Use the provided height if any, otherwise use a default of 200px.
 			//
 			// See https://github.com/insideout10/wordlift-plugin/issues/443.
-			$chord_atts['height'] = isset( $chord_atts['height'] ) ? $chord_atts['height'] : '200px';
+			$chord_atts['height'] = isset($chord_atts['height']) ? $chord_atts['height'] : '200px';
 
 		} else {
 			$post_id = get_the_ID();
@@ -78,27 +78,27 @@ 
 		//
 		// @see https://github.com/insideout10/wordlift-plugin/issues/699
 		//		wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
-		wp_enqueue_style( 'wordlift-ui' );
+		wp_enqueue_style('wordlift-ui');
 
 		// Adding javascript code.
-		wp_enqueue_script( 'd3', dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/d3/d3.min.js' );
+		wp_enqueue_script('d3', dirname(plugin_dir_url(__FILE__)).'/bower_components/d3/d3.min.js');
 
 		$this->enqueue_scripts();
 
-		wp_localize_script( 'wordlift-ui', 'wl_chord_params', array(
-			'ajax_url' => admin_url( 'admin-ajax.php' ),
+		wp_localize_script('wordlift-ui', 'wl_chord_params', array(
+			'ajax_url' => admin_url('admin-ajax.php'),
 			'action'   => 'wl_chord',
-		) );
+		));
 
 		// Escaping atts.
-		$esc_class  = esc_attr( 'wl-chord' );
-		$esc_id     = esc_attr( uniqid( 'wl-chord-' ) );
-		$esc_width  = esc_attr( $chord_atts['width'] );
-		$esc_height = esc_attr( $chord_atts['height'] );
+		$esc_class  = esc_attr('wl-chord');
+		$esc_id     = esc_attr(uniqid('wl-chord-'));
+		$esc_width  = esc_attr($chord_atts['width']);
+		$esc_height = esc_attr($chord_atts['height']);
 
-		$esc_post_id    = esc_attr( $post_id );
-		$esc_depth      = esc_attr( $chord_atts['depth'] );
-		$esc_main_color = esc_attr( $chord_atts['main_color'] );
+		$esc_post_id    = esc_attr($post_id);
+		$esc_depth      = esc_attr($chord_atts['depth']);
+		$esc_main_color = esc_attr($chord_atts['main_color']);
 
 		// Building template.
 		// TODO: in the HTML code there are static CSS rules. Move them to the CSS file.
@@ -121,21 +121,21 @@ 
 
 		$scope = $this;
 
-		add_action( 'init', function () use ( $scope ) {
-			if ( ! function_exists( 'register_block_type' ) ) {
+		add_action('init', function() use ($scope) {
+			if ( ! function_exists('register_block_type')) {
 				// Gutenberg is not active.
 				return;
 			}
 
-			register_block_type( 'wordlift/chord', array(
+			register_block_type('wordlift/chord', array(
 				'editor_script'   => 'wl-block-editor',
-				'render_callback' => function ( $attributes ) use ( $scope ) {
+				'render_callback' => function($attributes) use ($scope) {
 					$attr_code = '';
-					foreach ( $attributes as $key => $value ) {
-						$attr_code .= $key . '="' . htmlentities( $value ) . '" ';
+					foreach ($attributes as $key => $value) {
+						$attr_code .= $key.'="'.htmlentities($value).'" ';
 					}
 
-					return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+					return '['.$scope::SHORTCODE.' '.$attr_code.']';
 				},
 				'attributes'      => array(
 					'width'      => array(
@@ -164,10 +164,10 @@ 
 					),
 					'preview_src'     => array(
 						'type'    => 'string',
-						'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/chord.png',
+						'default' => WP_CONTENT_URL.'/plugins/wordlift/images/block-previews/chord.png',
 					),
 				),
-			) );
+			));
 		} );
 	}
 
@@ -178,7 +178,7 @@ 
 	 *
 	 * @since 3.14.0
 	 */
-	public function amp_post_template_css( $amp_template ) {
+	public function amp_post_template_css($amp_template) {
 
 		// Hide the `wl-chord` when in AMP.
 		?>

src/public/class-wordlift-geomap-shortcode.php

Indentation +134 added lines, -134 removed lines

@@ -18,145 +18,145 @@
  */
 class Wordlift_Geomap_Shortcode extends Wordlift_Shortcode {
 
-	const SHORTCODE = 'wl_geomap';
-
-	/**
-	 * Create a {@link Wordlift_Geomap_Shortcode} instance.
-	 *
-	 * @since 3.5.4
-	 */
-	public function __construct() {
-		parent::__construct();
-
-		// Hook to the `amp_post_template_css` to hide ourselves when in AMP
-		// rendering.
-		add_action( 'amp_post_template_css', array( $this, 'amp_post_template_css', ) );
-		$this->register_block_type();
-
-	}
-
-	/**
-	 * Render the shortcode.
-	 *
-	 * @param array $atts An array of shortcode attributes as set by the editor.
-	 *
-	 * @return string The output html code.
-	 * @since 3.5.4
-	 *
-	 */
-	public function render( $atts ) {
-
-		// Extract attributes and set default values.
-		$geomap_atts = shortcode_atts( array(
-			'width'  => '100%',
-			'height' => '300px',
-			'global' => false,
-		), $atts );
-
-		// Get id of the post
-		$post_id = get_the_ID();
-
-		if ( $geomap_atts['global'] || is_null( $post_id ) ) {
-			// Global geomap
-			$geomap_id = 'wl_geomap_global';
-			$post_id   = null;
-		} else {
-			// Post-specific geomap
-			$geomap_id = 'wl_geomap_' . $post_id;
-		}
-
-		wp_enqueue_style( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.css', array(), '1.6.0' );
-		wp_enqueue_script( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.js', array(), '1.6.0', true );
-
-		// Use the registered style which define an optional dependency to font-awesome.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/699
-		//		wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
-		wp_enqueue_style( 'wordlift-ui' );
-
-		$this->enqueue_scripts();
-
-		wp_localize_script( 'wordlift-ui', 'wl_geomap_params', array(
-			'ajax_url' => admin_url( 'admin-ajax.php' ),    // Global param
-			'action'   => 'wl_geomap'            // Global param
-		) );
-
-		// Escaping atts.
-		$esc_id      = esc_attr( $geomap_id );
-		$esc_width   = esc_attr( $geomap_atts['width'] );
-		$esc_height  = esc_attr( $geomap_atts['height'] );
-		$esc_post_id = esc_attr( $post_id );
-
-		// Return HTML template.
-		return <<<EOF
+    const SHORTCODE = 'wl_geomap';
+
+    /**
+     * Create a {@link Wordlift_Geomap_Shortcode} instance.
+     *
+     * @since 3.5.4
+     */
+    public function __construct() {
+        parent::__construct();
+
+        // Hook to the `amp_post_template_css` to hide ourselves when in AMP
+        // rendering.
+        add_action( 'amp_post_template_css', array( $this, 'amp_post_template_css', ) );
+        $this->register_block_type();
+
+    }
+
+    /**
+     * Render the shortcode.
+     *
+     * @param array $atts An array of shortcode attributes as set by the editor.
+     *
+     * @return string The output html code.
+     * @since 3.5.4
+     *
+     */
+    public function render( $atts ) {
+
+        // Extract attributes and set default values.
+        $geomap_atts = shortcode_atts( array(
+            'width'  => '100%',
+            'height' => '300px',
+            'global' => false,
+        ), $atts );
+
+        // Get id of the post
+        $post_id = get_the_ID();
+
+        if ( $geomap_atts['global'] || is_null( $post_id ) ) {
+            // Global geomap
+            $geomap_id = 'wl_geomap_global';
+            $post_id   = null;
+        } else {
+            // Post-specific geomap
+            $geomap_id = 'wl_geomap_' . $post_id;
+        }
+
+        wp_enqueue_style( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.css', array(), '1.6.0' );
+        wp_enqueue_script( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.js', array(), '1.6.0', true );
+
+        // Use the registered style which define an optional dependency to font-awesome.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/699
+        //		wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
+        wp_enqueue_style( 'wordlift-ui' );
+
+        $this->enqueue_scripts();
+
+        wp_localize_script( 'wordlift-ui', 'wl_geomap_params', array(
+            'ajax_url' => admin_url( 'admin-ajax.php' ),    // Global param
+            'action'   => 'wl_geomap'            // Global param
+        ) );
+
+        // Escaping atts.
+        $esc_id      = esc_attr( $geomap_id );
+        $esc_width   = esc_attr( $geomap_atts['width'] );
+        $esc_height  = esc_attr( $geomap_atts['height'] );
+        $esc_post_id = esc_attr( $post_id );
+
+        // Return HTML template.
+        return <<<EOF
 <div class="wl-geomap"  id="$esc_id" data-post-id="$esc_post_id"
 	style="width:$esc_width; height:$esc_height; background-color: gray;">
 </div>
 EOF;
-	}
-
-	private function register_block_type() {
-
-		$scope = $this;
-
-		add_action( 'init', function () use ( $scope ) {
-			if ( ! function_exists( 'register_block_type' ) ) {
-				// Gutenberg is not active.
-				return;
-			}
-
-			register_block_type( 'wordlift/geomap', array(
-				'editor_script'   => 'wl-block-editor',
-				'render_callback' => function ( $attributes ) use ( $scope ) {
-					$attr_code = '';
-					foreach ( $attributes as $key => $value ) {
-						$attr_code .= $key . '="' . htmlentities( $value ) . '" ';
-					}
-
-					return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
-				},
-				'attributes'      => array(
-					'width'  => array(
-						'type'    => 'string',
-						'default' => '100%'
-					),
-					'height' => array(
-						'type'    => 'string',
-						'default' => '300px'
-					),
-					'global' => array(
-						'type'    => 'boolean',
-						'default' => false
-					),
-					'preview'     => array(
-						'type'    => 'boolean',
-						'default' => false,
-					),
-					'preview_src'     => array(
-						'type'    => 'string',
-						'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/geomap.png',
-					),
-				),
-			) );
-		} );
-	}
-
-	/**
-	 * Customize the CSS when in AMP.
-	 *
-	 * See https://github.com/Automattic/amp-wp/blob/master/readme.md#custom-css
-	 *
-	 * @param object $amp_template The template.
-	 *
-	 * @since 3.13.0
-	 *
-	 */
-	public function amp_post_template_css( $amp_template ) {
-
-		// Hide the `wl-geomap` when in AMP.
-		?>
+    }
+
+    private function register_block_type() {
+
+        $scope = $this;
+
+        add_action( 'init', function () use ( $scope ) {
+            if ( ! function_exists( 'register_block_type' ) ) {
+                // Gutenberg is not active.
+                return;
+            }
+
+            register_block_type( 'wordlift/geomap', array(
+                'editor_script'   => 'wl-block-editor',
+                'render_callback' => function ( $attributes ) use ( $scope ) {
+                    $attr_code = '';
+                    foreach ( $attributes as $key => $value ) {
+                        $attr_code .= $key . '="' . htmlentities( $value ) . '" ';
+                    }
+
+                    return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+                },
+                'attributes'      => array(
+                    'width'  => array(
+                        'type'    => 'string',
+                        'default' => '100%'
+                    ),
+                    'height' => array(
+                        'type'    => 'string',
+                        'default' => '300px'
+                    ),
+                    'global' => array(
+                        'type'    => 'boolean',
+                        'default' => false
+                    ),
+                    'preview'     => array(
+                        'type'    => 'boolean',
+                        'default' => false,
+                    ),
+                    'preview_src'     => array(
+                        'type'    => 'string',
+                        'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/geomap.png',
+                    ),
+                ),
+            ) );
+        } );
+    }
+
+    /**
+     * Customize the CSS when in AMP.
+     *
+     * See https://github.com/Automattic/amp-wp/blob/master/readme.md#custom-css
+     *
+     * @param object $amp_template The template.
+     *
+     * @since 3.13.0
+     *
+     */
+    public function amp_post_template_css( $amp_template ) {
+
+        // Hide the `wl-geomap` when in AMP.
+        ?>
         .wl-geomap { display: none; }
 		<?php
-	}
+    }
 
 }

Spacing +26 added lines, -26 removed lines

@@ -30,7 +30,7 @@ 
 
 		// Hook to the `amp_post_template_css` to hide ourselves when in AMP
 		// rendering.
-		add_action( 'amp_post_template_css', array( $this, 'amp_post_template_css', ) );
+		add_action('amp_post_template_css', array($this, 'amp_post_template_css',));
 		$this->register_block_type();
 
 	}
@@ -44,48 +44,48 @@ 
 	 * @since 3.5.4
 	 *
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
 		// Extract attributes and set default values.
-		$geomap_atts = shortcode_atts( array(
+		$geomap_atts = shortcode_atts(array(
 			'width'  => '100%',
 			'height' => '300px',
 			'global' => false,
-		), $atts );
+		), $atts);
 
 		// Get id of the post
 		$post_id = get_the_ID();
 
-		if ( $geomap_atts['global'] || is_null( $post_id ) ) {
+		if ($geomap_atts['global'] || is_null($post_id)) {
 			// Global geomap
 			$geomap_id = 'wl_geomap_global';
 			$post_id   = null;
 		} else {
 			// Post-specific geomap
-			$geomap_id = 'wl_geomap_' . $post_id;
+			$geomap_id = 'wl_geomap_'.$post_id;
 		}
 
-		wp_enqueue_style( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.css', array(), '1.6.0' );
-		wp_enqueue_script( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.js', array(), '1.6.0', true );
+		wp_enqueue_style('wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.css', array(), '1.6.0');
+		wp_enqueue_script('wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.js', array(), '1.6.0', true);
 
 		// Use the registered style which define an optional dependency to font-awesome.
 		//
 		// @see https://github.com/insideout10/wordlift-plugin/issues/699
 		//		wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
-		wp_enqueue_style( 'wordlift-ui' );
+		wp_enqueue_style('wordlift-ui');
 
 		$this->enqueue_scripts();
 
-		wp_localize_script( 'wordlift-ui', 'wl_geomap_params', array(
-			'ajax_url' => admin_url( 'admin-ajax.php' ),    // Global param
+		wp_localize_script('wordlift-ui', 'wl_geomap_params', array(
+			'ajax_url' => admin_url('admin-ajax.php'), // Global param
 			'action'   => 'wl_geomap'            // Global param
-		) );
+		));
 
 		// Escaping atts.
-		$esc_id      = esc_attr( $geomap_id );
-		$esc_width   = esc_attr( $geomap_atts['width'] );
-		$esc_height  = esc_attr( $geomap_atts['height'] );
-		$esc_post_id = esc_attr( $post_id );
+		$esc_id      = esc_attr($geomap_id);
+		$esc_width   = esc_attr($geomap_atts['width']);
+		$esc_height  = esc_attr($geomap_atts['height']);
+		$esc_post_id = esc_attr($post_id);
 
 		// Return HTML template.
 		return <<<EOF
@@ -99,21 +99,21 @@ 
 
 		$scope = $this;
 
-		add_action( 'init', function () use ( $scope ) {
-			if ( ! function_exists( 'register_block_type' ) ) {
+		add_action('init', function() use ($scope) {
+			if ( ! function_exists('register_block_type')) {
 				// Gutenberg is not active.
 				return;
 			}
 
-			register_block_type( 'wordlift/geomap', array(
+			register_block_type('wordlift/geomap', array(
 				'editor_script'   => 'wl-block-editor',
-				'render_callback' => function ( $attributes ) use ( $scope ) {
+				'render_callback' => function($attributes) use ($scope) {
 					$attr_code = '';
-					foreach ( $attributes as $key => $value ) {
-						$attr_code .= $key . '="' . htmlentities( $value ) . '" ';
+					foreach ($attributes as $key => $value) {
+						$attr_code .= $key.'="'.htmlentities($value).'" ';
 					}
 
-					return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+					return '['.$scope::SHORTCODE.' '.$attr_code.']';
 				},
 				'attributes'      => array(
 					'width'  => array(
@@ -134,10 +134,10 @@ 
 					),
 					'preview_src'     => array(
 						'type'    => 'string',
-						'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/geomap.png',
+						'default' => WP_CONTENT_URL.'/plugins/wordlift/images/block-previews/geomap.png',
 					),
 				),
-			) );
+			));
 		} );
 	}
 
@@ -151,7 +151,7 @@ 
 	 * @since 3.13.0
 	 *
 	 */
-	public function amp_post_template_css( $amp_template ) {
+	public function amp_post_template_css($amp_template) {
 
 		// Hide the `wl-geomap` when in AMP.
 		?>

src/public/class-wordlift-timeline-shortcode.php

Indentation +228 added lines, -228 removed lines

@@ -7,258 +7,258 @@
  */
 class Wordlift_Timeline_Shortcode extends Wordlift_Shortcode {
 
-	const SHORTCODE = 'wl_timeline';
+    const SHORTCODE = 'wl_timeline';
 
-	/**
-	 * The list of locales supported by TimelineJS (correspond to the list of
-	 * files in the locale subfolder).
-	 *
-	 * @since 3.7.0
-	 * @var array An array of two-letters language codes.
-	 */
-	private static $supported_locales = array(
-		'ur',
-		'uk',
-		'tr',
-		'tl',
-		'th',
-		'te',
-		'ta',
-		'sv',
-		'sr',
-		'sl',
-		'sk',
-		'si',
-		'ru',
-		'ro',
-		'rm',
-		'pt',
-		'pl',
-		'no',
-		'nl',
-		'ne',
-		'ms',
-		'lv',
-		'lt',
-		'lb',
-		'ko',
-		'ka',
-		'ja',
-		'iw',
-		'it',
-		'is',
-		'id',
-		'hy',
-		'hu',
-		'hr',
-		'hi',
-		'he',
-		'gl',
-		'ga',
-		'fy',
-		'fr',
-		'fo',
-		'fi',
-		'fa',
-		'eu',
-		'et',
-		'es',
-		'eo',
-		'en',
-		'el',
-		'de',
-		'da',
-		'cz',
-		'ca',
-		'bg',
-		'be',
-		'ar',
-		'af'
-	);
+    /**
+     * The list of locales supported by TimelineJS (correspond to the list of
+     * files in the locale subfolder).
+     *
+     * @since 3.7.0
+     * @var array An array of two-letters language codes.
+     */
+    private static $supported_locales = array(
+        'ur',
+        'uk',
+        'tr',
+        'tl',
+        'th',
+        'te',
+        'ta',
+        'sv',
+        'sr',
+        'sl',
+        'sk',
+        'si',
+        'ru',
+        'ro',
+        'rm',
+        'pt',
+        'pl',
+        'no',
+        'nl',
+        'ne',
+        'ms',
+        'lv',
+        'lt',
+        'lb',
+        'ko',
+        'ka',
+        'ja',
+        'iw',
+        'it',
+        'is',
+        'id',
+        'hy',
+        'hu',
+        'hr',
+        'hi',
+        'he',
+        'gl',
+        'ga',
+        'fy',
+        'fr',
+        'fo',
+        'fi',
+        'fa',
+        'eu',
+        'et',
+        'es',
+        'eo',
+        'en',
+        'el',
+        'de',
+        'da',
+        'cz',
+        'ca',
+        'bg',
+        'be',
+        'ar',
+        'af'
+    );
 
-	/**
-	 * The Log service.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log_service The Log service.
-	 */
-	private $log_service;
+    /**
+     * The Log service.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Log_Service $log_service The Log service.
+     */
+    private $log_service;
 
-	/**
-	 * Create a Wordlift_Timeline_Shortcode instance.
-	 *
-	 * @since 3.1.0
-	 */
-	public function __construct() {
-		parent::__construct();
+    /**
+     * Create a Wordlift_Timeline_Shortcode instance.
+     *
+     * @since 3.1.0
+     */
+    public function __construct() {
+        parent::__construct();
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Timeline_Shortcode' );
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Timeline_Shortcode' );
 
-		$this->register_block_type();
+        $this->register_block_type();
 
-	}
+    }
 
-	public function get_timelinejs_default_options() {
-		return array(
-			'debug'                            => defined( 'WP_DEBUG' ) && WP_DEBUG,
-			'height'                           => null,
-			'width'                            => null,
-			'is_embed'                         => false,
-			'hash_bookmark'                    => false,
-			'default_bg_color'                 => 'white',
-			'scale_factor'                     => 2,
-			'initial_zoom'                     => null,
-			'zoom_sequence'                    => '[0.5, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89]',
-			'timenav_position'                 => 'bottom',
-			'optimal_tick_width'               => 100,
-			'base_class'                       => 'tl-timeline',
-			'timenav_height'                   => 150,
-			'timenav_height_percentage'        => null,
-			'timenav_mobile_height_percentage' => 40,
-			'timenav_height_min'               => 150,
-			'marker_height_min'                => 30,
-			'marker_width_min'                 => 100,
-			'start_at_slide'                   => 0,
-			'start_at_end'                     => false,
-			'menubar_height'                   => 0,
-			'use_bc'                           => false,
-			'duration'                         => 1000,
-			'ease'                             => 'TL.Ease.easeInOutQuint',
-			'slide_default_fade'               => '0%',
-			'language'                         => $this->get_locale(),
-			'ga_property_id'                   => null,
-			'track_events'                     => "['back_to_start','nav_next','nav_previous','zoom_in','zoom_out']"
-		);
-	}
+    public function get_timelinejs_default_options() {
+        return array(
+            'debug'                            => defined( 'WP_DEBUG' ) && WP_DEBUG,
+            'height'                           => null,
+            'width'                            => null,
+            'is_embed'                         => false,
+            'hash_bookmark'                    => false,
+            'default_bg_color'                 => 'white',
+            'scale_factor'                     => 2,
+            'initial_zoom'                     => null,
+            'zoom_sequence'                    => '[0.5, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89]',
+            'timenav_position'                 => 'bottom',
+            'optimal_tick_width'               => 100,
+            'base_class'                       => 'tl-timeline',
+            'timenav_height'                   => 150,
+            'timenav_height_percentage'        => null,
+            'timenav_mobile_height_percentage' => 40,
+            'timenav_height_min'               => 150,
+            'marker_height_min'                => 30,
+            'marker_width_min'                 => 100,
+            'start_at_slide'                   => 0,
+            'start_at_end'                     => false,
+            'menubar_height'                   => 0,
+            'use_bc'                           => false,
+            'duration'                         => 1000,
+            'ease'                             => 'TL.Ease.easeInOutQuint',
+            'slide_default_fade'               => '0%',
+            'language'                         => $this->get_locale(),
+            'ga_property_id'                   => null,
+            'track_events'                     => "['back_to_start','nav_next','nav_previous','zoom_in','zoom_out']"
+        );
+    }
 
-	/**
-	 * Renders the Timeline.
-	 *
-	 * @param array $atts An array of shortcode attributes.
-	 *
-	 * @return string The rendered HTML.
-	 * @since 3.1.0
-	 *
-	 */
-	public function render( $atts ) {
+    /**
+     * Renders the Timeline.
+     *
+     * @param array $atts An array of shortcode attributes.
+     *
+     * @return string The rendered HTML.
+     * @since 3.1.0
+     *
+     */
+    public function render( $atts ) {
 
-		//extract attributes and set default values
-		$settings = shortcode_atts( array_merge( $this->get_timelinejs_default_options(), array(
-			'global'            => false,
-			'display_images_as' => 'media',
-			'excerpt_length'    => 55
-		) ), $atts );
+        //extract attributes and set default values
+        $settings = shortcode_atts( array_merge( $this->get_timelinejs_default_options(), array(
+            'global'            => false,
+            'display_images_as' => 'media',
+            'excerpt_length'    => 55
+        ) ), $atts );
 
-		// Load the TimelineJS stylesheets and scripts.
-		wp_enqueue_style( 'timelinejs', dirname( plugin_dir_url( __FILE__ ) ) . '/timelinejs/css/timeline.css' );
-		wp_enqueue_script( 'timelinejs', dirname( plugin_dir_url( __FILE__ ) ) . '/timelinejs/js/timeline' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '-min' : '' ) . '.js' );
+        // Load the TimelineJS stylesheets and scripts.
+        wp_enqueue_style( 'timelinejs', dirname( plugin_dir_url( __FILE__ ) ) . '/timelinejs/css/timeline.css' );
+        wp_enqueue_script( 'timelinejs', dirname( plugin_dir_url( __FILE__ ) ) . '/timelinejs/js/timeline' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '-min' : '' ) . '.js' );
 
-		// Enqueue the scripts for the timeline.
-		$this->enqueue_scripts();
+        // Enqueue the scripts for the timeline.
+        $this->enqueue_scripts();
 
-		// Provide the script with options.
-		wp_localize_script( 'timelinejs', 'wl_timeline_params', array(
-			'ajax_url'          => admin_url( 'admin-ajax.php' ),
-			// TODO: this parameter is already provided by WP
-			'action'            => 'wl_timeline',
-			// These settings apply to our wl_timeline AJAX endpoint.
-			'display_images_as' => $settings['display_images_as'],
-			'excerpt_length'    => $settings['excerpt_length'],
-			// These settings apply to the timeline javascript client.
-			'settings'          => array_filter( $settings, function ( $value ) {
-				// Do not set NULL values.
-				return ( null !== $value );
-			} )
-		) );
+        // Provide the script with options.
+        wp_localize_script( 'timelinejs', 'wl_timeline_params', array(
+            'ajax_url'          => admin_url( 'admin-ajax.php' ),
+            // TODO: this parameter is already provided by WP
+            'action'            => 'wl_timeline',
+            // These settings apply to our wl_timeline AJAX endpoint.
+            'display_images_as' => $settings['display_images_as'],
+            'excerpt_length'    => $settings['excerpt_length'],
+            // These settings apply to the timeline javascript client.
+            'settings'          => array_filter( $settings, function ( $value ) {
+                // Do not set NULL values.
+                return ( null !== $value );
+            } )
+        ) );
 
-		// Get the current post id or set null if global is set to true.
-		$post_id = ( $settings['global'] ? null : get_the_ID() );
+        // Get the current post id or set null if global is set to true.
+        $post_id = ( $settings['global'] ? null : get_the_ID() );
 
-		// Escaping atts.
-		$style        = sprintf( 'style="%s%s"', isset( $settings['width'] ) ? "width:{$settings['width']};" : '', isset( $settings['height'] ) ? "height:{$settings['height']};" : '' );
-		$data_post_id = ( isset( $post_id ) ? "data-post-id='$post_id'" : '' );
+        // Escaping atts.
+        $style        = sprintf( 'style="%s%s"', isset( $settings['width'] ) ? "width:{$settings['width']};" : '', isset( $settings['height'] ) ? "height:{$settings['height']};" : '' );
+        $data_post_id = ( isset( $post_id ) ? "data-post-id='$post_id'" : '' );
 
-		// Generate a unique ID for this timeline.
-		$element_id = uniqid( 'wl-timeline-' );
+        // Generate a unique ID for this timeline.
+        $element_id = uniqid( 'wl-timeline-' );
 
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-			$this->log_service->trace( "Creating a timeline widget [ element id :: $element_id ][ post id :: $post_id ]" );
-		}
+        if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+            $this->log_service->trace( "Creating a timeline widget [ element id :: $element_id ][ post id :: $post_id ]" );
+        }
 
-		// Building template.
-		return sprintf( '<div class="wl-timeline-container" %s><div class="wl-timeline" id="%s" %s></div></div>', $style, $element_id, $data_post_id );
-	}
+        // Building template.
+        return sprintf( '<div class="wl-timeline-container" %s><div class="wl-timeline" id="%s" %s></div></div>', $style, $element_id, $data_post_id );
+    }
 
-	private function register_block_type() {
+    private function register_block_type() {
 
-		$scope = $this;
+        $scope = $this;
 
-		add_action( 'init', function () use ( $scope ) {
-			if ( ! function_exists( 'register_block_type' ) ) {
-				// Gutenberg is not active.
-				return;
-			}
+        add_action( 'init', function () use ( $scope ) {
+            if ( ! function_exists( 'register_block_type' ) ) {
+                // Gutenberg is not active.
+                return;
+            }
 
-			register_block_type( 'wordlift/timeline', array(
-				'editor_script'   => 'wl-block-editor',
-				'render_callback' => function ( $attributes ) use ( $scope ) {
-					$attr_code          = '';
-					$timelinejs_options = json_decode( $attributes['timelinejs_options'], true );
-					unset( $attributes['timelinejs_options'] );
-					$attributes_all = array_merge( $attributes, $timelinejs_options );
-					foreach ( $attributes_all as $key => $value ) {
-						if ( $value && strpos( $value, '[' ) === false && strpos( $value, ']' ) === false ) {
-							$attr_code .= $key . '="' . $value . '" ';
-						}
-					}
+            register_block_type( 'wordlift/timeline', array(
+                'editor_script'   => 'wl-block-editor',
+                'render_callback' => function ( $attributes ) use ( $scope ) {
+                    $attr_code          = '';
+                    $timelinejs_options = json_decode( $attributes['timelinejs_options'], true );
+                    unset( $attributes['timelinejs_options'] );
+                    $attributes_all = array_merge( $attributes, $timelinejs_options );
+                    foreach ( $attributes_all as $key => $value ) {
+                        if ( $value && strpos( $value, '[' ) === false && strpos( $value, ']' ) === false ) {
+                            $attr_code .= $key . '="' . $value . '" ';
+                        }
+                    }
 
-					return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
-				},
-				'attributes'      => array(
-					'display_images_as'  => array(
-						'type'    => 'string',
-						'default' => 'media'
-					),
-					'excerpt_length'     => array(
-						'type'    => 'number',
-						'default' => 55
-					),
-					'global'             => array(
-						'type'    => 'bool',
-						'default' => false
-					),
-					'timelinejs_options' => array(
-						'type'    => 'string', // https://timeline.knightlab.com/docs/options.html
-						'default' => json_encode( $scope->get_timelinejs_default_options(), JSON_PRETTY_PRINT )
-					),
-					'preview'     => array(
-						'type'    => 'boolean',
-						'default' => false,
-					),
-					'preview_src' => array(
-						'type'    => 'string',
-						'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/timeline.png',
-					)
-				)
-			) );
-		} );
-	}
+                    return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+                },
+                'attributes'      => array(
+                    'display_images_as'  => array(
+                        'type'    => 'string',
+                        'default' => 'media'
+                    ),
+                    'excerpt_length'     => array(
+                        'type'    => 'number',
+                        'default' => 55
+                    ),
+                    'global'             => array(
+                        'type'    => 'bool',
+                        'default' => false
+                    ),
+                    'timelinejs_options' => array(
+                        'type'    => 'string', // https://timeline.knightlab.com/docs/options.html
+                        'default' => json_encode( $scope->get_timelinejs_default_options(), JSON_PRETTY_PRINT )
+                    ),
+                    'preview'     => array(
+                        'type'    => 'boolean',
+                        'default' => false,
+                    ),
+                    'preview_src' => array(
+                        'type'    => 'string',
+                        'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/timeline.png',
+                    )
+                )
+            ) );
+        } );
+    }
 
-	/**
-	 * Return the locale for the TimelineJS according to WP's configured locale and
-	 * support TimelineJS locales. If WP's locale is not supported, english is used.
-	 *
-	 * @return string The locale (2 letters code).
-	 * @since 3.7.0
-	 */
-	private function get_locale() {
+    /**
+     * Return the locale for the TimelineJS according to WP's configured locale and
+     * support TimelineJS locales. If WP's locale is not supported, english is used.
+     *
+     * @return string The locale (2 letters code).
+     * @since 3.7.0
+     */
+    private function get_locale() {
 
-		// Get the first 2 letters.
-		$locale = substr( get_locale(), 0, 2 );
+        // Get the first 2 letters.
+        $locale = substr( get_locale(), 0, 2 );
 
-		// Check that the specified locale is supported otherwise use English.
-		return in_array( $locale, self::$supported_locales ) ? $locale : 'en';
-	}
+        // Check that the specified locale is supported otherwise use English.
+        return in_array( $locale, self::$supported_locales ) ? $locale : 'en';
+    }
 
 }

Spacing +35 added lines, -35 removed lines

@@ -93,7 +93,7 @@ 
 	public function __construct() {
 		parent::__construct();
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Timeline_Shortcode' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_Timeline_Shortcode');
 
 		$this->register_block_type();
 
@@ -101,7 +101,7 @@ 
 
 	public function get_timelinejs_default_options() {
 		return array(
-			'debug'                            => defined( 'WP_DEBUG' ) && WP_DEBUG,
+			'debug'                            => defined('WP_DEBUG') && WP_DEBUG,
 			'height'                           => null,
 			'width'                            => null,
 			'is_embed'                         => false,
@@ -141,79 +141,79 @@ 
 	 * @since 3.1.0
 	 *
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
 		//extract attributes and set default values
-		$settings = shortcode_atts( array_merge( $this->get_timelinejs_default_options(), array(
+		$settings = shortcode_atts(array_merge($this->get_timelinejs_default_options(), array(
 			'global'            => false,
 			'display_images_as' => 'media',
 			'excerpt_length'    => 55
-		) ), $atts );
+		)), $atts);
 
 		// Load the TimelineJS stylesheets and scripts.
-		wp_enqueue_style( 'timelinejs', dirname( plugin_dir_url( __FILE__ ) ) . '/timelinejs/css/timeline.css' );
-		wp_enqueue_script( 'timelinejs', dirname( plugin_dir_url( __FILE__ ) ) . '/timelinejs/js/timeline' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '-min' : '' ) . '.js' );
+		wp_enqueue_style('timelinejs', dirname(plugin_dir_url(__FILE__)).'/timelinejs/css/timeline.css');
+		wp_enqueue_script('timelinejs', dirname(plugin_dir_url(__FILE__)).'/timelinejs/js/timeline'.( ! defined('SCRIPT_DEBUG') || ! SCRIPT_DEBUG ? '-min' : '').'.js');
 
 		// Enqueue the scripts for the timeline.
 		$this->enqueue_scripts();
 
 		// Provide the script with options.
-		wp_localize_script( 'timelinejs', 'wl_timeline_params', array(
-			'ajax_url'          => admin_url( 'admin-ajax.php' ),
+		wp_localize_script('timelinejs', 'wl_timeline_params', array(
+			'ajax_url'          => admin_url('admin-ajax.php'),
 			// TODO: this parameter is already provided by WP
 			'action'            => 'wl_timeline',
 			// These settings apply to our wl_timeline AJAX endpoint.
 			'display_images_as' => $settings['display_images_as'],
 			'excerpt_length'    => $settings['excerpt_length'],
 			// These settings apply to the timeline javascript client.
-			'settings'          => array_filter( $settings, function ( $value ) {
+			'settings'          => array_filter($settings, function($value) {
 				// Do not set NULL values.
-				return ( null !== $value );
+				return (null !== $value);
 			} )
-		) );
+		));
 
 		// Get the current post id or set null if global is set to true.
-		$post_id = ( $settings['global'] ? null : get_the_ID() );
+		$post_id = ($settings['global'] ? null : get_the_ID());
 
 		// Escaping atts.
-		$style        = sprintf( 'style="%s%s"', isset( $settings['width'] ) ? "width:{$settings['width']};" : '', isset( $settings['height'] ) ? "height:{$settings['height']};" : '' );
-		$data_post_id = ( isset( $post_id ) ? "data-post-id='$post_id'" : '' );
+		$style        = sprintf('style="%s%s"', isset($settings['width']) ? "width:{$settings['width']};" : '', isset($settings['height']) ? "height:{$settings['height']};" : '');
+		$data_post_id = (isset($post_id) ? "data-post-id='$post_id'" : '');
 
 		// Generate a unique ID for this timeline.
-		$element_id = uniqid( 'wl-timeline-' );
+		$element_id = uniqid('wl-timeline-');
 
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-			$this->log_service->trace( "Creating a timeline widget [ element id :: $element_id ][ post id :: $post_id ]" );
+		if (defined('WP_DEBUG') && WP_DEBUG) {
+			$this->log_service->trace("Creating a timeline widget [ element id :: $element_id ][ post id :: $post_id ]");
 		}
 
 		// Building template.
-		return sprintf( '<div class="wl-timeline-container" %s><div class="wl-timeline" id="%s" %s></div></div>', $style, $element_id, $data_post_id );
+		return sprintf('<div class="wl-timeline-container" %s><div class="wl-timeline" id="%s" %s></div></div>', $style, $element_id, $data_post_id);
 	}
 
 	private function register_block_type() {
 
 		$scope = $this;
 
-		add_action( 'init', function () use ( $scope ) {
-			if ( ! function_exists( 'register_block_type' ) ) {
+		add_action('init', function() use ($scope) {
+			if ( ! function_exists('register_block_type')) {
 				// Gutenberg is not active.
 				return;
 			}
 
-			register_block_type( 'wordlift/timeline', array(
+			register_block_type('wordlift/timeline', array(
 				'editor_script'   => 'wl-block-editor',
-				'render_callback' => function ( $attributes ) use ( $scope ) {
+				'render_callback' => function($attributes) use ($scope) {
 					$attr_code          = '';
-					$timelinejs_options = json_decode( $attributes['timelinejs_options'], true );
-					unset( $attributes['timelinejs_options'] );
-					$attributes_all = array_merge( $attributes, $timelinejs_options );
-					foreach ( $attributes_all as $key => $value ) {
-						if ( $value && strpos( $value, '[' ) === false && strpos( $value, ']' ) === false ) {
-							$attr_code .= $key . '="' . $value . '" ';
+					$timelinejs_options = json_decode($attributes['timelinejs_options'], true);
+					unset($attributes['timelinejs_options']);
+					$attributes_all = array_merge($attributes, $timelinejs_options);
+					foreach ($attributes_all as $key => $value) {
+						if ($value && strpos($value, '[') === false && strpos($value, ']') === false) {
+							$attr_code .= $key.'="'.$value.'" ';
 						}
 					}
 
-					return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+					return '['.$scope::SHORTCODE.' '.$attr_code.']';
 				},
 				'attributes'      => array(
 					'display_images_as'  => array(
@@ -230,7 +230,7 @@ 
 					),
 					'timelinejs_options' => array(
 						'type'    => 'string', // https://timeline.knightlab.com/docs/options.html
-						'default' => json_encode( $scope->get_timelinejs_default_options(), JSON_PRETTY_PRINT )
+						'default' => json_encode($scope->get_timelinejs_default_options(), JSON_PRETTY_PRINT)
 					),
 					'preview'     => array(
 						'type'    => 'boolean',
@@ -238,10 +238,10 @@ 
 					),
 					'preview_src' => array(
 						'type'    => 'string',
-						'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/timeline.png',
+						'default' => WP_CONTENT_URL.'/plugins/wordlift/images/block-previews/timeline.png',
 					)
 				)
-			) );
+			));
 		} );
 	}
 
@@ -255,10 +255,10 @@ 
 	private function get_locale() {
 
 		// Get the first 2 letters.
-		$locale = substr( get_locale(), 0, 2 );
+		$locale = substr(get_locale(), 0, 2);
 
 		// Check that the specified locale is supported otherwise use English.
-		return in_array( $locale, self::$supported_locales ) ? $locale : 'en';
+		return in_array($locale, self::$supported_locales) ? $locale : 'en';
 	}
 
 }