eventespresso / event-espresso-core

core/services/bootstrap/BootstrapRequestResponseObjects.php

Indentation +73 added lines, -73 removed lines

@@ -29,88 +29,88 @@
  */
 class BootstrapRequestResponseObjects
 {
-    protected LegacyRequestInterface $legacy_request;
+	protected LegacyRequestInterface $legacy_request;
 
-    protected LoaderInterface        $loader;
+	protected LoaderInterface        $loader;
 
-    protected RequestInterface       $request;
+	protected RequestInterface       $request;
 
-    protected ResponseInterface      $response;
+	protected ResponseInterface      $response;
 
 
-    /**
-     * BootstrapRequestResponseObjects constructor.
-     *
-     * @param LoaderInterface $loader
-     */
-    public function __construct(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
+	/**
+	 * BootstrapRequestResponseObjects constructor.
+	 *
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+	}
 
 
-    /**
-     * @return void
-     */
-    public function buildRequestResponse()
-    {
-        $email_validator   = new Basic();
-        $request_sanitizer = new RequestSanitizer($email_validator);
-        $server_sanitizer  = new ServerSanitizer();
-        $request_params    = new RequestParams($request_sanitizer, $_GET, $_POST);
-        $server_params     = new ServerParams($server_sanitizer, $_SERVER);
-        // load our Request and Response objects
-        $this->request  = apply_filters(
-            'FHEE___EventEspresso_core_services_bootstrap_BootstrapRequestResponseObjects__buildRequestResponse__request',
-            new Request($request_params, $server_params),
-            $request_params,
-            $server_params,
-            $request_sanitizer,
-            $server_sanitizer
-        );
-        $this->response = apply_filters(
-            'FHEE___EventEspresso_core_services_bootstrap_BootstrapRequestResponseObjects__buildRequestResponse__response',
-            new Response()
-        );
-        $this->loader->share(Basic::class, $email_validator);
-        $this->loader->share(RequestSanitizer::class, $request_sanitizer);
-        $this->loader->share(ServerSanitizer::class, $server_sanitizer);
-        $this->loader->share(RequestParams::class, $request_params);
-        $this->loader->share(ServerParams::class, $server_params);
-    }
+	/**
+	 * @return void
+	 */
+	public function buildRequestResponse()
+	{
+		$email_validator   = new Basic();
+		$request_sanitizer = new RequestSanitizer($email_validator);
+		$server_sanitizer  = new ServerSanitizer();
+		$request_params    = new RequestParams($request_sanitizer, $_GET, $_POST);
+		$server_params     = new ServerParams($server_sanitizer, $_SERVER);
+		// load our Request and Response objects
+		$this->request  = apply_filters(
+			'FHEE___EventEspresso_core_services_bootstrap_BootstrapRequestResponseObjects__buildRequestResponse__request',
+			new Request($request_params, $server_params),
+			$request_params,
+			$server_params,
+			$request_sanitizer,
+			$server_sanitizer
+		);
+		$this->response = apply_filters(
+			'FHEE___EventEspresso_core_services_bootstrap_BootstrapRequestResponseObjects__buildRequestResponse__response',
+			new Response()
+		);
+		$this->loader->share(Basic::class, $email_validator);
+		$this->loader->share(RequestSanitizer::class, $request_sanitizer);
+		$this->loader->share(ServerSanitizer::class, $server_sanitizer);
+		$this->loader->share(RequestParams::class, $request_params);
+		$this->loader->share(ServerParams::class, $server_params);
+	}
 
 
-    /**
-     * @return void
-     * @throws InvalidArgumentException
-     */
-    public function shareRequestResponse()
-    {
-        $this->loader->share(Request::class, $this->request);
-        $this->loader->share(Response::class, $this->response);
-        EE_Dependency_Map::instance()->setRequest($this->request);
-        EE_Dependency_Map::instance()->setResponse($this->response);
-    }
+	/**
+	 * @return void
+	 * @throws InvalidArgumentException
+	 */
+	public function shareRequestResponse()
+	{
+		$this->loader->share(Request::class, $this->request);
+		$this->loader->share(Response::class, $this->response);
+		EE_Dependency_Map::instance()->setRequest($this->request);
+		EE_Dependency_Map::instance()->setResponse($this->response);
+	}
 
 
-    /**
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws EE_Error
-     */
-    public function setupLegacyRequest()
-    {
-        espresso_load_required(
-            'EE_Request',
-            EE_CORE . 'request_stack/EE_Request.core.php'
-        );
-        $this->legacy_request = new EE_Request($_GET, $_POST, $_COOKIE, $_SERVER);
-        $this->legacy_request->setRequest($this->request);
-        $this->legacy_request->admin      = $this->request->isAdmin();
-        $this->legacy_request->ajax       = $this->request->isAjax();
-        $this->legacy_request->front_ajax = $this->request->isFrontAjax();
-        EE_Dependency_Map::instance()->setLegacyRequest($this->legacy_request);
-        $this->loader->share('EE_Request', $this->legacy_request);
-        $this->loader->share('EventEspresso\core\services\request\LegacyRequestInterface', $this->legacy_request);
-    }
+	/**
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws EE_Error
+	 */
+	public function setupLegacyRequest()
+	{
+		espresso_load_required(
+			'EE_Request',
+			EE_CORE . 'request_stack/EE_Request.core.php'
+		);
+		$this->legacy_request = new EE_Request($_GET, $_POST, $_COOKIE, $_SERVER);
+		$this->legacy_request->setRequest($this->request);
+		$this->legacy_request->admin      = $this->request->isAdmin();
+		$this->legacy_request->ajax       = $this->request->isAjax();
+		$this->legacy_request->front_ajax = $this->request->isFrontAjax();
+		EE_Dependency_Map::instance()->setLegacyRequest($this->legacy_request);
+		$this->loader->share('EE_Request', $this->legacy_request);
+		$this->loader->share('EventEspresso\core\services\request\LegacyRequestInterface', $this->legacy_request);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
         $request_params    = new RequestParams($request_sanitizer, $_GET, $_POST);
         $server_params     = new ServerParams($server_sanitizer, $_SERVER);
         // load our Request and Response objects
-        $this->request  = apply_filters(
+        $this->request = apply_filters(
             'FHEE___EventEspresso_core_services_bootstrap_BootstrapRequestResponseObjects__buildRequestResponse__request',
             new Request($request_params, $server_params),
             $request_params,
@@ -102,7 +102,7 @@ 
     {
         espresso_load_required(
             'EE_Request',
-            EE_CORE . 'request_stack/EE_Request.core.php'
+            EE_CORE.'request_stack/EE_Request.core.php'
         );
         $this->legacy_request = new EE_Request($_GET, $_POST, $_COOKIE, $_SERVER);
         $this->legacy_request->setRequest($this->request);

core/services/addon/api/IncompatibleAddonHandler.php

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/AddonManager.php

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/loaders/ClassInterfaceCache.php

Indentation +187 added lines, -187 removed lines

@@ -16,191 +16,191 @@
  */
 class ClassInterfaceCache
 {
-    /**
-     * array of interfaces indexed by FQCNs where values are arrays of interface FQNs
-     *
-     * @var string[][] $interfaces
-     */
-    private $interfaces = [];
-
-    /**
-     * @type string[][] $aliases
-     */
-    protected $aliases = [];
-
-
-    /**
-     * @return string[][]
-     */
-    public function getAliases(): array
-    {
-        return $this->aliases;
-    }
-
-
-    /**
-     * @param string|FullyQualifiedName $fqn
-     * @return string
-     */
-    public function getFqn($fqn): string
-    {
-        $fqn = $fqn instanceof FullyQualifiedName
-            ? $fqn->string()
-            : $fqn;
-        return ltrim((string) $fqn, '\\');
-    }
-
-
-    /**
-     * @param string|FullyQualifiedName $fqn
-     * @return array
-     */
-    public function getInterfaces($fqn): array
-    {
-        $fqn = $this->getFqn($fqn);
-        // have we already seen this FQCN ?
-        if (! array_key_exists($fqn, $this->interfaces)) {
-            $this->interfaces[ $fqn ] = [];
-            if (class_exists($fqn)) {
-                $this->interfaces[ $fqn ] = class_implements($fqn, false);
-                $this->interfaces[ $fqn ] = $this->interfaces[ $fqn ] !== false
-                    ? $this->interfaces[ $fqn ]
-                    : [];
-            }
-        }
-        return $this->interfaces[ $fqn ];
-    }
-
-
-    /**
-     * @param string|FullyQualifiedName $fqn
-     * @param string                    $interface
-     * @return bool
-     */
-    public function hasInterface($fqn, string $interface): bool
-    {
-        $fqn        = $this->getFqn($fqn);
-        $interfaces = $this->getInterfaces($fqn);
-        return in_array($interface, $interfaces, true);
-    }
-
-
-    /**
-     * adds an alias for a classname
-     *
-     * @param string|FullyQualifiedName $fqn       the class name that should be used
-     *                                             (concrete class to replace interface)
-     * @param string|FullyQualifiedName $alias     the class name that would be type hinted for
-     *                                             (abstract parent or interface)
-     * @param string $for_class                    the class that has the dependency
-     *                                             (is type hinting for the interface)
-     * @throws InvalidAliasException
-     */
-    public function addAlias($fqn, $alias, string $for_class = '')
-    {
-        $fqn   = $this->getFqn($fqn);
-        $alias = $this->getFqn($alias);
-        if (strpos($alias, '\\') !== false && ! is_subclass_of($fqn, $alias)) {
-            throw new InvalidAliasException($fqn, $alias);
-        }
-        // are we adding an alias for a specific class?
-        if ($for_class !== '') {
-            // make sure it's set up as an array
-            if (! isset($this->aliases[ $for_class ])) {
-                $this->aliases[ $for_class ] = [];
-            }
-            $this->aliases[ $for_class ][ $alias ] = $fqn;
-            return;
-        }
-        $this->aliases[ $alias ] = $fqn;
-    }
-
-
-    /**
-     * returns TRUE if the provided FQN is an alias
-     *
-     * @param string|FullyQualifiedName $fqn
-     * @param string                    $for_class
-     * @return bool
-     */
-    public function isAlias($fqn = '', string $for_class = ''): bool
-    {
-        $fqn = $this->getFqn($fqn);
-        if ($this->isAliasForClass($fqn, $for_class)) {
-            return true;
-        }
-        return $this->isDirectAlias($fqn);
-    }
-
-
-    /**
-     * returns TRUE if the provided FQN is an alias
-     *
-     * @param string $alias
-     * @return bool
-     */
-    protected function isDirectAlias(string $alias = ''): bool
-    {
-        return isset($this->aliases[ $alias ]) && ! is_array($this->aliases[ $alias ]);
-    }
-
-
-    /**
-     * returns TRUE if the provided FQN is an alias for the specified class
-     *
-     * @param string $alias
-     * @param string $for_class
-     * @return bool
-     */
-    protected function isAliasForClass(string $alias = '', string $for_class = ''): bool
-    {
-        return (
-            $for_class !== ''
-            && isset($this->aliases[ $for_class ][ $alias ])
-        );
-    }
-
-
-    /**
-     * returns FQN for provided alias if one exists, otherwise returns the original FQN
-     * functions recursively, so that multiple aliases can be used to drill down to a FQN
-     *  for example:
-     *      if the following two entries were added to the aliases array:
-     *          array(
-     *              'interface_alias'           => 'some\namespace\interface'
-     *              'some\namespace\interface'  => 'some\namespace\classname'
-     *          )
-     *      then one could use Loader::getNew( 'interface_alias' )
-     *      to load an instance of 'some\namespace\classname'
-     *
-     * @param string|FullyQualifiedName $alias
-     * @param string                    $for_class
-     * @return string
-     */
-    public function getFqnForAlias($alias = '', string $for_class = ''): string
-    {
-        $alias = $this->getFqn($alias);
-        if ($this->isAliasForClass($alias, $for_class)) {
-            return $this->getFqnForAlias($this->aliases[ $for_class ][ $alias ], $for_class);
-        }
-        if ($this->isDirectAlias($alias)) {
-            // note: changed '' to $for_class
-            return $this->getFqnForAlias($this->aliases[ $alias ], $for_class);
-        }
-        return $alias;
-    }
-
-
-    // public function debug($for_class = '')
-    // {
-    //     if ($for_class !== '') {
-    //         if ( ! isset($this->aliases[ $for_class ])) {
-    //             \EEH_Debug_Tools::printr('NOT FOUND', "aliases[ $for_class ]", __FILE__, __LINE__);
-    //             return;
-    //         }
-    //         \EEH_Debug_Tools::printr($this->aliases[ $for_class ], "aliases[ $for_class ]", __FILE__, __LINE__);
-    //         return;
-    //     }
-    //     \EEH_Debug_Tools::printr($this->aliases, '$this->aliases', __FILE__, __LINE__);
-    // }
+	/**
+	 * array of interfaces indexed by FQCNs where values are arrays of interface FQNs
+	 *
+	 * @var string[][] $interfaces
+	 */
+	private $interfaces = [];
+
+	/**
+	 * @type string[][] $aliases
+	 */
+	protected $aliases = [];
+
+
+	/**
+	 * @return string[][]
+	 */
+	public function getAliases(): array
+	{
+		return $this->aliases;
+	}
+
+
+	/**
+	 * @param string|FullyQualifiedName $fqn
+	 * @return string
+	 */
+	public function getFqn($fqn): string
+	{
+		$fqn = $fqn instanceof FullyQualifiedName
+			? $fqn->string()
+			: $fqn;
+		return ltrim((string) $fqn, '\\');
+	}
+
+
+	/**
+	 * @param string|FullyQualifiedName $fqn
+	 * @return array
+	 */
+	public function getInterfaces($fqn): array
+	{
+		$fqn = $this->getFqn($fqn);
+		// have we already seen this FQCN ?
+		if (! array_key_exists($fqn, $this->interfaces)) {
+			$this->interfaces[ $fqn ] = [];
+			if (class_exists($fqn)) {
+				$this->interfaces[ $fqn ] = class_implements($fqn, false);
+				$this->interfaces[ $fqn ] = $this->interfaces[ $fqn ] !== false
+					? $this->interfaces[ $fqn ]
+					: [];
+			}
+		}
+		return $this->interfaces[ $fqn ];
+	}
+
+
+	/**
+	 * @param string|FullyQualifiedName $fqn
+	 * @param string                    $interface
+	 * @return bool
+	 */
+	public function hasInterface($fqn, string $interface): bool
+	{
+		$fqn        = $this->getFqn($fqn);
+		$interfaces = $this->getInterfaces($fqn);
+		return in_array($interface, $interfaces, true);
+	}
+
+
+	/**
+	 * adds an alias for a classname
+	 *
+	 * @param string|FullyQualifiedName $fqn       the class name that should be used
+	 *                                             (concrete class to replace interface)
+	 * @param string|FullyQualifiedName $alias     the class name that would be type hinted for
+	 *                                             (abstract parent or interface)
+	 * @param string $for_class                    the class that has the dependency
+	 *                                             (is type hinting for the interface)
+	 * @throws InvalidAliasException
+	 */
+	public function addAlias($fqn, $alias, string $for_class = '')
+	{
+		$fqn   = $this->getFqn($fqn);
+		$alias = $this->getFqn($alias);
+		if (strpos($alias, '\\') !== false && ! is_subclass_of($fqn, $alias)) {
+			throw new InvalidAliasException($fqn, $alias);
+		}
+		// are we adding an alias for a specific class?
+		if ($for_class !== '') {
+			// make sure it's set up as an array
+			if (! isset($this->aliases[ $for_class ])) {
+				$this->aliases[ $for_class ] = [];
+			}
+			$this->aliases[ $for_class ][ $alias ] = $fqn;
+			return;
+		}
+		$this->aliases[ $alias ] = $fqn;
+	}
+
+
+	/**
+	 * returns TRUE if the provided FQN is an alias
+	 *
+	 * @param string|FullyQualifiedName $fqn
+	 * @param string                    $for_class
+	 * @return bool
+	 */
+	public function isAlias($fqn = '', string $for_class = ''): bool
+	{
+		$fqn = $this->getFqn($fqn);
+		if ($this->isAliasForClass($fqn, $for_class)) {
+			return true;
+		}
+		return $this->isDirectAlias($fqn);
+	}
+
+
+	/**
+	 * returns TRUE if the provided FQN is an alias
+	 *
+	 * @param string $alias
+	 * @return bool
+	 */
+	protected function isDirectAlias(string $alias = ''): bool
+	{
+		return isset($this->aliases[ $alias ]) && ! is_array($this->aliases[ $alias ]);
+	}
+
+
+	/**
+	 * returns TRUE if the provided FQN is an alias for the specified class
+	 *
+	 * @param string $alias
+	 * @param string $for_class
+	 * @return bool
+	 */
+	protected function isAliasForClass(string $alias = '', string $for_class = ''): bool
+	{
+		return (
+			$for_class !== ''
+			&& isset($this->aliases[ $for_class ][ $alias ])
+		);
+	}
+
+
+	/**
+	 * returns FQN for provided alias if one exists, otherwise returns the original FQN
+	 * functions recursively, so that multiple aliases can be used to drill down to a FQN
+	 *  for example:
+	 *      if the following two entries were added to the aliases array:
+	 *          array(
+	 *              'interface_alias'           => 'some\namespace\interface'
+	 *              'some\namespace\interface'  => 'some\namespace\classname'
+	 *          )
+	 *      then one could use Loader::getNew( 'interface_alias' )
+	 *      to load an instance of 'some\namespace\classname'
+	 *
+	 * @param string|FullyQualifiedName $alias
+	 * @param string                    $for_class
+	 * @return string
+	 */
+	public function getFqnForAlias($alias = '', string $for_class = ''): string
+	{
+		$alias = $this->getFqn($alias);
+		if ($this->isAliasForClass($alias, $for_class)) {
+			return $this->getFqnForAlias($this->aliases[ $for_class ][ $alias ], $for_class);
+		}
+		if ($this->isDirectAlias($alias)) {
+			// note: changed '' to $for_class
+			return $this->getFqnForAlias($this->aliases[ $alias ], $for_class);
+		}
+		return $alias;
+	}
+
+
+	// public function debug($for_class = '')
+	// {
+	//     if ($for_class !== '') {
+	//         if ( ! isset($this->aliases[ $for_class ])) {
+	//             \EEH_Debug_Tools::printr('NOT FOUND', "aliases[ $for_class ]", __FILE__, __LINE__);
+	//             return;
+	//         }
+	//         \EEH_Debug_Tools::printr($this->aliases[ $for_class ], "aliases[ $for_class ]", __FILE__, __LINE__);
+	//         return;
+	//     }
+	//     \EEH_Debug_Tools::printr($this->aliases, '$this->aliases', __FILE__, __LINE__);
+	// }
 }

Spacing +14 added lines, -14 removed lines

@@ -59,16 +59,16 @@ 
     {
         $fqn = $this->getFqn($fqn);
         // have we already seen this FQCN ?
-        if (! array_key_exists($fqn, $this->interfaces)) {
-            $this->interfaces[ $fqn ] = [];
+        if ( ! array_key_exists($fqn, $this->interfaces)) {
+            $this->interfaces[$fqn] = [];
             if (class_exists($fqn)) {
-                $this->interfaces[ $fqn ] = class_implements($fqn, false);
-                $this->interfaces[ $fqn ] = $this->interfaces[ $fqn ] !== false
-                    ? $this->interfaces[ $fqn ]
+                $this->interfaces[$fqn] = class_implements($fqn, false);
+                $this->interfaces[$fqn] = $this->interfaces[$fqn] !== false
+                    ? $this->interfaces[$fqn]
                     : [];
             }
         }
-        return $this->interfaces[ $fqn ];
+        return $this->interfaces[$fqn];
     }
 
 
@@ -106,13 +106,13 @@ 
         // are we adding an alias for a specific class?
         if ($for_class !== '') {
             // make sure it's set up as an array
-            if (! isset($this->aliases[ $for_class ])) {
-                $this->aliases[ $for_class ] = [];
+            if ( ! isset($this->aliases[$for_class])) {
+                $this->aliases[$for_class] = [];
             }
-            $this->aliases[ $for_class ][ $alias ] = $fqn;
+            $this->aliases[$for_class][$alias] = $fqn;
             return;
         }
-        $this->aliases[ $alias ] = $fqn;
+        $this->aliases[$alias] = $fqn;
     }
 
 
@@ -141,7 +141,7 @@ 
      */
     protected function isDirectAlias(string $alias = ''): bool
     {
-        return isset($this->aliases[ $alias ]) && ! is_array($this->aliases[ $alias ]);
+        return isset($this->aliases[$alias]) && ! is_array($this->aliases[$alias]);
     }
 
 
@@ -156,7 +156,7 @@ 
     {
         return (
             $for_class !== ''
-            && isset($this->aliases[ $for_class ][ $alias ])
+            && isset($this->aliases[$for_class][$alias])
         );
     }
 
@@ -181,11 +181,11 @@ 
     {
         $alias = $this->getFqn($alias);
         if ($this->isAliasForClass($alias, $for_class)) {
-            return $this->getFqnForAlias($this->aliases[ $for_class ][ $alias ], $for_class);
+            return $this->getFqnForAlias($this->aliases[$for_class][$alias], $for_class);
         }
         if ($this->isDirectAlias($alias)) {
             // note: changed '' to $for_class
-            return $this->getFqnForAlias($this->aliases[ $alias ], $for_class);
+            return $this->getFqnForAlias($this->aliases[$alias], $for_class);
         }
         return $alias;
     }

core/services/converters/date_time_formats/PhpToUnicode.php

Indentation +91 added lines, -91 removed lines

@@ -4,103 +4,103 @@
 
 class PhpToUnicode
 {
-    /**
-     * array where keys are PHP date format parameters
-     * and values are Unicode Date Format substitutions
-     */
-    public static array $date_formats = [
-        // YEAR
-        'y'  => 'yy',    // 00, 01, ..., 99
-        'Y'  => 'yyyy',  // 2000, 2001, ..., 2099
-        'o'  => 'GGGG',  // ISO "week-numbering year" 2000, 2001, ..., 2099
-        // MONTH
-        'M'  => 'MMM',   // Jan, Feb, ..., Dec
-        'n'  => 'M',     // 1, 2, ..., 12
-        'm'  => 'MM',    // 01, 02, ..., 12
-        'F'  => 'MMMM',  // January, February, ..., December
-        // DAY
-        'd'  => 'dd',    // 01, 02, ..., 31
-        'D'  => 'eee',   // Sun, Mon, ..., Sat
-        'jS' => 'do',   // 1st, 2nd, ..., 31st
-        'j'  => 'd',     // 1, 2, ..., 31
-        'l'  => 'eeee',  // Sunday, Monday, ..., Saturday
-        'N'  => 'e',     // Day of week 0, 1, ..., 6
-        'w'  => 'i',     // ISO Day of week 1, 2, ..., 7
-        'z'  => 'D',   // day of the year 0 - 365 to 1 - 366
-        // WEEK
-        'W'  => 'w',
-        // CHARACTERS
-        '|'  => '',
-    ];
+	/**
+	 * array where keys are PHP date format parameters
+	 * and values are Unicode Date Format substitutions
+	 */
+	public static array $date_formats = [
+		// YEAR
+		'y'  => 'yy',    // 00, 01, ..., 99
+		'Y'  => 'yyyy',  // 2000, 2001, ..., 2099
+		'o'  => 'GGGG',  // ISO "week-numbering year" 2000, 2001, ..., 2099
+		// MONTH
+		'M'  => 'MMM',   // Jan, Feb, ..., Dec
+		'n'  => 'M',     // 1, 2, ..., 12
+		'm'  => 'MM',    // 01, 02, ..., 12
+		'F'  => 'MMMM',  // January, February, ..., December
+		// DAY
+		'd'  => 'dd',    // 01, 02, ..., 31
+		'D'  => 'eee',   // Sun, Mon, ..., Sat
+		'jS' => 'do',   // 1st, 2nd, ..., 31st
+		'j'  => 'd',     // 1, 2, ..., 31
+		'l'  => 'eeee',  // Sunday, Monday, ..., Saturday
+		'N'  => 'e',     // Day of week 0, 1, ..., 6
+		'w'  => 'i',     // ISO Day of week 1, 2, ..., 7
+		'z'  => 'D',   // day of the year 0 - 365 to 1 - 366
+		// WEEK
+		'W'  => 'w',
+		// CHARACTERS
+		'|'  => '',
+	];
 
 
-    /**
-     * array where keys are PHP time format parameters
-     * and values are Unicode Time Format substitutions
-     */
-    public static array $time_formats = [
-        // 'a' => 'a', // am, pm, no specific JS alternative
-        'A' => 'a', // AM, PM
-        // HOUR
-        // convert "g" to an intermediary format
-        // to avoid its result getting replaced by "h"
-        'g' => '@',     // 1, 2, ..., 12
-        'h' => 'hh',    // 01, 02, ..., 12
-        '@' => 'h',     // 1, 2, ..., 12
-        'G' => '#',     // 0, 1, ... 23
-        'H' => 'HH',    // 00, 01, ... 23
-        '#' => 'H',     // 0, 1, ... 23
-        // MINUTES & SECONDS
-        'i' => 'mm',    // minutes 00, 01, ..., 59
-        's' => 'ss',    // seconds 00, 01, ..., 59
-        'v' => 'SSS',   // milliseconds 000, 001, ..., 999
-        'u' => 'SSS',   // microseconds (not in unicode) 000, 001, ..., 999
-    ];
+	/**
+	 * array where keys are PHP time format parameters
+	 * and values are Unicode Time Format substitutions
+	 */
+	public static array $time_formats = [
+		// 'a' => 'a', // am, pm, no specific JS alternative
+		'A' => 'a', // AM, PM
+		// HOUR
+		// convert "g" to an intermediary format
+		// to avoid its result getting replaced by "h"
+		'g' => '@',     // 1, 2, ..., 12
+		'h' => 'hh',    // 01, 02, ..., 12
+		'@' => 'h',     // 1, 2, ..., 12
+		'G' => '#',     // 0, 1, ... 23
+		'H' => 'HH',    // 00, 01, ... 23
+		'#' => 'H',     // 0, 1, ... 23
+		// MINUTES & SECONDS
+		'i' => 'mm',    // minutes 00, 01, ..., 59
+		's' => 'ss',    // seconds 00, 01, ..., 59
+		'v' => 'SSS',   // milliseconds 000, 001, ..., 999
+		'u' => 'SSS',   // microseconds (not in unicode) 000, 001, ..., 999
+	];
 
 
-    /**
-     * array where keys are PHP timezone format parameters
-     * and values are Unicode Timezone Format substitutions
-     */
-    public static array $timezone_formats = [
-        'Z' => 'xx',    // -0100, +0000, ..., +1200
-        'e' => 'xxx',     // Timezone identifier UTC, GMT, Atlantic/Azores to -01:00, +00:00, ... +12:00
-        'T' => 'xxx',     // Timezone abbreviation EST, MDT to -01:00, +00:00, ... +12:00
-        'P' => 'xxx',     // -01:00, +00:00, ... +12:00
-        'O' => 'xx',    // -0100, +0000, ..., +1200
-    ];
+	/**
+	 * array where keys are PHP timezone format parameters
+	 * and values are Unicode Timezone Format substitutions
+	 */
+	public static array $timezone_formats = [
+		'Z' => 'xx',    // -0100, +0000, ..., +1200
+		'e' => 'xxx',     // Timezone identifier UTC, GMT, Atlantic/Azores to -01:00, +00:00, ... +12:00
+		'T' => 'xxx',     // Timezone abbreviation EST, MDT to -01:00, +00:00, ... +12:00
+		'P' => 'xxx',     // -01:00, +00:00, ... +12:00
+		'O' => 'xx',    // -0100, +0000, ..., +1200
+	];
 
 
-    /**
-     * @param string $date_format
-     * @return string
-     */
-    public function convertDateFormat(string $date_format): string
-    {
-        // replace backslashed characters and `: ` with empty string
-        $date_format = preg_replace('/(\\\\\w)*(:\s)*/', '', $date_format);
-        foreach (PhpToUnicode::$date_formats as $find => $replace) {
-            $date_format = (string) str_replace($find, $replace, $date_format);
-        }
-        return trim($date_format);
-    }
+	/**
+	 * @param string $date_format
+	 * @return string
+	 */
+	public function convertDateFormat(string $date_format): string
+	{
+		// replace backslashed characters and `: ` with empty string
+		$date_format = preg_replace('/(\\\\\w)*(:\s)*/', '', $date_format);
+		foreach (PhpToUnicode::$date_formats as $find => $replace) {
+			$date_format = (string) str_replace($find, $replace, $date_format);
+		}
+		return trim($date_format);
+	}
 
 
-    /**
-     * @param string $time_format
-     * @return string
-     */
-    public function convertTimeFormat(string $time_format): string
-    {
-        // replace backslashed characters and `: ` with empty string
-        $time_format = preg_replace('/(\\\\\w)*(:\s)*/', '', $time_format);
-        foreach (PhpToUnicode::$time_formats as $find => $replace) {
-            $time_format = (string) str_replace($find, $replace, $time_format);
-        }
-        // and just in case the timezone has been added
-        foreach (PhpToUnicode::$timezone_formats as $find => $replace) {
-            $time_format = (string) str_replace($find, $replace, $time_format);
-        }
-        return trim($time_format);
-    }
+	/**
+	 * @param string $time_format
+	 * @return string
+	 */
+	public function convertTimeFormat(string $time_format): string
+	{
+		// replace backslashed characters and `: ` with empty string
+		$time_format = preg_replace('/(\\\\\w)*(:\s)*/', '', $time_format);
+		foreach (PhpToUnicode::$time_formats as $find => $replace) {
+			$time_format = (string) str_replace($find, $replace, $time_format);
+		}
+		// and just in case the timezone has been added
+		foreach (PhpToUnicode::$timezone_formats as $find => $replace) {
+			$time_format = (string) str_replace($find, $replace, $time_format);
+		}
+		return trim($time_format);
+	}
 }

core/services/helpers/datetime/PhpCompatGreaterFiveSixHelper.php

Indentation +87 added lines, -87 removed lines

@@ -10,99 +10,99 @@
 
 class PhpCompatGreaterFiveSixHelper extends AbstractHelper
 {
-    /**
-     * PhpCompatGreaterFiveSixHelper constructor.
-     *
-     * @throws DomainException
-     */
-    public function __construct()
-    {
-        if (PHP_VERSION_ID < 50600) {
-            throw new DomainException(
-                sprintf(
-                    esc_html__(
-                        'The %1$s is only usable on php versions greater than 5.6.  You\'ll want to use %2$s instead.',
-                        'event_espresso'
-                    ),
-                    __CLASS__,
-                    'EventEspresso\core\services\helpers\datetime\PhpCompatLessFiveSixHelper'
-                )
-            );
-        }
-    }
+	/**
+	 * PhpCompatGreaterFiveSixHelper constructor.
+	 *
+	 * @throws DomainException
+	 */
+	public function __construct()
+	{
+		if (PHP_VERSION_ID < 50600) {
+			throw new DomainException(
+				sprintf(
+					esc_html__(
+						'The %1$s is only usable on php versions greater than 5.6.  You\'ll want to use %2$s instead.',
+						'event_espresso'
+					),
+					__CLASS__,
+					'EventEspresso\core\services\helpers\datetime\PhpCompatLessFiveSixHelper'
+				)
+			);
+		}
+	}
 
 
-    /**
-     * Returns a timezone string for the provided gmt_offset.
-     * This is a valid timezone string that can be sent into DateTimeZone
-     *
-     * @param float|string $gmt_offset
-     * @return string
-     */
-    public function getTimezoneStringFromGmtOffset($gmt_offset = ''): string
-    {
-        $gmt_offset_or_timezone_string = $this->sanitizeInitialIncomingGmtOffsetForGettingTimezoneString($gmt_offset);
-        return is_float($gmt_offset_or_timezone_string)
-            ? $this->convertWpGmtOffsetForDateTimeZone($gmt_offset_or_timezone_string)
-            : $gmt_offset_or_timezone_string;
-    }
+	/**
+	 * Returns a timezone string for the provided gmt_offset.
+	 * This is a valid timezone string that can be sent into DateTimeZone
+	 *
+	 * @param float|string $gmt_offset
+	 * @return string
+	 */
+	public function getTimezoneStringFromGmtOffset($gmt_offset = ''): string
+	{
+		$gmt_offset_or_timezone_string = $this->sanitizeInitialIncomingGmtOffsetForGettingTimezoneString($gmt_offset);
+		return is_float($gmt_offset_or_timezone_string)
+			? $this->convertWpGmtOffsetForDateTimeZone($gmt_offset_or_timezone_string)
+			: $gmt_offset_or_timezone_string;
+	}
 
 
-    /**
-     * Returns a formatted offset for use as an argument for constructing DateTimeZone
-     *
-     * @param float $gmt_offset This should be a float representing the gmt_offset.
-     * @return string
-     */
-    protected function convertWpGmtOffsetForDateTimeZone(float $gmt_offset): string
-    {
-        $is_negative = $gmt_offset < 0;
-        $gmt_offset  *= 100;
-        $gmt_offset  = absint($gmt_offset);
-        // negative and need zero padding?
-        if (strlen($gmt_offset) < 4) {
-            $gmt_offset = str_pad($gmt_offset, 4, '0', STR_PAD_LEFT);
-        }
-        $gmt_offset = $this->convertToTimeFraction($gmt_offset);
-        // return something like -1300, -0200 or +1300, +0200
-        return $is_negative
-            ? '-' . $gmt_offset
-            : '+' . $gmt_offset;
-    }
+	/**
+	 * Returns a formatted offset for use as an argument for constructing DateTimeZone
+	 *
+	 * @param float $gmt_offset This should be a float representing the gmt_offset.
+	 * @return string
+	 */
+	protected function convertWpGmtOffsetForDateTimeZone(float $gmt_offset): string
+	{
+		$is_negative = $gmt_offset < 0;
+		$gmt_offset  *= 100;
+		$gmt_offset  = absint($gmt_offset);
+		// negative and need zero padding?
+		if (strlen($gmt_offset) < 4) {
+			$gmt_offset = str_pad($gmt_offset, 4, '0', STR_PAD_LEFT);
+		}
+		$gmt_offset = $this->convertToTimeFraction($gmt_offset);
+		// return something like -1300, -0200 or +1300, +0200
+		return $is_negative
+			? '-' . $gmt_offset
+			: '+' . $gmt_offset;
+	}
 
 
-    /**
-     * Converts something like `1550` to `1530` or `0275` to `0245`
-     * Incoming offset should be a positive value, this will mutate negative values. Be aware!
-     *
-     * @param int $offset
-     * @return string
-     */
-    protected function convertToTimeFraction(int $offset): string
-    {
-        $first_part  = substr($offset, 0, 2);
-        $second_part = substr($offset, 2, 2);
-        $second_part = str_replace(['25', '50', '75'], ['15', '30', '45'], $second_part);
-        return $first_part . $second_part;
-    }
+	/**
+	 * Converts something like `1550` to `1530` or `0275` to `0245`
+	 * Incoming offset should be a positive value, this will mutate negative values. Be aware!
+	 *
+	 * @param int $offset
+	 * @return string
+	 */
+	protected function convertToTimeFraction(int $offset): string
+	{
+		$first_part  = substr($offset, 0, 2);
+		$second_part = substr($offset, 2, 2);
+		$second_part = str_replace(['25', '50', '75'], ['15', '30', '45'], $second_part);
+		return $first_part . $second_part;
+	}
 
 
-    /**
-     * Get Timezone offset for given timezone object
-     *
-     * @param DateTimeZone $date_time_zone
-     * @param null|int     $time
-     * @return int
-     * @throws Exception
-     */
-    public function getTimezoneOffset(DateTimezone $date_time_zone, $time = null): int
-    {
-        $time = is_int($time) || $time === null
-            ? $time
-            : (int) strtotime($time);
-        $time = preg_match(EE_Datetime_Field::unix_timestamp_regex, (int) $time)
-            ? $time
-            : time();
-        return $date_time_zone->getOffset(new DateTime('@' . $time));
-    }
+	/**
+	 * Get Timezone offset for given timezone object
+	 *
+	 * @param DateTimeZone $date_time_zone
+	 * @param null|int     $time
+	 * @return int
+	 * @throws Exception
+	 */
+	public function getTimezoneOffset(DateTimezone $date_time_zone, $time = null): int
+	{
+		$time = is_int($time) || $time === null
+			? $time
+			: (int) strtotime($time);
+		$time = preg_match(EE_Datetime_Field::unix_timestamp_regex, (int) $time)
+			? $time
+			: time();
+		return $date_time_zone->getOffset(new DateTime('@' . $time));
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
     protected function convertWpGmtOffsetForDateTimeZone(float $gmt_offset): string
     {
         $is_negative = $gmt_offset < 0;
-        $gmt_offset  *= 100;
+        $gmt_offset *= 100;
         $gmt_offset  = absint($gmt_offset);
         // negative and need zero padding?
         if (strlen($gmt_offset) < 4) {
@@ -66,8 +66,8 @@ 
         $gmt_offset = $this->convertToTimeFraction($gmt_offset);
         // return something like -1300, -0200 or +1300, +0200
         return $is_negative
-            ? '-' . $gmt_offset
-            : '+' . $gmt_offset;
+            ? '-'.$gmt_offset
+            : '+'.$gmt_offset;
     }
 
 
@@ -83,7 +83,7 @@ 
         $first_part  = substr($offset, 0, 2);
         $second_part = substr($offset, 2, 2);
         $second_part = str_replace(['25', '50', '75'], ['15', '30', '45'], $second_part);
-        return $first_part . $second_part;
+        return $first_part.$second_part;
     }
 
 
@@ -103,6 +103,6 @@ 
         $time = preg_match(EE_Datetime_Field::unix_timestamp_regex, (int) $time)
             ? $time
             : time();
-        return $date_time_zone->getOffset(new DateTime('@' . $time));
+        return $date_time_zone->getOffset(new DateTime('@'.$time));
     }
 }

core/services/helpers/WordPressHooks.php

Indentation +31 added lines, -31 removed lines

@@ -4,35 +4,35 @@
 
 class WordPressHooks
 {
-    /**
-     * returns an array of names for all classes that have methods registered as callbacks for the given action or
-     * filter hook
-     *
-     * @param string $hook
-     * @return array
-     */
-    public static function getClassNamesForAllCallbacksOnHook(string $hook): array
-    {
-        global $wp_filter;
-        $class_names = [];
-        // are any callbacks registered for this hook ?
-        if (isset($wp_filter[ $hook ])) {
-            // loop thru all of the callbacks attached to the deprecated hookpoint
-            foreach ($wp_filter[ $hook ] as $priority) {
-                foreach ($priority as $callback) {
-                    // is the callback a non-static class method ?
-                    if (isset($callback['function']) && is_array($callback['function'])) {
-                        if (isset($callback['function'][0]) && is_object($callback['function'][0])) {
-                            $class_names[] = get_class($callback['function'][0]);
-                        }
-                        // test for static method
-                    } elseif (strpos($callback['function'], '::') !== false) {
-                        $class         = explode('::', $callback['function']);
-                        $class_names[] = $class[0];
-                    }
-                }
-            }
-        }
-        return $class_names;
-    }
+	/**
+	 * returns an array of names for all classes that have methods registered as callbacks for the given action or
+	 * filter hook
+	 *
+	 * @param string $hook
+	 * @return array
+	 */
+	public static function getClassNamesForAllCallbacksOnHook(string $hook): array
+	{
+		global $wp_filter;
+		$class_names = [];
+		// are any callbacks registered for this hook ?
+		if (isset($wp_filter[ $hook ])) {
+			// loop thru all of the callbacks attached to the deprecated hookpoint
+			foreach ($wp_filter[ $hook ] as $priority) {
+				foreach ($priority as $callback) {
+					// is the callback a non-static class method ?
+					if (isset($callback['function']) && is_array($callback['function'])) {
+						if (isset($callback['function'][0]) && is_object($callback['function'][0])) {
+							$class_names[] = get_class($callback['function'][0]);
+						}
+						// test for static method
+					} elseif (strpos($callback['function'], '::') !== false) {
+						$class         = explode('::', $callback['function']);
+						$class_names[] = $class[0];
+					}
+				}
+			}
+		}
+		return $class_names;
+	}
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -16,9 +16,9 @@
         global $wp_filter;
         $class_names = [];
         // are any callbacks registered for this hook ?
-        if (isset($wp_filter[ $hook ])) {
+        if (isset($wp_filter[$hook])) {
             // loop thru all of the callbacks attached to the deprecated hookpoint
-            foreach ($wp_filter[ $hook ] as $priority) {
+            foreach ($wp_filter[$hook] as $priority) {
                 foreach ($priority as $callback) {
                     // is the callback a non-static class method ?
                     if (isset($callback['function']) && is_array($callback['function'])) {

core/services/collections/iterators/CollectionFilterCallbackIterator.php

Indentation +49 added lines, -49 removed lines

@@ -8,53 +8,53 @@
 
 class CollectionFilterCallbackIterator extends FilterIterator
 {
-    /**
-     * Used for determining whether the iterated object in the Collection is "valid" or not.
-     *
-     * @var Closure
-     */
-    private Closure $acceptance_callback;
-
-
-    /**
-     * CollectionFilterCallbackIterator constructor.
-     *
-     * @param Collection $collection
-     * @param Closure    $acceptance_callback  The closure will receive an instance of whatever object is stored on the
-     *                                         collection when iterating over the collection and should return boolean.
-     */
-    public function __construct(Collection $collection, Closure $acceptance_callback)
-    {
-        $this->acceptance_callback = $acceptance_callback;
-        parent::__construct($collection);
-    }
-
-
-    /**
-     * Check whether the current element of the iterator is acceptable
-     *
-     * @link  http://php.net/manual/en/filteriterator.accept.php
-     * @return bool true if the current element is acceptable, otherwise false.
-     */
-    public function accept(): bool
-    {
-        $acceptance_callback = $this->acceptance_callback;
-        return $acceptance_callback($this->getInnerIterator()->current());
-    }
-
-
-    /**
-     * Returns a filtered array of objects from the collection using the provided acceptance callback
-     *
-     * @return array
-     */
-    public function getFiltered(): array
-    {
-        $filtered_array = [];
-        $this->rewind();
-        foreach ($this as $filtered_object) {
-            $filtered_array[] = $filtered_object;
-        }
-        return $filtered_array;
-    }
+	/**
+	 * Used for determining whether the iterated object in the Collection is "valid" or not.
+	 *
+	 * @var Closure
+	 */
+	private Closure $acceptance_callback;
+
+
+	/**
+	 * CollectionFilterCallbackIterator constructor.
+	 *
+	 * @param Collection $collection
+	 * @param Closure    $acceptance_callback  The closure will receive an instance of whatever object is stored on the
+	 *                                         collection when iterating over the collection and should return boolean.
+	 */
+	public function __construct(Collection $collection, Closure $acceptance_callback)
+	{
+		$this->acceptance_callback = $acceptance_callback;
+		parent::__construct($collection);
+	}
+
+
+	/**
+	 * Check whether the current element of the iterator is acceptable
+	 *
+	 * @link  http://php.net/manual/en/filteriterator.accept.php
+	 * @return bool true if the current element is acceptable, otherwise false.
+	 */
+	public function accept(): bool
+	{
+		$acceptance_callback = $this->acceptance_callback;
+		return $acceptance_callback($this->getInnerIterator()->current());
+	}
+
+
+	/**
+	 * Returns a filtered array of objects from the collection using the provided acceptance callback
+	 *
+	 * @return array
+	 */
+	public function getFiltered(): array
+	{
+		$filtered_array = [];
+		$this->rewind();
+		foreach ($this as $filtered_object) {
+			$filtered_array[] = $filtered_object;
+		}
+		return $filtered_array;
+	}
 }

core/services/encryption/openssl/CipherMethod.php

Indentation +190 added lines, -190 removed lines

@@ -14,194 +14,194 @@
  */
 class CipherMethod
 {
-    protected string $cipher_method_option_name = '';
-
-    /**
-     * list of cipher methods that we consider usable,
-     * essentially all of the installed_cipher_methods minus weak_algorithms
-     */
-    protected array  $cipher_methods        = [];
-
-    protected string $default_cipher_method = '';
-
-    /**
-     * list of ALL cipher methods available on the server
-     */
-    protected array $installed_cipher_methods = [];
-
-    /**
-     * the OpenSSL cipher method to use. default: AES-128-CBC
-     */
-    protected ?string $validated_cipher_method = null;
-
-    /**
-     * as early as Aug 2016, Openssl declared the following weak: RC2, RC4, DES, 3DES, MD5 based
-     * and ECB mode should be avoided
-     */
-    protected array $weak_algorithms = ['des', 'ecb', 'md5', 'rc2', 'rc4'];
-
-
-    /**
-     * @param string $default_cipher_method
-     * @param string $cipher_method_option_name
-     */
-    public function __construct(string $default_cipher_method, string $cipher_method_option_name)
-    {
-        $this->default_cipher_method     = $default_cipher_method;
-        $this->cipher_method_option_name = $cipher_method_option_name;
-        $this->installed_cipher_methods  = openssl_get_cipher_methods();
-    }
-
-
-    /**
-     * Returns a cipher method that has been verified to work.
-     * First checks if the cached cipher has been set already and if so, returns that.
-     * Then tests the incoming default and returns that if it's good.
-     * If not, then it retrieves the previously tested and saved cipher method.
-     * But if that doesn't exist, then calls getAvailableCipherMethod()
-     * to see what is available on the server, and returns the results.
-     *
-     * @param string $cipher_method
-     * @param bool   $load_alternate [optional] if TRUE, will load the default cipher method (or any strong algorithm)
-     *                               if the requested cipher method is not installed or invalid.
-     *                               if FALSE, will throw an exception if the requested cipher method is not valid.
-     * @return string
-     * @throws RuntimeException
-     */
-    public function getCipherMethod(string $cipher_method = '', bool $load_alternate = true): ?string
-    {
-        if (empty($cipher_method) && $this->validated_cipher_method !== null) {
-            return $this->validated_cipher_method;
-        }
-        // if nothing specific was requested and it's ok to load an alternate, then grab the system default
-        if (empty($cipher_method) && $load_alternate) {
-            $cipher_method = $this->default_cipher_method;
-        }
-        // verify that the cipher method can produce an initialization vector.
-        // but if the requested is invalid and we don't want to load an alternate, then throw an exception
-        $throw_exception = ! $load_alternate;
-        if ($this->validateCipherMethod($cipher_method, $throw_exception) === false) {
-            // nope? ... ok let's see what we can find
-            $cipher_method = $this->getAvailableCipherMethod();
-        }
-        // if nothing has been previously validated, then save the currently requested cipher which appears to be good
-        if ($this->validated_cipher_method === null) {
-            $this->validated_cipher_method = $cipher_method;
-        }
-        return $cipher_method;
-    }
-
-
-    /**
-     * returns true if the selected cipher method either uses Galois/Counter Mode (GCM)
-     * or Counter with CBC-MAC (CCM) authenticated encryption modes
-     * (also need to be using PHP 7.1 or greater to actually use authenticated encryption modes)
-     *
-     * @return bool
-     */
-    public function usesAuthenticatedEncryptionMode(): bool
-    {
-        return PHP_VERSION_ID >= 70100
-               && (
-                   stripos($this->validated_cipher_method, 'gcm') !== false
-                   || stripos($this->validated_cipher_method, 'ccm') !== false
-               );
-    }
-
-
-    /**
-     * @param string $cipher_method
-     * @return string
-     * @throws RuntimeException
-     */
-    protected function getAvailableCipherMethod(string $cipher_method = ''): ?string
-    {
-        // if nothing was supplied, the get what we found in the past to work
-        $cipher_method_to_test = $cipher_method
-            ?: get_option($this->cipher_method_option_name, '');
-        // verify that the incoming cipher method exists and can produce an initialization vector
-        if ($this->validateCipherMethod($cipher_method_to_test) === false) {
-            // what? there's no list?
-            if (empty($this->cipher_methods)) {
-                // generate that list and cache it
-                $this->cipher_methods = $this->getAvailableStrongCipherMethods();
-            }
-            // then grab the first item from the list (we'll add it back later if it is good)
-            $cipher_method_to_test = array_shift($this->cipher_methods);
-            if ($cipher_method_to_test === null) {
-                throw new RuntimeException(
-                    esc_html__(
-                        'OpenSSL support appears to be enabled on the server, but no cipher methods are available. Please contact the server administrator.',
-                        'event_espresso'
-                    )
-                );
-            }
-            // verify that the next cipher method works
-            return $this->getAvailableCipherMethod($cipher_method_to_test);
-        }
-        // if we've gotten this far, then we found an available cipher method that works
-        // so save that for next time, if it's not the same as what's there already
-        if ($cipher_method_to_test !== $cipher_method) {
-            update_option($this->cipher_method_option_name, $cipher_method_to_test);
-        }
-        // if we previously removed this cipher method from the list of valid ones, then let's put it back
-        if (! in_array($cipher_method_to_test, $this->cipher_methods, true)) {
-            array_unshift($this->cipher_methods, $cipher_method_to_test);
-        }
-        return $cipher_method_to_test;
-    }
-
-
-    /**
-     * @return array
-     */
-    protected function getAvailableStrongCipherMethods(): array
-    {
-        return array_filter($this->installed_cipher_methods, [$this, 'weakAlgorithmFilter']);
-    }
-
-
-    /**
-     * @param string $cipher_method
-     * @param bool   $throw_exception
-     * @return bool
-     */
-    protected function validateCipherMethod(string $cipher_method, bool $throw_exception = false): bool
-    {
-        // verify that the requested cipher method is actually installed and can produce an initialization vector
-        if (
-            in_array($cipher_method, $this->installed_cipher_methods, true)
-            && openssl_cipher_iv_length($cipher_method) !== false
-        ) {
-            return true;
-        }
-        if (! $throw_exception) {
-            return false;
-        }
-        throw new RuntimeException(
-            sprintf(
-                esc_html__(
-                    'The requested OpenSSL cipher method "%1$s" is invalid or not installed on the server. Please contact the server administrator.',
-                    'event_espresso'
-                ),
-                $cipher_method
-            )
-        );
-    }
-
-
-    /**
-     * @see https://www.php.net/manual/en/function.openssl-get-cipher-methods.php#example-890
-     * @param string $cipher_method
-     * @return bool
-     */
-    protected function weakAlgorithmFilter(string $cipher_method): bool
-    {
-        foreach ($this->weak_algorithms as $weak_algorithm) {
-            if (stripos($cipher_method, $weak_algorithm) !== false) {
-                return false;
-            }
-        }
-        return true;
-    }
+	protected string $cipher_method_option_name = '';
+
+	/**
+	 * list of cipher methods that we consider usable,
+	 * essentially all of the installed_cipher_methods minus weak_algorithms
+	 */
+	protected array  $cipher_methods        = [];
+
+	protected string $default_cipher_method = '';
+
+	/**
+	 * list of ALL cipher methods available on the server
+	 */
+	protected array $installed_cipher_methods = [];
+
+	/**
+	 * the OpenSSL cipher method to use. default: AES-128-CBC
+	 */
+	protected ?string $validated_cipher_method = null;
+
+	/**
+	 * as early as Aug 2016, Openssl declared the following weak: RC2, RC4, DES, 3DES, MD5 based
+	 * and ECB mode should be avoided
+	 */
+	protected array $weak_algorithms = ['des', 'ecb', 'md5', 'rc2', 'rc4'];
+
+
+	/**
+	 * @param string $default_cipher_method
+	 * @param string $cipher_method_option_name
+	 */
+	public function __construct(string $default_cipher_method, string $cipher_method_option_name)
+	{
+		$this->default_cipher_method     = $default_cipher_method;
+		$this->cipher_method_option_name = $cipher_method_option_name;
+		$this->installed_cipher_methods  = openssl_get_cipher_methods();
+	}
+
+
+	/**
+	 * Returns a cipher method that has been verified to work.
+	 * First checks if the cached cipher has been set already and if so, returns that.
+	 * Then tests the incoming default and returns that if it's good.
+	 * If not, then it retrieves the previously tested and saved cipher method.
+	 * But if that doesn't exist, then calls getAvailableCipherMethod()
+	 * to see what is available on the server, and returns the results.
+	 *
+	 * @param string $cipher_method
+	 * @param bool   $load_alternate [optional] if TRUE, will load the default cipher method (or any strong algorithm)
+	 *                               if the requested cipher method is not installed or invalid.
+	 *                               if FALSE, will throw an exception if the requested cipher method is not valid.
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	public function getCipherMethod(string $cipher_method = '', bool $load_alternate = true): ?string
+	{
+		if (empty($cipher_method) && $this->validated_cipher_method !== null) {
+			return $this->validated_cipher_method;
+		}
+		// if nothing specific was requested and it's ok to load an alternate, then grab the system default
+		if (empty($cipher_method) && $load_alternate) {
+			$cipher_method = $this->default_cipher_method;
+		}
+		// verify that the cipher method can produce an initialization vector.
+		// but if the requested is invalid and we don't want to load an alternate, then throw an exception
+		$throw_exception = ! $load_alternate;
+		if ($this->validateCipherMethod($cipher_method, $throw_exception) === false) {
+			// nope? ... ok let's see what we can find
+			$cipher_method = $this->getAvailableCipherMethod();
+		}
+		// if nothing has been previously validated, then save the currently requested cipher which appears to be good
+		if ($this->validated_cipher_method === null) {
+			$this->validated_cipher_method = $cipher_method;
+		}
+		return $cipher_method;
+	}
+
+
+	/**
+	 * returns true if the selected cipher method either uses Galois/Counter Mode (GCM)
+	 * or Counter with CBC-MAC (CCM) authenticated encryption modes
+	 * (also need to be using PHP 7.1 or greater to actually use authenticated encryption modes)
+	 *
+	 * @return bool
+	 */
+	public function usesAuthenticatedEncryptionMode(): bool
+	{
+		return PHP_VERSION_ID >= 70100
+			   && (
+				   stripos($this->validated_cipher_method, 'gcm') !== false
+				   || stripos($this->validated_cipher_method, 'ccm') !== false
+			   );
+	}
+
+
+	/**
+	 * @param string $cipher_method
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	protected function getAvailableCipherMethod(string $cipher_method = ''): ?string
+	{
+		// if nothing was supplied, the get what we found in the past to work
+		$cipher_method_to_test = $cipher_method
+			?: get_option($this->cipher_method_option_name, '');
+		// verify that the incoming cipher method exists and can produce an initialization vector
+		if ($this->validateCipherMethod($cipher_method_to_test) === false) {
+			// what? there's no list?
+			if (empty($this->cipher_methods)) {
+				// generate that list and cache it
+				$this->cipher_methods = $this->getAvailableStrongCipherMethods();
+			}
+			// then grab the first item from the list (we'll add it back later if it is good)
+			$cipher_method_to_test = array_shift($this->cipher_methods);
+			if ($cipher_method_to_test === null) {
+				throw new RuntimeException(
+					esc_html__(
+						'OpenSSL support appears to be enabled on the server, but no cipher methods are available. Please contact the server administrator.',
+						'event_espresso'
+					)
+				);
+			}
+			// verify that the next cipher method works
+			return $this->getAvailableCipherMethod($cipher_method_to_test);
+		}
+		// if we've gotten this far, then we found an available cipher method that works
+		// so save that for next time, if it's not the same as what's there already
+		if ($cipher_method_to_test !== $cipher_method) {
+			update_option($this->cipher_method_option_name, $cipher_method_to_test);
+		}
+		// if we previously removed this cipher method from the list of valid ones, then let's put it back
+		if (! in_array($cipher_method_to_test, $this->cipher_methods, true)) {
+			array_unshift($this->cipher_methods, $cipher_method_to_test);
+		}
+		return $cipher_method_to_test;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	protected function getAvailableStrongCipherMethods(): array
+	{
+		return array_filter($this->installed_cipher_methods, [$this, 'weakAlgorithmFilter']);
+	}
+
+
+	/**
+	 * @param string $cipher_method
+	 * @param bool   $throw_exception
+	 * @return bool
+	 */
+	protected function validateCipherMethod(string $cipher_method, bool $throw_exception = false): bool
+	{
+		// verify that the requested cipher method is actually installed and can produce an initialization vector
+		if (
+			in_array($cipher_method, $this->installed_cipher_methods, true)
+			&& openssl_cipher_iv_length($cipher_method) !== false
+		) {
+			return true;
+		}
+		if (! $throw_exception) {
+			return false;
+		}
+		throw new RuntimeException(
+			sprintf(
+				esc_html__(
+					'The requested OpenSSL cipher method "%1$s" is invalid or not installed on the server. Please contact the server administrator.',
+					'event_espresso'
+				),
+				$cipher_method
+			)
+		);
+	}
+
+
+	/**
+	 * @see https://www.php.net/manual/en/function.openssl-get-cipher-methods.php#example-890
+	 * @param string $cipher_method
+	 * @return bool
+	 */
+	protected function weakAlgorithmFilter(string $cipher_method): bool
+	{
+		foreach ($this->weak_algorithms as $weak_algorithm) {
+			if (stripos($cipher_method, $weak_algorithm) !== false) {
+				return false;
+			}
+		}
+		return true;
+	}
 }