insideout10 / wordlift-plugin

src/vendor/composer/autoload_psr4.php

Spacing +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@
 
 // autoload_psr4.php @generated by Composer
 
-$vendorDir = dirname( ( __DIR__ ) );
-$baseDir   = dirname( $vendorDir );
+$vendorDir = dirname((__DIR__));
+$baseDir   = dirname($vendorDir);
 
 return array();

src/vendor/composer/autoload_real.php

Indentation +48 added lines, -48 removed lines

@@ -4,52 +4,52 @@
 
 class ComposerAutoloaderInit30c84c47a44576eaa4b38cc478d5e11b {
 
-	private static $loader;
-
-	public static function loadClassLoader( $class ) {
-		if ( 'Composer\Autoload\ClassLoader' === $class ) {
-			require __DIR__ . '/ClassLoader.php';
-		}
-	}
-
-	/**
-	 * @return \Composer\Autoload\ClassLoader
-	 */
-	public static function getLoader() {
-		if ( null !== self::$loader ) {
-			return self::$loader;
-		}
-
-		require __DIR__ . '/platform_check.php';
-
-		spl_autoload_register( array( 'ComposerAutoloaderInit30c84c47a44576eaa4b38cc478d5e11b', 'loadClassLoader' ), true, true );
-		self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-		spl_autoload_unregister( array( 'ComposerAutoloaderInit30c84c47a44576eaa4b38cc478d5e11b', 'loadClassLoader' ) );
-
-		$useStaticLoader = PHP_VERSION_ID >= 50600 && ! defined( 'HHVM_VERSION' ) && ( ! function_exists( 'zend_loader_file_encoded' ) || ! zend_loader_file_encoded() );
-		if ( $useStaticLoader ) {
-			require __DIR__ . '/autoload_static.php';
-
-			call_user_func( \Composer\Autoload\ComposerStaticInit30c84c47a44576eaa4b38cc478d5e11b::getInitializer( $loader ) );
-		} else {
-			$map = require __DIR__ . '/autoload_namespaces.php';
-			foreach ( $map as $namespace => $path ) {
-				$loader->set( $namespace, $path );
-			}
-
-			$map = require __DIR__ . '/autoload_psr4.php';
-			foreach ( $map as $namespace => $path ) {
-				$loader->setPsr4( $namespace, $path );
-			}
-
-			$classMap = require __DIR__ . '/autoload_classmap.php';
-			if ( $classMap ) {
-				$loader->addClassMap( $classMap );
-			}
-		}
-
-		$loader->register( true );
-
-		return $loader;
-	}
+    private static $loader;
+
+    public static function loadClassLoader( $class ) {
+        if ( 'Composer\Autoload\ClassLoader' === $class ) {
+            require __DIR__ . '/ClassLoader.php';
+        }
+    }
+
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
+    public static function getLoader() {
+        if ( null !== self::$loader ) {
+            return self::$loader;
+        }
+
+        require __DIR__ . '/platform_check.php';
+
+        spl_autoload_register( array( 'ComposerAutoloaderInit30c84c47a44576eaa4b38cc478d5e11b', 'loadClassLoader' ), true, true );
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        spl_autoload_unregister( array( 'ComposerAutoloaderInit30c84c47a44576eaa4b38cc478d5e11b', 'loadClassLoader' ) );
+
+        $useStaticLoader = PHP_VERSION_ID >= 50600 && ! defined( 'HHVM_VERSION' ) && ( ! function_exists( 'zend_loader_file_encoded' ) || ! zend_loader_file_encoded() );
+        if ( $useStaticLoader ) {
+            require __DIR__ . '/autoload_static.php';
+
+            call_user_func( \Composer\Autoload\ComposerStaticInit30c84c47a44576eaa4b38cc478d5e11b::getInitializer( $loader ) );
+        } else {
+            $map = require __DIR__ . '/autoload_namespaces.php';
+            foreach ( $map as $namespace => $path ) {
+                $loader->set( $namespace, $path );
+            }
+
+            $map = require __DIR__ . '/autoload_psr4.php';
+            foreach ( $map as $namespace => $path ) {
+                $loader->setPsr4( $namespace, $path );
+            }
+
+            $classMap = require __DIR__ . '/autoload_classmap.php';
+            if ( $classMap ) {
+                $loader->addClassMap( $classMap );
+            }
+        }
+
+        $loader->register( true );
+
+        return $loader;
+    }
 }

Spacing +21 added lines, -21 removed lines

@@ -6,9 +6,9 @@ 
 
 	private static $loader;
 
-	public static function loadClassLoader( $class ) {
-		if ( 'Composer\Autoload\ClassLoader' === $class ) {
-			require __DIR__ . '/ClassLoader.php';
+	public static function loadClassLoader($class) {
+		if ('Composer\Autoload\ClassLoader' === $class) {
+			require __DIR__.'/ClassLoader.php';
 		}
 	}
 
@@ -16,39 +16,39 @@ 
 	 * @return \Composer\Autoload\ClassLoader
 	 */
 	public static function getLoader() {
-		if ( null !== self::$loader ) {
+		if (null !== self::$loader) {
 			return self::$loader;
 		}
 
-		require __DIR__ . '/platform_check.php';
+		require __DIR__.'/platform_check.php';
 
-		spl_autoload_register( array( 'ComposerAutoloaderInit30c84c47a44576eaa4b38cc478d5e11b', 'loadClassLoader' ), true, true );
+		spl_autoload_register(array('ComposerAutoloaderInit30c84c47a44576eaa4b38cc478d5e11b', 'loadClassLoader'), true, true);
 		self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-		spl_autoload_unregister( array( 'ComposerAutoloaderInit30c84c47a44576eaa4b38cc478d5e11b', 'loadClassLoader' ) );
+		spl_autoload_unregister(array('ComposerAutoloaderInit30c84c47a44576eaa4b38cc478d5e11b', 'loadClassLoader'));
 
-		$useStaticLoader = PHP_VERSION_ID >= 50600 && ! defined( 'HHVM_VERSION' ) && ( ! function_exists( 'zend_loader_file_encoded' ) || ! zend_loader_file_encoded() );
-		if ( $useStaticLoader ) {
-			require __DIR__ . '/autoload_static.php';
+		$useStaticLoader = PHP_VERSION_ID >= 50600 && ! defined('HHVM_VERSION') && ( ! function_exists('zend_loader_file_encoded') || ! zend_loader_file_encoded());
+		if ($useStaticLoader) {
+			require __DIR__.'/autoload_static.php';
 
-			call_user_func( \Composer\Autoload\ComposerStaticInit30c84c47a44576eaa4b38cc478d5e11b::getInitializer( $loader ) );
+			call_user_func(\Composer\Autoload\ComposerStaticInit30c84c47a44576eaa4b38cc478d5e11b::getInitializer($loader));
 		} else {
-			$map = require __DIR__ . '/autoload_namespaces.php';
-			foreach ( $map as $namespace => $path ) {
-				$loader->set( $namespace, $path );
+			$map = require __DIR__.'/autoload_namespaces.php';
+			foreach ($map as $namespace => $path) {
+				$loader->set($namespace, $path);
 			}
 
-			$map = require __DIR__ . '/autoload_psr4.php';
-			foreach ( $map as $namespace => $path ) {
-				$loader->setPsr4( $namespace, $path );
+			$map = require __DIR__.'/autoload_psr4.php';
+			foreach ($map as $namespace => $path) {
+				$loader->setPsr4($namespace, $path);
 			}
 
-			$classMap = require __DIR__ . '/autoload_classmap.php';
-			if ( $classMap ) {
-				$loader->addClassMap( $classMap );
+			$classMap = require __DIR__.'/autoload_classmap.php';
+			if ($classMap) {
+				$loader->addClassMap($classMap);
 			}
 		}
 
-		$loader->register( true );
+		$loader->register(true);
 
 		return $loader;
 	}

src/wordlift-entity-type.php

Indentation +35 added lines, -35 removed lines

@@ -10,8 +10,8 @@ 
  */
 function wl_set_entity_main_type( $post_id, $type_uri ) {
 
-	Wordlift_Entity_Type_Service::get_instance()
-								->set( $post_id, $type_uri );
+    Wordlift_Entity_Type_Service::get_instance()
+                                ->set( $post_id, $type_uri );
 
 }
 
@@ -20,39 +20,39 @@ 
  */
 function wl_print_entity_type_inline_js() {
 
-	$terms = get_terms( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array( 'get' => 'all' ) );
-
-	// Load the type data.
-	$schema_service = Wordlift_Schema_Service::get_instance();
-	$entity_types   = array_reduce(
-		$terms,
-		function ( $carry, $term ) use ( $schema_service ) {
-			$type = $schema_service->get_schema( $term->slug );
-
-			// Skip if no `uri`.
-			if ( empty( $type['uri'] ) ) {
-				return $carry;
-			}
-
-			$carry[] = array(
-				'label'     => $term->name,
-				'uri'       => $type['uri'],
-				'css'       => $type['css_class'],
-				'sameAs'    => isset( $type['same_as'] ) ? $type['same_as'] : array(),
-				'slug'      => $term->slug,
-				'templates' => ( isset( $type['templates'] ) ? $type['templates'] : array() ),
-			);
-
-			return $carry;
-		},
-		array()
-	);
-
-	// Hook to the Block Editor script.
-	wp_localize_script( 'wl-block-editor', '_wlEntityTypes', $entity_types );
-
-	// Hook to the Classic Editor script, see Wordlift_Admin_Post_Edit_Page.
-	wp_localize_script( 'wl-classic-editor', '_wlEntityTypes', $entity_types );
+    $terms = get_terms( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array( 'get' => 'all' ) );
+
+    // Load the type data.
+    $schema_service = Wordlift_Schema_Service::get_instance();
+    $entity_types   = array_reduce(
+        $terms,
+        function ( $carry, $term ) use ( $schema_service ) {
+            $type = $schema_service->get_schema( $term->slug );
+
+            // Skip if no `uri`.
+            if ( empty( $type['uri'] ) ) {
+                return $carry;
+            }
+
+            $carry[] = array(
+                'label'     => $term->name,
+                'uri'       => $type['uri'],
+                'css'       => $type['css_class'],
+                'sameAs'    => isset( $type['same_as'] ) ? $type['same_as'] : array(),
+                'slug'      => $term->slug,
+                'templates' => ( isset( $type['templates'] ) ? $type['templates'] : array() ),
+            );
+
+            return $carry;
+        },
+        array()
+    );
+
+    // Hook to the Block Editor script.
+    wp_localize_script( 'wl-block-editor', '_wlEntityTypes', $entity_types );
+
+    // Hook to the Classic Editor script, see Wordlift_Admin_Post_Edit_Page.
+    wp_localize_script( 'wl-classic-editor', '_wlEntityTypes', $entity_types );
 
 }
 

Spacing +12 added lines, -12 removed lines

@@ -8,10 +8,10 @@ 
  *
  * @deprecated use Wordlift_Entity_Type_Service::get_instance()->set( $post_id, $type_uri )
  */
-function wl_set_entity_main_type( $post_id, $type_uri ) {
+function wl_set_entity_main_type($post_id, $type_uri) {
 
 	Wordlift_Entity_Type_Service::get_instance()
-								->set( $post_id, $type_uri );
+								->set($post_id, $type_uri);
 
 }
 
@@ -20,17 +20,17 @@ 
  */
 function wl_print_entity_type_inline_js() {
 
-	$terms = get_terms( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array( 'get' => 'all' ) );
+	$terms = get_terms(Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array('get' => 'all'));
 
 	// Load the type data.
 	$schema_service = Wordlift_Schema_Service::get_instance();
 	$entity_types   = array_reduce(
 		$terms,
-		function ( $carry, $term ) use ( $schema_service ) {
-			$type = $schema_service->get_schema( $term->slug );
+		function($carry, $term) use ($schema_service) {
+			$type = $schema_service->get_schema($term->slug);
 
 			// Skip if no `uri`.
-			if ( empty( $type['uri'] ) ) {
+			if (empty($type['uri'])) {
 				return $carry;
 			}
 
@@ -38,9 +38,9 @@ 
 				'label'     => $term->name,
 				'uri'       => $type['uri'],
 				'css'       => $type['css_class'],
-				'sameAs'    => isset( $type['same_as'] ) ? $type['same_as'] : array(),
+				'sameAs'    => isset($type['same_as']) ? $type['same_as'] : array(),
 				'slug'      => $term->slug,
-				'templates' => ( isset( $type['templates'] ) ? $type['templates'] : array() ),
+				'templates' => (isset($type['templates']) ? $type['templates'] : array()),
 			);
 
 			return $carry;
@@ -49,13 +49,13 @@ 
 	);
 
 	// Hook to the Block Editor script.
-	wp_localize_script( 'wl-block-editor', '_wlEntityTypes', $entity_types );
+	wp_localize_script('wl-block-editor', '_wlEntityTypes', $entity_types);
 
 	// Hook to the Classic Editor script, see Wordlift_Admin_Post_Edit_Page.
-	wp_localize_script( 'wl-classic-editor', '_wlEntityTypes', $entity_types );
+	wp_localize_script('wl-classic-editor', '_wlEntityTypes', $entity_types);
 
 }
 
 // Allow Classic and Block Editor scripts to register first.
-add_action( 'admin_print_scripts-post.php', 'wl_print_entity_type_inline_js', 11 );
-add_action( 'admin_print_scripts-post-new.php', 'wl_print_entity_type_inline_js', 11 );
+add_action('admin_print_scripts-post.php', 'wl_print_entity_type_inline_js', 11);
+add_action('admin_print_scripts-post-new.php', 'wl_print_entity_type_inline_js', 11);

src/includes/class-wordlift-countries.php

Indentation +516 added lines, -516 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -21,520 +21,520 @@ 
  */
 class Wordlift_Countries {
 
-	/**
-	 * An array that will contain country codes => country names pairs. It gets lazily loaded the first time by the
-	 * `get_countries` function.
-	 *
-	 * @since 3.18.0
-	 * @var array An array of country codes => country names pairs or NULL if not initialized yet.
-	 */
-	private static $countries = array();
-
-	/**
-	 * The list of supported country codes, this is populated by self::lazy_populate_codes_and_country_codes_array.
-	 *
-	 * WARNING! If you change the list of supported countries, *you have* to add the related flag
-	 * in the images/flags folder.
-	 *
-	 * @since 3.18.0
-	 *
-	 * @var array An array of country codes => supported_languages_array
-	 */
-	public static $codes = array();
-
-	/**
-	 * The list of country codes, this is populated by self::lazy_populate_codes_and_country_codes_array.
-	 *
-	 * WARNING! If you change the list of supported countries, *you have* to add the related flag
-	 * in the images/flags folder.
-	 *
-	 * @since 3.18.0
-	 *
-	 * @var array An array of country codes => country names.
-	 */
-	private static $country_codes = array();
-
-	/**
-	 * An array of flag filenames.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @var array An array of flag filenames.
-	 */
-	private static $country_flags = array(
-		'af' => 'Afghanistan',
-		'ax' => 'Aland',
-		'al' => 'Albania',
-		'dz' => 'Algeria',
-		'as' => 'American-Samoa',
-		'ad' => 'Andorra',
-		'ao' => 'Angola',
-		'ai' => 'Anguilla',
-		'aq' => 'Antarctica',
-		'ag' => 'Antigua-and-Barbuda',
-		'ar' => 'Argentina',
-		'am' => 'Armenia',
-		'aw' => 'Aruba',
-		'au' => 'Australia',
-		'at' => 'Austria',
-		'az' => 'Azerbaijan',
-		'bs' => 'Bahamas',
-		'bh' => 'Bahrain',
-		'bd' => 'Bangladesh',
-		'bb' => 'Barbados',
-		'by' => 'Belarus',
-		'be' => 'Belgium',
-		'bz' => 'Belize',
-		'bj' => 'Benin',
-		'bm' => 'Bermuda',
-		'bt' => 'Bhutan',
-		'bo' => 'Bolivia',
-		// Uses Netherlands' flag, see https://en.wikipedia.org/wiki/Caribbean_Netherlands.
-		'bq' => 'Netherlands',
-		'ba' => 'Bosnia-and-Herzegovina',
-		'bw' => 'Botswana',
-		'bv' => 'Bouvet Island',
-		'br' => 'Brazil',
-		'io' => null,
-		'bn' => 'Brunei',
-		'bg' => 'Bulgaria',
-		'bf' => 'Burkina-Faso',
-		'bi' => 'Burundi',
-		'kh' => 'Cambodia',
-		'cm' => 'Cameroon',
-		'ca' => 'Canada',
-		'cv' => 'Cape-Verde',
-		'ky' => 'Cayman-Islands',
-		'cf' => 'Central-African-Republic',
-		'td' => 'Chad',
-		'cl' => 'Chile',
-		'cn' => 'China',
-		'cx' => 'Christmas-Island',
-		'cc' => 'Cocos-Keeling-Islands',
-		'co' => 'Colombia',
-		'km' => 'Comoros',
-		'cg' => 'Republic-of-the-Congo',
-		'cd' => 'Democratic-Republic-of-the-Congo',
-		'ck' => 'Cook-Islands',
-		'cr' => 'Costa-Rica',
-		'ci' => 'Cote-dIvoire',
-		'hr' => 'Croatia',
-		'cu' => 'Cuba',
-		'cw' => 'Curacao',
-		'cy' => 'Cyprus',
-		'cz' => 'Czech-Republic',
-		'dk' => 'Denmark',
-		'dj' => 'Djibouti',
-		'dm' => 'Dominica',
-		'do' => 'Dominican-Republic',
-		'ec' => 'Ecuador',
-		'eg' => 'Egypt',
-		'sv' => 'El-Salvador',
-		'gq' => 'Equatorial-Guinea',
-		'er' => 'Eritrea',
-		'ee' => 'Estonia',
-		'et' => 'Ethiopia',
-		'fk' => 'Falkland-Islands',
-		'fo' => 'Faroes',
-		'fj' => 'Fiji',
-		'fi' => 'Finland',
-		'fr' => 'France',
-		// Uses France's flag, see https://en.wikipedia.org/wiki/French_Guiana.
-		'gf' => 'France',
-		'pf' => 'French-Polynesia',
-		'tf' => 'French-Southern-Territories',
-		'ga' => 'Gabon',
-		'gm' => 'Gambia',
-		'ge' => 'Georgia',
-		'de' => 'Germany',
-		'gh' => 'Ghana',
-		'gi' => 'Gibraltar',
-		'gr' => 'Greece',
-		'gl' => 'Greenland',
-		'gd' => 'Grenada',
-		// Uses France's flag, see https://en.wikipedia.org/wiki/Guadeloupe.
-		'gp' => 'France',
-		'gu' => 'Guam',
-		'gt' => 'Guatemala',
-		'gg' => 'Guernsey',
-		'gn' => 'Guinea',
-		'gw' => 'Guinea-Bissau',
-		'gy' => 'Guyana',
-		'ht' => 'Haiti',
-		// Uses Australia's flag, see https://en.wikipedia.org/wiki/Heard_Island_and_McDonald_Islands.
-		'hm' => 'Australia',
-		'va' => 'Vatican-City',
-		'hn' => 'Honduras',
-		'hk' => 'Hong-Kong',
-		'hu' => 'Hungary',
-		'is' => 'Iceland',
-		'in' => 'India',
-		'id' => 'Indonesia',
-		'ir' => 'Iran',
-		'iq' => 'Iraq',
-		'ie' => 'Ireland',
-		'im' => 'Isle-of-Man',
-		'il' => 'Israel',
-		'it' => 'Italy',
-		'jm' => 'Jamaica',
-		'jp' => 'Japan',
-		'je' => 'Jersey',
-		'jo' => 'Jordan',
-		'kz' => 'Kazakhstan',
-		'ke' => 'Kenya',
-		'ki' => 'Kiribati',
-		'kp' => 'North-Korea',
-		'kr' => 'South-Korea',
-		'kw' => 'Kuwait',
-		'kg' => 'Kyrgyzstan',
-		'la' => 'Laos',
-		'lv' => 'Latvia',
-		'lb' => 'Lebanon',
-		'ls' => 'Lesotho',
-		'lr' => 'Liberia',
-		'ly' => 'Libya',
-		'li' => 'Liechtenstein',
-		'lt' => 'Lithuania',
-		'lu' => 'Luxembourg',
-		'mo' => 'Macau',
-		'mk' => 'Macedonia',
-		'mg' => 'Madagascar',
-		'mw' => 'Malawi',
-		'my' => 'Malaysia',
-		'mv' => 'Maldives',
-		'ml' => 'Mali',
-		'mt' => 'Malta',
-		'mh' => 'Marshall-Islands',
-		'mq' => 'Martinique',
-		'mr' => 'Mauritania',
-		'mu' => 'Mauritius',
-		'yt' => 'Mayotte',
-		'mx' => 'Mexico',
-		'fm' => 'Micronesia',
-		'md' => 'Moldova',
-		'mc' => 'Monaco',
-		'mn' => 'Mongolia',
-		'me' => 'Montenegro',
-		'ms' => 'Montserrat',
-		'ma' => 'Morocco',
-		'mz' => 'Mozambique',
-		'mm' => 'Myanmar',
-		'na' => 'Namibia',
-		'nr' => 'Nauru',
-		'np' => 'Nepal',
-		'nl' => 'Netherlands',
-		'nc' => 'New-Caledonia',
-		'nz' => 'New-Zealand',
-		'ni' => 'Nicaragua',
-		'ne' => 'Niger',
-		'ng' => 'Nigeria',
-		'nu' => 'Niue',
-		'nf' => 'Norfolk-Island',
-		'mp' => 'Northern-Mariana-Islands',
-		'no' => 'Norway',
-		'om' => 'Oman',
-		'pk' => 'Pakistan',
-		'pw' => 'Palau',
-		'ps' => 'Palestine',
-		'pa' => 'Panama',
-		'pg' => 'Papua-New-Guinea',
-		'py' => 'Paraguay',
-		'pe' => 'Peru',
-		'ph' => 'Philippines',
-		'pn' => 'Pitcairn-Islands',
-		'pl' => 'Poland',
-		'pt' => 'Portugal',
-		'pr' => 'Puerto Rico',
-		'qa' => 'Qatar',
-		// Uses France's flag, see https://en.wikipedia.org/wiki/R%C3%A9union.
-		're' => 'France',
-		'ro' => 'Romania',
-		'ru' => 'Russia',
-		'rw' => 'Rwanda',
-		'bl' => 'Saint-Barthelemy',
-		'sh' => 'Saint-Helena',
-		'kn' => 'Saint-Kitts-and-Nevis',
-		'lc' => 'Saint-Lucia',
-		'mf' => 'Saint-Martin',
-		// Uses France's flag, see https://en.wikipedia.org/wiki/Saint_Pierre_and_Miquelon.
-		'pm' => 'France',
-		'vc' => 'Saint-Vincent-and-the-Grenadines',
-		'ws' => 'Samoa',
-		'sm' => 'San-Marino',
-		'st' => 'Sao-Tome-and-Principe',
-		'sa' => 'Saudi-Arabia',
-		'sn' => 'Senegal',
-		'rs' => 'Serbia',
-		'sc' => 'Seychelles',
-		'sl' => 'Sierra-Leone',
-		'sg' => 'Singapore',
-		'sx' => null,
-		'sk' => 'Slovakia',
-		'si' => 'Slovenia',
-		'sb' => 'Solomon-Islands',
-		'so' => 'Somalia',
-		'za' => 'South-Africa',
-		'gs' => 'South-Georgia-and-the-South-Sandwich-Islands',
-		'ss' => 'South-Sudan',
-		'es' => 'Spain',
-		'lk' => 'Sri-Lanka',
-		'sd' => 'Sudan',
-		'sr' => 'Suriname',
-		// Uses Norway's flag, see https://en.wikipedia.org/wiki/Svalbard_and_Jan_Mayen.
-		'sj' => 'Norway',
-		'sz' => 'Swaziland',
-		'se' => 'Sweden',
-		'ch' => 'Switzerland',
-		'sy' => 'Syria',
-		'tw' => 'Taiwan',
-		'tj' => 'Tajikistan',
-		'tz' => 'Tanzania',
-		'th' => 'Thailand',
-		'tl' => 'East-Timor',
-		'tg' => 'Togo',
-		'tk' => 'Tokelau',
-		'to' => 'Tonga',
-		'tt' => 'Trinidad-and-Tobago',
-		'tn' => 'Tunisia',
-		'tr' => 'Turkey',
-		'tm' => 'Turkmenistan',
-		'tc' => 'Turks-and-Caicos-Islands',
-		'tv' => 'Tuvalu',
-		'ug' => 'Uganda',
-		'ua' => 'Ukraine',
-		'ae' => 'United-Arab-Emirates',
-		'gb' => 'United-Kingdom',
-		'uk' => 'United-Kingdom',
-		'us' => 'United-States',
-		'um' => 'United-States',
-		'uy' => 'Uruguay',
-		'uz' => 'Uzbekistan',
-		'vu' => 'Vanuatu',
-		've' => 'Venezuela',
-		'vn' => 'Vietnam',
-		'vg' => 'British-Virgin-Islands',
-		'vi' => 'US-Virgin-Islands',
-		'wf' => 'Wallis-And-Futuna',
-		'eh' => 'Western-Sahara',
-		'ye' => 'Yemen',
-		'zm' => 'Zambia',
-		'zw' => 'Zimbabwe',
-	);
-
-	/**
-	 * Parse_country_code_json_file_to_array.
-	 *
-	 * @param string $file_name The json file name where the supported country
-	 * and languages are present.
-	 *
-	 * @return array An Array having two maps, country_code_language_map and country_code_name_map.
-	 */
-	public static function parse_country_code_json_file_to_array( $file_name ) {
-		// phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
-		$json_file_contents = file_get_contents( $file_name );
-		$decoded_array      = json_decode( $json_file_contents, true );
-		// decoded array would be null if the json_decode parses
-		// invalid content.
-		if ( null === $decoded_array ) {
-			return array(
-				'country_code_name_map'     => array(),
-				'country_code_language_map' => array(),
-			);
-		}
-		$result = array();
-		// country_code => country_language map.
-		$country_code_language_map = array();
-		// country_code => country_name map.
-		$country_code_name_map = array();
-		foreach ( $decoded_array as $key => $value ) {
-			$country_code_language_map[ $key ] = $value['supportedLang'];
-			$country_code_name_map [ $key ]    = $value['defaultLoc']['loc_name'];
-		}
-		$result['country_code_language_map'] = $country_code_language_map;
-		$result['country_code_name_map']     = $country_code_name_map;
-
-		return $result;
-	}
-
-	/**
-	 * Get the list of WordLift's supported country codes from json file mapping country_code => languages.
-	 *
-	 * @param string $file_name The json file where the supported country codes and language_codes are stored.
-	 *
-	 * @return array An Array having two maps, country_code_language_map and country_code_name_map.
-	 * @since 3.22.5.1
-	 */
-	public static function get_codes_from_json_file( $file_name ) {
-		if ( file_exists( $file_name ) ) {
-			return self::parse_country_code_json_file_to_array( $file_name );
-		}
-
-		return array(
-			'country_code_name_map'     => array(),
-			'country_code_language_map' => array(),
-		);
-	}
-
-	/**
-	 * Returns the country language pairs.
-	 *
-	 * @return array The country language pairs.
-	 * @since 3.18.0
-	 */
-	public static function get_codes() {
-		return self::$codes;
-	}
-
-	/**
-	 * Populate self::codes and self::country_codes if not done before.
-	 *
-	 * @param string $file_name The json file where the supported country codes and language_codes are stored.
-	 *
-	 * @return void
-	 * @since 3.22.5.1
-	 */
-	private static function lazy_populate_codes_and_country_codes_array( $file_name ) {
-		if ( null === $file_name ) {
-			$file_name = __DIR__ . '/supported-countries.json';
-		}
-		if ( 0 === count( self::$codes ) || 0 === count( self::$country_codes ) ) {
-			// populate the two arrays.
-			$result_array        = self::get_codes_from_json_file( $file_name );
-			self::$codes         = $result_array['country_code_language_map'];
-			self::$country_codes = $result_array['country_code_name_map'];
-		}
-
-	}
-
-	/**
-	 * Reset codes_and_country_codes static variable, used for testing
-	 *
-	 * @return void
-	 * @since 3.22.5.1
-	 */
-	public static function reset_codes_and_country_codes() {
-		self::$codes         = array();
-		self::$country_codes = array();
-	}
-
-	/**
-	 * Get the list of WordLift's supported countries in an array with country code => country name pairs.
-	 *
-	 * @param string|false $lang Optional. The language code we are looking for. Default `any`.
-	 *
-	 * @param string|null  $file_name Optional. The json file containing country codes
-	 *   and language data.
-	 *
-	 * @return array An array with country code => country name pairs.
-	 * @since 3.18.0
-	 */
-	public static function get_countries( $lang = false, $file_name = null ) {
-
-		// populate the codes and countries array if it is not done before.
-		self::lazy_populate_codes_and_country_codes_array( $file_name );
-
-		// Lazily load the countries.
-		// $lang_key = false === $lang ? 'any' : $lang;
-		$lang_key = 'any';
-		$lang     = '';
-
-		if ( isset( self::$countries[ $lang_key ] ) ) {
-			return self::$countries[ $lang_key ];
-		}
-
-		// Prepare the array.
-		self::$countries[ $lang ] = array();
-
-		// Get the country names from WP's own (multisite) function.
-		foreach ( self::$codes as $key => $languages ) {
-			if (
-				// Process all countries if there is no language specified.
-				empty( $lang ) ||
-
-				// Or if there are no language limitations for current country.
-				empty( self::$codes[ $key ] ) ||
-
-				// Or if the language code exists for current country.
-				! empty( $lang ) && in_array( $lang, self::$codes[ $key ], true )
-			) {
-				self::$countries[ $lang_key ][ $key ] = self::format_country_code( $key );
-			}
-		}
-
-		// Sort by country name.
-		asort( self::$countries[ $lang_key ] );
-
-		// We don't sort here because `asort` returns bool instead of sorted array.
-		return self::$countries[ $lang_key ];
-	}
-
-	/**
-	 * Returns the country for a country code. This function is a clone of WP's function provided in `ms.php`.
-	 *
-	 * @param string $code Optional. The two-letter country code. Default empty.
-	 *
-	 * @return string The country corresponding to $code if it exists. If it does not exist,
-	 *                then the first two letters of $code is returned.
-	 * @since 3.18.0
-	 */
-	private static function format_country_code( $code = '' ) {
-
-		$code = strtolower( substr( $code, 0, 2 ) );
-		/**
-		 * Filters the country codes.
-		 *
-		 * @param array $country_codes Key/value pair of country codes where key is the short version.
-		 * @param string $code A two-letter designation of the country.
-		 *
-		 * @since 3.18.0
-		 */
-		$country_codes = apply_filters( 'country_code', self::$country_codes, $code );
-
-		return strtr( $code, $country_codes );
-	}
-
-	/**
-	 * Get a flag URL.
-	 *
-	 * @param string $country_code The country code.
-	 *
-	 * @return string|null The flag url or null if not available.
-	 * @since 3.20.0
-	 */
-	public static function get_flag_url( $country_code ) {
-
-		// Bail out if we don't have the flag.
-		if ( ! isset( self::$country_flags[ $country_code ] )
-			 || ( self::$country_flags[ $country_code ] ) === null ) {
-			return null;
-		}
-
-		return plugin_dir_url( __DIR__ )
-			   . 'images/flags/16/'
-			   . self::$country_flags[ $country_code ]
-			   . '.png';
-	}
-
-	/**
-	 * Get a country name given a country code.
-	 *
-	 * @param string $country_code The 2-letters country code.
-	 *
-	 * @return null|string The country name (in English) or null if not found.
-	 * @since 3.20.0
-	 */
-	public static function get_country_name( $country_code ) {
-
-		/**
-		 * @since 3.27.6
-		 *
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/1188
-		 */
-		if ( ! isset( self::$country_codes[ $country_code ] ) ) {
-			return '';
-		}
-
-		return self::$country_codes[ $country_code ];
-	}
+    /**
+     * An array that will contain country codes => country names pairs. It gets lazily loaded the first time by the
+     * `get_countries` function.
+     *
+     * @since 3.18.0
+     * @var array An array of country codes => country names pairs or NULL if not initialized yet.
+     */
+    private static $countries = array();
+
+    /**
+     * The list of supported country codes, this is populated by self::lazy_populate_codes_and_country_codes_array.
+     *
+     * WARNING! If you change the list of supported countries, *you have* to add the related flag
+     * in the images/flags folder.
+     *
+     * @since 3.18.0
+     *
+     * @var array An array of country codes => supported_languages_array
+     */
+    public static $codes = array();
+
+    /**
+     * The list of country codes, this is populated by self::lazy_populate_codes_and_country_codes_array.
+     *
+     * WARNING! If you change the list of supported countries, *you have* to add the related flag
+     * in the images/flags folder.
+     *
+     * @since 3.18.0
+     *
+     * @var array An array of country codes => country names.
+     */
+    private static $country_codes = array();
+
+    /**
+     * An array of flag filenames.
+     *
+     * @since 3.20.0
+     *
+     * @var array An array of flag filenames.
+     */
+    private static $country_flags = array(
+        'af' => 'Afghanistan',
+        'ax' => 'Aland',
+        'al' => 'Albania',
+        'dz' => 'Algeria',
+        'as' => 'American-Samoa',
+        'ad' => 'Andorra',
+        'ao' => 'Angola',
+        'ai' => 'Anguilla',
+        'aq' => 'Antarctica',
+        'ag' => 'Antigua-and-Barbuda',
+        'ar' => 'Argentina',
+        'am' => 'Armenia',
+        'aw' => 'Aruba',
+        'au' => 'Australia',
+        'at' => 'Austria',
+        'az' => 'Azerbaijan',
+        'bs' => 'Bahamas',
+        'bh' => 'Bahrain',
+        'bd' => 'Bangladesh',
+        'bb' => 'Barbados',
+        'by' => 'Belarus',
+        'be' => 'Belgium',
+        'bz' => 'Belize',
+        'bj' => 'Benin',
+        'bm' => 'Bermuda',
+        'bt' => 'Bhutan',
+        'bo' => 'Bolivia',
+        // Uses Netherlands' flag, see https://en.wikipedia.org/wiki/Caribbean_Netherlands.
+        'bq' => 'Netherlands',
+        'ba' => 'Bosnia-and-Herzegovina',
+        'bw' => 'Botswana',
+        'bv' => 'Bouvet Island',
+        'br' => 'Brazil',
+        'io' => null,
+        'bn' => 'Brunei',
+        'bg' => 'Bulgaria',
+        'bf' => 'Burkina-Faso',
+        'bi' => 'Burundi',
+        'kh' => 'Cambodia',
+        'cm' => 'Cameroon',
+        'ca' => 'Canada',
+        'cv' => 'Cape-Verde',
+        'ky' => 'Cayman-Islands',
+        'cf' => 'Central-African-Republic',
+        'td' => 'Chad',
+        'cl' => 'Chile',
+        'cn' => 'China',
+        'cx' => 'Christmas-Island',
+        'cc' => 'Cocos-Keeling-Islands',
+        'co' => 'Colombia',
+        'km' => 'Comoros',
+        'cg' => 'Republic-of-the-Congo',
+        'cd' => 'Democratic-Republic-of-the-Congo',
+        'ck' => 'Cook-Islands',
+        'cr' => 'Costa-Rica',
+        'ci' => 'Cote-dIvoire',
+        'hr' => 'Croatia',
+        'cu' => 'Cuba',
+        'cw' => 'Curacao',
+        'cy' => 'Cyprus',
+        'cz' => 'Czech-Republic',
+        'dk' => 'Denmark',
+        'dj' => 'Djibouti',
+        'dm' => 'Dominica',
+        'do' => 'Dominican-Republic',
+        'ec' => 'Ecuador',
+        'eg' => 'Egypt',
+        'sv' => 'El-Salvador',
+        'gq' => 'Equatorial-Guinea',
+        'er' => 'Eritrea',
+        'ee' => 'Estonia',
+        'et' => 'Ethiopia',
+        'fk' => 'Falkland-Islands',
+        'fo' => 'Faroes',
+        'fj' => 'Fiji',
+        'fi' => 'Finland',
+        'fr' => 'France',
+        // Uses France's flag, see https://en.wikipedia.org/wiki/French_Guiana.
+        'gf' => 'France',
+        'pf' => 'French-Polynesia',
+        'tf' => 'French-Southern-Territories',
+        'ga' => 'Gabon',
+        'gm' => 'Gambia',
+        'ge' => 'Georgia',
+        'de' => 'Germany',
+        'gh' => 'Ghana',
+        'gi' => 'Gibraltar',
+        'gr' => 'Greece',
+        'gl' => 'Greenland',
+        'gd' => 'Grenada',
+        // Uses France's flag, see https://en.wikipedia.org/wiki/Guadeloupe.
+        'gp' => 'France',
+        'gu' => 'Guam',
+        'gt' => 'Guatemala',
+        'gg' => 'Guernsey',
+        'gn' => 'Guinea',
+        'gw' => 'Guinea-Bissau',
+        'gy' => 'Guyana',
+        'ht' => 'Haiti',
+        // Uses Australia's flag, see https://en.wikipedia.org/wiki/Heard_Island_and_McDonald_Islands.
+        'hm' => 'Australia',
+        'va' => 'Vatican-City',
+        'hn' => 'Honduras',
+        'hk' => 'Hong-Kong',
+        'hu' => 'Hungary',
+        'is' => 'Iceland',
+        'in' => 'India',
+        'id' => 'Indonesia',
+        'ir' => 'Iran',
+        'iq' => 'Iraq',
+        'ie' => 'Ireland',
+        'im' => 'Isle-of-Man',
+        'il' => 'Israel',
+        'it' => 'Italy',
+        'jm' => 'Jamaica',
+        'jp' => 'Japan',
+        'je' => 'Jersey',
+        'jo' => 'Jordan',
+        'kz' => 'Kazakhstan',
+        'ke' => 'Kenya',
+        'ki' => 'Kiribati',
+        'kp' => 'North-Korea',
+        'kr' => 'South-Korea',
+        'kw' => 'Kuwait',
+        'kg' => 'Kyrgyzstan',
+        'la' => 'Laos',
+        'lv' => 'Latvia',
+        'lb' => 'Lebanon',
+        'ls' => 'Lesotho',
+        'lr' => 'Liberia',
+        'ly' => 'Libya',
+        'li' => 'Liechtenstein',
+        'lt' => 'Lithuania',
+        'lu' => 'Luxembourg',
+        'mo' => 'Macau',
+        'mk' => 'Macedonia',
+        'mg' => 'Madagascar',
+        'mw' => 'Malawi',
+        'my' => 'Malaysia',
+        'mv' => 'Maldives',
+        'ml' => 'Mali',
+        'mt' => 'Malta',
+        'mh' => 'Marshall-Islands',
+        'mq' => 'Martinique',
+        'mr' => 'Mauritania',
+        'mu' => 'Mauritius',
+        'yt' => 'Mayotte',
+        'mx' => 'Mexico',
+        'fm' => 'Micronesia',
+        'md' => 'Moldova',
+        'mc' => 'Monaco',
+        'mn' => 'Mongolia',
+        'me' => 'Montenegro',
+        'ms' => 'Montserrat',
+        'ma' => 'Morocco',
+        'mz' => 'Mozambique',
+        'mm' => 'Myanmar',
+        'na' => 'Namibia',
+        'nr' => 'Nauru',
+        'np' => 'Nepal',
+        'nl' => 'Netherlands',
+        'nc' => 'New-Caledonia',
+        'nz' => 'New-Zealand',
+        'ni' => 'Nicaragua',
+        'ne' => 'Niger',
+        'ng' => 'Nigeria',
+        'nu' => 'Niue',
+        'nf' => 'Norfolk-Island',
+        'mp' => 'Northern-Mariana-Islands',
+        'no' => 'Norway',
+        'om' => 'Oman',
+        'pk' => 'Pakistan',
+        'pw' => 'Palau',
+        'ps' => 'Palestine',
+        'pa' => 'Panama',
+        'pg' => 'Papua-New-Guinea',
+        'py' => 'Paraguay',
+        'pe' => 'Peru',
+        'ph' => 'Philippines',
+        'pn' => 'Pitcairn-Islands',
+        'pl' => 'Poland',
+        'pt' => 'Portugal',
+        'pr' => 'Puerto Rico',
+        'qa' => 'Qatar',
+        // Uses France's flag, see https://en.wikipedia.org/wiki/R%C3%A9union.
+        're' => 'France',
+        'ro' => 'Romania',
+        'ru' => 'Russia',
+        'rw' => 'Rwanda',
+        'bl' => 'Saint-Barthelemy',
+        'sh' => 'Saint-Helena',
+        'kn' => 'Saint-Kitts-and-Nevis',
+        'lc' => 'Saint-Lucia',
+        'mf' => 'Saint-Martin',
+        // Uses France's flag, see https://en.wikipedia.org/wiki/Saint_Pierre_and_Miquelon.
+        'pm' => 'France',
+        'vc' => 'Saint-Vincent-and-the-Grenadines',
+        'ws' => 'Samoa',
+        'sm' => 'San-Marino',
+        'st' => 'Sao-Tome-and-Principe',
+        'sa' => 'Saudi-Arabia',
+        'sn' => 'Senegal',
+        'rs' => 'Serbia',
+        'sc' => 'Seychelles',
+        'sl' => 'Sierra-Leone',
+        'sg' => 'Singapore',
+        'sx' => null,
+        'sk' => 'Slovakia',
+        'si' => 'Slovenia',
+        'sb' => 'Solomon-Islands',
+        'so' => 'Somalia',
+        'za' => 'South-Africa',
+        'gs' => 'South-Georgia-and-the-South-Sandwich-Islands',
+        'ss' => 'South-Sudan',
+        'es' => 'Spain',
+        'lk' => 'Sri-Lanka',
+        'sd' => 'Sudan',
+        'sr' => 'Suriname',
+        // Uses Norway's flag, see https://en.wikipedia.org/wiki/Svalbard_and_Jan_Mayen.
+        'sj' => 'Norway',
+        'sz' => 'Swaziland',
+        'se' => 'Sweden',
+        'ch' => 'Switzerland',
+        'sy' => 'Syria',
+        'tw' => 'Taiwan',
+        'tj' => 'Tajikistan',
+        'tz' => 'Tanzania',
+        'th' => 'Thailand',
+        'tl' => 'East-Timor',
+        'tg' => 'Togo',
+        'tk' => 'Tokelau',
+        'to' => 'Tonga',
+        'tt' => 'Trinidad-and-Tobago',
+        'tn' => 'Tunisia',
+        'tr' => 'Turkey',
+        'tm' => 'Turkmenistan',
+        'tc' => 'Turks-and-Caicos-Islands',
+        'tv' => 'Tuvalu',
+        'ug' => 'Uganda',
+        'ua' => 'Ukraine',
+        'ae' => 'United-Arab-Emirates',
+        'gb' => 'United-Kingdom',
+        'uk' => 'United-Kingdom',
+        'us' => 'United-States',
+        'um' => 'United-States',
+        'uy' => 'Uruguay',
+        'uz' => 'Uzbekistan',
+        'vu' => 'Vanuatu',
+        've' => 'Venezuela',
+        'vn' => 'Vietnam',
+        'vg' => 'British-Virgin-Islands',
+        'vi' => 'US-Virgin-Islands',
+        'wf' => 'Wallis-And-Futuna',
+        'eh' => 'Western-Sahara',
+        'ye' => 'Yemen',
+        'zm' => 'Zambia',
+        'zw' => 'Zimbabwe',
+    );
+
+    /**
+     * Parse_country_code_json_file_to_array.
+     *
+     * @param string $file_name The json file name where the supported country
+     * and languages are present.
+     *
+     * @return array An Array having two maps, country_code_language_map and country_code_name_map.
+     */
+    public static function parse_country_code_json_file_to_array( $file_name ) {
+        // phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
+        $json_file_contents = file_get_contents( $file_name );
+        $decoded_array      = json_decode( $json_file_contents, true );
+        // decoded array would be null if the json_decode parses
+        // invalid content.
+        if ( null === $decoded_array ) {
+            return array(
+                'country_code_name_map'     => array(),
+                'country_code_language_map' => array(),
+            );
+        }
+        $result = array();
+        // country_code => country_language map.
+        $country_code_language_map = array();
+        // country_code => country_name map.
+        $country_code_name_map = array();
+        foreach ( $decoded_array as $key => $value ) {
+            $country_code_language_map[ $key ] = $value['supportedLang'];
+            $country_code_name_map [ $key ]    = $value['defaultLoc']['loc_name'];
+        }
+        $result['country_code_language_map'] = $country_code_language_map;
+        $result['country_code_name_map']     = $country_code_name_map;
+
+        return $result;
+    }
+
+    /**
+     * Get the list of WordLift's supported country codes from json file mapping country_code => languages.
+     *
+     * @param string $file_name The json file where the supported country codes and language_codes are stored.
+     *
+     * @return array An Array having two maps, country_code_language_map and country_code_name_map.
+     * @since 3.22.5.1
+     */
+    public static function get_codes_from_json_file( $file_name ) {
+        if ( file_exists( $file_name ) ) {
+            return self::parse_country_code_json_file_to_array( $file_name );
+        }
+
+        return array(
+            'country_code_name_map'     => array(),
+            'country_code_language_map' => array(),
+        );
+    }
+
+    /**
+     * Returns the country language pairs.
+     *
+     * @return array The country language pairs.
+     * @since 3.18.0
+     */
+    public static function get_codes() {
+        return self::$codes;
+    }
+
+    /**
+     * Populate self::codes and self::country_codes if not done before.
+     *
+     * @param string $file_name The json file where the supported country codes and language_codes are stored.
+     *
+     * @return void
+     * @since 3.22.5.1
+     */
+    private static function lazy_populate_codes_and_country_codes_array( $file_name ) {
+        if ( null === $file_name ) {
+            $file_name = __DIR__ . '/supported-countries.json';
+        }
+        if ( 0 === count( self::$codes ) || 0 === count( self::$country_codes ) ) {
+            // populate the two arrays.
+            $result_array        = self::get_codes_from_json_file( $file_name );
+            self::$codes         = $result_array['country_code_language_map'];
+            self::$country_codes = $result_array['country_code_name_map'];
+        }
+
+    }
+
+    /**
+     * Reset codes_and_country_codes static variable, used for testing
+     *
+     * @return void
+     * @since 3.22.5.1
+     */
+    public static function reset_codes_and_country_codes() {
+        self::$codes         = array();
+        self::$country_codes = array();
+    }
+
+    /**
+     * Get the list of WordLift's supported countries in an array with country code => country name pairs.
+     *
+     * @param string|false $lang Optional. The language code we are looking for. Default `any`.
+     *
+     * @param string|null  $file_name Optional. The json file containing country codes
+     *   and language data.
+     *
+     * @return array An array with country code => country name pairs.
+     * @since 3.18.0
+     */
+    public static function get_countries( $lang = false, $file_name = null ) {
+
+        // populate the codes and countries array if it is not done before.
+        self::lazy_populate_codes_and_country_codes_array( $file_name );
+
+        // Lazily load the countries.
+        // $lang_key = false === $lang ? 'any' : $lang;
+        $lang_key = 'any';
+        $lang     = '';
+
+        if ( isset( self::$countries[ $lang_key ] ) ) {
+            return self::$countries[ $lang_key ];
+        }
+
+        // Prepare the array.
+        self::$countries[ $lang ] = array();
+
+        // Get the country names from WP's own (multisite) function.
+        foreach ( self::$codes as $key => $languages ) {
+            if (
+                // Process all countries if there is no language specified.
+                empty( $lang ) ||
+
+                // Or if there are no language limitations for current country.
+                empty( self::$codes[ $key ] ) ||
+
+                // Or if the language code exists for current country.
+                ! empty( $lang ) && in_array( $lang, self::$codes[ $key ], true )
+            ) {
+                self::$countries[ $lang_key ][ $key ] = self::format_country_code( $key );
+            }
+        }
+
+        // Sort by country name.
+        asort( self::$countries[ $lang_key ] );
+
+        // We don't sort here because `asort` returns bool instead of sorted array.
+        return self::$countries[ $lang_key ];
+    }
+
+    /**
+     * Returns the country for a country code. This function is a clone of WP's function provided in `ms.php`.
+     *
+     * @param string $code Optional. The two-letter country code. Default empty.
+     *
+     * @return string The country corresponding to $code if it exists. If it does not exist,
+     *                then the first two letters of $code is returned.
+     * @since 3.18.0
+     */
+    private static function format_country_code( $code = '' ) {
+
+        $code = strtolower( substr( $code, 0, 2 ) );
+        /**
+         * Filters the country codes.
+         *
+         * @param array $country_codes Key/value pair of country codes where key is the short version.
+         * @param string $code A two-letter designation of the country.
+         *
+         * @since 3.18.0
+         */
+        $country_codes = apply_filters( 'country_code', self::$country_codes, $code );
+
+        return strtr( $code, $country_codes );
+    }
+
+    /**
+     * Get a flag URL.
+     *
+     * @param string $country_code The country code.
+     *
+     * @return string|null The flag url or null if not available.
+     * @since 3.20.0
+     */
+    public static function get_flag_url( $country_code ) {
+
+        // Bail out if we don't have the flag.
+        if ( ! isset( self::$country_flags[ $country_code ] )
+             || ( self::$country_flags[ $country_code ] ) === null ) {
+            return null;
+        }
+
+        return plugin_dir_url( __DIR__ )
+                . 'images/flags/16/'
+                . self::$country_flags[ $country_code ]
+                . '.png';
+    }
+
+    /**
+     * Get a country name given a country code.
+     *
+     * @param string $country_code The 2-letters country code.
+     *
+     * @return null|string The country name (in English) or null if not found.
+     * @since 3.20.0
+     */
+    public static function get_country_name( $country_code ) {
+
+        /**
+         * @since 3.27.6
+         *
+         * @see https://github.com/insideout10/wordlift-plugin/issues/1188
+         */
+        if ( ! isset( self::$country_codes[ $country_code ] ) ) {
+            return '';
+        }
+
+        return self::$country_codes[ $country_code ];
+    }
 
 }

Spacing +40 added lines, -40 removed lines

@@ -10,7 +10,7 @@ 
  * @since   3.18.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -329,13 +329,13 @@ 
 	 *
 	 * @return array An Array having two maps, country_code_language_map and country_code_name_map.
 	 */
-	public static function parse_country_code_json_file_to_array( $file_name ) {
+	public static function parse_country_code_json_file_to_array($file_name) {
 		// phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
-		$json_file_contents = file_get_contents( $file_name );
-		$decoded_array      = json_decode( $json_file_contents, true );
+		$json_file_contents = file_get_contents($file_name);
+		$decoded_array      = json_decode($json_file_contents, true);
 		// decoded array would be null if the json_decode parses
 		// invalid content.
-		if ( null === $decoded_array ) {
+		if (null === $decoded_array) {
 			return array(
 				'country_code_name_map'     => array(),
 				'country_code_language_map' => array(),
@@ -346,9 +346,9 @@ 
 		$country_code_language_map = array();
 		// country_code => country_name map.
 		$country_code_name_map = array();
-		foreach ( $decoded_array as $key => $value ) {
-			$country_code_language_map[ $key ] = $value['supportedLang'];
-			$country_code_name_map [ $key ]    = $value['defaultLoc']['loc_name'];
+		foreach ($decoded_array as $key => $value) {
+			$country_code_language_map[$key] = $value['supportedLang'];
+			$country_code_name_map [$key]    = $value['defaultLoc']['loc_name'];
 		}
 		$result['country_code_language_map'] = $country_code_language_map;
 		$result['country_code_name_map']     = $country_code_name_map;
@@ -364,9 +364,9 @@ 
 	 * @return array An Array having two maps, country_code_language_map and country_code_name_map.
 	 * @since 3.22.5.1
 	 */
-	public static function get_codes_from_json_file( $file_name ) {
-		if ( file_exists( $file_name ) ) {
-			return self::parse_country_code_json_file_to_array( $file_name );
+	public static function get_codes_from_json_file($file_name) {
+		if (file_exists($file_name)) {
+			return self::parse_country_code_json_file_to_array($file_name);
 		}
 
 		return array(
@@ -393,13 +393,13 @@ 
 	 * @return void
 	 * @since 3.22.5.1
 	 */
-	private static function lazy_populate_codes_and_country_codes_array( $file_name ) {
-		if ( null === $file_name ) {
-			$file_name = __DIR__ . '/supported-countries.json';
+	private static function lazy_populate_codes_and_country_codes_array($file_name) {
+		if (null === $file_name) {
+			$file_name = __DIR__.'/supported-countries.json';
 		}
-		if ( 0 === count( self::$codes ) || 0 === count( self::$country_codes ) ) {
+		if (0 === count(self::$codes) || 0 === count(self::$country_codes)) {
 			// populate the two arrays.
-			$result_array        = self::get_codes_from_json_file( $file_name );
+			$result_array        = self::get_codes_from_json_file($file_name);
 			self::$codes         = $result_array['country_code_language_map'];
 			self::$country_codes = $result_array['country_code_name_map'];
 		}
@@ -428,44 +428,44 @@ 
 	 * @return array An array with country code => country name pairs.
 	 * @since 3.18.0
 	 */
-	public static function get_countries( $lang = false, $file_name = null ) {
+	public static function get_countries($lang = false, $file_name = null) {
 
 		// populate the codes and countries array if it is not done before.
-		self::lazy_populate_codes_and_country_codes_array( $file_name );
+		self::lazy_populate_codes_and_country_codes_array($file_name);
 
 		// Lazily load the countries.
 		// $lang_key = false === $lang ? 'any' : $lang;
 		$lang_key = 'any';
 		$lang     = '';
 
-		if ( isset( self::$countries[ $lang_key ] ) ) {
-			return self::$countries[ $lang_key ];
+		if (isset(self::$countries[$lang_key])) {
+			return self::$countries[$lang_key];
 		}
 
 		// Prepare the array.
-		self::$countries[ $lang ] = array();
+		self::$countries[$lang] = array();
 
 		// Get the country names from WP's own (multisite) function.
-		foreach ( self::$codes as $key => $languages ) {
+		foreach (self::$codes as $key => $languages) {
 			if (
 				// Process all countries if there is no language specified.
-				empty( $lang ) ||
+				empty($lang) ||
 
 				// Or if there are no language limitations for current country.
-				empty( self::$codes[ $key ] ) ||
+				empty(self::$codes[$key]) ||
 
 				// Or if the language code exists for current country.
-				! empty( $lang ) && in_array( $lang, self::$codes[ $key ], true )
+				! empty($lang) && in_array($lang, self::$codes[$key], true)
 			) {
-				self::$countries[ $lang_key ][ $key ] = self::format_country_code( $key );
+				self::$countries[$lang_key][$key] = self::format_country_code($key);
 			}
 		}
 
 		// Sort by country name.
-		asort( self::$countries[ $lang_key ] );
+		asort(self::$countries[$lang_key]);
 
 		// We don't sort here because `asort` returns bool instead of sorted array.
-		return self::$countries[ $lang_key ];
+		return self::$countries[$lang_key];
 	}
 
 	/**
@@ -477,9 +477,9 @@ 
 	 *                then the first two letters of $code is returned.
 	 * @since 3.18.0
 	 */
-	private static function format_country_code( $code = '' ) {
+	private static function format_country_code($code = '') {
 
-		$code = strtolower( substr( $code, 0, 2 ) );
+		$code = strtolower(substr($code, 0, 2));
 		/**
 		 * Filters the country codes.
 		 *
@@ -488,9 +488,9 @@ 
 		 *
 		 * @since 3.18.0
 		 */
-		$country_codes = apply_filters( 'country_code', self::$country_codes, $code );
+		$country_codes = apply_filters('country_code', self::$country_codes, $code);
 
-		return strtr( $code, $country_codes );
+		return strtr($code, $country_codes);
 	}
 
 	/**
@@ -501,17 +501,17 @@ 
 	 * @return string|null The flag url or null if not available.
 	 * @since 3.20.0
 	 */
-	public static function get_flag_url( $country_code ) {
+	public static function get_flag_url($country_code) {
 
 		// Bail out if we don't have the flag.
-		if ( ! isset( self::$country_flags[ $country_code ] )
-			 || ( self::$country_flags[ $country_code ] ) === null ) {
+		if ( ! isset(self::$country_flags[$country_code])
+			 || (self::$country_flags[$country_code]) === null) {
 			return null;
 		}
 
-		return plugin_dir_url( __DIR__ )
+		return plugin_dir_url(__DIR__)
 			   . 'images/flags/16/'
-			   . self::$country_flags[ $country_code ]
+			   . self::$country_flags[$country_code]
 			   . '.png';
 	}
 
@@ -523,18 +523,18 @@ 
 	 * @return null|string The country name (in English) or null if not found.
 	 * @since 3.20.0
 	 */
-	public static function get_country_name( $country_code ) {
+	public static function get_country_name($country_code) {
 
 		/**
 		 * @since 3.27.6
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/1188
 		 */
-		if ( ! isset( self::$country_codes[ $country_code ] ) ) {
+		if ( ! isset(self::$country_codes[$country_code])) {
 			return '';
 		}
 
-		return self::$country_codes[ $country_code ];
+		return self::$country_codes[$country_code];
 	}
 
 }

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

Indentation +83 added lines, -83 removed lines

@@ -19,88 +19,88 @@
  */
 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,31 +73,31 @@ 
 	 * @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 ) {
+			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/includes/class-wordlift-entity-type-taxonomy-service.php

Indentation +201 added lines, -201 removed lines

@@ -14,211 +14,211 @@
  */
 class Wordlift_Entity_Type_Taxonomy_Service {
 
-	/**
-	 * The WordPress taxonomy name.
-	 *
-	 * @since 1.0.0
-	 */
-	const TAXONOMY_NAME = 'wl_entity_type';
-
-	/**
-	 * Register the taxonomies.
-	 *
-	 * @since 3.23.6 we hook to `wp_get_object_terms` to ensure that a term is returned when a post is queries for the
-	 *               `wl_entity_type` taxonomy.
-	 * @since 3.18.0
-	 */
-	public function init() {
-
-		$labels = array(
-			'name'              => _x( 'Entity Types', 'taxonomy general name', 'wordlift' ),
-			'singular_name'     => _x( 'Entity Type', 'taxonomy singular name', 'wordlift' ),
-			'search_items'      => __( 'Search Entity Types', 'wordlift' ),
-			'all_items'         => __( 'All Entity Types', 'wordlift' ),
-			'parent_item'       => __( 'Parent Entity Type', 'wordlift' ),
-			'parent_item_colon' => __( 'Parent Entity Type:', 'wordlift' ),
-			'edit_item'         => __( 'Edit Entity Type', 'wordlift' ),
-			'update_item'       => __( 'Update Entity Type', 'wordlift' ),
-			'add_new_item'      => __( 'Add New Entity Type', 'wordlift' ),
-			'new_item_name'     => __( 'New Entity Type', 'wordlift' ),
-			'menu_name'         => __( 'Entity Types', 'wordlift' ),
-		);
-
-		// Take away GUI for taxonomy editing.
-		// TODO: read capabilities when editing of the WL <-> schema.org mapping is possible.
-		$capabilities = array(
-			// We enable editors to change the title/description of terms:
-			//
-			// @see https://github.com/insideout10/wordlift-plugin/issues/398.
-			'manage_terms' => 'manage_options',
-			'edit_terms'   => 'wl_entity_type_edit_term',
-			'delete_terms' => 'wl_entity_type_delete_term',
-			'assign_terms' => 'edit_posts',
-		);
-
-		$args = array(
-			'labels'             => $labels,
-			'capabilities'       => $capabilities,
-			'hierarchical'       => true,
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-			'show_admin_column'  => apply_filters( 'wl_feature__enable__entity-types-taxonomy', true ),
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-			'show_in_rest'       => apply_filters( 'wl_feature__enable__entity-types-taxonomy', true ),
-			'show_in_quick_edit' => false,
-			'publicly_queryable' => false,
-		);
-
-		/*
+    /**
+     * The WordPress taxonomy name.
+     *
+     * @since 1.0.0
+     */
+    const TAXONOMY_NAME = 'wl_entity_type';
+
+    /**
+     * Register the taxonomies.
+     *
+     * @since 3.23.6 we hook to `wp_get_object_terms` to ensure that a term is returned when a post is queries for the
+     *               `wl_entity_type` taxonomy.
+     * @since 3.18.0
+     */
+    public function init() {
+
+        $labels = array(
+            'name'              => _x( 'Entity Types', 'taxonomy general name', 'wordlift' ),
+            'singular_name'     => _x( 'Entity Type', 'taxonomy singular name', 'wordlift' ),
+            'search_items'      => __( 'Search Entity Types', 'wordlift' ),
+            'all_items'         => __( 'All Entity Types', 'wordlift' ),
+            'parent_item'       => __( 'Parent Entity Type', 'wordlift' ),
+            'parent_item_colon' => __( 'Parent Entity Type:', 'wordlift' ),
+            'edit_item'         => __( 'Edit Entity Type', 'wordlift' ),
+            'update_item'       => __( 'Update Entity Type', 'wordlift' ),
+            'add_new_item'      => __( 'Add New Entity Type', 'wordlift' ),
+            'new_item_name'     => __( 'New Entity Type', 'wordlift' ),
+            'menu_name'         => __( 'Entity Types', 'wordlift' ),
+        );
+
+        // Take away GUI for taxonomy editing.
+        // TODO: read capabilities when editing of the WL <-> schema.org mapping is possible.
+        $capabilities = array(
+            // We enable editors to change the title/description of terms:
+            //
+            // @see https://github.com/insideout10/wordlift-plugin/issues/398.
+            'manage_terms' => 'manage_options',
+            'edit_terms'   => 'wl_entity_type_edit_term',
+            'delete_terms' => 'wl_entity_type_delete_term',
+            'assign_terms' => 'edit_posts',
+        );
+
+        $args = array(
+            'labels'             => $labels,
+            'capabilities'       => $capabilities,
+            'hierarchical'       => true,
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+            'show_admin_column'  => apply_filters( 'wl_feature__enable__entity-types-taxonomy', true ),
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+            'show_in_rest'       => apply_filters( 'wl_feature__enable__entity-types-taxonomy', true ),
+            'show_in_quick_edit' => false,
+            'publicly_queryable' => false,
+        );
+
+        /*
 		 * If `All Entity Types` is enabled, use the new metabox.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 * @since 3.20.0
 		 */
-		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__all-entity-types', WL_ALL_ENTITY_TYPES ) ) {
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-			$args['meta_box_cb'] = apply_filters( 'wl_feature__enable__entity-types-taxonomy', true ) ? array(
-				'Wordlift_Admin_Schemaorg_Taxonomy_Metabox',
-				'render',
-			) : false;
-		}
-
-		register_taxonomy(
-			self::TAXONOMY_NAME, // Taxonomy name.
-			Wordlift_Entity_Service::valid_entity_post_types(), // Taxonomy post types.
-			$args // Taxonomy args.
-		);
-
-		/**
-		 * Register meta wl_entities_gutenberg for use in Gutenberg
-		 */
-		register_meta(
-			'post',
-			'wl_entities_gutenberg',
-			array(
-				'show_in_rest' => true,
-				'single'       => true,
-				'type'         => 'string',
-			)
-		);
-
-		/**
-		 * Register meta _wl_alt_label for use in Gutenberg
-		 */
-		// register_meta( 'post', Wordlift_Entity_Service::ALTERNATIVE_LABEL_META_KEY, array(
-		// 'object_subtype' => '',
-		// 'show_in_rest'   => true,
-		// 'single'         => false,
-		// 'type'           => 'string',
-		// 'auth_callback'  => function () {
-		// return current_user_can( 'edit_posts' );
-		// }
-		// ) );
-
-		// see #1364: add custom fields support for CPTs that are valid entity post types in order to be able to
-		// query for synonyms in Block Editor.
-		add_filter(
-			'register_post_type_args',
-			function ( $args, $post_type ) {
-				if ( in_array( $post_type, Wordlift_Entity_Service::valid_entity_post_types(), true ) ) {
-					if ( ! isset( $args['supports'] ) ) {
-						$args['supports'] = array();
-					}
-					$args['supports'][] = 'custom-fields';
-				}
-
-				return $args;
-			},
-			10,
-			2
-		);
-
-		// Add filter to change the metabox CSS class.
-		add_filter( 'postbox_classes_entity_wl_entity_typediv', 'wl_admin_metaboxes_add_css_class' );
-
-		// Add a filter to preset the object term if none is set.
-		//
-		// DO NOT hook to `wp_get_object_terms`, because `wp_get_object_terms` returns imploded values for SQL queries.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/995
-		// @since 3.23.6
-		add_filter( 'get_object_terms', array( $this, 'get_object_terms' ), 10, 4 );
-
-		/**
-		 * Exclude sitemap creation for wl_entity_type taxonomy in Yoast
-		 *
-		 * @since 3.30.1
-		 */
-		add_filter( 'wpseo_sitemap_exclude_taxonomy', array( $this, 'wpseo_sitemap_exclude_taxonomy' ), 10, 2 );
-
-	}
-
-	/**
-	 * Hook to the `get_object_terms` filter.
-	 *
-	 * We check if our taxonomy is requested and whether a term has been returned. If no term has been returned we
-	 * preset `Article` for posts/pages and 'Thing' for everything else and we query the terms again.
-	 *
-	 * @param array    $terms Array of terms for the given object or objects.
-	 * @param int[]    $object_ids Array of object IDs for which terms were retrieved.
-	 * @param string[] $taxonomies Array of taxonomy names from which terms were retrieved.
-	 * @param array    $args Array of arguments for retrieving terms for the given
-	 *                                object(s). See get_object_terms() for details.
-	 *
-	 * @return array|WP_Error
-	 * @since 3.23.6
-	 */
-	public function get_object_terms( $terms, $object_ids, $taxonomies, $args ) {
-		// Get our entity type.
-		$entity_type = self::TAXONOMY_NAME;
-
-		// Check if this is a query for our entity type, that no terms have been found and that we have an article
-		// term to preset in case.
-		if ( ! taxonomy_exists( $entity_type )
-			 || array( $entity_type ) !== (array) $taxonomies
-			 || ! empty( $terms )
-			 || ! term_exists( 'article', $entity_type )
-			 || ! term_exists( 'thing', $entity_type ) ) {
-
-			// Return the input value.
-			return $terms;
-		}
-
-		// Avoid nested calls in case of issues.
-		remove_filter( 'get_object_terms', array( $this, 'get_object_terms' ), 10 );
-
-		// Set the default term for all the queried object.
-		foreach ( (array) $object_ids as $object_id ) {
-			$post_type = get_post_type( $object_id );
-			if ( Wordlift_Entity_Type_Service::is_valid_entity_post_type( $post_type ) ) {
-				// Set the term to article for posts and pages, or to thing for everything else.
-				$uris = Wordlift_Entity_Type_Adapter::get_entity_types( $post_type );
-				foreach ( $uris as $uri ) {
-					// set the uri based on post type.
-					if ( 'http://schema.org/Article' === $uri || 'http://schema.org/Thing' === $uri ) {
-						$uri = Wordlift_Entity_Service::TYPE_NAME === $post_type ?
-							'http://schema.org/Thing' : 'http://schema.org/Article';
-					}
-					Wordlift_Entity_Type_Service::get_instance()->set( $object_id, $uri );
-				}
-			}
-		}
-
-		// Finally return the object terms.
-		$terms = wp_get_object_terms( $object_ids, $taxonomies, $args );
-
-		// Re-enable nested calls in case of issues.
-		add_filter( 'get_object_terms', array( $this, 'get_object_terms' ), 10, 4 );
-
-		return $terms;
-	}
-
-	public function wpseo_sitemap_exclude_taxonomy( $exclude, $tax ) {
-		if ( self::TAXONOMY_NAME === $tax ) {
-			return true;
-		}
-
-		return $exclude;
-	}
+        // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+        if ( apply_filters( 'wl_feature__enable__all-entity-types', WL_ALL_ENTITY_TYPES ) ) {
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+            $args['meta_box_cb'] = apply_filters( 'wl_feature__enable__entity-types-taxonomy', true ) ? array(
+                'Wordlift_Admin_Schemaorg_Taxonomy_Metabox',
+                'render',
+            ) : false;
+        }
+
+        register_taxonomy(
+            self::TAXONOMY_NAME, // Taxonomy name.
+            Wordlift_Entity_Service::valid_entity_post_types(), // Taxonomy post types.
+            $args // Taxonomy args.
+        );
+
+        /**
+         * Register meta wl_entities_gutenberg for use in Gutenberg
+         */
+        register_meta(
+            'post',
+            'wl_entities_gutenberg',
+            array(
+                'show_in_rest' => true,
+                'single'       => true,
+                'type'         => 'string',
+            )
+        );
+
+        /**
+         * Register meta _wl_alt_label for use in Gutenberg
+         */
+        // register_meta( 'post', Wordlift_Entity_Service::ALTERNATIVE_LABEL_META_KEY, array(
+        // 'object_subtype' => '',
+        // 'show_in_rest'   => true,
+        // 'single'         => false,
+        // 'type'           => 'string',
+        // 'auth_callback'  => function () {
+        // return current_user_can( 'edit_posts' );
+        // }
+        // ) );
+
+        // see #1364: add custom fields support for CPTs that are valid entity post types in order to be able to
+        // query for synonyms in Block Editor.
+        add_filter(
+            'register_post_type_args',
+            function ( $args, $post_type ) {
+                if ( in_array( $post_type, Wordlift_Entity_Service::valid_entity_post_types(), true ) ) {
+                    if ( ! isset( $args['supports'] ) ) {
+                        $args['supports'] = array();
+                    }
+                    $args['supports'][] = 'custom-fields';
+                }
+
+                return $args;
+            },
+            10,
+            2
+        );
+
+        // Add filter to change the metabox CSS class.
+        add_filter( 'postbox_classes_entity_wl_entity_typediv', 'wl_admin_metaboxes_add_css_class' );
+
+        // Add a filter to preset the object term if none is set.
+        //
+        // DO NOT hook to `wp_get_object_terms`, because `wp_get_object_terms` returns imploded values for SQL queries.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/995
+        // @since 3.23.6
+        add_filter( 'get_object_terms', array( $this, 'get_object_terms' ), 10, 4 );
+
+        /**
+         * Exclude sitemap creation for wl_entity_type taxonomy in Yoast
+         *
+         * @since 3.30.1
+         */
+        add_filter( 'wpseo_sitemap_exclude_taxonomy', array( $this, 'wpseo_sitemap_exclude_taxonomy' ), 10, 2 );
+
+    }
+
+    /**
+     * Hook to the `get_object_terms` filter.
+     *
+     * We check if our taxonomy is requested and whether a term has been returned. If no term has been returned we
+     * preset `Article` for posts/pages and 'Thing' for everything else and we query the terms again.
+     *
+     * @param array    $terms Array of terms for the given object or objects.
+     * @param int[]    $object_ids Array of object IDs for which terms were retrieved.
+     * @param string[] $taxonomies Array of taxonomy names from which terms were retrieved.
+     * @param array    $args Array of arguments for retrieving terms for the given
+     *                                object(s). See get_object_terms() for details.
+     *
+     * @return array|WP_Error
+     * @since 3.23.6
+     */
+    public function get_object_terms( $terms, $object_ids, $taxonomies, $args ) {
+        // Get our entity type.
+        $entity_type = self::TAXONOMY_NAME;
+
+        // Check if this is a query for our entity type, that no terms have been found and that we have an article
+        // term to preset in case.
+        if ( ! taxonomy_exists( $entity_type )
+             || array( $entity_type ) !== (array) $taxonomies
+             || ! empty( $terms )
+             || ! term_exists( 'article', $entity_type )
+             || ! term_exists( 'thing', $entity_type ) ) {
+
+            // Return the input value.
+            return $terms;
+        }
+
+        // Avoid nested calls in case of issues.
+        remove_filter( 'get_object_terms', array( $this, 'get_object_terms' ), 10 );
+
+        // Set the default term for all the queried object.
+        foreach ( (array) $object_ids as $object_id ) {
+            $post_type = get_post_type( $object_id );
+            if ( Wordlift_Entity_Type_Service::is_valid_entity_post_type( $post_type ) ) {
+                // Set the term to article for posts and pages, or to thing for everything else.
+                $uris = Wordlift_Entity_Type_Adapter::get_entity_types( $post_type );
+                foreach ( $uris as $uri ) {
+                    // set the uri based on post type.
+                    if ( 'http://schema.org/Article' === $uri || 'http://schema.org/Thing' === $uri ) {
+                        $uri = Wordlift_Entity_Service::TYPE_NAME === $post_type ?
+                            'http://schema.org/Thing' : 'http://schema.org/Article';
+                    }
+                    Wordlift_Entity_Type_Service::get_instance()->set( $object_id, $uri );
+                }
+            }
+        }
+
+        // Finally return the object terms.
+        $terms = wp_get_object_terms( $object_ids, $taxonomies, $args );
+
+        // Re-enable nested calls in case of issues.
+        add_filter( 'get_object_terms', array( $this, 'get_object_terms' ), 10, 4 );
+
+        return $terms;
+    }
+
+    public function wpseo_sitemap_exclude_taxonomy( $exclude, $tax ) {
+        if ( self::TAXONOMY_NAME === $tax ) {
+            return true;
+        }
+
+        return $exclude;
+    }
 
 }

Spacing +39 added lines, -39 removed lines

@@ -31,17 +31,17 @@ 
 	public function init() {
 
 		$labels = array(
-			'name'              => _x( 'Entity Types', 'taxonomy general name', 'wordlift' ),
-			'singular_name'     => _x( 'Entity Type', 'taxonomy singular name', 'wordlift' ),
-			'search_items'      => __( 'Search Entity Types', 'wordlift' ),
-			'all_items'         => __( 'All Entity Types', 'wordlift' ),
-			'parent_item'       => __( 'Parent Entity Type', 'wordlift' ),
-			'parent_item_colon' => __( 'Parent Entity Type:', 'wordlift' ),
-			'edit_item'         => __( 'Edit Entity Type', 'wordlift' ),
-			'update_item'       => __( 'Update Entity Type', 'wordlift' ),
-			'add_new_item'      => __( 'Add New Entity Type', 'wordlift' ),
-			'new_item_name'     => __( 'New Entity Type', 'wordlift' ),
-			'menu_name'         => __( 'Entity Types', 'wordlift' ),
+			'name'              => _x('Entity Types', 'taxonomy general name', 'wordlift'),
+			'singular_name'     => _x('Entity Type', 'taxonomy singular name', 'wordlift'),
+			'search_items'      => __('Search Entity Types', 'wordlift'),
+			'all_items'         => __('All Entity Types', 'wordlift'),
+			'parent_item'       => __('Parent Entity Type', 'wordlift'),
+			'parent_item_colon' => __('Parent Entity Type:', 'wordlift'),
+			'edit_item'         => __('Edit Entity Type', 'wordlift'),
+			'update_item'       => __('Update Entity Type', 'wordlift'),
+			'add_new_item'      => __('Add New Entity Type', 'wordlift'),
+			'new_item_name'     => __('New Entity Type', 'wordlift'),
+			'menu_name'         => __('Entity Types', 'wordlift'),
 		);
 
 		// Take away GUI for taxonomy editing.
@@ -61,9 +61,9 @@ 
 			'capabilities'       => $capabilities,
 			'hierarchical'       => true,
 			// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-			'show_admin_column'  => apply_filters( 'wl_feature__enable__entity-types-taxonomy', true ),
+			'show_admin_column'  => apply_filters('wl_feature__enable__entity-types-taxonomy', true),
 			// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-			'show_in_rest'       => apply_filters( 'wl_feature__enable__entity-types-taxonomy', true ),
+			'show_in_rest'       => apply_filters('wl_feature__enable__entity-types-taxonomy', true),
 			'show_in_quick_edit' => false,
 			'publicly_queryable' => false,
 		);
@@ -75,9 +75,9 @@ 
 		 * @since 3.20.0
 		 */
 		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__all-entity-types', WL_ALL_ENTITY_TYPES ) ) {
+		if (apply_filters('wl_feature__enable__all-entity-types', WL_ALL_ENTITY_TYPES)) {
 			// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-			$args['meta_box_cb'] = apply_filters( 'wl_feature__enable__entity-types-taxonomy', true ) ? array(
+			$args['meta_box_cb'] = apply_filters('wl_feature__enable__entity-types-taxonomy', true) ? array(
 				'Wordlift_Admin_Schemaorg_Taxonomy_Metabox',
 				'render',
 			) : false;
@@ -119,9 +119,9 @@ 
 		// query for synonyms in Block Editor.
 		add_filter(
 			'register_post_type_args',
-			function ( $args, $post_type ) {
-				if ( in_array( $post_type, Wordlift_Entity_Service::valid_entity_post_types(), true ) ) {
-					if ( ! isset( $args['supports'] ) ) {
+			function($args, $post_type) {
+				if (in_array($post_type, Wordlift_Entity_Service::valid_entity_post_types(), true)) {
+					if ( ! isset($args['supports'])) {
 						$args['supports'] = array();
 					}
 					$args['supports'][] = 'custom-fields';
@@ -134,7 +134,7 @@ 
 		);
 
 		// Add filter to change the metabox CSS class.
-		add_filter( 'postbox_classes_entity_wl_entity_typediv', 'wl_admin_metaboxes_add_css_class' );
+		add_filter('postbox_classes_entity_wl_entity_typediv', 'wl_admin_metaboxes_add_css_class');
 
 		// Add a filter to preset the object term if none is set.
 		//
@@ -142,14 +142,14 @@ 
 		//
 		// @see https://github.com/insideout10/wordlift-plugin/issues/995
 		// @since 3.23.6
-		add_filter( 'get_object_terms', array( $this, 'get_object_terms' ), 10, 4 );
+		add_filter('get_object_terms', array($this, 'get_object_terms'), 10, 4);
 
 		/**
 		 * Exclude sitemap creation for wl_entity_type taxonomy in Yoast
 		 *
 		 * @since 3.30.1
 		 */
-		add_filter( 'wpseo_sitemap_exclude_taxonomy', array( $this, 'wpseo_sitemap_exclude_taxonomy' ), 10, 2 );
+		add_filter('wpseo_sitemap_exclude_taxonomy', array($this, 'wpseo_sitemap_exclude_taxonomy'), 10, 2);
 
 	}
 
@@ -168,53 +168,53 @@ 
 	 * @return array|WP_Error
 	 * @since 3.23.6
 	 */
-	public function get_object_terms( $terms, $object_ids, $taxonomies, $args ) {
+	public function get_object_terms($terms, $object_ids, $taxonomies, $args) {
 		// Get our entity type.
 		$entity_type = self::TAXONOMY_NAME;
 
 		// Check if this is a query for our entity type, that no terms have been found and that we have an article
 		// term to preset in case.
-		if ( ! taxonomy_exists( $entity_type )
-			 || array( $entity_type ) !== (array) $taxonomies
-			 || ! empty( $terms )
-			 || ! term_exists( 'article', $entity_type )
-			 || ! term_exists( 'thing', $entity_type ) ) {
+		if ( ! taxonomy_exists($entity_type)
+			 || array($entity_type) !== (array) $taxonomies
+			 || ! empty($terms)
+			 || ! term_exists('article', $entity_type)
+			 || ! term_exists('thing', $entity_type)) {
 
 			// Return the input value.
 			return $terms;
 		}
 
 		// Avoid nested calls in case of issues.
-		remove_filter( 'get_object_terms', array( $this, 'get_object_terms' ), 10 );
+		remove_filter('get_object_terms', array($this, 'get_object_terms'), 10);
 
 		// Set the default term for all the queried object.
-		foreach ( (array) $object_ids as $object_id ) {
-			$post_type = get_post_type( $object_id );
-			if ( Wordlift_Entity_Type_Service::is_valid_entity_post_type( $post_type ) ) {
+		foreach ((array) $object_ids as $object_id) {
+			$post_type = get_post_type($object_id);
+			if (Wordlift_Entity_Type_Service::is_valid_entity_post_type($post_type)) {
 				// Set the term to article for posts and pages, or to thing for everything else.
-				$uris = Wordlift_Entity_Type_Adapter::get_entity_types( $post_type );
-				foreach ( $uris as $uri ) {
+				$uris = Wordlift_Entity_Type_Adapter::get_entity_types($post_type);
+				foreach ($uris as $uri) {
 					// set the uri based on post type.
-					if ( 'http://schema.org/Article' === $uri || 'http://schema.org/Thing' === $uri ) {
+					if ('http://schema.org/Article' === $uri || 'http://schema.org/Thing' === $uri) {
 						$uri = Wordlift_Entity_Service::TYPE_NAME === $post_type ?
 							'http://schema.org/Thing' : 'http://schema.org/Article';
 					}
-					Wordlift_Entity_Type_Service::get_instance()->set( $object_id, $uri );
+					Wordlift_Entity_Type_Service::get_instance()->set($object_id, $uri);
 				}
 			}
 		}
 
 		// Finally return the object terms.
-		$terms = wp_get_object_terms( $object_ids, $taxonomies, $args );
+		$terms = wp_get_object_terms($object_ids, $taxonomies, $args);
 
 		// Re-enable nested calls in case of issues.
-		add_filter( 'get_object_terms', array( $this, 'get_object_terms' ), 10, 4 );
+		add_filter('get_object_terms', array($this, 'get_object_terms'), 10, 4);
 
 		return $terms;
 	}
 
-	public function wpseo_sitemap_exclude_taxonomy( $exclude, $tax ) {
-		if ( self::TAXONOMY_NAME === $tax ) {
+	public function wpseo_sitemap_exclude_taxonomy($exclude, $tax) {
+		if (self::TAXONOMY_NAME === $tax) {
 			return true;
 		}
 

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

Indentation +182 added lines, -182 removed lines

@@ -16,187 +16,187 @@
  */
 class Wordlift_Attachment_Service {
 
-	/**
-	 * Create a {@link Wordlift_Attachment_Service} instance.
-	 *
-	 * @since 3.20.0
-	 */
-	protected function __construct() {
-
-	}
-
-	private static $instance = null;
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @return \Wordlift_Attachment_Service The singleton instance.
-	 * @since 3.20.0
-	 */
-	public static function get_instance() {
-
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self();
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get an attachment ID given a URL.
-	 *
-	 * Inspired from https://wpscholar.com/blog/get-attachment-id-from-wp-image-url/
-	 *
-	 * @param string $url The attachment URL.
-	 *
-	 * @return int|false Attachment ID on success, false on failure
-	 * @since 3.10.0
-	 */
-	public function get_attachment_id( $url ) {
-
-		// Get the upload directory data, we need the base URL to check whether
-		// the URL we received is within WP.
-		$dir = wp_upload_dir();
-
-		// Get the filename, the extension is kept.
-		if ( 1 !== preg_match( "@^{$dir['baseurl']}/(.+?)(?:-\d+x\d+)?(\.\w+)$@", $url, $matches ) ) {
-			return false;
-		}
-
-		$filename = $matches[1] . $matches[2];
-
-		// The following query is CPU-intensive, we need to review it.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/689.
-		//
-		// Query for attachments with the specified filename.
-		$query = new WP_Query(
-			array(
-				'post_type'           => 'attachment',
-				'post_status'         => 'inherit',
-				'fields'              => 'ids',
-				'meta_query'          => array(
-					array(
-						'value'   => $filename,
-						'compare' => '=',
-						'key'     => '_wp_attached_file',
-					),
-				),
-				'posts_per_page'      => 1,
-				'ignore_sticky_posts' => true,
-			)
-		);
-
-		// If there are no posts, return.
-		if ( $query->have_posts() ) {
-			return $query->posts[0];
-			// foreach ( $query->posts as $attachment_id ) {
-			//
-			// Get the attachment metadata, we need the filename.
-			// $metadata          = wp_get_attachment_metadata( $attachment_id );
-			// $original_filename = basename( $metadata['file'] );
-			//
-			// Get the cropped filenames, or an empty array in case there are no files.
-			// $sizes_filenames = isset( $metadata['sizes'] ) ? wp_list_pluck( $metadata['sizes'], 'file' ) : array();
-			//
-			// If the provided filename matches the attachment filename (or one of its resized images), return the id.
-			// if ( $original_filename === $filename || in_array( $filename, $sizes_filenames ) ) {
-			// return $attachment_id;
-			// }
-			// }
-		}
-
-		// If we got here, we couldn't find any attachment.
-		return false;
-	}
-
-	/**
-	 * Get images embedded in the post content.
-	 *
-	 * @param string $content The post content.
-	 *
-	 * @return array An array of attachment ids.
-	 * @since 3.10.0
-	 */
-	public function get_image_embeds( $content ) {
-
-		// Go over all the images included in the post content, check if they are
-		// in the DB, and if so include them.
-		$images = array();
-		if ( false === preg_match_all( '#<img [^>]*src="([^\\">]*)"[^>]*>#', $content, $images ) ) {
-			return array();
-		}
-
-		// Map the image URLs to attachment ids.
-		$that = $this;
-		$ids  = array_map(
-			function ( $url ) use ( $that ) {
-				return $that->get_attachment_id( $url );
-			},
-			$images[1]
-		);
-
-		// Filter out not found ids (i.e. id is false).
-		return array_filter(
-			$ids,
-			function ( $item ) {
-				return false !== $item;
-			}
-		);
-	}
-
-	/**
-	 * Get images linked via the `gallery` shortcode.
-	 *
-	 * @param \WP_Post $post A {@link WP_Post} instance.
-	 *
-	 * @return array An array of attachment ids.
-	 * @since 3.10.0
-	 */
-	public function get_gallery( $post ) {
-
-		// @todo: the `gallery` shortcode has an `exclude` attribute which isn't
-		// checked at the moment.
-
-		// Prepare the return value.
-		$ids = array();
-
-		// As the above for images in galleries.
-		// Code inspired by http://wordpress.stackexchange.com/questions/80408/how-to-get-page-post-gallery-attachment-images-in-order-they-are-set-in-backend
-		$pattern = get_shortcode_regex();
-
-		if ( preg_match_all( '/' . $pattern . '/s', $post->post_content, $matches )
-			 && array_key_exists( 2, $matches )
-			 && in_array( 'gallery', $matches[2], true )
-		) {
-
-			$keys = array_keys( $matches[2], 'gallery', true );
-
-			foreach ( $keys as $key ) {
-				$atts = shortcode_parse_atts( $matches[3][ $key ] );
-
-				if ( is_array( $atts ) && array_key_exists( 'ids', $atts ) ) {
-					// gallery images insert explicitly by their ids.
-
-					foreach ( explode( ',', $atts['ids'] ) as $attachment_id ) {
-						// Since we do not check for actual image existence
-						// when generating the json content, check it now.
-						if ( wp_get_attachment_image_src( $attachment_id, 'full' ) ) {
-							$ids[ $attachment_id ] = true;
-						}
-					}
-				} else {
-					// gallery shortcode with no ids uses all the images
-					// attached to the post.
-					$images = get_attached_media( 'image', $post->ID );
-					foreach ( $images as $attachment ) {
-						$ids[ $attachment->ID ] = true;
-					}
-				}
-			}
-		}
-
-		return array_keys( $ids );
-	}
+    /**
+     * Create a {@link Wordlift_Attachment_Service} instance.
+     *
+     * @since 3.20.0
+     */
+    protected function __construct() {
+
+    }
+
+    private static $instance = null;
+
+    /**
+     * Get the singleton instance.
+     *
+     * @return \Wordlift_Attachment_Service The singleton instance.
+     * @since 3.20.0
+     */
+    public static function get_instance() {
+
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Get an attachment ID given a URL.
+     *
+     * Inspired from https://wpscholar.com/blog/get-attachment-id-from-wp-image-url/
+     *
+     * @param string $url The attachment URL.
+     *
+     * @return int|false Attachment ID on success, false on failure
+     * @since 3.10.0
+     */
+    public function get_attachment_id( $url ) {
+
+        // Get the upload directory data, we need the base URL to check whether
+        // the URL we received is within WP.
+        $dir = wp_upload_dir();
+
+        // Get the filename, the extension is kept.
+        if ( 1 !== preg_match( "@^{$dir['baseurl']}/(.+?)(?:-\d+x\d+)?(\.\w+)$@", $url, $matches ) ) {
+            return false;
+        }
+
+        $filename = $matches[1] . $matches[2];
+
+        // The following query is CPU-intensive, we need to review it.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/689.
+        //
+        // Query for attachments with the specified filename.
+        $query = new WP_Query(
+            array(
+                'post_type'           => 'attachment',
+                'post_status'         => 'inherit',
+                'fields'              => 'ids',
+                'meta_query'          => array(
+                    array(
+                        'value'   => $filename,
+                        'compare' => '=',
+                        'key'     => '_wp_attached_file',
+                    ),
+                ),
+                'posts_per_page'      => 1,
+                'ignore_sticky_posts' => true,
+            )
+        );
+
+        // If there are no posts, return.
+        if ( $query->have_posts() ) {
+            return $query->posts[0];
+            // foreach ( $query->posts as $attachment_id ) {
+            //
+            // Get the attachment metadata, we need the filename.
+            // $metadata          = wp_get_attachment_metadata( $attachment_id );
+            // $original_filename = basename( $metadata['file'] );
+            //
+            // Get the cropped filenames, or an empty array in case there are no files.
+            // $sizes_filenames = isset( $metadata['sizes'] ) ? wp_list_pluck( $metadata['sizes'], 'file' ) : array();
+            //
+            // If the provided filename matches the attachment filename (or one of its resized images), return the id.
+            // if ( $original_filename === $filename || in_array( $filename, $sizes_filenames ) ) {
+            // return $attachment_id;
+            // }
+            // }
+        }
+
+        // If we got here, we couldn't find any attachment.
+        return false;
+    }
+
+    /**
+     * Get images embedded in the post content.
+     *
+     * @param string $content The post content.
+     *
+     * @return array An array of attachment ids.
+     * @since 3.10.0
+     */
+    public function get_image_embeds( $content ) {
+
+        // Go over all the images included in the post content, check if they are
+        // in the DB, and if so include them.
+        $images = array();
+        if ( false === preg_match_all( '#<img [^>]*src="([^\\">]*)"[^>]*>#', $content, $images ) ) {
+            return array();
+        }
+
+        // Map the image URLs to attachment ids.
+        $that = $this;
+        $ids  = array_map(
+            function ( $url ) use ( $that ) {
+                return $that->get_attachment_id( $url );
+            },
+            $images[1]
+        );
+
+        // Filter out not found ids (i.e. id is false).
+        return array_filter(
+            $ids,
+            function ( $item ) {
+                return false !== $item;
+            }
+        );
+    }
+
+    /**
+     * Get images linked via the `gallery` shortcode.
+     *
+     * @param \WP_Post $post A {@link WP_Post} instance.
+     *
+     * @return array An array of attachment ids.
+     * @since 3.10.0
+     */
+    public function get_gallery( $post ) {
+
+        // @todo: the `gallery` shortcode has an `exclude` attribute which isn't
+        // checked at the moment.
+
+        // Prepare the return value.
+        $ids = array();
+
+        // As the above for images in galleries.
+        // Code inspired by http://wordpress.stackexchange.com/questions/80408/how-to-get-page-post-gallery-attachment-images-in-order-they-are-set-in-backend
+        $pattern = get_shortcode_regex();
+
+        if ( preg_match_all( '/' . $pattern . '/s', $post->post_content, $matches )
+             && array_key_exists( 2, $matches )
+             && in_array( 'gallery', $matches[2], true )
+        ) {
+
+            $keys = array_keys( $matches[2], 'gallery', true );
+
+            foreach ( $keys as $key ) {
+                $atts = shortcode_parse_atts( $matches[3][ $key ] );
+
+                if ( is_array( $atts ) && array_key_exists( 'ids', $atts ) ) {
+                    // gallery images insert explicitly by their ids.
+
+                    foreach ( explode( ',', $atts['ids'] ) as $attachment_id ) {
+                        // Since we do not check for actual image existence
+                        // when generating the json content, check it now.
+                        if ( wp_get_attachment_image_src( $attachment_id, 'full' ) ) {
+                            $ids[ $attachment_id ] = true;
+                        }
+                    }
+                } else {
+                    // gallery shortcode with no ids uses all the images
+                    // attached to the post.
+                    $images = get_attached_media( 'image', $post->ID );
+                    foreach ( $images as $attachment ) {
+                        $ids[ $attachment->ID ] = true;
+                    }
+                }
+            }
+        }
+
+        return array_keys( $ids );
+    }
 
 }

Spacing +25 added lines, -25 removed lines

@@ -35,7 +35,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new self();
 		}
 
@@ -52,18 +52,18 @@ 
 	 * @return int|false Attachment ID on success, false on failure
 	 * @since 3.10.0
 	 */
-	public function get_attachment_id( $url ) {
+	public function get_attachment_id($url) {
 
 		// Get the upload directory data, we need the base URL to check whether
 		// the URL we received is within WP.
 		$dir = wp_upload_dir();
 
 		// Get the filename, the extension is kept.
-		if ( 1 !== preg_match( "@^{$dir['baseurl']}/(.+?)(?:-\d+x\d+)?(\.\w+)$@", $url, $matches ) ) {
+		if (1 !== preg_match("@^{$dir['baseurl']}/(.+?)(?:-\d+x\d+)?(\.\w+)$@", $url, $matches)) {
 			return false;
 		}
 
-		$filename = $matches[1] . $matches[2];
+		$filename = $matches[1].$matches[2];
 
 		// The following query is CPU-intensive, we need to review it.
 		//
@@ -88,7 +88,7 @@ 
 		);
 
 		// If there are no posts, return.
-		if ( $query->have_posts() ) {
+		if ($query->have_posts()) {
 			return $query->posts[0];
 			// foreach ( $query->posts as $attachment_id ) {
 			//
@@ -118,20 +118,20 @@ 
 	 * @return array An array of attachment ids.
 	 * @since 3.10.0
 	 */
-	public function get_image_embeds( $content ) {
+	public function get_image_embeds($content) {
 
 		// Go over all the images included in the post content, check if they are
 		// in the DB, and if so include them.
 		$images = array();
-		if ( false === preg_match_all( '#<img [^>]*src="([^\\">]*)"[^>]*>#', $content, $images ) ) {
+		if (false === preg_match_all('#<img [^>]*src="([^\\">]*)"[^>]*>#', $content, $images)) {
 			return array();
 		}
 
 		// Map the image URLs to attachment ids.
 		$that = $this;
 		$ids  = array_map(
-			function ( $url ) use ( $that ) {
-				return $that->get_attachment_id( $url );
+			function($url) use ($that) {
+				return $that->get_attachment_id($url);
 			},
 			$images[1]
 		);
@@ -139,7 +139,7 @@ 
 		// Filter out not found ids (i.e. id is false).
 		return array_filter(
 			$ids,
-			function ( $item ) {
+			function($item) {
 				return false !== $item;
 			}
 		);
@@ -153,7 +153,7 @@ 
 	 * @return array An array of attachment ids.
 	 * @since 3.10.0
 	 */
-	public function get_gallery( $post ) {
+	public function get_gallery($post) {
 
 		// @todo: the `gallery` shortcode has an `exclude` attribute which isn't
 		// checked at the moment.
@@ -165,38 +165,38 @@ 
 		// Code inspired by http://wordpress.stackexchange.com/questions/80408/how-to-get-page-post-gallery-attachment-images-in-order-they-are-set-in-backend
 		$pattern = get_shortcode_regex();
 
-		if ( preg_match_all( '/' . $pattern . '/s', $post->post_content, $matches )
-			 && array_key_exists( 2, $matches )
-			 && in_array( 'gallery', $matches[2], true )
+		if (preg_match_all('/'.$pattern.'/s', $post->post_content, $matches)
+			 && array_key_exists(2, $matches)
+			 && in_array('gallery', $matches[2], true)
 		) {
 
-			$keys = array_keys( $matches[2], 'gallery', true );
+			$keys = array_keys($matches[2], 'gallery', true);
 
-			foreach ( $keys as $key ) {
-				$atts = shortcode_parse_atts( $matches[3][ $key ] );
+			foreach ($keys as $key) {
+				$atts = shortcode_parse_atts($matches[3][$key]);
 
-				if ( is_array( $atts ) && array_key_exists( 'ids', $atts ) ) {
+				if (is_array($atts) && array_key_exists('ids', $atts)) {
 					// gallery images insert explicitly by their ids.
 
-					foreach ( explode( ',', $atts['ids'] ) as $attachment_id ) {
+					foreach (explode(',', $atts['ids']) as $attachment_id) {
 						// Since we do not check for actual image existence
 						// when generating the json content, check it now.
-						if ( wp_get_attachment_image_src( $attachment_id, 'full' ) ) {
-							$ids[ $attachment_id ] = true;
+						if (wp_get_attachment_image_src($attachment_id, 'full')) {
+							$ids[$attachment_id] = true;
 						}
 					}
 				} else {
 					// gallery shortcode with no ids uses all the images
 					// attached to the post.
-					$images = get_attached_media( 'image', $post->ID );
-					foreach ( $images as $attachment ) {
-						$ids[ $attachment->ID ] = true;
+					$images = get_attached_media('image', $post->ID);
+					foreach ($images as $attachment) {
+						$ids[$attachment->ID] = true;
 					}
 				}
 			}
 		}
 
-		return array_keys( $ids );
+		return array_keys($ids);
 	}
 
 }

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

Indentation +264 added lines, -264 removed lines

@@ -17,274 +17,274 @@
  */
 class Wordlift_Jsonld_Service {
 
-	/**
-	 * A {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * A {@link Wordlift_Term_JsonLd_Adapter} instance.
-	 *
-	 * @since  3.32.0
-	 * @access private
-	 * @var Wordlift_Term_JsonLd_Adapter $entity_service A {@link Wordlift_Term_JsonLd_Adapter} instance.
-	 */
-	private $term_jsonld_adapter;
-
-	/**
-	 * A {@link Wordlift_Post_Converter} instance.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var \Wordlift_Post_Converter A {@link Wordlift_Post_Converter} instance.
-	 */
-	private $converter;
-
-	/**
-	 * A {@link Wordlift_Website_Jsonld_Converter} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Website_Jsonld_Converter A {@link Wordlift_Website_Jsonld_Converter} instance.
-	 */
-	private $website_converter;
-
-	/**
-	 * The singleton instance for the JSON-LD service.
-	 *
-	 * @since 3.15.1
-	 *
-	 * @var \Wordlift_Jsonld_Service $instance The singleton instance for the JSON-LD service.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a JSON-LD service.
-	 *
-	 * @param \Wordlift_Entity_Service           $entity_service A {@link Wordlift_Entity_Service} instance.
-	 * @param \Wordlift_Post_Converter           $converter A {@link Wordlift_Uri_To_Jsonld_Converter} instance.
-	 * @param \Wordlift_Website_Jsonld_Converter $website_converter A {@link Wordlift_Website_Jsonld_Converter} instance.
-	 * @param \Wordlift_Term_JsonLd_Adapter      $term_jsonld_adapter
-	 *
-	 * @since 3.8.0
-	 */
-	public function __construct( $entity_service, $converter, $website_converter, $term_jsonld_adapter ) {
-
-		$this->entity_service      = $entity_service;
-		$this->converter           = $converter;
-		$this->website_converter   = $website_converter;
-		$this->term_jsonld_adapter = $term_jsonld_adapter;
-		self::$instance            = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance for the JSON-LD service.
-	 *
-	 * @return \Wordlift_Jsonld_Service The singleton instance for the JSON-LD service.
-	 * @since 3.15.1
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Process calls to the AJAX 'wl_jsonld' endpoint.
-	 *
-	 * @since 3.8.0
-	 */
-	public function get() {
-		// Clear the buffer to be sure someone doesn't mess with our response.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/406.
-		// See https://codex.wordpress.org/AJAX_in_Plugins.
+    /**
+     * A {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     * A {@link Wordlift_Term_JsonLd_Adapter} instance.
+     *
+     * @since  3.32.0
+     * @access private
+     * @var Wordlift_Term_JsonLd_Adapter $entity_service A {@link Wordlift_Term_JsonLd_Adapter} instance.
+     */
+    private $term_jsonld_adapter;
+
+    /**
+     * A {@link Wordlift_Post_Converter} instance.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var \Wordlift_Post_Converter A {@link Wordlift_Post_Converter} instance.
+     */
+    private $converter;
+
+    /**
+     * A {@link Wordlift_Website_Jsonld_Converter} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Website_Jsonld_Converter A {@link Wordlift_Website_Jsonld_Converter} instance.
+     */
+    private $website_converter;
+
+    /**
+     * The singleton instance for the JSON-LD service.
+     *
+     * @since 3.15.1
+     *
+     * @var \Wordlift_Jsonld_Service $instance The singleton instance for the JSON-LD service.
+     */
+    private static $instance;
+
+    /**
+     * Create a JSON-LD service.
+     *
+     * @param \Wordlift_Entity_Service           $entity_service A {@link Wordlift_Entity_Service} instance.
+     * @param \Wordlift_Post_Converter           $converter A {@link Wordlift_Uri_To_Jsonld_Converter} instance.
+     * @param \Wordlift_Website_Jsonld_Converter $website_converter A {@link Wordlift_Website_Jsonld_Converter} instance.
+     * @param \Wordlift_Term_JsonLd_Adapter      $term_jsonld_adapter
+     *
+     * @since 3.8.0
+     */
+    public function __construct( $entity_service, $converter, $website_converter, $term_jsonld_adapter ) {
+
+        $this->entity_service      = $entity_service;
+        $this->converter           = $converter;
+        $this->website_converter   = $website_converter;
+        $this->term_jsonld_adapter = $term_jsonld_adapter;
+        self::$instance            = $this;
+
+    }
+
+    /**
+     * Get the singleton instance for the JSON-LD service.
+     *
+     * @return \Wordlift_Jsonld_Service The singleton instance for the JSON-LD service.
+     * @since 3.15.1
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Process calls to the AJAX 'wl_jsonld' endpoint.
+     *
+     * @since 3.8.0
+     */
+    public function get() {
+        // Clear the buffer to be sure someone doesn't mess with our response.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/406.
+        // See https://codex.wordpress.org/AJAX_in_Plugins.
         // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-		@ob_clean();
-
-		// Get the parameter from the request.
-		$is_homepage = isset( $_REQUEST['homepage'] ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$post_id     = isset( $_REQUEST['id'] ) && is_numeric( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : null; //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-
-		// Send the generated JSON-LD.
-		$this->send_jsonld( $this->get_jsonld( $is_homepage, $post_id ) );
-
-	}
-
-	/**
-	 * A close of WP's own `wp_send_json` function which uses `application/ld+json` as content type.
-	 *
-	 * @param mixed $response Variable (usually an array or object) to encode as JSON,
-	 *                           then print and die.
-	 *
-	 * @since 3.18.5
-	 */
-	private function send_jsonld( $response ) {
+        @ob_clean();
+
+        // Get the parameter from the request.
+        $is_homepage = isset( $_REQUEST['homepage'] ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        $post_id     = isset( $_REQUEST['id'] ) && is_numeric( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : null; //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+
+        // Send the generated JSON-LD.
+        $this->send_jsonld( $this->get_jsonld( $is_homepage, $post_id ) );
+
+    }
+
+    /**
+     * A close of WP's own `wp_send_json` function which uses `application/ld+json` as content type.
+     *
+     * @param mixed $response Variable (usually an array or object) to encode as JSON,
+     *                           then print and die.
+     *
+     * @since 3.18.5
+     */
+    private function send_jsonld( $response ) {
         // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-		@header( 'Content-Type: application/ld+json; charset=' . get_option( 'blog_charset' ) );
-		echo wp_json_encode( $response );
-		if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
-			wp_die();
-		} else {
-			die;
-		}
-	}
-
-	/**
-	 * Get the JSON-LD.
-	 *
-	 * @param bool     $is_homepage Whether the JSON-LD for the homepage is being requested.
-	 * @param int|null $post_id The JSON-LD for the specified {@link WP_Post} id.
-	 * @param int      $context A context for the JSON-LD generation, valid values in Jsonld_Context_Enum.
-	 *
-	 * @return array A JSON-LD structure.
-	 * @since 3.15.1
-	 */
-	public function get_jsonld( $is_homepage = false, $post_id = null, $context = Jsonld_Context_Enum::UNKNOWN ) {
-
-		// Tell NewRelic to ignore us, otherwise NewRelic customers might receive
-		// e-mails with a low apdex score.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/521
-		Wordlift_NewRelic_Adapter::ignore_apdex();
-
-		// Switch to Website converter if is home page.
-		if ( $is_homepage ) {
-			/**
-			 * Filter: 'wordlift_disable_website_json_ld' - Allow disabling of the json+ld output.
-			 *
-			 * @since  3.14.0
-			 * @api    bool $display_search Whether or not to display json+ld search on the frontend.
-			 */
-			if ( apply_filters( 'wordlift_disable_website_json_ld', false ) ) {
-				return array();
-			}
-
-			// Set a reference to the website_converter.
-			$website_converter = $this->website_converter;
-
-			// Send JSON-LD.
-			return $website_converter->create_schema();
-		}
-
-		// If no id has been provided return an empty array.
-		if ( ! isset( $post_id ) ) {
-			return array();
-		}
-
-		// An array of references which is captured when converting an URI to a
-		// json which we gather to further expand our json-ld.
-		$references       = array();
-		$references_infos = array();
-
-		// Set a reference to the entity_to_jsonld_converter to use in the closures.
-		$entity_to_jsonld_converter = $this->converter;
-
-		$jsonld = array( $entity_to_jsonld_converter->convert( $post_id, $references, $references_infos ) );
-
-		$that                       = $this;
-		$expanded_references_jsonld = array_map(
-			function ( $item ) use ( $context, $entity_to_jsonld_converter, &$references_infos, $that ) {
-				// "2nd level properties" may not output here, e.g. a post
-				// mentioning an event, located in a place: the place is referenced
-				// via the `@id` but no other properties are loaded.
-				$ignored = array();
-				if ( $item instanceof Term_Reference ) {
+        @header( 'Content-Type: application/ld+json; charset=' . get_option( 'blog_charset' ) );
+        echo wp_json_encode( $response );
+        if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+            wp_die();
+        } else {
+            die;
+        }
+    }
+
+    /**
+     * Get the JSON-LD.
+     *
+     * @param bool     $is_homepage Whether the JSON-LD for the homepage is being requested.
+     * @param int|null $post_id The JSON-LD for the specified {@link WP_Post} id.
+     * @param int      $context A context for the JSON-LD generation, valid values in Jsonld_Context_Enum.
+     *
+     * @return array A JSON-LD structure.
+     * @since 3.15.1
+     */
+    public function get_jsonld( $is_homepage = false, $post_id = null, $context = Jsonld_Context_Enum::UNKNOWN ) {
+
+        // Tell NewRelic to ignore us, otherwise NewRelic customers might receive
+        // e-mails with a low apdex score.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/521
+        Wordlift_NewRelic_Adapter::ignore_apdex();
+
+        // Switch to Website converter if is home page.
+        if ( $is_homepage ) {
+            /**
+             * Filter: 'wordlift_disable_website_json_ld' - Allow disabling of the json+ld output.
+             *
+             * @since  3.14.0
+             * @api    bool $display_search Whether or not to display json+ld search on the frontend.
+             */
+            if ( apply_filters( 'wordlift_disable_website_json_ld', false ) ) {
+                return array();
+            }
+
+            // Set a reference to the website_converter.
+            $website_converter = $this->website_converter;
+
+            // Send JSON-LD.
+            return $website_converter->create_schema();
+        }
+
+        // If no id has been provided return an empty array.
+        if ( ! isset( $post_id ) ) {
+            return array();
+        }
+
+        // An array of references which is captured when converting an URI to a
+        // json which we gather to further expand our json-ld.
+        $references       = array();
+        $references_infos = array();
+
+        // Set a reference to the entity_to_jsonld_converter to use in the closures.
+        $entity_to_jsonld_converter = $this->converter;
+
+        $jsonld = array( $entity_to_jsonld_converter->convert( $post_id, $references, $references_infos ) );
+
+        $that                       = $this;
+        $expanded_references_jsonld = array_map(
+            function ( $item ) use ( $context, $entity_to_jsonld_converter, &$references_infos, $that ) {
+                // "2nd level properties" may not output here, e.g. a post
+                // mentioning an event, located in a place: the place is referenced
+                // via the `@id` but no other properties are loaded.
+                $ignored = array();
+                if ( $item instanceof Term_Reference ) {
                     // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-					  $term_jsonld = $that->term_jsonld_adapter->get( $item->get_id(), $context );
-
-					  // For term references, we publish a jsonld array on the page, use only the first item.
-					  return count( $term_jsonld ) > 0 ? $term_jsonld[0] : false;
-				} elseif ( $item instanceof Post_Reference ) {
-					$item = $item->get_id();
-				}
-
-				// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-				return $entity_to_jsonld_converter->convert( $item, $ignored, $references_infos );
-			},
-			array_unique( $references )
-		);
-
-		// Convert each URI to a JSON-LD array, while gathering referenced entities.
-		// in the references array.
-		$jsonld = array_merge(
-			$jsonld,
-			// Convert each URI in the references array to JSON-LD. We don't output
-			// entities already output above (hence the array_diff).
-			array_filter( $expanded_references_jsonld )
-		);
-
-		$required_references = array_filter(
-			$references_infos,
-			function ( $item ) use ( $references ) {
-
-				return isset( $item['reference'] ) &&
-				   // Check that the reference is required
-				   $item['reference']->get_required() &&
-				   // Check that the reference isn't being output already.
-				   ! in_array( $item['reference']->get_id(), $references, true );
-			}
-		);
-
-		$jsonld = array_merge(
-			$jsonld,
-			array_filter(
-				array_map(
-					function ( $item ) use ( $references, $entity_to_jsonld_converter ) {
-
-						if ( ! isset( $item['reference'] ) ) {
-							  return null;
-						}
-
-						$post_id = $item['reference']->get_id();
-						if ( in_array( $post_id, $references, true ) ) {
-							return null;
-						}
-
-						$references[] = $post_id;
-
-						return $entity_to_jsonld_converter->convert( $post_id, $references );
-					},
-					$required_references
-				)
-			)
-		);
-
-		/**
-		 * Filter name: wl_after_get_jsonld
-		 *
-		 * @return array
-		 * @since 3.27.2
-		 * @var $jsonld array The final jsonld before outputting to page.
-		 * @var $post_id int The post id for which the jsonld is generated.
-		 */
-		$jsonld = apply_filters( 'wl_after_get_jsonld', $jsonld, $post_id, $context );
-
-		return $jsonld;
-	}
-
-	/**
-	 * Write the JSON-LD in the head.
-	 *
-	 * This function isn't actually used, but may be used to quickly enable writing the JSON-LD synchronously to the
-	 * document head, using the `wp_head` hook.
-	 *
-	 * @since 3.18.5
-	 */
-	public function wp_head() {
-
-		// Determine whether this is the home page or whether we're displaying a single post.
-		$is_homepage = is_home() || is_front_page();
-		$post_id     = is_singular() ? get_the_ID() : null;
-
-		$jsonld = wp_json_encode( $this->get_jsonld( $is_homepage, $post_id, Jsonld_Context_Enum::PAGE ) );
-		?>
+                        $term_jsonld = $that->term_jsonld_adapter->get( $item->get_id(), $context );
+
+                        // For term references, we publish a jsonld array on the page, use only the first item.
+                        return count( $term_jsonld ) > 0 ? $term_jsonld[0] : false;
+                } elseif ( $item instanceof Post_Reference ) {
+                    $item = $item->get_id();
+                }
+
+                // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+                return $entity_to_jsonld_converter->convert( $item, $ignored, $references_infos );
+            },
+            array_unique( $references )
+        );
+
+        // Convert each URI to a JSON-LD array, while gathering referenced entities.
+        // in the references array.
+        $jsonld = array_merge(
+            $jsonld,
+            // Convert each URI in the references array to JSON-LD. We don't output
+            // entities already output above (hence the array_diff).
+            array_filter( $expanded_references_jsonld )
+        );
+
+        $required_references = array_filter(
+            $references_infos,
+            function ( $item ) use ( $references ) {
+
+                return isset( $item['reference'] ) &&
+                   // Check that the reference is required
+                   $item['reference']->get_required() &&
+                   // Check that the reference isn't being output already.
+                   ! in_array( $item['reference']->get_id(), $references, true );
+            }
+        );
+
+        $jsonld = array_merge(
+            $jsonld,
+            array_filter(
+                array_map(
+                    function ( $item ) use ( $references, $entity_to_jsonld_converter ) {
+
+                        if ( ! isset( $item['reference'] ) ) {
+                                return null;
+                        }
+
+                        $post_id = $item['reference']->get_id();
+                        if ( in_array( $post_id, $references, true ) ) {
+                            return null;
+                        }
+
+                        $references[] = $post_id;
+
+                        return $entity_to_jsonld_converter->convert( $post_id, $references );
+                    },
+                    $required_references
+                )
+            )
+        );
+
+        /**
+         * Filter name: wl_after_get_jsonld
+         *
+         * @return array
+         * @since 3.27.2
+         * @var $jsonld array The final jsonld before outputting to page.
+         * @var $post_id int The post id for which the jsonld is generated.
+         */
+        $jsonld = apply_filters( 'wl_after_get_jsonld', $jsonld, $post_id, $context );
+
+        return $jsonld;
+    }
+
+    /**
+     * Write the JSON-LD in the head.
+     *
+     * This function isn't actually used, but may be used to quickly enable writing the JSON-LD synchronously to the
+     * document head, using the `wp_head` hook.
+     *
+     * @since 3.18.5
+     */
+    public function wp_head() {
+
+        // Determine whether this is the home page or whether we're displaying a single post.
+        $is_homepage = is_home() || is_front_page();
+        $post_id     = is_singular() ? get_the_ID() : null;
+
+        $jsonld = wp_json_encode( $this->get_jsonld( $is_homepage, $post_id, Jsonld_Context_Enum::PAGE ) );
+        ?>
 		<script type="application/ld+json"><?php echo esc_html( $jsonld ); ?></script>
 													  <?php
-	}
+    }
 
 }

Spacing +31 added lines, -31 removed lines

@@ -72,7 +72,7 @@ 
 	 *
 	 * @since 3.8.0
 	 */
-	public function __construct( $entity_service, $converter, $website_converter, $term_jsonld_adapter ) {
+	public function __construct($entity_service, $converter, $website_converter, $term_jsonld_adapter) {
 
 		$this->entity_service      = $entity_service;
 		$this->converter           = $converter;
@@ -107,11 +107,11 @@ 
 		@ob_clean();
 
 		// Get the parameter from the request.
-		$is_homepage = isset( $_REQUEST['homepage'] ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$post_id     = isset( $_REQUEST['id'] ) && is_numeric( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : null; //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		$is_homepage = isset($_REQUEST['homepage']); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		$post_id     = isset($_REQUEST['id']) && is_numeric($_REQUEST['id']) ? intval($_REQUEST['id']) : null; //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 
 		// Send the generated JSON-LD.
-		$this->send_jsonld( $this->get_jsonld( $is_homepage, $post_id ) );
+		$this->send_jsonld($this->get_jsonld($is_homepage, $post_id));
 
 	}
 
@@ -123,11 +123,11 @@ 
 	 *
 	 * @since 3.18.5
 	 */
-	private function send_jsonld( $response ) {
+	private function send_jsonld($response) {
         // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-		@header( 'Content-Type: application/ld+json; charset=' . get_option( 'blog_charset' ) );
-		echo wp_json_encode( $response );
-		if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+		@header('Content-Type: application/ld+json; charset='.get_option('blog_charset'));
+		echo wp_json_encode($response);
+		if (apply_filters('wp_doing_ajax', defined('DOING_AJAX') && DOING_AJAX)) {
 			wp_die();
 		} else {
 			die;
@@ -144,7 +144,7 @@ 
 	 * @return array A JSON-LD structure.
 	 * @since 3.15.1
 	 */
-	public function get_jsonld( $is_homepage = false, $post_id = null, $context = Jsonld_Context_Enum::UNKNOWN ) {
+	public function get_jsonld($is_homepage = false, $post_id = null, $context = Jsonld_Context_Enum::UNKNOWN) {
 
 		// Tell NewRelic to ignore us, otherwise NewRelic customers might receive
 		// e-mails with a low apdex score.
@@ -153,14 +153,14 @@ 
 		Wordlift_NewRelic_Adapter::ignore_apdex();
 
 		// Switch to Website converter if is home page.
-		if ( $is_homepage ) {
+		if ($is_homepage) {
 			/**
 			 * Filter: 'wordlift_disable_website_json_ld' - Allow disabling of the json+ld output.
 			 *
 			 * @since  3.14.0
 			 * @api    bool $display_search Whether or not to display json+ld search on the frontend.
 			 */
-			if ( apply_filters( 'wordlift_disable_website_json_ld', false ) ) {
+			if (apply_filters('wordlift_disable_website_json_ld', false)) {
 				return array();
 			}
 
@@ -172,7 +172,7 @@ 
 		}
 
 		// If no id has been provided return an empty array.
-		if ( ! isset( $post_id ) ) {
+		if ( ! isset($post_id)) {
 			return array();
 		}
 
@@ -184,29 +184,29 @@ 
 		// Set a reference to the entity_to_jsonld_converter to use in the closures.
 		$entity_to_jsonld_converter = $this->converter;
 
-		$jsonld = array( $entity_to_jsonld_converter->convert( $post_id, $references, $references_infos ) );
+		$jsonld = array($entity_to_jsonld_converter->convert($post_id, $references, $references_infos));
 
 		$that                       = $this;
 		$expanded_references_jsonld = array_map(
-			function ( $item ) use ( $context, $entity_to_jsonld_converter, &$references_infos, $that ) {
+			function($item) use ($context, $entity_to_jsonld_converter, &$references_infos, $that) {
 				// "2nd level properties" may not output here, e.g. a post
 				// mentioning an event, located in a place: the place is referenced
 				// via the `@id` but no other properties are loaded.
 				$ignored = array();
-				if ( $item instanceof Term_Reference ) {
+				if ($item instanceof Term_Reference) {
                     // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-					  $term_jsonld = $that->term_jsonld_adapter->get( $item->get_id(), $context );
+					  $term_jsonld = $that->term_jsonld_adapter->get($item->get_id(), $context);
 
 					  // For term references, we publish a jsonld array on the page, use only the first item.
-					  return count( $term_jsonld ) > 0 ? $term_jsonld[0] : false;
-				} elseif ( $item instanceof Post_Reference ) {
+					  return count($term_jsonld) > 0 ? $term_jsonld[0] : false;
+				} elseif ($item instanceof Post_Reference) {
 					$item = $item->get_id();
 				}
 
 				// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-				return $entity_to_jsonld_converter->convert( $item, $ignored, $references_infos );
+				return $entity_to_jsonld_converter->convert($item, $ignored, $references_infos);
 			},
-			array_unique( $references )
+			array_unique($references)
 		);
 
 		// Convert each URI to a JSON-LD array, while gathering referenced entities.
@@ -215,18 +215,18 @@ 
 			$jsonld,
 			// Convert each URI in the references array to JSON-LD. We don't output
 			// entities already output above (hence the array_diff).
-			array_filter( $expanded_references_jsonld )
+			array_filter($expanded_references_jsonld)
 		);
 
 		$required_references = array_filter(
 			$references_infos,
-			function ( $item ) use ( $references ) {
+			function($item) use ($references) {
 
-				return isset( $item['reference'] ) &&
+				return isset($item['reference']) &&
 				   // Check that the reference is required
 				   $item['reference']->get_required() &&
 				   // Check that the reference isn't being output already.
-				   ! in_array( $item['reference']->get_id(), $references, true );
+				   ! in_array($item['reference']->get_id(), $references, true);
 			}
 		);
 
@@ -234,20 +234,20 @@ 
 			$jsonld,
 			array_filter(
 				array_map(
-					function ( $item ) use ( $references, $entity_to_jsonld_converter ) {
+					function($item) use ($references, $entity_to_jsonld_converter) {
 
-						if ( ! isset( $item['reference'] ) ) {
+						if ( ! isset($item['reference'])) {
 							  return null;
 						}
 
 						$post_id = $item['reference']->get_id();
-						if ( in_array( $post_id, $references, true ) ) {
+						if (in_array($post_id, $references, true)) {
 							return null;
 						}
 
 						$references[] = $post_id;
 
-						return $entity_to_jsonld_converter->convert( $post_id, $references );
+						return $entity_to_jsonld_converter->convert($post_id, $references);
 					},
 					$required_references
 				)
@@ -262,7 +262,7 @@ 
 		 * @var $jsonld array The final jsonld before outputting to page.
 		 * @var $post_id int The post id for which the jsonld is generated.
 		 */
-		$jsonld = apply_filters( 'wl_after_get_jsonld', $jsonld, $post_id, $context );
+		$jsonld = apply_filters('wl_after_get_jsonld', $jsonld, $post_id, $context);
 
 		return $jsonld;
 	}
@@ -281,9 +281,9 @@ 
 		$is_homepage = is_home() || is_front_page();
 		$post_id     = is_singular() ? get_the_ID() : null;
 
-		$jsonld = wp_json_encode( $this->get_jsonld( $is_homepage, $post_id, Jsonld_Context_Enum::PAGE ) );
+		$jsonld = wp_json_encode($this->get_jsonld($is_homepage, $post_id, Jsonld_Context_Enum::PAGE));
 		?>
-		<script type="application/ld+json"><?php echo esc_html( $jsonld ); ?></script>
+		<script type="application/ld+json"><?php echo esc_html($jsonld); ?></script>
 													  <?php
 	}
 

src/includes/class-wordlift-category-taxonomy-service.php

Indentation +60 added lines, -60 removed lines

@@ -18,75 +18,75 @@
  */
 class Wordlift_Category_Taxonomy_Service {
 
-	/**
-	 * The {@link Wordlift_Entity_Post_Type_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Entity_Post_Type_Service $entity_post_type_service The {@link Wordlift_Entity_Post_Type_Service} instance.
-	 */
-	private $entity_post_type_service;
+    /**
+     * The {@link Wordlift_Entity_Post_Type_Service} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Entity_Post_Type_Service $entity_post_type_service The {@link Wordlift_Entity_Post_Type_Service} instance.
+     */
+    private $entity_post_type_service;
 
-	/**
-	 * Create a {@link Wordlift_Category_Taxonomy_Service} instance.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param \Wordlift_Entity_Post_Type_Service $entity_post_type_service The {@link Wordlift_Entity_Post_Type_Service} instance.
-	 */
-	public function __construct( $entity_post_type_service ) {
+    /**
+     * Create a {@link Wordlift_Category_Taxonomy_Service} instance.
+     *
+     * @since 3.11.0
+     *
+     * @param \Wordlift_Entity_Post_Type_Service $entity_post_type_service The {@link Wordlift_Entity_Post_Type_Service} instance.
+     */
+    public function __construct( $entity_post_type_service ) {
 
-		$this->entity_post_type_service = $entity_post_type_service;
+        $this->entity_post_type_service = $entity_post_type_service;
 
-	}
+    }
 
-	/**
-	 * Set the entity post types as one to be included in archive pages.
-	 *
-	 * In order to have entities show up in standard WP categories (Posts categories)
-	 * we configure the `entity` post type, but we also need to alter the main
-	 * WP query (which by default queries posts only) to include the `entities`.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param WP_Query $query WP's {@link WP_Query} instance.
-	 */
-	public function pre_get_posts( $query ) {
+    /**
+     * Set the entity post types as one to be included in archive pages.
+     *
+     * In order to have entities show up in standard WP categories (Posts categories)
+     * we configure the `entity` post type, but we also need to alter the main
+     * WP query (which by default queries posts only) to include the `entities`.
+     *
+     * @since 3.11.0
+     *
+     * @param WP_Query $query WP's {@link WP_Query} instance.
+     */
+    public function pre_get_posts( $query ) {
 
-		// Only for the main query, avoid problems with widgets and what not.
-		if ( ! $query->is_main_query() ) {
-			return;
-		}
+        // Only for the main query, avoid problems with widgets and what not.
+        if ( ! $query->is_main_query() ) {
+            return;
+        }
 
-		// We don't want to alter the query if we're in the admin UI, if this is
-		// not a category query, or if the `suppress_filters` is set.
-		//
-		// Note that it is unlikely for `suppress_filter` to be set on the front
-		// end, but let's be safe if it is set the calling code assumes no
-		// modifications of queries.
-		//
-		// is_admin is needed, otherwise category based post filters will show
-		// both types and at the current release (4.7) it causes PHP errors.
-		if ( is_admin() || ! is_category() || ! empty( $query->query_vars['suppress_filters'] ) ) {
-			return;
-		}
+        // We don't want to alter the query if we're in the admin UI, if this is
+        // not a category query, or if the `suppress_filters` is set.
+        //
+        // Note that it is unlikely for `suppress_filter` to be set on the front
+        // end, but let's be safe if it is set the calling code assumes no
+        // modifications of queries.
+        //
+        // is_admin is needed, otherwise category based post filters will show
+        // both types and at the current release (4.7) it causes PHP errors.
+        if ( is_admin() || ! is_category() || ! empty( $query->query_vars['suppress_filters'] ) ) {
+            return;
+        }
 
-		// Check the current post types, maybe the category archive pages
-		// are already associated with other post types.
-		//
-		// If `post_type` isn't set, WP assumes `post` by default.
-		$post_types = $query->get( 'post_type' );
-		$post_types = (array) ( $post_types ? $post_types : 'post' );
+        // Check the current post types, maybe the category archive pages
+        // are already associated with other post types.
+        //
+        // If `post_type` isn't set, WP assumes `post` by default.
+        $post_types = $query->get( 'post_type' );
+        $post_types = (array) ( $post_types ? $post_types : 'post' );
 
-		// Add the entities post type only if the post post type is used in the query
-		// since we only want `entities` to appear alongside posts.
-		if ( in_array( 'post', $post_types, true ) ) {
-			$post_types[] = $this->entity_post_type_service->get_post_type();
-		}
+        // Add the entities post type only if the post post type is used in the query
+        // since we only want `entities` to appear alongside posts.
+        if ( in_array( 'post', $post_types, true ) ) {
+            $post_types[] = $this->entity_post_type_service->get_post_type();
+        }
 
-		// Update the query post types.
-		$query->set( 'post_type', $post_types );
+        // Update the query post types.
+        $query->set( 'post_type', $post_types );
 
-	}
+    }
 
 }

Spacing +8 added lines, -8 removed lines

@@ -34,7 +34,7 @@ 
 	 *
 	 * @param \Wordlift_Entity_Post_Type_Service $entity_post_type_service The {@link Wordlift_Entity_Post_Type_Service} instance.
 	 */
-	public function __construct( $entity_post_type_service ) {
+	public function __construct($entity_post_type_service) {
 
 		$this->entity_post_type_service = $entity_post_type_service;
 
@@ -51,10 +51,10 @@ 
 	 *
 	 * @param WP_Query $query WP's {@link WP_Query} instance.
 	 */
-	public function pre_get_posts( $query ) {
+	public function pre_get_posts($query) {
 
 		// Only for the main query, avoid problems with widgets and what not.
-		if ( ! $query->is_main_query() ) {
+		if ( ! $query->is_main_query()) {
 			return;
 		}
 
@@ -67,7 +67,7 @@ 
 		//
 		// is_admin is needed, otherwise category based post filters will show
 		// both types and at the current release (4.7) it causes PHP errors.
-		if ( is_admin() || ! is_category() || ! empty( $query->query_vars['suppress_filters'] ) ) {
+		if (is_admin() || ! is_category() || ! empty($query->query_vars['suppress_filters'])) {
 			return;
 		}
 
@@ -75,17 +75,17 @@ 
 		// are already associated with other post types.
 		//
 		// If `post_type` isn't set, WP assumes `post` by default.
-		$post_types = $query->get( 'post_type' );
-		$post_types = (array) ( $post_types ? $post_types : 'post' );
+		$post_types = $query->get('post_type');
+		$post_types = (array) ($post_types ? $post_types : 'post');
 
 		// Add the entities post type only if the post post type is used in the query
 		// since we only want `entities` to appear alongside posts.
-		if ( in_array( 'post', $post_types, true ) ) {
+		if (in_array('post', $post_types, true)) {
 			$post_types[] = $this->entity_post_type_service->get_post_type();
 		}
 
 		// Update the query post types.
-		$query->set( 'post_type', $post_types );
+		$query->set('post_type', $post_types);
 
 	}