insideout10 / wordlift-plugin

src/admin/WL_Metabox/class-wordlift-metabox-field-multiline.php

Indentation +9 added lines, -9 removed lines

@@ -18,20 +18,20 @@
  */
 class Wordlift_Metabox_Field_Multiline extends WL_Metabox_Field {
 
-	/**
-	 * @inheritdoc
-	 */
-	public function html_input( $text ) {
+    /**
+     * @inheritdoc
+     */
+    public function html_input( $text ) {
 
-		$esc_text      = esc_textarea( $text );
-		$esc_meta_name = esc_attr( $this->meta_name );
-		$html          = <<<EOF
+        $esc_text      = esc_textarea( $text );
+        $esc_meta_name = esc_attr( $this->meta_name );
+        $html          = <<<EOF
 			<div class="wl-input-wrapper">
 				<textarea id="$esc_meta_name" class="$esc_meta_name" name="wl_metaboxes[$esc_meta_name][]" style="width:88%">$esc_text</textarea>
 				<button class="button wl-remove-input wl-button" type="button" style="width:10 % ">Remove</button>
 			</div>
 EOF;
 
-		return $html;
-	}
+        return $html;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -21,10 +21,10 @@
 	/**
 	 * @inheritdoc
 	 */
-	public function html_input( $text ) {
+	public function html_input($text) {
 
-		$esc_text      = esc_textarea( $text );
-		$esc_meta_name = esc_attr( $this->meta_name );
+		$esc_text      = esc_textarea($text);
+		$esc_meta_name = esc_attr($this->meta_name);
 		$html          = <<<EOF
 			<div class="wl-input-wrapper">
 				<textarea id="$esc_meta_name" class="$esc_meta_name" name="wl_metaboxes[$esc_meta_name][]" style="width:88%">$esc_text</textarea>

src/admin/WL_Metabox/class-wordlift-metabox-field-duration.php

Indentation +38 added lines, -38 removed lines

@@ -18,29 +18,29 @@ 
  */
 class Wordlift_Metabox_Field_Duration extends WL_Metabox_Field {
 
-	/**
-	 * @param mixed $duration
-	 *
-	 * @return string HTML for the duration input element
-	 */
-	public function html_input( $duration ) {
+    /**
+     * @param mixed $duration
+     *
+     * @return string HTML for the duration input element
+     */
+    public function html_input( $duration ) {
 
-		$esc_duration  = esc_attr( $duration );
-		$esc_meta_name = esc_attr( $this->meta_name );
-		$html          = <<<EOF
+        $esc_duration  = esc_attr( $duration );
+        $esc_meta_name = esc_attr( $this->meta_name );
+        $html          = <<<EOF
 			<div class="wl-input-wrapper">
 				<input type="text" pattern="\s*((([01]?[0-9]{1}|2[0-3]{1}):)?[0-5]{1})?[0-9]{1}\s*" id="$esc_meta_name" class="$esc_meta_name" name="wl_metaboxes[$esc_meta_name][]" value="$esc_duration" style="width:88%" />
 				<button class="button wl-remove-input wl-button" type="button" style="width:10 % ">Remove</button>
 			</div>
 EOF;
 
-		return $html;
-	}
+        return $html;
+    }
 
-	public function html_wrapper_close() {
+    public function html_wrapper_close() {
 
-		$invalid_message = esc_html__( 'Invalid format, should be time in HH:MM format or just MM', 'wordlift' );
-		$html            = <<<EOF
+        $invalid_message = esc_html__( 'Invalid format, should be time in HH:MM format or just MM', 'wordlift' );
+        $html            = <<<EOF
 			<script type='text/javascript'>
 				( function( $ ) {
 
@@ -63,33 +63,33 @@ 
 			</script>
 EOF;
 
-		$html .= parent::html_wrapper_close();
+        $html .= parent::html_wrapper_close();
 
-		return $html;
-	}
+        return $html;
+    }
 
-	/**
-	 * Sanitize a single value. Called from $this->sanitize_data. Default sanitization excludes empty values.
-	 * make sure the value is either empty, an integer representing valid number of minutes
-	 * or an HH:MM time format.
-	 *
-	 * @param mixed $value The value being sanitized.
-	 *
-	 * @return mixed Returns sanitized value, or null.
-	 */
-	public function sanitize_data_filter( $value ) {
+    /**
+     * Sanitize a single value. Called from $this->sanitize_data. Default sanitization excludes empty values.
+     * make sure the value is either empty, an integer representing valid number of minutes
+     * or an HH:MM time format.
+     *
+     * @param mixed $value The value being sanitized.
+     *
+     * @return mixed Returns sanitized value, or null.
+     */
+    public function sanitize_data_filter( $value ) {
 
-		if ( ! is_null( $value ) && '' !== $value ) {         // do not use 'empty()' -> https://www.virendrachandak.com/techtalk/php-isset-vs-empty-vs-is_null/ .
-			preg_match( '#((([01]?[0-9]{1}|2[0-3]{1}):)?[0-5]{1})?[0-9]{1}#',
-				trim( $value ),
-				$matches
-			);
+        if ( ! is_null( $value ) && '' !== $value ) {         // do not use 'empty()' -> https://www.virendrachandak.com/techtalk/php-isset-vs-empty-vs-is_null/ .
+            preg_match( '#((([01]?[0-9]{1}|2[0-3]{1}):)?[0-5]{1})?[0-9]{1}#',
+                trim( $value ),
+                $matches
+            );
 
-			if ( count( $matches ) > 0 ) {
-				return $matches[0];
-			}
-		}
+            if ( count( $matches ) > 0 ) {
+                return $matches[0];
+            }
+        }
 
-		return null;
-	}
+        return null;
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -23,10 +23,10 @@ 
 	 *
 	 * @return string HTML for the duration input element
 	 */
-	public function html_input( $duration ) {
+	public function html_input($duration) {
 
-		$esc_duration  = esc_attr( $duration );
-		$esc_meta_name = esc_attr( $this->meta_name );
+		$esc_duration  = esc_attr($duration);
+		$esc_meta_name = esc_attr($this->meta_name);
 		$html          = <<<EOF
 			<div class="wl-input-wrapper">
 				<input type="text" pattern="\s*((([01]?[0-9]{1}|2[0-3]{1}):)?[0-5]{1})?[0-9]{1}\s*" id="$esc_meta_name" class="$esc_meta_name" name="wl_metaboxes[$esc_meta_name][]" value="$esc_duration" style="width:88%" />
@@ -39,7 +39,7 @@ 
 
 	public function html_wrapper_close() {
 
-		$invalid_message = esc_html__( 'Invalid format, should be time in HH:MM format or just MM', 'wordlift' );
+		$invalid_message = esc_html__('Invalid format, should be time in HH:MM format or just MM', 'wordlift');
 		$html            = <<<EOF
 			<script type='text/javascript'>
 				( function( $ ) {
@@ -77,15 +77,15 @@ 
 	 *
 	 * @return mixed Returns sanitized value, or null.
 	 */
-	public function sanitize_data_filter( $value ) {
+	public function sanitize_data_filter($value) {
 
-		if ( ! is_null( $value ) && '' !== $value ) {         // do not use 'empty()' -> https://www.virendrachandak.com/techtalk/php-isset-vs-empty-vs-is_null/ .
-			preg_match( '#((([01]?[0-9]{1}|2[0-3]{1}):)?[0-5]{1})?[0-9]{1}#',
-				trim( $value ),
+		if ( ! is_null($value) && '' !== $value) {         // do not use 'empty()' -> https://www.virendrachandak.com/techtalk/php-isset-vs-empty-vs-is_null/ .
+			preg_match('#((([01]?[0-9]{1}|2[0-3]{1}):)?[0-5]{1})?[0-9]{1}#',
+				trim($value),
 				$matches
 			);
 
-			if ( count( $matches ) > 0 ) {
+			if (count($matches) > 0) {
 				return $matches[0];
 			}
 		}

src/admin/WL_Metabox/WL_Metabox.php

Indentation +223 added lines, -223 removed lines

@@ -25,277 +25,277 @@
  */
 class WL_Metabox {
 
-	public $fields;
-
-	/**
-	 * WL_Metabox constructor.
-	 *
-	 * @since 3.1.0
-	 */
-	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(
-			&$this,
-			'save_form_data',
-		) );
-
-		// Enqueue js and css.
-		$this->enqueue_scripts_and_styles();
-
-	}
-
-	/**
-	 * Add a callback to print the metabox in page.
-	 * Wordpress will fire the $this->html() callback at the right time.
-	 */
-	public function add_main_metabox() {
-
-		// Add main metabox (will print also the inner fields).
-		$id    = uniqid( 'wl-metabox-' );
-		$title = get_the_title() . ' ' . __( 'properties', 'wordlift' );
-		add_meta_box( $id, $title, array(
-			$this,
-			'html',
-		), Wordlift_Entity_Service::TYPE_NAME, 'normal', 'high' );
-
-		// Add filter to change the metabox CSS class.
-		add_filter( "postbox_classes_entity_$id", 'wl_admin_metaboxes_add_css_class' );
-	}
-
-	/**
-	 * Called from WP to print the metabox content in page.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param WP_Post $post The post.
-	 */
-	public function html( $post ) {
-
-		// Build the fields we need to print.
-		$this->instantiate_fields( $post->ID );
-
-		// Loop over the fields.
-		foreach ( $this->fields as $field ) {
-
-			// load data from DB (values will be available in $field->data).
-			$field->get_data();
-
-			// print field HTML (nonce included).
-			echo $field->html();
-		}
-
-	}
-
-	/**
-	 * Read the WL <-> Schema mapping and build the Fields for the entity being edited.
-	 *
-	 * Note: the first function that calls this method will instantiate the fields.
-	 * Why it isn't called from the constructor? Because we need to hook this process as late as possible.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param int $post_id The 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 ) ) {
-			return;
-		}
-
-		$entity_type = wl_entity_taxonomy_get_custom_fields( $post_id );
-
-		if ( isset( $entity_type ) ) {
-
-			/**
-			 * In some special case, properties must be grouped in one field (e.g. coordinates) or dealed with custom methods.
-			 * We must divide fields in two groups:
-			 * - 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 );
-			$simple_metaboxes  = $metaboxes[0];
-			$grouped_metaboxes = $metaboxes[1];
+    public $fields;
+
+    /**
+     * WL_Metabox constructor.
+     *
+     * @since 3.1.0
+     */
+    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(
+            &$this,
+            'save_form_data',
+        ) );
+
+        // Enqueue js and css.
+        $this->enqueue_scripts_and_styles();
+
+    }
+
+    /**
+     * Add a callback to print the metabox in page.
+     * Wordpress will fire the $this->html() callback at the right time.
+     */
+    public function add_main_metabox() {
+
+        // Add main metabox (will print also the inner fields).
+        $id    = uniqid( 'wl-metabox-' );
+        $title = get_the_title() . ' ' . __( 'properties', 'wordlift' );
+        add_meta_box( $id, $title, array(
+            $this,
+            'html',
+        ), Wordlift_Entity_Service::TYPE_NAME, 'normal', 'high' );
+
+        // Add filter to change the metabox CSS class.
+        add_filter( "postbox_classes_entity_$id", 'wl_admin_metaboxes_add_css_class' );
+    }
+
+    /**
+     * Called from WP to print the metabox content in page.
+     *
+     * @since 3.1.0
+     *
+     * @param WP_Post $post The post.
+     */
+    public function html( $post ) {
+
+        // Build the fields we need to print.
+        $this->instantiate_fields( $post->ID );
+
+        // Loop over the fields.
+        foreach ( $this->fields as $field ) {
+
+            // load data from DB (values will be available in $field->data).
+            $field->get_data();
+
+            // print field HTML (nonce included).
+            echo $field->html();
+        }
+
+    }
+
+    /**
+     * Read the WL <-> Schema mapping and build the Fields for the entity being edited.
+     *
+     * Note: the first function that calls this method will instantiate the fields.
+     * Why it isn't called from the constructor? Because we need to hook this process as late as possible.
+     *
+     * @since 3.1.0
+     *
+     * @param int $post_id The 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 ) ) {
+            return;
+        }
+
+        $entity_type = wl_entity_taxonomy_get_custom_fields( $post_id );
+
+        if ( isset( $entity_type ) ) {
+
+            /**
+             * In some special case, properties must be grouped in one field (e.g. coordinates) or dealed with custom methods.
+             * We must divide fields in two groups:
+             * - 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 );
+            $simple_metaboxes  = $metaboxes[0];
+            $grouped_metaboxes = $metaboxes[1];
 
-			// Loop over simple entity properties.
-			foreach ( $simple_metaboxes as $key => $property ) {
+            // Loop over simple entity properties.
+            foreach ( $simple_metaboxes as $key => $property ) {
 
-				// Info passed to the metabox.
-				$info         = array();
-				$info[ $key ] = $property;
+                // Info passed to the metabox.
+                $info         = array();
+                $info[ $key ] = $property;
 
-				// Build the requested field as WL_Metabox_Field_ object.
-				$this->add_field( $info );
-			}
+                // Build the requested field as WL_Metabox_Field_ object.
+                $this->add_field( $info );
+            }
 
-			// Loop over grouped properties.
-			foreach ( $grouped_metaboxes as $key => $property ) {
+            // Loop over grouped properties.
+            foreach ( $grouped_metaboxes as $key => $property ) {
 
-				// Info passed to the metabox.
-				$info         = array();
-				$info[ $key ] = $property;
+                // Info passed to the metabox.
+                $info         = array();
+                $info[ $key ] = $property;
 
-				// Build the requested field group as WL_Metabox_Field_ object.
-				$this->add_field( $info, true );
-			}
+                // Build the requested field group as WL_Metabox_Field_ object.
+                $this->add_field( $info, true );
+            }
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Separates metaboxes in simple and grouped.
-	 *
-	 * @param array $custom_fields Information on the entity type.
-	 *
-	 * @return array
-	 */
-	public function group_properties_by_input_field( $custom_fields ) {
+    /**
+     * Separates metaboxes in simple and grouped.
+     *
+     * @param array $custom_fields Information on the entity type.
+     *
+     * @return array
+     */
+    public function group_properties_by_input_field( $custom_fields ) {
 
-		$simple_properties  = array();
-		$grouped_properties = array();
+        $simple_properties  = array();
+        $grouped_properties = array();
 
-		// Loop over possible entity properties.
-		foreach ( $custom_fields as $key => $property ) {
+        // Loop over possible entity properties.
+        foreach ( $custom_fields as $key => $property ) {
 
-			// Check presence of predicate and type.
-			if ( isset( $property['predicate'] ) && isset( $property['type'] ) ) {
+            // Check presence of predicate and type.
+            if ( isset( $property['predicate'] ) && isset( $property['type'] ) ) {
 
-				// Check if input_field is defined.
-				if ( isset( $property['input_field'] ) && $property['input_field'] !== '' ) {
+                // Check if input_field is defined.
+                if ( isset( $property['input_field'] ) && $property['input_field'] !== '' ) {
 
-					$grouped_key = $property['input_field'];
+                    $grouped_key = $property['input_field'];
 
-					// Update list of grouped properties.
-					$grouped_properties[ $grouped_key ][ $key ] = $property;
+                    // Update list of grouped properties.
+                    $grouped_properties[ $grouped_key ][ $key ] = $property;
 
-				} else {
+                } else {
 
-					// input_field not defined, add simple metabox.
-					$simple_properties[ $key ] = $property;
-				}
-			}
-		}
+                    // input_field not defined, add simple metabox.
+                    $simple_properties[ $key ] = $property;
+                }
+            }
+        }
 
-		return array( $simple_properties, $grouped_properties );
-	}
+        return array( $simple_properties, $grouped_properties );
+    }
 
-	/**
-	 * Add a Field to the current Metabox, based on the description of the Field.
-	 * This method is a rude factory for Field objects.
-	 *
-	 * @param array $args
-	 * @param bool  $grouped Flag to distinguish between simple and grouped Fields
-	 */
-	public function add_field( $args, $grouped = false ) {
+    /**
+     * Add a Field to the current Metabox, based on the description of the Field.
+     * This method is a rude factory for Field objects.
+     *
+     * @param array $args
+     * @param bool  $grouped Flag to distinguish between simple and grouped Fields
+     */
+    public function add_field( $args, $grouped = false ) {
 
-		if ( $grouped ) {
-			// Special fields (sameas, coordinates, etc.).
+        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 );
+            // Build Field with a custom class (e.g. WL_Metabox_Field_date).
+            $field_class = 'WL_Metabox_Field_' . key( $args );
 
-		} else {
-			// Simple fields (string, uri, boolean, etc.).
+        } 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 ];
+            // Which field? We want to use the class that is specific for the field.
+            $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 the field declares what metabox it wants, use that one.
+            if ( isset( $this_meta['metabox']['class'] ) ) {
 
-				$field_class = $this_meta['metabox']['class'];
+                $field_class = $this_meta['metabox']['class'];
 
-			} elseif ( ! isset( $this_meta['type'] ) || ( $this_meta['type'] == Wordlift_Schema_Service::DATA_TYPE_STRING ) ) {
+            } elseif ( ! isset( $this_meta['type'] ) || ( $this_meta['type'] == Wordlift_Schema_Service::DATA_TYPE_STRING ) ) {
 
-				// TODO: all fields should explicitly declare the required WL_Metabox.
-				// When they will remove this.
+                // TODO: all fields should explicitly declare the required WL_Metabox.
+                // When they will remove this.
 
-				// Use default WL_Metabox_Field (manages strings).
-				$field_class = 'WL_Metabox_Field';
+                // Use default WL_Metabox_Field (manages strings).
+                $field_class = 'WL_Metabox_Field';
 
-			} else {
+            } else {
 
-				// TODO: all fields should explicitly declare the required WL_Metabox.
-				// When they will remove this.
+                // TODO: all fields should explicitly declare the required WL_Metabox.
+                // 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'];
+                // Build Field with a custom class (e.g. WL_Metabox_Field_date).
+                $field_class = 'WL_Metabox_Field_' . $this_meta['type'];
 
-			}
-		}
+            }
+        }
 
-		// Call apropriate constructor (e.g. WL_Metabox_Field_... ).
-		$this->fields[] = new $field_class( $args );
-	}
+        // Call apropriate constructor (e.g. WL_Metabox_Field_... ).
+        $this->fields[] = new $field_class( $args );
+    }
 
-	public function save_form_data( $entity_id ) {
+    public function save_form_data( $entity_id ) {
 
-		// Build Field objects.
-		$this->instantiate_fields( $entity_id );
+        // Build Field objects.
+        $this->instantiate_fields( $entity_id );
 
-		// Check if WL metabox form was posted.
-		if ( ! isset( $_POST['wl_metaboxes'] ) ) {
-			return;
-		}
+        // Check if WL metabox form was posted.
+        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 ) {
+            // Verify nonce.
+            $valid_nonce = $field->verify_nonce();
+            if ( $valid_nonce ) {
 
-				$posted_data = $_POST['wl_metaboxes'];
-				$field_name  = $field->meta_name;
+                $posted_data = $_POST['wl_metaboxes'];
+                $field_name  = $field->meta_name;
 
-				// Each Filed only deals with its values.
-				if ( isset( $posted_data[ $field_name ] ) ) {
+                // Each Filed only deals with its values.
+                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 );
-				}
-			}
-		}
+                    // Save data permanently
+                    $field->save_data( $values );
+                }
+            }
+        }
 
-		wl_linked_data_push_to_redlink( $entity_id );
-	}
+        wl_linked_data_push_to_redlink( $entity_id );
+    }
 
-	/**
-	 * Enqueue scripts and styles.
-	 *
-	 * @since 3.0.0
-	 */
-	public function enqueue_scripts_and_styles() {
+    /**
+     * Enqueue scripts and styles.
+     *
+     * @since 3.0.0
+     */
+    public function enqueue_scripts_and_styles() {
 
-		// Load the jquery-ui-timepicker-addon library.
-		wp_enqueue_style( 'jquery-ui-timepicker-addon', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.css' );
-		wp_enqueue_script( 'jquery-ui-timepicker-addon', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.js', array( 'jquery-ui-datepicker' ), '1.6.3', true );
+        // Load the jquery-ui-timepicker-addon library.
+        wp_enqueue_style( 'jquery-ui-timepicker-addon', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.css' );
+        wp_enqueue_script( 'jquery-ui-timepicker-addon', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.js', array( 'jquery-ui-datepicker' ), '1.6.3', true );
 
-		wp_enqueue_script( 'jquery-ui-timepicker-no-conflict', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery.datetimepicker.no-conflict.js', array(
-			'jquery-ui-datepicker',
-			'jquery-ui-timepicker-addon',
-		) );
+        wp_enqueue_script( 'jquery-ui-timepicker-no-conflict', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery.datetimepicker.no-conflict.js', array(
+            'jquery-ui-datepicker',
+            'jquery-ui-timepicker-addon',
+        ) );
 
-		// 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__ );
+        // 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__ );
 
-		// 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' ),
-				'action'   => 'entity_by_title',
-			)
-		);
+        // 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' ),
+                'action'   => 'entity_by_title',
+            )
+        );
 
-	}
+    }
 
 }

Spacing +66 added lines, -66 removed lines

@@ -7,14 +7,14 @@ 
  * @subpackage Wordlift/admin/WL_Metabox
  */
 
-require_once( 'WL_Metabox_Field.php' );
-require_once( 'WL_Metabox_Field_date.php' );
-require_once( 'WL_Metabox_Field_uri.php' );
-require_once( 'WL_Metabox_Field_coordinates.php' );
-require_once( '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('WL_Metabox_Field.php');
+require_once('WL_Metabox_Field_date.php');
+require_once('WL_Metabox_Field_uri.php');
+require_once('WL_Metabox_Field_coordinates.php');
+require_once('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.
@@ -35,11 +35,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();
@@ -53,15 +53,15 @@ 
 	public function add_main_metabox() {
 
 		// Add main metabox (will print also the inner fields).
-		$id    = uniqid( 'wl-metabox-' );
-		$title = get_the_title() . ' ' . __( 'properties', 'wordlift' );
-		add_meta_box( $id, $title, array(
+		$id    = uniqid('wl-metabox-');
+		$title = get_the_title().' '.__('properties', 'wordlift');
+		add_meta_box($id, $title, array(
 			$this,
 			'html',
-		), Wordlift_Entity_Service::TYPE_NAME, 'normal', 'high' );
+		), Wordlift_Entity_Service::TYPE_NAME, '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');
 	}
 
 	/**
@@ -71,13 +71,13 @@ 
 	 *
 	 * @param WP_Post $post The post.
 	 */
-	public function html( $post ) {
+	public function html($post) {
 
 		// Build the fields we need to print.
-		$this->instantiate_fields( $post->ID );
+		$this->instantiate_fields($post->ID);
 
 		// 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();
@@ -98,16 +98,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)) {
 
 			/**
 			 * In some special case, properties must be grouped in one field (e.g. coordinates) or dealed with custom methods.
@@ -115,30 +115,30 @@ 
 			 * - 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);
 			}
 
 		}
@@ -152,34 +152,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);
 	}
 
 	/**
@@ -189,27 +189,27 @@ 
 	 * @param array $args
 	 * @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'] ) || ( $this_meta['type'] == Wordlift_Schema_Service::DATA_TYPE_STRING ) ) {
+			} elseif ( ! isset($this_meta['type']) || ($this_meta['type'] == Wordlift_Schema_Service::DATA_TYPE_STRING)) {
 
 				// TODO: all fields should explicitly declare the required WL_Metabox.
 				// When they will remove this.
@@ -223,49 +223,49 @@ 
 				// 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'];
 
 			}
 		}
 
 		// Call apropriate constructor (e.g. WL_Metabox_Field_... ).
-		$this->fields[] = new $field_class( $args );
+		$this->fields[] = new $field_class($args);
 	}
 
-	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);
 				}
 			}
 		}
 
-		wl_linked_data_push_to_redlink( $entity_id );
+		wl_linked_data_push_to_redlink($entity_id);
 	}
 
 	/**
@@ -276,22 +276,22 @@ 
 	public function enqueue_scripts_and_styles() {
 
 		// Load the jquery-ui-timepicker-addon library.
-		wp_enqueue_style( 'jquery-ui-timepicker-addon', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.css' );
-		wp_enqueue_script( 'jquery-ui-timepicker-addon', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.js', array( 'jquery-ui-datepicker' ), '1.6.3', true );
+		wp_enqueue_style('jquery-ui-timepicker-addon', dirname(plugin_dir_url(__FILE__)).'/js/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.css');
+		wp_enqueue_script('jquery-ui-timepicker-addon', dirname(plugin_dir_url(__FILE__)).'/js/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.js', array('jquery-ui-datepicker'), '1.6.3', true);
 
-		wp_enqueue_script( 'jquery-ui-timepicker-no-conflict', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery.datetimepicker.no-conflict.js', array(
+		wp_enqueue_script('jquery-ui-timepicker-no-conflict', dirname(plugin_dir_url(__FILE__)).'/js/jquery.datetimepicker.no-conflict.js', array(
 			'jquery-ui-datepicker',
 			'jquery-ui-timepicker-addon',
-		) );
+		));
 
 		// 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/modules/core/wordlift_core_install.php

Indentation +167 added lines, -167 removed lines

@@ -11,95 +11,95 @@ 
  */
 function wl_core_install_entity_type_data() {
 
-	// Ensure the custom type and the taxonomy are registered.
-	Wordlift_Entity_Post_Type_Service::get_instance()->register();
-
-	wl_entity_type_taxonomy_register();
-
-	// Ensure the custom taxonomy for dbpedia topics is registered
-	Wordlift_Topic_Taxonomy_Service::get_instance()->init();
-
-	// Set the taxonomy data.
-	// Note: parent types must be defined before child types.
-	$terms = array(
-		'thing'         => array(
-			'label'       => 'Thing',
-			'description' => 'A generic thing (something that doesn\'t fit in the previous definitions.',
-		),
-		'creative-work' => array(
-			'label'       => 'CreativeWork',
-			'description' => 'A creative work (or a Music Album).',
-		),
-		'event'         => array(
-			'label'       => 'Event',
-			'description' => 'An event.',
-		),
-		'organization'  => array(
-			'label'       => 'Organization',
-			'description' => 'An organization, including a government or a newspaper.',
-		),
-		'person'        => array(
-			'label'       => 'Person',
-			'description' => 'A person (or a music artist).',
-		),
-		'place'         => array(
-			'label'       => 'Place',
-			'description' => 'A place.',
-		),
-		'localbusiness' => array(
-			'label'       => 'LocalBusiness',
-			'description' => 'A local business.',
-		),
-	);
-
-	foreach ( $terms as $slug => $term ) {
-
-		// Create the term if it does not exist, then get its ID
-		$term_id = term_exists( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-
-		if ( 0 == $term_id || is_null( $term_id ) ) {
-			$result = wp_insert_term( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-		} else {
-			$term_id = $term_id['term_id'];
-			$result  = get_term( $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, ARRAY_A );
-		}
-
-		// Check for errors.
-		if ( is_wp_error( $result ) ) {
-			wl_write_log( 'wl_install_entity_type_data [ ' . $result->get_error_message() . ' ]' );
-			continue;
-		}
-
-		// Check if 'parent' corresponds to an actual term and get its ID.
-		if ( ! isset( $term['parents'] ) ) {
-			$term['parents'] = array();
-		}
-
-		$parent_ids = array();
-		foreach ( $term['parents'] as $parent_slug ) {
-			$parent_id    = get_term_by( 'slug', $parent_slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-			$parent_ids[] = intval( $parent_id->term_id );  // Note: int casting is suggested by Codex: http://codex.wordpress.org/Function_Reference/get_term_by
-		}
-
-		// Define a parent in the WP taxonomy style (not important for WL)
-		if ( empty( $parent_ids ) ) {
-			// No parent
-			$parent_id = 0;
-		} else {
-			// Get first parent
-			$parent_id = $parent_ids[0];
-		}
-
-		// Update term with description, slug and parent
-		wp_update_term( $result['term_id'], Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
-			'name'        => $term['label'],
-			'slug'        => $slug,
-			'description' => $term['description'],
-			// We give to WP taxonomy just one parent. TODO: see if can give more than one
-			'parent'      => $parent_id,
-		) );
-
-	}
+    // Ensure the custom type and the taxonomy are registered.
+    Wordlift_Entity_Post_Type_Service::get_instance()->register();
+
+    wl_entity_type_taxonomy_register();
+
+    // Ensure the custom taxonomy for dbpedia topics is registered
+    Wordlift_Topic_Taxonomy_Service::get_instance()->init();
+
+    // Set the taxonomy data.
+    // Note: parent types must be defined before child types.
+    $terms = array(
+        'thing'         => array(
+            'label'       => 'Thing',
+            'description' => 'A generic thing (something that doesn\'t fit in the previous definitions.',
+        ),
+        'creative-work' => array(
+            'label'       => 'CreativeWork',
+            'description' => 'A creative work (or a Music Album).',
+        ),
+        'event'         => array(
+            'label'       => 'Event',
+            'description' => 'An event.',
+        ),
+        'organization'  => array(
+            'label'       => 'Organization',
+            'description' => 'An organization, including a government or a newspaper.',
+        ),
+        'person'        => array(
+            'label'       => 'Person',
+            'description' => 'A person (or a music artist).',
+        ),
+        'place'         => array(
+            'label'       => 'Place',
+            'description' => 'A place.',
+        ),
+        'localbusiness' => array(
+            'label'       => 'LocalBusiness',
+            'description' => 'A local business.',
+        ),
+    );
+
+    foreach ( $terms as $slug => $term ) {
+
+        // Create the term if it does not exist, then get its ID
+        $term_id = term_exists( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+
+        if ( 0 == $term_id || is_null( $term_id ) ) {
+            $result = wp_insert_term( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+        } else {
+            $term_id = $term_id['term_id'];
+            $result  = get_term( $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, ARRAY_A );
+        }
+
+        // Check for errors.
+        if ( is_wp_error( $result ) ) {
+            wl_write_log( 'wl_install_entity_type_data [ ' . $result->get_error_message() . ' ]' );
+            continue;
+        }
+
+        // Check if 'parent' corresponds to an actual term and get its ID.
+        if ( ! isset( $term['parents'] ) ) {
+            $term['parents'] = array();
+        }
+
+        $parent_ids = array();
+        foreach ( $term['parents'] as $parent_slug ) {
+            $parent_id    = get_term_by( 'slug', $parent_slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+            $parent_ids[] = intval( $parent_id->term_id );  // Note: int casting is suggested by Codex: http://codex.wordpress.org/Function_Reference/get_term_by
+        }
+
+        // Define a parent in the WP taxonomy style (not important for WL)
+        if ( empty( $parent_ids ) ) {
+            // No parent
+            $parent_id = 0;
+        } else {
+            // Get first parent
+            $parent_id = $parent_ids[0];
+        }
+
+        // Update term with description, slug and parent
+        wp_update_term( $result['term_id'], Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+            'name'        => $term['label'],
+            'slug'        => $slug,
+            'description' => $term['description'],
+            // We give to WP taxonomy just one parent. TODO: see if can give more than one
+            'parent'      => $parent_id,
+        ) );
+
+    }
 
 }
 
@@ -108,16 +108,16 @@ 
  */
 function wl_core_install_create_relation_instance_table() {
 
-	global $wpdb;
-	// global $wl_db_version;
-	$installed_version = get_option( 'wl_db_version' );
+    global $wpdb;
+    // global $wl_db_version;
+    $installed_version = get_option( 'wl_db_version' );
 
-	if ( WL_DB_VERSION != $installed_version ) {
-		$table_name      = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
-		$charset_collate = $wpdb->get_charset_collate();
+    if ( WL_DB_VERSION != $installed_version ) {
+        $table_name      = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
+        $charset_collate = $wpdb->get_charset_collate();
 
-		// Sql statement for the relation instances custom table
-		$sql = <<<EOF
+        // Sql statement for the relation instances custom table
+        $sql = <<<EOF
 			CREATE TABLE $table_name (
   				id int(11) NOT NULL AUTO_INCREMENT,
   				subject_id int(11) NOT NULL,
@@ -129,14 +129,14 @@ 
 			) $charset_collate;
 EOF;
 
-		// @see: https://codex.wordpress.org/Creating_Tables_with_Plugins
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-		$results = dbDelta( $sql );
+        // @see: https://codex.wordpress.org/Creating_Tables_with_Plugins
+        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        $results = dbDelta( $sql );
 
-		wl_write_log( $results );
+        wl_write_log( $results );
 
-		update_option( 'wl_db_version', WL_DB_VERSION );
-	}
+        update_option( 'wl_db_version', WL_DB_VERSION );
+    }
 }
 
 /**
@@ -147,10 +147,10 @@ 
  */
 function wl_core_upgrade_db_to_1_0() {
 
-	if ( ! get_option( 'wl_db_version' ) ) {
-		wl_core_install_entity_type_data();
-		wl_core_install_create_relation_instance_table();
-	}
+    if ( ! get_option( 'wl_db_version' ) ) {
+        wl_core_install_entity_type_data();
+        wl_core_install_create_relation_instance_table();
+    }
 
 }
 
@@ -163,31 +163,31 @@ 
  */
 function wl_core_upgrade_db_1_0_to_3_10() {
 
-	// If the DB version is less than 3.10, than flatten the txonomy.
-	if ( version_compare( get_option( 'wl_db_version' ), '3.9', '<=' ) ) {
+    // If the DB version is less than 3.10, than flatten the txonomy.
+    if ( version_compare( get_option( 'wl_db_version' ), '3.9', '<=' ) ) {
 
-		$term_slugs = array(
-			'thing',
-			'creative-work',
-			'event',
-			'organization',
-			'person',
-			'place',
-			'localbusiness',
-		);
+        $term_slugs = array(
+            'thing',
+            'creative-work',
+            'event',
+            'organization',
+            'person',
+            'place',
+            'localbusiness',
+        );
 
-		foreach ( $term_slugs as $slug ) {
+        foreach ( $term_slugs as $slug ) {
 
-			$term = get_term_by( 'slug', $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+            $term = get_term_by( 'slug', $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
 
-			// Set the term's parent to 0.
-			if ( $term ) {
-				wp_update_term( $term->term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
-					'parent' => 0,
-				) );
-			}
-		}
-	}
+            // Set the term's parent to 0.
+            if ( $term ) {
+                wp_update_term( $term->term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+                    'parent' => 0,
+                ) );
+            }
+        }
+    }
 
 }
 
@@ -200,14 +200,14 @@ 
  * @since 3.12.0
  */
 function wl_core_upgrade_db_3_10_3_12() {
-	/*
+    /*
 	 * As this upgrade functionality runs on the init hook, and the AMP plugin
 	 * initialization does the same, avoid possible race conditions by
 	 * deferring the actual flush to a later hook.
 	 */
-	add_action( 'wp_loaded', function () {
-		flush_rewrite_rules();
-	} );
+    add_action( 'wp_loaded', function () {
+        flush_rewrite_rules();
+    } );
 }
 
 /**
@@ -218,49 +218,49 @@ 
  * @since 3.14.0
  */
 function wl_core_upgrade_db_3_12_3_14() {
-	$result = wp_insert_term(
-		'Recipe',
-		Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
-		array(
-			'slug'        => 'recipe',
-			'description' => 'A Recipe.',
-		)
-	);
-
-	// Assign capabilities to manipulate entities to admins.
-	$admins = get_role( 'administrator' );
-
-	$admins->add_cap( 'edit_wordlift_entity' );
-	$admins->add_cap( 'edit_wordlift_entities' );
-	$admins->add_cap( 'edit_others_wordlift_entities' );
-	$admins->add_cap( 'publish_wordlift_entities' );
-	$admins->add_cap( 'read_private_wordlift_entities' );
-	$admins->add_cap( 'delete_wordlift_entity' );
-
-	// Assign capabilities to manipulate entities to editors.
-	$editors = get_role( 'editor' );
-
-	$editors->add_cap( 'edit_wordlift_entity' );
-	$editors->add_cap( 'edit_wordlift_entities' );
-	$editors->add_cap( 'edit_others_wordlift_entities' );
-	$editors->add_cap( 'publish_wordlift_entities' );
-	$editors->add_cap( 'read_private_wordlift_entities' );
-	$editors->add_cap( 'delete_wordlift_entity' );
+    $result = wp_insert_term(
+        'Recipe',
+        Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
+        array(
+            'slug'        => 'recipe',
+            'description' => 'A Recipe.',
+        )
+    );
+
+    // Assign capabilities to manipulate entities to admins.
+    $admins = get_role( 'administrator' );
+
+    $admins->add_cap( 'edit_wordlift_entity' );
+    $admins->add_cap( 'edit_wordlift_entities' );
+    $admins->add_cap( 'edit_others_wordlift_entities' );
+    $admins->add_cap( 'publish_wordlift_entities' );
+    $admins->add_cap( 'read_private_wordlift_entities' );
+    $admins->add_cap( 'delete_wordlift_entity' );
+
+    // Assign capabilities to manipulate entities to editors.
+    $editors = get_role( 'editor' );
+
+    $editors->add_cap( 'edit_wordlift_entity' );
+    $editors->add_cap( 'edit_wordlift_entities' );
+    $editors->add_cap( 'edit_others_wordlift_entities' );
+    $editors->add_cap( 'publish_wordlift_entities' );
+    $editors->add_cap( 'read_private_wordlift_entities' );
+    $editors->add_cap( 'delete_wordlift_entity' );
 
 }
 
 // Check db status on automated plugins updates
 function wl_core_update_db_check() {
 
-	if ( get_option( 'wl_db_version' ) != WL_DB_VERSION ) {
+    if ( get_option( 'wl_db_version' ) != WL_DB_VERSION ) {
 
-		wl_core_upgrade_db_to_1_0();
-		wl_core_upgrade_db_1_0_to_3_10();
-		wl_core_upgrade_db_3_10_3_12();
-		wl_core_upgrade_db_3_12_3_14();
-		update_option( 'wl_db_version', WL_DB_VERSION );
+        wl_core_upgrade_db_to_1_0();
+        wl_core_upgrade_db_1_0_to_3_10();
+        wl_core_upgrade_db_3_10_3_12();
+        wl_core_upgrade_db_3_12_3_14();
+        update_option( 'wl_db_version', WL_DB_VERSION );
 
-	}
+    }
 
 }
 

Spacing +46 added lines, -46 removed lines

@@ -52,37 +52,37 @@ 
 		),
 	);
 
-	foreach ( $terms as $slug => $term ) {
+	foreach ($terms as $slug => $term) {
 
 		// Create the term if it does not exist, then get its ID
-		$term_id = term_exists( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+		$term_id = term_exists($slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
 
-		if ( 0 == $term_id || is_null( $term_id ) ) {
-			$result = wp_insert_term( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+		if (0 == $term_id || is_null($term_id)) {
+			$result = wp_insert_term($slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
 		} else {
 			$term_id = $term_id['term_id'];
-			$result  = get_term( $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, ARRAY_A );
+			$result  = get_term($term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, ARRAY_A);
 		}
 
 		// Check for errors.
-		if ( is_wp_error( $result ) ) {
-			wl_write_log( 'wl_install_entity_type_data [ ' . $result->get_error_message() . ' ]' );
+		if (is_wp_error($result)) {
+			wl_write_log('wl_install_entity_type_data [ '.$result->get_error_message().' ]');
 			continue;
 		}
 
 		// Check if 'parent' corresponds to an actual term and get its ID.
-		if ( ! isset( $term['parents'] ) ) {
+		if ( ! isset($term['parents'])) {
 			$term['parents'] = array();
 		}
 
 		$parent_ids = array();
-		foreach ( $term['parents'] as $parent_slug ) {
-			$parent_id    = get_term_by( 'slug', $parent_slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-			$parent_ids[] = intval( $parent_id->term_id );  // Note: int casting is suggested by Codex: http://codex.wordpress.org/Function_Reference/get_term_by
+		foreach ($term['parents'] as $parent_slug) {
+			$parent_id    = get_term_by('slug', $parent_slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
+			$parent_ids[] = intval($parent_id->term_id); // Note: int casting is suggested by Codex: http://codex.wordpress.org/Function_Reference/get_term_by
 		}
 
 		// Define a parent in the WP taxonomy style (not important for WL)
-		if ( empty( $parent_ids ) ) {
+		if (empty($parent_ids)) {
 			// No parent
 			$parent_id = 0;
 		} else {
@@ -91,13 +91,13 @@ 
 		}
 
 		// Update term with description, slug and parent
-		wp_update_term( $result['term_id'], Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+		wp_update_term($result['term_id'], Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
 			'name'        => $term['label'],
 			'slug'        => $slug,
 			'description' => $term['description'],
 			// We give to WP taxonomy just one parent. TODO: see if can give more than one
 			'parent'      => $parent_id,
-		) );
+		));
 
 	}
 
@@ -110,10 +110,10 @@ 
 
 	global $wpdb;
 	// global $wl_db_version;
-	$installed_version = get_option( 'wl_db_version' );
+	$installed_version = get_option('wl_db_version');
 
-	if ( WL_DB_VERSION != $installed_version ) {
-		$table_name      = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
+	if (WL_DB_VERSION != $installed_version) {
+		$table_name      = $wpdb->prefix.WL_DB_RELATION_INSTANCES_TABLE_NAME;
 		$charset_collate = $wpdb->get_charset_collate();
 
 		// Sql statement for the relation instances custom table
@@ -130,12 +130,12 @@ 
 EOF;
 
 		// @see: https://codex.wordpress.org/Creating_Tables_with_Plugins
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-		$results = dbDelta( $sql );
+		require_once(ABSPATH.'wp-admin/includes/upgrade.php');
+		$results = dbDelta($sql);
 
-		wl_write_log( $results );
+		wl_write_log($results);
 
-		update_option( 'wl_db_version', WL_DB_VERSION );
+		update_option('wl_db_version', WL_DB_VERSION);
 	}
 }
 
@@ -147,7 +147,7 @@ 
  */
 function wl_core_upgrade_db_to_1_0() {
 
-	if ( ! get_option( 'wl_db_version' ) ) {
+	if ( ! get_option('wl_db_version')) {
 		wl_core_install_entity_type_data();
 		wl_core_install_create_relation_instance_table();
 	}
@@ -164,7 +164,7 @@ 
 function wl_core_upgrade_db_1_0_to_3_10() {
 
 	// If the DB version is less than 3.10, than flatten the txonomy.
-	if ( version_compare( get_option( 'wl_db_version' ), '3.9', '<=' ) ) {
+	if (version_compare(get_option('wl_db_version'), '3.9', '<=')) {
 
 		$term_slugs = array(
 			'thing',
@@ -176,15 +176,15 @@ 
 			'localbusiness',
 		);
 
-		foreach ( $term_slugs as $slug ) {
+		foreach ($term_slugs as $slug) {
 
-			$term = get_term_by( 'slug', $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+			$term = get_term_by('slug', $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
 
 			// Set the term's parent to 0.
-			if ( $term ) {
-				wp_update_term( $term->term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+			if ($term) {
+				wp_update_term($term->term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
 					'parent' => 0,
-				) );
+				));
 			}
 		}
 	}
@@ -205,7 +205,7 @@ 
 	 * initialization does the same, avoid possible race conditions by
 	 * deferring the actual flush to a later hook.
 	 */
-	add_action( 'wp_loaded', function () {
+	add_action('wp_loaded', function() {
 		flush_rewrite_rules();
 	} );
 }
@@ -228,40 +228,40 @@ 
 	);
 
 	// Assign capabilities to manipulate entities to admins.
-	$admins = get_role( 'administrator' );
+	$admins = get_role('administrator');
 
-	$admins->add_cap( 'edit_wordlift_entity' );
-	$admins->add_cap( 'edit_wordlift_entities' );
-	$admins->add_cap( 'edit_others_wordlift_entities' );
-	$admins->add_cap( 'publish_wordlift_entities' );
-	$admins->add_cap( 'read_private_wordlift_entities' );
-	$admins->add_cap( 'delete_wordlift_entity' );
+	$admins->add_cap('edit_wordlift_entity');
+	$admins->add_cap('edit_wordlift_entities');
+	$admins->add_cap('edit_others_wordlift_entities');
+	$admins->add_cap('publish_wordlift_entities');
+	$admins->add_cap('read_private_wordlift_entities');
+	$admins->add_cap('delete_wordlift_entity');
 
 	// Assign capabilities to manipulate entities to editors.
-	$editors = get_role( 'editor' );
+	$editors = get_role('editor');
 
-	$editors->add_cap( 'edit_wordlift_entity' );
-	$editors->add_cap( 'edit_wordlift_entities' );
-	$editors->add_cap( 'edit_others_wordlift_entities' );
-	$editors->add_cap( 'publish_wordlift_entities' );
-	$editors->add_cap( 'read_private_wordlift_entities' );
-	$editors->add_cap( 'delete_wordlift_entity' );
+	$editors->add_cap('edit_wordlift_entity');
+	$editors->add_cap('edit_wordlift_entities');
+	$editors->add_cap('edit_others_wordlift_entities');
+	$editors->add_cap('publish_wordlift_entities');
+	$editors->add_cap('read_private_wordlift_entities');
+	$editors->add_cap('delete_wordlift_entity');
 
 }
 
 // Check db status on automated plugins updates
 function wl_core_update_db_check() {
 
-	if ( get_option( 'wl_db_version' ) != WL_DB_VERSION ) {
+	if (get_option('wl_db_version') != WL_DB_VERSION) {
 
 		wl_core_upgrade_db_to_1_0();
 		wl_core_upgrade_db_1_0_to_3_10();
 		wl_core_upgrade_db_3_10_3_12();
 		wl_core_upgrade_db_3_12_3_14();
-		update_option( 'wl_db_version', WL_DB_VERSION );
+		update_option('wl_db_version', WL_DB_VERSION);
 
 	}
 
 }
 
-add_action( 'init', 'wl_core_update_db_check', 11 ); // need taxonomies and post type to be defined first
+add_action('init', 'wl_core_update_db_check', 11); // need taxonomies and post type to be defined first

src/includes/properties/class-wordlift-double-property-service.php

Indentation +9 added lines, -9 removed lines

@@ -16,15 +16,15 @@
  */
 class Wordlift_Double_Property_Service extends Wordlift_Simple_Property_Service {
 
-	/**
-	 * @inheritdoc
-	 */
-	function get( $post_id, $meta_key ) {
+    /**
+     * @inheritdoc
+     */
+    function get( $post_id, $meta_key ) {
 
-		// Map the result to a numeric value when possible.
-		return array_map( function ( $value ) {
-			return is_numeric( $value ) ? (double) $value : $value;
-		}, parent::get( $post_id, $meta_key ) );
-	}
+        // Map the result to a numeric value when possible.
+        return array_map( function ( $value ) {
+            return is_numeric( $value ) ? (double) $value : $value;
+        }, parent::get( $post_id, $meta_key ) );
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -19,12 +19,12 @@
 	/**
 	 * @inheritdoc
 	 */
-	function get( $post_id, $meta_key ) {
+	function get($post_id, $meta_key) {
 
 		// Map the result to a numeric value when possible.
-		return array_map( function ( $value ) {
-			return is_numeric( $value ) ? (double) $value : $value;
-		}, parent::get( $post_id, $meta_key ) );
+		return array_map(function($value) {
+			return is_numeric($value) ? (double) $value : $value;
+		}, parent::get($post_id, $meta_key));
 	}
 
 }

src/includes/properties/class-wordlift-property-getter-factory.php

Indentation +32 added lines, -32 removed lines

@@ -25,40 +25,40 @@
  */
 class Wordlift_Property_Getter_Factory {
 
-	/**
-	 * Create a {@link Wordlift_Property_Getter} instance.
-	 *
-	 * @since 3.8.0
-	 *
-	 * @param \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @return \Wordlift_Property_Getter A {@link Wordlift_Property_Getter} instance.
-	 */
-	public static function create( $entity_service ) {
+    /**
+     * Create a {@link Wordlift_Property_Getter} instance.
+     *
+     * @since 3.8.0
+     *
+     * @param \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
+     *
+     * @return \Wordlift_Property_Getter A {@link Wordlift_Property_Getter} instance.
+     */
+    public static function create( $entity_service ) {
 
-		$property_getter = new Wordlift_Property_Getter( new Wordlift_Simple_Property_Service() );
-		$property_getter->register( new Wordlift_Entity_Property_Service( $entity_service ), array(
-			Wordlift_Schema_Service::FIELD_FOUNDER,
-			Wordlift_Schema_Service::FIELD_AUTHOR,
-			Wordlift_Schema_Service::FIELD_KNOWS,
-			Wordlift_Schema_Service::FIELD_BIRTH_PLACE,
-			Wordlift_Schema_Service::FIELD_AFFILIATION,
-		) );
-		$property_getter->register( new Wordlift_Location_Property_Service( $entity_service ), array(
-			Wordlift_Schema_Service::FIELD_LOCATION,
-		) );
-		$property_getter->register( new Wordlift_Url_Property_Service(), array( Wordlift_Url_Property_Service::META_KEY ) );
-		$property_getter->register( new Wordlift_Double_Property_Service(), array(
-			Wordlift_Schema_Service::FIELD_GEO_LATITUDE,
-			Wordlift_Schema_Service::FIELD_GEO_LONGITUDE,
-		) );
+        $property_getter = new Wordlift_Property_Getter( new Wordlift_Simple_Property_Service() );
+        $property_getter->register( new Wordlift_Entity_Property_Service( $entity_service ), array(
+            Wordlift_Schema_Service::FIELD_FOUNDER,
+            Wordlift_Schema_Service::FIELD_AUTHOR,
+            Wordlift_Schema_Service::FIELD_KNOWS,
+            Wordlift_Schema_Service::FIELD_BIRTH_PLACE,
+            Wordlift_Schema_Service::FIELD_AFFILIATION,
+        ) );
+        $property_getter->register( new Wordlift_Location_Property_Service( $entity_service ), array(
+            Wordlift_Schema_Service::FIELD_LOCATION,
+        ) );
+        $property_getter->register( new Wordlift_Url_Property_Service(), array( Wordlift_Url_Property_Service::META_KEY ) );
+        $property_getter->register( new Wordlift_Double_Property_Service(), array(
+            Wordlift_Schema_Service::FIELD_GEO_LATITUDE,
+            Wordlift_Schema_Service::FIELD_GEO_LONGITUDE,
+        ) );
 
-		$property_getter->register( new Wordlift_Duration_Property_Service( $entity_service ), array(
-			Wordlift_Schema_Service::FIELD_PREP_TIME,
-			Wordlift_Schema_Service::FIELD_TOTAL_TIME,
-		) );
+        $property_getter->register( new Wordlift_Duration_Property_Service( $entity_service ), array(
+            Wordlift_Schema_Service::FIELD_PREP_TIME,
+            Wordlift_Schema_Service::FIELD_TOTAL_TIME,
+        ) );
 
-		return $property_getter;
-	}
+        return $property_getter;
+    }
 
 }

Spacing +18 added lines, -18 removed lines

@@ -7,13 +7,13 @@ 
  * @subpackage Wordlift/includes/properties
  */
 
-require_once( 'class-wordlift-property-getter.php' );
-require_once( 'class-wordlift-simple-property-service.php' );
-require_once( 'class-wordlift-entity-property-service.php' );
-require_once( 'class-wordlift-location-property-service.php' );
-require_once( 'class-wordlift-url-property-service.php' );
-require_once( 'class-wordlift-double-property-service.php' );
-require_once( 'class-wordlift-duration-property-service.php' );
+require_once('class-wordlift-property-getter.php');
+require_once('class-wordlift-simple-property-service.php');
+require_once('class-wordlift-entity-property-service.php');
+require_once('class-wordlift-location-property-service.php');
+require_once('class-wordlift-url-property-service.php');
+require_once('class-wordlift-double-property-service.php');
+require_once('class-wordlift-duration-property-service.php');
 
 /**
  * A Wordlift_Property_Getter_Factory, which instantiate a configured
@@ -34,29 +34,29 @@ 
 	 *
 	 * @return \Wordlift_Property_Getter A {@link Wordlift_Property_Getter} instance.
 	 */
-	public static function create( $entity_service ) {
+	public static function create($entity_service) {
 
-		$property_getter = new Wordlift_Property_Getter( new Wordlift_Simple_Property_Service() );
-		$property_getter->register( new Wordlift_Entity_Property_Service( $entity_service ), array(
+		$property_getter = new Wordlift_Property_Getter(new Wordlift_Simple_Property_Service());
+		$property_getter->register(new Wordlift_Entity_Property_Service($entity_service), array(
 			Wordlift_Schema_Service::FIELD_FOUNDER,
 			Wordlift_Schema_Service::FIELD_AUTHOR,
 			Wordlift_Schema_Service::FIELD_KNOWS,
 			Wordlift_Schema_Service::FIELD_BIRTH_PLACE,
 			Wordlift_Schema_Service::FIELD_AFFILIATION,
-		) );
-		$property_getter->register( new Wordlift_Location_Property_Service( $entity_service ), array(
+		));
+		$property_getter->register(new Wordlift_Location_Property_Service($entity_service), array(
 			Wordlift_Schema_Service::FIELD_LOCATION,
-		) );
-		$property_getter->register( new Wordlift_Url_Property_Service(), array( Wordlift_Url_Property_Service::META_KEY ) );
-		$property_getter->register( new Wordlift_Double_Property_Service(), array(
+		));
+		$property_getter->register(new Wordlift_Url_Property_Service(), array(Wordlift_Url_Property_Service::META_KEY));
+		$property_getter->register(new Wordlift_Double_Property_Service(), array(
 			Wordlift_Schema_Service::FIELD_GEO_LATITUDE,
 			Wordlift_Schema_Service::FIELD_GEO_LONGITUDE,
-		) );
+		));
 
-		$property_getter->register( new Wordlift_Duration_Property_Service( $entity_service ), array(
+		$property_getter->register(new Wordlift_Duration_Property_Service($entity_service), array(
 			Wordlift_Schema_Service::FIELD_PREP_TIME,
 			Wordlift_Schema_Service::FIELD_TOTAL_TIME,
-		) );
+		));
 
 		return $property_getter;
 	}

src/includes/properties/class-wordlift-duration-property-service.php

Indentation +9 added lines, -9 removed lines

@@ -19,20 +19,20 @@
  */
 class Wordlift_Duration_Property_Service extends Wordlift_Simple_Property_Service {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	function get( $post_id, $meta_key ) {
+    /**
+     * {@inheritdoc}
+     */
+    function get( $post_id, $meta_key ) {
 
-		/*
+        /*
 		 * Map the value in the meta
 		 * The UI for the meta date enable two forms, a number of minutes
 		 * or an h:mm format.
 		 * Both needs to be adjusted to the iso format.
 		 */
-		return array_map( function ( $value ) {
-			return 'PT' . str_replace( ':', 'H', $value ) . 'M';
-		}, parent::get( $post_id, $meta_key ) );
-	}
+        return array_map( function ( $value ) {
+            return 'PT' . str_replace( ':', 'H', $value ) . 'M';
+        }, parent::get( $post_id, $meta_key ) );
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	function get( $post_id, $meta_key ) {
+	function get($post_id, $meta_key) {
 
 		/*
 		 * Map the value in the meta
@@ -30,9 +30,9 @@ 
 		 * or an h:mm format.
 		 * Both needs to be adjusted to the iso format.
 		 */
-		return array_map( function ( $value ) {
-			return 'PT' . str_replace( ':', 'H', $value ) . 'M';
-		}, parent::get( $post_id, $meta_key ) );
+		return array_map(function($value) {
+			return 'PT'.str_replace(':', 'H', $value).'M';
+		}, parent::get($post_id, $meta_key));
 	}
 
 }

src/includes/class-wordlift-schema-url-property-service.php

Indentation +204 added lines, -204 removed lines

@@ -13,209 +13,209 @@
  */
 class Wordlift_Schema_Url_Property_Service extends Wordlift_Property_Service {
 
-	/**
-	 * The meta key used to store data for this property. We don't use wl_url to
-	 * avoid potential confusion about other URLs.
-	 *
-	 * @since 3.6.0
-	 */
-	const META_KEY = 'wl_schema_url';
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_rdf_predicate() {
-
-		return 'http://schema.org/url';
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_rdf_data_type() {
-
-		return 'xsd:anyURI';
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_data_type() {
-
-		return Wordlift_Schema_Service::DATA_TYPE_URI;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_cardinality() {
-
-		return INF;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_metabox_class() {
-
-		return 'WL_Metabox_Field';
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_metabox_label() {
-
-		return __( 'Web Site(s)', 'wordlift' );
-	}
-
-	/**
-	 * @var
-	 */
-	private $sparql_service;
-
-	/**
-	 * Create a Wordlift_Schema_Url_Property_Service instance.
-	 * @since 3.6.0
-	 *
-	 * @param Wordlift_Sparql_Service $sparql_service
-	 */
-	public function __construct( $sparql_service ) {
-		parent::__construct();
-
-		// Finally listen for metadata requests for this field.
-		$this->add_filter_get_post_metadata();
-
-		$this->sparql_service = $sparql_service;
-	}
-
-	/**
-	 * Get the schema:url value for the specified post/entity.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param int $post_id The post id.
-	 *
-	 * @return array|NULL The schema:url value or NULL if not set.
-	 */
-	public function get( $post_id ) {
-
-		// Get the schema:url values set in WP.
-		$values = get_post_meta( $post_id, self::META_KEY, false );
-
-		// If the property has never been set, we set its default value the first
-		// time to <permalink>.
-		if ( 0 === count( $values ) ) {
-			return array( '<permalink>' );
-		}
-
-		// If there's only one value and that value is empty, we return NULL, i.e.
-		// variable not set.
-		if ( 1 === count( $values ) && empty( $values[0] ) ) {
-			return null;
-		}
-
-		// Finally return whatever values the editor set.
-		return $values;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function sanitize( $value ) {
-
-		// TODO: check that it's an URL or that is <permalink>
-
-		return $value;
-	}
-
-	/**
-	 * Generate an insert query that inserts the schema:url values for the specified
-	 * post.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param string $s       The subject URI.
-	 * @param int    $post_id The post id.
-	 *
-	 * @return string The insert query or an empty string.
-	 */
-	public function get_insert_query( $s, $post_id ) {
-
-		// If we have no value, return an empty string (no query).
-		if ( null === ( $values = $this->get( $post_id ) ) ) {
-			return '';
-		}
-
-		// Create the insert query.
-		$q = Wordlift_Query_Builder::new_instance()->insert();
-
-		// Add each schema:url, replacing <permalink> with the actual post permalink.
-		foreach ( $values as $value ) {
-			$q = $q->statement( $s, $this->get_rdf_predicate(), '<permalink>' === $value ? get_permalink( $post_id ) : $value, Wordlift_Query_Builder::OBJECT_URI );
-		}
-
-		// Build and return the query.
-		return $q->build();
-	}
-
-	/**
-	 * Get direct calls to read this meta and alter the response according to our
-	 * own strategy, i.e. if a value has never been set for this meta, then return
-	 * <permalink>.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param mixed  $value     The original value.
-	 * @param int    $object_id The post id.
-	 * @param string $meta_key  The meta key. We expect wl_schema_url or we return straight the value.
-	 * @param bool   $single    Whether to return a single value.
-	 *
-	 * @return array|mixed|NULL|string
-	 */
-	public function get_post_metadata( $value, $object_id, $meta_key, $single ) {
-
-		// It's not us, return the value.
-		if ( self::META_KEY !== $meta_key ) {
-			return $value;
-		}
-
-		$this->remove_filter_get_post_metadata();
-
-		$new_value = $this->get( $object_id );
-
-		$this->add_filter_get_post_metadata();
-
-		// If we must return a single value, but we don't have a value, then return an empty string.
-		if ( $single && ( is_null( $new_value ) || 0 === count( $new_value ) ) ) {
-			return '';
-		}
-
-		// If we have a value and we need to return it as single, return the first value.
-		if ( $single ) {
-			return $new_value[0];
-		}
-
-		// Otherwise return the array.
-		return $new_value;
-	}
-
-	private function add_filter_get_post_metadata() {
-
-		add_filter( 'get_post_metadata', array(
-			$this,
-			'get_post_metadata',
-		), 10, 4 );
-
-	}
-
-	private function remove_filter_get_post_metadata() {
-
-		remove_filter( 'get_post_metadata', array(
-			$this,
-			'get_post_metadata',
-		), 10 );
-
-	}
+    /**
+     * The meta key used to store data for this property. We don't use wl_url to
+     * avoid potential confusion about other URLs.
+     *
+     * @since 3.6.0
+     */
+    const META_KEY = 'wl_schema_url';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_rdf_predicate() {
+
+        return 'http://schema.org/url';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_rdf_data_type() {
+
+        return 'xsd:anyURI';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_data_type() {
+
+        return Wordlift_Schema_Service::DATA_TYPE_URI;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_cardinality() {
+
+        return INF;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_metabox_class() {
+
+        return 'WL_Metabox_Field';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_metabox_label() {
+
+        return __( 'Web Site(s)', 'wordlift' );
+    }
+
+    /**
+     * @var
+     */
+    private $sparql_service;
+
+    /**
+     * Create a Wordlift_Schema_Url_Property_Service instance.
+     * @since 3.6.0
+     *
+     * @param Wordlift_Sparql_Service $sparql_service
+     */
+    public function __construct( $sparql_service ) {
+        parent::__construct();
+
+        // Finally listen for metadata requests for this field.
+        $this->add_filter_get_post_metadata();
+
+        $this->sparql_service = $sparql_service;
+    }
+
+    /**
+     * Get the schema:url value for the specified post/entity.
+     *
+     * @since 3.6.0
+     *
+     * @param int $post_id The post id.
+     *
+     * @return array|NULL The schema:url value or NULL if not set.
+     */
+    public function get( $post_id ) {
+
+        // Get the schema:url values set in WP.
+        $values = get_post_meta( $post_id, self::META_KEY, false );
+
+        // If the property has never been set, we set its default value the first
+        // time to <permalink>.
+        if ( 0 === count( $values ) ) {
+            return array( '<permalink>' );
+        }
+
+        // If there's only one value and that value is empty, we return NULL, i.e.
+        // variable not set.
+        if ( 1 === count( $values ) && empty( $values[0] ) ) {
+            return null;
+        }
+
+        // Finally return whatever values the editor set.
+        return $values;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function sanitize( $value ) {
+
+        // TODO: check that it's an URL or that is <permalink>
+
+        return $value;
+    }
+
+    /**
+     * Generate an insert query that inserts the schema:url values for the specified
+     * post.
+     *
+     * @since 3.6.0
+     *
+     * @param string $s       The subject URI.
+     * @param int    $post_id The post id.
+     *
+     * @return string The insert query or an empty string.
+     */
+    public function get_insert_query( $s, $post_id ) {
+
+        // If we have no value, return an empty string (no query).
+        if ( null === ( $values = $this->get( $post_id ) ) ) {
+            return '';
+        }
+
+        // Create the insert query.
+        $q = Wordlift_Query_Builder::new_instance()->insert();
+
+        // Add each schema:url, replacing <permalink> with the actual post permalink.
+        foreach ( $values as $value ) {
+            $q = $q->statement( $s, $this->get_rdf_predicate(), '<permalink>' === $value ? get_permalink( $post_id ) : $value, Wordlift_Query_Builder::OBJECT_URI );
+        }
+
+        // Build and return the query.
+        return $q->build();
+    }
+
+    /**
+     * Get direct calls to read this meta and alter the response according to our
+     * own strategy, i.e. if a value has never been set for this meta, then return
+     * <permalink>.
+     *
+     * @since 3.6.0
+     *
+     * @param mixed  $value     The original value.
+     * @param int    $object_id The post id.
+     * @param string $meta_key  The meta key. We expect wl_schema_url or we return straight the value.
+     * @param bool   $single    Whether to return a single value.
+     *
+     * @return array|mixed|NULL|string
+     */
+    public function get_post_metadata( $value, $object_id, $meta_key, $single ) {
+
+        // It's not us, return the value.
+        if ( self::META_KEY !== $meta_key ) {
+            return $value;
+        }
+
+        $this->remove_filter_get_post_metadata();
+
+        $new_value = $this->get( $object_id );
+
+        $this->add_filter_get_post_metadata();
+
+        // If we must return a single value, but we don't have a value, then return an empty string.
+        if ( $single && ( is_null( $new_value ) || 0 === count( $new_value ) ) ) {
+            return '';
+        }
+
+        // If we have a value and we need to return it as single, return the first value.
+        if ( $single ) {
+            return $new_value[0];
+        }
+
+        // Otherwise return the array.
+        return $new_value;
+    }
+
+    private function add_filter_get_post_metadata() {
+
+        add_filter( 'get_post_metadata', array(
+            $this,
+            'get_post_metadata',
+        ), 10, 4 );
+
+    }
+
+    private function remove_filter_get_post_metadata() {
+
+        remove_filter( 'get_post_metadata', array(
+            $this,
+            'get_post_metadata',
+        ), 10 );
+
+    }
 
 }

Spacing +21 added lines, -21 removed lines

@@ -66,7 +66,7 @@ 
 	 */
 	public function get_metabox_label() {
 
-		return __( 'Web Site(s)', 'wordlift' );
+		return __('Web Site(s)', 'wordlift');
 	}
 
 	/**
@@ -80,7 +80,7 @@ 
 	 *
 	 * @param Wordlift_Sparql_Service $sparql_service
 	 */
-	public function __construct( $sparql_service ) {
+	public function __construct($sparql_service) {
 		parent::__construct();
 
 		// Finally listen for metadata requests for this field.
@@ -98,20 +98,20 @@ 
 	 *
 	 * @return array|NULL The schema:url value or NULL if not set.
 	 */
-	public function get( $post_id ) {
+	public function get($post_id) {
 
 		// Get the schema:url values set in WP.
-		$values = get_post_meta( $post_id, self::META_KEY, false );
+		$values = get_post_meta($post_id, self::META_KEY, false);
 
 		// If the property has never been set, we set its default value the first
 		// time to <permalink>.
-		if ( 0 === count( $values ) ) {
-			return array( '<permalink>' );
+		if (0 === count($values)) {
+			return array('<permalink>');
 		}
 
 		// If there's only one value and that value is empty, we return NULL, i.e.
 		// variable not set.
-		if ( 1 === count( $values ) && empty( $values[0] ) ) {
+		if (1 === count($values) && empty($values[0])) {
 			return null;
 		}
 
@@ -122,7 +122,7 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function sanitize( $value ) {
+	public function sanitize($value) {
 
 		// TODO: check that it's an URL or that is <permalink>
 
@@ -140,10 +140,10 @@ 
 	 *
 	 * @return string The insert query or an empty string.
 	 */
-	public function get_insert_query( $s, $post_id ) {
+	public function get_insert_query($s, $post_id) {
 
 		// If we have no value, return an empty string (no query).
-		if ( null === ( $values = $this->get( $post_id ) ) ) {
+		if (null === ($values = $this->get($post_id))) {
 			return '';
 		}
 
@@ -151,8 +151,8 @@ 
 		$q = Wordlift_Query_Builder::new_instance()->insert();
 
 		// Add each schema:url, replacing <permalink> with the actual post permalink.
-		foreach ( $values as $value ) {
-			$q = $q->statement( $s, $this->get_rdf_predicate(), '<permalink>' === $value ? get_permalink( $post_id ) : $value, Wordlift_Query_Builder::OBJECT_URI );
+		foreach ($values as $value) {
+			$q = $q->statement($s, $this->get_rdf_predicate(), '<permalink>' === $value ? get_permalink($post_id) : $value, Wordlift_Query_Builder::OBJECT_URI);
 		}
 
 		// Build and return the query.
@@ -173,26 +173,26 @@ 
 	 *
 	 * @return array|mixed|NULL|string
 	 */
-	public function get_post_metadata( $value, $object_id, $meta_key, $single ) {
+	public function get_post_metadata($value, $object_id, $meta_key, $single) {
 
 		// It's not us, return the value.
-		if ( self::META_KEY !== $meta_key ) {
+		if (self::META_KEY !== $meta_key) {
 			return $value;
 		}
 
 		$this->remove_filter_get_post_metadata();
 
-		$new_value = $this->get( $object_id );
+		$new_value = $this->get($object_id);
 
 		$this->add_filter_get_post_metadata();
 
 		// If we must return a single value, but we don't have a value, then return an empty string.
-		if ( $single && ( is_null( $new_value ) || 0 === count( $new_value ) ) ) {
+		if ($single && (is_null($new_value) || 0 === count($new_value))) {
 			return '';
 		}
 
 		// If we have a value and we need to return it as single, return the first value.
-		if ( $single ) {
+		if ($single) {
 			return $new_value[0];
 		}
 
@@ -202,19 +202,19 @@ 
 
 	private function add_filter_get_post_metadata() {
 
-		add_filter( 'get_post_metadata', array(
+		add_filter('get_post_metadata', array(
 			$this,
 			'get_post_metadata',
-		), 10, 4 );
+		), 10, 4);
 
 	}
 
 	private function remove_filter_get_post_metadata() {
 
-		remove_filter( 'get_post_metadata', array(
+		remove_filter('get_post_metadata', array(
 			$this,
 			'get_post_metadata',
-		), 10 );
+		), 10);
 
 	}
 

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

Indentation +945 added lines, -945 removed lines

@@ -15,950 +15,950 @@
  */
 class Wordlift_Schema_Service {
 
-	/**
-	 * The 'location created' field name.
-	 *
-	 * @since 3.5.0
-	 */
-	const FIELD_LOCATION_CREATED = 'wl_location_created';
-
-	/**
-	 * The 'topic' field name.
-	 *
-	 * @since 3.5.0
-	 */
-	const FIELD_TOPIC = 'wl_topic';
-
-	/**
-	 * The 'author' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_AUTHOR = 'wl_author';
-
-	/**
-	 * The 'same as' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_SAME_AS = 'entity_same_as';
-
-	/**
-	 * The 'date start' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_DATE_START = 'wl_cal_date_start';
-
-	/**
-	 * The 'date end' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_DATE_END = 'wl_cal_date_end';
-
-	/**
-	 * The 'location' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_LOCATION = 'wl_location';
-
-	/**
-	 * The 'founder' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_FOUNDER = 'wl_founder';
-
-	/**
-	 * The 'knows' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_KNOWS = 'wl_knows';
-
-	/**
-	 * The 'birth date' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_BIRTH_DATE = 'wl_birth_date';
-
-	/**
-	 * The 'birth place' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_BIRTH_PLACE = 'wl_birth_place';
-
-	/**
-	 * The 'latitude' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_GEO_LATITUDE = 'wl_geo_latitude';
-
-	/**
-	 * The 'longitude' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_GEO_LONGITUDE = 'wl_geo_longitude';
-
-	/**
-	 * The 'streetAddress' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_ADDRESS = 'wl_address';
-
-	/**
-	 * The 'postOfficeBoxNumber' field name.
-	 *
-	 * @since 3.3.0
-	 */
-	const FIELD_ADDRESS_PO_BOX = 'wl_address_post_office_box';
-
-	/**
-	 * The 'postalCode' field name.
-	 *
-	 * @since 3.3.0
-	 */
-	const FIELD_ADDRESS_POSTAL_CODE = 'wl_address_postal_code';
-
-	/**
-	 * The 'addressLocality' field name.
-	 *
-	 * @since 3.3.0
-	 */
-	const FIELD_ADDRESS_LOCALITY = 'wl_address_locality';
-	/**
-	 * The 'addressRegion' field name.
-	 *
-	 * @since 3.3.0
-	 */
-	const FIELD_ADDRESS_REGION = 'wl_address_region';
-
-	/**
-	 * The 'addressCountry' field name.
-	 *
-	 * @since 3.3.0
-	 */
-	const FIELD_ADDRESS_COUNTRY = 'wl_address_country';
-
-	/**
-	 * The 'entity type' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_ENTITY_TYPE = 'wl_entity_type_uri';
-
-	/**
-	 * The 'email' field name.
-	 *
-	 * @since 3.2.0
-	 */
-	const FIELD_EMAIL = 'wl_email';
-
-	/**
-	 * The 'affiliation' field name.
-	 *
-	 * @since 3.2.0
-	 */
-	const FIELD_AFFILIATION = 'wl_affiliation';
-
-	/**
-	 * The 'telephone' field name.
-	 *
-	 * @since 3.8.0
-	 */
-	const FIELD_TELEPHONE = 'wl_schema_telephone';
-
-	/**
-	 * The 'legalName' field name.
-	 *
-	 * @since 3.12.0
-	 */
-	const FIELD_LEGAL_NAME = 'wl_schema_legal_name';
-
-	/**
-	 * The 'recipeCuisine' field name.
-	 *
-	 * @since 3.14.0
-	 */
-	const FIELD_RECIPE_CUISINE = 'wl_schema_recipe_cuisine';
-
-	/**
-	 * The 'recipeIngredient' field name.
-	 *
-	 * @since 3.14.0
-	 */
-	const FIELD_RECIPE_INGREDIENT = 'wl_schema_recipe_ingredient';
-
-	/**
-	 * The 'recipeInstructions' field name.
-	 *
-	 * @since 3.14.0
-	 */
-	const FIELD_RECIPE_INSTRUCTIONS = 'wl_schema_recipe_instructions';
-
-	/**
-	 * The 'recipeYield' field name.
-	 *
-	 * @since 3.14.0
-	 */
-	const FIELD_RECIPE_YIELD = 'wl_schema_recipe_yield';
-
-	/**
-	 * The 'prepTime' field name.
-	 *
-	 * @since 3.14.0
-	 */
-	const FIELD_PREP_TIME = 'wl_schema_prep_time';
-
-	/**
-	 * The 'totalTime' field name.
-	 *
-	 * @since 3.14.0
-	 */
-	const FIELD_TOTAL_TIME = 'wl_schema_total_time';
-
-	/**
-	 * The 'URI' data type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const DATA_TYPE_URI = 'uri';
-
-	/**
-	 * The 'date' data type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const DATA_TYPE_DATE = 'date';
-
-	/**
-	 * The 'time' data type name.
-	 *
-	 * @since 3.14.0
-	 */
-	const DATA_TYPE_DURATION = 'duration';
-
-	/**
-	 * The 'double' data type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const DATA_TYPE_DOUBLE = 'double';
-
-	/**
-	 * The 'string' data type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const DATA_TYPE_STRING = 'string';
-
-	/**
-	 * The multiline text data type name.
-	 *
-	 * @since 3.14.0
-	 */
-	const DATA_TYPE_MULTILINE = 'multiline';
-
-	/**
-	 * The 'integer' data type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const DATA_TYPE_INTEGER = 'int';
-
-	/**
-	 * The 'boolean' data type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const DATA_TYPE_BOOLEAN = 'bool';
-
-	/**
-	 * The schema.org Event type URI.
-	 *
-	 * @since 3.1.0
-	 */
-	const SCHEMA_EVENT_TYPE = 'http://schema.org/Event';
-
-	/**
-	 * The Schema service singleton instance.
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Schema_Service $instance The Schema service singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * WordLift's schema.
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var array $schema WordLift's schema.
-	 */
-	private $schema;
-
-	/**
-	 * The Log service.
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log_service The Log service.
-	 */
-	private $log_service;
-
-	/**
-	 * Wordlift_Schema_Service constructor.
-	 *
-	 * @since 3.1.0
-	 */
-	public function __construct() {
-
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Schema_Service' );
-
-		// Create a singleton instance of the Schema service, useful to provide static functions to global functions.
-		self::$instance = $this;
-
-		// Set the taxonomy data.
-		// Note: parent types must be defined before child types.
-		$this->schema = array(
-			'thing'         => $this->get_thing_schema(),
-			'creative-work' => $this->get_creative_work_schema(),
-			'event'         => $this->get_event_schema(),
-			'organization'  => $this->get_organization_schema(),
-			'person'        => $this->get_person_schema(),
-			'place'         => $this->get_place_schema(),
-			'localbusiness' => $this->get_local_business_schema(),
-			'recipe'        => $this->get_recipe_schema(),
-		);
-
-	}
-
-	/**
-	 * Get a reference to the Schema service.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @return Wordlift_Schema_Service A reference to the Schema service.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get the properties for a field with the specified key. The key is used as
-	 * meta key when the field's value is stored in WordPress meta data table.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param string $key The field's key.
-	 *
-	 * @return null|array An array of field's properties or null if the field is not found.
-	 */
-	public function get_field( $key ) {
-
-		// Parse each schema's fields until we find the one we're looking for, then
-		// return its properties.
-		foreach ( $this->schema as $_ => $schema ) {
-
-			if ( ! isset( $schema['custom_fields'] ) ) {
-				break;
-			}
-
-			foreach ( $schema['custom_fields'] as $field => $props ) {
-				if ( $key === $field ) {
-					return $props;
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get the WordLift's schema.
-	 *
-	 * @param string $name The schema name.
-	 *
-	 * @return array|null An array with the schema configuration or NULL if the schema is not found.
-	 *
-	 * @since 3.1.0
-	 */
-	public function get_schema( $name ) {
-
-		// Check if the schema exists and, if not, return NULL.
-		if ( ! isset( $this->schema[ $name ] ) ) {
-			return null;
-		}
-
-		// Return the requested schema.
-		return $this->schema[ $name ];
-	}
-
-	/**
-	 * Get the WordLift's schema trough schema type uri.
-	 *
-	 * @param string $uri The schema uri.
-	 *
-	 * @return array|null An array with the schema configuration or NULL if the schema is not found.
-	 *
-	 * @since 3.3.0
-	 */
-	public function get_schema_by_uri( $uri ) {
-
-		foreach ( $this->schema as $name => $schema ) {
-			if ( $schema['uri'] === $uri ) {
-				return $schema;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get the 'thing' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.1.0
-	 */
-	private function get_thing_schema() {
-
-		return array(
-			'css_class'     => 'wl-thing',
-			'uri'           => 'http://schema.org/Thing',
-			'same_as'       => array( '*' ),
-			// set as default.
-			'custom_fields' => array(
-				self::FIELD_SAME_AS                            => array(
-					'predicate'   => 'http://schema.org/sameAs',
-					'type'        => self::DATA_TYPE_URI,
-					'export_type' => 'http://schema.org/Thing',
-					'constraints' => array(
-						'cardinality' => INF,
-					),
-					// We need a custom metabox.
-					'input_field' => 'sameas',
-				),
-				// Add the schema:url property.
-				Wordlift_Schema_Url_Property_Service::META_KEY => Wordlift_Schema_Url_Property_Service::get_instance()
-				                                                                                      ->get_compat_definition(),
-			),
-			// {{sameAs}} not present in the microdata template,
-			// because it is treated separately in *wl_content_embed_item_microdata*
-			'templates'     => array(
-				'subtitle' => '{{id}}',
-			),
-		);
-
-	}
-
-	/**
-	 * Get the 'creative work' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.1.0
-	 */
-	private function get_creative_work_schema() {
-
-		$schema = array(
-			'label'         => 'CreativeWork',
-			'description'   => 'A creative work (or a Music Album).',
-			'parents'       => array( 'thing' ),
-			// Give term slug as parent.
-			'css_class'     => 'wl-creative-work',
-			'uri'           => 'http://schema.org/CreativeWork',
-			'same_as'       => array(
-				'http://schema.org/MusicAlbum',
-				'http://schema.org/Product',
-			),
-			'custom_fields' => array(
-				self::FIELD_AUTHOR => array(
-					'predicate'   => 'http://schema.org/author',
-					'type'        => self::DATA_TYPE_URI,
-					'export_type' => 'http://schema.org/Person',
-					'constraints' => array(
-						'uri_type'    => array( 'Person', 'Organization' ),
-						'cardinality' => INF,
-					),
-				),
-			),
-			'templates'     => array(
-				'subtitle' => '{{id}}',
-			),
-		);
-
-		// Merge the custom fields with those provided by the thing schema.
-		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
-
-		return $schema;
-	}
-
-	/**
-	 * Get the 'event' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.1.0
-	 */
-	private function get_event_schema() {
-
-		$schema = array(
-			'label'         => 'Event',
-			'description'   => 'An event . ',
-			'parents'       => array( 'thing' ),
-			'css_class'     => 'wl-event',
-			'uri'           => self::SCHEMA_EVENT_TYPE,
-			'same_as'       => array( 'http://dbpedia.org/ontology/Event' ),
-			'custom_fields' => array(
-				self::FIELD_DATE_START => array(
-					'predicate'   => 'http://schema.org/startDate',
-					'type'        => self::DATA_TYPE_DATE,
-					'export_type' => 'xsd:datetime',
-					'constraints' => '',
-				),
-				self::FIELD_DATE_END   => array(
-					'predicate'   => 'http://schema.org/endDate',
-					'type'        => self::DATA_TYPE_DATE,
-					'export_type' => 'xsd:datetime',
-					'constraints' => '',
-				),
-				self::FIELD_LOCATION   => array(
-					'predicate'   => 'http://schema.org/location',
-					'type'        => self::DATA_TYPE_URI,
-					'export_type' => 'http://schema.org/PostalAddress',
-					'constraints' => array(
-						'uri_type'    => array( 'Place', 'LocalBusiness' ),
-						'cardinality' => INF,
-					),
-				),
-			),
-			'templates'     => array(
-				'subtitle' => '{{id}}',
-			),
-		);
-
-		// Merge the custom fields with those provided by the thing schema.
-		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
-
-		return $schema;
-	}
-
-	/**
-	 * Get the 'organization' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.1.0
-	 */
-	private function get_organization_schema() {
-
-		$schema = array(
-			'label'         => 'Organization',
-			'description'   => 'An organization, including a government or a newspaper.',
-			'parents'       => array( 'thing' ),
-			'css_class'     => 'wl-organization',
-			'uri'           => 'http://schema.org/Organization',
-			'same_as'       => array(
-				'http://rdf.freebase.com/ns/organization.organization',
-				'http://rdf.freebase.com/ns/government.government',
-				'http://schema.org/Newspaper',
-			),
-			'custom_fields' => array(
-				self::FIELD_LEGAL_NAME          => array(
-					'predicate'   => 'http://schema.org/legalName',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-				),
-				self::FIELD_FOUNDER             => array(
-					'predicate'   => 'http://schema.org/founder',
-					'type'        => self::DATA_TYPE_URI,
-					'export_type' => 'http://schema.org/Person',
-					'constraints' => array(
-						'uri_type'    => 'Person',
-						'cardinality' => INF,
-					),
-				),
-				self::FIELD_ADDRESS             => array(
-					'predicate'   => 'http://schema.org/streetAddress',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_ADDRESS_PO_BOX      => array(
-					'predicate'   => 'http://schema.org/postOfficeBoxNumber',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_ADDRESS_POSTAL_CODE => array(
-					'predicate'   => 'http://schema.org/postalCode',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_ADDRESS_LOCALITY    => array(
-					'predicate'   => 'http://schema.org/addressLocality',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_ADDRESS_REGION      => array(
-					'predicate'   => 'http://schema.org/addressRegion',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_ADDRESS_COUNTRY     => array(
-					'predicate'   => 'http://schema.org/addressCountry',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_EMAIL               => array(
-					'predicate'   => 'http://schema.org/email',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-				),
-				self::FIELD_TELEPHONE           => array(
-					'predicate'   => 'http://schema.org/telephone',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-				),
-			),
-			'templates'     => array(
-				'subtitle' => '{{id}}',
-			),
-		);
-
-		// Merge the custom fields with those provided by the thing schema.
-		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
-
-		return $schema;
-	}
-
-	/**
-	 * Get the 'person' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.1.0
-	 */
-	private function get_person_schema() {
-
-		$schema = array(
-			'label'         => 'Person',
-			'description'   => 'A person (or a music artist).',
-			'parents'       => array( 'thing' ),
-			'css_class'     => 'wl-person',
-			'uri'           => 'http://schema.org/Person',
-			'same_as'       => array(
-				'http://rdf.freebase.com/ns/people.person',
-				'http://rdf.freebase.com/ns/music.artist',
-				'http://dbpedia.org/class/yago/LivingPeople',
-			),
-			'custom_fields' => array(
-				self::FIELD_KNOWS       => array(
-					'predicate'   => 'http://schema.org/knows',
-					'type'        => self::DATA_TYPE_URI,
-					'export_type' => 'http://schema.org/Person',
-					'constraints' => array(
-						'uri_type'    => 'Person',
-						'cardinality' => INF,
-					),
-				),
-				self::FIELD_BIRTH_DATE  => array(
-					'predicate'   => 'http://schema.org/birthDate',
-					'type'        => self::DATA_TYPE_DATE,
-					'export_type' => 'xsd:date',
-					'constraints' => '',
-				),
-				self::FIELD_BIRTH_PLACE => array(
-					'predicate'   => 'http://schema.org/birthPlace',
-					'type'        => self::DATA_TYPE_URI,
-					'export_type' => 'http://schema.org/Place',
-					'constraints' => array(
-						'uri_type' => 'Place',
-					),
-				),
-				self::FIELD_AFFILIATION => array(
-					'predicate'   => 'http://schema.org/affiliation',
-					'type'        => self::DATA_TYPE_URI,
-					'export_type' => 'http://schema.org/Organization',
-					'constraints' => array(
-						'uri_type'    => array(
-							'Organization',
-							'LocalBusiness',
-						),
-						'cardinality' => INF,
-					),
-				),
-				self::FIELD_EMAIL       => array(
-					'predicate'   => 'http://schema.org/email',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => array(
-						'cardinality' => INF,
-					),
-				),
-			),
-			'templates'     => array(
-				'subtitle' => '{{id}}',
-			),
-		);
-
-		// Merge the custom fields with those provided by the thing schema.
-		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
-
-		return $schema;
-
-	}
-
-	/**
-	 * Get the 'place' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.1.0
-	 */
-	private function get_place_schema() {
-
-		$schema = array(
-			'label'         => 'Place',
-			'description'   => 'A place.',
-			'parents'       => array( 'thing' ),
-			'css_class'     => 'wl-place',
-			'uri'           => 'http://schema.org/Place',
-			'same_as'       => array(
-				'http://rdf.freebase.com/ns/location.location',
-				'http://www.opengis.net/gml/_Feature',
-			),
-			'custom_fields' => array(
-				self::FIELD_GEO_LATITUDE        => array(
-					'predicate'   => 'http://schema.org/latitude',
-					'type'        => self::DATA_TYPE_DOUBLE,
-					'export_type' => 'xsd:double',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'coordinates',
-				),
-				self::FIELD_GEO_LONGITUDE       => array(
-					'predicate'   => 'http://schema.org/longitude',
-					'type'        => self::DATA_TYPE_DOUBLE,
-					'export_type' => 'xsd:double',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'coordinates',
-				),
-				self::FIELD_ADDRESS             => array(
-					'predicate'   => 'http://schema.org/streetAddress',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_ADDRESS_PO_BOX      => array(
-					'predicate'   => 'http://schema.org/postOfficeBoxNumber',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_ADDRESS_POSTAL_CODE => array(
-					'predicate'   => 'http://schema.org/postalCode',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_ADDRESS_LOCALITY    => array(
-					'predicate'   => 'http://schema.org/addressLocality',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_ADDRESS_REGION      => array(
-					'predicate'   => 'http://schema.org/addressRegion',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_ADDRESS_COUNTRY     => array(
-					'predicate'   => 'http://schema.org/addressCountry',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-			),
-			'templates'     => array(
-				'subtitle' => '{{id}}',
-			),
-		);
-
-		// Merge the custom fields with those provided by the thing schema.
-		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
-
-		return $schema;
-	}
-
-	/**
-	 * Get the 'local business' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.1.0
-	 */
-	private function get_local_business_schema() {
-
-		$schema = array(
-			'label'         => 'LocalBusiness',
-			'description'   => 'A local business.',
-			'parents'       => array( 'place', 'organization' ),
-			'css_class'     => 'wl-local-business',
-			'uri'           => 'http://schema.org/LocalBusiness',
-			'same_as'       => array(
-				'http://rdf.freebase.com/ns/business/business_location',
-				'https://schema.org/Store',
-			),
-			'custom_fields' => array(),
-			'templates'     => array(
-				'subtitle' => '{{id}}',
-			),
-		);
-
-		// Merge the custom fields with those provided by the place and organization schema.
-		$place_schema            = $this->get_place_schema();
-		$organization_schema     = $this->get_organization_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $place_schema['custom_fields'], $organization_schema['custom_fields'] );
-
-		return $schema;
-	}
-
-	/**
-	 * Get the 'recipe' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.14.0
-	 */
-	private function get_recipe_schema() {
-
-		$schema = array(
-			'label'         => 'Recipe',
-			'description'   => 'A Recipe.',
-			'parents'       => array( 'CreativeWork' ),
-			'css_class'     => 'wl-recipe',
-			'uri'           => 'http://schema.org/Recipe',
-			'same_as'       => array(),
-			'templates'     => array(
-				'subtitle' => '{{id}}',
-			),
-			'custom_fields' => array(
-				self::FIELD_RECIPE_CUISINE      => array(
-					'predicate'   => 'http://schema.org/recipeCuisine',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					'metabox'     => array(
-						'label' => __( 'Recipe cuisine', 'wordlift' ),
-					),
-				),
-				self::FIELD_RECIPE_INGREDIENT   => array(
-					'predicate'   => 'http://schema.org/recipeIngredient',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => array(
-						'cardinality' => INF,
-					),
-					'metabox'     => array(
-						'label' => __( 'Recipe ingredient', 'wordlift' ),
-					),
-				),
-				self::FIELD_RECIPE_INSTRUCTIONS => array(
-					'predicate'   => 'http://schema.org/recipeInstructions',
-					'type'        => self::DATA_TYPE_MULTILINE,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					'metabox'     => array(
-						'class' => 'Wordlift_Metabox_Field_Multiline',
-						'label' => __( 'Recipe instructions', 'wordlift' ),
-					),
-				),
-				self::FIELD_RECIPE_YIELD        => array(
-					'predicate'   => 'http://schema.org/recipeYield',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					'metabox'     => array(
-						'label' => __( 'Recipe number of servings', 'wordlift' ),
-					),
-				),
-				self::FIELD_PREP_TIME           => array(
-					'predicate'   => 'http://schema.org/prepTime',
-					'type'        => self::DATA_TYPE_DURATION,
-					'export_type' => 'xsd:time',
-					'constraints' => '',
-					'metabox'     => array(
-						'class' => 'Wordlift_Metabox_Field_Duration',
-						'label' => __( 'Recipe preparation time', 'wordlift' ),
-					),
-				),
-				self::FIELD_TOTAL_TIME          => array(
-					'predicate'   => 'http://schema.org/totalTime',
-					'type'        => self::DATA_TYPE_DURATION,
-					'export_type' => 'xsd:time',
-					'constraints' => '',
-					'metabox'     => array(
-						'class' => 'Wordlift_Metabox_Field_Duration',
-						'label' => __( 'Recipe total time', 'wordlift' ),
-					),
-				),
-			),
-		);
-
-		// Merge the custom fields with those provided by the parent schema.
-		$parent_schema           = $this->get_creative_work_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $parent_schema['custom_fields'] );
-
-		return $schema;
-	}
+    /**
+     * The 'location created' field name.
+     *
+     * @since 3.5.0
+     */
+    const FIELD_LOCATION_CREATED = 'wl_location_created';
+
+    /**
+     * The 'topic' field name.
+     *
+     * @since 3.5.0
+     */
+    const FIELD_TOPIC = 'wl_topic';
+
+    /**
+     * The 'author' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_AUTHOR = 'wl_author';
+
+    /**
+     * The 'same as' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_SAME_AS = 'entity_same_as';
+
+    /**
+     * The 'date start' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_DATE_START = 'wl_cal_date_start';
+
+    /**
+     * The 'date end' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_DATE_END = 'wl_cal_date_end';
+
+    /**
+     * The 'location' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_LOCATION = 'wl_location';
+
+    /**
+     * The 'founder' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_FOUNDER = 'wl_founder';
+
+    /**
+     * The 'knows' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_KNOWS = 'wl_knows';
+
+    /**
+     * The 'birth date' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_BIRTH_DATE = 'wl_birth_date';
+
+    /**
+     * The 'birth place' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_BIRTH_PLACE = 'wl_birth_place';
+
+    /**
+     * The 'latitude' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_GEO_LATITUDE = 'wl_geo_latitude';
+
+    /**
+     * The 'longitude' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_GEO_LONGITUDE = 'wl_geo_longitude';
+
+    /**
+     * The 'streetAddress' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_ADDRESS = 'wl_address';
+
+    /**
+     * The 'postOfficeBoxNumber' field name.
+     *
+     * @since 3.3.0
+     */
+    const FIELD_ADDRESS_PO_BOX = 'wl_address_post_office_box';
+
+    /**
+     * The 'postalCode' field name.
+     *
+     * @since 3.3.0
+     */
+    const FIELD_ADDRESS_POSTAL_CODE = 'wl_address_postal_code';
+
+    /**
+     * The 'addressLocality' field name.
+     *
+     * @since 3.3.0
+     */
+    const FIELD_ADDRESS_LOCALITY = 'wl_address_locality';
+    /**
+     * The 'addressRegion' field name.
+     *
+     * @since 3.3.0
+     */
+    const FIELD_ADDRESS_REGION = 'wl_address_region';
+
+    /**
+     * The 'addressCountry' field name.
+     *
+     * @since 3.3.0
+     */
+    const FIELD_ADDRESS_COUNTRY = 'wl_address_country';
+
+    /**
+     * The 'entity type' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_ENTITY_TYPE = 'wl_entity_type_uri';
+
+    /**
+     * The 'email' field name.
+     *
+     * @since 3.2.0
+     */
+    const FIELD_EMAIL = 'wl_email';
+
+    /**
+     * The 'affiliation' field name.
+     *
+     * @since 3.2.0
+     */
+    const FIELD_AFFILIATION = 'wl_affiliation';
+
+    /**
+     * The 'telephone' field name.
+     *
+     * @since 3.8.0
+     */
+    const FIELD_TELEPHONE = 'wl_schema_telephone';
+
+    /**
+     * The 'legalName' field name.
+     *
+     * @since 3.12.0
+     */
+    const FIELD_LEGAL_NAME = 'wl_schema_legal_name';
+
+    /**
+     * The 'recipeCuisine' field name.
+     *
+     * @since 3.14.0
+     */
+    const FIELD_RECIPE_CUISINE = 'wl_schema_recipe_cuisine';
+
+    /**
+     * The 'recipeIngredient' field name.
+     *
+     * @since 3.14.0
+     */
+    const FIELD_RECIPE_INGREDIENT = 'wl_schema_recipe_ingredient';
+
+    /**
+     * The 'recipeInstructions' field name.
+     *
+     * @since 3.14.0
+     */
+    const FIELD_RECIPE_INSTRUCTIONS = 'wl_schema_recipe_instructions';
+
+    /**
+     * The 'recipeYield' field name.
+     *
+     * @since 3.14.0
+     */
+    const FIELD_RECIPE_YIELD = 'wl_schema_recipe_yield';
+
+    /**
+     * The 'prepTime' field name.
+     *
+     * @since 3.14.0
+     */
+    const FIELD_PREP_TIME = 'wl_schema_prep_time';
+
+    /**
+     * The 'totalTime' field name.
+     *
+     * @since 3.14.0
+     */
+    const FIELD_TOTAL_TIME = 'wl_schema_total_time';
+
+    /**
+     * The 'URI' data type name.
+     *
+     * @since 3.1.0
+     */
+    const DATA_TYPE_URI = 'uri';
+
+    /**
+     * The 'date' data type name.
+     *
+     * @since 3.1.0
+     */
+    const DATA_TYPE_DATE = 'date';
+
+    /**
+     * The 'time' data type name.
+     *
+     * @since 3.14.0
+     */
+    const DATA_TYPE_DURATION = 'duration';
+
+    /**
+     * The 'double' data type name.
+     *
+     * @since 3.1.0
+     */
+    const DATA_TYPE_DOUBLE = 'double';
+
+    /**
+     * The 'string' data type name.
+     *
+     * @since 3.1.0
+     */
+    const DATA_TYPE_STRING = 'string';
+
+    /**
+     * The multiline text data type name.
+     *
+     * @since 3.14.0
+     */
+    const DATA_TYPE_MULTILINE = 'multiline';
+
+    /**
+     * The 'integer' data type name.
+     *
+     * @since 3.1.0
+     */
+    const DATA_TYPE_INTEGER = 'int';
+
+    /**
+     * The 'boolean' data type name.
+     *
+     * @since 3.1.0
+     */
+    const DATA_TYPE_BOOLEAN = 'bool';
+
+    /**
+     * The schema.org Event type URI.
+     *
+     * @since 3.1.0
+     */
+    const SCHEMA_EVENT_TYPE = 'http://schema.org/Event';
+
+    /**
+     * The Schema service singleton instance.
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Schema_Service $instance The Schema service singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * WordLift's schema.
+     *
+     * @since  3.1.0
+     * @access private
+     * @var array $schema WordLift's schema.
+     */
+    private $schema;
+
+    /**
+     * The Log service.
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Log_Service $log_service The Log service.
+     */
+    private $log_service;
+
+    /**
+     * Wordlift_Schema_Service constructor.
+     *
+     * @since 3.1.0
+     */
+    public function __construct() {
+
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Schema_Service' );
+
+        // Create a singleton instance of the Schema service, useful to provide static functions to global functions.
+        self::$instance = $this;
+
+        // Set the taxonomy data.
+        // Note: parent types must be defined before child types.
+        $this->schema = array(
+            'thing'         => $this->get_thing_schema(),
+            'creative-work' => $this->get_creative_work_schema(),
+            'event'         => $this->get_event_schema(),
+            'organization'  => $this->get_organization_schema(),
+            'person'        => $this->get_person_schema(),
+            'place'         => $this->get_place_schema(),
+            'localbusiness' => $this->get_local_business_schema(),
+            'recipe'        => $this->get_recipe_schema(),
+        );
+
+    }
+
+    /**
+     * Get a reference to the Schema service.
+     *
+     * @since 3.1.0
+     *
+     * @return Wordlift_Schema_Service A reference to the Schema service.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get the properties for a field with the specified key. The key is used as
+     * meta key when the field's value is stored in WordPress meta data table.
+     *
+     * @since 3.6.0
+     *
+     * @param string $key The field's key.
+     *
+     * @return null|array An array of field's properties or null if the field is not found.
+     */
+    public function get_field( $key ) {
+
+        // Parse each schema's fields until we find the one we're looking for, then
+        // return its properties.
+        foreach ( $this->schema as $_ => $schema ) {
+
+            if ( ! isset( $schema['custom_fields'] ) ) {
+                break;
+            }
+
+            foreach ( $schema['custom_fields'] as $field => $props ) {
+                if ( $key === $field ) {
+                    return $props;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the WordLift's schema.
+     *
+     * @param string $name The schema name.
+     *
+     * @return array|null An array with the schema configuration or NULL if the schema is not found.
+     *
+     * @since 3.1.0
+     */
+    public function get_schema( $name ) {
+
+        // Check if the schema exists and, if not, return NULL.
+        if ( ! isset( $this->schema[ $name ] ) ) {
+            return null;
+        }
+
+        // Return the requested schema.
+        return $this->schema[ $name ];
+    }
+
+    /**
+     * Get the WordLift's schema trough schema type uri.
+     *
+     * @param string $uri The schema uri.
+     *
+     * @return array|null An array with the schema configuration or NULL if the schema is not found.
+     *
+     * @since 3.3.0
+     */
+    public function get_schema_by_uri( $uri ) {
+
+        foreach ( $this->schema as $name => $schema ) {
+            if ( $schema['uri'] === $uri ) {
+                return $schema;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the 'thing' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.1.0
+     */
+    private function get_thing_schema() {
+
+        return array(
+            'css_class'     => 'wl-thing',
+            'uri'           => 'http://schema.org/Thing',
+            'same_as'       => array( '*' ),
+            // set as default.
+            'custom_fields' => array(
+                self::FIELD_SAME_AS                            => array(
+                    'predicate'   => 'http://schema.org/sameAs',
+                    'type'        => self::DATA_TYPE_URI,
+                    'export_type' => 'http://schema.org/Thing',
+                    'constraints' => array(
+                        'cardinality' => INF,
+                    ),
+                    // We need a custom metabox.
+                    'input_field' => 'sameas',
+                ),
+                // Add the schema:url property.
+                Wordlift_Schema_Url_Property_Service::META_KEY => Wordlift_Schema_Url_Property_Service::get_instance()
+                                                                                                        ->get_compat_definition(),
+            ),
+            // {{sameAs}} not present in the microdata template,
+            // because it is treated separately in *wl_content_embed_item_microdata*
+            'templates'     => array(
+                'subtitle' => '{{id}}',
+            ),
+        );
+
+    }
+
+    /**
+     * Get the 'creative work' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.1.0
+     */
+    private function get_creative_work_schema() {
+
+        $schema = array(
+            'label'         => 'CreativeWork',
+            'description'   => 'A creative work (or a Music Album).',
+            'parents'       => array( 'thing' ),
+            // Give term slug as parent.
+            'css_class'     => 'wl-creative-work',
+            'uri'           => 'http://schema.org/CreativeWork',
+            'same_as'       => array(
+                'http://schema.org/MusicAlbum',
+                'http://schema.org/Product',
+            ),
+            'custom_fields' => array(
+                self::FIELD_AUTHOR => array(
+                    'predicate'   => 'http://schema.org/author',
+                    'type'        => self::DATA_TYPE_URI,
+                    'export_type' => 'http://schema.org/Person',
+                    'constraints' => array(
+                        'uri_type'    => array( 'Person', 'Organization' ),
+                        'cardinality' => INF,
+                    ),
+                ),
+            ),
+            'templates'     => array(
+                'subtitle' => '{{id}}',
+            ),
+        );
+
+        // Merge the custom fields with those provided by the thing schema.
+        $thing_schema            = $this->get_thing_schema();
+        $schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+
+        return $schema;
+    }
+
+    /**
+     * Get the 'event' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.1.0
+     */
+    private function get_event_schema() {
+
+        $schema = array(
+            'label'         => 'Event',
+            'description'   => 'An event . ',
+            'parents'       => array( 'thing' ),
+            'css_class'     => 'wl-event',
+            'uri'           => self::SCHEMA_EVENT_TYPE,
+            'same_as'       => array( 'http://dbpedia.org/ontology/Event' ),
+            'custom_fields' => array(
+                self::FIELD_DATE_START => array(
+                    'predicate'   => 'http://schema.org/startDate',
+                    'type'        => self::DATA_TYPE_DATE,
+                    'export_type' => 'xsd:datetime',
+                    'constraints' => '',
+                ),
+                self::FIELD_DATE_END   => array(
+                    'predicate'   => 'http://schema.org/endDate',
+                    'type'        => self::DATA_TYPE_DATE,
+                    'export_type' => 'xsd:datetime',
+                    'constraints' => '',
+                ),
+                self::FIELD_LOCATION   => array(
+                    'predicate'   => 'http://schema.org/location',
+                    'type'        => self::DATA_TYPE_URI,
+                    'export_type' => 'http://schema.org/PostalAddress',
+                    'constraints' => array(
+                        'uri_type'    => array( 'Place', 'LocalBusiness' ),
+                        'cardinality' => INF,
+                    ),
+                ),
+            ),
+            'templates'     => array(
+                'subtitle' => '{{id}}',
+            ),
+        );
+
+        // Merge the custom fields with those provided by the thing schema.
+        $thing_schema            = $this->get_thing_schema();
+        $schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+
+        return $schema;
+    }
+
+    /**
+     * Get the 'organization' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.1.0
+     */
+    private function get_organization_schema() {
+
+        $schema = array(
+            'label'         => 'Organization',
+            'description'   => 'An organization, including a government or a newspaper.',
+            'parents'       => array( 'thing' ),
+            'css_class'     => 'wl-organization',
+            'uri'           => 'http://schema.org/Organization',
+            'same_as'       => array(
+                'http://rdf.freebase.com/ns/organization.organization',
+                'http://rdf.freebase.com/ns/government.government',
+                'http://schema.org/Newspaper',
+            ),
+            'custom_fields' => array(
+                self::FIELD_LEGAL_NAME          => array(
+                    'predicate'   => 'http://schema.org/legalName',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                ),
+                self::FIELD_FOUNDER             => array(
+                    'predicate'   => 'http://schema.org/founder',
+                    'type'        => self::DATA_TYPE_URI,
+                    'export_type' => 'http://schema.org/Person',
+                    'constraints' => array(
+                        'uri_type'    => 'Person',
+                        'cardinality' => INF,
+                    ),
+                ),
+                self::FIELD_ADDRESS             => array(
+                    'predicate'   => 'http://schema.org/streetAddress',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_ADDRESS_PO_BOX      => array(
+                    'predicate'   => 'http://schema.org/postOfficeBoxNumber',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_ADDRESS_POSTAL_CODE => array(
+                    'predicate'   => 'http://schema.org/postalCode',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_ADDRESS_LOCALITY    => array(
+                    'predicate'   => 'http://schema.org/addressLocality',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_ADDRESS_REGION      => array(
+                    'predicate'   => 'http://schema.org/addressRegion',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_ADDRESS_COUNTRY     => array(
+                    'predicate'   => 'http://schema.org/addressCountry',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_EMAIL               => array(
+                    'predicate'   => 'http://schema.org/email',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                ),
+                self::FIELD_TELEPHONE           => array(
+                    'predicate'   => 'http://schema.org/telephone',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                ),
+            ),
+            'templates'     => array(
+                'subtitle' => '{{id}}',
+            ),
+        );
+
+        // Merge the custom fields with those provided by the thing schema.
+        $thing_schema            = $this->get_thing_schema();
+        $schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+
+        return $schema;
+    }
+
+    /**
+     * Get the 'person' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.1.0
+     */
+    private function get_person_schema() {
+
+        $schema = array(
+            'label'         => 'Person',
+            'description'   => 'A person (or a music artist).',
+            'parents'       => array( 'thing' ),
+            'css_class'     => 'wl-person',
+            'uri'           => 'http://schema.org/Person',
+            'same_as'       => array(
+                'http://rdf.freebase.com/ns/people.person',
+                'http://rdf.freebase.com/ns/music.artist',
+                'http://dbpedia.org/class/yago/LivingPeople',
+            ),
+            'custom_fields' => array(
+                self::FIELD_KNOWS       => array(
+                    'predicate'   => 'http://schema.org/knows',
+                    'type'        => self::DATA_TYPE_URI,
+                    'export_type' => 'http://schema.org/Person',
+                    'constraints' => array(
+                        'uri_type'    => 'Person',
+                        'cardinality' => INF,
+                    ),
+                ),
+                self::FIELD_BIRTH_DATE  => array(
+                    'predicate'   => 'http://schema.org/birthDate',
+                    'type'        => self::DATA_TYPE_DATE,
+                    'export_type' => 'xsd:date',
+                    'constraints' => '',
+                ),
+                self::FIELD_BIRTH_PLACE => array(
+                    'predicate'   => 'http://schema.org/birthPlace',
+                    'type'        => self::DATA_TYPE_URI,
+                    'export_type' => 'http://schema.org/Place',
+                    'constraints' => array(
+                        'uri_type' => 'Place',
+                    ),
+                ),
+                self::FIELD_AFFILIATION => array(
+                    'predicate'   => 'http://schema.org/affiliation',
+                    'type'        => self::DATA_TYPE_URI,
+                    'export_type' => 'http://schema.org/Organization',
+                    'constraints' => array(
+                        'uri_type'    => array(
+                            'Organization',
+                            'LocalBusiness',
+                        ),
+                        'cardinality' => INF,
+                    ),
+                ),
+                self::FIELD_EMAIL       => array(
+                    'predicate'   => 'http://schema.org/email',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => array(
+                        'cardinality' => INF,
+                    ),
+                ),
+            ),
+            'templates'     => array(
+                'subtitle' => '{{id}}',
+            ),
+        );
+
+        // Merge the custom fields with those provided by the thing schema.
+        $thing_schema            = $this->get_thing_schema();
+        $schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+
+        return $schema;
+
+    }
+
+    /**
+     * Get the 'place' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.1.0
+     */
+    private function get_place_schema() {
+
+        $schema = array(
+            'label'         => 'Place',
+            'description'   => 'A place.',
+            'parents'       => array( 'thing' ),
+            'css_class'     => 'wl-place',
+            'uri'           => 'http://schema.org/Place',
+            'same_as'       => array(
+                'http://rdf.freebase.com/ns/location.location',
+                'http://www.opengis.net/gml/_Feature',
+            ),
+            'custom_fields' => array(
+                self::FIELD_GEO_LATITUDE        => array(
+                    'predicate'   => 'http://schema.org/latitude',
+                    'type'        => self::DATA_TYPE_DOUBLE,
+                    'export_type' => 'xsd:double',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'coordinates',
+                ),
+                self::FIELD_GEO_LONGITUDE       => array(
+                    'predicate'   => 'http://schema.org/longitude',
+                    'type'        => self::DATA_TYPE_DOUBLE,
+                    'export_type' => 'xsd:double',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'coordinates',
+                ),
+                self::FIELD_ADDRESS             => array(
+                    'predicate'   => 'http://schema.org/streetAddress',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_ADDRESS_PO_BOX      => array(
+                    'predicate'   => 'http://schema.org/postOfficeBoxNumber',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_ADDRESS_POSTAL_CODE => array(
+                    'predicate'   => 'http://schema.org/postalCode',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_ADDRESS_LOCALITY    => array(
+                    'predicate'   => 'http://schema.org/addressLocality',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_ADDRESS_REGION      => array(
+                    'predicate'   => 'http://schema.org/addressRegion',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_ADDRESS_COUNTRY     => array(
+                    'predicate'   => 'http://schema.org/addressCountry',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+            ),
+            'templates'     => array(
+                'subtitle' => '{{id}}',
+            ),
+        );
+
+        // Merge the custom fields with those provided by the thing schema.
+        $thing_schema            = $this->get_thing_schema();
+        $schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+
+        return $schema;
+    }
+
+    /**
+     * Get the 'local business' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.1.0
+     */
+    private function get_local_business_schema() {
+
+        $schema = array(
+            'label'         => 'LocalBusiness',
+            'description'   => 'A local business.',
+            'parents'       => array( 'place', 'organization' ),
+            'css_class'     => 'wl-local-business',
+            'uri'           => 'http://schema.org/LocalBusiness',
+            'same_as'       => array(
+                'http://rdf.freebase.com/ns/business/business_location',
+                'https://schema.org/Store',
+            ),
+            'custom_fields' => array(),
+            'templates'     => array(
+                'subtitle' => '{{id}}',
+            ),
+        );
+
+        // Merge the custom fields with those provided by the place and organization schema.
+        $place_schema            = $this->get_place_schema();
+        $organization_schema     = $this->get_organization_schema();
+        $schema['custom_fields'] = array_merge( $schema['custom_fields'], $place_schema['custom_fields'], $organization_schema['custom_fields'] );
+
+        return $schema;
+    }
+
+    /**
+     * Get the 'recipe' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.14.0
+     */
+    private function get_recipe_schema() {
+
+        $schema = array(
+            'label'         => 'Recipe',
+            'description'   => 'A Recipe.',
+            'parents'       => array( 'CreativeWork' ),
+            'css_class'     => 'wl-recipe',
+            'uri'           => 'http://schema.org/Recipe',
+            'same_as'       => array(),
+            'templates'     => array(
+                'subtitle' => '{{id}}',
+            ),
+            'custom_fields' => array(
+                self::FIELD_RECIPE_CUISINE      => array(
+                    'predicate'   => 'http://schema.org/recipeCuisine',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    'metabox'     => array(
+                        'label' => __( 'Recipe cuisine', 'wordlift' ),
+                    ),
+                ),
+                self::FIELD_RECIPE_INGREDIENT   => array(
+                    'predicate'   => 'http://schema.org/recipeIngredient',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => array(
+                        'cardinality' => INF,
+                    ),
+                    'metabox'     => array(
+                        'label' => __( 'Recipe ingredient', 'wordlift' ),
+                    ),
+                ),
+                self::FIELD_RECIPE_INSTRUCTIONS => array(
+                    'predicate'   => 'http://schema.org/recipeInstructions',
+                    'type'        => self::DATA_TYPE_MULTILINE,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    'metabox'     => array(
+                        'class' => 'Wordlift_Metabox_Field_Multiline',
+                        'label' => __( 'Recipe instructions', 'wordlift' ),
+                    ),
+                ),
+                self::FIELD_RECIPE_YIELD        => array(
+                    'predicate'   => 'http://schema.org/recipeYield',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    'metabox'     => array(
+                        'label' => __( 'Recipe number of servings', 'wordlift' ),
+                    ),
+                ),
+                self::FIELD_PREP_TIME           => array(
+                    'predicate'   => 'http://schema.org/prepTime',
+                    'type'        => self::DATA_TYPE_DURATION,
+                    'export_type' => 'xsd:time',
+                    'constraints' => '',
+                    'metabox'     => array(
+                        'class' => 'Wordlift_Metabox_Field_Duration',
+                        'label' => __( 'Recipe preparation time', 'wordlift' ),
+                    ),
+                ),
+                self::FIELD_TOTAL_TIME          => array(
+                    'predicate'   => 'http://schema.org/totalTime',
+                    'type'        => self::DATA_TYPE_DURATION,
+                    'export_type' => 'xsd:time',
+                    'constraints' => '',
+                    'metabox'     => array(
+                        'class' => 'Wordlift_Metabox_Field_Duration',
+                        'label' => __( 'Recipe total time', 'wordlift' ),
+                    ),
+                ),
+            ),
+        );
+
+        // Merge the custom fields with those provided by the parent schema.
+        $parent_schema           = $this->get_creative_work_schema();
+        $schema['custom_fields'] = array_merge( $schema['custom_fields'], $parent_schema['custom_fields'] );
+
+        return $schema;
+    }
 
 }

Spacing +36 added lines, -36 removed lines

@@ -321,7 +321,7 @@ 
 	 */
 	public function __construct() {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Schema_Service' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_Schema_Service');
 
 		// Create a singleton instance of the Schema service, useful to provide static functions to global functions.
 		self::$instance = $this;
@@ -363,18 +363,18 @@ 
 	 *
 	 * @return null|array An array of field's properties or null if the field is not found.
 	 */
-	public function get_field( $key ) {
+	public function get_field($key) {
 
 		// Parse each schema's fields until we find the one we're looking for, then
 		// return its properties.
-		foreach ( $this->schema as $_ => $schema ) {
+		foreach ($this->schema as $_ => $schema) {
 
-			if ( ! isset( $schema['custom_fields'] ) ) {
+			if ( ! isset($schema['custom_fields'])) {
 				break;
 			}
 
-			foreach ( $schema['custom_fields'] as $field => $props ) {
-				if ( $key === $field ) {
+			foreach ($schema['custom_fields'] as $field => $props) {
+				if ($key === $field) {
 					return $props;
 				}
 			}
@@ -392,15 +392,15 @@ 
 	 *
 	 * @since 3.1.0
 	 */
-	public function get_schema( $name ) {
+	public function get_schema($name) {
 
 		// Check if the schema exists and, if not, return NULL.
-		if ( ! isset( $this->schema[ $name ] ) ) {
+		if ( ! isset($this->schema[$name])) {
 			return null;
 		}
 
 		// Return the requested schema.
-		return $this->schema[ $name ];
+		return $this->schema[$name];
 	}
 
 	/**
@@ -412,10 +412,10 @@ 
 	 *
 	 * @since 3.3.0
 	 */
-	public function get_schema_by_uri( $uri ) {
+	public function get_schema_by_uri($uri) {
 
-		foreach ( $this->schema as $name => $schema ) {
-			if ( $schema['uri'] === $uri ) {
+		foreach ($this->schema as $name => $schema) {
+			if ($schema['uri'] === $uri) {
 				return $schema;
 			}
 		}
@@ -435,7 +435,7 @@ 
 		return array(
 			'css_class'     => 'wl-thing',
 			'uri'           => 'http://schema.org/Thing',
-			'same_as'       => array( '*' ),
+			'same_as'       => array('*'),
 			// set as default.
 			'custom_fields' => array(
 				self::FIELD_SAME_AS                            => array(
@@ -473,7 +473,7 @@ 
 		$schema = array(
 			'label'         => 'CreativeWork',
 			'description'   => 'A creative work (or a Music Album).',
-			'parents'       => array( 'thing' ),
+			'parents'       => array('thing'),
 			// Give term slug as parent.
 			'css_class'     => 'wl-creative-work',
 			'uri'           => 'http://schema.org/CreativeWork',
@@ -487,7 +487,7 @@ 
 					'type'        => self::DATA_TYPE_URI,
 					'export_type' => 'http://schema.org/Person',
 					'constraints' => array(
-						'uri_type'    => array( 'Person', 'Organization' ),
+						'uri_type'    => array('Person', 'Organization'),
 						'cardinality' => INF,
 					),
 				),
@@ -499,7 +499,7 @@ 
 
 		// Merge the custom fields with those provided by the thing schema.
 		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+		$schema['custom_fields'] = array_merge($schema['custom_fields'], $thing_schema['custom_fields']);
 
 		return $schema;
 	}
@@ -516,10 +516,10 @@ 
 		$schema = array(
 			'label'         => 'Event',
 			'description'   => 'An event . ',
-			'parents'       => array( 'thing' ),
+			'parents'       => array('thing'),
 			'css_class'     => 'wl-event',
 			'uri'           => self::SCHEMA_EVENT_TYPE,
-			'same_as'       => array( 'http://dbpedia.org/ontology/Event' ),
+			'same_as'       => array('http://dbpedia.org/ontology/Event'),
 			'custom_fields' => array(
 				self::FIELD_DATE_START => array(
 					'predicate'   => 'http://schema.org/startDate',
@@ -538,7 +538,7 @@ 
 					'type'        => self::DATA_TYPE_URI,
 					'export_type' => 'http://schema.org/PostalAddress',
 					'constraints' => array(
-						'uri_type'    => array( 'Place', 'LocalBusiness' ),
+						'uri_type'    => array('Place', 'LocalBusiness'),
 						'cardinality' => INF,
 					),
 				),
@@ -550,7 +550,7 @@ 
 
 		// Merge the custom fields with those provided by the thing schema.
 		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+		$schema['custom_fields'] = array_merge($schema['custom_fields'], $thing_schema['custom_fields']);
 
 		return $schema;
 	}
@@ -567,7 +567,7 @@ 
 		$schema = array(
 			'label'         => 'Organization',
 			'description'   => 'An organization, including a government or a newspaper.',
-			'parents'       => array( 'thing' ),
+			'parents'       => array('thing'),
 			'css_class'     => 'wl-organization',
 			'uri'           => 'http://schema.org/Organization',
 			'same_as'       => array(
@@ -659,7 +659,7 @@ 
 
 		// Merge the custom fields with those provided by the thing schema.
 		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+		$schema['custom_fields'] = array_merge($schema['custom_fields'], $thing_schema['custom_fields']);
 
 		return $schema;
 	}
@@ -676,7 +676,7 @@ 
 		$schema = array(
 			'label'         => 'Person',
 			'description'   => 'A person (or a music artist).',
-			'parents'       => array( 'thing' ),
+			'parents'       => array('thing'),
 			'css_class'     => 'wl-person',
 			'uri'           => 'http://schema.org/Person',
 			'same_as'       => array(
@@ -736,7 +736,7 @@ 
 
 		// Merge the custom fields with those provided by the thing schema.
 		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+		$schema['custom_fields'] = array_merge($schema['custom_fields'], $thing_schema['custom_fields']);
 
 		return $schema;
 
@@ -754,7 +754,7 @@ 
 		$schema = array(
 			'label'         => 'Place',
 			'description'   => 'A place.',
-			'parents'       => array( 'thing' ),
+			'parents'       => array('thing'),
 			'css_class'     => 'wl-place',
 			'uri'           => 'http://schema.org/Place',
 			'same_as'       => array(
@@ -834,7 +834,7 @@ 
 
 		// Merge the custom fields with those provided by the thing schema.
 		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+		$schema['custom_fields'] = array_merge($schema['custom_fields'], $thing_schema['custom_fields']);
 
 		return $schema;
 	}
@@ -851,7 +851,7 @@ 
 		$schema = array(
 			'label'         => 'LocalBusiness',
 			'description'   => 'A local business.',
-			'parents'       => array( 'place', 'organization' ),
+			'parents'       => array('place', 'organization'),
 			'css_class'     => 'wl-local-business',
 			'uri'           => 'http://schema.org/LocalBusiness',
 			'same_as'       => array(
@@ -867,7 +867,7 @@ 
 		// Merge the custom fields with those provided by the place and organization schema.
 		$place_schema            = $this->get_place_schema();
 		$organization_schema     = $this->get_organization_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $place_schema['custom_fields'], $organization_schema['custom_fields'] );
+		$schema['custom_fields'] = array_merge($schema['custom_fields'], $place_schema['custom_fields'], $organization_schema['custom_fields']);
 
 		return $schema;
 	}
@@ -884,7 +884,7 @@ 
 		$schema = array(
 			'label'         => 'Recipe',
 			'description'   => 'A Recipe.',
-			'parents'       => array( 'CreativeWork' ),
+			'parents'       => array('CreativeWork'),
 			'css_class'     => 'wl-recipe',
 			'uri'           => 'http://schema.org/Recipe',
 			'same_as'       => array(),
@@ -898,7 +898,7 @@ 
 					'export_type' => 'xsd:string',
 					'constraints' => '',
 					'metabox'     => array(
-						'label' => __( 'Recipe cuisine', 'wordlift' ),
+						'label' => __('Recipe cuisine', 'wordlift'),
 					),
 				),
 				self::FIELD_RECIPE_INGREDIENT   => array(
@@ -909,7 +909,7 @@ 
 						'cardinality' => INF,
 					),
 					'metabox'     => array(
-						'label' => __( 'Recipe ingredient', 'wordlift' ),
+						'label' => __('Recipe ingredient', 'wordlift'),
 					),
 				),
 				self::FIELD_RECIPE_INSTRUCTIONS => array(
@@ -919,7 +919,7 @@ 
 					'constraints' => '',
 					'metabox'     => array(
 						'class' => 'Wordlift_Metabox_Field_Multiline',
-						'label' => __( 'Recipe instructions', 'wordlift' ),
+						'label' => __('Recipe instructions', 'wordlift'),
 					),
 				),
 				self::FIELD_RECIPE_YIELD        => array(
@@ -928,7 +928,7 @@ 
 					'export_type' => 'xsd:string',
 					'constraints' => '',
 					'metabox'     => array(
-						'label' => __( 'Recipe number of servings', 'wordlift' ),
+						'label' => __('Recipe number of servings', 'wordlift'),
 					),
 				),
 				self::FIELD_PREP_TIME           => array(
@@ -938,7 +938,7 @@ 
 					'constraints' => '',
 					'metabox'     => array(
 						'class' => 'Wordlift_Metabox_Field_Duration',
-						'label' => __( 'Recipe preparation time', 'wordlift' ),
+						'label' => __('Recipe preparation time', 'wordlift'),
 					),
 				),
 				self::FIELD_TOTAL_TIME          => array(
@@ -948,7 +948,7 @@ 
 					'constraints' => '',
 					'metabox'     => array(
 						'class' => 'Wordlift_Metabox_Field_Duration',
-						'label' => __( 'Recipe total time', 'wordlift' ),
+						'label' => __('Recipe total time', 'wordlift'),
 					),
 				),
 			),
@@ -956,7 +956,7 @@ 
 
 		// Merge the custom fields with those provided by the parent schema.
 		$parent_schema           = $this->get_creative_work_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $parent_schema['custom_fields'] );
+		$schema['custom_fields'] = array_merge($schema['custom_fields'], $parent_schema['custom_fields']);
 
 		return $schema;
 	}