eventespresso / event-espresso-core

core/services/addon/api/AddonRoutes.php

Indentation +43 added lines, -43 removed lines

@@ -16,47 +16,47 @@
  */
 class AddonRoutes
 {
-    protected RouteHandler $route_handler;
-
-    /**
-     * array of fully qualified class names for routes where keys are add-on slugs
-     * @var string[][]
-     */
-    private array $routes = [];
-
-
-    /**
-     * @param RouteHandler $route_handler
-     */
-    public function __construct(RouteHandler $route_handler)
-    {
-        $this->route_handler = $route_handler;
-    }
-
-
-    /**
-     * @param string $route_fqcn
-     * @param string $addon_slug The class name of the add-on that the route belongs to
-     * @return void
-     */
-    public function addRouteFor(string $route_fqcn, string $addon_slug)
-    {
-        if (! isset($this->routes[ $addon_slug ])) {
-            $this->routes[ $addon_slug ] = [];
-        }
-        $this->routes[ $addon_slug ][] = $route_fqcn;
-    }
-
-
-    /**
-     * @throws Exception|DomainException|Throwable
-     */
-    public function loadRoutesFor(string $addon_slug)
-    {
-        if (isset($this->routes[ $addon_slug ])) {
-            foreach ($this->routes[ $addon_slug ] as $route_fqcn) {
-                $this->route_handler->addRoute($route_fqcn);
-            }
-        }
-    }
+	protected RouteHandler $route_handler;
+
+	/**
+	 * array of fully qualified class names for routes where keys are add-on slugs
+	 * @var string[][]
+	 */
+	private array $routes = [];
+
+
+	/**
+	 * @param RouteHandler $route_handler
+	 */
+	public function __construct(RouteHandler $route_handler)
+	{
+		$this->route_handler = $route_handler;
+	}
+
+
+	/**
+	 * @param string $route_fqcn
+	 * @param string $addon_slug The class name of the add-on that the route belongs to
+	 * @return void
+	 */
+	public function addRouteFor(string $route_fqcn, string $addon_slug)
+	{
+		if (! isset($this->routes[ $addon_slug ])) {
+			$this->routes[ $addon_slug ] = [];
+		}
+		$this->routes[ $addon_slug ][] = $route_fqcn;
+	}
+
+
+	/**
+	 * @throws Exception|DomainException|Throwable
+	 */
+	public function loadRoutesFor(string $addon_slug)
+	{
+		if (isset($this->routes[ $addon_slug ])) {
+			foreach ($this->routes[ $addon_slug ] as $route_fqcn) {
+				$this->route_handler->addRoute($route_fqcn);
+			}
+		}
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -41,10 +41,10 @@ 
      */
     public function addRouteFor(string $route_fqcn, string $addon_slug)
     {
-        if (! isset($this->routes[ $addon_slug ])) {
-            $this->routes[ $addon_slug ] = [];
+        if ( ! isset($this->routes[$addon_slug])) {
+            $this->routes[$addon_slug] = [];
         }
-        $this->routes[ $addon_slug ][] = $route_fqcn;
+        $this->routes[$addon_slug][] = $route_fqcn;
     }
 
 
@@ -53,8 +53,8 @@ 
      */
     public function loadRoutesFor(string $addon_slug)
     {
-        if (isset($this->routes[ $addon_slug ])) {
-            foreach ($this->routes[ $addon_slug ] as $route_fqcn) {
+        if (isset($this->routes[$addon_slug])) {
+            foreach ($this->routes[$addon_slug] as $route_fqcn) {
                 $this->route_handler->addRoute($route_fqcn);
             }
         }

core/services/addon/api/IncompatibleAddonHandler.php

Indentation +71 added lines, -71 removed lines

@@ -6,77 +6,77 @@
 
 class IncompatibleAddonHandler
 {
-    public function deactivateIncompatibleAddons(): void
-    {
-        static $done = false;
-        if ($done) {
-            return;
-        }
-        $this->deactivateIncompatibleAddon(
-            'Wait Lists',
-            'EE_WAIT_LISTS_VERSION',
-            '1.0.0.beta.074',
-            'load_espresso_wait_lists',
-            'EE_WAIT_LISTS_PLUGIN_FILE'
-        );
-        $this->deactivateIncompatibleAddon(
-            'Automated Upcoming Event Notifications',
-            'EE_AUTOMATED_UPCOMING_EVENT_NOTIFICATION_VERSION',
-            '1.0.0.beta.091',
-            'load_espresso_automated_upcoming_event_notification',
-            'EE_AUTOMATED_UPCOMING_EVENT_NOTIFICATION_PLUGIN_FILE'
-        );
-        // $this->deactivateIncompatibleAddon(
-        //     'WP Users Integration',
-        //     'EE_WPUSERS_VERSION',
-        //     '2.1.0.rc.003',
-        //     'load_ee_core_wpusers',
-        //     'EE_WPUSERS_PLUGIN_FILE'
-        // );
-        $done = true;
-    }
+	public function deactivateIncompatibleAddons(): void
+	{
+		static $done = false;
+		if ($done) {
+			return;
+		}
+		$this->deactivateIncompatibleAddon(
+			'Wait Lists',
+			'EE_WAIT_LISTS_VERSION',
+			'1.0.0.beta.074',
+			'load_espresso_wait_lists',
+			'EE_WAIT_LISTS_PLUGIN_FILE'
+		);
+		$this->deactivateIncompatibleAddon(
+			'Automated Upcoming Event Notifications',
+			'EE_AUTOMATED_UPCOMING_EVENT_NOTIFICATION_VERSION',
+			'1.0.0.beta.091',
+			'load_espresso_automated_upcoming_event_notification',
+			'EE_AUTOMATED_UPCOMING_EVENT_NOTIFICATION_PLUGIN_FILE'
+		);
+		// $this->deactivateIncompatibleAddon(
+		//     'WP Users Integration',
+		//     'EE_WPUSERS_VERSION',
+		//     '2.1.0.rc.003',
+		//     'load_ee_core_wpusers',
+		//     'EE_WPUSERS_PLUGIN_FILE'
+		// );
+		$done = true;
+	}
 
 
-    /**
-     * @param string $addon_name
-     * @param string $version_constant
-     * @param string $min_version_required
-     * @param string $load_callback
-     * @param string $plugin_file_constant
-     * @return void
-     */
-    private function deactivateIncompatibleAddon(
-        string $addon_name,
-        string $version_constant,
-        string $min_version_required,
-        string $load_callback,
-        string $plugin_file_constant
-    ): void {
-        if (! defined($version_constant)) {
-            return;
-        }
-        $addon_version = constant($version_constant);
-        if ($addon_version && version_compare($addon_version, $min_version_required, '<')) {
-            remove_action('AHEE__EE_System__load_espresso_addons', $load_callback);
-            if (! function_exists('deactivate_plugins')) {
-                require_once ABSPATH . 'wp-admin/includes/plugin.php';
-            }
-            deactivate_plugins(plugin_basename(constant($plugin_file_constant)));
-            unset($_GET['activate'], $_REQUEST['activate'], $_GET['activate-multi'], $_REQUEST['activate-multi']);
-            EE_Error::add_error(
-                sprintf(
-                    esc_html__(
-                        'We\'re sorry, but the Event Espresso %1$s addon was deactivated because version %2$s or higher is required with this version of Event Espresso core.',
-                        'event_espresso'
-                    ),
-                    $addon_name,
-                    $min_version_required
-                ),
-                __FILE__,
-                __FUNCTION__ . "($addon_name)",
-                __LINE__
-            );
-            EE_Error::get_notices(false, true);
-        }
-    }
+	/**
+	 * @param string $addon_name
+	 * @param string $version_constant
+	 * @param string $min_version_required
+	 * @param string $load_callback
+	 * @param string $plugin_file_constant
+	 * @return void
+	 */
+	private function deactivateIncompatibleAddon(
+		string $addon_name,
+		string $version_constant,
+		string $min_version_required,
+		string $load_callback,
+		string $plugin_file_constant
+	): void {
+		if (! defined($version_constant)) {
+			return;
+		}
+		$addon_version = constant($version_constant);
+		if ($addon_version && version_compare($addon_version, $min_version_required, '<')) {
+			remove_action('AHEE__EE_System__load_espresso_addons', $load_callback);
+			if (! function_exists('deactivate_plugins')) {
+				require_once ABSPATH . 'wp-admin/includes/plugin.php';
+			}
+			deactivate_plugins(plugin_basename(constant($plugin_file_constant)));
+			unset($_GET['activate'], $_REQUEST['activate'], $_GET['activate-multi'], $_REQUEST['activate-multi']);
+			EE_Error::add_error(
+				sprintf(
+					esc_html__(
+						'We\'re sorry, but the Event Espresso %1$s addon was deactivated because version %2$s or higher is required with this version of Event Espresso core.',
+						'event_espresso'
+					),
+					$addon_name,
+					$min_version_required
+				),
+				__FILE__,
+				__FUNCTION__ . "($addon_name)",
+				__LINE__
+			);
+			EE_Error::get_notices(false, true);
+		}
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -52,14 +52,14 @@ 
         string $load_callback,
         string $plugin_file_constant
     ): void {
-        if (! defined($version_constant)) {
+        if ( ! defined($version_constant)) {
             return;
         }
         $addon_version = constant($version_constant);
         if ($addon_version && version_compare($addon_version, $min_version_required, '<')) {
             remove_action('AHEE__EE_System__load_espresso_addons', $load_callback);
-            if (! function_exists('deactivate_plugins')) {
-                require_once ABSPATH . 'wp-admin/includes/plugin.php';
+            if ( ! function_exists('deactivate_plugins')) {
+                require_once ABSPATH.'wp-admin/includes/plugin.php';
             }
             deactivate_plugins(plugin_basename(constant($plugin_file_constant)));
             unset($_GET['activate'], $_REQUEST['activate'], $_GET['activate-multi'], $_REQUEST['activate-multi']);
@@ -73,7 +73,7 @@ 
                     $min_version_required
                 ),
                 __FILE__,
-                __FUNCTION__ . "($addon_name)",
+                __FUNCTION__."($addon_name)",
                 __LINE__
             );
             EE_Error::get_notices(false, true);

core/services/addon/api/v1/AddonApi.php

Indentation +115 added lines, -115 removed lines

@@ -9,119 +9,119 @@
 
 class AddonApi extends AddonApiVersion
 {
-    private DataMigrationApi $data_migration_api;
-
-    private LegacyModelApi $legacy_model_api;
-
-
-    /**
-     * Bootstrap constructor.
-     *
-     * @param AddonRoutes        $addon_routes
-     * @param DependencyHandlers $dependency_handlers
-     * @param Psr4Autoloader     $psr4_loader
-     * @param DataMigrationApi $data_migration_api
-     * @param LegacyModelApi $legacy_model_api
-     */
-    public function __construct(
-        AddonRoutes $addon_routes,
-        DependencyHandlers $dependency_handlers,
-        Psr4Autoloader $psr4_loader,
-        DataMigrationApi $data_migration_api,
-        LegacyModelApi $legacy_model_api
-    ) {
-        $this->data_migration_api = $data_migration_api;
-        $this->legacy_model_api   = $legacy_model_api;
-        parent::__construct($addon_routes, $dependency_handlers, $psr4_loader, AddonApiVersion::V1);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function dataMigrationScripts(): string
-    {
-        return $this->data_migration_api->dataMigrationScripts();
-    }
-
-
-    /**
-     * @param string $data_migration_scripts
-     */
-    public function addDataMigrationScripts(string $data_migration_scripts): void
-    {
-        $this->data_migration_api->addDataMigrationScripts($data_migration_scripts);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function entityClasses(): string
-    {
-        return $this->legacy_model_api->entityClasses();
-    }
-
-
-    /**
-     * @param string $entity_classes
-     */
-    public function addEntityClasses(string $entity_classes): void
-    {
-        $this->legacy_model_api->addEntityClasses($entity_classes);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function entityModels(): string
-    {
-        return $this->legacy_model_api->entityModels();
-    }
-
-
-    /**
-     * @param string $entity_models
-     */
-    public function addEntityModels(string $entity_models): void
-    {
-        $this->legacy_model_api->addEntityModels($entity_models);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function entityClassExtensions(): string
-    {
-        return $this->legacy_model_api->entityClassExtensions();
-    }
-
-
-    /**
-     * @param string $entity_class_extensions
-     */
-    public function addEntityClassExtensions(string $entity_class_extensions): void
-    {
-        $this->legacy_model_api->addEntityClassExtensions($entity_class_extensions);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function entityModelExtensions(): string
-    {
-        return $this->legacy_model_api->entityModelExtensions();
-    }
-
-
-    /**
-     * @param string $entity_model_extensions
-     */
-    public function addEntityModelExtensions(string $entity_model_extensions): void
-    {
-        $this->legacy_model_api->addEntityModelExtensions($entity_model_extensions);
-    }
+	private DataMigrationApi $data_migration_api;
+
+	private LegacyModelApi $legacy_model_api;
+
+
+	/**
+	 * Bootstrap constructor.
+	 *
+	 * @param AddonRoutes        $addon_routes
+	 * @param DependencyHandlers $dependency_handlers
+	 * @param Psr4Autoloader     $psr4_loader
+	 * @param DataMigrationApi $data_migration_api
+	 * @param LegacyModelApi $legacy_model_api
+	 */
+	public function __construct(
+		AddonRoutes $addon_routes,
+		DependencyHandlers $dependency_handlers,
+		Psr4Autoloader $psr4_loader,
+		DataMigrationApi $data_migration_api,
+		LegacyModelApi $legacy_model_api
+	) {
+		$this->data_migration_api = $data_migration_api;
+		$this->legacy_model_api   = $legacy_model_api;
+		parent::__construct($addon_routes, $dependency_handlers, $psr4_loader, AddonApiVersion::V1);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function dataMigrationScripts(): string
+	{
+		return $this->data_migration_api->dataMigrationScripts();
+	}
+
+
+	/**
+	 * @param string $data_migration_scripts
+	 */
+	public function addDataMigrationScripts(string $data_migration_scripts): void
+	{
+		$this->data_migration_api->addDataMigrationScripts($data_migration_scripts);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function entityClasses(): string
+	{
+		return $this->legacy_model_api->entityClasses();
+	}
+
+
+	/**
+	 * @param string $entity_classes
+	 */
+	public function addEntityClasses(string $entity_classes): void
+	{
+		$this->legacy_model_api->addEntityClasses($entity_classes);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function entityModels(): string
+	{
+		return $this->legacy_model_api->entityModels();
+	}
+
+
+	/**
+	 * @param string $entity_models
+	 */
+	public function addEntityModels(string $entity_models): void
+	{
+		$this->legacy_model_api->addEntityModels($entity_models);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function entityClassExtensions(): string
+	{
+		return $this->legacy_model_api->entityClassExtensions();
+	}
+
+
+	/**
+	 * @param string $entity_class_extensions
+	 */
+	public function addEntityClassExtensions(string $entity_class_extensions): void
+	{
+		$this->legacy_model_api->addEntityClassExtensions($entity_class_extensions);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function entityModelExtensions(): string
+	{
+		return $this->legacy_model_api->entityModelExtensions();
+	}
+
+
+	/**
+	 * @param string $entity_model_extensions
+	 */
+	public function addEntityModelExtensions(string $entity_model_extensions): void
+	{
+		$this->legacy_model_api->addEntityModelExtensions($entity_model_extensions);
+	}
 }

core/services/addon/api/v1/RegisterAddon.php

Indentation +40 added lines, -40 removed lines

@@ -9,44 +9,44 @@
 
 class RegisterAddon extends EE_Addon
 {
-    /**
-     * @param AddonApiV1 $addon
-     * @throws EE_Error
-     */
-    public function register(AddonApiV1 $addon): void
-    {
-        EE_Register_Addon::register(
-            $addon->fqcn(),
-            [
-                'class_name'            => $addon->fqcn(),
-                'version'               => $addon->version(),
-                'plugin_slug'           => $addon->slug(),
-                'min_core_version'      => $addon->minCoreVersion(),
-                'min_wp_version'        => $addon->minWpVersion(),
-                'main_file_path'        => $addon->mainFile(),
-                'dms_paths'             => [$addon->dataMigrationScripts()],
-                'class_paths'           => [$addon->entityClasses()],
-                'model_paths'           => [$addon->entityModels()],
-                'class_extension_paths' => [$addon->entityClassExtensions()],
-                'model_extension_paths' => [$addon->entityModelExtensions()],
-                'license' => [
-                    'beta'             => false,
-                    'main_file_path'   => $addon->mainFile(),
-                    'min_core_version' => $addon->minCoreVersion(),
-                    'plugin_id'        => $addon->ID(),
-                    'plugin_name'      => $addon->displayName(),
-                    'plugin_slug'      => $addon->slug(),
-                    'version'          => $addon->version(),
-                    'wp_override'      => false,
-                ],
-                // if plugin update engine is being used for auto-updates. not needed if PUE is not being used.
-                'pue_options'      => [
-                    'pue_plugin_slug' => $addon->slug(),
-                    'plugin_basename' => $addon->domain()->pluginBasename(),
-                    'checkPeriod'     => '24',
-                    'use_wp_update'   => false,
-                ]
-            ]
-        );
-    }
+	/**
+	 * @param AddonApiV1 $addon
+	 * @throws EE_Error
+	 */
+	public function register(AddonApiV1 $addon): void
+	{
+		EE_Register_Addon::register(
+			$addon->fqcn(),
+			[
+				'class_name'            => $addon->fqcn(),
+				'version'               => $addon->version(),
+				'plugin_slug'           => $addon->slug(),
+				'min_core_version'      => $addon->minCoreVersion(),
+				'min_wp_version'        => $addon->minWpVersion(),
+				'main_file_path'        => $addon->mainFile(),
+				'dms_paths'             => [$addon->dataMigrationScripts()],
+				'class_paths'           => [$addon->entityClasses()],
+				'model_paths'           => [$addon->entityModels()],
+				'class_extension_paths' => [$addon->entityClassExtensions()],
+				'model_extension_paths' => [$addon->entityModelExtensions()],
+				'license' => [
+					'beta'             => false,
+					'main_file_path'   => $addon->mainFile(),
+					'min_core_version' => $addon->minCoreVersion(),
+					'plugin_id'        => $addon->ID(),
+					'plugin_name'      => $addon->displayName(),
+					'plugin_slug'      => $addon->slug(),
+					'version'          => $addon->version(),
+					'wp_override'      => false,
+				],
+				// if plugin update engine is being used for auto-updates. not needed if PUE is not being used.
+				'pue_options'      => [
+					'pue_plugin_slug' => $addon->slug(),
+					'plugin_basename' => $addon->domain()->pluginBasename(),
+					'checkPeriod'     => '24',
+					'use_wp_update'   => false,
+				]
+			]
+		);
+	}
 }

core/services/addon/api/v1/LegacyModelApi.php

Indentation +48 added lines, -48 removed lines

@@ -4,71 +4,71 @@
 
 class LegacyModelApi
 {
-    /**
-     * path to EE_* entity classes
-     */
-    private string $entity_classes = '';
+	/**
+	 * path to EE_* entity classes
+	 */
+	private string $entity_classes = '';
 
-    /**
-     * path to EEM_* entity model classes
-     */
-    private string $entity_models = '';
+	/**
+	 * path to EEM_* entity model classes
+	 */
+	private string $entity_models = '';
 
-    /**
-     * path to EEE_* entity class extensions
-     */
-    private string $entity_class_extensions = '';
+	/**
+	 * path to EEE_* entity class extensions
+	 */
+	private string $entity_class_extensions = '';
 
-    /**
-     * path to EEME_* entity model class extensions
-     */
-    private string $entity_model_extensions = '';
+	/**
+	 * path to EEME_* entity model class extensions
+	 */
+	private string $entity_model_extensions = '';
 
 
-    public function entityClasses(): string
-    {
-        return $this->entity_classes;
-    }
+	public function entityClasses(): string
+	{
+		return $this->entity_classes;
+	}
 
 
-    public function addEntityClasses(string $entity_classes): void
-    {
-        $this->entity_classes = $entity_classes;
-    }
+	public function addEntityClasses(string $entity_classes): void
+	{
+		$this->entity_classes = $entity_classes;
+	}
 
 
-    public function entityModels(): string
-    {
-        return $this->entity_models;
-    }
+	public function entityModels(): string
+	{
+		return $this->entity_models;
+	}
 
 
-    public function addEntityModels(string $entity_models): void
-    {
-        $this->entity_models = $entity_models;
-    }
+	public function addEntityModels(string $entity_models): void
+	{
+		$this->entity_models = $entity_models;
+	}
 
 
-    public function entityClassExtensions(): string
-    {
-        return $this->entity_class_extensions;
-    }
+	public function entityClassExtensions(): string
+	{
+		return $this->entity_class_extensions;
+	}
 
 
-    public function addEntityClassExtensions(string $entity_class_extensions): void
-    {
-        $this->entity_class_extensions = $entity_class_extensions;
-    }
+	public function addEntityClassExtensions(string $entity_class_extensions): void
+	{
+		$this->entity_class_extensions = $entity_class_extensions;
+	}
 
 
-    public function entityModelExtensions(): string
-    {
-        return $this->entity_model_extensions;
-    }
+	public function entityModelExtensions(): string
+	{
+		return $this->entity_model_extensions;
+	}
 
 
-    public function addEntityModelExtensions(string $entity_model_extensions): void
-    {
-        $this->entity_model_extensions = $entity_model_extensions;
-    }
+	public function addEntityModelExtensions(string $entity_model_extensions): void
+	{
+		$this->entity_model_extensions = $entity_model_extensions;
+	}
 }

core/services/address/States.php

Indentation +134 added lines, -134 removed lines

@@ -12,138 +12,138 @@
  */
 class States
 {
-    /**
-     * indicates that ALL states should be retrieved from the db
-     */
-    public const GET_ALL = 'all';
-
-    /**
-     * indicates that only ACTIVE states should be retrieved from the db
-     */
-    public const GET_ACTIVE        = 'active';
-
-    public const INDEX_TYPE_ID     = 'id';
-
-    public const INDEX_TYPE_ABBREV = 'abbrev';
-
-    public const LIST_TYPE_NAME    = 'name';
-
-    public const LIST_TYPE_ABBREV  = 'abbrev';
-
-
-    private static function validGetOption(string $get_all_or_active): string
-    {
-        return in_array($get_all_or_active, [States::GET_ALL, States::GET_ACTIVE], true)
-            ? $get_all_or_active
-            : States::GET_ACTIVE;
-    }
-
-
-    private static function validIndexType(string $index_type): string
-    {
-        return in_array($index_type, [States::INDEX_TYPE_ID, States::INDEX_TYPE_ABBREV], true)
-            ? $index_type
-            : States::INDEX_TYPE_ID;
-    }
-
-
-    private static function validListType(string $list_type): string
-    {
-        return in_array($list_type, [States::LIST_TYPE_NAME, States::LIST_TYPE_ABBREV], true)
-            ? $list_type
-            : States::LIST_TYPE_NAME;
-    }
-
-
-    /**
-     * @param string $get_all_or_active
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private static function getStates(string $get_all_or_active = States::GET_ACTIVE): array
-    {
-        $get_all_or_active = States::validGetOption($get_all_or_active);
-        // get possibly cached list of states
-        return $get_all_or_active === States::GET_ALL
-            ? EEM_State::instance()->get_all_states()
-            : EEM_State::instance()->get_all_active_states();
-    }
-
-
-    /**
-     * @param string $index_type        what to use as keys for the array, one of the States::INDEX_TYPE_* constants
-     * @param bool   $group_by_country  whether to group the states by country
-     * @param string $get_all_or_active whether to get all states or just active states,
-     *                                  one of the States::GET_* constants
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function arrayOfNames(
-        string $index_type = States::INDEX_TYPE_ID,
-        bool $group_by_country = true,
-        string $get_all_or_active = States::GET_ACTIVE
-    ): array {
-        return States::arrayOfStates($index_type, $group_by_country, $get_all_or_active, States::LIST_TYPE_NAME);
-    }
-
-
-    /**
-     * @param string $index_type        what to use as keys for the array, one of the States::INDEX_TYPE_* constants
-     * @param bool   $group_by_country  whether to group the states by country
-     * @param string $get_all_or_active whether to get all states or just active states,
-     *                                  one of the States::GET_* constants
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function arrayOfAbbreviations(
-        string $index_type = States::INDEX_TYPE_ID,
-        bool $group_by_country = true,
-        string $get_all_or_active = States::GET_ACTIVE
-    ): array {
-        return States::arrayOfStates($index_type, $group_by_country, $get_all_or_active, States::LIST_TYPE_ABBREV);
-    }
-
-
-    /**
-     * generate list of state names or ISO codes
-     *
-     * @param string $index_type        what to use as keys for the array, one of the States::INDEX_TYPE_* constants
-     * @param bool   $group_by_country  whether to group the states by country
-     * @param string $get_all_or_active whether to get all states or just active states,
-     *                                  one of the States::GET_* constants
-     * @param string $list_type         whether to use state names or abbreviations as values for the array,
-     *                                  one of the States::LIST_TYPE_* constants
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private static function arrayOfStates(
-        string $index_type,
-        bool $group_by_country,
-        string $get_all_or_active,
-        string $list_type
-    ): array {
-        $list       = [0 => ''];
-        $group_list = ['' => [0 => '']];
-        $states     = States::getStates($get_all_or_active);
-        $list_type  = States::validListType($list_type);
-        $index_type = States::validIndexType($index_type);
-        if (! empty($states)) {
-            foreach ($states as $state) {
-                if ($state instanceof EE_State) {
-                    $index = $index_type === States::INDEX_TYPE_ID ? $state->ID() : $state->abbrev();
-                    $value = $list_type === States::LIST_TYPE_NAME ? $state->name() : $state->abbrev();
-                    if ($group_by_country) {
-                        $group_list[ $state->country()->name() ][ $index ] = $value;
-                    } else {
-                        $list[ $index ] = $value;
-                    }
-                }
-            }
-        }
-        return $group_by_country ? $group_list : $list;
-    }
+	/**
+	 * indicates that ALL states should be retrieved from the db
+	 */
+	public const GET_ALL = 'all';
+
+	/**
+	 * indicates that only ACTIVE states should be retrieved from the db
+	 */
+	public const GET_ACTIVE        = 'active';
+
+	public const INDEX_TYPE_ID     = 'id';
+
+	public const INDEX_TYPE_ABBREV = 'abbrev';
+
+	public const LIST_TYPE_NAME    = 'name';
+
+	public const LIST_TYPE_ABBREV  = 'abbrev';
+
+
+	private static function validGetOption(string $get_all_or_active): string
+	{
+		return in_array($get_all_or_active, [States::GET_ALL, States::GET_ACTIVE], true)
+			? $get_all_or_active
+			: States::GET_ACTIVE;
+	}
+
+
+	private static function validIndexType(string $index_type): string
+	{
+		return in_array($index_type, [States::INDEX_TYPE_ID, States::INDEX_TYPE_ABBREV], true)
+			? $index_type
+			: States::INDEX_TYPE_ID;
+	}
+
+
+	private static function validListType(string $list_type): string
+	{
+		return in_array($list_type, [States::LIST_TYPE_NAME, States::LIST_TYPE_ABBREV], true)
+			? $list_type
+			: States::LIST_TYPE_NAME;
+	}
+
+
+	/**
+	 * @param string $get_all_or_active
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private static function getStates(string $get_all_or_active = States::GET_ACTIVE): array
+	{
+		$get_all_or_active = States::validGetOption($get_all_or_active);
+		// get possibly cached list of states
+		return $get_all_or_active === States::GET_ALL
+			? EEM_State::instance()->get_all_states()
+			: EEM_State::instance()->get_all_active_states();
+	}
+
+
+	/**
+	 * @param string $index_type        what to use as keys for the array, one of the States::INDEX_TYPE_* constants
+	 * @param bool   $group_by_country  whether to group the states by country
+	 * @param string $get_all_or_active whether to get all states or just active states,
+	 *                                  one of the States::GET_* constants
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function arrayOfNames(
+		string $index_type = States::INDEX_TYPE_ID,
+		bool $group_by_country = true,
+		string $get_all_or_active = States::GET_ACTIVE
+	): array {
+		return States::arrayOfStates($index_type, $group_by_country, $get_all_or_active, States::LIST_TYPE_NAME);
+	}
+
+
+	/**
+	 * @param string $index_type        what to use as keys for the array, one of the States::INDEX_TYPE_* constants
+	 * @param bool   $group_by_country  whether to group the states by country
+	 * @param string $get_all_or_active whether to get all states or just active states,
+	 *                                  one of the States::GET_* constants
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function arrayOfAbbreviations(
+		string $index_type = States::INDEX_TYPE_ID,
+		bool $group_by_country = true,
+		string $get_all_or_active = States::GET_ACTIVE
+	): array {
+		return States::arrayOfStates($index_type, $group_by_country, $get_all_or_active, States::LIST_TYPE_ABBREV);
+	}
+
+
+	/**
+	 * generate list of state names or ISO codes
+	 *
+	 * @param string $index_type        what to use as keys for the array, one of the States::INDEX_TYPE_* constants
+	 * @param bool   $group_by_country  whether to group the states by country
+	 * @param string $get_all_or_active whether to get all states or just active states,
+	 *                                  one of the States::GET_* constants
+	 * @param string $list_type         whether to use state names or abbreviations as values for the array,
+	 *                                  one of the States::LIST_TYPE_* constants
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private static function arrayOfStates(
+		string $index_type,
+		bool $group_by_country,
+		string $get_all_or_active,
+		string $list_type
+	): array {
+		$list       = [0 => ''];
+		$group_list = ['' => [0 => '']];
+		$states     = States::getStates($get_all_or_active);
+		$list_type  = States::validListType($list_type);
+		$index_type = States::validIndexType($index_type);
+		if (! empty($states)) {
+			foreach ($states as $state) {
+				if ($state instanceof EE_State) {
+					$index = $index_type === States::INDEX_TYPE_ID ? $state->ID() : $state->abbrev();
+					$value = $list_type === States::LIST_TYPE_NAME ? $state->name() : $state->abbrev();
+					if ($group_by_country) {
+						$group_list[ $state->country()->name() ][ $index ] = $value;
+					} else {
+						$list[ $index ] = $value;
+					}
+				}
+			}
+		}
+		return $group_by_country ? $group_list : $list;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -131,15 +131,15 @@
         $states     = States::getStates($get_all_or_active);
         $list_type  = States::validListType($list_type);
         $index_type = States::validIndexType($index_type);
-        if (! empty($states)) {
+        if ( ! empty($states)) {
             foreach ($states as $state) {
                 if ($state instanceof EE_State) {
                     $index = $index_type === States::INDEX_TYPE_ID ? $state->ID() : $state->abbrev();
                     $value = $list_type === States::LIST_TYPE_NAME ? $state->name() : $state->abbrev();
                     if ($group_by_country) {
-                        $group_list[ $state->country()->name() ][ $index ] = $value;
+                        $group_list[$state->country()->name()][$index] = $value;
                     } else {
-                        $list[ $index ] = $value;
+                        $list[$index] = $value;
                     }
                 }
             }

core/services/address/Countries.php

Indentation +122 added lines, -122 removed lines

@@ -12,126 +12,126 @@
  */
 class Countries
 {
-    /**
-     * indicates that ALL countries should be retrieved from the db
-     */
-    public const GET_ALL = 'all';
-
-    /**
-     * indicates that only ACTIVE countries should be retrieved from the db
-     */
-    public const GET_ACTIVE     = 'active';
-
-    public const INDEX_TYPE_ID  = 'id';
-
-    public const INDEX_TYPE_ISO = 'iso';
-
-    public const LIST_TYPE_NAME = 'name';
-
-    public const LIST_TYPE_ISO  = 'iso';
-
-
-    private static function validGetOption(string $get_all_or_active): string
-    {
-        return in_array($get_all_or_active, [Countries::GET_ALL, Countries::GET_ACTIVE], true)
-            ? $get_all_or_active
-            : Countries::GET_ACTIVE;
-    }
-
-
-    private static function validIndexType(string $index_type): string
-    {
-        return in_array($index_type, [Countries::INDEX_TYPE_ID, Countries::INDEX_TYPE_ISO], true)
-            ? $index_type
-            : Countries::INDEX_TYPE_ID;
-    }
-
-
-    private static function validListType(string $list_type): string
-    {
-        return in_array($list_type, [Countries::LIST_TYPE_NAME, Countries::LIST_TYPE_ISO], true)
-            ? $list_type
-            : Countries::LIST_TYPE_NAME;
-    }
-
-
-    /**
-     * @param string $get_all_or_active whether to get all countries or just active countries,
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private static function getCountries(string $get_all_or_active = Countries::GET_ACTIVE): array
-    {
-        $get_all_or_active = Countries::validGetOption($get_all_or_active);
-        // get possibly cached list of countries
-        return $get_all_or_active === Countries::GET_ALL
-            ? EEM_Country::instance()->get_all_countries()
-            : EEM_Country::instance()->get_all_active_countries();
-    }
-
-
-    /**
-     * @param string $index_type        what to use as keys for the array, one of the Countries::INDEX_TYPE_* constants
-     * @param string $get_all_or_active whether to get all countries or just active countries,
-     *                                  one of the Countries::GET_* constants
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function arrayOfNames(
-        string $index_type = Countries::INDEX_TYPE_ID,
-        string $get_all_or_active = Countries::GET_ACTIVE
-    ): array {
-        return Countries::arrayOfCountries($index_type, $get_all_or_active, Countries::LIST_TYPE_NAME);
-    }
-
-
-    /**
-     * @param string $index_type        what to use as keys for the array, one of the Countries::INDEX_TYPE_* constants
-     * @param string $get_all_or_active whether to get all countries or just active countries,
-     *                                  one of the Countries::GET_* constants
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function arrayOfISOs(
-        string $index_type = Countries::INDEX_TYPE_ID,
-        string $get_all_or_active = Countries::GET_ACTIVE
-    ): array {
-        return Countries::arrayOfCountries($index_type, $get_all_or_active, Countries::LIST_TYPE_ISO);
-    }
-
-
-    /**
-     * generate list of country names or ISO codes
-     *
-     * @param string $index_type        what to use as keys for the array, one of the Countries::INDEX_TYPE_* constants
-     * @param string $get_all_or_active whether to get all countries or just active countries,
-     *                                  one of the Countries::GET_* constants
-     * @param string $list_type         whether to use country names or ISO codes as values for the array,
-     *                                  one of the Countries::LIST_TYPE_* constants
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private static function arrayOfCountries(
-        string $index_type,
-        string $get_all_or_active,
-        string $list_type
-    ): array {
-        $list       = ['' => ''];
-        $countries  = Countries::getCountries($get_all_or_active);
-        $list_type  = Countries::validListType($list_type);
-        $index_type = Countries::validIndexType($index_type);
-        if (! empty($countries)) {
-            foreach ($countries as $country) {
-                if ($country instanceof EE_Country) {
-                    $index          = $index_type === Countries::INDEX_TYPE_ID ? $country->ID() : $country->ISO();
-                    $list[ $index ] = $list_type === Countries::LIST_TYPE_NAME ? $country->name() : $country->ISO();
-                }
-            }
-        }
-        return $list;
-    }
+	/**
+	 * indicates that ALL countries should be retrieved from the db
+	 */
+	public const GET_ALL = 'all';
+
+	/**
+	 * indicates that only ACTIVE countries should be retrieved from the db
+	 */
+	public const GET_ACTIVE     = 'active';
+
+	public const INDEX_TYPE_ID  = 'id';
+
+	public const INDEX_TYPE_ISO = 'iso';
+
+	public const LIST_TYPE_NAME = 'name';
+
+	public const LIST_TYPE_ISO  = 'iso';
+
+
+	private static function validGetOption(string $get_all_or_active): string
+	{
+		return in_array($get_all_or_active, [Countries::GET_ALL, Countries::GET_ACTIVE], true)
+			? $get_all_or_active
+			: Countries::GET_ACTIVE;
+	}
+
+
+	private static function validIndexType(string $index_type): string
+	{
+		return in_array($index_type, [Countries::INDEX_TYPE_ID, Countries::INDEX_TYPE_ISO], true)
+			? $index_type
+			: Countries::INDEX_TYPE_ID;
+	}
+
+
+	private static function validListType(string $list_type): string
+	{
+		return in_array($list_type, [Countries::LIST_TYPE_NAME, Countries::LIST_TYPE_ISO], true)
+			? $list_type
+			: Countries::LIST_TYPE_NAME;
+	}
+
+
+	/**
+	 * @param string $get_all_or_active whether to get all countries or just active countries,
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private static function getCountries(string $get_all_or_active = Countries::GET_ACTIVE): array
+	{
+		$get_all_or_active = Countries::validGetOption($get_all_or_active);
+		// get possibly cached list of countries
+		return $get_all_or_active === Countries::GET_ALL
+			? EEM_Country::instance()->get_all_countries()
+			: EEM_Country::instance()->get_all_active_countries();
+	}
+
+
+	/**
+	 * @param string $index_type        what to use as keys for the array, one of the Countries::INDEX_TYPE_* constants
+	 * @param string $get_all_or_active whether to get all countries or just active countries,
+	 *                                  one of the Countries::GET_* constants
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function arrayOfNames(
+		string $index_type = Countries::INDEX_TYPE_ID,
+		string $get_all_or_active = Countries::GET_ACTIVE
+	): array {
+		return Countries::arrayOfCountries($index_type, $get_all_or_active, Countries::LIST_TYPE_NAME);
+	}
+
+
+	/**
+	 * @param string $index_type        what to use as keys for the array, one of the Countries::INDEX_TYPE_* constants
+	 * @param string $get_all_or_active whether to get all countries or just active countries,
+	 *                                  one of the Countries::GET_* constants
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function arrayOfISOs(
+		string $index_type = Countries::INDEX_TYPE_ID,
+		string $get_all_or_active = Countries::GET_ACTIVE
+	): array {
+		return Countries::arrayOfCountries($index_type, $get_all_or_active, Countries::LIST_TYPE_ISO);
+	}
+
+
+	/**
+	 * generate list of country names or ISO codes
+	 *
+	 * @param string $index_type        what to use as keys for the array, one of the Countries::INDEX_TYPE_* constants
+	 * @param string $get_all_or_active whether to get all countries or just active countries,
+	 *                                  one of the Countries::GET_* constants
+	 * @param string $list_type         whether to use country names or ISO codes as values for the array,
+	 *                                  one of the Countries::LIST_TYPE_* constants
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private static function arrayOfCountries(
+		string $index_type,
+		string $get_all_or_active,
+		string $list_type
+	): array {
+		$list       = ['' => ''];
+		$countries  = Countries::getCountries($get_all_or_active);
+		$list_type  = Countries::validListType($list_type);
+		$index_type = Countries::validIndexType($index_type);
+		if (! empty($countries)) {
+			foreach ($countries as $country) {
+				if ($country instanceof EE_Country) {
+					$index          = $index_type === Countries::INDEX_TYPE_ID ? $country->ID() : $country->ISO();
+					$list[ $index ] = $list_type === Countries::LIST_TYPE_NAME ? $country->name() : $country->ISO();
+				}
+			}
+		}
+		return $list;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -124,11 +124,11 @@
         $countries  = Countries::getCountries($get_all_or_active);
         $list_type  = Countries::validListType($list_type);
         $index_type = Countries::validIndexType($index_type);
-        if (! empty($countries)) {
+        if ( ! empty($countries)) {
             foreach ($countries as $country) {
                 if ($country instanceof EE_Country) {
                     $index          = $index_type === Countries::INDEX_TYPE_ID ? $country->ID() : $country->ISO();
-                    $list[ $index ] = $list_type === Countries::LIST_TYPE_NAME ? $country->name() : $country->ISO();
+                    $list[$index] = $list_type === Countries::LIST_TYPE_NAME ? $country->name() : $country->ISO();
                 }
             }
         }

core/libraries/iframe_display/IframeEmbedButton.php

Indentation +250 added lines, -250 removed lines

@@ -17,281 +17,281 @@
  */
 abstract class IframeEmbedButton
 {
-    /**
-     * @var string $iframe_name
-     */
-    private $iframe_name;
+	/**
+	 * @var string $iframe_name
+	 */
+	private $iframe_name;
 
-    /**
-     * @var string $route_name
-     */
-    private $route_name;
+	/**
+	 * @var string $route_name
+	 */
+	private $route_name;
 
-    /**
-     * @var string $slug
-     */
-    private $slug;
+	/**
+	 * @var string $slug
+	 */
+	private $slug;
 
-    /**
-     * @var boolean $append_filterable_content
-     */
-    private $append_filterable_content;
+	/**
+	 * @var boolean $append_filterable_content
+	 */
+	private $append_filterable_content;
 
 
-    /**
-     * IframeEmbedButton constructor.
-     *
-     * @param string $iframe_name i18n name for the iframe. This will be used in HTML
-     * @param string $route_name  the name of the registered route
-     * @param string $slug        URL slug used for the thing the iframe button is being embedded in.
-     *                            will most likely be "event" since that's the only usage atm
-     */
-    public function __construct($iframe_name, $route_name, $slug = 'event')
-    {
-        $this->iframe_name = $iframe_name;
-        $this->route_name = $route_name;
-        $this->slug = $slug;
-    }
+	/**
+	 * IframeEmbedButton constructor.
+	 *
+	 * @param string $iframe_name i18n name for the iframe. This will be used in HTML
+	 * @param string $route_name  the name of the registered route
+	 * @param string $slug        URL slug used for the thing the iframe button is being embedded in.
+	 *                            will most likely be "event" since that's the only usage atm
+	 */
+	public function __construct($iframe_name, $route_name, $slug = 'event')
+	{
+		$this->iframe_name = $iframe_name;
+		$this->route_name = $route_name;
+		$this->slug = $slug;
+	}
 
 
-    /**
-     * Adds an iframe embed code button to the Event editor.
-     */
-    public function addEventEditorIframeEmbedButtonFilter()
-    {
-        add_filter(
-            'get_sample_permalink_html',
-            array($this, 'appendIframeEmbedButtonToSamplePermalinkHtml'),
-            15,
-            2
-        );
-    }
+	/**
+	 * Adds an iframe embed code button to the Event editor.
+	 */
+	public function addEventEditorIframeEmbedButtonFilter()
+	{
+		add_filter(
+			'get_sample_permalink_html',
+			array($this, 'appendIframeEmbedButtonToSamplePermalinkHtml'),
+			15,
+			2
+		);
+	}
 
-    /**
-     * Adds assets of iframe embed code button.
-     */
-    public function addEventEditorIframeEmbedButtonAssets()
-    {
-        add_action(
-            'admin_enqueue_scripts',
-            array($this, 'embedButtonAssets'),
-            10
-        );
-    }
+	/**
+	 * Adds assets of iframe embed code button.
+	 */
+	public function addEventEditorIframeEmbedButtonAssets()
+	{
+		add_action(
+			'admin_enqueue_scripts',
+			array($this, 'embedButtonAssets'),
+			10
+		);
+	}
 
 
-    /**
-     * @param $permalink_string
-     * @param $id
-     * @return string
-     */
-    public function appendIframeEmbedButtonToSamplePermalinkHtml($permalink_string, $id)
-    {
-        return $this->eventEditorIframeEmbedButton(
-            $permalink_string,
-            $id
-        );
-    }
+	/**
+	 * @param $permalink_string
+	 * @param $id
+	 * @return string
+	 */
+	public function appendIframeEmbedButtonToSamplePermalinkHtml($permalink_string, $id)
+	{
+		return $this->eventEditorIframeEmbedButton(
+			$permalink_string,
+			$id
+		);
+	}
 
 
-    /**
-     * iframe embed code button to the Event editor.
-     *
-     * @param string $permalink_string
-     * @param int    $id
-     * @return string
-     */
-    public function eventEditorIframeEmbedButton(
-        $permalink_string,
-        $id
-    ) {
-        // make sure this is ONLY when editing and the event id has been set.
-        if (! empty($id)) {
-            $post = get_post($id);
-            // if NOT event then let's get out.
-            if ($post->post_type !== EspressoPostType::EVENTS) {
-                return $permalink_string;
-            }
-            $permalink_string .= $this->embedButtonHtml([$this->slug => $id]);
-        }
-        return $permalink_string;
-    }
+	/**
+	 * iframe embed code button to the Event editor.
+	 *
+	 * @param string $permalink_string
+	 * @param int    $id
+	 * @return string
+	 */
+	public function eventEditorIframeEmbedButton(
+		$permalink_string,
+		$id
+	) {
+		// make sure this is ONLY when editing and the event id has been set.
+		if (! empty($id)) {
+			$post = get_post($id);
+			// if NOT event then let's get out.
+			if ($post->post_type !== EspressoPostType::EVENTS) {
+				return $permalink_string;
+			}
+			$permalink_string .= $this->embedButtonHtml([$this->slug => $id]);
+		}
+		return $permalink_string;
+	}
 
 
-    /**
-     * Adds an iframe embed code button via a WP do_action() as determined by the first parameter
-     *
-     * @param string $action name of the WP do_action() to hook into
-     */
-    public function addActionIframeEmbedButton($action)
-    {
-        // add button for iframe code to event editor.
-        add_action(
-            $action,
-            array($this, 'addActionIframeEmbedButtonCallback'),
-            10,
-            2
-        );
-    }
+	/**
+	 * Adds an iframe embed code button via a WP do_action() as determined by the first parameter
+	 *
+	 * @param string $action name of the WP do_action() to hook into
+	 */
+	public function addActionIframeEmbedButton($action)
+	{
+		// add button for iframe code to event editor.
+		add_action(
+			$action,
+			array($this, 'addActionIframeEmbedButtonCallback'),
+			10,
+			2
+		);
+	}
 
 
-    /**
-     * @return void
-     */
-    public function addActionIframeEmbedButtonCallback()
-    {
-        echo wp_kses($this->embedButtonHtml(), AllowedTags::getWithFullTags());
-    }
+	/**
+	 * @return void
+	 */
+	public function addActionIframeEmbedButtonCallback()
+	{
+		echo wp_kses($this->embedButtonHtml(), AllowedTags::getWithFullTags());
+	}
 
 
-    /**
-     * Adds an iframe embed code button via a WP apply_filters() as determined by the first parameter
-     *
-     * @param string $filter     name of the WP apply_filters() to hook into
-     * @param bool   $append     if true, will add iframe embed button to end of content,
-     *                           else if false, will add to the beginning of the content
-     */
-    public function addFilterIframeEmbedButton($filter, $append = true)
-    {
-        $this->append_filterable_content = $append;
-        // add button for iframe code to event editor.
-        add_filter(
-            $filter,
-            array($this, 'addFilterIframeEmbedButtonCallback'),
-            10
-        );
-    }
+	/**
+	 * Adds an iframe embed code button via a WP apply_filters() as determined by the first parameter
+	 *
+	 * @param string $filter     name of the WP apply_filters() to hook into
+	 * @param bool   $append     if true, will add iframe embed button to end of content,
+	 *                           else if false, will add to the beginning of the content
+	 */
+	public function addFilterIframeEmbedButton($filter, $append = true)
+	{
+		$this->append_filterable_content = $append;
+		// add button for iframe code to event editor.
+		add_filter(
+			$filter,
+			array($this, 'addFilterIframeEmbedButtonCallback'),
+			10
+		);
+	}
 
 
-    /**
-     * @param array|string $filterable_content
-     * @return array|string
-     */
-    public function addFilterIframeEmbedButtonCallback($filterable_content)
-    {
-        $embedButtonHtml = $this->embedButtonHtml();
-        if (is_array($filterable_content)) {
-            $filterable_content = $this->append_filterable_content
-                ? $filterable_content + array($this->route_name => $embedButtonHtml)
-                : array($this->route_name => $embedButtonHtml) + $filterable_content;
-        } else {
-            $filterable_content = $this->append_filterable_content
-                ? $filterable_content . $embedButtonHtml
-                : $embedButtonHtml . $filterable_content;
-        }
-        return $filterable_content;
-    }
+	/**
+	 * @param array|string $filterable_content
+	 * @return array|string
+	 */
+	public function addFilterIframeEmbedButtonCallback($filterable_content)
+	{
+		$embedButtonHtml = $this->embedButtonHtml();
+		if (is_array($filterable_content)) {
+			$filterable_content = $this->append_filterable_content
+				? $filterable_content + array($this->route_name => $embedButtonHtml)
+				: array($this->route_name => $embedButtonHtml) + $filterable_content;
+		} else {
+			$filterable_content = $this->append_filterable_content
+				? $filterable_content . $embedButtonHtml
+				: $embedButtonHtml . $filterable_content;
+		}
+		return $filterable_content;
+	}
 
 
-    /**
-     * iframe_embed_html
-     *
-     * @param array  $query_args
-     * @param string $button_class
-     * @return string
-     */
-    public function embedButtonHtml($query_args = array(), $button_class = '')
-    {
-        // incoming args will replace the defaults listed here in the second array (union preserves first array)
-        $query_args = (array) $query_args + array($this->route_name => 'iframe');
-        $query_args = (array) apply_filters(
-            'FHEE__EventEspresso_core_libraries_iframe_display_IframeEmbedButton__embedButtonHtml__query_args',
-            $query_args
-        );
-        // add this route to our localized vars
-        $iframe_module_routes                      = EE_Registry::$i18n_js_strings['iframe_module_routes'] ?? [];
-        $iframe_module_routes[ $this->route_name ] = $this->route_name;
-        EE_Registry::$i18n_js_strings['iframe_module_routes'] = $iframe_module_routes;
-        $route_name = esc_attr($this->route_name);
-        $iframe_url = esc_url_raw(add_query_arg($query_args, site_url()));
+	/**
+	 * iframe_embed_html
+	 *
+	 * @param array  $query_args
+	 * @param string $button_class
+	 * @return string
+	 */
+	public function embedButtonHtml($query_args = array(), $button_class = '')
+	{
+		// incoming args will replace the defaults listed here in the second array (union preserves first array)
+		$query_args = (array) $query_args + array($this->route_name => 'iframe');
+		$query_args = (array) apply_filters(
+			'FHEE__EventEspresso_core_libraries_iframe_display_IframeEmbedButton__embedButtonHtml__query_args',
+			$query_args
+		);
+		// add this route to our localized vars
+		$iframe_module_routes                      = EE_Registry::$i18n_js_strings['iframe_module_routes'] ?? [];
+		$iframe_module_routes[ $this->route_name ] = $this->route_name;
+		EE_Registry::$i18n_js_strings['iframe_module_routes'] = $iframe_module_routes;
+		$route_name = esc_attr($this->route_name);
+		$iframe_url = esc_url_raw(add_query_arg($query_args, site_url()));
 
-        return EEH_HTML::div(
-            EEH_HTML::link(
-                '#',
-                sprintf(
-                    esc_html__('%1$s Embed %2$s iFrame', 'event_espresso'),
-                    '<span class="dashicons dashicons-embed-post"></span>',
-                    $this->iframe_name
-                ),
-                sprintf(
-                    esc_html__(
-                        'click here to generate code for embedding %1$s iframe into another site.',
-                        'event_espresso'
-                    ),
-                    EEH_Inflector::add_indefinite_article($this->iframe_name)
-                ),
-                $route_name . '-iframe-embed-trigger-js',
-                'iframe-embed-trigger-js button button--small button--secondary ' . esc_attr($button_class),
-                '',
-                ' data-iframe_embed_button="#' . $route_name . '-iframe-js" tabindex="-1"'
-            ),
-            '',
-            'ee-admin-button-row ee-admin-button-row--align-start'
-        )
-        . EEH_HTML::div(
-            EEH_HTML::div(
-                esc_html('<iframe src="' . $iframe_url . '" allow="' . home_url() . '" width="100%" height="100%"></iframe>'),
-                '',
-                '',
-                'width:100%; height: 500px;'
-            ),
-            $route_name . '-iframe-js',
-            'iframe-embed-wrapper-js',
-            'display:none;'
-        );
-    }
+		return EEH_HTML::div(
+			EEH_HTML::link(
+				'#',
+				sprintf(
+					esc_html__('%1$s Embed %2$s iFrame', 'event_espresso'),
+					'<span class="dashicons dashicons-embed-post"></span>',
+					$this->iframe_name
+				),
+				sprintf(
+					esc_html__(
+						'click here to generate code for embedding %1$s iframe into another site.',
+						'event_espresso'
+					),
+					EEH_Inflector::add_indefinite_article($this->iframe_name)
+				),
+				$route_name . '-iframe-embed-trigger-js',
+				'iframe-embed-trigger-js button button--small button--secondary ' . esc_attr($button_class),
+				'',
+				' data-iframe_embed_button="#' . $route_name . '-iframe-js" tabindex="-1"'
+			),
+			'',
+			'ee-admin-button-row ee-admin-button-row--align-start'
+		)
+		. EEH_HTML::div(
+			EEH_HTML::div(
+				esc_html('<iframe src="' . $iframe_url . '" allow="' . home_url() . '" width="100%" height="100%"></iframe>'),
+				'',
+				'',
+				'width:100%; height: 500px;'
+			),
+			$route_name . '-iframe-js',
+			'iframe-embed-wrapper-js',
+			'display:none;'
+		);
+	}
 
 
-    /**
-     * enqueue iframe button js
-     */
-    public function embedButtonAssets()
-    {
-        EE_Registry::$i18n_js_strings['iframe_embed_title'] = esc_html__(
-            'copy and paste the following into any other site\'s content to display this event:',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['iframe_embed_close_msg'] = esc_html__(
-            'click anywhere outside of this window to close it.',
-            'event_espresso'
-        );
-        wp_register_script(
-            'iframe_embed_button',
-            plugin_dir_url(__FILE__) . 'iframe-embed-button.js',
-            array('ee-dialog'),
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_enqueue_script('iframe_embed_button');
-    }
+	/**
+	 * enqueue iframe button js
+	 */
+	public function embedButtonAssets()
+	{
+		EE_Registry::$i18n_js_strings['iframe_embed_title'] = esc_html__(
+			'copy and paste the following into any other site\'s content to display this event:',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['iframe_embed_close_msg'] = esc_html__(
+			'click anywhere outside of this window to close it.',
+			'event_espresso'
+		);
+		wp_register_script(
+			'iframe_embed_button',
+			plugin_dir_url(__FILE__) . 'iframe-embed-button.js',
+			array('ee-dialog'),
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_enqueue_script('iframe_embed_button');
+	}
 
 
-    /**
-     * generates embed button sections for admin pages
-     *
-     * @param array $embed_buttons
-     * @return string
-     */
-    public function addIframeEmbedButtonsSection(array $embed_buttons)
-    {
-        $embed_buttons = (array) apply_filters(
-            'FHEE__EventEspresso_core_libraries_iframe_display_IframeEmbedButton__addIframeEmbedButtonsSection__embed_buttons',
-            $embed_buttons
-        );
-        if (empty($embed_buttons)) {
-            return '';
-        }
-        // add button for iframe code to event editor.
-        $html = EEH_HTML::div('', '', 'ee-admin-section ee-iframe-embed-buttons');
-        $html .= EEH_HTML::h3(esc_html__('iFrame Embed Code', 'event_espresso'));
-        $html .= EEH_HTML::p(
-            esc_html__(
-                'Click the following button(s) to generate iframe HTML that will allow you to embed your event content within the content of other websites.',
-                'event_espresso'
-            )
-        );
-        $html .= ' &nbsp; ' . implode(' &nbsp; ', $embed_buttons) . ' ';
-        $html .= EEH_HTML::divx();
-        return $html;
-    }
+	/**
+	 * generates embed button sections for admin pages
+	 *
+	 * @param array $embed_buttons
+	 * @return string
+	 */
+	public function addIframeEmbedButtonsSection(array $embed_buttons)
+	{
+		$embed_buttons = (array) apply_filters(
+			'FHEE__EventEspresso_core_libraries_iframe_display_IframeEmbedButton__addIframeEmbedButtonsSection__embed_buttons',
+			$embed_buttons
+		);
+		if (empty($embed_buttons)) {
+			return '';
+		}
+		// add button for iframe code to event editor.
+		$html = EEH_HTML::div('', '', 'ee-admin-section ee-iframe-embed-buttons');
+		$html .= EEH_HTML::h3(esc_html__('iFrame Embed Code', 'event_espresso'));
+		$html .= EEH_HTML::p(
+			esc_html__(
+				'Click the following button(s) to generate iframe HTML that will allow you to embed your event content within the content of other websites.',
+				'event_espresso'
+			)
+		);
+		$html .= ' &nbsp; ' . implode(' &nbsp; ', $embed_buttons) . ' ';
+		$html .= EEH_HTML::divx();
+		return $html;
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -106,7 +106,7 @@ 
         $id
     ) {
         // make sure this is ONLY when editing and the event id has been set.
-        if (! empty($id)) {
+        if ( ! empty($id)) {
             $post = get_post($id);
             // if NOT event then let's get out.
             if ($post->post_type !== EspressoPostType::EVENTS) {
@@ -176,8 +176,8 @@ 
                 : array($this->route_name => $embedButtonHtml) + $filterable_content;
         } else {
             $filterable_content = $this->append_filterable_content
-                ? $filterable_content . $embedButtonHtml
-                : $embedButtonHtml . $filterable_content;
+                ? $filterable_content.$embedButtonHtml
+                : $embedButtonHtml.$filterable_content;
         }
         return $filterable_content;
     }
@@ -200,7 +200,7 @@ 
         );
         // add this route to our localized vars
         $iframe_module_routes                      = EE_Registry::$i18n_js_strings['iframe_module_routes'] ?? [];
-        $iframe_module_routes[ $this->route_name ] = $this->route_name;
+        $iframe_module_routes[$this->route_name] = $this->route_name;
         EE_Registry::$i18n_js_strings['iframe_module_routes'] = $iframe_module_routes;
         $route_name = esc_attr($this->route_name);
         $iframe_url = esc_url_raw(add_query_arg($query_args, site_url()));
@@ -220,22 +220,22 @@ 
                     ),
                     EEH_Inflector::add_indefinite_article($this->iframe_name)
                 ),
-                $route_name . '-iframe-embed-trigger-js',
-                'iframe-embed-trigger-js button button--small button--secondary ' . esc_attr($button_class),
+                $route_name.'-iframe-embed-trigger-js',
+                'iframe-embed-trigger-js button button--small button--secondary '.esc_attr($button_class),
                 '',
-                ' data-iframe_embed_button="#' . $route_name . '-iframe-js" tabindex="-1"'
+                ' data-iframe_embed_button="#'.$route_name.'-iframe-js" tabindex="-1"'
             ),
             '',
             'ee-admin-button-row ee-admin-button-row--align-start'
         )
         . EEH_HTML::div(
             EEH_HTML::div(
-                esc_html('<iframe src="' . $iframe_url . '" allow="' . home_url() . '" width="100%" height="100%"></iframe>'),
+                esc_html('<iframe src="'.$iframe_url.'" allow="'.home_url().'" width="100%" height="100%"></iframe>'),
                 '',
                 '',
                 'width:100%; height: 500px;'
             ),
-            $route_name . '-iframe-js',
+            $route_name.'-iframe-js',
             'iframe-embed-wrapper-js',
             'display:none;'
         );
@@ -257,7 +257,7 @@ 
         );
         wp_register_script(
             'iframe_embed_button',
-            plugin_dir_url(__FILE__) . 'iframe-embed-button.js',
+            plugin_dir_url(__FILE__).'iframe-embed-button.js',
             array('ee-dialog'),
             EVENT_ESPRESSO_VERSION,
             true
@@ -290,7 +290,7 @@ 
                 'event_espresso'
             )
         );
-        $html .= ' &nbsp; ' . implode(' &nbsp; ', $embed_buttons) . ' ';
+        $html .= ' &nbsp; '.implode(' &nbsp; ', $embed_buttons).' ';
         $html .= EEH_HTML::divx();
         return $html;
     }

core/libraries/iframe_display/iframe_wrapper.template.php

Braces +5 added lines, -2 removed lines

@@ -31,11 +31,14 @@
     <meta name="robots" content="noindex,nofollow">
     <?php if ($enqueue_wp_assets) : ?>
         <?php wp_head(); ?>
-    <?php else : ?>
+    <?php else {
+	: ?>
         <?php foreach ($css as $handle => $url) : ?>
             <?php if (isset($inline_styles["{$handle}_before"])) :?>
                 <style>
-                    <?php echo wp_kses($inline_styles["{$handle}_before"], AllowedTags::getWithFullTags()); ?>
+                    <?php echo wp_kses($inline_styles["{$handle}_before"], AllowedTags::getWithFullTags());
+}
+?>
                 </style>
             <?php endif; ?>
             <link rel="stylesheet" type="text/css" id="<?php esc_attr_e($handle); ?>-css" href="<?php echo esc_url_raw($url); ?>">