insideout10 / wordlift-plugin

src/install/class-wordlift-install-1-0-0.php

Indentation +175 added lines, -175 removed lines

@@ -15,120 +15,120 @@ 
  * @subpackage Wordlift/install
  */
 class Wordlift_Install_1_0_0 extends Wordlift_Install {
-	/**
-	 * @inheritdoc
-	 */
-	protected static $version = '1.0.0';
-
-	/**
-	 * The WordLift entity type terms.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var array $terms The entity type terms.
-	 */
-	private static $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.',
-		),
-	);
-
-	/**
-	 * @inheritdoc
-	 */
-	public function install() {
-		// Set the dataset uri.
-		$this->set_dataset_uri();
-
-		// Create entity type terms.
-		$this->create_entity_type_terms();
-
-		// Create relations table.
-		$this->create_relation_instance_table();
-	}
-
-	/**
-	 * Create required entity type terms
-	 *
-	 * @since 3.18.0
-	 *
-	 * @return void
-	 */
-	private function create_entity_type_terms() {
-		$this->log->debug( 'Installing Entity Type data...' );
-
-		// Set the taxonomy data.
-		// Note: parent types must be defined before child types.
-		foreach ( self::$terms as $slug => $term ) {
-
-			// Check whether the term exists and create it if it doesn't.
-			$term_id = $this->get_term_or_create_if_not_exists( $slug );
-
-			// Bail if the term doesn't exists or it's not created.
-			if ( empty( $term_id ) ) {
-				continue;
-			}
-
-			// Update term with description, slug and parent.
-			$term = wp_update_term(
-				$term_id,
-				Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-				array(
-					'name'        => $term['label'],
-					'slug'        => $slug,
-					'description' => $term['description'],
-					// We give to WP taxonomy just one parent.
-					'parent'      => 0,
-				)
-			);
-
-			$this->log->trace( "Entity Type $slug installed with ID {$term['term_id']}." );
-
-		}
-
-		$this->log->debug( 'Entity Type data installed.' );
-	}
-
-	/**
-	 * Install custom relations table.
-	 *
-	 * @since 3.8.0
-	 *
-	 * @return void
-	 */
-	private function create_relation_instance_table() {
-		global $wpdb;
-
-		$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
+    /**
+     * @inheritdoc
+     */
+    protected static $version = '1.0.0';
+
+    /**
+     * The WordLift entity type terms.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var array $terms The entity type terms.
+     */
+    private static $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.',
+        ),
+    );
+
+    /**
+     * @inheritdoc
+     */
+    public function install() {
+        // Set the dataset uri.
+        $this->set_dataset_uri();
+
+        // Create entity type terms.
+        $this->create_entity_type_terms();
+
+        // Create relations table.
+        $this->create_relation_instance_table();
+    }
+
+    /**
+     * Create required entity type terms
+     *
+     * @since 3.18.0
+     *
+     * @return void
+     */
+    private function create_entity_type_terms() {
+        $this->log->debug( 'Installing Entity Type data...' );
+
+        // Set the taxonomy data.
+        // Note: parent types must be defined before child types.
+        foreach ( self::$terms as $slug => $term ) {
+
+            // Check whether the term exists and create it if it doesn't.
+            $term_id = $this->get_term_or_create_if_not_exists( $slug );
+
+            // Bail if the term doesn't exists or it's not created.
+            if ( empty( $term_id ) ) {
+                continue;
+            }
+
+            // Update term with description, slug and parent.
+            $term = wp_update_term(
+                $term_id,
+                Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                array(
+                    'name'        => $term['label'],
+                    'slug'        => $slug,
+                    'description' => $term['description'],
+                    // We give to WP taxonomy just one parent.
+                    'parent'      => 0,
+                )
+            );
+
+            $this->log->trace( "Entity Type $slug installed with ID {$term['term_id']}." );
+
+        }
+
+        $this->log->debug( 'Entity Type data installed.' );
+    }
+
+    /**
+     * Install custom relations table.
+     *
+     * @since 3.8.0
+     *
+     * @return void
+     */
+    private function create_relation_instance_table() {
+        global $wpdb;
+
+        $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
 			CREATE TABLE $table_name (
 					id int(11) NOT NULL AUTO_INCREMENT,
 					subject_id int(11) NOT NULL,
@@ -140,66 +140,66 @@ 
 			) $charset_collate;
 EOF;
 
-		// @see: https://codex.wordpress.org/Creating_Tables_with_Plugins
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-		$results = dbDelta( $sql );
-
-		$this->log->trace( 'create_relation_instance_table :: ' . var_export( $results, true ) );
-
-	}
-
-	/**
-	 * Configure the dataset uri.
-	 *
-	 * @since 3.18.0
-	 *
-	 * @return void
-	 */
-	private function set_dataset_uri() {
-		// Get the configuration service and load the key.
-		$configuration_service = Wordlift_Configuration_Service::get_instance();
-		$key                   = $configuration_service->get_key();
-
-		// If the key is not empty then set the dataset URI while sending
-		// the site URL.
-		if ( ! empty( $key ) ) {
-			$this->log->info( 'Updating the remote dataset URI...' );
-
-			$configuration_service->get_remote_dataset_uri( $key );
-		}
-
-	}
-
-	/**
-	 * Checks whether the term exists and create it if it doesn't.
-	 *
-	 * @since 3.18.0
-	 *
-	 * @param string $slug Term slug.
-	 *
-	 * @return mixed Term id if the term exists or if it's created. False on failure
-	 */
-	private function get_term_or_create_if_not_exists( $slug ) {
-		// Create the term if it does not exist, then get its ID.
-		$term_id = term_exists( $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-
-		if ( empty( $term_id ) ) {
-			// The term doesn't exists, so create it.
-			$maybe_term = wp_insert_term( $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-		} else {
-			// Get the term.
-			$maybe_term = get_term( $term_id['term_id'], Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, ARRAY_A );
-		}
-
-		// Check for errors.
-		if ( is_wp_error( $maybe_term ) ) {
-			$this->log->info( 'wl_install_entity_type_data [ ' . $maybe_term->get_error_message() . ' ]' );
-
-			return false;
-		}
-
-		// Finally return the term id.
-		return $maybe_term['term_id'];
-	}
+        // @see: https://codex.wordpress.org/Creating_Tables_with_Plugins
+        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        $results = dbDelta( $sql );
+
+        $this->log->trace( 'create_relation_instance_table :: ' . var_export( $results, true ) );
+
+    }
+
+    /**
+     * Configure the dataset uri.
+     *
+     * @since 3.18.0
+     *
+     * @return void
+     */
+    private function set_dataset_uri() {
+        // Get the configuration service and load the key.
+        $configuration_service = Wordlift_Configuration_Service::get_instance();
+        $key                   = $configuration_service->get_key();
+
+        // If the key is not empty then set the dataset URI while sending
+        // the site URL.
+        if ( ! empty( $key ) ) {
+            $this->log->info( 'Updating the remote dataset URI...' );
+
+            $configuration_service->get_remote_dataset_uri( $key );
+        }
+
+    }
+
+    /**
+     * Checks whether the term exists and create it if it doesn't.
+     *
+     * @since 3.18.0
+     *
+     * @param string $slug Term slug.
+     *
+     * @return mixed Term id if the term exists or if it's created. False on failure
+     */
+    private function get_term_or_create_if_not_exists( $slug ) {
+        // Create the term if it does not exist, then get its ID.
+        $term_id = term_exists( $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+
+        if ( empty( $term_id ) ) {
+            // The term doesn't exists, so create it.
+            $maybe_term = wp_insert_term( $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+        } else {
+            // Get the term.
+            $maybe_term = get_term( $term_id['term_id'], Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, ARRAY_A );
+        }
+
+        // Check for errors.
+        if ( is_wp_error( $maybe_term ) ) {
+            $this->log->info( 'wl_install_entity_type_data [ ' . $maybe_term->get_error_message() . ' ]' );
+
+            return false;
+        }
+
+        // Finally return the term id.
+        return $maybe_term['term_id'];
+    }
 
 }

Spacing +20 added lines, -20 removed lines

@@ -80,17 +80,17 @@ 
 	 * @return void
 	 */
 	private function create_entity_type_terms() {
-		$this->log->debug( 'Installing Entity Type data...' );
+		$this->log->debug('Installing Entity Type data...');
 
 		// Set the taxonomy data.
 		// Note: parent types must be defined before child types.
-		foreach ( self::$terms as $slug => $term ) {
+		foreach (self::$terms as $slug => $term) {
 
 			// Check whether the term exists and create it if it doesn't.
-			$term_id = $this->get_term_or_create_if_not_exists( $slug );
+			$term_id = $this->get_term_or_create_if_not_exists($slug);
 
 			// Bail if the term doesn't exists or it's not created.
-			if ( empty( $term_id ) ) {
+			if (empty($term_id)) {
 				continue;
 			}
 
@@ -107,11 +107,11 @@ 
 				)
 			);
 
-			$this->log->trace( "Entity Type $slug installed with ID {$term['term_id']}." );
+			$this->log->trace("Entity Type $slug installed with ID {$term['term_id']}.");
 
 		}
 
-		$this->log->debug( 'Entity Type data installed.' );
+		$this->log->debug('Entity Type data installed.');
 	}
 
 	/**
@@ -124,7 +124,7 @@ 
 	private function create_relation_instance_table() {
 		global $wpdb;
 
-		$table_name      = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
+		$table_name      = $wpdb->prefix.WL_DB_RELATION_INSTANCES_TABLE_NAME;
 		$charset_collate = $wpdb->get_charset_collate();
 
 		// Sql statement for the relation instances custom table.
@@ -141,10 +141,10 @@ 
 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);
 
-		$this->log->trace( 'create_relation_instance_table :: ' . var_export( $results, true ) );
+		$this->log->trace('create_relation_instance_table :: '.var_export($results, true));
 
 	}
 
@@ -162,10 +162,10 @@ 
 
 		// If the key is not empty then set the dataset URI while sending
 		// the site URL.
-		if ( ! empty( $key ) ) {
-			$this->log->info( 'Updating the remote dataset URI...' );
+		if ( ! empty($key)) {
+			$this->log->info('Updating the remote dataset URI...');
 
-			$configuration_service->get_remote_dataset_uri( $key );
+			$configuration_service->get_remote_dataset_uri($key);
 		}
 
 	}
@@ -179,21 +179,21 @@ 
 	 *
 	 * @return mixed Term id if the term exists or if it's created. False on failure
 	 */
-	private function get_term_or_create_if_not_exists( $slug ) {
+	private function get_term_or_create_if_not_exists($slug) {
 		// Create the term if it does not exist, then get its ID.
-		$term_id = term_exists( $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+		$term_id = term_exists($slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 
-		if ( empty( $term_id ) ) {
+		if (empty($term_id)) {
 			// The term doesn't exists, so create it.
-			$maybe_term = wp_insert_term( $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+			$maybe_term = wp_insert_term($slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 		} else {
 			// Get the term.
-			$maybe_term = get_term( $term_id['term_id'], Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, ARRAY_A );
+			$maybe_term = get_term($term_id['term_id'], Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, ARRAY_A);
 		}
 
 		// Check for errors.
-		if ( is_wp_error( $maybe_term ) ) {
-			$this->log->info( 'wl_install_entity_type_data [ ' . $maybe_term->get_error_message() . ' ]' );
+		if (is_wp_error($maybe_term)) {
+			$this->log->info('wl_install_entity_type_data [ '.$maybe_term->get_error_message().' ]');
 
 			return false;
 		}

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

Indentation +44 added lines, -44 removed lines

@@ -12,68 +12,68 @@
  */
 class Wordlift_Install_3_20_0 extends Wordlift_Install {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	protected static $version = '3.20.0';
+    /**
+     * {@inheritdoc}
+     */
+    protected static $version = '3.20.0';
 
-	public function install() {
+    public function install() {
 
-		$this->add_names_to_existing_terms();
-		$this->rename_localbusiness_to_local_business();
+        $this->add_names_to_existing_terms();
+        $this->rename_localbusiness_to_local_business();
 
-	}
+    }
 
-	private function add_names_to_existing_terms() {
+    private function add_names_to_existing_terms() {
 
-		$this->log->debug( 'Adding names and URIs to existing terms...' );
+        $this->log->debug( 'Adding names and URIs to existing terms...' );
 
-		$schema_names = array(
-			'article'       => 'Article',
-			'thing'         => 'Thing',
-			'creative-work' => 'CreativeWork',
-			'event'         => 'Event',
-			'organization'  => 'Organization',
-			'person'        => 'Person',
-			'place'         => 'Place',
-			'localbusiness' => 'LocalBusiness',
-			'recipe'        => 'Recipe',
-			'web-page'      => 'WebPage',
-			'offer'         => 'Offer',
-		);
+        $schema_names = array(
+            'article'       => 'Article',
+            'thing'         => 'Thing',
+            'creative-work' => 'CreativeWork',
+            'event'         => 'Event',
+            'organization'  => 'Organization',
+            'person'        => 'Person',
+            'place'         => 'Place',
+            'localbusiness' => 'LocalBusiness',
+            'recipe'        => 'Recipe',
+            'web-page'      => 'WebPage',
+            'offer'         => 'Offer',
+        );
 
-		foreach ( $schema_names as $slug => $name ) {
-			$term = get_term_by( 'slug', $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+        foreach ( $schema_names as $slug => $name ) {
+            $term = get_term_by( 'slug', $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
 
-			if ( false === $term ) {
-				$this->log->warn( "Term `$slug` not found." );
+            if ( false === $term ) {
+                $this->log->warn( "Term `$slug` not found." );
 
-				continue;
-			}
+                continue;
+            }
 
-			// $this->log->debug( "Adding $name and http://schema.org/$name as name and URI of term `$slug` ({$term->term_id})." );
+            // $this->log->debug( "Adding $name and http://schema.org/$name as name and URI of term `$slug` ({$term->term_id})." );
 
-			// We don't use the references to the Wordlift_Schemaorg_Class_Service because it might not be
-			// loaded if the `WL_ALL_ENTITY_TYPES` constant isn't set.
-			$result_1 = update_term_meta( $term->term_id, '_wl_name', $name );
-			$result_2 = update_term_meta( $term->term_id, '_wl_uri', "http://schema.org/$name" );
+            // We don't use the references to the Wordlift_Schemaorg_Class_Service because it might not be
+            // loaded if the `WL_ALL_ENTITY_TYPES` constant isn't set.
+            $result_1 = update_term_meta( $term->term_id, '_wl_name', $name );
+            $result_2 = update_term_meta( $term->term_id, '_wl_uri', "http://schema.org/$name" );
 
-			// $this->log->debug( 'name :: ' . var_export( $result_1, true ) . ' URI :: ' . var_export( $result_2, true ) );
+            // $this->log->debug( 'name :: ' . var_export( $result_1, true ) . ' URI :: ' . var_export( $result_2, true ) );
 
-		}
+        }
 
-	}
+    }
 
-	private function rename_localbusiness_to_local_business() {
+    private function rename_localbusiness_to_local_business() {
 
-		$term = get_term_by( 'slug', 'localbusiness', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+        $term = get_term_by( 'slug', 'localbusiness', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
 
-		if ( false === $term ) {
-			return;
-		}
+        if ( false === $term ) {
+            return;
+        }
 
-		wp_update_term( $term->term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array( 'slug' => 'local-business' ) );
+        wp_update_term( $term->term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array( 'slug' => 'local-business' ) );
 
-	}
+    }
 
 }

Spacing +10 added lines, -10 removed lines

@@ -26,7 +26,7 @@ 
 
 	private function add_names_to_existing_terms() {
 
-		$this->log->debug( 'Adding names and URIs to existing terms...' );
+		$this->log->debug('Adding names and URIs to existing terms...');
 
 		$schema_names = array(
 			'article'       => 'Article',
@@ -42,11 +42,11 @@ 
 			'offer'         => 'Offer',
 		);
 
-		foreach ( $schema_names as $slug => $name ) {
-			$term = get_term_by( 'slug', $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+		foreach ($schema_names as $slug => $name) {
+			$term = get_term_by('slug', $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 
-			if ( false === $term ) {
-				$this->log->warn( "Term `$slug` not found." );
+			if (false === $term) {
+				$this->log->warn("Term `$slug` not found.");
 
 				continue;
 			}
@@ -55,8 +55,8 @@ 
 
 			// We don't use the references to the Wordlift_Schemaorg_Class_Service because it might not be
 			// loaded if the `WL_ALL_ENTITY_TYPES` constant isn't set.
-			$result_1 = update_term_meta( $term->term_id, '_wl_name', $name );
-			$result_2 = update_term_meta( $term->term_id, '_wl_uri', "http://schema.org/$name" );
+			$result_1 = update_term_meta($term->term_id, '_wl_name', $name);
+			$result_2 = update_term_meta($term->term_id, '_wl_uri', "http://schema.org/$name");
 
 			// $this->log->debug( 'name :: ' . var_export( $result_1, true ) . ' URI :: ' . var_export( $result_2, true ) );
 
@@ -66,13 +66,13 @@ 
 
 	private function rename_localbusiness_to_local_business() {
 
-		$term = get_term_by( 'slug', 'localbusiness', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+		$term = get_term_by('slug', 'localbusiness', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 
-		if ( false === $term ) {
+		if (false === $term) {
 			return;
 		}
 
-		wp_update_term( $term->term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array( 'slug' => 'local-business' ) );
+		wp_update_term($term->term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array('slug' => 'local-business'));
 
 	}
 

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

Indentation +80 added lines, -80 removed lines

@@ -19,85 +19,85 @@
  */
 class Wordlift_Image_Service {
 
-	/**
-	 * The image ratios and sizes.
-	 *
-	 * @since 3.19.4
-	 * @access public
-	 * @var array $sizes The image ratios and sizes.
-	 */
-	public static $sizes = array(
-		'16x9' => array( 1200, 675 ),
-		'4x3'  => array( 1200, 900 ),
-		'1x1'  => array( 1200, 1200 ),
-	);
-
-	/**
-	 * Create a {@link Wordlift_Image_Service} instance.
-	 *
-	 * @since 3.19.4
-	 */
-	public function __construct() {
-
-		// Add hook to define the image sizes. Since we're a plugin, we cannot use the
-		// `after_theme_setup` hook.
-		add_action( 'init', array( $this, 'after_theme_setup' ) );
-
-	}
-
-	/**
-	 * Hook `after_theme_setup`: add our own image sizes.
-	 *
-	 * @since 3.19.4
-	 */
-	public function after_theme_setup() {
-
-		foreach ( self::$sizes as $ratio => $sizes ) {
-			add_image_size( "wl-$ratio", $sizes[0], $sizes[1], true );
-		}
-
-	}
-
-	/**
-	 * Get the sources for the specified attachment.
-	 *
-	 * @since 3.19.4
-	 *
-	 * @param int   $attachment_id The attachment id.
-	 *
-	 * @return array {
-	 * An array of image sources.
-	 *
-	 * @type string $url The attachment URL.
-	 * @type int    $width The attachment width.
-	 * @type int    $height The attachment height.
-	 * }
-	 */
-	public static function get_sources( $attachment_id ) {
-
-		// Get the source for the specified image sizes.
-		$sources = array_map( function ( $ratio ) use ( $attachment_id ) {
-
-			// Get the source of the specified ratio.
-			$source = wp_get_attachment_image_src( $attachment_id, "wl-$ratio" );
-
-			// Get the size for the specified ratio.
-			$size = Wordlift_Image_Service::$sizes[ $ratio ];
-
-			// Check that the source has an image, and the required size.
-			if ( empty( $source[0] ) || $size[0] !== $source[1] || $size[1] !== $source[2] ) {
-				return null;
-			}
-
-			// Return the source.
-			return $source;
-		}, array_keys( self::$sizes ) );
-
-		// Filter unavailable sources.
-		$sources_1200 = array_filter( $sources );
-
-		// Make the results unique.
-		return $sources_1200;
-	}
+    /**
+     * The image ratios and sizes.
+     *
+     * @since 3.19.4
+     * @access public
+     * @var array $sizes The image ratios and sizes.
+     */
+    public static $sizes = array(
+        '16x9' => array( 1200, 675 ),
+        '4x3'  => array( 1200, 900 ),
+        '1x1'  => array( 1200, 1200 ),
+    );
+
+    /**
+     * Create a {@link Wordlift_Image_Service} instance.
+     *
+     * @since 3.19.4
+     */
+    public function __construct() {
+
+        // Add hook to define the image sizes. Since we're a plugin, we cannot use the
+        // `after_theme_setup` hook.
+        add_action( 'init', array( $this, 'after_theme_setup' ) );
+
+    }
+
+    /**
+     * Hook `after_theme_setup`: add our own image sizes.
+     *
+     * @since 3.19.4
+     */
+    public function after_theme_setup() {
+
+        foreach ( self::$sizes as $ratio => $sizes ) {
+            add_image_size( "wl-$ratio", $sizes[0], $sizes[1], true );
+        }
+
+    }
+
+    /**
+     * Get the sources for the specified attachment.
+     *
+     * @since 3.19.4
+     *
+     * @param int   $attachment_id The attachment id.
+     *
+     * @return array {
+     * An array of image sources.
+     *
+     * @type string $url The attachment URL.
+     * @type int    $width The attachment width.
+     * @type int    $height The attachment height.
+     * }
+     */
+    public static function get_sources( $attachment_id ) {
+
+        // Get the source for the specified image sizes.
+        $sources = array_map( function ( $ratio ) use ( $attachment_id ) {
+
+            // Get the source of the specified ratio.
+            $source = wp_get_attachment_image_src( $attachment_id, "wl-$ratio" );
+
+            // Get the size for the specified ratio.
+            $size = Wordlift_Image_Service::$sizes[ $ratio ];
+
+            // Check that the source has an image, and the required size.
+            if ( empty( $source[0] ) || $size[0] !== $source[1] || $size[1] !== $source[2] ) {
+                return null;
+            }
+
+            // Return the source.
+            return $source;
+        }, array_keys( self::$sizes ) );
+
+        // Filter unavailable sources.
+        $sources_1200 = array_filter( $sources );
+
+        // Make the results unique.
+        return $sources_1200;
+    }
 
 }

Spacing +13 added lines, -13 removed lines

@@ -27,9 +27,9 @@ 
 	 * @var array $sizes The image ratios and sizes.
 	 */
 	public static $sizes = array(
-		'16x9' => array( 1200, 675 ),
-		'4x3'  => array( 1200, 900 ),
-		'1x1'  => array( 1200, 1200 ),
+		'16x9' => array(1200, 675),
+		'4x3'  => array(1200, 900),
+		'1x1'  => array(1200, 1200),
 	);
 
 	/**
@@ -41,7 +41,7 @@ 
 
 		// Add hook to define the image sizes. Since we're a plugin, we cannot use the
 		// `after_theme_setup` hook.
-		add_action( 'init', array( $this, 'after_theme_setup' ) );
+		add_action('init', array($this, 'after_theme_setup'));
 
 	}
 
@@ -52,8 +52,8 @@ 
 	 */
 	public function after_theme_setup() {
 
-		foreach ( self::$sizes as $ratio => $sizes ) {
-			add_image_size( "wl-$ratio", $sizes[0], $sizes[1], true );
+		foreach (self::$sizes as $ratio => $sizes) {
+			add_image_size("wl-$ratio", $sizes[0], $sizes[1], true);
 		}
 
 	}
@@ -73,28 +73,28 @@ 
 	 * @type int    $height The attachment height.
 	 * }
 	 */
-	public static function get_sources( $attachment_id ) {
+	public static function get_sources($attachment_id) {
 
 		// Get the source for the specified image sizes.
-		$sources = array_map( function ( $ratio ) use ( $attachment_id ) {
+		$sources = array_map(function($ratio) use ($attachment_id) {
 
 			// Get the source of the specified ratio.
-			$source = wp_get_attachment_image_src( $attachment_id, "wl-$ratio" );
+			$source = wp_get_attachment_image_src($attachment_id, "wl-$ratio");
 
 			// Get the size for the specified ratio.
-			$size = Wordlift_Image_Service::$sizes[ $ratio ];
+			$size = Wordlift_Image_Service::$sizes[$ratio];
 
 			// Check that the source has an image, and the required size.
-			if ( empty( $source[0] ) || $size[0] !== $source[1] || $size[1] !== $source[2] ) {
+			if (empty($source[0]) || $size[0] !== $source[1] || $size[1] !== $source[2]) {
 				return null;
 			}
 
 			// Return the source.
 			return $source;
-		}, array_keys( self::$sizes ) );
+		}, array_keys(self::$sizes));
 
 		// Filter unavailable sources.
-		$sources_1200 = array_filter( $sources );
+		$sources_1200 = array_filter($sources);
 
 		// Make the results unique.
 		return $sources_1200;

src/install/class-wordlift-install-3-19-5.php

Indentation +11 added lines, -11 removed lines

@@ -16,23 +16,23 @@
  */
 class Wordlift_Install_3_19_5 extends Wordlift_Install {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	protected static $version = '3.19.5';
+    /**
+     * {@inheritdoc}
+     */
+    protected static $version = '3.19.5';
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function install() {
+    /**
+     * {@inheritdoc}
+     */
+    public function install() {
 
-		/*
+        /*
 		 * Flush all the caches, since we changed some JSON-LD publishing rules.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/858
 		 */
-		Wordlift_File_Cache_Service::flush_all();
+        Wordlift_File_Cache_Service::flush_all();
 
-	}
+    }
 
 }

src/admin/elements/class-wordlift-admin-language-select-element.php

Indentation +13 added lines, -13 removed lines

@@ -18,11 +18,11 @@ 
  */
 class Wordlift_Admin_Language_Select_Element extends Wordlift_Admin_Select_Element {
 
-	/**
-	 * @inheritdoc
-	 */
-	public function render_options( $params ) {
-		/*
+    /**
+     * @inheritdoc
+     */
+    public function render_options( $params ) {
+        /*
 		 * Print all the supported language, preselecting the one configured
 		 * in WP (or English if not supported). We now use the `Wordlift_Languages`
 		 * class which provides the list of languages supported by WordLift.
@@ -30,14 +30,14 @@ 
 		 * See https://github.com/insideout10/wordlift-plugin/issues/349
 		 */
 
-		// Get WordLift's supported languages.
-		$languages = Wordlift_Languages::get_languages();
+        // Get WordLift's supported languages.
+        $languages = Wordlift_Languages::get_languages();
 
-		// If we support WP's configured language, then use that, otherwise use English by default.
-		$language = isset( $languages[ $params['value'] ] ) ? $params['value'] : 'en';
+        // If we support WP's configured language, then use that, otherwise use English by default.
+        $language = isset( $languages[ $params['value'] ] ) ? $params['value'] : 'en';
 
-		foreach ( $languages as $code => $label ) :
-			?>
+        foreach ( $languages as $code => $label ) :
+            ?>
             <option
                     value="<?php echo esc_attr( $code ); ?>"
 				<?php echo selected( $code, $language, false ); ?>
@@ -45,7 +45,7 @@ 
 				<?php echo esc_html( $label ); ?>
             </option>
 		<?php
-		endforeach;
-	}
+        endforeach;
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function render_options( $params ) {
+	public function render_options($params) {
 		/*
 		 * Print all the supported language, preselecting the one configured
 		 * in WP (or English if not supported). We now use the `Wordlift_Languages`
@@ -34,15 +34,15 @@ 
 		$languages = Wordlift_Languages::get_languages();
 
 		// If we support WP's configured language, then use that, otherwise use English by default.
-		$language = isset( $languages[ $params['value'] ] ) ? $params['value'] : 'en';
+		$language = isset($languages[$params['value']]) ? $params['value'] : 'en';
 
-		foreach ( $languages as $code => $label ) :
+		foreach ($languages as $code => $label) :
 			?>
             <option
-                    value="<?php echo esc_attr( $code ); ?>"
-				<?php echo selected( $code, $language, false ); ?>
+                    value="<?php echo esc_attr($code); ?>"
+				<?php echo selected($code, $language, false); ?>
             >
-				<?php echo esc_html( $label ); ?>
+				<?php echo esc_html($label); ?>
             </option>
 		<?php
 		endforeach;

src/admin/elements/class-wordlift-admin-author-element.php

Indentation +113 added lines, -113 removed lines

@@ -19,118 +19,118 @@
  */
 class Wordlift_Admin_Author_Element implements Wordlift_Admin_Element {
 
-	/**
-	 * The {@link Wordlift_Publisher_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
-	 */
-	private $publisher_service;
-
-	/**
-	 * A {@link Wordlift_Admin_Select2_Element} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Admin_Select2_Element $select_element A {@link Wordlift_Admin_Select2_Element} instance.
-	 */
-	private $select_element;
-
-	/**
-	 * Create a {@link Wordlift_Admin_Person_Element} instance.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param \Wordlift_Publisher_Service     $publisher_service The {@link Wordlift_Publisher_Service} instance.
-	 * @param \Wordlift_Admin_Select2_Element $select_element The {@link Wordlift_Admin_Select_Element} instance.
-	 */
-	function __construct( $publisher_service, $select_element ) {
-
-		$this->publisher_service = $publisher_service;
-
-		// Child elements.
-		$this->select_element = $select_element;
-
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function render( $args ) {
-
-		// Parse the arguments and merge with default values.
-		$params = wp_parse_args( $args, array(
-			'id'             => uniqid( 'wl-input-' ),
-			'name'           => uniqid( 'wl-input-' ),
-			'current_entity' => 0,
-		) );
-
-		$current_entity_id = $params['current_entity'];
-		$data              = $this->publisher_service->query();
-
-		// Set a default to show when no entity is associated and a way to unassign.
-		array_unshift( $data, array(
-			'id'            => '0',
-			'text'          => __( '<em>(none)</em>', 'wordlift' ),
-			'type'          => '',
-			'thumbnail_url' => plugin_dir_url( dirname( __FILE__ ) ) . 'images/pixel.png',
-		) );
-
-		// Finally do the render, passing along also the current selected entity
-		// id and the options data.
-		return $this->do_render( $params, $current_entity_id, $data );
-	}
-
-	/**
-	 * Render the `select` using the provided parameters.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param array $params The array of parameters from the `render` function.
-	 * @param int   $current_post_id The currently selected {@link WP_Post} `id`.
-	 * @param array $data An array of Select2 options.
-	 *
-	 * @return \Wordlift_Admin_Author_Element $this Return this element.
-	 */
-	protected function do_render( $params, $current_post_id, $data ) {
-
-		// Queue the script which will initialize the select and style it.
-		wp_enqueue_script( 'wl-author-element', plugin_dir_url( dirname( __FILE__ ) ) . 'js/1/author.js', array( 'wordlift-select2' ) );
-		wp_enqueue_style( 'wl-author-element', plugin_dir_url( dirname( __FILE__ ) ) . 'js/1/author.css' );
-
-		// Prepare the URLs for entities which don't have logos.
-		$person_thumbnail_url       = plugin_dir_url( dirname( __FILE__ ) ) . '../images/person.png';
-		$organization_thumbnail_url = plugin_dir_url( dirname( __FILE__ ) ) . '../images/organization.png';
-
-		// Get the current post.
-		$current_post = $current_post_id ? get_post( $current_post_id ) : null;
-
-		// Finally render the Select.
-		$this->select_element->render( array(
-			// Id.
-			'id'      => $params['id'],
-			// Name.
-			'name'    => $params['name'],
-			// Class names.
-			'class'   => 'wl-select2-element',
-			// The selected id.
-			'value'   => $current_post_id,
-			// The selected item (must be in the options for Select2 to display it).
-			'options' => $current_post ? array( $current_post->ID => $current_post->post_title ) : array(),
-			// Data attributes.
-			'data'    => array(
-				// The list of available options.
-				'wl-select2-data'               => json_encode( $data ),
-				// The HTML template for each option.
-				'wl-select2-template-result'    => "<div class='wl-select2-result'><span class='wl-select2-thumbnail' style='background-image: url( <%= obj.thumbnail_url || ( 'Organization' === obj.type ? '$organization_thumbnail_url' : '$person_thumbnail_url' ) %> );'>&nbsp;</span><span class='wl-select2'><%= obj.text %></span><span class='wl-select2-type'><%= obj.type %></span></div>",
-				// The HTML template for the selected option.
-				'wl-select2-template-selection' => "<div class='wl-select2-selection'><span class='wl-select2-thumbnail' style='background-image: url( <%= obj.thumbnail_url || ( 'Organization' === obj.type ? '$organization_thumbnail_url' : '$person_thumbnail_url' ) %> );'>&nbsp;</span><span class='wl-select2'><%= obj.text %></span><span class='wl-select2-type'><%= obj.type %></span></div>",
-			),
-		) );
-
-		// Finally return the element instance.
-		return $this;
-	}
+    /**
+     * The {@link Wordlift_Publisher_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
+     */
+    private $publisher_service;
+
+    /**
+     * A {@link Wordlift_Admin_Select2_Element} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Admin_Select2_Element $select_element A {@link Wordlift_Admin_Select2_Element} instance.
+     */
+    private $select_element;
+
+    /**
+     * Create a {@link Wordlift_Admin_Person_Element} instance.
+     *
+     * @since 3.14.0
+     *
+     * @param \Wordlift_Publisher_Service     $publisher_service The {@link Wordlift_Publisher_Service} instance.
+     * @param \Wordlift_Admin_Select2_Element $select_element The {@link Wordlift_Admin_Select_Element} instance.
+     */
+    function __construct( $publisher_service, $select_element ) {
+
+        $this->publisher_service = $publisher_service;
+
+        // Child elements.
+        $this->select_element = $select_element;
+
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function render( $args ) {
+
+        // Parse the arguments and merge with default values.
+        $params = wp_parse_args( $args, array(
+            'id'             => uniqid( 'wl-input-' ),
+            'name'           => uniqid( 'wl-input-' ),
+            'current_entity' => 0,
+        ) );
+
+        $current_entity_id = $params['current_entity'];
+        $data              = $this->publisher_service->query();
+
+        // Set a default to show when no entity is associated and a way to unassign.
+        array_unshift( $data, array(
+            'id'            => '0',
+            'text'          => __( '<em>(none)</em>', 'wordlift' ),
+            'type'          => '',
+            'thumbnail_url' => plugin_dir_url( dirname( __FILE__ ) ) . 'images/pixel.png',
+        ) );
+
+        // Finally do the render, passing along also the current selected entity
+        // id and the options data.
+        return $this->do_render( $params, $current_entity_id, $data );
+    }
+
+    /**
+     * Render the `select` using the provided parameters.
+     *
+     * @since 3.14.0
+     *
+     * @param array $params The array of parameters from the `render` function.
+     * @param int   $current_post_id The currently selected {@link WP_Post} `id`.
+     * @param array $data An array of Select2 options.
+     *
+     * @return \Wordlift_Admin_Author_Element $this Return this element.
+     */
+    protected function do_render( $params, $current_post_id, $data ) {
+
+        // Queue the script which will initialize the select and style it.
+        wp_enqueue_script( 'wl-author-element', plugin_dir_url( dirname( __FILE__ ) ) . 'js/1/author.js', array( 'wordlift-select2' ) );
+        wp_enqueue_style( 'wl-author-element', plugin_dir_url( dirname( __FILE__ ) ) . 'js/1/author.css' );
+
+        // Prepare the URLs for entities which don't have logos.
+        $person_thumbnail_url       = plugin_dir_url( dirname( __FILE__ ) ) . '../images/person.png';
+        $organization_thumbnail_url = plugin_dir_url( dirname( __FILE__ ) ) . '../images/organization.png';
+
+        // Get the current post.
+        $current_post = $current_post_id ? get_post( $current_post_id ) : null;
+
+        // Finally render the Select.
+        $this->select_element->render( array(
+            // Id.
+            'id'      => $params['id'],
+            // Name.
+            'name'    => $params['name'],
+            // Class names.
+            'class'   => 'wl-select2-element',
+            // The selected id.
+            'value'   => $current_post_id,
+            // The selected item (must be in the options for Select2 to display it).
+            'options' => $current_post ? array( $current_post->ID => $current_post->post_title ) : array(),
+            // Data attributes.
+            'data'    => array(
+                // The list of available options.
+                'wl-select2-data'               => json_encode( $data ),
+                // The HTML template for each option.
+                'wl-select2-template-result'    => "<div class='wl-select2-result'><span class='wl-select2-thumbnail' style='background-image: url( <%= obj.thumbnail_url || ( 'Organization' === obj.type ? '$organization_thumbnail_url' : '$person_thumbnail_url' ) %> );'>&nbsp;</span><span class='wl-select2'><%= obj.text %></span><span class='wl-select2-type'><%= obj.type %></span></div>",
+                // The HTML template for the selected option.
+                'wl-select2-template-selection' => "<div class='wl-select2-selection'><span class='wl-select2-thumbnail' style='background-image: url( <%= obj.thumbnail_url || ( 'Organization' === obj.type ? '$organization_thumbnail_url' : '$person_thumbnail_url' ) %> );'>&nbsp;</span><span class='wl-select2'><%= obj.text %></span><span class='wl-select2-type'><%= obj.type %></span></div>",
+            ),
+        ) );
+
+        // Finally return the element instance.
+        return $this;
+    }
 
 }

Spacing +21 added lines, -21 removed lines

@@ -45,7 +45,7 @@ 
 	 * @param \Wordlift_Publisher_Service     $publisher_service The {@link Wordlift_Publisher_Service} instance.
 	 * @param \Wordlift_Admin_Select2_Element $select_element The {@link Wordlift_Admin_Select_Element} instance.
 	 */
-	function __construct( $publisher_service, $select_element ) {
+	function __construct($publisher_service, $select_element) {
 
 		$this->publisher_service = $publisher_service;
 
@@ -57,29 +57,29 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function render( $args ) {
+	public function render($args) {
 
 		// Parse the arguments and merge with default values.
-		$params = wp_parse_args( $args, array(
-			'id'             => uniqid( 'wl-input-' ),
-			'name'           => uniqid( 'wl-input-' ),
+		$params = wp_parse_args($args, array(
+			'id'             => uniqid('wl-input-'),
+			'name'           => uniqid('wl-input-'),
 			'current_entity' => 0,
-		) );
+		));
 
 		$current_entity_id = $params['current_entity'];
 		$data              = $this->publisher_service->query();
 
 		// Set a default to show when no entity is associated and a way to unassign.
-		array_unshift( $data, array(
+		array_unshift($data, array(
 			'id'            => '0',
-			'text'          => __( '<em>(none)</em>', 'wordlift' ),
+			'text'          => __('<em>(none)</em>', 'wordlift'),
 			'type'          => '',
-			'thumbnail_url' => plugin_dir_url( dirname( __FILE__ ) ) . 'images/pixel.png',
-		) );
+			'thumbnail_url' => plugin_dir_url(dirname(__FILE__)).'images/pixel.png',
+		));
 
 		// Finally do the render, passing along also the current selected entity
 		// id and the options data.
-		return $this->do_render( $params, $current_entity_id, $data );
+		return $this->do_render($params, $current_entity_id, $data);
 	}
 
 	/**
@@ -93,21 +93,21 @@ 
 	 *
 	 * @return \Wordlift_Admin_Author_Element $this Return this element.
 	 */
-	protected function do_render( $params, $current_post_id, $data ) {
+	protected function do_render($params, $current_post_id, $data) {
 
 		// Queue the script which will initialize the select and style it.
-		wp_enqueue_script( 'wl-author-element', plugin_dir_url( dirname( __FILE__ ) ) . 'js/1/author.js', array( 'wordlift-select2' ) );
-		wp_enqueue_style( 'wl-author-element', plugin_dir_url( dirname( __FILE__ ) ) . 'js/1/author.css' );
+		wp_enqueue_script('wl-author-element', plugin_dir_url(dirname(__FILE__)).'js/1/author.js', array('wordlift-select2'));
+		wp_enqueue_style('wl-author-element', plugin_dir_url(dirname(__FILE__)).'js/1/author.css');
 
 		// Prepare the URLs for entities which don't have logos.
-		$person_thumbnail_url       = plugin_dir_url( dirname( __FILE__ ) ) . '../images/person.png';
-		$organization_thumbnail_url = plugin_dir_url( dirname( __FILE__ ) ) . '../images/organization.png';
+		$person_thumbnail_url       = plugin_dir_url(dirname(__FILE__)).'../images/person.png';
+		$organization_thumbnail_url = plugin_dir_url(dirname(__FILE__)).'../images/organization.png';
 
 		// Get the current post.
-		$current_post = $current_post_id ? get_post( $current_post_id ) : null;
+		$current_post = $current_post_id ? get_post($current_post_id) : null;
 
 		// Finally render the Select.
-		$this->select_element->render( array(
+		$this->select_element->render(array(
 			// Id.
 			'id'      => $params['id'],
 			// Name.
@@ -117,17 +117,17 @@ 
 			// The selected id.
 			'value'   => $current_post_id,
 			// The selected item (must be in the options for Select2 to display it).
-			'options' => $current_post ? array( $current_post->ID => $current_post->post_title ) : array(),
+			'options' => $current_post ? array($current_post->ID => $current_post->post_title) : array(),
 			// Data attributes.
 			'data'    => array(
 				// The list of available options.
-				'wl-select2-data'               => json_encode( $data ),
+				'wl-select2-data'               => json_encode($data),
 				// The HTML template for each option.
 				'wl-select2-template-result'    => "<div class='wl-select2-result'><span class='wl-select2-thumbnail' style='background-image: url( <%= obj.thumbnail_url || ( 'Organization' === obj.type ? '$organization_thumbnail_url' : '$person_thumbnail_url' ) %> );'>&nbsp;</span><span class='wl-select2'><%= obj.text %></span><span class='wl-select2-type'><%= obj.type %></span></div>",
 				// The HTML template for the selected option.
 				'wl-select2-template-selection' => "<div class='wl-select2-selection'><span class='wl-select2-thumbnail' style='background-image: url( <%= obj.thumbnail_url || ( 'Organization' === obj.type ? '$organization_thumbnail_url' : '$person_thumbnail_url' ) %> );'>&nbsp;</span><span class='wl-select2'><%= obj.text %></span><span class='wl-select2-type'><%= obj.type %></span></div>",
 			),
-		) );
+		));
 
 		// Finally return the element instance.
 		return $this;

src/admin/elements/class-wordlift-admin-country-select-element.php

Indentation +64 added lines, -64 removed lines

@@ -18,38 +18,38 @@ 
  */
 class Wordlift_Admin_Country_Select_Element extends Wordlift_Admin_Select_Element {
 
-	/**
-	 * Adds a filter that will add data `country-codes` attrbiute to the country select
-	 * to allow front-end validation.
-	 *
-	 * @since 3.18.0
-	 *
-	 */
-	public function __construct() {
-		// Adds the country codes as data attribute to allow front-end validation.
-		add_filter( 'wl_admin_select_element_data_attributes', array( $this, 'add_country_codes_data' ), 10, 1 );
-	}
+    /**
+     * Adds a filter that will add data `country-codes` attrbiute to the country select
+     * to allow front-end validation.
+     *
+     * @since 3.18.0
+     *
+     */
+    public function __construct() {
+        // Adds the country codes as data attribute to allow front-end validation.
+        add_filter( 'wl_admin_select_element_data_attributes', array( $this, 'add_country_codes_data' ), 10, 1 );
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function render_options( $params ) {
-		// Print all the supported countries, preselecting the one configured
-		// in WP (or United Kingdom if not supported). We now use the `Wordlift_Countries`
-		// class which provides the list of countries supported by WordLift.
-		//
-		// https://github.com/insideout10/wordlift-plugin/issues/713
+    /**
+     * @inheritdoc
+     */
+    public function render_options( $params ) {
+        // Print all the supported countries, preselecting the one configured
+        // in WP (or United Kingdom if not supported). We now use the `Wordlift_Countries`
+        // class which provides the list of countries supported by WordLift.
+        //
+        // https://github.com/insideout10/wordlift-plugin/issues/713
 
-		$lang = ( isset( $params['lang'] ) ) ? $params['lang'] : false;
+        $lang = ( isset( $params['lang'] ) ) ? $params['lang'] : false;
 
-		// Get WordLift's supported countries.
-		$countries = Wordlift_Countries::get_countries( $lang );
+        // Get WordLift's supported countries.
+        $countries = Wordlift_Countries::get_countries( $lang );
 
-		// If we support WP's configured language, then use that, otherwise use English by default.
-		$language = isset( $countries[ $params['value'] ] ) ? $params['value'] : 'uk';
+        // If we support WP's configured language, then use that, otherwise use English by default.
+        $language = isset( $countries[ $params['value'] ] ) ? $params['value'] : 'uk';
 
-		foreach ( $countries as $code => $label ) :
-			?>
+        foreach ( $countries as $code => $label ) :
+            ?>
             <option
                     value="<?php echo esc_attr( $code ); ?>"
 				<?php echo selected( $code, $language, false ); ?>
@@ -57,48 +57,48 @@ 
 				<?php echo esc_html( $label ); ?>
             </option>
 		<?php
-		endforeach;
-	}
+        endforeach;
+    }
 
-	/**
-	 * Returns select options html.
-	 *
-	 * @since 3.18.0
-	 *
-	 * @return void Echoes select options or empty string if required params are not set.
-	 */
-	public function get_options_html() {
-		$html = '';
+    /**
+     * Returns select options html.
+     *
+     * @since 3.18.0
+     *
+     * @return void Echoes select options or empty string if required params are not set.
+     */
+    public function get_options_html() {
+        $html = '';
 
-		// Check whether the required params are set.
-		if ( ! empty( $_POST['lang'] ) && ! empty( $_POST['value'] ) ) { // WPCS: CSRF, input var, sanitization ok.
-			ob_start();
-			// Get the new options.
-			$this->render_options( $_POST ); // WPCS: CSRF, input var, sanitization ok.
+        // Check whether the required params are set.
+        if ( ! empty( $_POST['lang'] ) && ! empty( $_POST['value'] ) ) { // WPCS: CSRF, input var, sanitization ok.
+            ob_start();
+            // Get the new options.
+            $this->render_options( $_POST ); // WPCS: CSRF, input var, sanitization ok.
 
-			$html = ob_get_clean();
-		}
+            $html = ob_get_clean();
+        }
 
-		// Return the html.
-		wp_send_json_success( $html );
-	}
+        // Return the html.
+        wp_send_json_success( $html );
+    }
 
-	/**
-	 * Modify the field data attributes by adding`country-code`
-	 * to existing attributes.
-	 *
-	 * @param array $attributes Current data attributes.
-	 *
-	 * @since 3.18.0
-	 *
-	 * @return array $attributes Modified attributes.
-	 */
-	public function add_country_codes_data( $attributes ) {
-		// Add the country codes.
-		$attributes['country-codes'] = json_encode( Wordlift_Countries::get_codes() );
+    /**
+     * Modify the field data attributes by adding`country-code`
+     * to existing attributes.
+     *
+     * @param array $attributes Current data attributes.
+     *
+     * @since 3.18.0
+     *
+     * @return array $attributes Modified attributes.
+     */
+    public function add_country_codes_data( $attributes ) {
+        // Add the country codes.
+        $attributes['country-codes'] = json_encode( Wordlift_Countries::get_codes() );
 
-		// Return the attributes.
-		return $attributes;
-	}
+        // Return the attributes.
+        return $attributes;
+    }
 
 }

Spacing +14 added lines, -14 removed lines

@@ -27,34 +27,34 @@ 
 	 */
 	public function __construct() {
 		// Adds the country codes as data attribute to allow front-end validation.
-		add_filter( 'wl_admin_select_element_data_attributes', array( $this, 'add_country_codes_data' ), 10, 1 );
+		add_filter('wl_admin_select_element_data_attributes', array($this, 'add_country_codes_data'), 10, 1);
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	public function render_options( $params ) {
+	public function render_options($params) {
 		// Print all the supported countries, preselecting the one configured
 		// in WP (or United Kingdom if not supported). We now use the `Wordlift_Countries`
 		// class which provides the list of countries supported by WordLift.
 		//
 		// https://github.com/insideout10/wordlift-plugin/issues/713
 
-		$lang = ( isset( $params['lang'] ) ) ? $params['lang'] : false;
+		$lang = (isset($params['lang'])) ? $params['lang'] : false;
 
 		// Get WordLift's supported countries.
-		$countries = Wordlift_Countries::get_countries( $lang );
+		$countries = Wordlift_Countries::get_countries($lang);
 
 		// If we support WP's configured language, then use that, otherwise use English by default.
-		$language = isset( $countries[ $params['value'] ] ) ? $params['value'] : 'uk';
+		$language = isset($countries[$params['value']]) ? $params['value'] : 'uk';
 
-		foreach ( $countries as $code => $label ) :
+		foreach ($countries as $code => $label) :
 			?>
             <option
-                    value="<?php echo esc_attr( $code ); ?>"
-				<?php echo selected( $code, $language, false ); ?>
+                    value="<?php echo esc_attr($code); ?>"
+				<?php echo selected($code, $language, false); ?>
             >
-				<?php echo esc_html( $label ); ?>
+				<?php echo esc_html($label); ?>
             </option>
 		<?php
 		endforeach;
@@ -71,16 +71,16 @@ 
 		$html = '';
 
 		// Check whether the required params are set.
-		if ( ! empty( $_POST['lang'] ) && ! empty( $_POST['value'] ) ) { // WPCS: CSRF, input var, sanitization ok.
+		if ( ! empty($_POST['lang']) && ! empty($_POST['value'])) { // WPCS: CSRF, input var, sanitization ok.
 			ob_start();
 			// Get the new options.
-			$this->render_options( $_POST ); // WPCS: CSRF, input var, sanitization ok.
+			$this->render_options($_POST); // WPCS: CSRF, input var, sanitization ok.
 
 			$html = ob_get_clean();
 		}
 
 		// Return the html.
-		wp_send_json_success( $html );
+		wp_send_json_success($html);
 	}
 
 	/**
@@ -93,9 +93,9 @@ 
 	 *
 	 * @return array $attributes Modified attributes.
 	 */
-	public function add_country_codes_data( $attributes ) {
+	public function add_country_codes_data($attributes) {
 		// Add the country codes.
-		$attributes['country-codes'] = json_encode( Wordlift_Countries::get_codes() );
+		$attributes['country-codes'] = json_encode(Wordlift_Countries::get_codes());
 
 		// Return the attributes.
 		return $attributes;

src/admin/elements/class-wordlift-admin-select2-element.php

Indentation +21 added lines, -21 removed lines

@@ -18,13 +18,13 @@ 
  */
 class Wordlift_Admin_Select2_Element extends Wordlift_Admin_Select_Element {
 
-	/**
-	 * @inheritdoc
-	 */
-	public function render_options( $params ) {
-		// Loop through all params and add the options.
-		foreach ( $params['options'] as $value => $label ) :
-			?>
+    /**
+     * @inheritdoc
+     */
+    public function render_options( $params ) {
+        // Loop through all params and add the options.
+        foreach ( $params['options'] as $value => $label ) :
+            ?>
             <option
                     value="<?php echo esc_attr( $value ); ?>"
 				<?php selected( $params['value'], $value ); ?>
@@ -32,20 +32,20 @@ 
 				<?php echo esc_html( $label ); ?>
             </option>
 		<?php
-		endforeach;
-	}
+        endforeach;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	protected function enqueue_resources() {
-		// Enqueue select2 library js and css.
-		// Underscore is needed for Select2's `templateResult` and `templateSelection` templates.
-		wp_enqueue_script( 'wordlift-select2', plugin_dir_url( dirname( __FILE__ ) ) . 'js/select2/js/select2' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.js', array(
-			'jquery',
-			'underscore',
-		), '4.0.3' );
-		wp_enqueue_style( 'wordlift-select2', plugin_dir_url( dirname( __FILE__ ) ) . 'js/select2/css/select2' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', array(), '4.0.3' );
-	}
+    /**
+     * @inheritdoc
+     */
+    protected function enqueue_resources() {
+        // Enqueue select2 library js and css.
+        // Underscore is needed for Select2's `templateResult` and `templateSelection` templates.
+        wp_enqueue_script( 'wordlift-select2', plugin_dir_url( dirname( __FILE__ ) ) . 'js/select2/js/select2' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.js', array(
+            'jquery',
+            'underscore',
+        ), '4.0.3' );
+        wp_enqueue_style( 'wordlift-select2', plugin_dir_url( dirname( __FILE__ ) ) . 'js/select2/css/select2' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', array(), '4.0.3' );
+    }
 
 }

Spacing +8 added lines, -8 removed lines

@@ -21,15 +21,15 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function render_options( $params ) {
+	public function render_options($params) {
 		// Loop through all params and add the options.
-		foreach ( $params['options'] as $value => $label ) :
+		foreach ($params['options'] as $value => $label) :
 			?>
             <option
-                    value="<?php echo esc_attr( $value ); ?>"
-				<?php selected( $params['value'], $value ); ?>
+                    value="<?php echo esc_attr($value); ?>"
+				<?php selected($params['value'], $value); ?>
             >
-				<?php echo esc_html( $label ); ?>
+				<?php echo esc_html($label); ?>
             </option>
 		<?php
 		endforeach;
@@ -41,11 +41,11 @@ 
 	protected function enqueue_resources() {
 		// Enqueue select2 library js and css.
 		// Underscore is needed for Select2's `templateResult` and `templateSelection` templates.
-		wp_enqueue_script( 'wordlift-select2', plugin_dir_url( dirname( __FILE__ ) ) . 'js/select2/js/select2' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.js', array(
+		wp_enqueue_script('wordlift-select2', plugin_dir_url(dirname(__FILE__)).'js/select2/js/select2'.( ! defined('SCRIPT_DEBUG') || ! SCRIPT_DEBUG ? '.min' : '').'.js', array(
 			'jquery',
 			'underscore',
-		), '4.0.3' );
-		wp_enqueue_style( 'wordlift-select2', plugin_dir_url( dirname( __FILE__ ) ) . 'js/select2/css/select2' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', array(), '4.0.3' );
+		), '4.0.3');
+		wp_enqueue_style('wordlift-select2', plugin_dir_url(dirname(__FILE__)).'js/select2/css/select2'.( ! defined('SCRIPT_DEBUG') || ! SCRIPT_DEBUG ? '.min' : '').'.css', array(), '4.0.3');
 	}
 
 }

src/install/class-wordlift-install-package-type.php

Indentation +38 added lines, -38 removed lines

@@ -16,51 +16,51 @@
  */
 class Wordlift_Install_Package_Type extends Wordlift_Install {
 
-	/**
-	 * The install version.
-	 *
-	 * @since 3.20.0
-	 */
-	protected static $version = '3.20.0';
+    /**
+     * The install version.
+     *
+     * @since 3.20.0
+     */
+    protected static $version = '3.20.0';
 
-	/**
-	 * Run the install procedure.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @return mixed The result.
-	 */
-	public function install() {
+    /**
+     * Run the install procedure.
+     *
+     * @since 3.20.0
+     *
+     * @return mixed The result.
+     */
+    public function install() {
 
-		$configuration_service = Wordlift_Configuration_Service::get_instance();
-		$key                   = $configuration_service->get_key();
+        $configuration_service = Wordlift_Configuration_Service::get_instance();
+        $key                   = $configuration_service->get_key();
 
-		// Bail out if the `key` isn't set.
-		if ( empty( $key ) ) {
-			return;
-		}
+        // Bail out if the `key` isn't set.
+        if ( empty( $key ) ) {
+            return;
+        }
 
-		// Calling this function will get and set the remote dataset and package type.
-		$configuration_service->get_remote_dataset_uri( $key );
+        // Calling this function will get and set the remote dataset and package type.
+        $configuration_service->get_remote_dataset_uri( $key );
 
-	}
+    }
 
-	/**
-	 * Must install when the package type isn't set.
-	 *
-	 * https://github.com/insideout10/wordlift-plugin/issues/761
-	 *
-	 * @since 3.20.0
-	 * @return bool True if package type is set, otherwise false.
-	 */
-	public function must_install() {
+    /**
+     * Must install when the package type isn't set.
+     *
+     * https://github.com/insideout10/wordlift-plugin/issues/761
+     *
+     * @since 3.20.0
+     * @return bool True if package type is set, otherwise false.
+     */
+    public function must_install() {
 
-		$configuration_service = Wordlift_Configuration_Service::get_instance();
-		$key                   = $configuration_service->get_key();
-		$package_type          = $configuration_service->get_package_type();
+        $configuration_service = Wordlift_Configuration_Service::get_instance();
+        $key                   = $configuration_service->get_key();
+        $package_type          = $configuration_service->get_package_type();
 
-		// We need to determine the package type if the `key` is set, but the `package_type` isn't.
-		return is_admin() && ! empty( $key ) && empty( $package_type );
-	}
+        // We need to determine the package type if the `key` is set, but the `package_type` isn't.
+        return is_admin() && ! empty( $key ) && empty( $package_type );
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -36,12 +36,12 @@ 
 		$key                   = $configuration_service->get_key();
 
 		// Bail out if the `key` isn't set.
-		if ( empty( $key ) ) {
+		if (empty($key)) {
 			return;
 		}
 
 		// Calling this function will get and set the remote dataset and package type.
-		$configuration_service->get_remote_dataset_uri( $key );
+		$configuration_service->get_remote_dataset_uri($key);
 
 	}
 
@@ -60,7 +60,7 @@ 
 		$package_type          = $configuration_service->get_package_type();
 
 		// We need to determine the package type if the `key` is set, but the `package_type` isn't.
-		return is_admin() && ! empty( $key ) && empty( $package_type );
+		return is_admin() && ! empty($key) && empty($package_type);
 	}
 
 }