insideout10 / wordlift-plugin

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

Indentation +40 added lines, -40 removed lines

@@ -14,54 +14,54 @@
  */
 class Wordlift_Tinymce_Adapter {
 
-	/**
-	 * The {@link Wordlift} plugin instance.
-	 *
-	 * @since  3.12.0
-	 * @access private
-	 * @var \Wordlift $plugin The {@link Wordlift} plugin instance.
-	 */
-	private $plugin;
+    /**
+     * The {@link Wordlift} plugin instance.
+     *
+     * @since  3.12.0
+     * @access private
+     * @var \Wordlift $plugin The {@link Wordlift} plugin instance.
+     */
+    private $plugin;
 
-	/**
-	 * Wordlift_Tinymce_Adapter constructor.
-	 *
-	 * @param \Wordlift $plugin The {@link Wordlift} plugin instance.
-	 */
-	public function __construct( $plugin ) {
+    /**
+     * Wordlift_Tinymce_Adapter constructor.
+     *
+     * @param \Wordlift $plugin The {@link Wordlift} plugin instance.
+     */
+    public function __construct( $plugin ) {
 
-		$this->plugin = $plugin;
+        $this->plugin = $plugin;
 
-	}
+    }
 
-	/**
-	 * Load the TinyMCE plugin. This method is called by the WP mce_external_plugins hook.
-	 *
-	 * @since 3.12.0
-	 *
-	 * @param array $plugins The existing plugins array.
-	 *
-	 * @return array The modified plugins array.
-	 */
-	function mce_external_plugins( $plugins ) {
+    /**
+     * Load the TinyMCE plugin. This method is called by the WP mce_external_plugins hook.
+     *
+     * @since 3.12.0
+     *
+     * @param array $plugins The existing plugins array.
+     *
+     * @return array The modified plugins array.
+     */
+    function mce_external_plugins( $plugins ) {
 
-		// Get WordLift's version as a cache killer.
-		$version = $this->plugin->get_version();
+        // Get WordLift's version as a cache killer.
+        $version = $this->plugin->get_version();
 
-		// User can edit?
-		$can_edit = current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' );
+        // User can edit?
+        $can_edit = current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' );
 
-		// If user can't edit or rich editing isn't enabled, bail out.
-		if ( ! $can_edit || ! get_user_option( 'rich_editing' ) ) {
-			return $plugins;
-		}
+        // If user can't edit or rich editing isn't enabled, bail out.
+        if ( ! $can_edit || ! get_user_option( 'rich_editing' ) ) {
+            return $plugins;
+        }
 
-		// Add our own JavaScript file to TinyMCE's extensions.
-		$plugins['wordlift']      = plugin_dir_url( dirname( __FILE__ ) ) . 'js/wordlift-reloaded.js?ver=' . $version;
-		$plugins['wl_shortcodes'] = plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/wordlift_shortcode_tinymce_plugin.js?ver=' . $version;
-		$plugins['wl_tinymce']    = plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/tinymce.js?ver=' . $version;
+        // Add our own JavaScript file to TinyMCE's extensions.
+        $plugins['wordlift']      = plugin_dir_url( dirname( __FILE__ ) ) . 'js/wordlift-reloaded.js?ver=' . $version;
+        $plugins['wl_shortcodes'] = plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/wordlift_shortcode_tinymce_plugin.js?ver=' . $version;
+        $plugins['wl_tinymce']    = plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/tinymce.js?ver=' . $version;
 
-		return $plugins;
-	}
+        return $plugins;
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -28,7 +28,7 @@ 
 	 *
 	 * @param \Wordlift $plugin The {@link Wordlift} plugin instance.
 	 */
-	public function __construct( $plugin ) {
+	public function __construct($plugin) {
 
 		$this->plugin = $plugin;
 
@@ -43,23 +43,23 @@ 
 	 *
 	 * @return array The modified plugins array.
 	 */
-	function mce_external_plugins( $plugins ) {
+	function mce_external_plugins($plugins) {
 
 		// Get WordLift's version as a cache killer.
 		$version = $this->plugin->get_version();
 
 		// User can edit?
-		$can_edit = current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' );
+		$can_edit = current_user_can('edit_posts') || current_user_can('edit_pages');
 
 		// If user can't edit or rich editing isn't enabled, bail out.
-		if ( ! $can_edit || ! get_user_option( 'rich_editing' ) ) {
+		if ( ! $can_edit || ! get_user_option('rich_editing')) {
 			return $plugins;
 		}
 
 		// Add our own JavaScript file to TinyMCE's extensions.
-		$plugins['wordlift']      = plugin_dir_url( dirname( __FILE__ ) ) . 'js/wordlift-reloaded.js?ver=' . $version;
-		$plugins['wl_shortcodes'] = plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/wordlift_shortcode_tinymce_plugin.js?ver=' . $version;
-		$plugins['wl_tinymce']    = plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/tinymce.js?ver=' . $version;
+		$plugins['wordlift']      = plugin_dir_url(dirname(__FILE__)).'js/wordlift-reloaded.js?ver='.$version;
+		$plugins['wl_shortcodes'] = plugin_dir_url(dirname(__FILE__)).'admin/js/wordlift_shortcode_tinymce_plugin.js?ver='.$version;
+		$plugins['wl_tinymce']    = plugin_dir_url(dirname(__FILE__)).'admin/js/1/tinymce.js?ver='.$version;
 
 		return $plugins;
 	}

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

Indentation +68 added lines, -68 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -20,79 +20,79 @@ 
  * @since 3.15.0
  */
 class Wordlift_Autocomplete_Service {
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
 
-	/**
-	 * The {@link Class_Wordlift_Autocomplete_Service} instance.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	public function __construct( $configuration_service ) {
-		$this->configuration_service = $configuration_service;
-		$this->log                   = Wordlift_Log_Service::get_logger( 'Wordlift_Autocomplete_Service' );
-	}
+    /**
+     * The {@link Class_Wordlift_Autocomplete_Service} instance.
+     *
+     * @since 3.15.0
+     *
+     * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    public function __construct( $configuration_service ) {
+        $this->configuration_service = $configuration_service;
+        $this->log                   = Wordlift_Log_Service::get_logger( 'Wordlift_Autocomplete_Service' );
+    }
 
-	/**
-	 * Make request to external API and return the response.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string $query The search string.
-	 *
-	 * @return array $response The API response.
-	 */
-	public function make_request( $query ) {
-		$url = $this->build_request_url( $query );
+    /**
+     * Make request to external API and return the response.
+     *
+     * @since 3.15.0
+     *
+     * @param string $query The search string.
+     *
+     * @return array $response The API response.
+     */
+    public function make_request( $query ) {
+        $url = $this->build_request_url( $query );
 
-		// Make request.
-		$response = wp_remote_get( $url );
+        // Make request.
+        $response = wp_remote_get( $url );
 
-		// Return the response.
-		return $response;
-	}
+        // Return the response.
+        return $response;
+    }
 
-	/**
-	 * Build the autocomplete url.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string $query The search string.
-	 *
-	 * @return string Built url.
-	 */
-	private function build_request_url( $query ) {
-		$args = array(
-			'key'      => $this->configuration_service->get_key(),
-			'language' => $this->configuration_service->get_language_code(),
-			'query'    => $query,
-			'limit'    => 100,
-		);
+    /**
+     * Build the autocomplete url.
+     *
+     * @since 3.15.0
+     *
+     * @param string $query The search string.
+     *
+     * @return string Built url.
+     */
+    private function build_request_url( $query ) {
+        $args = array(
+            'key'      => $this->configuration_service->get_key(),
+            'language' => $this->configuration_service->get_language_code(),
+            'query'    => $query,
+            'limit'    => 100,
+        );
 
-		// Add args to URL.
-		$request_url = add_query_arg(
-			urlencode_deep( $args ),
-			$this->configuration_service->get_autocomplete_url()
-		);
+        // Add args to URL.
+        $request_url = add_query_arg(
+            urlencode_deep( $args ),
+            $this->configuration_service->get_autocomplete_url()
+        );
 
-		// return the built url.
-		return $request_url;
-	}
+        // return the built url.
+        return $request_url;
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -10,7 +10,7 @@ 
  * @since      3.15.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -45,9 +45,9 @@ 
 	 *
 	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
 	 */
-	public function __construct( $configuration_service ) {
+	public function __construct($configuration_service) {
 		$this->configuration_service = $configuration_service;
-		$this->log                   = Wordlift_Log_Service::get_logger( 'Wordlift_Autocomplete_Service' );
+		$this->log                   = Wordlift_Log_Service::get_logger('Wordlift_Autocomplete_Service');
 	}
 
 	/**
@@ -59,11 +59,11 @@ 
 	 *
 	 * @return array $response The API response.
 	 */
-	public function make_request( $query ) {
-		$url = $this->build_request_url( $query );
+	public function make_request($query) {
+		$url = $this->build_request_url($query);
 
 		// Make request.
-		$response = wp_remote_get( $url );
+		$response = wp_remote_get($url);
 
 		// Return the response.
 		return $response;
@@ -78,7 +78,7 @@ 
 	 *
 	 * @return string Built url.
 	 */
-	private function build_request_url( $query ) {
+	private function build_request_url($query) {
 		$args = array(
 			'key'      => $this->configuration_service->get_key(),
 			'language' => $this->configuration_service->get_language_code(),
@@ -88,7 +88,7 @@ 
 
 		// Add args to URL.
 		$request_url = add_query_arg(
-			urlencode_deep( $args ),
+			urlencode_deep($args),
 			$this->configuration_service->get_autocomplete_url()
 		);
 

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

Indentation +63 added lines, -63 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -21,75 +21,75 @@ 
  */
 class Wordlift_Autocomplete_Adapter {
 
-	/**
-	 * The {@link Wordlift_Autocomplete_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Autocomplete_Service $configuration_service The {@link Wordlift_Autocomplete_Service} instance.
-	 */
-	private $autocomplete_service;
+    /**
+     * The {@link Wordlift_Autocomplete_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Autocomplete_Service $configuration_service The {@link Wordlift_Autocomplete_Service} instance.
+     */
+    private $autocomplete_service;
 
 
-	/**
-	 * Wordlift_Autocomplete_Adapter constructor.
-	 *
-	 * @since 3.14.2
-	 *
-	 * @param \Wordlift_Autocomplete_Service $autocomplete_service The {@link Wordlift_Autocomplete_Service} instance.
-	 */
-	public function __construct( $autocomplete_service ) {
-		$this->autocomplete_service = $autocomplete_service;
-	}
+    /**
+     * Wordlift_Autocomplete_Adapter constructor.
+     *
+     * @since 3.14.2
+     *
+     * @param \Wordlift_Autocomplete_Service $autocomplete_service The {@link Wordlift_Autocomplete_Service} instance.
+     */
+    public function __construct( $autocomplete_service ) {
+        $this->autocomplete_service = $autocomplete_service;
+    }
 
-	/**
-	 * Handle the autocomplete ajax request.
-	 *
-	 * @since 3.15.0
-	 */
-	public function wl_autocomplete() {
-		if (
-			! isset( $_REQUEST['_wpnonce'] ) || // Input var okay.
-			! wp_verify_nonce( sanitize_key( $_REQUEST['_wpnonce'] ), 'wordlift_autocomplete' ) // Input var okay.
-		) {
-			wp_send_json_error( array(
-				'message' => __( 'Nonce field doesn\'t match.', 'wordlift' ),
-			) );
-		}
+    /**
+     * Handle the autocomplete ajax request.
+     *
+     * @since 3.15.0
+     */
+    public function wl_autocomplete() {
+        if (
+            ! isset( $_REQUEST['_wpnonce'] ) || // Input var okay.
+            ! wp_verify_nonce( sanitize_key( $_REQUEST['_wpnonce'] ), 'wordlift_autocomplete' ) // Input var okay.
+        ) {
+            wp_send_json_error( array(
+                'message' => __( 'Nonce field doesn\'t match.', 'wordlift' ),
+            ) );
+        }
 
-		// 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' ),
-			) );
-		}
+        // 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' ),
+            ) );
+        }
 
-		// Make request.
-		$response = $this->autocomplete_service->make_request( $query );
+        // Make request.
+        $response = $this->autocomplete_service->make_request( $query );
 
-		// Clear any buffer.
-		ob_clean();
+        // Clear any buffer.
+        ob_clean();
 
-		// If the response is valid, then send the suggestions.
-		if ( ! is_wp_error( $response ) && 200 === (int) $response['response']['code'] ) {
-			// Echo the response.
-			wp_send_json_success( json_decode( wp_remote_retrieve_body( $response ), true ) );
-		} else {
-			// Default error message.
-			$error_message = 'Something went wrong.';
+        // If the response is valid, then send the suggestions.
+        if ( ! is_wp_error( $response ) && 200 === (int) $response['response']['code'] ) {
+            // Echo the response.
+            wp_send_json_success( json_decode( wp_remote_retrieve_body( $response ), true ) );
+        } else {
+            // Default error message.
+            $error_message = 'Something went wrong.';
 
-			// Get the real error message if there is WP_Error.
-			if ( is_wp_error( $response ) ) {
-				$error_message = $response->get_error_message();
-			}
+            // Get the real error message if there is WP_Error.
+            if ( is_wp_error( $response ) ) {
+                $error_message = $response->get_error_message();
+            }
 
-			// There is an error, so send error message.
-			wp_send_json_error( array(
-				/* translators: Placeholders: %s - the error message that will be returned. */
-				'message' => sprintf( esc_html__( 'Error: %s', 'wordlift' ), $error_message ),
-			) );
-		}
-	}
+            // There is an error, so send error message.
+            wp_send_json_error( array(
+                /* translators: Placeholders: %s - the error message that will be returned. */
+                'message' => sprintf( esc_html__( 'Error: %s', 'wordlift' ), $error_message ),
+            ) );
+        }
+    }
 }

Spacing +19 added lines, -19 removed lines

@@ -10,7 +10,7 @@ 
  * @since      3.15.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -38,7 +38,7 @@ 
 	 *
 	 * @param \Wordlift_Autocomplete_Service $autocomplete_service The {@link Wordlift_Autocomplete_Service} instance.
 	 */
-	public function __construct( $autocomplete_service ) {
+	public function __construct($autocomplete_service) {
 		$this->autocomplete_service = $autocomplete_service;
 	}
 
@@ -49,47 +49,47 @@ 
 	 */
 	public function wl_autocomplete() {
 		if (
-			! isset( $_REQUEST['_wpnonce'] ) || // Input var okay.
-			! wp_verify_nonce( sanitize_key( $_REQUEST['_wpnonce'] ), 'wordlift_autocomplete' ) // Input var okay.
+			! isset($_REQUEST['_wpnonce']) || // Input var okay.
+			! wp_verify_nonce(sanitize_key($_REQUEST['_wpnonce']), 'wordlift_autocomplete') // Input var okay.
 		) {
-			wp_send_json_error( array(
-				'message' => __( 'Nonce field doesn\'t match.', 'wordlift' ),
-			) );
+			wp_send_json_error(array(
+				'message' => __('Nonce field doesn\'t match.', 'wordlift'),
+			));
 		}
 
 		// 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'),
+			));
 		}
 
 		// Make request.
-		$response = $this->autocomplete_service->make_request( $query );
+		$response = $this->autocomplete_service->make_request($query);
 
 		// Clear any buffer.
 		ob_clean();
 
 		// If the response is valid, then send the suggestions.
-		if ( ! is_wp_error( $response ) && 200 === (int) $response['response']['code'] ) {
+		if ( ! is_wp_error($response) && 200 === (int) $response['response']['code']) {
 			// Echo the response.
-			wp_send_json_success( json_decode( wp_remote_retrieve_body( $response ), true ) );
+			wp_send_json_success(json_decode(wp_remote_retrieve_body($response), true));
 		} else {
 			// Default error message.
 			$error_message = 'Something went wrong.';
 
 			// Get the real error message if there is WP_Error.
-			if ( is_wp_error( $response ) ) {
+			if (is_wp_error($response)) {
 				$error_message = $response->get_error_message();
 			}
 
 			// There is an error, so send error message.
-			wp_send_json_error( array(
+			wp_send_json_error(array(
 				/* translators: Placeholders: %s - the error message that will be returned. */
-				'message' => sprintf( esc_html__( 'Error: %s', 'wordlift' ), $error_message ),
-			) );
+				'message' => sprintf(esc_html__('Error: %s', 'wordlift'), $error_message),
+			));
 		}
 	}
 }

src/includes/class-wordlift-sanitizer.php

Indentation +18 added lines, -18 removed lines

@@ -4,26 +4,26 @@
  */
 class Wordlift_Sanitizer {
 
-	/**
-	 * Only accept URIs
-	 *
-	 * @param string $value
-	 *
-	 * @return null
-	 */
-	public static function sanitize_url( $value ) {
+    /**
+     * Only accept URIs
+     *
+     * @param string $value
+     *
+     * @return null
+     */
+    public static function sanitize_url( $value ) {
 
-		// Initially this function used also filter_var( $value, FILTER_VALIDATE_URL )
-		// but URLs with UTF-8 characters are not valid. We store those anyway in the DB as it's up to the browser
-		// to do proper url encoding when requesting the URL.
-		//
-		// see also http://stackoverflow.com/questions/2137080/php-filter-var-filter-validate-url
+        // Initially this function used also filter_var( $value, FILTER_VALIDATE_URL )
+        // but URLs with UTF-8 characters are not valid. We store those anyway in the DB as it's up to the browser
+        // to do proper url encoding when requesting the URL.
+        //
+        // see also http://stackoverflow.com/questions/2137080/php-filter-var-filter-validate-url
 
-		if ( ! is_null( $value ) && $value !== '' ) {
-			return $value;
-		}
+        if ( ! is_null( $value ) && $value !== '' ) {
+            return $value;
+        }
 
-		return null;
-	}
+        return null;
+    }
 
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 	 *
 	 * @return null
 	 */
-	public static function sanitize_url( $value ) {
+	public static function sanitize_url($value) {
 
 		// Initially this function used also filter_var( $value, FILTER_VALIDATE_URL )
 		// but URLs with UTF-8 characters are not valid. We store those anyway in the DB as it's up to the browser
@@ -19,7 +19,7 @@ 
 		//
 		// see also http://stackoverflow.com/questions/2137080/php-filter-var-filter-validate-url
 
-		if ( ! is_null( $value ) && $value !== '' ) {
+		if ( ! is_null($value) && $value !== '') {
 			return $value;
 		}
 

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

Indentation +316 added lines, -316 removed lines

@@ -18,321 +18,321 @@
  */
 class Wordlift_Admin_Settings_Page extends Wordlift_Admin_Page {
 
-	/**
-	 * A singleton instance of the Notice service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_Notice_Service $instance A singleton instance of the Notice service.
-	 */
-	private static $instance;
-
-	/**
-	 * A {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * A {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * A {@link Wordlift_Admin_Input_Element} element renderer.
-	 *
-	 * @since  3.11.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.13.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;
-
-	/**
-	 * A {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Language_Select_Element $language_select_element A {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 */
-	private $language_select_element;
-
-	/**
-	 * A {@link Wordlift_Admin_Publisher_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Publisher_Element $publisher_element A {@link Wordlift_Admin_Publisher_Element} element renderer.
-	 */
-	private $publisher_element;
-
-	/**
-	 * Create a {@link Wordlift_Admin_Settings_Page} instance.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param \Wordlift_Configuration_Service         $configuration_service
-	 * @param \Wordlift_Entity_Service                $entity_service
-	 * @param \Wordlift_Admin_Input_Element           $input_element
-	 * @param \Wordlift_Admin_Language_Select_Element $language_select_element
-	 * @param \Wordlift_Admin_Publisher_Element       $publisher_element
-	 * @param \Wordlift_Admin_Radio_Input_Element     $radio_input_element
-	 */
-	function __construct( $configuration_service, $entity_service, $input_element, $language_select_element, $publisher_element, $radio_input_element ) {
-
-		$this->configuration_service = $configuration_service;
-		$this->entity_service        = $entity_service;
-
-		// Set a reference to the UI elements.
-		$this->input_element           = $input_element;
-		$this->radio_input_element     = $radio_input_element;
-		$this->language_select_element = $language_select_element;
-		$this->publisher_element       = $publisher_element;
-
-		self::$instance = $this;
-	}
-
-	/**
-	 * Get the singleton instance of the Notice service.
-	 *
-	 * @since 3.14.0
-	 * @return \Wordlift_Admin_Settings_Page The singleton instance of the settings page service.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_parent_slug() {
-
-		return 'wl_admin_menu';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_capability() {
-
-		return 'manage_options';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_page_title() {
-
-		return 'WorldLift Settings';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_menu_title() {
-
-		return 'Settings';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_menu_slug() {
-
-		return 'wl_configuration_admin_menu';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_partial_name() {
-
-		return 'wordlift-admin-settings-page.php';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function enqueue_scripts() {
-
-		// Enqueue the media scripts to be used for the publisher's logo selection.
-		wp_enqueue_media();
-
-		// JavaScript required for the settings page.
-		// @todo: try to move to the `wordlift-admin.bundle.js`.
-		wp_enqueue_script( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/settings.js', array( 'wp-util' ) );
-
-	}
-
-	/**
-	 * Configure all the configuration parameters.
-	 *
-	 * Called by the *admin_init* hook.
-	 *
-	 * @since 3.11.0
-	 */
-	function admin_init() {
-
-		// Register WordLift's general settings, providing our own sanitize callback
-		// which will also check whether the user filled the WL Publisher form.
-		register_setting(
-			'wl_general_settings',
-			'wl_general_settings',
-			array( $this, 'sanitize_callback', )
-		);
-
-		// Add the general settings section.
-		add_settings_section(
-			'wl_general_settings_section', // ID used to identify this section and with which to register options.
-			'',                            // Section header.
-			'',                            // Callback used to render the description of the section.
-			'wl_general_settings'          // Page on which to add this section of options.
-		);
-
-		$key_args = array(
-			'id'          => 'wl-key',
-			'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::KEY . ']',
-			'value'       => $this->configuration_service->get_key(),
-			'description' => __( 'Insert the <a href="https://www.wordlift.io/blogger">WordLift Key</a> you received via email.', 'wordlift' ),
-		);
-
-		// Set the class for the key field based on the validity of the key.
-		// Class should be "untouched" for an empty (virgin) value, "valid"
-		// if the key is valid, or "invalid" otherwise.
-		$validation_service = new Wordlift_Key_Validation_Service( $this->configuration_service );
-
-		if ( empty( $key_args['value'] ) ) {
-			$key_args['css_class'] = 'untouched';
-		} elseif ( $validation_service->is_valid( $key_args['value'] ) ) {
-			$key_args['css_class'] = 'valid';
-		} else {
-			$key_args['css_class'] = 'invalid';
-		}
-
-		// Add the `key` field.
-		add_settings_field(
-			'wl-key',                                       // Element id used to identify the field throughout the theme.
-			_x( 'WordLift Key', 'wordlift' ),               // The label to the left of the option interface element.
-			// The name of the function responsible for rendering the option interface.
-			array( $this->input_element, 'render', ),
-			'wl_general_settings',                          // The page on which this option will be displayed.
-			'wl_general_settings_section',                  // The name of the section to which this field belongs.
-			$key_args                                       // The array of arguments to pass to the callback. In this case, just a description.
-		);
-
-		// Entity Base Path input.
-		$entity_base_path_args = array(
-			// The array of arguments to pass to the callback. In this case, just a description.
-			'id'          => 'wl-entity-base-path',
-			'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::ENTITY_BASE_PATH_KEY . ']',
-			'value'       => $this->configuration_service->get_entity_base_path(),
-			'description' => sprintf( _x( 'All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field above. Check our <a href="%s">FAQs</a> if you need more info.', 'wordlift' ), 'https://wordlift.io/wordlift-user-faqs/#10-why-and-how-should-i-customize-the-url-of-the-entity-pages-created-in-my-vocabulary' ),
-		);
-
-		$entity_base_path_args['readonly'] = 0 < $this->entity_service->count();
-
-		// Add the `wl_entity_base_path` field.
-		add_settings_field(
-			'wl-entity-base-path',                                // ID used to identify the field throughout the theme
-			_x( 'Entity Base Path', 'wordlift' ),                 // The label to the left of the option interface element
-			// The name of the function responsible for rendering the option interface
-			array( $this->input_element, 'render', ),
-			'wl_general_settings',                                // The page on which this option will be displayed
-			'wl_general_settings_section',                        // The name of the section to which this field belongs
-			$entity_base_path_args
-		);
-
-		// Add the `language_name` field.
-		add_settings_field(
-			'wl-site-language',
-			_x( 'Site Language', 'wordlift' ),
-			array( $this->language_select_element, 'render' ),
-			'wl_general_settings',
-			'wl_general_settings_section',
-			array(
-				// The array of arguments to pass to the callback. In this case, just a description.
-				'id'          => 'wl-site-language',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LANGUAGE . ']',
-				'value'       => $this->configuration_service->get_language_code(),
-				'description' => __( 'Each WordLift Key can be used only in one language. Pick yours.', 'wordlift' ),
-			)
-		);
-
-		// Add the `publisher` field.
-		add_settings_field(
-			'wl-publisher-id',
-			_x( 'Publisher', 'wordlift' ),
-			array( $this->publisher_element, 'render' ),
-			'wl_general_settings',
-			'wl_general_settings_section',
-			array(
-				'id'   => 'wl-publisher-id',
-				'name' => 'wl_general_settings[' . Wordlift_Configuration_Service::PUBLISHER_ID . ']',
-			)
-		);
-
-		// Add the `link by default` field.
-		add_settings_field(
-			'wl-link-by-default',
-			_x( 'Link by Default', 'wordlift' ),
-			array( $this->radio_input_element, 'render' ),
-			'wl_general_settings',
-			'wl_general_settings_section',
-			array(
-				'id'          => 'wl-link-by-default',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LINK_BY_DEFAULT . ']',
-				'value'       => $this->configuration_service->is_link_by_default() ? 'yes' : 'no',
-				'description' => _x( 'Whether to link entities by default or not. This setting applies to all the entities.', 'wordlift' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Sanitize the configuration settings to be stored.
-	 *
-	 * If a new entity is being created for the publisher, create it and set The
-	 * publisher setting.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param array $input The configuration settings array.
-	 *
-	 * @return array The sanitized input array.
-	 */
-	function sanitize_callback( $input ) {
-
-		// Check whether a publisher name has been set.
-		if ( isset( $_POST['wl_publisher'] ) && ! empty( $_POST['wl_publisher']['name'] ) ) {
-			$name         = $_POST['wl_publisher']['name'];
-			$type         = $_POST['wl_publisher']['type'];
-			$thumbnail_id = $_POST['wl_publisher']['thumbnail_id'] ?: null;
-
-			// Set the type URI, either http://schema.org/Person or http://schema.org/Organization.
-			$type_uri = sprintf( 'http://schema.org/%s', 'organization' === $type ? 'Organization' : 'Person' );
-
-			// Create an entity for the publisher and assign it to the input
-			// parameter which WordPress automatically saves into the settings.
-			$input['publisher_id'] = $this->entity_service->create( $name, $type_uri, $thumbnail_id, 'publish' );
-		}
-
-		return $input;
-	}
+    /**
+     * A singleton instance of the Notice service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_Notice_Service $instance A singleton instance of the Notice service.
+     */
+    private static $instance;
+
+    /**
+     * A {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     * A {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * A {@link Wordlift_Admin_Input_Element} element renderer.
+     *
+     * @since  3.11.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.13.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;
+
+    /**
+     * A {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Language_Select_Element $language_select_element A {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     */
+    private $language_select_element;
+
+    /**
+     * A {@link Wordlift_Admin_Publisher_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Publisher_Element $publisher_element A {@link Wordlift_Admin_Publisher_Element} element renderer.
+     */
+    private $publisher_element;
+
+    /**
+     * Create a {@link Wordlift_Admin_Settings_Page} instance.
+     *
+     * @since 3.11.0
+     *
+     * @param \Wordlift_Configuration_Service         $configuration_service
+     * @param \Wordlift_Entity_Service                $entity_service
+     * @param \Wordlift_Admin_Input_Element           $input_element
+     * @param \Wordlift_Admin_Language_Select_Element $language_select_element
+     * @param \Wordlift_Admin_Publisher_Element       $publisher_element
+     * @param \Wordlift_Admin_Radio_Input_Element     $radio_input_element
+     */
+    function __construct( $configuration_service, $entity_service, $input_element, $language_select_element, $publisher_element, $radio_input_element ) {
+
+        $this->configuration_service = $configuration_service;
+        $this->entity_service        = $entity_service;
+
+        // Set a reference to the UI elements.
+        $this->input_element           = $input_element;
+        $this->radio_input_element     = $radio_input_element;
+        $this->language_select_element = $language_select_element;
+        $this->publisher_element       = $publisher_element;
+
+        self::$instance = $this;
+    }
+
+    /**
+     * Get the singleton instance of the Notice service.
+     *
+     * @since 3.14.0
+     * @return \Wordlift_Admin_Settings_Page The singleton instance of the settings page service.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_parent_slug() {
+
+        return 'wl_admin_menu';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_capability() {
+
+        return 'manage_options';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_page_title() {
+
+        return 'WorldLift Settings';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_menu_title() {
+
+        return 'Settings';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_menu_slug() {
+
+        return 'wl_configuration_admin_menu';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_partial_name() {
+
+        return 'wordlift-admin-settings-page.php';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function enqueue_scripts() {
+
+        // Enqueue the media scripts to be used for the publisher's logo selection.
+        wp_enqueue_media();
+
+        // JavaScript required for the settings page.
+        // @todo: try to move to the `wordlift-admin.bundle.js`.
+        wp_enqueue_script( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/settings.js', array( 'wp-util' ) );
+
+    }
+
+    /**
+     * Configure all the configuration parameters.
+     *
+     * Called by the *admin_init* hook.
+     *
+     * @since 3.11.0
+     */
+    function admin_init() {
+
+        // Register WordLift's general settings, providing our own sanitize callback
+        // which will also check whether the user filled the WL Publisher form.
+        register_setting(
+            'wl_general_settings',
+            'wl_general_settings',
+            array( $this, 'sanitize_callback', )
+        );
+
+        // Add the general settings section.
+        add_settings_section(
+            'wl_general_settings_section', // ID used to identify this section and with which to register options.
+            '',                            // Section header.
+            '',                            // Callback used to render the description of the section.
+            'wl_general_settings'          // Page on which to add this section of options.
+        );
+
+        $key_args = array(
+            'id'          => 'wl-key',
+            'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::KEY . ']',
+            'value'       => $this->configuration_service->get_key(),
+            'description' => __( 'Insert the <a href="https://www.wordlift.io/blogger">WordLift Key</a> you received via email.', 'wordlift' ),
+        );
+
+        // Set the class for the key field based on the validity of the key.
+        // Class should be "untouched" for an empty (virgin) value, "valid"
+        // if the key is valid, or "invalid" otherwise.
+        $validation_service = new Wordlift_Key_Validation_Service( $this->configuration_service );
+
+        if ( empty( $key_args['value'] ) ) {
+            $key_args['css_class'] = 'untouched';
+        } elseif ( $validation_service->is_valid( $key_args['value'] ) ) {
+            $key_args['css_class'] = 'valid';
+        } else {
+            $key_args['css_class'] = 'invalid';
+        }
+
+        // Add the `key` field.
+        add_settings_field(
+            'wl-key',                                       // Element id used to identify the field throughout the theme.
+            _x( 'WordLift Key', 'wordlift' ),               // The label to the left of the option interface element.
+            // The name of the function responsible for rendering the option interface.
+            array( $this->input_element, 'render', ),
+            'wl_general_settings',                          // The page on which this option will be displayed.
+            'wl_general_settings_section',                  // The name of the section to which this field belongs.
+            $key_args                                       // The array of arguments to pass to the callback. In this case, just a description.
+        );
+
+        // Entity Base Path input.
+        $entity_base_path_args = array(
+            // The array of arguments to pass to the callback. In this case, just a description.
+            'id'          => 'wl-entity-base-path',
+            'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::ENTITY_BASE_PATH_KEY . ']',
+            'value'       => $this->configuration_service->get_entity_base_path(),
+            'description' => sprintf( _x( 'All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field above. Check our <a href="%s">FAQs</a> if you need more info.', 'wordlift' ), 'https://wordlift.io/wordlift-user-faqs/#10-why-and-how-should-i-customize-the-url-of-the-entity-pages-created-in-my-vocabulary' ),
+        );
+
+        $entity_base_path_args['readonly'] = 0 < $this->entity_service->count();
+
+        // Add the `wl_entity_base_path` field.
+        add_settings_field(
+            'wl-entity-base-path',                                // ID used to identify the field throughout the theme
+            _x( 'Entity Base Path', 'wordlift' ),                 // The label to the left of the option interface element
+            // The name of the function responsible for rendering the option interface
+            array( $this->input_element, 'render', ),
+            'wl_general_settings',                                // The page on which this option will be displayed
+            'wl_general_settings_section',                        // The name of the section to which this field belongs
+            $entity_base_path_args
+        );
+
+        // Add the `language_name` field.
+        add_settings_field(
+            'wl-site-language',
+            _x( 'Site Language', 'wordlift' ),
+            array( $this->language_select_element, 'render' ),
+            'wl_general_settings',
+            'wl_general_settings_section',
+            array(
+                // The array of arguments to pass to the callback. In this case, just a description.
+                'id'          => 'wl-site-language',
+                'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LANGUAGE . ']',
+                'value'       => $this->configuration_service->get_language_code(),
+                'description' => __( 'Each WordLift Key can be used only in one language. Pick yours.', 'wordlift' ),
+            )
+        );
+
+        // Add the `publisher` field.
+        add_settings_field(
+            'wl-publisher-id',
+            _x( 'Publisher', 'wordlift' ),
+            array( $this->publisher_element, 'render' ),
+            'wl_general_settings',
+            'wl_general_settings_section',
+            array(
+                'id'   => 'wl-publisher-id',
+                'name' => 'wl_general_settings[' . Wordlift_Configuration_Service::PUBLISHER_ID . ']',
+            )
+        );
+
+        // Add the `link by default` field.
+        add_settings_field(
+            'wl-link-by-default',
+            _x( 'Link by Default', 'wordlift' ),
+            array( $this->radio_input_element, 'render' ),
+            'wl_general_settings',
+            'wl_general_settings_section',
+            array(
+                'id'          => 'wl-link-by-default',
+                'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LINK_BY_DEFAULT . ']',
+                'value'       => $this->configuration_service->is_link_by_default() ? 'yes' : 'no',
+                'description' => _x( 'Whether to link entities by default or not. This setting applies to all the entities.', 'wordlift' ),
+            )
+        );
+
+    }
+
+    /**
+     * Sanitize the configuration settings to be stored.
+     *
+     * If a new entity is being created for the publisher, create it and set The
+     * publisher setting.
+     *
+     * @since 3.11.0
+     *
+     * @param array $input The configuration settings array.
+     *
+     * @return array The sanitized input array.
+     */
+    function sanitize_callback( $input ) {
+
+        // Check whether a publisher name has been set.
+        if ( isset( $_POST['wl_publisher'] ) && ! empty( $_POST['wl_publisher']['name'] ) ) {
+            $name         = $_POST['wl_publisher']['name'];
+            $type         = $_POST['wl_publisher']['type'];
+            $thumbnail_id = $_POST['wl_publisher']['thumbnail_id'] ?: null;
+
+            // Set the type URI, either http://schema.org/Person or http://schema.org/Organization.
+            $type_uri = sprintf( 'http://schema.org/%s', 'organization' === $type ? 'Organization' : 'Person' );
+
+            // Create an entity for the publisher and assign it to the input
+            // parameter which WordPress automatically saves into the settings.
+            $input['publisher_id'] = $this->entity_service->create( $name, $type_uri, $thumbnail_id, 'publish' );
+        }
+
+        return $input;
+    }
 
 }

Spacing +37 added lines, -37 removed lines

@@ -93,7 +93,7 @@ 
 	 * @param \Wordlift_Admin_Publisher_Element       $publisher_element
 	 * @param \Wordlift_Admin_Radio_Input_Element     $radio_input_element
 	 */
-	function __construct( $configuration_service, $entity_service, $input_element, $language_select_element, $publisher_element, $radio_input_element ) {
+	function __construct($configuration_service, $entity_service, $input_element, $language_select_element, $publisher_element, $radio_input_element) {
 
 		$this->configuration_service = $configuration_service;
 		$this->entity_service        = $entity_service;
@@ -176,7 +176,7 @@ 
 
 		// JavaScript required for the settings page.
 		// @todo: try to move to the `wordlift-admin.bundle.js`.
-		wp_enqueue_script( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/settings.js', array( 'wp-util' ) );
+		wp_enqueue_script('wordlift-admin-settings-page', plugin_dir_url(dirname(__FILE__)).'admin/js/1/settings.js', array('wp-util'));
 
 	}
 
@@ -194,32 +194,32 @@ 
 		register_setting(
 			'wl_general_settings',
 			'wl_general_settings',
-			array( $this, 'sanitize_callback', )
+			array($this, 'sanitize_callback',)
 		);
 
 		// Add the general settings section.
 		add_settings_section(
 			'wl_general_settings_section', // ID used to identify this section and with which to register options.
-			'',                            // Section header.
-			'',                            // Callback used to render the description of the section.
+			'', // Section header.
+			'', // Callback used to render the description of the section.
 			'wl_general_settings'          // Page on which to add this section of options.
 		);
 
 		$key_args = array(
 			'id'          => 'wl-key',
-			'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::KEY . ']',
+			'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::KEY.']',
 			'value'       => $this->configuration_service->get_key(),
-			'description' => __( 'Insert the <a href="https://www.wordlift.io/blogger">WordLift Key</a> you received via email.', 'wordlift' ),
+			'description' => __('Insert the <a href="https://www.wordlift.io/blogger">WordLift Key</a> you received via email.', 'wordlift'),
 		);
 
 		// Set the class for the key field based on the validity of the key.
 		// Class should be "untouched" for an empty (virgin) value, "valid"
 		// if the key is valid, or "invalid" otherwise.
-		$validation_service = new Wordlift_Key_Validation_Service( $this->configuration_service );
+		$validation_service = new Wordlift_Key_Validation_Service($this->configuration_service);
 
-		if ( empty( $key_args['value'] ) ) {
+		if (empty($key_args['value'])) {
 			$key_args['css_class'] = 'untouched';
-		} elseif ( $validation_service->is_valid( $key_args['value'] ) ) {
+		} elseif ($validation_service->is_valid($key_args['value'])) {
 			$key_args['css_class'] = 'valid';
 		} else {
 			$key_args['css_class'] = 'invalid';
@@ -227,12 +227,12 @@ 
 
 		// Add the `key` field.
 		add_settings_field(
-			'wl-key',                                       // Element id used to identify the field throughout the theme.
-			_x( 'WordLift Key', 'wordlift' ),               // The label to the left of the option interface element.
+			'wl-key', // Element id used to identify the field throughout the theme.
+			_x('WordLift Key', 'wordlift'), // The label to the left of the option interface element.
 			// The name of the function responsible for rendering the option interface.
-			array( $this->input_element, 'render', ),
-			'wl_general_settings',                          // The page on which this option will be displayed.
-			'wl_general_settings_section',                  // The name of the section to which this field belongs.
+			array($this->input_element, 'render',),
+			'wl_general_settings', // The page on which this option will be displayed.
+			'wl_general_settings_section', // The name of the section to which this field belongs.
 			$key_args                                       // The array of arguments to pass to the callback. In this case, just a description.
 		);
 
@@ -240,65 +240,65 @@ 
 		$entity_base_path_args = array(
 			// The array of arguments to pass to the callback. In this case, just a description.
 			'id'          => 'wl-entity-base-path',
-			'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::ENTITY_BASE_PATH_KEY . ']',
+			'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::ENTITY_BASE_PATH_KEY.']',
 			'value'       => $this->configuration_service->get_entity_base_path(),
-			'description' => sprintf( _x( 'All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field above. Check our <a href="%s">FAQs</a> if you need more info.', 'wordlift' ), 'https://wordlift.io/wordlift-user-faqs/#10-why-and-how-should-i-customize-the-url-of-the-entity-pages-created-in-my-vocabulary' ),
+			'description' => sprintf(_x('All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field above. Check our <a href="%s">FAQs</a> if you need more info.', 'wordlift'), 'https://wordlift.io/wordlift-user-faqs/#10-why-and-how-should-i-customize-the-url-of-the-entity-pages-created-in-my-vocabulary'),
 		);
 
 		$entity_base_path_args['readonly'] = 0 < $this->entity_service->count();
 
 		// Add the `wl_entity_base_path` field.
 		add_settings_field(
-			'wl-entity-base-path',                                // ID used to identify the field throughout the theme
-			_x( 'Entity Base Path', 'wordlift' ),                 // The label to the left of the option interface element
+			'wl-entity-base-path', // ID used to identify the field throughout the theme
+			_x('Entity Base Path', 'wordlift'), // The label to the left of the option interface element
 			// The name of the function responsible for rendering the option interface
-			array( $this->input_element, 'render', ),
-			'wl_general_settings',                                // The page on which this option will be displayed
-			'wl_general_settings_section',                        // The name of the section to which this field belongs
+			array($this->input_element, 'render',),
+			'wl_general_settings', // The page on which this option will be displayed
+			'wl_general_settings_section', // The name of the section to which this field belongs
 			$entity_base_path_args
 		);
 
 		// Add the `language_name` field.
 		add_settings_field(
 			'wl-site-language',
-			_x( 'Site Language', 'wordlift' ),
-			array( $this->language_select_element, 'render' ),
+			_x('Site Language', 'wordlift'),
+			array($this->language_select_element, 'render'),
 			'wl_general_settings',
 			'wl_general_settings_section',
 			array(
 				// The array of arguments to pass to the callback. In this case, just a description.
 				'id'          => 'wl-site-language',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LANGUAGE . ']',
+				'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::LANGUAGE.']',
 				'value'       => $this->configuration_service->get_language_code(),
-				'description' => __( 'Each WordLift Key can be used only in one language. Pick yours.', 'wordlift' ),
+				'description' => __('Each WordLift Key can be used only in one language. Pick yours.', 'wordlift'),
 			)
 		);
 
 		// Add the `publisher` field.
 		add_settings_field(
 			'wl-publisher-id',
-			_x( 'Publisher', 'wordlift' ),
-			array( $this->publisher_element, 'render' ),
+			_x('Publisher', 'wordlift'),
+			array($this->publisher_element, 'render'),
 			'wl_general_settings',
 			'wl_general_settings_section',
 			array(
 				'id'   => 'wl-publisher-id',
-				'name' => 'wl_general_settings[' . Wordlift_Configuration_Service::PUBLISHER_ID . ']',
+				'name' => 'wl_general_settings['.Wordlift_Configuration_Service::PUBLISHER_ID.']',
 			)
 		);
 
 		// Add the `link by default` field.
 		add_settings_field(
 			'wl-link-by-default',
-			_x( 'Link by Default', 'wordlift' ),
-			array( $this->radio_input_element, 'render' ),
+			_x('Link by Default', 'wordlift'),
+			array($this->radio_input_element, 'render'),
 			'wl_general_settings',
 			'wl_general_settings_section',
 			array(
 				'id'          => 'wl-link-by-default',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LINK_BY_DEFAULT . ']',
+				'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::LINK_BY_DEFAULT.']',
 				'value'       => $this->configuration_service->is_link_by_default() ? 'yes' : 'no',
-				'description' => _x( 'Whether to link entities by default or not. This setting applies to all the entities.', 'wordlift' ),
+				'description' => _x('Whether to link entities by default or not. This setting applies to all the entities.', 'wordlift'),
 			)
 		);
 
@@ -316,20 +316,20 @@ 
 	 *
 	 * @return array The sanitized input array.
 	 */
-	function sanitize_callback( $input ) {
+	function sanitize_callback($input) {
 
 		// Check whether a publisher name has been set.
-		if ( isset( $_POST['wl_publisher'] ) && ! empty( $_POST['wl_publisher']['name'] ) ) {
+		if (isset($_POST['wl_publisher']) && ! empty($_POST['wl_publisher']['name'])) {
 			$name         = $_POST['wl_publisher']['name'];
 			$type         = $_POST['wl_publisher']['type'];
 			$thumbnail_id = $_POST['wl_publisher']['thumbnail_id'] ?: null;
 
 			// Set the type URI, either http://schema.org/Person or http://schema.org/Organization.
-			$type_uri = sprintf( 'http://schema.org/%s', 'organization' === $type ? 'Organization' : 'Person' );
+			$type_uri = sprintf('http://schema.org/%s', 'organization' === $type ? 'Organization' : 'Person');
 
 			// Create an entity for the publisher and assign it to the input
 			// parameter which WordPress automatically saves into the settings.
-			$input['publisher_id'] = $this->entity_service->create( $name, $type_uri, $thumbnail_id, 'publish' );
+			$input['publisher_id'] = $this->entity_service->create($name, $type_uri, $thumbnail_id, 'publish');
 		}
 
 		return $input;

src/admin/class-wordlift-admin.php

Indentation +158 added lines, -158 removed lines

@@ -22,163 +22,163 @@
  */
 class Wordlift_Admin {
 
-	/**
-	 * The ID of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $plugin_name The ID of this plugin.
-	 */
-	private $plugin_name;
-
-	/**
-	 * The version of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $version The current version of this plugin.
-	 */
-	private $version;
-
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * The {@link Wordlift_User_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
-	 */
-	private $user_service;
-
-	/**
-	 * Initialize the class and set its properties.
-	 *
-	 * @since  1.0.0
-	 *
-	 * @param string                          $plugin_name           The name of this plugin.
-	 * @param string                          $version               The version of this plugin.
-	 * @param \Wordlift_Configuration_Service $configuration_service The configuration service.
-	 * @param \Wordlift_Notice_Service        $notice_service        The notice service.
-	 * @param \Wordlift_User_Service          $user_service          The {@link Wordlift_User_Service} instance.
-	 */
-	public function __construct( $plugin_name, $version, $configuration_service, $notice_service, $user_service ) {
-
-		$this->plugin_name = $plugin_name;
-		$this->version     = $version;
-
-		$this->configuration_service = $configuration_service;
-		$this->user_service          = $user_service;
-
-		$dataset_uri = $configuration_service->get_dataset_uri();
-		$key         = $configuration_service->get_key();
-
-		if ( empty( $dataset_uri ) ) {
-			$settings_page = Wordlift_Admin_Settings_Page::get_instance();
-			if ( empty( $key ) ) {
-				$error = sprintf( esc_html__( "WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
-			} else {
-				$error = sprintf( esc_html__( "WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
-			}
-			$notice_service->add_error( $error );
-		}
-
-	}
-
-	/**
-	 * Register the stylesheets for the admin area.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_styles() {
-
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
-
-	}
-
-	/**
-	 * Register the JavaScript for the admin area.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_scripts() {
-
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		// Enqueue the admin scripts.
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/1/admin.js', array(
-			'jquery',
-			'underscore',
-			'backbone',
-		), $this->version, false );
-
-		// Set the basic params.
-		$params = array(
-			// @todo scripts in admin should use wp.post.
-			'ajax_url'              => admin_url( 'admin-ajax.php' ),
-			// @todo remove specific actions from settings.
-			'action'                => 'entity_by_title',
-			'datasetUri'            => $this->configuration_service->get_dataset_uri(),
-			'language'              => $this->configuration_service->get_language_code(),
-			'link_by_default'       => $this->configuration_service->is_link_by_default(),
-			// Whether the current user is allowed to create new entities.
-			//
-			// @see https://github.com/insideout10/wordlift-plugin/issues/561
-			'can_create_entities'   => current_user_can( 'edit_wordlift_entities' ) ? 'yes' : 'no',
-			'l10n'                  => array(
-				'You already published an entity with the same name' => __( 'You already published an entity with the same name: ', 'wordlift' ),
-				'logo_selection_title'                               => __( 'WordLift Choose Logo', 'wordlift' ),
-				'logo_selection_button'                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
-			),
-			'wl_autocomplete_nonce' => wp_create_nonce( 'wordlift_autocomplete' ),
-		);
-
-		// Set post-related values if there's a current post.
-		if ( null !== $post = $entity_being_edited = get_post() ) {
-
-			$params['post_id']           = $entity_being_edited->ID;
-			$entity_service              = Wordlift_Entity_Service::get_instance();
-			$params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_service->is_entity( $post->ID ) && is_numeric( get_the_ID() );
-			// We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
-			// from the results, since we don't want the current entity to be discovered by the analysis.
-			//
-			// See https://github.com/insideout10/wordlift-plugin/issues/345
-			$params['itemId'] = $entity_service->get_uri( $entity_being_edited->ID );
-
-		}
-
-		// Finally output the params as `wlSettings` for JavaScript code.
-		wp_localize_script( $this->plugin_name, 'wlSettings', $params );
-
-	}
+    /**
+     * The ID of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $plugin_name The ID of this plugin.
+     */
+    private $plugin_name;
+
+    /**
+     * The version of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $version The current version of this plugin.
+     */
+    private $version;
+
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * The {@link Wordlift_User_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
+     */
+    private $user_service;
+
+    /**
+     * Initialize the class and set its properties.
+     *
+     * @since  1.0.0
+     *
+     * @param string                          $plugin_name           The name of this plugin.
+     * @param string                          $version               The version of this plugin.
+     * @param \Wordlift_Configuration_Service $configuration_service The configuration service.
+     * @param \Wordlift_Notice_Service        $notice_service        The notice service.
+     * @param \Wordlift_User_Service          $user_service          The {@link Wordlift_User_Service} instance.
+     */
+    public function __construct( $plugin_name, $version, $configuration_service, $notice_service, $user_service ) {
+
+        $this->plugin_name = $plugin_name;
+        $this->version     = $version;
+
+        $this->configuration_service = $configuration_service;
+        $this->user_service          = $user_service;
+
+        $dataset_uri = $configuration_service->get_dataset_uri();
+        $key         = $configuration_service->get_key();
+
+        if ( empty( $dataset_uri ) ) {
+            $settings_page = Wordlift_Admin_Settings_Page::get_instance();
+            if ( empty( $key ) ) {
+                $error = sprintf( esc_html__( "WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+            } else {
+                $error = sprintf( esc_html__( "WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+            }
+            $notice_service->add_error( $error );
+        }
+
+    }
+
+    /**
+     * Register the stylesheets for the admin area.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_styles() {
+
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
+
+    }
+
+    /**
+     * Register the JavaScript for the admin area.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_scripts() {
+
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        // Enqueue the admin scripts.
+        wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/1/admin.js', array(
+            'jquery',
+            'underscore',
+            'backbone',
+        ), $this->version, false );
+
+        // Set the basic params.
+        $params = array(
+            // @todo scripts in admin should use wp.post.
+            'ajax_url'              => admin_url( 'admin-ajax.php' ),
+            // @todo remove specific actions from settings.
+            'action'                => 'entity_by_title',
+            'datasetUri'            => $this->configuration_service->get_dataset_uri(),
+            'language'              => $this->configuration_service->get_language_code(),
+            'link_by_default'       => $this->configuration_service->is_link_by_default(),
+            // Whether the current user is allowed to create new entities.
+            //
+            // @see https://github.com/insideout10/wordlift-plugin/issues/561
+            'can_create_entities'   => current_user_can( 'edit_wordlift_entities' ) ? 'yes' : 'no',
+            'l10n'                  => array(
+                'You already published an entity with the same name' => __( 'You already published an entity with the same name: ', 'wordlift' ),
+                'logo_selection_title'                               => __( 'WordLift Choose Logo', 'wordlift' ),
+                'logo_selection_button'                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
+            ),
+            'wl_autocomplete_nonce' => wp_create_nonce( 'wordlift_autocomplete' ),
+        );
+
+        // Set post-related values if there's a current post.
+        if ( null !== $post = $entity_being_edited = get_post() ) {
+
+            $params['post_id']           = $entity_being_edited->ID;
+            $entity_service              = Wordlift_Entity_Service::get_instance();
+            $params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_service->is_entity( $post->ID ) && is_numeric( get_the_ID() );
+            // We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
+            // from the results, since we don't want the current entity to be discovered by the analysis.
+            //
+            // See https://github.com/insideout10/wordlift-plugin/issues/345
+            $params['itemId'] = $entity_service->get_uri( $entity_being_edited->ID );
+
+        }
+
+        // Finally output the params as `wlSettings` for JavaScript code.
+        wp_localize_script( $this->plugin_name, 'wlSettings', $params );
+
+    }
 
 }

Spacing +19 added lines, -19 removed lines

@@ -69,7 +69,7 @@ 
 	 * @param \Wordlift_Notice_Service        $notice_service        The notice service.
 	 * @param \Wordlift_User_Service          $user_service          The {@link Wordlift_User_Service} instance.
 	 */
-	public function __construct( $plugin_name, $version, $configuration_service, $notice_service, $user_service ) {
+	public function __construct($plugin_name, $version, $configuration_service, $notice_service, $user_service) {
 
 		$this->plugin_name = $plugin_name;
 		$this->version     = $version;
@@ -80,14 +80,14 @@ 
 		$dataset_uri = $configuration_service->get_dataset_uri();
 		$key         = $configuration_service->get_key();
 
-		if ( empty( $dataset_uri ) ) {
+		if (empty($dataset_uri)) {
 			$settings_page = Wordlift_Admin_Settings_Page::get_instance();
-			if ( empty( $key ) ) {
-				$error = sprintf( esc_html__( "WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+			if (empty($key)) {
+				$error = sprintf(esc_html__("WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift'), '<a href="'.$settings_page->get_url().'">'.esc_html__('settings page', 'wordlift').'</a>');
 			} else {
-				$error = sprintf( esc_html__( "WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+				$error = sprintf(esc_html__("WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift'), '<a href="'.$settings_page->get_url().'">'.esc_html__('settings page', 'wordlift').'</a>');
 			}
-			$notice_service->add_error( $error );
+			$notice_service->add_error($error);
 		}
 
 	}
@@ -111,7 +111,7 @@ 
 		 * class.
 		 */
 
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
+		wp_enqueue_style($this->plugin_name, plugin_dir_url(__FILE__).'css/wordlift-admin.css', array(), $this->version, 'all');
 
 	}
 
@@ -135,16 +135,16 @@ 
 		 */
 
 		// Enqueue the admin scripts.
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/1/admin.js', array(
+		wp_enqueue_script($this->plugin_name, plugin_dir_url(__FILE__).'js/1/admin.js', array(
 			'jquery',
 			'underscore',
 			'backbone',
-		), $this->version, false );
+		), $this->version, false);
 
 		// Set the basic params.
 		$params = array(
 			// @todo scripts in admin should use wp.post.
-			'ajax_url'              => admin_url( 'admin-ajax.php' ),
+			'ajax_url'              => admin_url('admin-ajax.php'),
 			// @todo remove specific actions from settings.
 			'action'                => 'entity_by_title',
 			'datasetUri'            => $this->configuration_service->get_dataset_uri(),
@@ -153,31 +153,31 @@ 
 			// Whether the current user is allowed to create new entities.
 			//
 			// @see https://github.com/insideout10/wordlift-plugin/issues/561
-			'can_create_entities'   => current_user_can( 'edit_wordlift_entities' ) ? 'yes' : 'no',
+			'can_create_entities'   => current_user_can('edit_wordlift_entities') ? 'yes' : 'no',
 			'l10n'                  => array(
-				'You already published an entity with the same name' => __( 'You already published an entity with the same name: ', 'wordlift' ),
-				'logo_selection_title'                               => __( 'WordLift Choose Logo', 'wordlift' ),
-				'logo_selection_button'                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
+				'You already published an entity with the same name' => __('You already published an entity with the same name: ', 'wordlift'),
+				'logo_selection_title'                               => __('WordLift Choose Logo', 'wordlift'),
+				'logo_selection_button'                              => array('text' => __('Choose Logo', 'wordlift')),
 			),
-			'wl_autocomplete_nonce' => wp_create_nonce( 'wordlift_autocomplete' ),
+			'wl_autocomplete_nonce' => wp_create_nonce('wordlift_autocomplete'),
 		);
 
 		// Set post-related values if there's a current post.
-		if ( null !== $post = $entity_being_edited = get_post() ) {
+		if (null !== $post = $entity_being_edited = get_post()) {
 
 			$params['post_id']           = $entity_being_edited->ID;
 			$entity_service              = Wordlift_Entity_Service::get_instance();
-			$params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_service->is_entity( $post->ID ) && is_numeric( get_the_ID() );
+			$params['entityBeingEdited'] = isset($entity_being_edited->post_type) && $entity_service->is_entity($post->ID) && is_numeric(get_the_ID());
 			// We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
 			// from the results, since we don't want the current entity to be discovered by the analysis.
 			//
 			// See https://github.com/insideout10/wordlift-plugin/issues/345
-			$params['itemId'] = $entity_service->get_uri( $entity_being_edited->ID );
+			$params['itemId'] = $entity_service->get_uri($entity_being_edited->ID);
 
 		}
 
 		// Finally output the params as `wlSettings` for JavaScript code.
-		wp_localize_script( $this->plugin_name, 'wlSettings', $params );
+		wp_localize_script($this->plugin_name, 'wlSettings', $params);
 
 	}
 

src/admin/WL_Metabox/class-wl-metabox-field.php

Indentation +347 added lines, -347 removed lines

@@ -19,360 +19,360 @@
  */
 class WL_Metabox_Field {
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access protected
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	protected $log;
-
-	/**
-	 * The meta name for this field's value.
-	 *
-	 * @var string $meta_name The meta name for this field's value.
-	 */
-	public $meta_name;
-
-	/**
-	 * The custom field settings.
-	 *
-	 * @var null|array $raw_custom_field The custom field settings.
-	 */
-	public $raw_custom_field;
-
-	/**
-	 * The schema.org predicate.
-	 *
-	 * @var string $predicate The schema.org predicate.
-	 */
-	public $predicate;
-
-	/**
-	 * The field's label.
-	 *
-	 * @var string $label The field's label.
-	 */
-	public $label;
-
-	/**
-	 * The WordLift data type.
-	 *
-	 * @var string $expected_wl_type The WordLift data type.
-	 */
-	public $expected_wl_type;
-
-	/**
-	 * The RDF data type.
-	 *
-	 * @var string $expected_uri_type The RDF data type.
-	 */
-	public $expected_uri_type;
-
-	/**
-	 * The cardinality.
-	 *
-	 * @var int $cardinality The cardinality.
-	 */
-	public $cardinality;
-
-	/**
-	 * The current value.
-	 *
-	 * @var array $data The current value.
-	 */
-	public $data;
-
-	/**
-	 * Create a {@link WL_Metabox_Field} instance.
-	 *
-	 * @param array $args An array of parameters.
-	 */
-	public function __construct( $args ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'WL_Metabox_Field' );
-
-		if ( empty( $args ) ) {
-			return;
-		}
-
-		// Save a copy of the custom field's params.
-		$this->raw_custom_field = reset( $args );
-
-		// Extract meta name (post_meta key for the DB).
-		$this->meta_name = key( $args );
-
-		// Extract linked data predicate.
-		if ( isset( $this->raw_custom_field['predicate'] ) ) {
-			$this->predicate = $this->raw_custom_field['predicate'];
-		} else {
-			return;
-		}
-
-		// Extract human readable label.
-		$exploded_predicate = explode( '/', $this->predicate );
-
-		// Use the label defined for the property if set, otherwise the last part of the schema.org/xyz predicate.
-		$this->label = isset( $this->raw_custom_field['metabox']['label'] ) ? $this->raw_custom_field['metabox']['label'] : end( $exploded_predicate );
-
-		// Extract field constraints (numerosity, expected type).
-		// Default constaints: accept one string..
-		if ( isset( $this->raw_custom_field['type'] ) ) {
-			$this->expected_wl_type = $this->raw_custom_field['type'];
-		} else {
-			$this->expected_wl_type = Wordlift_Schema_Service::DATA_TYPE_STRING;
-		}
-
-		$this->cardinality = 1;
-		if ( isset( $this->raw_custom_field['constraints'] ) ) {
-
-			$constraints = $this->raw_custom_field['constraints'];
-
-			// Extract cardinality.
-			if ( isset( $constraints['cardinality'] ) ) {
-				$this->cardinality = $constraints['cardinality'];
-			}
-
-			// Which type of entity can we accept (e.g. Place, Event, ecc.)? .
-			if ( Wordlift_Schema_Service::DATA_TYPE_URI === $this->expected_wl_type && isset( $constraints['uri_type'] ) ) {
-				$this->expected_uri_type = is_array( $constraints['uri_type'] )
-					? $constraints['uri_type']
-					: array( $constraints['uri_type'] );
-			}
-		}
-
-	}
-
-	/**
-	 * Return nonce HTML.
-	 *
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 */
-	public function html_nonce() {
-
-		return wp_nonce_field( 'wordlift_' . $this->meta_name . '_entity_box', 'wordlift_' . $this->meta_name . '_entity_box_nonce', true, false );
-	}
-
-	/**
-	 * Verify nonce.
-	 *
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 *
-	 * @return boolean Nonce verification.
-	 */
-	public function verify_nonce() {
-
-		$nonce_name   = 'wordlift_' . $this->meta_name . '_entity_box_nonce';
-		$nonce_verify = 'wordlift_' . $this->meta_name . '_entity_box';
-
-		if ( ! isset( $_POST[ $nonce_name ] ) ) {
-			return false;
-		}
-
-		// Verify that the nonce is valid.
-		return wp_verify_nonce( $_POST[ $nonce_name ], $nonce_verify );
-	}
-
-	/**
-	 * Load data from DB and store the resulting array in $this->data.
-	 *
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 */
-	public function get_data() {
-
-		$data = get_post_meta( get_the_ID(), $this->meta_name );
-
-		// Values are always contained in an array (makes it easier to manage cardinality).
-		if ( ! is_array( $data ) ) {
-			$data = array( $data );
-		}
-
-		$this->data = $data;
-	}
-
-	/**
-	 * Sanitizes data before saving to DB. Default sanitization trashes empty
-	 * values.
-	 *
-	 * Stores the sanitized values into $this->data so they can be later processed.
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 *
-	 * @param array $values Array of values to be sanitized and then stored into
-	 *                      $this->data.
-	 */
-	public function sanitize_data( $values ) {
-
-		$sanitized_data = array();
-
-		if ( ! is_array( $values ) ) {
-			$values = array( $values );
-		}
-
-		foreach ( $values as $value ) {
-			$sanitized_value = $this->sanitize_data_filter( $value );
-			if ( ! is_null( $sanitized_value ) ) {
-				$sanitized_data[] = $sanitized_value;
-			}
-		}
-
-		$this->data = $sanitized_data;
-	}
-
-	/**
-	 * Sanitize a single value. Called from $this->sanitize_data. Default
-	 * sanitization excludes empty values.
-	 *
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 *
-	 * @param string $value The value to sanitize.
-	 *
-	 * @return mixed Returns sanitized value, or null.
-	 */
-	public function sanitize_data_filter( $value ) {
-
-		// TODO: all fields should provide their own sanitize which shouldn't
-		// be part of a UI class.
-
-		// If the field provides its own validation, use it.
-		if ( isset( $this->raw_custom_field['sanitize'] ) ) {
-			return call_user_func( $this->raw_custom_field['sanitize'], $value );
-		}
-
-		if ( ! is_null( $value ) && '' !== $value ) {         // do not use 'empty()' -> https://www.virendrachandak.com/techtalk/php-isset-vs-empty-vs-is_null/ .
-			return $value;
-		}
-
-		return null;
-	}
-
-	/**
-	 * Save data to DB.
-	 *
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 *
-	 * @param array $values Array of values to be sanitized and then stored into $this->data.
-	 */
-	public function save_data( $values ) {
-
-		// Will sanitize data and store them in $field->data.
-		$this->sanitize_data( $values );
-
-		$entity_id = get_the_ID();
-
-		// Take away old values.
-		delete_post_meta( $entity_id, $this->meta_name );
-
-		// insert new values, respecting cardinality.
-		$single = ( 1 === $this->cardinality );
-		foreach ( $this->data as $value ) {
-			add_post_meta( $entity_id, $this->meta_name, $value, $single );
-		}
-	}
-
-	/**
-	 * Returns the HTML tag that will contain the Field. By default the we
-	 * return a <div> with data- attributes on cardinality and expected types.
-	 *
-	 * It is useful to provide data- attributes for the JS scripts.
-	 *
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 */
-	public function html_wrapper_open() {
-
-		return "<div class='wl-field' data-cardinality='$this->cardinality'>";
-	}
-
-	/**
-	 * Returns Field HTML (nonce included).
-	 *
-	 * Overwrite this method (or methods called from this method) in a child
-	 * class to obtain custom behaviour.
-	 */
-	public function html() {
-
-		// Open main <div> for the Field.
-		$html = $this->html_wrapper_open();
-
-		// Label.
-		$html .= "<h3>$this->label</h3>";
-
-		// print nonce.
-		$html .= $this->html_nonce();
-
-		// print data loaded from DB.
-		$count = 0;
-		if ( $this->data ) {
-			foreach ( $this->data as $value ) {
-				if ( $count < $this->cardinality ) {
-					$html .= $this->html_input( $value );
-				}
-				$count ++;
-			}
-		}
-
-		// Print the empty <input> to add new values.
-		if ( 0 === $count ) { // } || $count < $this->cardinality ) { DO NOT print empty inputs unless requested by the editor since fields might support empty strings.
-			$html .= $this->html_input( '' );    // Will print an empty <input>.
-			$count ++;
-		}
-
-		// If cardinality allows it, print button to add new values.
-		$html .= $this->get_add_button_html( $count );
-
-		// Close the HTML wrapper.
-		$html .= $this->html_wrapper_close();
-
-		return $html;
-	}
-
-	/**
-	 * Get the add button html.
-	 *
-	 * This function is protected, allowing extending class to further customize
-	 * the add button html code.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param int $count The current number of values.
-	 *
-	 * @return string The add button html code.
-	 */
-	protected function get_add_button_html( $count ) {
-
-		// If cardinality allows it, print button to add new values.
-		if ( $count < $this->cardinality ) {
-			return '<button class="button wl-add-input wl-button" type="button">' . esc_html__( 'Add' ) . '</button>';
-		}
-
-		// Return an empty string.
-		return '';
-	}
-
-	/**
-	 * Return a single <input> tag for the Field.
-	 *
-	 * @param mixed $value Input value.
-	 *
-	 * @return string The html code fragment.
-	 */
-	public function html_input( $value ) {
-		$html = <<<EOF
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.15.0
+     * @access protected
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    protected $log;
+
+    /**
+     * The meta name for this field's value.
+     *
+     * @var string $meta_name The meta name for this field's value.
+     */
+    public $meta_name;
+
+    /**
+     * The custom field settings.
+     *
+     * @var null|array $raw_custom_field The custom field settings.
+     */
+    public $raw_custom_field;
+
+    /**
+     * The schema.org predicate.
+     *
+     * @var string $predicate The schema.org predicate.
+     */
+    public $predicate;
+
+    /**
+     * The field's label.
+     *
+     * @var string $label The field's label.
+     */
+    public $label;
+
+    /**
+     * The WordLift data type.
+     *
+     * @var string $expected_wl_type The WordLift data type.
+     */
+    public $expected_wl_type;
+
+    /**
+     * The RDF data type.
+     *
+     * @var string $expected_uri_type The RDF data type.
+     */
+    public $expected_uri_type;
+
+    /**
+     * The cardinality.
+     *
+     * @var int $cardinality The cardinality.
+     */
+    public $cardinality;
+
+    /**
+     * The current value.
+     *
+     * @var array $data The current value.
+     */
+    public $data;
+
+    /**
+     * Create a {@link WL_Metabox_Field} instance.
+     *
+     * @param array $args An array of parameters.
+     */
+    public function __construct( $args ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'WL_Metabox_Field' );
+
+        if ( empty( $args ) ) {
+            return;
+        }
+
+        // Save a copy of the custom field's params.
+        $this->raw_custom_field = reset( $args );
+
+        // Extract meta name (post_meta key for the DB).
+        $this->meta_name = key( $args );
+
+        // Extract linked data predicate.
+        if ( isset( $this->raw_custom_field['predicate'] ) ) {
+            $this->predicate = $this->raw_custom_field['predicate'];
+        } else {
+            return;
+        }
+
+        // Extract human readable label.
+        $exploded_predicate = explode( '/', $this->predicate );
+
+        // Use the label defined for the property if set, otherwise the last part of the schema.org/xyz predicate.
+        $this->label = isset( $this->raw_custom_field['metabox']['label'] ) ? $this->raw_custom_field['metabox']['label'] : end( $exploded_predicate );
+
+        // Extract field constraints (numerosity, expected type).
+        // Default constaints: accept one string..
+        if ( isset( $this->raw_custom_field['type'] ) ) {
+            $this->expected_wl_type = $this->raw_custom_field['type'];
+        } else {
+            $this->expected_wl_type = Wordlift_Schema_Service::DATA_TYPE_STRING;
+        }
+
+        $this->cardinality = 1;
+        if ( isset( $this->raw_custom_field['constraints'] ) ) {
+
+            $constraints = $this->raw_custom_field['constraints'];
+
+            // Extract cardinality.
+            if ( isset( $constraints['cardinality'] ) ) {
+                $this->cardinality = $constraints['cardinality'];
+            }
+
+            // Which type of entity can we accept (e.g. Place, Event, ecc.)? .
+            if ( Wordlift_Schema_Service::DATA_TYPE_URI === $this->expected_wl_type && isset( $constraints['uri_type'] ) ) {
+                $this->expected_uri_type = is_array( $constraints['uri_type'] )
+                    ? $constraints['uri_type']
+                    : array( $constraints['uri_type'] );
+            }
+        }
+
+    }
+
+    /**
+     * Return nonce HTML.
+     *
+     * Overwrite this method in a child class to obtain custom behaviour.
+     */
+    public function html_nonce() {
+
+        return wp_nonce_field( 'wordlift_' . $this->meta_name . '_entity_box', 'wordlift_' . $this->meta_name . '_entity_box_nonce', true, false );
+    }
+
+    /**
+     * Verify nonce.
+     *
+     * Overwrite this method in a child class to obtain custom behaviour.
+     *
+     * @return boolean Nonce verification.
+     */
+    public function verify_nonce() {
+
+        $nonce_name   = 'wordlift_' . $this->meta_name . '_entity_box_nonce';
+        $nonce_verify = 'wordlift_' . $this->meta_name . '_entity_box';
+
+        if ( ! isset( $_POST[ $nonce_name ] ) ) {
+            return false;
+        }
+
+        // Verify that the nonce is valid.
+        return wp_verify_nonce( $_POST[ $nonce_name ], $nonce_verify );
+    }
+
+    /**
+     * Load data from DB and store the resulting array in $this->data.
+     *
+     * Overwrite this method in a child class to obtain custom behaviour.
+     */
+    public function get_data() {
+
+        $data = get_post_meta( get_the_ID(), $this->meta_name );
+
+        // Values are always contained in an array (makes it easier to manage cardinality).
+        if ( ! is_array( $data ) ) {
+            $data = array( $data );
+        }
+
+        $this->data = $data;
+    }
+
+    /**
+     * Sanitizes data before saving to DB. Default sanitization trashes empty
+     * values.
+     *
+     * Stores the sanitized values into $this->data so they can be later processed.
+     * Overwrite this method in a child class to obtain custom behaviour.
+     *
+     * @param array $values Array of values to be sanitized and then stored into
+     *                      $this->data.
+     */
+    public function sanitize_data( $values ) {
+
+        $sanitized_data = array();
+
+        if ( ! is_array( $values ) ) {
+            $values = array( $values );
+        }
+
+        foreach ( $values as $value ) {
+            $sanitized_value = $this->sanitize_data_filter( $value );
+            if ( ! is_null( $sanitized_value ) ) {
+                $sanitized_data[] = $sanitized_value;
+            }
+        }
+
+        $this->data = $sanitized_data;
+    }
+
+    /**
+     * Sanitize a single value. Called from $this->sanitize_data. Default
+     * sanitization excludes empty values.
+     *
+     * Overwrite this method in a child class to obtain custom behaviour.
+     *
+     * @param string $value The value to sanitize.
+     *
+     * @return mixed Returns sanitized value, or null.
+     */
+    public function sanitize_data_filter( $value ) {
+
+        // TODO: all fields should provide their own sanitize which shouldn't
+        // be part of a UI class.
+
+        // If the field provides its own validation, use it.
+        if ( isset( $this->raw_custom_field['sanitize'] ) ) {
+            return call_user_func( $this->raw_custom_field['sanitize'], $value );
+        }
+
+        if ( ! is_null( $value ) && '' !== $value ) {         // do not use 'empty()' -> https://www.virendrachandak.com/techtalk/php-isset-vs-empty-vs-is_null/ .
+            return $value;
+        }
+
+        return null;
+    }
+
+    /**
+     * Save data to DB.
+     *
+     * Overwrite this method in a child class to obtain custom behaviour.
+     *
+     * @param array $values Array of values to be sanitized and then stored into $this->data.
+     */
+    public function save_data( $values ) {
+
+        // Will sanitize data and store them in $field->data.
+        $this->sanitize_data( $values );
+
+        $entity_id = get_the_ID();
+
+        // Take away old values.
+        delete_post_meta( $entity_id, $this->meta_name );
+
+        // insert new values, respecting cardinality.
+        $single = ( 1 === $this->cardinality );
+        foreach ( $this->data as $value ) {
+            add_post_meta( $entity_id, $this->meta_name, $value, $single );
+        }
+    }
+
+    /**
+     * Returns the HTML tag that will contain the Field. By default the we
+     * return a <div> with data- attributes on cardinality and expected types.
+     *
+     * It is useful to provide data- attributes for the JS scripts.
+     *
+     * Overwrite this method in a child class to obtain custom behaviour.
+     */
+    public function html_wrapper_open() {
+
+        return "<div class='wl-field' data-cardinality='$this->cardinality'>";
+    }
+
+    /**
+     * Returns Field HTML (nonce included).
+     *
+     * Overwrite this method (or methods called from this method) in a child
+     * class to obtain custom behaviour.
+     */
+    public function html() {
+
+        // Open main <div> for the Field.
+        $html = $this->html_wrapper_open();
+
+        // Label.
+        $html .= "<h3>$this->label</h3>";
+
+        // print nonce.
+        $html .= $this->html_nonce();
+
+        // print data loaded from DB.
+        $count = 0;
+        if ( $this->data ) {
+            foreach ( $this->data as $value ) {
+                if ( $count < $this->cardinality ) {
+                    $html .= $this->html_input( $value );
+                }
+                $count ++;
+            }
+        }
+
+        // Print the empty <input> to add new values.
+        if ( 0 === $count ) { // } || $count < $this->cardinality ) { DO NOT print empty inputs unless requested by the editor since fields might support empty strings.
+            $html .= $this->html_input( '' );    // Will print an empty <input>.
+            $count ++;
+        }
+
+        // If cardinality allows it, print button to add new values.
+        $html .= $this->get_add_button_html( $count );
+
+        // Close the HTML wrapper.
+        $html .= $this->html_wrapper_close();
+
+        return $html;
+    }
+
+    /**
+     * Get the add button html.
+     *
+     * This function is protected, allowing extending class to further customize
+     * the add button html code.
+     *
+     * @since 3.15.0
+     *
+     * @param int $count The current number of values.
+     *
+     * @return string The add button html code.
+     */
+    protected function get_add_button_html( $count ) {
+
+        // If cardinality allows it, print button to add new values.
+        if ( $count < $this->cardinality ) {
+            return '<button class="button wl-add-input wl-button" type="button">' . esc_html__( 'Add' ) . '</button>';
+        }
+
+        // Return an empty string.
+        return '';
+    }
+
+    /**
+     * Return a single <input> tag for the Field.
+     *
+     * @param mixed $value Input value.
+     *
+     * @return string The html code fragment.
+     */
+    public function html_input( $value ) {
+        $html = <<<EOF
 			<div class="wl-input-wrapper">
 				<input type="text" id="$this->meta_name" name="wl_metaboxes[$this->meta_name][]" value="$value" style="width:88%" />
 				<button class="button wl-remove-input wl-button" type="button">Remove</button>
 			</div>
 EOF;
 
-		return $html;
-	}
+        return $html;
+    }
 
-	/**
-	 * Returns closing for the wrapper HTML tag.
-	 */
-	public function html_wrapper_close() {
+    /**
+     * Returns closing for the wrapper HTML tag.
+     */
+    public function html_wrapper_close() {
 
-		return '</div><hr>';
-	}
+        return '</div><hr>';
+    }
 
 }

Spacing +51 added lines, -51 removed lines

@@ -89,56 +89,56 @@ 
 	 *
 	 * @param array $args An array of parameters.
 	 */
-	public function __construct( $args ) {
+	public function __construct($args) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'WL_Metabox_Field' );
+		$this->log = Wordlift_Log_Service::get_logger('WL_Metabox_Field');
 
-		if ( empty( $args ) ) {
+		if (empty($args)) {
 			return;
 		}
 
 		// Save a copy of the custom field's params.
-		$this->raw_custom_field = reset( $args );
+		$this->raw_custom_field = reset($args);
 
 		// Extract meta name (post_meta key for the DB).
-		$this->meta_name = key( $args );
+		$this->meta_name = key($args);
 
 		// Extract linked data predicate.
-		if ( isset( $this->raw_custom_field['predicate'] ) ) {
+		if (isset($this->raw_custom_field['predicate'])) {
 			$this->predicate = $this->raw_custom_field['predicate'];
 		} else {
 			return;
 		}
 
 		// Extract human readable label.
-		$exploded_predicate = explode( '/', $this->predicate );
+		$exploded_predicate = explode('/', $this->predicate);
 
 		// Use the label defined for the property if set, otherwise the last part of the schema.org/xyz predicate.
-		$this->label = isset( $this->raw_custom_field['metabox']['label'] ) ? $this->raw_custom_field['metabox']['label'] : end( $exploded_predicate );
+		$this->label = isset($this->raw_custom_field['metabox']['label']) ? $this->raw_custom_field['metabox']['label'] : end($exploded_predicate);
 
 		// Extract field constraints (numerosity, expected type).
 		// Default constaints: accept one string..
-		if ( isset( $this->raw_custom_field['type'] ) ) {
+		if (isset($this->raw_custom_field['type'])) {
 			$this->expected_wl_type = $this->raw_custom_field['type'];
 		} else {
 			$this->expected_wl_type = Wordlift_Schema_Service::DATA_TYPE_STRING;
 		}
 
 		$this->cardinality = 1;
-		if ( isset( $this->raw_custom_field['constraints'] ) ) {
+		if (isset($this->raw_custom_field['constraints'])) {
 
 			$constraints = $this->raw_custom_field['constraints'];
 
 			// Extract cardinality.
-			if ( isset( $constraints['cardinality'] ) ) {
+			if (isset($constraints['cardinality'])) {
 				$this->cardinality = $constraints['cardinality'];
 			}
 
 			// Which type of entity can we accept (e.g. Place, Event, ecc.)? .
-			if ( Wordlift_Schema_Service::DATA_TYPE_URI === $this->expected_wl_type && isset( $constraints['uri_type'] ) ) {
-				$this->expected_uri_type = is_array( $constraints['uri_type'] )
+			if (Wordlift_Schema_Service::DATA_TYPE_URI === $this->expected_wl_type && isset($constraints['uri_type'])) {
+				$this->expected_uri_type = is_array($constraints['uri_type'])
 					? $constraints['uri_type']
-					: array( $constraints['uri_type'] );
+					: array($constraints['uri_type']);
 			}
 		}
 
@@ -151,7 +151,7 @@ 
 	 */
 	public function html_nonce() {
 
-		return wp_nonce_field( 'wordlift_' . $this->meta_name . '_entity_box', 'wordlift_' . $this->meta_name . '_entity_box_nonce', true, false );
+		return wp_nonce_field('wordlift_'.$this->meta_name.'_entity_box', 'wordlift_'.$this->meta_name.'_entity_box_nonce', true, false);
 	}
 
 	/**
@@ -163,15 +163,15 @@ 
 	 */
 	public function verify_nonce() {
 
-		$nonce_name   = 'wordlift_' . $this->meta_name . '_entity_box_nonce';
-		$nonce_verify = 'wordlift_' . $this->meta_name . '_entity_box';
+		$nonce_name   = 'wordlift_'.$this->meta_name.'_entity_box_nonce';
+		$nonce_verify = 'wordlift_'.$this->meta_name.'_entity_box';
 
-		if ( ! isset( $_POST[ $nonce_name ] ) ) {
+		if ( ! isset($_POST[$nonce_name])) {
 			return false;
 		}
 
 		// Verify that the nonce is valid.
-		return wp_verify_nonce( $_POST[ $nonce_name ], $nonce_verify );
+		return wp_verify_nonce($_POST[$nonce_name], $nonce_verify);
 	}
 
 	/**
@@ -181,11 +181,11 @@ 
 	 */
 	public function get_data() {
 
-		$data = get_post_meta( get_the_ID(), $this->meta_name );
+		$data = get_post_meta(get_the_ID(), $this->meta_name);
 
 		// Values are always contained in an array (makes it easier to manage cardinality).
-		if ( ! is_array( $data ) ) {
-			$data = array( $data );
+		if ( ! is_array($data)) {
+			$data = array($data);
 		}
 
 		$this->data = $data;
@@ -201,17 +201,17 @@ 
 	 * @param array $values Array of values to be sanitized and then stored into
 	 *                      $this->data.
 	 */
-	public function sanitize_data( $values ) {
+	public function sanitize_data($values) {
 
 		$sanitized_data = array();
 
-		if ( ! is_array( $values ) ) {
-			$values = array( $values );
+		if ( ! is_array($values)) {
+			$values = array($values);
 		}
 
-		foreach ( $values as $value ) {
-			$sanitized_value = $this->sanitize_data_filter( $value );
-			if ( ! is_null( $sanitized_value ) ) {
+		foreach ($values as $value) {
+			$sanitized_value = $this->sanitize_data_filter($value);
+			if ( ! is_null($sanitized_value)) {
 				$sanitized_data[] = $sanitized_value;
 			}
 		}
@@ -229,17 +229,17 @@ 
 	 *
 	 * @return mixed Returns sanitized value, or null.
 	 */
-	public function sanitize_data_filter( $value ) {
+	public function sanitize_data_filter($value) {
 
 		// TODO: all fields should provide their own sanitize which shouldn't
 		// be part of a UI class.
 
 		// If the field provides its own validation, use it.
-		if ( isset( $this->raw_custom_field['sanitize'] ) ) {
-			return call_user_func( $this->raw_custom_field['sanitize'], $value );
+		if (isset($this->raw_custom_field['sanitize'])) {
+			return call_user_func($this->raw_custom_field['sanitize'], $value);
 		}
 
-		if ( ! is_null( $value ) && '' !== $value ) {         // do not use 'empty()' -> https://www.virendrachandak.com/techtalk/php-isset-vs-empty-vs-is_null/ .
+		if ( ! is_null($value) && '' !== $value) {         // do not use 'empty()' -> https://www.virendrachandak.com/techtalk/php-isset-vs-empty-vs-is_null/ .
 			return $value;
 		}
 
@@ -253,20 +253,20 @@ 
 	 *
 	 * @param array $values Array of values to be sanitized and then stored into $this->data.
 	 */
-	public function save_data( $values ) {
+	public function save_data($values) {
 
 		// Will sanitize data and store them in $field->data.
-		$this->sanitize_data( $values );
+		$this->sanitize_data($values);
 
 		$entity_id = get_the_ID();
 
 		// Take away old values.
-		delete_post_meta( $entity_id, $this->meta_name );
+		delete_post_meta($entity_id, $this->meta_name);
 
 		// insert new values, respecting cardinality.
-		$single = ( 1 === $this->cardinality );
-		foreach ( $this->data as $value ) {
-			add_post_meta( $entity_id, $this->meta_name, $value, $single );
+		$single = (1 === $this->cardinality);
+		foreach ($this->data as $value) {
+			add_post_meta($entity_id, $this->meta_name, $value, $single);
 		}
 	}
 
@@ -302,23 +302,23 @@ 
 
 		// print data loaded from DB.
 		$count = 0;
-		if ( $this->data ) {
-			foreach ( $this->data as $value ) {
-				if ( $count < $this->cardinality ) {
-					$html .= $this->html_input( $value );
+		if ($this->data) {
+			foreach ($this->data as $value) {
+				if ($count < $this->cardinality) {
+					$html .= $this->html_input($value);
 				}
-				$count ++;
+				$count++;
 			}
 		}
 
 		// Print the empty <input> to add new values.
-		if ( 0 === $count ) { // } || $count < $this->cardinality ) { DO NOT print empty inputs unless requested by the editor since fields might support empty strings.
-			$html .= $this->html_input( '' );    // Will print an empty <input>.
-			$count ++;
+		if (0 === $count) { // } || $count < $this->cardinality ) { DO NOT print empty inputs unless requested by the editor since fields might support empty strings.
+			$html .= $this->html_input(''); // Will print an empty <input>.
+			$count++;
 		}
 
 		// If cardinality allows it, print button to add new values.
-		$html .= $this->get_add_button_html( $count );
+		$html .= $this->get_add_button_html($count);
 
 		// Close the HTML wrapper.
 		$html .= $this->html_wrapper_close();
@@ -338,11 +338,11 @@ 
 	 *
 	 * @return string The add button html code.
 	 */
-	protected function get_add_button_html( $count ) {
+	protected function get_add_button_html($count) {
 
 		// If cardinality allows it, print button to add new values.
-		if ( $count < $this->cardinality ) {
-			return '<button class="button wl-add-input wl-button" type="button">' . esc_html__( 'Add' ) . '</button>';
+		if ($count < $this->cardinality) {
+			return '<button class="button wl-add-input wl-button" type="button">'.esc_html__('Add').'</button>';
 		}
 
 		// Return an empty string.
@@ -356,7 +356,7 @@ 
 	 *
 	 * @return string The html code fragment.
 	 */
-	public function html_input( $value ) {
+	public function html_input($value) {
 		$html = <<<EOF
 			<div class="wl-input-wrapper">
 				<input type="text" id="$this->meta_name" name="wl_metaboxes[$this->meta_name][]" value="$value" style="width:88%" />

src/admin/WL_Metabox/class-wl-metabox.php

Spacing +67 added lines, -67 removed lines

@@ -7,14 +7,14 @@ 
  * @subpackage Wordlift/admin/WL_Metabox
  */
 
-require_once( 'class-wl-metabox-field.php' );
-require_once( 'WL_Metabox_Field_date.php' );
-require_once( 'class-wl-metabox-field-uri.php' );
-require_once( 'WL_Metabox_Field_coordinates.php' );
-require_once( 'class-wl-metabox-field-sameas.php' );
-require_once( 'WL_Metabox_Field_address.php' );
-require_once( 'class-wordlift-metabox-field-duration.php' );
-require_once( 'class-wordlift-metabox-field-multiline.php' );
+require_once('class-wl-metabox-field.php');
+require_once('WL_Metabox_Field_date.php');
+require_once('class-wl-metabox-field-uri.php');
+require_once('WL_Metabox_Field_coordinates.php');
+require_once('class-wl-metabox-field-sameas.php');
+require_once('WL_Metabox_Field_address.php');
+require_once('class-wordlift-metabox-field-duration.php');
+require_once('class-wordlift-metabox-field-multiline.php');
 
 /**
  * Define the {@link WL_Metabox} class.
@@ -42,11 +42,11 @@ 
 	public function __construct() {
 
 		// Add hooks to print metaboxes and save submitted data.
-		add_action( 'add_meta_boxes', array( &$this, 'add_main_metabox' ) );
-		add_action( 'wl_linked_data_save_post', array(
+		add_action('add_meta_boxes', array(&$this, 'add_main_metabox'));
+		add_action('wl_linked_data_save_post', array(
 			&$this,
 			'save_form_data',
-		) );
+		));
 
 		// Enqueue js and css.
 		$this->enqueue_scripts_and_styles();
@@ -60,27 +60,27 @@ 
 	public function add_main_metabox() {
 
 		// Build the fields we need to print.
-		$this->instantiate_fields( get_the_ID() );
+		$this->instantiate_fields(get_the_ID());
 
 		// Bailout if there are no actual fields, we do not need a metabox in that case.
-		if ( empty( $this->fields ) ) {
+		if (empty($this->fields)) {
 			return;
 		}
 
 		// Add main metabox (will print also the inner fields).
-		$id    = uniqid( 'wl-metabox-' );
-		$title = get_the_title() . ' ' . __( 'properties', 'wordlift' );
+		$id    = uniqid('wl-metabox-');
+		$title = get_the_title().' '.__('properties', 'wordlift');
 
 		// WordPress 4.2 do not accept an array of screens as parameter, have to do be explicit.
-		foreach ( Wordlift_Entity_Service::valid_entity_post_types() as $screen ) {
-			add_meta_box( $id, $title, array(
+		foreach (Wordlift_Entity_Service::valid_entity_post_types() as $screen) {
+			add_meta_box($id, $title, array(
 				$this,
 				'html',
-			), $screen, 'normal', 'high' );
+			), $screen, 'normal', 'high');
 		}
 
 		// Add filter to change the metabox CSS class.
-		add_filter( "postbox_classes_entity_$id", 'wl_admin_metaboxes_add_css_class' );
+		add_filter("postbox_classes_entity_$id", 'wl_admin_metaboxes_add_css_class');
 	}
 
 	/**
@@ -90,10 +90,10 @@ 
 	 *
 	 * @param WP_Post $post The post.
 	 */
-	public function html( $post ) {
+	public function html($post) {
 
 		// Loop over the fields.
-		foreach ( $this->fields as $field ) {
+		foreach ($this->fields as $field) {
 
 			// load data from DB (values will be available in $field->data).
 			$field->get_data();
@@ -114,16 +114,16 @@ 
 	 *
 	 * @param int $post_id The post id.
 	 */
-	public function instantiate_fields( $post_id ) {
+	public function instantiate_fields($post_id) {
 
 		// This function must be called only once. Not called from the constructor because WP hooks have a rococo ordering.
-		if ( isset( $this->fields ) ) {
+		if (isset($this->fields)) {
 			return;
 		}
 
-		$entity_type = wl_entity_taxonomy_get_custom_fields( $post_id );
+		$entity_type = wl_entity_taxonomy_get_custom_fields($post_id);
 
-		if ( isset( $entity_type ) ) {
+		if (isset($entity_type)) {
 
 			/*
 			 * Might not have any relevant meta box field, for example for articles,
@@ -138,31 +138,31 @@ 
 			 * - simple: accept values for one property
 			 * - grouped: accept values for more properties, or for one property that needs a specific metabox.
 			 */
-			$metaboxes         = $this->group_properties_by_input_field( $entity_type );
+			$metaboxes         = $this->group_properties_by_input_field($entity_type);
 			$simple_metaboxes  = $metaboxes[0];
 			$grouped_metaboxes = $metaboxes[1];
 
 			// Loop over simple entity properties.
-			foreach ( $simple_metaboxes as $key => $property ) {
+			foreach ($simple_metaboxes as $key => $property) {
 
 				// Info passed to the metabox.
 				$info         = array();
-				$info[ $key ] = $property;
+				$info[$key] = $property;
 
 				// Build the requested field as WL_Metabox_Field_ object.
-				$this->add_field( $info );
+				$this->add_field($info);
 
 			}
 
 			// Loop over grouped properties.
-			foreach ( $grouped_metaboxes as $key => $property ) {
+			foreach ($grouped_metaboxes as $key => $property) {
 
 				// Info passed to the metabox.
 				$info         = array();
-				$info[ $key ] = $property;
+				$info[$key] = $property;
 
 				// Build the requested field group as WL_Metabox_Field_ object.
-				$this->add_field( $info, true );
+				$this->add_field($info, true);
 
 			}
 		}
@@ -176,34 +176,34 @@ 
 	 *
 	 * @return array
 	 */
-	public function group_properties_by_input_field( $custom_fields ) {
+	public function group_properties_by_input_field($custom_fields) {
 
 		$simple_properties  = array();
 		$grouped_properties = array();
 
 		// Loop over possible entity properties.
-		foreach ( $custom_fields as $key => $property ) {
+		foreach ($custom_fields as $key => $property) {
 
 			// Check presence of predicate and type.
-			if ( isset( $property['predicate'] ) && isset( $property['type'] ) ) {
+			if (isset($property['predicate']) && isset($property['type'])) {
 
 				// Check if input_field is defined.
-				if ( isset( $property['input_field'] ) && '' !== $property['input_field'] ) {
+				if (isset($property['input_field']) && '' !== $property['input_field']) {
 
 					$grouped_key = $property['input_field'];
 
 					// Update list of grouped properties.
-					$grouped_properties[ $grouped_key ][ $key ] = $property;
+					$grouped_properties[$grouped_key][$key] = $property;
 
 				} else {
 
 					// input_field not defined, add simple metabox.
-					$simple_properties[ $key ] = $property;
+					$simple_properties[$key] = $property;
 				}
 			}
 		}
 
-		return array( $simple_properties, $grouped_properties );
+		return array($simple_properties, $grouped_properties);
 	}
 
 	/**
@@ -213,29 +213,29 @@ 
 	 * @param array $args    The field's information.
 	 * @param bool  $grouped Flag to distinguish between simple and grouped fields.
 	 */
-	public function add_field( $args, $grouped = false ) {
+	public function add_field($args, $grouped = false) {
 
-		if ( $grouped ) {
+		if ($grouped) {
 
 			// Special fields (sameas, coordinates, etc.).
 			//
 			// Build Field with a custom class (e.g. WL_Metabox_Field_date).
-			$field_class = 'WL_Metabox_Field_' . key( $args );
+			$field_class = 'WL_Metabox_Field_'.key($args);
 
 		} else {
 
 			// Simple fields (string, uri, boolean, etc.).
 			//
 			// Which field? We want to use the class that is specific for the field.
-			$meta      = key( $args );
-			$this_meta = $args[ $meta ];
+			$meta      = key($args);
+			$this_meta = $args[$meta];
 
 			// If the field declares what metabox it wants, use that one.
-			if ( isset( $this_meta['metabox']['class'] ) ) {
+			if (isset($this_meta['metabox']['class'])) {
 
 				$field_class = $this_meta['metabox']['class'];
 
-			} elseif ( ! isset( $this_meta['type'] ) || Wordlift_Schema_Service::DATA_TYPE_STRING === $this_meta['type'] ) {
+			} elseif ( ! isset($this_meta['type']) || Wordlift_Schema_Service::DATA_TYPE_STRING === $this_meta['type']) {
 
 				// TODO: all fields should explicitly declare the required WL_Metabox.
 				// When they will remove this.
@@ -249,7 +249,7 @@ 
 				// When they will remove this.
 				//
 				// Build Field with a custom class (e.g. WL_Metabox_Field_date).
-				$field_class = 'WL_Metabox_Field_' . $this_meta['type'];
+				$field_class = 'WL_Metabox_Field_'.$this_meta['type'];
 
 			}
 
@@ -257,7 +257,7 @@ 
 		// End if().
 
 		// Call apropriate constructor (e.g. WL_Metabox_Field_... ).
-		$this->fields[] = new $field_class( $args );
+		$this->fields[] = new $field_class($args);
 	}
 
 	/**
@@ -267,40 +267,40 @@ 
 	 *
 	 * @param int $entity_id The entity's {@link WP_Post}'s id.
 	 */
-	public function save_form_data( $entity_id ) {
+	public function save_form_data($entity_id) {
 
 		// Build Field objects.
-		$this->instantiate_fields( $entity_id );
+		$this->instantiate_fields($entity_id);
 
 		// Check if WL metabox form was posted.
-		if ( ! isset( $_POST['wl_metaboxes'] ) ) {
+		if ( ! isset($_POST['wl_metaboxes'])) {
 			return;
 		}
 
-		foreach ( $this->fields as $field ) {
+		foreach ($this->fields as $field) {
 
 			// Verify nonce.
 			$valid_nonce = $field->verify_nonce();
-			if ( $valid_nonce ) {
+			if ($valid_nonce) {
 
 				$posted_data = $_POST['wl_metaboxes'];
 				$field_name  = $field->meta_name;
 
 				// Each Filed only deals with its values.
-				if ( isset( $posted_data[ $field_name ] ) ) {
+				if (isset($posted_data[$field_name])) {
 
-					$values = $posted_data[ $field_name ];
-					if ( ! is_array( $values ) ) {
-						$values = array( $values );
+					$values = $posted_data[$field_name];
+					if ( ! is_array($values)) {
+						$values = array($values);
 					}
 
 					// Save data permanently
-					$field->save_data( $values );
+					$field->save_data($values);
 				}
 			}
 		}
 
-		Wordlift_Linked_Data_Service::get_instance()->push( $entity_id );
+		Wordlift_Linked_Data_Service::get_instance()->push($entity_id);
 
 	}
 
@@ -312,20 +312,20 @@ 
 	public function enqueue_scripts_and_styles() {
 
 		// Use the minified version if PW_DEBUG isn't set.
-		$min = ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ? '.min' : '';
+		$min = ! defined('WP_DEBUG') || ! WP_DEBUG ? '.min' : '';
 
 		// Load the jquery-ui-timepicker-addon library.
-		wp_enqueue_style( 'wl-flatpickr', dirname( plugin_dir_url( __FILE__ ) ) . "/js/flatpickr/flatpickr$min.css", array(), '3.0.6' );
-		wp_enqueue_script( 'wl-flatpickr', dirname( plugin_dir_url( __FILE__ ) ) . "/js/flatpickr/flatpickr$min.js", array( 'jquery' ), '3.0.6', true );
+		wp_enqueue_style('wl-flatpickr', dirname(plugin_dir_url(__FILE__))."/js/flatpickr/flatpickr$min.css", array(), '3.0.6');
+		wp_enqueue_script('wl-flatpickr', dirname(plugin_dir_url(__FILE__))."/js/flatpickr/flatpickr$min.js", array('jquery'), '3.0.6', true);
 
 		// Leaflet.
-		wp_enqueue_style( 'leaflet', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/bower_components/leaflet/dist/leaflet.css' );
-		wp_enqueue_script( 'leaflet', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/bower_components/leaflet/dist/leaflet.js', __FILE__ );
+		wp_enqueue_style('leaflet', dirname(dirname(plugin_dir_url(__FILE__))).'/bower_components/leaflet/dist/leaflet.css');
+		wp_enqueue_script('leaflet', dirname(dirname(plugin_dir_url(__FILE__))).'/bower_components/leaflet/dist/leaflet.js', __FILE__);
 
 		// Add AJAX autocomplete to facilitate metabox editing.
-		wp_enqueue_script( 'wl-entity-metabox-utility', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wl_entity_metabox_utilities.js' );
-		wp_localize_script( 'wl-entity-metabox-utility', 'wlEntityMetaboxParams', array(
-				'ajax_url' => admin_url( 'admin-ajax.php' ),
+		wp_enqueue_script('wl-entity-metabox-utility', dirname(plugin_dir_url(__FILE__)).'/js/wl_entity_metabox_utilities.js');
+		wp_localize_script('wl-entity-metabox-utility', 'wlEntityMetaboxParams', array(
+				'ajax_url' => admin_url('admin-ajax.php'),
 				'action'   => 'entity_by_title',
 			)
 		);

src/admin/WL_Metabox/class-wl-metabox-field-sameas.php

Indentation +38 added lines, -38 removed lines

@@ -16,43 +16,43 @@
  */
 class WL_Metabox_Field_sameas extends WL_Metabox_Field {
 
-	/**
-	 * @inheritdoc
-	 */
-	public function __construct( $args ) {
-		parent::__construct( $args['sameas'] );
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function save_data( $values ) {
-		// The autocomplete select may send JSON arrays in input values.
-		$merged = array_reduce( (array) $values, function ( $carry, $item ) {
-			return array_merge( $carry, mb_split( "\x{2063}", wp_unslash( $item ) ) );
-		}, array() );
-
-		parent::save_data( $merged );
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function sanitize_data_filter( $value ) {
-
-		// Call our sanitizer helper.
-		return Wordlift_Sanitizer::sanitize_url( $value );
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	protected function get_add_button_html( $count ) {
-
-		// Return an element where the new Autocomplete Select will attach to.
-		return '<p>'
-			   . esc_html__( 'Type a URL or any text to find entities from the vocabulary and the cloud:', 'wordlift' )
-			   . '</p><div id="wl-metabox-field-sameas"></div>';
-	}
+    /**
+     * @inheritdoc
+     */
+    public function __construct( $args ) {
+        parent::__construct( $args['sameas'] );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function save_data( $values ) {
+        // The autocomplete select may send JSON arrays in input values.
+        $merged = array_reduce( (array) $values, function ( $carry, $item ) {
+            return array_merge( $carry, mb_split( "\x{2063}", wp_unslash( $item ) ) );
+        }, array() );
+
+        parent::save_data( $merged );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function sanitize_data_filter( $value ) {
+
+        // Call our sanitizer helper.
+        return Wordlift_Sanitizer::sanitize_url( $value );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function get_add_button_html( $count ) {
+
+        // Return an element where the new Autocomplete Select will attach to.
+        return '<p>'
+                . esc_html__( 'Type a URL or any text to find entities from the vocabulary and the cloud:', 'wordlift' )
+                . '</p><div id="wl-metabox-field-sameas"></div>';
+    }
 
 }

Spacing +11 added lines, -11 removed lines

@@ -19,39 +19,39 @@
 	/**
 	 * @inheritdoc
 	 */
-	public function __construct( $args ) {
-		parent::__construct( $args['sameas'] );
+	public function __construct($args) {
+		parent::__construct($args['sameas']);
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	public function save_data( $values ) {
+	public function save_data($values) {
 		// The autocomplete select may send JSON arrays in input values.
-		$merged = array_reduce( (array) $values, function ( $carry, $item ) {
-			return array_merge( $carry, mb_split( "\x{2063}", wp_unslash( $item ) ) );
-		}, array() );
+		$merged = array_reduce((array) $values, function($carry, $item) {
+			return array_merge($carry, mb_split("\x{2063}", wp_unslash($item)));
+		}, array());
 
-		parent::save_data( $merged );
+		parent::save_data($merged);
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	public function sanitize_data_filter( $value ) {
+	public function sanitize_data_filter($value) {
 
 		// Call our sanitizer helper.
-		return Wordlift_Sanitizer::sanitize_url( $value );
+		return Wordlift_Sanitizer::sanitize_url($value);
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	protected function get_add_button_html( $count ) {
+	protected function get_add_button_html($count) {
 
 		// Return an element where the new Autocomplete Select will attach to.
 		return '<p>'
-			   . esc_html__( 'Type a URL or any text to find entities from the vocabulary and the cloud:', 'wordlift' )
+			   . esc_html__('Type a URL or any text to find entities from the vocabulary and the cloud:', 'wordlift')
 			   . '</p><div id="wl-metabox-field-sameas"></div>';
 	}