eventespresso / event-espresso-core

core/services/addon/AddonManager.php

Indentation +93 added lines, -93 removed lines

@@ -23,109 +23,109 @@
  */
 class AddonManager
 {
-    /**
-     * @var AddonCollection
-     */
-    private $addons;
+	/**
+	 * @var AddonCollection
+	 */
+	private $addons;
 
-    /**
-     * @var IncompatibleAddonHandler
-     */
-    private $incompatible_addon_handler;
+	/**
+	 * @var IncompatibleAddonHandler
+	 */
+	private $incompatible_addon_handler;
 
-    /**
-     * @var Psr4Autoloader
-     */
-    private $psr4_loader;
+	/**
+	 * @var Psr4Autoloader
+	 */
+	private $psr4_loader;
 
-    /**
-     * @var RegisterV1Addon
-     */
-    private $register_v1_addon;
+	/**
+	 * @var RegisterV1Addon
+	 */
+	private $register_v1_addon;
 
-    /**
-     * @var ThirdPartyPluginHandler
-     */
-    private $third_party_plugin_handler;
+	/**
+	 * @var ThirdPartyPluginHandler
+	 */
+	private $third_party_plugin_handler;
 
 
-    /**
-     * AddonManager constructor.
-     *
-     * @param AddonCollection          $addons
-     * @param Psr4Autoloader           $psr4_loader
-     * @param RegisterV1Addon          $register_v1_addon
-     * @param IncompatibleAddonHandler $incompatible_addon_handler
-     * @param ThirdPartyPluginHandler  $third_party_plugin_handler
-     */
-    public function __construct(
-        AddonCollection $addons,
-        Psr4Autoloader $psr4_loader,
-        RegisterV1Addon $register_v1_addon,
-        IncompatibleAddonHandler $incompatible_addon_handler,
-        ThirdPartyPluginHandler $third_party_plugin_handler
-    ) {
-        $this->addons                     = $addons;
-        $this->psr4_loader                = $psr4_loader;
-        $this->register_v1_addon          = $register_v1_addon;
-        $this->incompatible_addon_handler = $incompatible_addon_handler;
-        $this->third_party_plugin_handler = $third_party_plugin_handler;
-    }
+	/**
+	 * AddonManager constructor.
+	 *
+	 * @param AddonCollection          $addons
+	 * @param Psr4Autoloader           $psr4_loader
+	 * @param RegisterV1Addon          $register_v1_addon
+	 * @param IncompatibleAddonHandler $incompatible_addon_handler
+	 * @param ThirdPartyPluginHandler  $third_party_plugin_handler
+	 */
+	public function __construct(
+		AddonCollection $addons,
+		Psr4Autoloader $psr4_loader,
+		RegisterV1Addon $register_v1_addon,
+		IncompatibleAddonHandler $incompatible_addon_handler,
+		ThirdPartyPluginHandler $third_party_plugin_handler
+	) {
+		$this->addons                     = $addons;
+		$this->psr4_loader                = $psr4_loader;
+		$this->register_v1_addon          = $register_v1_addon;
+		$this->incompatible_addon_handler = $incompatible_addon_handler;
+		$this->third_party_plugin_handler = $third_party_plugin_handler;
+	}
 
 
-    /**
-     * @throws Exception
-     */
-    public function initialize()
-    {
-        // set autoloaders for all of the classes implementing the legacy EEI_Plugin_API
-        // which provide helpers for EE plugin authors to more easily register certain components with EE.
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'plugin_api');
-    }
+	/**
+	 * @throws Exception
+	 */
+	public function initialize()
+	{
+		// set autoloaders for all of the classes implementing the legacy EEI_Plugin_API
+		// which provide helpers for EE plugin authors to more easily register certain components with EE.
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'plugin_api');
+	}
 
 
-    /**
-     * @throws Exception
-     */
-    public function loadAddons()
-    {
-        try {
-            $this->incompatible_addon_handler->deactivateIncompatibleAddons();
-            // legacy add-on API
-            do_action('AHEE__EE_System__load_espresso_addons');
-            // new add-on API that uses versioning
-            do_action(
-                'AHEE__EventEspresso_core_services_addon_AddonManager__initialize__addons',
-                $this->addons,
-                espresso_version()
-            );
-            // addons are responsible for loading their AddonApiVersion into the AddonCollection
-            foreach ($this->addons as $addon) {
-                if ($addon instanceof AddonApiVersion) {
-                    $this->registerAddon($addon);
-                }
-            }
-            $this->third_party_plugin_handler->loadPlugins();
-            do_action('AHEE__EE_System__load_espresso_addons__complete');
-        } catch (Exception $exception) {
-            new ExceptionStackTraceDisplay($exception);
-        }
-    }
+	/**
+	 * @throws Exception
+	 */
+	public function loadAddons()
+	{
+		try {
+			$this->incompatible_addon_handler->deactivateIncompatibleAddons();
+			// legacy add-on API
+			do_action('AHEE__EE_System__load_espresso_addons');
+			// new add-on API that uses versioning
+			do_action(
+				'AHEE__EventEspresso_core_services_addon_AddonManager__initialize__addons',
+				$this->addons,
+				espresso_version()
+			);
+			// addons are responsible for loading their AddonApiVersion into the AddonCollection
+			foreach ($this->addons as $addon) {
+				if ($addon instanceof AddonApiVersion) {
+					$this->registerAddon($addon);
+				}
+			}
+			$this->third_party_plugin_handler->loadPlugins();
+			do_action('AHEE__EE_System__load_espresso_addons__complete');
+		} catch (Exception $exception) {
+			new ExceptionStackTraceDisplay($exception);
+		}
+	}
 
 
-    /**
-     * @param AddonApiVersion $addon
-     * @throws EE_Error
-     */
-    private function registerAddon(AddonApiVersion $addon)
-    {
-        // first register addon namespace so that FQCNs resolve correctly
-        $this->psr4_loader->addNamespace($addon->getNamespace(), dirname($addon->mainFile()) . '/src/');
-        // then allow add-on to perform any other setup that relied on PSR4 autoloading
-        $addon->initialize();
-        // now register each addon based on it's API version
-        if ($addon instanceof AddonApiV1) {
-            $this->register_v1_addon->register($addon);
-        }
-    }
+	/**
+	 * @param AddonApiVersion $addon
+	 * @throws EE_Error
+	 */
+	private function registerAddon(AddonApiVersion $addon)
+	{
+		// first register addon namespace so that FQCNs resolve correctly
+		$this->psr4_loader->addNamespace($addon->getNamespace(), dirname($addon->mainFile()) . '/src/');
+		// then allow add-on to perform any other setup that relied on PSR4 autoloading
+		$addon->initialize();
+		// now register each addon based on it's API version
+		if ($addon instanceof AddonApiV1) {
+			$this->register_v1_addon->register($addon);
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@ 
     {
         // set autoloaders for all of the classes implementing the legacy EEI_Plugin_API
         // which provide helpers for EE plugin authors to more easily register certain components with EE.
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'plugin_api');
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'plugin_api');
     }
 
 
@@ -120,7 +120,7 @@ 
     private function registerAddon(AddonApiVersion $addon)
     {
         // first register addon namespace so that FQCNs resolve correctly
-        $this->psr4_loader->addNamespace($addon->getNamespace(), dirname($addon->mainFile()) . '/src/');
+        $this->psr4_loader->addNamespace($addon->getNamespace(), dirname($addon->mainFile()).'/src/');
         // then allow add-on to perform any other setup that relied on PSR4 autoloading
         $addon->initialize();
         // now register each addon based on it's API version

core/services/addon/api/IncompatibleAddonHandler.php

Indentation +62 added lines, -62 removed lines

@@ -6,68 +6,68 @@
 
 class IncompatibleAddonHandler
 {
-    /**
-     * @return void
-     */
-    public function deactivateIncompatibleAddons()
-    {
-        $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'
-        );
-    }
+	/**
+	 * @return void
+	 */
+	public function deactivateIncompatibleAddons()
+	{
+		$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'
+		);
+	}
 
 
-    /**
-     * @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
-    ) {
-        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
+	) {
+		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

@@ -43,14 +43,14 @@ 
         string $load_callback,
         string $plugin_file_constant
     ) {
-        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']);
@@ -64,7 +64,7 @@ 
                     $min_version_required
                 ),
                 __FILE__,
-                __FUNCTION__ . "({$addon_name})",
+                __FUNCTION__."({$addon_name})",
                 __LINE__
             );
             EE_Error::get_notices(false, true);

core/services/addon/api/AddonApiVersion.php

Indentation +282 added lines, -282 removed lines

@@ -19,286 +19,286 @@
  */
 abstract class AddonApiVersion
 {
-    const V1 = 1;
-
-    /**
-     * @var int one of the API_VERSION_* constants from above
-     */
-    private $api_version;
-
-    /**
-     * @var DomainInterface
-     */
-    private $domain;
-
-    /**
-     * @var Version minimum version of EE core that the add-on will work with
-     */
-    private $min_core_version;
-
-    /**
-     * @var Version minimum version of WP core that the add-on will work with
-     */
-    private $min_wp_version;
-
-    /**
-     * @var string  PascalCase identifier for the add-on.
-     *              IMPORTANT! there must be a class of the same name in the root of the add-ons /src/domain/ folder
-     */
-    private $name;
-
-    /**
-     * @var string
-     */
-    private $addon_namespace;
-
-    /**
-     * @var FilePath
-     */
-    private $main_file;
-
-    /**
-     * @var string
-     */
-    private $slug;
-
-    /**
-     * @var Version the current add-on version
-     */
-    private $version;
-
-
-    /**
-     * Bootstrap constructor.
-     *
-     * @param string $slug
-     * @param string $name
-     * @param string $namespace
-     * @param string $version
-     * @param string $min_core_version
-     * @param string $main_file
-     * @param int    $api_version
-     */
-    protected function __construct(
-        string $slug,
-        string $name,
-        string $namespace,
-        string $version,
-        string $min_core_version,
-        string $main_file,
-        int $api_version
-    ) {
-        $this->setSlug($slug);
-        $this->setName($name);
-        $this->setNamespace($namespace);
-        $this->setMinCoreVersion($min_core_version);
-        $this->setMainFile($main_file);
-        $this->setVersion($version);
-        $this->setApiVersion($api_version);
-    }
-
-
-    /**
-     * @return void
-     */
-    public function initialize(): void
-    {
-        $this->domain = DomainFactory::create(
-            "{$this->addon_namespace}\\domain\\Domain",
-            $this->main_file,
-            $this->version
-        );
-    }
-
-
-    /**
-     * @return int[]
-     */
-    private function validApiVersions(): array
-    {
-        return [
-            AddonApiVersion::V1,
-        ];
-    }
-
-
-    /**
-     * @param int $api_version
-     */
-    private function setApiVersion(int $api_version): void
-    {
-        if (! in_array($api_version, $this->validApiVersions())) {
-            throw new DomainException(
-                esc_html__(
-                    'Invalid Add-on API Version! Please use one of the EventEspresso\core\domain\entities\addon\Bootstrap class constants',
-                    'event_espresso'
-                )
-            );
-        }
-        $this->api_version = $api_version;
-    }
-
-
-    /**
-     * @param string $main_file
-     */
-    public function setMainFile(string $main_file): void
-    {
-        $this->main_file = new FilePath($main_file);
-    }
-
-
-    /**
-     * @param string $min_core_version
-     */
-    private function setMinCoreVersion(string $min_core_version): void
-    {
-        $this->min_core_version = Version::fromString($min_core_version);
-    }
-
-
-    /**
-     * @param string $name
-     */
-    public function setName(string $name): void
-    {
-        $this->name = $name;
-    }
-
-
-    /**
-     * @param string $namespace
-     */
-    private function setNamespace(string $namespace): void
-    {
-        $this->addon_namespace = $namespace;
-    }
-
-
-    /**
-     * @param string $slug
-     */
-    private function setSlug(string $slug): void
-    {
-        $valid_slug = sanitize_key($slug);
-        if ($slug !== $valid_slug) {
-            throw new DomainException(
-                esc_html__(
-                    'Invalid Add-on "slug"! Please ensure that slug only uses lowercase characters and dashes.',
-                    'event_espresso'
-                )
-            );
-        }
-        $this->slug = $valid_slug;
-    }
-
-
-    /**
-     * @param string $version
-     */
-    public function setVersion(string $version): void
-    {
-        $this->version = Version::fromString($version);
-    }
-
-
-    /**
-     * @return int
-     */
-    public function apiVersion(): int
-    {
-        return $this->api_version;
-    }
-
-
-    /**
-     * @return DomainInterface
-     */
-    public function domain(): DomainInterface
-    {
-        return $this->domain;
-    }
-
-
-    /**
-     * @return Version|null
-     */
-    public function minCoreVersion(): ?Version
-    {
-        return $this->min_core_version;
-    }
-
-
-    /**
-     * @return Version|null
-     */
-    public function minWpVersion(): ?Version
-    {
-        return $this->min_wp_version;
-    }
-
-
-    /**
-     * @param string $min_wp_version
-     */
-    public function setMinWpVersion(string $min_wp_version = EE_MIN_WP_VER_REQUIRED): void
-    {
-        $this->min_wp_version = Version::fromString($min_wp_version);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function name(): string
-    {
-        return $this->name;
-    }
-
-
-    /**
-     * FQCN for the domain's EE_Addon class
-     *
-     * @return string
-     */
-    public function fqcn(): string
-    {
-        return "{$this->addon_namespace}\\domain\\{$this->name}";
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getNamespace(): string
-    {
-        return $this->addon_namespace;
-    }
-
-
-    /**
-     * @return FilePath
-     */
-    public function mainFile(): FilePath
-    {
-        return $this->main_file;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function slug(): string
-    {
-        return $this->slug;
-    }
-
-
-    /**
-     * @return Version
-     */
-    public function version(): Version
-    {
-        return $this->version;
-    }
+	const V1 = 1;
+
+	/**
+	 * @var int one of the API_VERSION_* constants from above
+	 */
+	private $api_version;
+
+	/**
+	 * @var DomainInterface
+	 */
+	private $domain;
+
+	/**
+	 * @var Version minimum version of EE core that the add-on will work with
+	 */
+	private $min_core_version;
+
+	/**
+	 * @var Version minimum version of WP core that the add-on will work with
+	 */
+	private $min_wp_version;
+
+	/**
+	 * @var string  PascalCase identifier for the add-on.
+	 *              IMPORTANT! there must be a class of the same name in the root of the add-ons /src/domain/ folder
+	 */
+	private $name;
+
+	/**
+	 * @var string
+	 */
+	private $addon_namespace;
+
+	/**
+	 * @var FilePath
+	 */
+	private $main_file;
+
+	/**
+	 * @var string
+	 */
+	private $slug;
+
+	/**
+	 * @var Version the current add-on version
+	 */
+	private $version;
+
+
+	/**
+	 * Bootstrap constructor.
+	 *
+	 * @param string $slug
+	 * @param string $name
+	 * @param string $namespace
+	 * @param string $version
+	 * @param string $min_core_version
+	 * @param string $main_file
+	 * @param int    $api_version
+	 */
+	protected function __construct(
+		string $slug,
+		string $name,
+		string $namespace,
+		string $version,
+		string $min_core_version,
+		string $main_file,
+		int $api_version
+	) {
+		$this->setSlug($slug);
+		$this->setName($name);
+		$this->setNamespace($namespace);
+		$this->setMinCoreVersion($min_core_version);
+		$this->setMainFile($main_file);
+		$this->setVersion($version);
+		$this->setApiVersion($api_version);
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function initialize(): void
+	{
+		$this->domain = DomainFactory::create(
+			"{$this->addon_namespace}\\domain\\Domain",
+			$this->main_file,
+			$this->version
+		);
+	}
+
+
+	/**
+	 * @return int[]
+	 */
+	private function validApiVersions(): array
+	{
+		return [
+			AddonApiVersion::V1,
+		];
+	}
+
+
+	/**
+	 * @param int $api_version
+	 */
+	private function setApiVersion(int $api_version): void
+	{
+		if (! in_array($api_version, $this->validApiVersions())) {
+			throw new DomainException(
+				esc_html__(
+					'Invalid Add-on API Version! Please use one of the EventEspresso\core\domain\entities\addon\Bootstrap class constants',
+					'event_espresso'
+				)
+			);
+		}
+		$this->api_version = $api_version;
+	}
+
+
+	/**
+	 * @param string $main_file
+	 */
+	public function setMainFile(string $main_file): void
+	{
+		$this->main_file = new FilePath($main_file);
+	}
+
+
+	/**
+	 * @param string $min_core_version
+	 */
+	private function setMinCoreVersion(string $min_core_version): void
+	{
+		$this->min_core_version = Version::fromString($min_core_version);
+	}
+
+
+	/**
+	 * @param string $name
+	 */
+	public function setName(string $name): void
+	{
+		$this->name = $name;
+	}
+
+
+	/**
+	 * @param string $namespace
+	 */
+	private function setNamespace(string $namespace): void
+	{
+		$this->addon_namespace = $namespace;
+	}
+
+
+	/**
+	 * @param string $slug
+	 */
+	private function setSlug(string $slug): void
+	{
+		$valid_slug = sanitize_key($slug);
+		if ($slug !== $valid_slug) {
+			throw new DomainException(
+				esc_html__(
+					'Invalid Add-on "slug"! Please ensure that slug only uses lowercase characters and dashes.',
+					'event_espresso'
+				)
+			);
+		}
+		$this->slug = $valid_slug;
+	}
+
+
+	/**
+	 * @param string $version
+	 */
+	public function setVersion(string $version): void
+	{
+		$this->version = Version::fromString($version);
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function apiVersion(): int
+	{
+		return $this->api_version;
+	}
+
+
+	/**
+	 * @return DomainInterface
+	 */
+	public function domain(): DomainInterface
+	{
+		return $this->domain;
+	}
+
+
+	/**
+	 * @return Version|null
+	 */
+	public function minCoreVersion(): ?Version
+	{
+		return $this->min_core_version;
+	}
+
+
+	/**
+	 * @return Version|null
+	 */
+	public function minWpVersion(): ?Version
+	{
+		return $this->min_wp_version;
+	}
+
+
+	/**
+	 * @param string $min_wp_version
+	 */
+	public function setMinWpVersion(string $min_wp_version = EE_MIN_WP_VER_REQUIRED): void
+	{
+		$this->min_wp_version = Version::fromString($min_wp_version);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function name(): string
+	{
+		return $this->name;
+	}
+
+
+	/**
+	 * FQCN for the domain's EE_Addon class
+	 *
+	 * @return string
+	 */
+	public function fqcn(): string
+	{
+		return "{$this->addon_namespace}\\domain\\{$this->name}";
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getNamespace(): string
+	{
+		return $this->addon_namespace;
+	}
+
+
+	/**
+	 * @return FilePath
+	 */
+	public function mainFile(): FilePath
+	{
+		return $this->main_file;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function slug(): string
+	{
+		return $this->slug;
+	}
+
+
+	/**
+	 * @return Version
+	 */
+	public function version(): Version
+	{
+		return $this->version;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -127,7 +127,7 @@
      */
     private function setApiVersion(int $api_version): void
     {
-        if (! in_array($api_version, $this->validApiVersions())) {
+        if ( ! in_array($api_version, $this->validApiVersions())) {
             throw new DomainException(
                 esc_html__(
                     'Invalid Add-on API Version! Please use one of the EventEspresso\core\domain\entities\addon\Bootstrap class constants',

core/services/addon/api/ThirdPartyPluginHandler.php

Indentation +38 added lines, -38 removed lines

@@ -7,42 +7,42 @@
 class ThirdPartyPluginHandler
 {
 
-    /**
-     * @var RequestInterface $request
-     */
-    private $request;
-
-
-    /**
-     * ThirdPartyPluginHandler constructor.
-     *
-     * @param RequestInterface $request
-     */
-    public function __construct(RequestInterface $request)
-    {
-        $this->request = $request;
-    }
-
-
-    public function loadPlugins()
-    {
-        $this->wpApiBasicAuth();
-    }
-
-
-    private function wpApiBasicAuth()
-    {
-        // if the WP API basic auth plugin isn't already loaded, load it now.
-        // We want it for mobile apps. Just include the entire plugin
-        // also, don't load the basic auth when a plugin is getting activated, because
-        // it could be the basic auth plugin, and it doesn't check if its methods are already defined
-        // and causes a fatal error
-        if (($this->request->isWordPressApi() || $this->request->isApi())
-            && ! $this->request->isActivation()
-            && ! function_exists('json_basic_auth_handler')
-            && ! function_exists('json_basic_auth_error')
-        ) {
-            include_once EE_THIRD_PARTY . 'wp-api-basic-auth/basic-auth.php';
-        }
-    }
+	/**
+	 * @var RequestInterface $request
+	 */
+	private $request;
+
+
+	/**
+	 * ThirdPartyPluginHandler constructor.
+	 *
+	 * @param RequestInterface $request
+	 */
+	public function __construct(RequestInterface $request)
+	{
+		$this->request = $request;
+	}
+
+
+	public function loadPlugins()
+	{
+		$this->wpApiBasicAuth();
+	}
+
+
+	private function wpApiBasicAuth()
+	{
+		// if the WP API basic auth plugin isn't already loaded, load it now.
+		// We want it for mobile apps. Just include the entire plugin
+		// also, don't load the basic auth when a plugin is getting activated, because
+		// it could be the basic auth plugin, and it doesn't check if its methods are already defined
+		// and causes a fatal error
+		if (($this->request->isWordPressApi() || $this->request->isApi())
+			&& ! $this->request->isActivation()
+			&& ! function_exists('json_basic_auth_handler')
+			&& ! function_exists('json_basic_auth_error')
+		) {
+			include_once EE_THIRD_PARTY . 'wp-api-basic-auth/basic-auth.php';
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
             && ! function_exists('json_basic_auth_handler')
             && ! function_exists('json_basic_auth_error')
         ) {
-            include_once EE_THIRD_PARTY . 'wp-api-basic-auth/basic-auth.php';
+            include_once EE_THIRD_PARTY.'wp-api-basic-auth/basic-auth.php';
         }
     }
 }

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

Indentation +91 added lines, -91 removed lines

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

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

Indentation +22 added lines, -22 removed lines

@@ -8,26 +8,26 @@
 
 class RegisterAddon
 {
-    /**
-     * @param AddonApiV1 $addon
-     * @throws EE_Error
-     */
-    public function register(AddonApiV1 $addon)
-    {
-        EE_Register_Addon::register(
-            $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()],
-            ]
-        );
-    }
+	/**
+	 * @param AddonApiV1 $addon
+	 * @throws EE_Error
+	 */
+	public function register(AddonApiV1 $addon)
+	{
+		EE_Register_Addon::register(
+			$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()],
+			]
+		);
+	}
 }

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

Indentation +131 added lines, -131 removed lines

@@ -7,135 +7,135 @@
 class AddonApi extends AddonApiVersion
 {
 
-    /**
-     * @var DataMigrationApi
-     */
-    private $data_migration_api;
-
-    /**
-     * @var LegacyModelApi
-     */
-    private $legacy_model_api;
-
-
-    /**
-     * Bootstrap constructor.
-     *
-     * @param string $slug
-     * @param string $name
-     * @param string $namespace
-     * @param string $version
-     * @param string $min_core_version
-     * @param string $main_file
-     */
-    public function __construct(
-        string $slug,
-        string $name,
-        string $namespace,
-        string $version,
-        string $min_core_version,
-        string $main_file
-    ) {
-        parent::__construct(
-            $slug,
-            $name,
-            $namespace,
-            $version,
-            $min_core_version,
-            $main_file,
-            AddonApiVersion::V1
-        );
-        $this->legacy_model_api = new LegacyModelApi();
-        $this->data_migration_api = new DataMigrationApi();
-    }
-
-
-    /**
-     * @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);
-    }
+	/**
+	 * @var DataMigrationApi
+	 */
+	private $data_migration_api;
+
+	/**
+	 * @var LegacyModelApi
+	 */
+	private $legacy_model_api;
+
+
+	/**
+	 * Bootstrap constructor.
+	 *
+	 * @param string $slug
+	 * @param string $name
+	 * @param string $namespace
+	 * @param string $version
+	 * @param string $min_core_version
+	 * @param string $main_file
+	 */
+	public function __construct(
+		string $slug,
+		string $name,
+		string $namespace,
+		string $version,
+		string $min_core_version,
+		string $main_file
+	) {
+		parent::__construct(
+			$slug,
+			$name,
+			$namespace,
+			$version,
+			$min_core_version,
+			$main_file,
+			AddonApiVersion::V1
+		);
+		$this->legacy_model_api = new LegacyModelApi();
+		$this->data_migration_api = new DataMigrationApi();
+	}
+
+
+	/**
+	 * @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/DataMigrationApi.php

Indentation +18 added lines, -18 removed lines

@@ -5,26 +5,26 @@
 class DataMigrationApi
 {
 
-    /**
-     * @var string path to DMS folder
-     */
-    private $data_migration_scripts;
+	/**
+	 * @var string path to DMS folder
+	 */
+	private $data_migration_scripts;
 
 
-    /**
-     * @return string
-     */
-    public function dataMigrationScripts(): string
-    {
-        return $this->data_migration_scripts;
-    }
+	/**
+	 * @return string
+	 */
+	public function dataMigrationScripts(): string
+	{
+		return $this->data_migration_scripts;
+	}
 
 
-    /**
-     * @param string $data_migration_scripts
-     */
-    public function addDataMigrationScripts(string $data_migration_scripts): void
-    {
-        $this->data_migration_scripts = $data_migration_scripts;
-    }
+	/**
+	 * @param string $data_migration_scripts
+	 */
+	public function addDataMigrationScripts(string $data_migration_scripts): void
+	{
+		$this->data_migration_scripts = $data_migration_scripts;
+	}
 }

core/libraries/plugin_api/EE_Register_Model.lib.php

Indentation +175 added lines, -175 removed lines

@@ -11,193 +11,193 @@
  */
 class EE_Register_Model implements EEI_Plugin_API
 {
-    /**
-     *
-     * @var array keys are the model_id used to register with, values are the array provided to register them, exactly
-     *      like EE_Register_Model::register()'s 2nd arg
-     */
-    protected static $_model_registry;
+	/**
+	 *
+	 * @var array keys are the model_id used to register with, values are the array provided to register them, exactly
+	 *      like EE_Register_Model::register()'s 2nd arg
+	 */
+	protected static $_model_registry;
 
-    /**
-     *
-     * @var array keys are model names, values are their class names. Stored on registration and used
-     * on a hook
-     */
-    protected static $_model_name_to_classname_map;
+	/**
+	 *
+	 * @var array keys are model names, values are their class names. Stored on registration and used
+	 * on a hook
+	 */
+	protected static $_model_name_to_classname_map;
 
 
-    /**
-     * @param string $model_id    unique id for it
-     * @param array  $config      {
-     * @type array   $model_paths array of folders containing DB models, where each file follows the models naming
-     *                            convention, which is: EEM_{model_name}.model.php which contains a single class called
-     *                            EEM_{model_name}. Eg. you could pass
-     *                            "public_html/wp-content/plugins/my_addon/db_models" (with or without trailing slash)
-     *                            and in that folder put each of your model files, like "EEM_Food.model.php" which
-     *                            contains the class "EEM_Food" and
-     *                            "EEM_Monkey.model.php" which contains the class "EEM_Monkey". These will be
-     *                            autoloaded and added to the EE registry so they can be used like ordinary models. The
-     *                            class contained in each file should extend EEM_Base.
-     * @type array   $class_paths array of folders containing DB classes, where each file follows the model class
-     *                            naming convention, which is EE_{model_name}.class.php. The class contained in each
-     *                            file should extend EE_Base_Class
-     *
-     * }
-     * @return bool
-     * @throws EE_Error
-     */
-    public static function register(string $model_id = '', array $config = []): bool
-    {
-        // required fields MUST be present, so let's make sure they are.
-        if (empty($model_id) || ! is_array($config) || empty($config['model_paths'])) {
-            throw new EE_Error(
-                __(
-                    'In order to register Models with EE_Register_Model::register(), you must include a "model_id" (a unique identifier for this set of models), and an array containing the following keys: "model_paths" (an array of full server paths to folders that contain models)',
-                    'event_espresso'
-                )
-            );
-        }
+	/**
+	 * @param string $model_id    unique id for it
+	 * @param array  $config      {
+	 * @type array   $model_paths array of folders containing DB models, where each file follows the models naming
+	 *                            convention, which is: EEM_{model_name}.model.php which contains a single class called
+	 *                            EEM_{model_name}. Eg. you could pass
+	 *                            "public_html/wp-content/plugins/my_addon/db_models" (with or without trailing slash)
+	 *                            and in that folder put each of your model files, like "EEM_Food.model.php" which
+	 *                            contains the class "EEM_Food" and
+	 *                            "EEM_Monkey.model.php" which contains the class "EEM_Monkey". These will be
+	 *                            autoloaded and added to the EE registry so they can be used like ordinary models. The
+	 *                            class contained in each file should extend EEM_Base.
+	 * @type array   $class_paths array of folders containing DB classes, where each file follows the model class
+	 *                            naming convention, which is EE_{model_name}.class.php. The class contained in each
+	 *                            file should extend EE_Base_Class
+	 *
+	 * }
+	 * @return bool
+	 * @throws EE_Error
+	 */
+	public static function register(string $model_id = '', array $config = []): bool
+	{
+		// required fields MUST be present, so let's make sure they are.
+		if (empty($model_id) || ! is_array($config) || empty($config['model_paths'])) {
+			throw new EE_Error(
+				__(
+					'In order to register Models with EE_Register_Model::register(), you must include a "model_id" (a unique identifier for this set of models), and an array containing the following keys: "model_paths" (an array of full server paths to folders that contain models)',
+					'event_espresso'
+				)
+			);
+		}
 
-        // make sure we don't register twice
-        if (isset(self::$_model_registry[ $model_id ])) {
-            return true;
-        }
+		// make sure we don't register twice
+		if (isset(self::$_model_registry[ $model_id ])) {
+			return true;
+		}
 
-        if (! did_action('AHEE__EE_System__load_espresso_addons')
-            || did_action('FHEE__EE_System__parse_model_names')
-            || did_action('FHEE__EE_System__parse_implemented_model_names')
-        ) {
-            EE_Error::doing_it_wrong(
-                __METHOD__,
-                sprintf(
-                    __(
-                        'An attempt was made to register "%s" as a group models has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__load_espresso_addons" hook to register models.',
-                        'event_espresso'
-                    ),
-                    $model_id
-                ),
-                '4.5'
-            );
-        }
-        self::$_model_registry[ $model_id ] = $config;
+		if (! did_action('AHEE__EE_System__load_espresso_addons')
+			|| did_action('FHEE__EE_System__parse_model_names')
+			|| did_action('FHEE__EE_System__parse_implemented_model_names')
+		) {
+			EE_Error::doing_it_wrong(
+				__METHOD__,
+				sprintf(
+					__(
+						'An attempt was made to register "%s" as a group models has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__load_espresso_addons" hook to register models.',
+						'event_espresso'
+					),
+					$model_id
+				),
+				'4.5'
+			);
+		}
+		self::$_model_registry[ $model_id ] = $config;
 
-        if ((isset($config['model_paths']) && ! isset($config['class_paths']))
-            || (! isset($config['model_paths']) && isset($config['class_paths']))
-        ) {
-            throw new EE_Error(
-                sprintf(
-                    __(
-                        'You must register both "model_paths" AND "class_paths", not just one or the other You provided %s',
-                        'event_espresso'
-                    ),
-                    implode(", ", array_keys($config))
-                )
-            );
-        }
-        if (isset($config['model_paths'])) {
-            // make sure they passed in an array
-            if (! is_array($config['model_paths'])) {
-                $config['model_paths'] = [$config['model_paths']];
-            }
-            // we want to add this as a model folder
-            // and autoload them all
-            $class_to_filepath_map = EEH_File::get_contents_of_folders($config['model_paths']);
-            EEH_Autoloader::register_autoloader($class_to_filepath_map);
-            $model_name_to_classname_map = [];
-            foreach (array_keys($class_to_filepath_map) as $classname) {
-                $model_name_to_classname_map[ str_replace("EEM_", "", $classname) ] = $classname;
-            }
-            self::$_model_name_to_classname_map[ $model_id ] = $model_name_to_classname_map;
-            add_filter('FHEE__EE_System__parse_model_names', ['EE_Register_Model', 'add_addon_models']);
-            add_filter(
-                'FHEE__EE_System__parse_implemented_model_names',
-                ['EE_Register_Model', 'add_addon_models']
-            );
-            add_filter('FHEE__EE_Registry__load_model__paths', ['EE_Register_Model', 'add_model_folders']);
-            unset($config['model_paths']);
-        }
-        if (isset($config['class_paths'])) {
-            // make sure they passed in an array
-            if (! is_array($config['class_paths'])) {
-                $config['class_paths'] = [$config['class_paths']];
-            }
-            $class_to_filepath_map = EEH_File::get_contents_of_folders($config['class_paths']);
-            EEH_Autoloader::register_autoloader($class_to_filepath_map);
-            add_filter('FHEE__EE_Registry__load_class__paths', ['EE_Register_Model', 'add_class_folders']);
-            unset($config['class_paths']);
-        }
-        foreach ($config as $unknown_key => $unknown_config) {
-            self::deregister($model_id);
-            throw new EE_Error(
-                sprintf(__("The key '%s' is not a known key for registering a model", "event_espresso"), $unknown_key)
-            );
-        }
-        return true;
-    }
+		if ((isset($config['model_paths']) && ! isset($config['class_paths']))
+			|| (! isset($config['model_paths']) && isset($config['class_paths']))
+		) {
+			throw new EE_Error(
+				sprintf(
+					__(
+						'You must register both "model_paths" AND "class_paths", not just one or the other You provided %s',
+						'event_espresso'
+					),
+					implode(", ", array_keys($config))
+				)
+			);
+		}
+		if (isset($config['model_paths'])) {
+			// make sure they passed in an array
+			if (! is_array($config['model_paths'])) {
+				$config['model_paths'] = [$config['model_paths']];
+			}
+			// we want to add this as a model folder
+			// and autoload them all
+			$class_to_filepath_map = EEH_File::get_contents_of_folders($config['model_paths']);
+			EEH_Autoloader::register_autoloader($class_to_filepath_map);
+			$model_name_to_classname_map = [];
+			foreach (array_keys($class_to_filepath_map) as $classname) {
+				$model_name_to_classname_map[ str_replace("EEM_", "", $classname) ] = $classname;
+			}
+			self::$_model_name_to_classname_map[ $model_id ] = $model_name_to_classname_map;
+			add_filter('FHEE__EE_System__parse_model_names', ['EE_Register_Model', 'add_addon_models']);
+			add_filter(
+				'FHEE__EE_System__parse_implemented_model_names',
+				['EE_Register_Model', 'add_addon_models']
+			);
+			add_filter('FHEE__EE_Registry__load_model__paths', ['EE_Register_Model', 'add_model_folders']);
+			unset($config['model_paths']);
+		}
+		if (isset($config['class_paths'])) {
+			// make sure they passed in an array
+			if (! is_array($config['class_paths'])) {
+				$config['class_paths'] = [$config['class_paths']];
+			}
+			$class_to_filepath_map = EEH_File::get_contents_of_folders($config['class_paths']);
+			EEH_Autoloader::register_autoloader($class_to_filepath_map);
+			add_filter('FHEE__EE_Registry__load_class__paths', ['EE_Register_Model', 'add_class_folders']);
+			unset($config['class_paths']);
+		}
+		foreach ($config as $unknown_key => $unknown_config) {
+			self::deregister($model_id);
+			throw new EE_Error(
+				sprintf(__("The key '%s' is not a known key for registering a model", "event_espresso"), $unknown_key)
+			);
+		}
+		return true;
+	}
 
 
-    /**
-     * Filters the core list of models
-     *
-     * @param array $core_models
-     * @return array keys are model names (eg 'Event') and values are their classes (eg 'EE_Event')
-     */
-    public static function add_addon_models($core_models = []): array
-    {
-        $models = [];
-        foreach (self::$_model_name_to_classname_map as $model_map) {
-            $models[] = $model_map;
-        }
-        return array_merge($core_models, ...$models);
-    }
+	/**
+	 * Filters the core list of models
+	 *
+	 * @param array $core_models
+	 * @return array keys are model names (eg 'Event') and values are their classes (eg 'EE_Event')
+	 */
+	public static function add_addon_models($core_models = []): array
+	{
+		$models = [];
+		foreach (self::$_model_name_to_classname_map as $model_map) {
+			$models[] = $model_map;
+		}
+		return array_merge($core_models, ...$models);
+	}
 
 
-    /**
-     * Filters the list of model folders
-     *
-     * @param array $folders
-     * @return array of folder paths
-     */
-    public static function add_model_folders(array $folders = []): array
-    {
-        $model_folders = [];
-        foreach (self::$_model_registry as $config) {
-            if (isset($config['model_paths'])) {
-                $model_folders[] = $config['model_paths'];
-            }
-        }
-        return array_merge($folders, ...$model_folders);
-    }
+	/**
+	 * Filters the list of model folders
+	 *
+	 * @param array $folders
+	 * @return array of folder paths
+	 */
+	public static function add_model_folders(array $folders = []): array
+	{
+		$model_folders = [];
+		foreach (self::$_model_registry as $config) {
+			if (isset($config['model_paths'])) {
+				$model_folders[] = $config['model_paths'];
+			}
+		}
+		return array_merge($folders, ...$model_folders);
+	}
 
 
-    /**
-     * Filters the array of model class paths
-     *
-     * @param array $folders
-     * @return array of folder paths
-     */
-    public static function add_class_folders(array $folders = []): array
-    {
-        $class_folders = [];
-        foreach (self::$_model_registry as $config) {
-            if (isset($config['class_paths'])) {
-                $class_folders[] = $config['class_paths'];
-            }
-        }
-        return array_merge($folders, ...$class_folders);
-    }
+	/**
+	 * Filters the array of model class paths
+	 *
+	 * @param array $folders
+	 * @return array of folder paths
+	 */
+	public static function add_class_folders(array $folders = []): array
+	{
+		$class_folders = [];
+		foreach (self::$_model_registry as $config) {
+			if (isset($config['class_paths'])) {
+				$class_folders[] = $config['class_paths'];
+			}
+		}
+		return array_merge($folders, ...$class_folders);
+	}
 
 
-    /**
-     * deregister
-     *
-     * @param string $model_id
-     */
-    public static function deregister(string $model_id = '')
-    {
-        if (isset(self::$_model_registry[ $model_id ])) {
-            unset(self::$_model_registry[ $model_id ]);
-            unset(self::$_model_name_to_classname_map[ $model_id ]);
-        }
-    }
+	/**
+	 * deregister
+	 *
+	 * @param string $model_id
+	 */
+	public static function deregister(string $model_id = '')
+	{
+		if (isset(self::$_model_registry[ $model_id ])) {
+			unset(self::$_model_registry[ $model_id ]);
+			unset(self::$_model_name_to_classname_map[ $model_id ]);
+		}
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -59,11 +59,11 @@ 
         }
 
         // make sure we don't register twice
-        if (isset(self::$_model_registry[ $model_id ])) {
+        if (isset(self::$_model_registry[$model_id])) {
             return true;
         }
 
-        if (! did_action('AHEE__EE_System__load_espresso_addons')
+        if ( ! did_action('AHEE__EE_System__load_espresso_addons')
             || did_action('FHEE__EE_System__parse_model_names')
             || did_action('FHEE__EE_System__parse_implemented_model_names')
         ) {
@@ -79,10 +79,10 @@ 
                 '4.5'
             );
         }
-        self::$_model_registry[ $model_id ] = $config;
+        self::$_model_registry[$model_id] = $config;
 
         if ((isset($config['model_paths']) && ! isset($config['class_paths']))
-            || (! isset($config['model_paths']) && isset($config['class_paths']))
+            || ( ! isset($config['model_paths']) && isset($config['class_paths']))
         ) {
             throw new EE_Error(
                 sprintf(
@@ -96,7 +96,7 @@ 
         }
         if (isset($config['model_paths'])) {
             // make sure they passed in an array
-            if (! is_array($config['model_paths'])) {
+            if ( ! is_array($config['model_paths'])) {
                 $config['model_paths'] = [$config['model_paths']];
             }
             // we want to add this as a model folder
@@ -105,9 +105,9 @@ 
             EEH_Autoloader::register_autoloader($class_to_filepath_map);
             $model_name_to_classname_map = [];
             foreach (array_keys($class_to_filepath_map) as $classname) {
-                $model_name_to_classname_map[ str_replace("EEM_", "", $classname) ] = $classname;
+                $model_name_to_classname_map[str_replace("EEM_", "", $classname)] = $classname;
             }
-            self::$_model_name_to_classname_map[ $model_id ] = $model_name_to_classname_map;
+            self::$_model_name_to_classname_map[$model_id] = $model_name_to_classname_map;
             add_filter('FHEE__EE_System__parse_model_names', ['EE_Register_Model', 'add_addon_models']);
             add_filter(
                 'FHEE__EE_System__parse_implemented_model_names',
@@ -118,7 +118,7 @@ 
         }
         if (isset($config['class_paths'])) {
             // make sure they passed in an array
-            if (! is_array($config['class_paths'])) {
+            if ( ! is_array($config['class_paths'])) {
                 $config['class_paths'] = [$config['class_paths']];
             }
             $class_to_filepath_map = EEH_File::get_contents_of_folders($config['class_paths']);
@@ -195,9 +195,9 @@ 
      */
     public static function deregister(string $model_id = '')
     {
-        if (isset(self::$_model_registry[ $model_id ])) {
-            unset(self::$_model_registry[ $model_id ]);
-            unset(self::$_model_name_to_classname_map[ $model_id ]);
+        if (isset(self::$_model_registry[$model_id])) {
+            unset(self::$_model_registry[$model_id]);
+            unset(self::$_model_name_to_classname_map[$model_id]);
         }
     }
 }