eventespresso / event-espresso-core

core/services/routing/Route.php

Spacing +2 added lines, -2 removed lines

@@ -251,7 +251,7 @@ 
     private function loadDataNode()
     {
         $data_node_fqcn = $this->dataNodeClass();
-        if (! empty($data_node_fqcn)) {
+        if ( ! empty($data_node_fqcn)) {
             $data_node = $this->loader->getShared($data_node_fqcn);
             $this->setDataNode($data_node);
         }
@@ -279,7 +279,7 @@ 
      */
     private function verifyIsHandled($handled)
     {
-        if (! is_bool($handled)) {
+        if ( ! is_bool($handled)) {
             throw new DomainException(
                 esc_html__(
                     'Route::requestHandler() must return a boolean to indicate whether the request has been handled or not.',

Indentation +267 added lines, -267 removed lines

@@ -28,271 +28,271 @@
  */
 abstract class Route implements RouteInterface, RequiresCapCheckInterface
 {
-    /**
-     * @var AssetManagerInterface $asset_manager
-     */
-    protected $asset_manager;
-
-    /**
-     * @var EE_Dependency_Map $dependency_map
-     */
-    protected $dependency_map;
-
-    /**
-     * @var JsonDataNode $data_node
-     */
-    protected $data_node;
-
-    /**
-     * @var LoaderInterface $loader
-     */
-    protected $loader;
-
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
-
-    /**
-     * @var RouteMatchSpecificationInterface $specification
-     */
-    protected $specification;
-
-    /**
-     * @var boolean $handled
-     */
-    private $handled = false;
-
-    /**
-     * @var array $default_dependencies
-     */
-    protected static $default_dependencies = [
-        'EE_Dependency_Map'                           => EE_Dependency_Map::load_from_cache,
-        'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
-        'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-    ];
-
-    /**
-     * @var array $full_dependencies
-     */
-    protected static $full_dependencies = [
-        'EE_Dependency_Map'                             => EE_Dependency_Map::load_from_cache,
-        'EventEspresso\core\services\loaders\Loader'    => EE_Dependency_Map::load_from_cache,
-        'EventEspresso\core\services\request\Request'   => EE_Dependency_Map::load_from_cache,
-        'EventEspresso\core\services\json\JsonDataNode' => EE_Dependency_Map::load_from_cache,
-        RouteMatchSpecificationInterface::class         => EE_Dependency_Map::load_from_cache,
-    ];
-
-
-    /**
-     * Route constructor.
-     *
-     * @param EE_Dependency_Map                     $dependency_map
-     * @param LoaderInterface                       $loader
-     * @param RequestInterface                      $request
-     * @param JsonDataNode|null                     $data_node
-     * @param RouteMatchSpecificationInterface|null $specification
-     */
-    public function __construct(
-        EE_Dependency_Map $dependency_map,
-        LoaderInterface $loader,
-        RequestInterface $request,
-        JsonDataNode $data_node = null,
-        RouteMatchSpecificationInterface $specification = null
-    ) {
-        $this->dependency_map = $dependency_map;
-        $this->data_node      = $data_node;
-        $this->loader         = $loader;
-        $this->request        = $request;
-        $this->setSpecification($specification);
-    }
-
-
-    /**
-     * @return void
-     */
-    abstract protected function registerDependencies();
-
-
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     */
-    abstract protected function requestHandler(): bool;
-
-
-    /**
-     * called just before matchesCurrentRequest()
-     * and allows Route to perform any setup required such as calling setSpecification()
-     *
-     * @return void
-     */
-    public function initialize()
-    {
-        // do nothing by default
-    }
-
-
-    /**
-     * returns true if the current request matches this route
-     * child classes can override and use Request directly to match route with request
-     * or supply a RouteMatchSpecification class and just use the below
-     *
-     * @return bool
-     */
-    public function matchesCurrentRequest(): bool
-    {
-        return $this->specification instanceof RouteMatchSpecificationInterface
-               && $this->specification->isMatchingRoute();
-    }
-
-
-    /**
-     * returns the FQCN for this route's JsonDataNode
-     *
-     * @return string
-     */
-    protected function dataNodeClass(): string
-    {
-        return '';
-    }
-
-
-    public function getCapCheck()
-    {
-        return new PublicCapabilities('', 'access Event Espresso route');
-    }
-
-
-    /**
-     * @return array
-     */
-    public static function getDefaultDependencies(): array
-    {
-        return self::$default_dependencies;
-    }
-
-
-    /**
-     * @return array
-     */
-    public static function getFullDependencies(): array
-    {
-        return self::$full_dependencies;
-    }
-
-
-    /**
-     * @param JsonDataNode|null $data_node
-     */
-    protected function setDataNode(JsonDataNode $data_node = null)
-    {
-        $this->data_node = $data_node;
-    }
-
-
-    /**
-     * @param RouteMatchSpecificationInterface|null $specification
-     */
-    protected function setSpecification(RouteMatchSpecificationInterface $specification = null)
-    {
-        $this->specification = $specification;
-    }
-
-
-    /**
-     * @return JsonDataNode
-     */
-    public function dataNode(): ?JsonDataNode
-    {
-        return $this->data_node;
-    }
-
-
-    /**
-     * runs route requestHandler() if
-     *      - route has not previously been handled
-     *      - route specification matches for current request
-     * sets route handled property based on results returned by requestHandler()
-     *
-     * @return bool
-     */
-    public function handleRequest(): bool
-    {
-        if ($this->isNotHandled()) {
-            $this->initialize();
-            if ($this->matchesCurrentRequest()) {
-                do_action('AHEE__EventEspresso_core_domain_entities_routes_handlers_Route__handleRequest', $this);
-                $this->registerDependencies();
-                $this->loadDataNode();
-                $this->verifyIsHandled($this->requestHandler());
-            }
-        }
-        return $this->handled;
-    }
-
-
-    /**
-     * @return bool
-     */
-    final public function isHandled(): bool
-    {
-        return $this->handled;
-    }
-
-
-    /**
-     * @return bool
-     */
-    final public function isNotHandled(): bool
-    {
-        return ! $this->handled;
-    }
-
-
-    /**
-     * @return void
-     */
-    private function loadDataNode()
-    {
-        $data_node_fqcn = $this->dataNodeClass();
-        if (! empty($data_node_fqcn)) {
-            $data_node = $this->loader->getShared($data_node_fqcn);
-            $this->setDataNode($data_node);
-        }
-    }
-
-
-    /**
-     * @param string $domain_fqcn
-     */
-    public function initializeBaristaForDomain(string $domain_fqcn)
-    {
-        if (apply_filters('FHEE__load_Barista', true)) {
-            /** @var BaristaFactory $factory */
-            $factory = $this->loader->getShared(BaristaFactory::class);
-            $barista = $factory->createFromDomainClass($domain_fqcn);
-            if ($barista instanceof BaristaInterface) {
-                $barista->initialize();
-            }
-        }
-    }
-
-
-    /**
-     * @var bool
-     */
-    private function verifyIsHandled($handled)
-    {
-        if (! is_bool($handled)) {
-            throw new DomainException(
-                esc_html__(
-                    'Route::requestHandler() must return a boolean to indicate whether the request has been handled or not.',
-                    'event_espresso'
-                )
-            );
-        }
-        $this->handled = filter_var($handled, FILTER_VALIDATE_BOOLEAN);
-    }
+	/**
+	 * @var AssetManagerInterface $asset_manager
+	 */
+	protected $asset_manager;
+
+	/**
+	 * @var EE_Dependency_Map $dependency_map
+	 */
+	protected $dependency_map;
+
+	/**
+	 * @var JsonDataNode $data_node
+	 */
+	protected $data_node;
+
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	protected $loader;
+
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
+
+	/**
+	 * @var RouteMatchSpecificationInterface $specification
+	 */
+	protected $specification;
+
+	/**
+	 * @var boolean $handled
+	 */
+	private $handled = false;
+
+	/**
+	 * @var array $default_dependencies
+	 */
+	protected static $default_dependencies = [
+		'EE_Dependency_Map'                           => EE_Dependency_Map::load_from_cache,
+		'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
+		'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+	];
+
+	/**
+	 * @var array $full_dependencies
+	 */
+	protected static $full_dependencies = [
+		'EE_Dependency_Map'                             => EE_Dependency_Map::load_from_cache,
+		'EventEspresso\core\services\loaders\Loader'    => EE_Dependency_Map::load_from_cache,
+		'EventEspresso\core\services\request\Request'   => EE_Dependency_Map::load_from_cache,
+		'EventEspresso\core\services\json\JsonDataNode' => EE_Dependency_Map::load_from_cache,
+		RouteMatchSpecificationInterface::class         => EE_Dependency_Map::load_from_cache,
+	];
+
+
+	/**
+	 * Route constructor.
+	 *
+	 * @param EE_Dependency_Map                     $dependency_map
+	 * @param LoaderInterface                       $loader
+	 * @param RequestInterface                      $request
+	 * @param JsonDataNode|null                     $data_node
+	 * @param RouteMatchSpecificationInterface|null $specification
+	 */
+	public function __construct(
+		EE_Dependency_Map $dependency_map,
+		LoaderInterface $loader,
+		RequestInterface $request,
+		JsonDataNode $data_node = null,
+		RouteMatchSpecificationInterface $specification = null
+	) {
+		$this->dependency_map = $dependency_map;
+		$this->data_node      = $data_node;
+		$this->loader         = $loader;
+		$this->request        = $request;
+		$this->setSpecification($specification);
+	}
+
+
+	/**
+	 * @return void
+	 */
+	abstract protected function registerDependencies();
+
+
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 */
+	abstract protected function requestHandler(): bool;
+
+
+	/**
+	 * called just before matchesCurrentRequest()
+	 * and allows Route to perform any setup required such as calling setSpecification()
+	 *
+	 * @return void
+	 */
+	public function initialize()
+	{
+		// do nothing by default
+	}
+
+
+	/**
+	 * returns true if the current request matches this route
+	 * child classes can override and use Request directly to match route with request
+	 * or supply a RouteMatchSpecification class and just use the below
+	 *
+	 * @return bool
+	 */
+	public function matchesCurrentRequest(): bool
+	{
+		return $this->specification instanceof RouteMatchSpecificationInterface
+			   && $this->specification->isMatchingRoute();
+	}
+
+
+	/**
+	 * returns the FQCN for this route's JsonDataNode
+	 *
+	 * @return string
+	 */
+	protected function dataNodeClass(): string
+	{
+		return '';
+	}
+
+
+	public function getCapCheck()
+	{
+		return new PublicCapabilities('', 'access Event Espresso route');
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public static function getDefaultDependencies(): array
+	{
+		return self::$default_dependencies;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public static function getFullDependencies(): array
+	{
+		return self::$full_dependencies;
+	}
+
+
+	/**
+	 * @param JsonDataNode|null $data_node
+	 */
+	protected function setDataNode(JsonDataNode $data_node = null)
+	{
+		$this->data_node = $data_node;
+	}
+
+
+	/**
+	 * @param RouteMatchSpecificationInterface|null $specification
+	 */
+	protected function setSpecification(RouteMatchSpecificationInterface $specification = null)
+	{
+		$this->specification = $specification;
+	}
+
+
+	/**
+	 * @return JsonDataNode
+	 */
+	public function dataNode(): ?JsonDataNode
+	{
+		return $this->data_node;
+	}
+
+
+	/**
+	 * runs route requestHandler() if
+	 *      - route has not previously been handled
+	 *      - route specification matches for current request
+	 * sets route handled property based on results returned by requestHandler()
+	 *
+	 * @return bool
+	 */
+	public function handleRequest(): bool
+	{
+		if ($this->isNotHandled()) {
+			$this->initialize();
+			if ($this->matchesCurrentRequest()) {
+				do_action('AHEE__EventEspresso_core_domain_entities_routes_handlers_Route__handleRequest', $this);
+				$this->registerDependencies();
+				$this->loadDataNode();
+				$this->verifyIsHandled($this->requestHandler());
+			}
+		}
+		return $this->handled;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	final public function isHandled(): bool
+	{
+		return $this->handled;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	final public function isNotHandled(): bool
+	{
+		return ! $this->handled;
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function loadDataNode()
+	{
+		$data_node_fqcn = $this->dataNodeClass();
+		if (! empty($data_node_fqcn)) {
+			$data_node = $this->loader->getShared($data_node_fqcn);
+			$this->setDataNode($data_node);
+		}
+	}
+
+
+	/**
+	 * @param string $domain_fqcn
+	 */
+	public function initializeBaristaForDomain(string $domain_fqcn)
+	{
+		if (apply_filters('FHEE__load_Barista', true)) {
+			/** @var BaristaFactory $factory */
+			$factory = $this->loader->getShared(BaristaFactory::class);
+			$barista = $factory->createFromDomainClass($domain_fqcn);
+			if ($barista instanceof BaristaInterface) {
+				$barista->initialize();
+			}
+		}
+	}
+
+
+	/**
+	 * @var bool
+	 */
+	private function verifyIsHandled($handled)
+	{
+		if (! is_bool($handled)) {
+			throw new DomainException(
+				esc_html__(
+					'Route::requestHandler() must return a boolean to indicate whether the request has been handled or not.',
+					'event_espresso'
+				)
+			);
+		}
+		$this->handled = filter_var($handled, FILTER_VALIDATE_BOOLEAN);
+	}
 }

core/services/addon/AddonManager.php

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

Indentation +79 added lines, -79 removed lines

@@ -23,95 +23,95 @@
  */
 class AddonManager
 {
-    private AddonCollection          $addons;
+	private AddonCollection          $addons;
 
-    private IncompatibleAddonHandler $incompatible_addon_handler;
+	private IncompatibleAddonHandler $incompatible_addon_handler;
 
-    private Psr4Autoloader           $psr4_loader;
+	private Psr4Autoloader           $psr4_loader;
 
-    private RegisterV1Addon          $register_v1_addon;
+	private RegisterV1Addon          $register_v1_addon;
 
-    private ThirdPartyPluginHandler  $third_party_plugin_handler;
+	private ThirdPartyPluginHandler  $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
-     * @throws Throwable
-     */
-    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
+	 * @throws Throwable
+	 */
+	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);
+		}
+	}
 }

core/services/addon/api/IncompatibleAddonHandler.php

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);

Indentation +74 added lines, -74 removed lines

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

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

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';
         }
     }
 }

Indentation +39 added lines, -39 removed lines

@@ -7,43 +7,43 @@
 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';
+		}
+	}
 }

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;
+	}
 }