eventespresso / event-espresso-core

core/domain/services/validation/email/strategies/InternationalDNS.php

Indentation +39 added lines, -39 removed lines

@@ -14,43 +14,43 @@
  */
 class InternationalDNS extends International
 {
-    /**
-     * Validates the email in teh same way as the parent, but also
-     * verifies the domain exists.
-     *
-     * @param string $email_address
-     * @return bool
-     * @throws EmailValidationException
-     */
-    public function validate(string $email_address): bool
-    {
-        parent::validate($email_address);
-        $domain = $this->getDomainPartOfEmail(
-            $email_address,
-            $this->getAtIndex($email_address)
-        );
-        if (! checkdnsrr($domain)) {
-            // domain not found in MX records
-            throw new EmailValidationException(
-                esc_html__(
-                // @codingStandardsIgnoreStart
-                    'Although the email address provided is formatted correctly, a valid "MX record" could not be located for that address and domain. Please enter a valid email address.',
-                    // @codingStandardsIgnoreEnd
-                    'event_espresso'
-                )
-            );
-        }
-        if (! checkdnsrr($domain, 'A')) {
-            // domain not found in A records
-            throw new EmailValidationException(
-                esc_html__(
-                // @codingStandardsIgnoreStart
-                    'Although the email address provided is formatted correctly, a valid "A record" could not be located for that address and domain. Please enter a valid email address.',
-                    // @codingStandardsIgnoreEnd
-                    'event_espresso'
-                )
-            );
-        }
-        return true;
-    }
+	/**
+	 * Validates the email in teh same way as the parent, but also
+	 * verifies the domain exists.
+	 *
+	 * @param string $email_address
+	 * @return bool
+	 * @throws EmailValidationException
+	 */
+	public function validate(string $email_address): bool
+	{
+		parent::validate($email_address);
+		$domain = $this->getDomainPartOfEmail(
+			$email_address,
+			$this->getAtIndex($email_address)
+		);
+		if (! checkdnsrr($domain)) {
+			// domain not found in MX records
+			throw new EmailValidationException(
+				esc_html__(
+				// @codingStandardsIgnoreStart
+					'Although the email address provided is formatted correctly, a valid "MX record" could not be located for that address and domain. Please enter a valid email address.',
+					// @codingStandardsIgnoreEnd
+					'event_espresso'
+				)
+			);
+		}
+		if (! checkdnsrr($domain, 'A')) {
+			// domain not found in A records
+			throw new EmailValidationException(
+				esc_html__(
+				// @codingStandardsIgnoreStart
+					'Although the email address provided is formatted correctly, a valid "A record" could not be located for that address and domain. Please enter a valid email address.',
+					// @codingStandardsIgnoreEnd
+					'event_espresso'
+				)
+			);
+		}
+		return true;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
             $email_address,
             $this->getAtIndex($email_address)
         );
-        if (! checkdnsrr($domain)) {
+        if ( ! checkdnsrr($domain)) {
             // domain not found in MX records
             throw new EmailValidationException(
                 esc_html__(
@@ -40,7 +40,7 @@ 
                 )
             );
         }
-        if (! checkdnsrr($domain, 'A')) {
+        if ( ! checkdnsrr($domain, 'A')) {
             // domain not found in A records
             throw new EmailValidationException(
                 esc_html__(

core/domain/services/validation/email/EmailValidatorInterface.php

Indentation +8 added lines, -8 removed lines

@@ -13,12 +13,12 @@
  */
 interface EmailValidatorInterface
 {
-    /**
-     * Validates the supplied email address. If it is invalid, throws EmailValidationException
-     *
-     * @param string $email_address
-     * @return boolean
-     * @throws EmailValidationException
-     */
-    public function validate(string $email_address): bool;
+	/**
+	 * Validates the supplied email address. If it is invalid, throws EmailValidationException
+	 *
+	 * @param string $email_address
+	 * @return boolean
+	 * @throws EmailValidationException
+	 */
+	public function validate(string $email_address): bool;
 }

core/domain/services/validation/email/EmailValidationService.php

Indentation +50 added lines, -50 removed lines

@@ -15,59 +15,59 @@
  */
 class EmailValidationService implements EmailValidatorInterface
 {
-    protected EE_Registration_Config $registration_config;
+	protected EE_Registration_Config $registration_config;
 
-    protected LoaderInterface        $loader;
+	protected LoaderInterface        $loader;
 
 
-    /**
-     * EmailValidationService constructor.
-     * Accepts an \EE_Config as an argument.
-     *
-     * @param EE_Registration_Config $config
-     * @param LoaderInterface        $loader
-     */
-    public function __construct(EE_Registration_Config $config, LoaderInterface $loader)
-    {
-        $this->registration_config = $config;
-        $this->loader              = $loader;
-    }
+	/**
+	 * EmailValidationService constructor.
+	 * Accepts an \EE_Config as an argument.
+	 *
+	 * @param EE_Registration_Config $config
+	 * @param LoaderInterface        $loader
+	 */
+	public function __construct(EE_Registration_Config $config, LoaderInterface $loader)
+	{
+		$this->registration_config = $config;
+		$this->loader              = $loader;
+	}
 
 
-    /**
-     * Validates the email address. If it's invalid, an EmailValidationException
-     * is thrown that describes why its invalid.
-     *
-     * @param string $email_address
-     * @return boolean
-     * @throws EmailValidationException
-     */
-    public function validate(string $email_address): bool
-    {
-        // pick the correct validator according to the config
-        switch ($this->registration_config->email_validation_level) {
-            case 'basic':
-                $validator = $this->loader->getShared(
-                    'EventEspresso\core\domain\services\validation\email\strategies\Basic'
-                );
-                break;
-            case 'i18n':
-                $validator = $this->loader->getShared(
-                    'EventEspresso\core\domain\services\validation\email\strategies\International'
-                );
-                break;
-            case 'i18n_dns':
-                $validator = $this->loader->getShared(
-                    'EventEspresso\core\domain\services\validation\email\strategies\InternationalDNS'
-                );
-                break;
-            case 'wp_default':
-            default:
-                $validator = $this->loader->getShared(
-                    'EventEspresso\core\domain\services\validation\email\strategies\WordPress'
-                );
-                break;
-        }
-        return $validator->validate($email_address);
-    }
+	/**
+	 * Validates the email address. If it's invalid, an EmailValidationException
+	 * is thrown that describes why its invalid.
+	 *
+	 * @param string $email_address
+	 * @return boolean
+	 * @throws EmailValidationException
+	 */
+	public function validate(string $email_address): bool
+	{
+		// pick the correct validator according to the config
+		switch ($this->registration_config->email_validation_level) {
+			case 'basic':
+				$validator = $this->loader->getShared(
+					'EventEspresso\core\domain\services\validation\email\strategies\Basic'
+				);
+				break;
+			case 'i18n':
+				$validator = $this->loader->getShared(
+					'EventEspresso\core\domain\services\validation\email\strategies\International'
+				);
+				break;
+			case 'i18n_dns':
+				$validator = $this->loader->getShared(
+					'EventEspresso\core\domain\services\validation\email\strategies\InternationalDNS'
+				);
+				break;
+			case 'wp_default':
+			default:
+				$validator = $this->loader->getShared(
+					'EventEspresso\core\domain\services\validation\email\strategies\WordPress'
+				);
+				break;
+		}
+		return $validator->validate($email_address);
+	}
 }

core/domain/entities/contexts/RequestTypeContext.php

Indentation +181 added lines, -181 removed lines

@@ -15,185 +15,185 @@
  */
 class RequestTypeContext extends Context
 {
-    /**
-     * indicates that the current request involves some form of activation
-     */
-    const ACTIVATION = 'activation-request';
-
-    /**
-     * indicates that the current request is for the admin but is not being made via AJAX
-     */
-    const ADMIN = 'non-ajax-admin-request';
-
-    /**
-     * indicates that the current request is for the admin AND is being made via AJAX
-     */
-    const AJAX_ADMIN = 'admin-ajax-request';
-
-    /**
-     * indicates that the current request is for the frontend AND is being made via AJAX
-     */
-    const AJAX_FRONT = 'frontend-ajax-request';
-
-    /**
-     * indicates that the current request is for the WP Heartbeat
-     */
-    const AJAX_HEARTBEAT = 'admin-ajax-heartbeat';
-
-    /**
-     * indicates that the current request is being made via AJAX, but is NOT for EE
-     */
-    const AJAX_OTHER = 'other-ajax-request';
-
-    /**
-     * indicates that the current request is for the EE REST API
-     */
-    const API = 'rest-api';
-
-    /**
-     * indicates that the current request is from the command line
-     */
-    const CLI = 'command-line';
-
-    /**
-     * indicates that the current request is for a WP_Cron
-     */
-    const CRON = 'wp-cron';
-
-    /**
-     * indicates that the current request is for a feed (ie: RSS)
-     */
-    const FEED = 'feed-request';
-
-    /**
-     * indicates that the current request is for the frontend but is not being made via AJAX
-     */
-    const FRONTEND = 'non-ajax-frontend-request';
-
-    /**
-     * indicates that the current request is for content that is to be displayed within an iframe
-     */
-    const IFRAME = 'iframe-request';
-
-    /**
-     * indicates that the current request is for the EE GraphQL manager
-     */
-    const GQL = 'graphql';
-
-    /**
-     * indicates that the current request is for the WP REST API
-     */
-    const WP_API = 'wp-rest-api';
-
-    /**
-     * indicates that the current request is a loopback sent from WP core to test for errors
-     */
-    const WP_SCRAPE = 'wordpress-scrape';
-
-    /**
-     * @var boolean $is_activation
-     */
-    private bool $is_activation = false;
-
-    /**
-     * @var boolean $is_unit_testing
-     */
-    private bool $is_unit_testing = false;
-
-    /**
-     * @var array $valid_request_types
-     */
-    private array $valid_request_types = array();
-
-
-    /**
-     * RequestTypeContext constructor.
-     *
-     * @param string $slug
-     * @param string $description
-     * @throws InvalidArgumentException
-     */
-    public function __construct($slug, $description)
-    {
-        parent::__construct($slug, $description);
-        if (! in_array($this->slug(), $this->validRequestTypes(), true)) {
-            throw new InvalidArgumentException(
-                sprintf(
-                    esc_html__(
-                        'The RequestTypeContext slug must be one of the following values: %1$s %2$s',
-                        'event_espresso'
-                    ),
-                    '<br />',
-                    var_export($this->validRequestTypes(), true)
-                )
-            );
-        }
-    }
-
-
-    /**
-     * @return array
-     */
-    public function validRequestTypes(): array
-    {
-        if (empty($this->valid_request_types)) {
-            $this->valid_request_types = apply_filters(
-                'FHEE__EventEspresso_core_domain_entities_contexts_RequestTypeContext__validRequestTypes',
-                array(
-                    RequestTypeContext::ACTIVATION,
-                    RequestTypeContext::ADMIN,
-                    RequestTypeContext::AJAX_ADMIN,
-                    RequestTypeContext::AJAX_FRONT,
-                    RequestTypeContext::AJAX_HEARTBEAT,
-                    RequestTypeContext::AJAX_OTHER,
-                    RequestTypeContext::API,
-                    RequestTypeContext::CLI,
-                    RequestTypeContext::CRON,
-                    RequestTypeContext::FEED,
-                    RequestTypeContext::FRONTEND,
-                    RequestTypeContext::GQL,
-                    RequestTypeContext::IFRAME,
-                    RequestTypeContext::WP_API,
-                    RequestTypeContext::WP_SCRAPE,
-                )
-            );
-        }
-        return $this->valid_request_types;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isActivation(): bool
-    {
-        return $this->is_activation;
-    }
-
-
-    /**
-     * @param bool $is_activation
-     */
-    public function setIsActivation(bool $is_activation = false)
-    {
-        $this->is_activation = filter_var($is_activation, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isUnitTesting(): bool
-    {
-        return $this->is_unit_testing;
-    }
-
-
-    /**
-     * @param bool $is_unit_testing
-     */
-    public function setIsUnitTesting(bool $is_unit_testing = false)
-    {
-        $this->is_unit_testing = filter_var($is_unit_testing, FILTER_VALIDATE_BOOLEAN);
-    }
+	/**
+	 * indicates that the current request involves some form of activation
+	 */
+	const ACTIVATION = 'activation-request';
+
+	/**
+	 * indicates that the current request is for the admin but is not being made via AJAX
+	 */
+	const ADMIN = 'non-ajax-admin-request';
+
+	/**
+	 * indicates that the current request is for the admin AND is being made via AJAX
+	 */
+	const AJAX_ADMIN = 'admin-ajax-request';
+
+	/**
+	 * indicates that the current request is for the frontend AND is being made via AJAX
+	 */
+	const AJAX_FRONT = 'frontend-ajax-request';
+
+	/**
+	 * indicates that the current request is for the WP Heartbeat
+	 */
+	const AJAX_HEARTBEAT = 'admin-ajax-heartbeat';
+
+	/**
+	 * indicates that the current request is being made via AJAX, but is NOT for EE
+	 */
+	const AJAX_OTHER = 'other-ajax-request';
+
+	/**
+	 * indicates that the current request is for the EE REST API
+	 */
+	const API = 'rest-api';
+
+	/**
+	 * indicates that the current request is from the command line
+	 */
+	const CLI = 'command-line';
+
+	/**
+	 * indicates that the current request is for a WP_Cron
+	 */
+	const CRON = 'wp-cron';
+
+	/**
+	 * indicates that the current request is for a feed (ie: RSS)
+	 */
+	const FEED = 'feed-request';
+
+	/**
+	 * indicates that the current request is for the frontend but is not being made via AJAX
+	 */
+	const FRONTEND = 'non-ajax-frontend-request';
+
+	/**
+	 * indicates that the current request is for content that is to be displayed within an iframe
+	 */
+	const IFRAME = 'iframe-request';
+
+	/**
+	 * indicates that the current request is for the EE GraphQL manager
+	 */
+	const GQL = 'graphql';
+
+	/**
+	 * indicates that the current request is for the WP REST API
+	 */
+	const WP_API = 'wp-rest-api';
+
+	/**
+	 * indicates that the current request is a loopback sent from WP core to test for errors
+	 */
+	const WP_SCRAPE = 'wordpress-scrape';
+
+	/**
+	 * @var boolean $is_activation
+	 */
+	private bool $is_activation = false;
+
+	/**
+	 * @var boolean $is_unit_testing
+	 */
+	private bool $is_unit_testing = false;
+
+	/**
+	 * @var array $valid_request_types
+	 */
+	private array $valid_request_types = array();
+
+
+	/**
+	 * RequestTypeContext constructor.
+	 *
+	 * @param string $slug
+	 * @param string $description
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct($slug, $description)
+	{
+		parent::__construct($slug, $description);
+		if (! in_array($this->slug(), $this->validRequestTypes(), true)) {
+			throw new InvalidArgumentException(
+				sprintf(
+					esc_html__(
+						'The RequestTypeContext slug must be one of the following values: %1$s %2$s',
+						'event_espresso'
+					),
+					'<br />',
+					var_export($this->validRequestTypes(), true)
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function validRequestTypes(): array
+	{
+		if (empty($this->valid_request_types)) {
+			$this->valid_request_types = apply_filters(
+				'FHEE__EventEspresso_core_domain_entities_contexts_RequestTypeContext__validRequestTypes',
+				array(
+					RequestTypeContext::ACTIVATION,
+					RequestTypeContext::ADMIN,
+					RequestTypeContext::AJAX_ADMIN,
+					RequestTypeContext::AJAX_FRONT,
+					RequestTypeContext::AJAX_HEARTBEAT,
+					RequestTypeContext::AJAX_OTHER,
+					RequestTypeContext::API,
+					RequestTypeContext::CLI,
+					RequestTypeContext::CRON,
+					RequestTypeContext::FEED,
+					RequestTypeContext::FRONTEND,
+					RequestTypeContext::GQL,
+					RequestTypeContext::IFRAME,
+					RequestTypeContext::WP_API,
+					RequestTypeContext::WP_SCRAPE,
+				)
+			);
+		}
+		return $this->valid_request_types;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isActivation(): bool
+	{
+		return $this->is_activation;
+	}
+
+
+	/**
+	 * @param bool $is_activation
+	 */
+	public function setIsActivation(bool $is_activation = false)
+	{
+		$this->is_activation = filter_var($is_activation, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isUnitTesting(): bool
+	{
+		return $this->is_unit_testing;
+	}
+
+
+	/**
+	 * @param bool $is_unit_testing
+	 */
+	public function setIsUnitTesting(bool $is_unit_testing = false)
+	{
+		$this->is_unit_testing = filter_var($is_unit_testing, FILTER_VALIDATE_BOOLEAN);
+	}
 }

core/domain/entities/routing/handlers/admin/AdminRoute.php

Indentation +93 added lines, -93 removed lines

@@ -27,97 +27,97 @@
  */
 class AdminRoute extends Route
 {
-    protected EE_Admin_Config $admin_config;
-
-    /**
-     * @var array $default_dependencies
-     */
-    protected static $default_dependencies = [
-        'EE_Admin_Config'                             => EE_Dependency_Map::load_from_cache,
-        '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,
-    ];
-
-
-    /**
-     * Route constructor.
-     *
-     * @param EE_Admin_Config                       $admin_config
-     * @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_Admin_Config $admin_config,
-        EE_Dependency_Map $dependency_map,
-        LoaderInterface $loader,
-        RequestInterface $request,
-        JsonDataNode $data_node = null,
-        RouteMatchSpecificationInterface $specification = null
-    ) {
-        $this->admin_config = $admin_config;
-        parent::__construct($dependency_map, $loader, $request, $data_node, $specification);
-    }
-
-
-    /**
-     * @return CapCheckInterface
-     */
-    public function getCapCheck()
-    {
-        return new CapCheck('ee_read_events', 'access Event Espresso admin route');
-    }
-
-
-    /**
-     * @return array
-     */
-    public static function getDefaultDependencies(): array
-    {
-        return self::$default_dependencies;
-    }
-
-
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     */
-    public function matchesCurrentRequest(): bool
-    {
-        return $this->request->isAdmin() || $this->request->isAdminAjax() || $this->request->isActivation();
-    }
-
-
-    /**
-     * @return void
-     */
-    protected function registerDependencies()
-    {
-    }
-
-
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     */
-    protected function requestHandler(): bool
-    {
-        // don't handle request more than once!!!
-        if (did_action('AHEE__EE_System__load_controllers__load_admin_controllers')) {
-            return true;
-        }
-        do_action('AHEE__EE_System__load_controllers__load_admin_controllers');
-        $this->loader->getShared('EE_Admin');
-        do_action(
-            'AHEE__EventEspresso_core_domain_entities_routing_handlers_admin_AdminRoute__requestHandler__admin_loaded'
-        );
-
-        AdminFontSize::setAdminFontSizeBodyClass();
-        return true;
-    }
+	protected EE_Admin_Config $admin_config;
+
+	/**
+	 * @var array $default_dependencies
+	 */
+	protected static $default_dependencies = [
+		'EE_Admin_Config'                             => EE_Dependency_Map::load_from_cache,
+		'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,
+	];
+
+
+	/**
+	 * Route constructor.
+	 *
+	 * @param EE_Admin_Config                       $admin_config
+	 * @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_Admin_Config $admin_config,
+		EE_Dependency_Map $dependency_map,
+		LoaderInterface $loader,
+		RequestInterface $request,
+		JsonDataNode $data_node = null,
+		RouteMatchSpecificationInterface $specification = null
+	) {
+		$this->admin_config = $admin_config;
+		parent::__construct($dependency_map, $loader, $request, $data_node, $specification);
+	}
+
+
+	/**
+	 * @return CapCheckInterface
+	 */
+	public function getCapCheck()
+	{
+		return new CapCheck('ee_read_events', 'access Event Espresso admin route');
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public static function getDefaultDependencies(): array
+	{
+		return self::$default_dependencies;
+	}
+
+
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 */
+	public function matchesCurrentRequest(): bool
+	{
+		return $this->request->isAdmin() || $this->request->isAdminAjax() || $this->request->isActivation();
+	}
+
+
+	/**
+	 * @return void
+	 */
+	protected function registerDependencies()
+	{
+	}
+
+
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 */
+	protected function requestHandler(): bool
+	{
+		// don't handle request more than once!!!
+		if (did_action('AHEE__EE_System__load_controllers__load_admin_controllers')) {
+			return true;
+		}
+		do_action('AHEE__EE_System__load_controllers__load_admin_controllers');
+		$this->loader->getShared('EE_Admin');
+		do_action(
+			'AHEE__EventEspresso_core_domain_entities_routing_handlers_admin_AdminRoute__requestHandler__admin_loaded'
+		);
+
+		AdminFontSize::setAdminFontSizeBodyClass();
+		return true;
+	}
 }

core/domain/entities/routing/handlers/shared/GQLRequests.php

Indentation +215 added lines, -215 removed lines

@@ -19,227 +19,227 @@
  */
 class GQLRequests extends Route
 {
-    /**
-     * @var AssetManifestFactory
-     */
-    private $manifest_factory;
+	/**
+	 * @var AssetManifestFactory
+	 */
+	private $manifest_factory;
 
 
-    /**
-     * AssetRequests constructor.
-     *
-     * @param EE_Dependency_Map    $dependency_map
-     * @param LoaderInterface      $loader
-     * @param RequestInterface     $request
-     * @param AssetManifestFactory $manifest_factory
-     */
-    public function __construct(
-        EE_Dependency_Map $dependency_map,
-        LoaderInterface $loader,
-        RequestInterface $request,
-        AssetManifestFactory $manifest_factory
-    ) {
-        $this->manifest_factory = $manifest_factory;
-        parent::__construct($dependency_map, $loader, $request);
-    }
+	/**
+	 * AssetRequests constructor.
+	 *
+	 * @param EE_Dependency_Map    $dependency_map
+	 * @param LoaderInterface      $loader
+	 * @param RequestInterface     $request
+	 * @param AssetManifestFactory $manifest_factory
+	 */
+	public function __construct(
+		EE_Dependency_Map $dependency_map,
+		LoaderInterface $loader,
+		RequestInterface $request,
+		AssetManifestFactory $manifest_factory
+	) {
+		$this->manifest_factory = $manifest_factory;
+		parent::__construct($dependency_map, $loader, $request);
+	}
 
 
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   5.0.0.p
-     */
-    public function matchesCurrentRequest(): bool
-    {
-        global $pagenow;
-        return (
-                   $this->request->isGQL()
-                   || $this->request->isUnitTesting()
-                   || (
-                       $this->request->isAdmin()
-                       && $this->request->getRequestParam('page') === 'espresso_events'
-                       && (
-                           $this->request->getRequestParam('action') === 'create_new'
-                           || $this->request->getRequestParam('action') === 'edit'
-                       )
-                   ) || (
-                       $pagenow
-                       && (
-                           $pagenow === 'post-new.php'
-                           || (
-                               $pagenow === 'post.php'
-                               && $this->request->getRequestParam('action') === 'edit'
-                           )
-                       )
-                   )
-               );
-    }
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   5.0.0.p
+	 */
+	public function matchesCurrentRequest(): bool
+	{
+		global $pagenow;
+		return (
+				   $this->request->isGQL()
+				   || $this->request->isUnitTesting()
+				   || (
+					   $this->request->isAdmin()
+					   && $this->request->getRequestParam('page') === 'espresso_events'
+					   && (
+						   $this->request->getRequestParam('action') === 'create_new'
+						   || $this->request->getRequestParam('action') === 'edit'
+					   )
+				   ) || (
+					   $pagenow
+					   && (
+						   $pagenow === 'post-new.php'
+						   || (
+							   $pagenow === 'post.php'
+							   && $this->request->getRequestParam('action') === 'edit'
+						   )
+					   )
+				   )
+			   );
+	}
 
 
-    /**
-     * @since 5.0.0.p
-     */
-    protected function registerDependencies()
-    {
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\GraphQLManager',
-            [
-                'EventEspresso\core\services\graphql\ConnectionsManager' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\graphql\DataLoaderManager'  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\graphql\EnumsManager'       => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\graphql\InputsManager'      => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\graphql\TypesManager'       => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\TypesManager',
-            [
-                'EventEspresso\core\services\graphql\types\TypeCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\InputsManager',
-            [
-                'EventEspresso\core\services\graphql\inputs\InputCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\EnumsManager',
-            [
-                'EventEspresso\core\services\graphql\enums\EnumCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\ConnectionsManager',
-            [
-                'EventEspresso\core\services\graphql\connections\ConnectionCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\DataLoaderManager',
-            [
-                'EventEspresso\core\services\graphql\loaders\DataLoaderCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Datetime',
-            ['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Attendee',
-            ['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Event',
-            ['EEM_Event' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\FormElement',
-            ['EEM_Form_Element' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\FormSection',
-            ['EEM_Form_Section' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Ticket',
-            ['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Price',
-            ['EEM_Price' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\PriceType',
-            ['EEM_Price_Type' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Venue',
-            ['EEM_Venue' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\State',
-            ['EEM_State' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Country',
-            ['EEM_Country' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\EventDatetimesConnection',
-            ['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryDatetimesConnection',
-            ['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryAttendeesConnection',
-            ['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryCountriesConnection',
-            ['EEM_Country' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryFormElementsConnection',
-            ['EEM_Form_Element' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryFormSectionsConnection',
-            ['EEM_Form_Section' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryStatesConnection',
-            ['EEM_State' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\DatetimeTicketsConnection',
-            ['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryTicketsConnection',
-            ['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\TicketPricesConnection',
-            ['EEM_Price' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryPricesConnection',
-            ['EEM_Price' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryPriceTypesConnection',
-            ['EEM_Price_Type' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\TicketDatetimesConnection',
-            ['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\EventVenuesConnection',
-            ['EEM_Venue' => EE_Dependency_Map::load_from_cache]
-        );
-    }
+	/**
+	 * @since 5.0.0.p
+	 */
+	protected function registerDependencies()
+	{
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\GraphQLManager',
+			[
+				'EventEspresso\core\services\graphql\ConnectionsManager' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\graphql\DataLoaderManager'  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\graphql\EnumsManager'       => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\graphql\InputsManager'      => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\graphql\TypesManager'       => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\TypesManager',
+			[
+				'EventEspresso\core\services\graphql\types\TypeCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\InputsManager',
+			[
+				'EventEspresso\core\services\graphql\inputs\InputCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\EnumsManager',
+			[
+				'EventEspresso\core\services\graphql\enums\EnumCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\ConnectionsManager',
+			[
+				'EventEspresso\core\services\graphql\connections\ConnectionCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\DataLoaderManager',
+			[
+				'EventEspresso\core\services\graphql\loaders\DataLoaderCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Datetime',
+			['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Attendee',
+			['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Event',
+			['EEM_Event' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\FormElement',
+			['EEM_Form_Element' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\FormSection',
+			['EEM_Form_Section' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Ticket',
+			['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Price',
+			['EEM_Price' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\PriceType',
+			['EEM_Price_Type' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Venue',
+			['EEM_Venue' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\State',
+			['EEM_State' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Country',
+			['EEM_Country' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\EventDatetimesConnection',
+			['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryDatetimesConnection',
+			['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryAttendeesConnection',
+			['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryCountriesConnection',
+			['EEM_Country' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryFormElementsConnection',
+			['EEM_Form_Element' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryFormSectionsConnection',
+			['EEM_Form_Section' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryStatesConnection',
+			['EEM_State' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\DatetimeTicketsConnection',
+			['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryTicketsConnection',
+			['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\TicketPricesConnection',
+			['EEM_Price' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryPricesConnection',
+			['EEM_Price' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryPriceTypesConnection',
+			['EEM_Price_Type' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\TicketDatetimesConnection',
+			['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\EventVenuesConnection',
+			['EEM_Venue' => EE_Dependency_Map::load_from_cache]
+		);
+	}
 
 
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   5.0.0.p
-     */
-    protected function requestHandler(): bool
-    {
-        // load handler for EE GraphQL requests
-        $graphQL_manager = $this->loader->getShared(
-            'EventEspresso\core\services\graphql\GraphQLManager'
-        );
-        $graphQL_manager->init();
-        $manifest = $this->manifest_factory->createFromDomainObject(DomainFactory::getEventEspressoCoreDomain());
-        $manifest->initialize();
-        return true;
-    }
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   5.0.0.p
+	 */
+	protected function requestHandler(): bool
+	{
+		// load handler for EE GraphQL requests
+		$graphQL_manager = $this->loader->getShared(
+			'EventEspresso\core\services\graphql\GraphQLManager'
+		);
+		$graphQL_manager->init();
+		$manifest = $this->manifest_factory->createFromDomainObject(DomainFactory::getEventEspressoCoreDomain());
+		$manifest->initialize();
+		return true;
+	}
 }

core/domain/entities/routing/handlers/shared/SessionRequests.php

Indentation +46 added lines, -46 removed lines

@@ -15,54 +15,54 @@
  */
 class SessionRequests extends Route
 {
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   5.0.0.p
-     */
-    public function matchesCurrentRequest(): bool
-    {
-        return $this->request->isAdmin()
-               || $this->request->isEeAjax()
-               || $this->request->isFrontend()
-               || $this->request->isIframe()
-               || $this->request->isApi()
-               || $this->request->isWordPressApi();
-    }
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   5.0.0.p
+	 */
+	public function matchesCurrentRequest(): bool
+	{
+		return $this->request->isAdmin()
+			   || $this->request->isEeAjax()
+			   || $this->request->isFrontend()
+			   || $this->request->isIframe()
+			   || $this->request->isApi()
+			   || $this->request->isWordPressApi();
+	}
 
 
-    /**
-     * @since 5.0.0.p
-     */
-    protected function registerDependencies()
-    {
-        $this->dependency_map->registerDependencies(
-            'EE_Session',
-            [
-                'EventEspresso\core\services\cache\TransientCacheStorage'  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\values\session\SessionLifespan' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request'              => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\session\SessionStartHandler'  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\encryption\Base64Encoder'     => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\session\SessionStartHandler',
-            ['EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache]
-        );
-    }
+	/**
+	 * @since 5.0.0.p
+	 */
+	protected function registerDependencies()
+	{
+		$this->dependency_map->registerDependencies(
+			'EE_Session',
+			[
+				'EventEspresso\core\services\cache\TransientCacheStorage'  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\values\session\SessionLifespan' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request'              => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\session\SessionStartHandler'  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\encryption\Base64Encoder'     => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\session\SessionStartHandler',
+			['EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache]
+		);
+	}
 
 
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   5.0.0.p
-     */
-    protected function requestHandler(): bool
-    {
-        $this->loader->getShared('EE_Session');
-        return true;
-    }
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   5.0.0.p
+	 */
+	protected function requestHandler(): bool
+	{
+		$this->loader->getShared('EE_Session');
+		return true;
+	}
 }

core/domain/entities/DbSafeDateTime.php

Indentation +191 added lines, -191 removed lines

@@ -19,195 +19,195 @@
  */
 class DbSafeDateTime extends DateTime
 {
-    // phpcs:disable Generic.NamingConventions.UpperCaseConstantName.ClassConstantNotUpperCase
-    /**
-     * @type string db_safe_timestamp_format
-     */
-    const db_safe_timestamp_format = 'Y-m-d H:i:s O e';
-
-    // phpcs:enable
-
-    // phpcs:disable PSR2.Classes.PropertyDeclaration.Underscore
-    /**
-     * DateTime object converted to a string that includes the date, time, UTC offset, and timezone identifier
-     *
-     * @type string $_datetime_string
-     */
-    protected $_datetime_string = '';
-
-    /**
-     * where to write the error log to
-     *
-     * @type string $_error_log_dir
-     */
-    protected $_error_log_dir = '';
-
-    // phpcs:enable
-
-
-    /**
-     * @param string $error_log_dir
-     */
-    public function setErrorLogDir(string $error_log_dir): void
-    {
-        // if the folder path is writable, then except the path + filename, else keep empty
-        $this->_error_log_dir = is_writable(str_replace(basename($error_log_dir), '', $error_log_dir))
-            ? $error_log_dir
-            : '';
-    }
-
-
-    /**
-     * @return string
-     */
-    public function __toString(): string
-    {
-        return $this->format(DbSafeDateTime::db_safe_timestamp_format);
-    }
-
-
-    /**
-     * @return array
-     */
-    public function __sleep(): array
-    {
-        $this->_datetime_string = $this->format(DbSafeDateTime::db_safe_timestamp_format);
-        $date                   = DateTime::createFromFormat(
-            DbSafeDateTime::db_safe_timestamp_format,
-            $this->_datetime_string
-        );
-        if (! $date instanceof DateTime) {
-            try {
-                // we want a stack trace to determine where the malformed date came from, so...
-                throw new DomainException('');
-            } catch (DomainException $e) {
-                $stack_trace = $e->getTraceAsString();
-            }
-            $this->writeToErrorLog(
-                sprintf(
-                    esc_html__(
-                        'A valid DateTime could not be generated from "%1$s" because the following errors occurred: %2$s %3$s %2$s PHP version: %4$s %2$s Stack Trace: %5$s',
-                        'event_espresso'
-                    ),
-                    $this->_datetime_string,
-                    '<br />',
-                    print_r(DateTime::getLastErrors(), true),
-                    PHP_VERSION,
-                    $stack_trace
-                )
-            );
-        }
-        return ['_datetime_string'];
-    }
-
-
-    /**
-     * if an empty or null value got saved to the db for a datetime,
-     * then some servers and/or PHP itself will incorrectly convert that date string
-     * resulting in "-0001-11-30" for the year-month-day.
-     * see the Notes section
-     *
-     * @link http://php.net/manual/en/datetime.formats.date.php
-     * We'll replace those with "0000-00-00" which will allow a valid DateTime object to be created,
-     * but still result in the internal date for that object being set to "-0001-11-30 10:00:00.000000".
-     * so we're no better off, but at least things won't go fatal on us.
-     * @throws Exception
-     */
-    public function __wakeup(): void
-    {
-        $date = self::createFromFormat(
-            DbSafeDateTime::db_safe_timestamp_format,
-            $this->_datetime_string
-        );
-        if (! $date instanceof DateTime) {
-            $this->writeToErrorLog(
-                sprintf(
-                    esc_html__(
-                        'A valid DateTime could not be recreated from "%1$s" because the following errors occurred: %2$s %3$s %2$s PHP version: %4$s',
-                        'event_espresso'
-                    ),
-                    $this->_datetime_string,
-                    '<br />',
-                    print_r(DateTime::getLastErrors(), true),
-                    PHP_VERSION
-                )
-            );
-        } else {
-            $this->__construct(
-                $date->format(EE_Datetime_Field::mysql_timestamp_format),
-                new DateTimeZone($date->format('e'))
-            );
-        }
-    }
-
-
-    /**
-     * Normalizes incoming date string so that it is a bit more stable for use.
-     *
-     * @param string $date_string
-     * @return string
-     */
-    public static function normalizeInvalidDate(string $date_string): string
-    {
-        return str_replace(
-            ['-0001-11-29', '-0001-11-30', '0000-00-00'],
-            '0000-01-03',
-            $date_string
-        );
-    }
-
-
-    /**
-     * Creates a DbSafeDateTime from ye old DateTime
-     *
-     * @param DateTime $datetime
-     * @return DbSafeDateTime
-     * @throws Exception
-     */
-    public static function createFromDateTime(DateTime $datetime): DbSafeDateTime
-    {
-        return new DbSafeDateTime(
-            $datetime->format(EE_Datetime_Field::mysql_timestamp_format),
-            new DateTimeZone($datetime->format('e'))
-        );
-    }
-
-
-    /**
-     * Parse a string into a new DateTime object according to the specified format
-     *
-     * @param string            $format   Format accepted by date().
-     * @param string            $time     String representing the time.
-     * @param DateTimeZone|null $timezone A DateTimeZone object representing the desired time zone.
-     * @return DbSafeDateTime|boolean
-     * @throws Exception
-     * @link https://php.net/manual/en/datetime.createfromformat.php
-     */
-    #[\ReturnTypeWillChange]
-    public static function createFromFormat($format, $time, ?DateTimeZone $timezone = null)
-    {
-        $time = self::normalizeInvalidDate($time);
-        // Various php versions handle the third argument differently.  This conditional accounts for that.
-        $DateTime = $timezone instanceof DateTimeZone
-            ? parent::createFromFormat($format, $time, $timezone)
-            : parent::createFromFormat($format, $time);
-        return $DateTime instanceof DateTime
-            ? self::createFromDateTime($DateTime)
-            : $DateTime;
-    }
-
-
-    /**
-     * @param string $message
-     */
-    private function writeToErrorLog(string $message)
-    {
-        if (! empty($this->_error_log_dir)) {
-            /** @noinspection ForgottenDebugOutputInspection */
-            error_log($message, 3, $this->_error_log_dir);
-        } else {
-            /** @noinspection ForgottenDebugOutputInspection */
-            error_log($message);
-        }
-    }
+	// phpcs:disable Generic.NamingConventions.UpperCaseConstantName.ClassConstantNotUpperCase
+	/**
+	 * @type string db_safe_timestamp_format
+	 */
+	const db_safe_timestamp_format = 'Y-m-d H:i:s O e';
+
+	// phpcs:enable
+
+	// phpcs:disable PSR2.Classes.PropertyDeclaration.Underscore
+	/**
+	 * DateTime object converted to a string that includes the date, time, UTC offset, and timezone identifier
+	 *
+	 * @type string $_datetime_string
+	 */
+	protected $_datetime_string = '';
+
+	/**
+	 * where to write the error log to
+	 *
+	 * @type string $_error_log_dir
+	 */
+	protected $_error_log_dir = '';
+
+	// phpcs:enable
+
+
+	/**
+	 * @param string $error_log_dir
+	 */
+	public function setErrorLogDir(string $error_log_dir): void
+	{
+		// if the folder path is writable, then except the path + filename, else keep empty
+		$this->_error_log_dir = is_writable(str_replace(basename($error_log_dir), '', $error_log_dir))
+			? $error_log_dir
+			: '';
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function __toString(): string
+	{
+		return $this->format(DbSafeDateTime::db_safe_timestamp_format);
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function __sleep(): array
+	{
+		$this->_datetime_string = $this->format(DbSafeDateTime::db_safe_timestamp_format);
+		$date                   = DateTime::createFromFormat(
+			DbSafeDateTime::db_safe_timestamp_format,
+			$this->_datetime_string
+		);
+		if (! $date instanceof DateTime) {
+			try {
+				// we want a stack trace to determine where the malformed date came from, so...
+				throw new DomainException('');
+			} catch (DomainException $e) {
+				$stack_trace = $e->getTraceAsString();
+			}
+			$this->writeToErrorLog(
+				sprintf(
+					esc_html__(
+						'A valid DateTime could not be generated from "%1$s" because the following errors occurred: %2$s %3$s %2$s PHP version: %4$s %2$s Stack Trace: %5$s',
+						'event_espresso'
+					),
+					$this->_datetime_string,
+					'<br />',
+					print_r(DateTime::getLastErrors(), true),
+					PHP_VERSION,
+					$stack_trace
+				)
+			);
+		}
+		return ['_datetime_string'];
+	}
+
+
+	/**
+	 * if an empty or null value got saved to the db for a datetime,
+	 * then some servers and/or PHP itself will incorrectly convert that date string
+	 * resulting in "-0001-11-30" for the year-month-day.
+	 * see the Notes section
+	 *
+	 * @link http://php.net/manual/en/datetime.formats.date.php
+	 * We'll replace those with "0000-00-00" which will allow a valid DateTime object to be created,
+	 * but still result in the internal date for that object being set to "-0001-11-30 10:00:00.000000".
+	 * so we're no better off, but at least things won't go fatal on us.
+	 * @throws Exception
+	 */
+	public function __wakeup(): void
+	{
+		$date = self::createFromFormat(
+			DbSafeDateTime::db_safe_timestamp_format,
+			$this->_datetime_string
+		);
+		if (! $date instanceof DateTime) {
+			$this->writeToErrorLog(
+				sprintf(
+					esc_html__(
+						'A valid DateTime could not be recreated from "%1$s" because the following errors occurred: %2$s %3$s %2$s PHP version: %4$s',
+						'event_espresso'
+					),
+					$this->_datetime_string,
+					'<br />',
+					print_r(DateTime::getLastErrors(), true),
+					PHP_VERSION
+				)
+			);
+		} else {
+			$this->__construct(
+				$date->format(EE_Datetime_Field::mysql_timestamp_format),
+				new DateTimeZone($date->format('e'))
+			);
+		}
+	}
+
+
+	/**
+	 * Normalizes incoming date string so that it is a bit more stable for use.
+	 *
+	 * @param string $date_string
+	 * @return string
+	 */
+	public static function normalizeInvalidDate(string $date_string): string
+	{
+		return str_replace(
+			['-0001-11-29', '-0001-11-30', '0000-00-00'],
+			'0000-01-03',
+			$date_string
+		);
+	}
+
+
+	/**
+	 * Creates a DbSafeDateTime from ye old DateTime
+	 *
+	 * @param DateTime $datetime
+	 * @return DbSafeDateTime
+	 * @throws Exception
+	 */
+	public static function createFromDateTime(DateTime $datetime): DbSafeDateTime
+	{
+		return new DbSafeDateTime(
+			$datetime->format(EE_Datetime_Field::mysql_timestamp_format),
+			new DateTimeZone($datetime->format('e'))
+		);
+	}
+
+
+	/**
+	 * Parse a string into a new DateTime object according to the specified format
+	 *
+	 * @param string            $format   Format accepted by date().
+	 * @param string            $time     String representing the time.
+	 * @param DateTimeZone|null $timezone A DateTimeZone object representing the desired time zone.
+	 * @return DbSafeDateTime|boolean
+	 * @throws Exception
+	 * @link https://php.net/manual/en/datetime.createfromformat.php
+	 */
+	#[\ReturnTypeWillChange]
+	public static function createFromFormat($format, $time, ?DateTimeZone $timezone = null)
+	{
+		$time = self::normalizeInvalidDate($time);
+		// Various php versions handle the third argument differently.  This conditional accounts for that.
+		$DateTime = $timezone instanceof DateTimeZone
+			? parent::createFromFormat($format, $time, $timezone)
+			: parent::createFromFormat($format, $time);
+		return $DateTime instanceof DateTime
+			? self::createFromDateTime($DateTime)
+			: $DateTime;
+	}
+
+
+	/**
+	 * @param string $message
+	 */
+	private function writeToErrorLog(string $message)
+	{
+		if (! empty($this->_error_log_dir)) {
+			/** @noinspection ForgottenDebugOutputInspection */
+			error_log($message, 3, $this->_error_log_dir);
+		} else {
+			/** @noinspection ForgottenDebugOutputInspection */
+			error_log($message);
+		}
+	}
 }

core/domain/entities/users/CurrentUser.php

Indentation +71 added lines, -71 removed lines

@@ -13,75 +13,75 @@
  */
 class CurrentUser
 {
-    private EventManagers $event_managers;
-
-    private ?WP_User      $current_user     = null;
-
-    private bool          $is_event_manager = false;
-
-    private bool          $is_logged_in     = false;
-
-    private bool          $is_super_admin   = false;
-
-
-    /**
-     * CurrentUser constructor.
-     *
-     * @param EventManagers $event_managers
-     */
-    public function __construct(EventManagers $event_managers)
-    {
-        $this->event_managers = $event_managers;
-        $this->setCurrentUser();
-    }
-
-
-    public function setCurrentUser(): void
-    {
-        if (! $this->current_user instanceof WP_User) {
-            $this->current_user     = wp_get_current_user();
-            $event_manager_roles    = array_keys($this->event_managers->roles());
-            $current_user_roles     = $this->current_user->roles;
-            $this->is_event_manager = ! empty(array_intersect($event_manager_roles, $current_user_roles));
-            $this->is_super_admin   = is_super_admin($this->current_user->ID);
-            $this->is_logged_in     = $this->current_user->exists();
-        }
-    }
-
-
-    /**
-     * @return WP_User
-     */
-    public function currentUser(): ?WP_User
-    {
-        return $this->current_user;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isEventManager(): bool
-    {
-        return $this->is_event_manager;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isLoggedIn(): bool
-    {
-        return $this->is_logged_in;
-    }
-
-
-    /**
-     * @return bool
-     * @since 5.0.8.p
-     */
-    public function isSuperAdmin(): bool
-    {
-        return $this->is_super_admin;
-    }
+	private EventManagers $event_managers;
+
+	private ?WP_User      $current_user     = null;
+
+	private bool          $is_event_manager = false;
+
+	private bool          $is_logged_in     = false;
+
+	private bool          $is_super_admin   = false;
+
+
+	/**
+	 * CurrentUser constructor.
+	 *
+	 * @param EventManagers $event_managers
+	 */
+	public function __construct(EventManagers $event_managers)
+	{
+		$this->event_managers = $event_managers;
+		$this->setCurrentUser();
+	}
+
+
+	public function setCurrentUser(): void
+	{
+		if (! $this->current_user instanceof WP_User) {
+			$this->current_user     = wp_get_current_user();
+			$event_manager_roles    = array_keys($this->event_managers->roles());
+			$current_user_roles     = $this->current_user->roles;
+			$this->is_event_manager = ! empty(array_intersect($event_manager_roles, $current_user_roles));
+			$this->is_super_admin   = is_super_admin($this->current_user->ID);
+			$this->is_logged_in     = $this->current_user->exists();
+		}
+	}
+
+
+	/**
+	 * @return WP_User
+	 */
+	public function currentUser(): ?WP_User
+	{
+		return $this->current_user;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isEventManager(): bool
+	{
+		return $this->is_event_manager;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isLoggedIn(): bool
+	{
+		return $this->is_logged_in;
+	}
+
+
+	/**
+	 * @return bool
+	 * @since 5.0.8.p
+	 */
+	public function isSuperAdmin(): bool
+	{
+		return $this->is_super_admin;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 
     public function setCurrentUser(): void
     {
-        if (! $this->current_user instanceof WP_User) {
+        if ( ! $this->current_user instanceof WP_User) {
             $this->current_user     = wp_get_current_user();
             $event_manager_roles    = array_keys($this->event_managers->roles());
             $current_user_roles     = $this->current_user->roles;