eventespresso / event-espresso-core

core/domain/services/contexts/RequestTypeContextFactoryInterface.php

Indentation +5 added lines, -5 removed lines

@@ -14,9 +14,9 @@
  */
 interface RequestTypeContextFactoryInterface
 {
-    /**
-     * @param string $slug
-     * @return RequestTypeContext
-     */
-    public function create(string $slug): RequestTypeContext;
+	/**
+	 * @param string $slug
+	 * @return RequestTypeContext
+	 */
+	public function create(string $slug): RequestTypeContext;
 }

core/domain/services/contexts/RequestTypeContextFactory.php

Indentation +72 added lines, -72 removed lines

@@ -16,80 +16,80 @@
  */
 class RequestTypeContextFactory implements RequestTypeContextFactoryInterface
 {
-    private LoaderInterface $loader;
+	private LoaderInterface $loader;
 
 
-    /**
-     * RequestTypeContextFactory constructor.
-     *
-     * @param LoaderInterface $loader
-     */
-    public function __construct(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
+	/**
+	 * RequestTypeContextFactory constructor.
+	 *
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+	}
 
 
-    /**
-     * @param string $slug
-     * @return RequestTypeContext
-     */
-    public function create(string $slug): RequestTypeContext
-    {
-        switch ($slug) {
-            case RequestTypeContext::ACTIVATION:
-                $description = 'The current request is for some form of activation';
-                break;
-            case RequestTypeContext::API:
-                $description = 'The current request is for the EE REST API';
-                break;
-            case RequestTypeContext::AJAX_FRONT:
-                $description = 'The current request is for the frontend via AJAX';
-                break;
-            case RequestTypeContext::AJAX_ADMIN:
-                $description = 'The current request is for the admin via AJAX';
-                break;
-            case RequestTypeContext::AJAX_HEARTBEAT:
-                $description = 'The current request is for the WP Heartbeat';
-                break;
-            case RequestTypeContext::AJAX_OTHER:
-                $description = 'The current request is for non-EE related code via AJAX';
-                break;
-            case RequestTypeContext::CRON:
-                $description = 'The current request is for a WP_Cron';
-                break;
-            case RequestTypeContext::CLI:
-                $description = 'The current request is from the command line';
-                break;
-            case RequestTypeContext::ADMIN:
-                $description = 'The current request is for the admin';
-                break;
-            case RequestTypeContext::IFRAME:
-                $description = 'The current request is for an iframe';
-                break;
-            case RequestTypeContext::FEED:
-                $description = 'The current request is for a feed (ie: RSS)';
-                break;
-            case RequestTypeContext::GQL:
-                $description = 'The current request is for the EE GraphQL Manager';
-                break;
-            case RequestTypeContext::WP_API:
-                $description = 'The current request is for the WordPress REST API';
-                break;
-            case RequestTypeContext::WP_SCRAPE:
-                $description = 'The current request is for a WordPress loopback scrape';
-                break;
-            case RequestTypeContext::FRONTEND:
-            default:
-                $description = 'The current request is for the frontend';
-                break;
-        }
-        // we're using the Loader with sharing turned on,
-        // so that the generated RequestTypeContext object is accessible anywhere
-        // by simply requesting it again from the loader
-        return $this->loader->getShared(
-            'EventEspresso\core\domain\entities\contexts\RequestTypeContext',
-            array($slug, $description)
-        );
-    }
+	/**
+	 * @param string $slug
+	 * @return RequestTypeContext
+	 */
+	public function create(string $slug): RequestTypeContext
+	{
+		switch ($slug) {
+			case RequestTypeContext::ACTIVATION:
+				$description = 'The current request is for some form of activation';
+				break;
+			case RequestTypeContext::API:
+				$description = 'The current request is for the EE REST API';
+				break;
+			case RequestTypeContext::AJAX_FRONT:
+				$description = 'The current request is for the frontend via AJAX';
+				break;
+			case RequestTypeContext::AJAX_ADMIN:
+				$description = 'The current request is for the admin via AJAX';
+				break;
+			case RequestTypeContext::AJAX_HEARTBEAT:
+				$description = 'The current request is for the WP Heartbeat';
+				break;
+			case RequestTypeContext::AJAX_OTHER:
+				$description = 'The current request is for non-EE related code via AJAX';
+				break;
+			case RequestTypeContext::CRON:
+				$description = 'The current request is for a WP_Cron';
+				break;
+			case RequestTypeContext::CLI:
+				$description = 'The current request is from the command line';
+				break;
+			case RequestTypeContext::ADMIN:
+				$description = 'The current request is for the admin';
+				break;
+			case RequestTypeContext::IFRAME:
+				$description = 'The current request is for an iframe';
+				break;
+			case RequestTypeContext::FEED:
+				$description = 'The current request is for a feed (ie: RSS)';
+				break;
+			case RequestTypeContext::GQL:
+				$description = 'The current request is for the EE GraphQL Manager';
+				break;
+			case RequestTypeContext::WP_API:
+				$description = 'The current request is for the WordPress REST API';
+				break;
+			case RequestTypeContext::WP_SCRAPE:
+				$description = 'The current request is for a WordPress loopback scrape';
+				break;
+			case RequestTypeContext::FRONTEND:
+			default:
+				$description = 'The current request is for the frontend';
+				break;
+		}
+		// we're using the Loader with sharing turned on,
+		// so that the generated RequestTypeContext object is accessible anywhere
+		// by simply requesting it again from the loader
+		return $this->loader->getShared(
+			'EventEspresso\core\domain\entities\contexts\RequestTypeContext',
+			array($slug, $description)
+		);
+	}
 }

core/domain/deprecated/EE_Load_Textdomain.core.php

Indentation +151 added lines, -151 removed lines

@@ -16,156 +16,156 @@
  */
 class EE_Load_Textdomain extends EE_Base
 {
-    private const REPO_BASE_URL    = 'https://github.com/eventespresso/languages-ee4/raw/refs/heads/master/event_espresso';
-
-    private const FILE_NAME_PREFIX = 'event_espresso-';
-
-
-    /**
-     * holds the current lang in WP
-     *
-     * @var string
-     */
-    public static string $locale = '';
-
-
-    /**
-     * this takes care of retrieving a matching textdomain for event espresso for the current WPLANG from EE GitHub
-     * repo (if necessary) and then loading it for translations. should only be called in wp plugins_loaded callback
-     *
-     * @return void
-     * @depecated 5.0.42
-     */
-    public static function loadTextdomain()
-    {
-        EE_Load_Textdomain::$locale = get_locale();
-        if (empty(EE_Load_Textdomain::$locale)) {
-            // can't download a language file if a language isn't set <taps temple>
-            return;
-        }
-        // hook into init to load the textdomain
-        add_action('init', [EE_Load_Textdomain::class, 'loadTranslationsForLocale'], 9);
-        add_action('init', [EE_Load_Textdomain::class, 'loadPluginTextdomain']);
-    }
-
-
-    /**
-     * @return void
-     * @depecated 5.0.42
-     */
-    public static function loadPluginTextdomain()
-    {
-        $locale_mo      = EE_Load_Textdomain::$locale . '.mo';
-        $github_mo_path = EE_LANGUAGES_SAFE_DIR . EE_Load_Textdomain::FILE_NAME_PREFIX . $locale_mo;
-        if (is_readable($github_mo_path)) {
-            load_plugin_textdomain('event_espresso', false, EE_LANGUAGES_SAFE_LOC);
-            return;
-        }
-        $glotpress_mo_path = EE_LANGUAGES_SAFE_DIR . EE_Load_Textdomain::FILE_NAME_PREFIX . '4-' . $locale_mo;
-        if (is_readable($glotpress_mo_path)) {
-            load_textdomain('event_espresso', $glotpress_mo_path);
-            return;
-        }
-        load_plugin_textdomain('event_espresso', false, dirname(EE_PLUGIN_BASENAME) . '/languages/');
-    }
-
-
-    /**
-     * The purpose of this method is to side-load the language files for EE,
-     * this includes the POT file and the PO/MO files for the given WPLANG locale (if necessary).
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @depecated 5.0.42
-     */
-    public static function loadTranslationsForLocale()
-    {
-        $loaded_text_domains = new LoadedTextDomains();
-        // check if language files has already been side-loaded
-        if ($loaded_text_domains->hasVersion(EE_Load_Textdomain::$locale, EVENT_ESPRESSO_VERSION)) {
-            return;
-        }
-
-        // if locale is "en_US" then lets just get out, since Event Espresso core is already "en_US"
-        if (EE_Load_Textdomain::$locale === 'en_US') {
-            // but set option first else we'll forever be downloading the pot file
-            $loaded_text_domains->versionLoaded(EE_Load_Textdomain::$locale, EVENT_ESPRESSO_VERSION);
-            return;
-        }
-
-        /** @var Request $request */
-        $request = LoaderFactory::getShared(Request::class);
-        if ($request->isActivation()) {
-            // clean up old text domain tracking
-            $LegacyTextDomainOptions = new LegacyTextDomainOptions($loaded_text_domains);
-            $LegacyTextDomainOptions->convertToConsolidatedFormat();
-        }
-
-        [$mo_loaded, $po_loaded] = EE_Load_Textdomain::sideLoadMoPo();
-
-        // set option so the above only runs when EE updates.
-        $loaded_text_domains->versionLoaded(EE_Load_Textdomain::$locale, EVENT_ESPRESSO_VERSION);
-
-        if ($mo_loaded && $po_loaded) {
-            EE_Error::add_success(
-                sprintf(
-                    esc_html__(
-                        'Successfully downloaded the Event Espresso text domain for the "%1$s" locale.',
-                        'event_espresso'
-                    ),
-                    EE_Load_Textdomain::$locale
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-    }
-
-
-    /**
-     * @throws ReflectionException
-     * @throws EE_Error
-     * @depecated 5.0.42
-     */
-    private static function sideLoadMoPo(): array
-    {
-        // load side-loader and side-load the .POT file as this should always be included.
-        $side_loader_args = [
-            'upload_path'   => EE_PLUGIN_DIR_PATH . 'languages/',
-            'download_url'  => EE_Load_Textdomain::REPO_BASE_URL . '.pot',
-            'new_file_name' => 'event_espresso.pot',
-        ];
-        EE_Registry::instance()->load_helper('Sideloader');
-        $side_loader = new EEH_Sideloader($side_loader_args);
-        // side-load the .POT file only for main site of the network, or if not running Multisite.
-        if (is_main_site()) {
-            $side_loader->sideload();
-        }
-        $repo_locale_URL = EE_Load_Textdomain::REPO_BASE_URL . '-' . EE_Load_Textdomain::$locale;
-        $file_name_base  = EE_Load_Textdomain::FILE_NAME_PREFIX . EE_Load_Textdomain::$locale;
-
-        // made it here so let's get the language files from the GitHub repo, first the .mo file
-        $side_loader->setDownloadUrl("$repo_locale_URL.mo");
-        $side_loader->setNewFileName("$file_name_base.mo");
-        $mo_loaded = $side_loader->sideload();
-
-        // now the .po file:
-        $side_loader->setDownloadUrl("$repo_locale_URL.po");
-        $side_loader->setNewFileName("$file_name_base.po");
-        $po_loaded = $side_loader->sideload();
-
-        return [$mo_loaded, $po_loaded];
-    }
-
-
-    /**
-     * @depecated 5.0.42
-     */
-    public static function load_textdomain()
-    {
-        EE_Load_Textdomain::loadTextdomain();
-    }
+	private const REPO_BASE_URL    = 'https://github.com/eventespresso/languages-ee4/raw/refs/heads/master/event_espresso';
+
+	private const FILE_NAME_PREFIX = 'event_espresso-';
+
+
+	/**
+	 * holds the current lang in WP
+	 *
+	 * @var string
+	 */
+	public static string $locale = '';
+
+
+	/**
+	 * this takes care of retrieving a matching textdomain for event espresso for the current WPLANG from EE GitHub
+	 * repo (if necessary) and then loading it for translations. should only be called in wp plugins_loaded callback
+	 *
+	 * @return void
+	 * @depecated 5.0.42
+	 */
+	public static function loadTextdomain()
+	{
+		EE_Load_Textdomain::$locale = get_locale();
+		if (empty(EE_Load_Textdomain::$locale)) {
+			// can't download a language file if a language isn't set <taps temple>
+			return;
+		}
+		// hook into init to load the textdomain
+		add_action('init', [EE_Load_Textdomain::class, 'loadTranslationsForLocale'], 9);
+		add_action('init', [EE_Load_Textdomain::class, 'loadPluginTextdomain']);
+	}
+
+
+	/**
+	 * @return void
+	 * @depecated 5.0.42
+	 */
+	public static function loadPluginTextdomain()
+	{
+		$locale_mo      = EE_Load_Textdomain::$locale . '.mo';
+		$github_mo_path = EE_LANGUAGES_SAFE_DIR . EE_Load_Textdomain::FILE_NAME_PREFIX . $locale_mo;
+		if (is_readable($github_mo_path)) {
+			load_plugin_textdomain('event_espresso', false, EE_LANGUAGES_SAFE_LOC);
+			return;
+		}
+		$glotpress_mo_path = EE_LANGUAGES_SAFE_DIR . EE_Load_Textdomain::FILE_NAME_PREFIX . '4-' . $locale_mo;
+		if (is_readable($glotpress_mo_path)) {
+			load_textdomain('event_espresso', $glotpress_mo_path);
+			return;
+		}
+		load_plugin_textdomain('event_espresso', false, dirname(EE_PLUGIN_BASENAME) . '/languages/');
+	}
+
+
+	/**
+	 * The purpose of this method is to side-load the language files for EE,
+	 * this includes the POT file and the PO/MO files for the given WPLANG locale (if necessary).
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @depecated 5.0.42
+	 */
+	public static function loadTranslationsForLocale()
+	{
+		$loaded_text_domains = new LoadedTextDomains();
+		// check if language files has already been side-loaded
+		if ($loaded_text_domains->hasVersion(EE_Load_Textdomain::$locale, EVENT_ESPRESSO_VERSION)) {
+			return;
+		}
+
+		// if locale is "en_US" then lets just get out, since Event Espresso core is already "en_US"
+		if (EE_Load_Textdomain::$locale === 'en_US') {
+			// but set option first else we'll forever be downloading the pot file
+			$loaded_text_domains->versionLoaded(EE_Load_Textdomain::$locale, EVENT_ESPRESSO_VERSION);
+			return;
+		}
+
+		/** @var Request $request */
+		$request = LoaderFactory::getShared(Request::class);
+		if ($request->isActivation()) {
+			// clean up old text domain tracking
+			$LegacyTextDomainOptions = new LegacyTextDomainOptions($loaded_text_domains);
+			$LegacyTextDomainOptions->convertToConsolidatedFormat();
+		}
+
+		[$mo_loaded, $po_loaded] = EE_Load_Textdomain::sideLoadMoPo();
+
+		// set option so the above only runs when EE updates.
+		$loaded_text_domains->versionLoaded(EE_Load_Textdomain::$locale, EVENT_ESPRESSO_VERSION);
+
+		if ($mo_loaded && $po_loaded) {
+			EE_Error::add_success(
+				sprintf(
+					esc_html__(
+						'Successfully downloaded the Event Espresso text domain for the "%1$s" locale.',
+						'event_espresso'
+					),
+					EE_Load_Textdomain::$locale
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+	}
+
+
+	/**
+	 * @throws ReflectionException
+	 * @throws EE_Error
+	 * @depecated 5.0.42
+	 */
+	private static function sideLoadMoPo(): array
+	{
+		// load side-loader and side-load the .POT file as this should always be included.
+		$side_loader_args = [
+			'upload_path'   => EE_PLUGIN_DIR_PATH . 'languages/',
+			'download_url'  => EE_Load_Textdomain::REPO_BASE_URL . '.pot',
+			'new_file_name' => 'event_espresso.pot',
+		];
+		EE_Registry::instance()->load_helper('Sideloader');
+		$side_loader = new EEH_Sideloader($side_loader_args);
+		// side-load the .POT file only for main site of the network, or if not running Multisite.
+		if (is_main_site()) {
+			$side_loader->sideload();
+		}
+		$repo_locale_URL = EE_Load_Textdomain::REPO_BASE_URL . '-' . EE_Load_Textdomain::$locale;
+		$file_name_base  = EE_Load_Textdomain::FILE_NAME_PREFIX . EE_Load_Textdomain::$locale;
+
+		// made it here so let's get the language files from the GitHub repo, first the .mo file
+		$side_loader->setDownloadUrl("$repo_locale_URL.mo");
+		$side_loader->setNewFileName("$file_name_base.mo");
+		$mo_loaded = $side_loader->sideload();
+
+		// now the .po file:
+		$side_loader->setDownloadUrl("$repo_locale_URL.po");
+		$side_loader->setNewFileName("$file_name_base.po");
+		$po_loaded = $side_loader->sideload();
+
+		return [$mo_loaded, $po_loaded];
+	}
+
+
+	/**
+	 * @depecated 5.0.42
+	 */
+	public static function load_textdomain()
+	{
+		EE_Load_Textdomain::loadTextdomain();
+	}
 
 }

Spacing +8 added lines, -8 removed lines

@@ -55,18 +55,18 @@ 
      */
     public static function loadPluginTextdomain()
     {
-        $locale_mo      = EE_Load_Textdomain::$locale . '.mo';
-        $github_mo_path = EE_LANGUAGES_SAFE_DIR . EE_Load_Textdomain::FILE_NAME_PREFIX . $locale_mo;
+        $locale_mo      = EE_Load_Textdomain::$locale.'.mo';
+        $github_mo_path = EE_LANGUAGES_SAFE_DIR.EE_Load_Textdomain::FILE_NAME_PREFIX.$locale_mo;
         if (is_readable($github_mo_path)) {
             load_plugin_textdomain('event_espresso', false, EE_LANGUAGES_SAFE_LOC);
             return;
         }
-        $glotpress_mo_path = EE_LANGUAGES_SAFE_DIR . EE_Load_Textdomain::FILE_NAME_PREFIX . '4-' . $locale_mo;
+        $glotpress_mo_path = EE_LANGUAGES_SAFE_DIR.EE_Load_Textdomain::FILE_NAME_PREFIX.'4-'.$locale_mo;
         if (is_readable($glotpress_mo_path)) {
             load_textdomain('event_espresso', $glotpress_mo_path);
             return;
         }
-        load_plugin_textdomain('event_espresso', false, dirname(EE_PLUGIN_BASENAME) . '/languages/');
+        load_plugin_textdomain('event_espresso', false, dirname(EE_PLUGIN_BASENAME).'/languages/');
     }
 
 
@@ -133,8 +133,8 @@ 
     {
         // load side-loader and side-load the .POT file as this should always be included.
         $side_loader_args = [
-            'upload_path'   => EE_PLUGIN_DIR_PATH . 'languages/',
-            'download_url'  => EE_Load_Textdomain::REPO_BASE_URL . '.pot',
+            'upload_path'   => EE_PLUGIN_DIR_PATH.'languages/',
+            'download_url'  => EE_Load_Textdomain::REPO_BASE_URL.'.pot',
             'new_file_name' => 'event_espresso.pot',
         ];
         EE_Registry::instance()->load_helper('Sideloader');
@@ -143,8 +143,8 @@ 
         if (is_main_site()) {
             $side_loader->sideload();
         }
-        $repo_locale_URL = EE_Load_Textdomain::REPO_BASE_URL . '-' . EE_Load_Textdomain::$locale;
-        $file_name_base  = EE_Load_Textdomain::FILE_NAME_PREFIX . EE_Load_Textdomain::$locale;
+        $repo_locale_URL = EE_Load_Textdomain::REPO_BASE_URL.'-'.EE_Load_Textdomain::$locale;
+        $file_name_base  = EE_Load_Textdomain::FILE_NAME_PREFIX.EE_Load_Textdomain::$locale;
 
         // made it here so let's get the language files from the GitHub repo, first the .mo file
         $side_loader->setDownloadUrl("$repo_locale_URL.mo");

core/services/notifications/PersistentAdminNoticeManager.php

Indentation +420 added lines, -420 removed lines

@@ -29,424 +29,424 @@
  */
 class PersistentAdminNoticeManager
 {
-    const WP_OPTION_KEY = 'ee_pers_admin_notices';
-
-    private CapabilitiesChecker $capabilities_checker;
-
-    private RequestInterface $request;
-
-    /**
-     * @var Collection|PersistentAdminNotice[]|null $notice_collection
-     */
-    private ?Collection $notice_collection = null;
-
-    /**
-     * if AJAX is not enabled, then the return URL will be used for redirecting back to the admin page where the
-     * persistent admin notice was displayed, and ultimately dismissed from.
-     *
-     * @var string $return_url
-     */
-    private string $return_url;
-
-
-    /**
-     * PersistentAdminNoticeManager constructor
-     *
-     * @param CapabilitiesChecker $capabilities_checker
-     * @param RequestInterface    $request
-     * @param string              $return_url where to  redirect to after dismissing notices
-     */
-    public function __construct(
-        CapabilitiesChecker $capabilities_checker,
-        RequestInterface $request,
-        string $return_url = ''
-    ) {
-        $this->capabilities_checker = $capabilities_checker;
-        $this->request              = $request;
-        $this->setReturnUrl($return_url);
-        add_action('wp_ajax_dismiss_ee_nag_notice', [$this, 'dismissNotice']);
-        add_action('shutdown', [$this, 'registerAndSaveNotices'], 998);
-    }
-
-
-    public function loadAdminNotices()
-    {
-        // setup up notices at priority 9 because `EE_Admin::display_admin_notices()` runs at priority 10,
-        // and we want to retrieve and generate any nag notices at the last possible moment
-        add_action('admin_notices', [$this, 'displayNotices'], 9);
-        add_action('network_admin_notices', [$this, 'displayNotices'], 9);
-    }
-
-
-    /**
-     * @param string $return_url
-     */
-    public function setReturnUrl(string $return_url)
-    {
-        $this->return_url = $return_url;
-    }
-
-
-    /**
-     * @return Collection
-     * @throws InvalidEntityException
-     * @throws InvalidInterfaceException
-     * @throws DomainException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    protected function getPersistentAdminNoticeCollection(): Collection
-    {
-        if (! $this->notice_collection instanceof Collection) {
-            $this->notice_collection = new Collection(
-                'EventEspresso\core\domain\entities\notifications\PersistentAdminNotice'
-            );
-            $this->retrieveStoredNotices();
-            $this->registerNotices();
-        }
-        return $this->notice_collection;
-    }
-
-
-    /**
-     * generates PersistentAdminNotice objects for all non-dismissed notices saved to the db
-     *
-     * @return void
-     * @throws InvalidEntityException
-     * @throws DomainException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    protected function retrieveStoredNotices()
-    {
-        $persistent_admin_notices = get_option(PersistentAdminNoticeManager::WP_OPTION_KEY, []);
-        if (! empty($persistent_admin_notices)) {
-            foreach ($persistent_admin_notices as $name => $details) {
-                if (is_array($details)) {
-                    if (
-                        ! isset(
-                            $details['message'],
-                            $details['capability'],
-                            $details['cap_context'],
-                            $details['dismissed']
-                        )
-                    ) {
-                        throw new DomainException(
-                            sprintf(
-                                esc_html__(
-                                    'The "%1$s" PersistentAdminNotice could not be retrieved from the database.',
-                                    'event_espresso'
-                                ),
-                                $name
-                            )
-                        );
-                    }
-                    $notice = new PersistentAdminNotice(
-                        (string) $name,
-                        (string) $details['message'],
-                        (bool) ($details['force_update'] ?? false),
-                        (string) $details['capability'],
-                        (string) $details['cap_context'],
-                        (bool) $details['dismissed'],
-                        (string) ($details['type'] ?? 'info'),
-                        (string) ($details['extra_css'] ?? '')
-                    );
-                    // new format for nag notices
-                    $this->notice_collection->add($notice, sanitize_key($name));
-                } else {
-                    try {
-                        // old nag notices, that we want to convert to the new format
-                        $this->notice_collection->add(
-                            new PersistentAdminNotice(
-                                (string) $name,
-                                (string) $details,
-                                false,
-                                '',
-                                '',
-                                empty($details)
-                            ),
-                            sanitize_key($name)
-                        );
-                    } catch (Exception $e) {
-                        EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-                    }
-                }
-                // each notice will self register when the action hook in registerNotices is triggered
-            }
-        }
-    }
-
-
-    /**
-     * exposes the Persistent Admin Notice Collection via an action
-     * so that PersistentAdminNotice objects can be added and/or removed
-     * without compromising the actual collection like a filter would
-     */
-    protected function registerNotices()
-    {
-        do_action(
-            'AHEE__EventEspresso_core_services_notifications_PersistentAdminNoticeManager__registerNotices',
-            $this->notice_collection
-        );
-    }
-
-
-    /**
-     * @throws DomainException
-     * @throws InvalidClassException
-     * @throws InvalidInterfaceException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function displayNotices()
-    {
-        $this->notice_collection = $this->getPersistentAdminNoticeCollection();
-        if ($this->notice_collection->hasObjects()) {
-            $enqueue_assets = false;
-            // and display notices
-            foreach ($this->notice_collection as $persistent_admin_notice) {
-                /** @var PersistentAdminNotice $persistent_admin_notice */
-                // don't display notices that have already been dismissed
-                if ($persistent_admin_notice->getDismissed()) {
-                    continue;
-                }
-                try {
-                    $this->capabilities_checker->processCapCheck(
-                        $persistent_admin_notice->getCapCheck()
-                    );
-                } catch (InsufficientPermissionsException $e) {
-                    // user does not have required cap, so skip to next notice
-                    // and just eat the exception - nom nom nom nom
-                    continue;
-                }
-                if ($persistent_admin_notice->getMessage() === '') {
-                    continue;
-                }
-                $this->displayPersistentAdminNotice($persistent_admin_notice);
-                $enqueue_assets = true;
-            }
-            if ($enqueue_assets) {
-                $this->enqueueAssets();
-            }
-        }
-    }
-
-
-    /**
-     * does what it's named
-     *
-     * @return void
-     */
-    public function enqueueAssets()
-    {
-        wp_register_script(
-            'espresso_core',
-            EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js',
-            ['jquery'],
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_register_script(
-            'ee_error_js',
-            EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js',
-            ['espresso_core'],
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_localize_script(
-            'ee_error_js',
-            'ee_dismiss',
-            [
-                'return_url'    => urlencode($this->return_url),
-                'ajax_url'      => WP_AJAX_URL,
-                'unknown_error' => wp_strip_all_tags(
-                    __(
-                        'An unknown error has occurred on the server while attempting to dismiss this notice.',
-                        'event_espresso'
-                    )
-                ),
-            ]
-        );
-        wp_enqueue_script('ee_error_js');
-    }
-
-
-    /**
-     * displayPersistentAdminNoticeHtml
-     *
-     * @param PersistentAdminNotice $persistent_admin_notice
-     */
-    protected function displayPersistentAdminNotice(PersistentAdminNotice $persistent_admin_notice)
-    {
-        // used in template
-        $persistent_admin_notice_name    = $persistent_admin_notice->getName();
-        $persistent_admin_notice_message = $persistent_admin_notice->getMessage();
-        $persistent_admin_notice_type    = $persistent_admin_notice->getType();
-        $persistent_admin_notice_css     = $persistent_admin_notice->extraCss();
-        $is_dismissible                  = $persistent_admin_notice->getForceUpdate() !== true;
-        require EE_TEMPLATES . '/notifications/persistent_admin_notice.template.php';
-    }
-
-
-    /**
-     * dismissNotice
-     *
-     * @param string $pan_name the name, or key of the Persistent Admin Notice to be dismissed
-     * @param bool   $purge    if true, then delete it from the db
-     * @param bool   $return   forget all of this AJAX or redirect nonsense, and just return
-     * @return void
-     * @throws InvalidEntityException
-     * @throws InvalidInterfaceException
-     * @throws DomainException
-     * @throws InvalidArgumentException
-     * @throws InvalidArgumentException
-     * @throws InvalidArgumentException
-     * @throws InvalidArgumentException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function dismissNotice(string $pan_name = '', bool $purge = false, bool $return = false)
-    {
-        $pan_name                = $this->request->getRequestParam('ee_nag_notice', $pan_name);
-        $this->notice_collection = $this->getPersistentAdminNoticeCollection();
-        if (! empty($pan_name) && $this->notice_collection->has($pan_name)) {
-            /** @var PersistentAdminNotice $persistent_admin_notice */
-            $persistent_admin_notice = $this->notice_collection->get($pan_name);
-            try {
-                $this->capabilities_checker->processCapCheck(
-                    $persistent_admin_notice->getCapCheck()
-                );
-            } catch (InsufficientPermissionsException $e) {
-                // user does not have required cap, so just eat the exception - nom nom nom nom
-                return;
-            }
-            $persistent_admin_notice->setDismissed(true);
-            $persistent_admin_notice->setPurge($purge);
-            $this->saveNotices();
-        }
-        if ($return) {
-            return;
-        }
-        if ($this->request->isAjax()) {
-            // grab any notices and concatenate into string
-            echo wp_json_encode(
-                [
-                    'errors' => implode('<br />', EE_Error::get_notices(false)),
-                ]
-            );
-            exit();
-        }
-        // save errors to a transient to be displayed on next request (after redirect)
-        EE_Error::get_notices(false, true);
-        wp_safe_redirect(
-            urldecode(
-                $this->request->getRequestParam('return_url', '')
-            )
-        );
-    }
-
-
-    /**
-     * saveNotices
-     *
-     * @throws DomainException
-     * @throws InvalidInterfaceException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function saveNotices()
-    {
-        $this->notice_collection = $this->getPersistentAdminNoticeCollection();
-        $new_notices_array = [];
-        if ($this->notice_collection->hasObjects()) {
-            $persistent_admin_notices = get_option(PersistentAdminNoticeManager::WP_OPTION_KEY, []);
-            // maybe initialize persistent_admin_notices
-            if (empty($persistent_admin_notices)) {
-                add_option(PersistentAdminNoticeManager::WP_OPTION_KEY, [], '', 'no');
-            }
-            foreach ($this->notice_collection as $persistent_admin_notice) {
-                // remove this notice ?
-                if ($persistent_admin_notice->getPurge()) {
-                    continue;
-                }
-                /** @var PersistentAdminNotice $persistent_admin_notice */
-                $new_notices_array[ $persistent_admin_notice->getName() ] = [
-                    'message'      => $persistent_admin_notice->getMessage(),
-                    'capability'   => $persistent_admin_notice->getCapability(),
-                    'cap_context'  => $persistent_admin_notice->getCapContext(),
-                    'dismissed'    => $persistent_admin_notice->getDismissed(),
-                    'force_update' => $persistent_admin_notice->getForceUpdate(),
-                    'type'         => $persistent_admin_notice->getType(),
-                    'extra_css'    => $persistent_admin_notice->extraCss(),
-                ];
-            }
-        }
-        update_option(PersistentAdminNoticeManager::WP_OPTION_KEY, $new_notices_array);
-    }
-
-
-    /**
-     * @throws DomainException
-     * @throws InvalidEntityException
-     * @throws InvalidInterfaceException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function registerAndSaveNotices()
-    {
-        $this->getPersistentAdminNoticeCollection();
-        $this->registerNotices();
-        $this->saveNotices();
-        add_filter(
-            'PersistentAdminNoticeManager__registerAndSaveNotices__complete',
-            '__return_true'
-        );
-    }
-
-
-    /**
-     * @throws DomainException
-     * @throws InvalidEntityException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public static function loadRegisterAndSaveNotices()
-    {
-        /** @var PersistentAdminNoticeManager $persistent_admin_notice_manager */
-        $persistent_admin_notice_manager = LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\services\notifications\PersistentAdminNoticeManager'
-        );
-        // if shutdown has already run, then call registerAndSaveNotices() manually
-        if (did_action('shutdown')) {
-            $persistent_admin_notice_manager->registerAndSaveNotices();
-        }
-    }
-
-
-    public static function hasPersistentAdminNotice(string $notice_name): bool
-    {
-        /** @var PersistentAdminNoticeManager $persistent_admin_notice_manager */
-        $persistent_admin_notice_manager = LoaderFactory::getLoader()->getShared(PersistentAdminNoticeManager::class);
-        $persistent_admin_notice_manager->getPersistentAdminNoticeCollection();
-        return $persistent_admin_notice_manager->notice_collection->has(sanitize_key($notice_name));
-    }
-
-
-    public static function dismissPersistentAdminNotice(string $notice_name)
-    {
-        /** @var PersistentAdminNoticeManager $persistent_admin_notice_manager */
-        $persistent_admin_notice_manager = LoaderFactory::getLoader()->getShared(PersistentAdminNoticeManager::class);
-        $persistent_admin_notice_manager->dismissNotice(sanitize_key($notice_name), true, true);
-    }
-
-
-    public static function deletePersistentAdminNotice(string $notice_name)
-    {
-        /** @var PersistentAdminNoticeManager $persistent_admin_notice_manager */
-        $persistent_admin_notice_manager = LoaderFactory::getLoader()->getShared(PersistentAdminNoticeManager::class);
-        $persistent_admin_notice_manager->getPersistentAdminNoticeCollection();
-        $notice = $persistent_admin_notice_manager->notice_collection->get(sanitize_key($notice_name));
-        if ($notice) {
-            $notice->setPurge(true);
-            $persistent_admin_notice_manager->notice_collection->remove($notice);
-            $persistent_admin_notice_manager->saveNotices();
-        }
-    }
+	const WP_OPTION_KEY = 'ee_pers_admin_notices';
+
+	private CapabilitiesChecker $capabilities_checker;
+
+	private RequestInterface $request;
+
+	/**
+	 * @var Collection|PersistentAdminNotice[]|null $notice_collection
+	 */
+	private ?Collection $notice_collection = null;
+
+	/**
+	 * if AJAX is not enabled, then the return URL will be used for redirecting back to the admin page where the
+	 * persistent admin notice was displayed, and ultimately dismissed from.
+	 *
+	 * @var string $return_url
+	 */
+	private string $return_url;
+
+
+	/**
+	 * PersistentAdminNoticeManager constructor
+	 *
+	 * @param CapabilitiesChecker $capabilities_checker
+	 * @param RequestInterface    $request
+	 * @param string              $return_url where to  redirect to after dismissing notices
+	 */
+	public function __construct(
+		CapabilitiesChecker $capabilities_checker,
+		RequestInterface $request,
+		string $return_url = ''
+	) {
+		$this->capabilities_checker = $capabilities_checker;
+		$this->request              = $request;
+		$this->setReturnUrl($return_url);
+		add_action('wp_ajax_dismiss_ee_nag_notice', [$this, 'dismissNotice']);
+		add_action('shutdown', [$this, 'registerAndSaveNotices'], 998);
+	}
+
+
+	public function loadAdminNotices()
+	{
+		// setup up notices at priority 9 because `EE_Admin::display_admin_notices()` runs at priority 10,
+		// and we want to retrieve and generate any nag notices at the last possible moment
+		add_action('admin_notices', [$this, 'displayNotices'], 9);
+		add_action('network_admin_notices', [$this, 'displayNotices'], 9);
+	}
+
+
+	/**
+	 * @param string $return_url
+	 */
+	public function setReturnUrl(string $return_url)
+	{
+		$this->return_url = $return_url;
+	}
+
+
+	/**
+	 * @return Collection
+	 * @throws InvalidEntityException
+	 * @throws InvalidInterfaceException
+	 * @throws DomainException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	protected function getPersistentAdminNoticeCollection(): Collection
+	{
+		if (! $this->notice_collection instanceof Collection) {
+			$this->notice_collection = new Collection(
+				'EventEspresso\core\domain\entities\notifications\PersistentAdminNotice'
+			);
+			$this->retrieveStoredNotices();
+			$this->registerNotices();
+		}
+		return $this->notice_collection;
+	}
+
+
+	/**
+	 * generates PersistentAdminNotice objects for all non-dismissed notices saved to the db
+	 *
+	 * @return void
+	 * @throws InvalidEntityException
+	 * @throws DomainException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	protected function retrieveStoredNotices()
+	{
+		$persistent_admin_notices = get_option(PersistentAdminNoticeManager::WP_OPTION_KEY, []);
+		if (! empty($persistent_admin_notices)) {
+			foreach ($persistent_admin_notices as $name => $details) {
+				if (is_array($details)) {
+					if (
+						! isset(
+							$details['message'],
+							$details['capability'],
+							$details['cap_context'],
+							$details['dismissed']
+						)
+					) {
+						throw new DomainException(
+							sprintf(
+								esc_html__(
+									'The "%1$s" PersistentAdminNotice could not be retrieved from the database.',
+									'event_espresso'
+								),
+								$name
+							)
+						);
+					}
+					$notice = new PersistentAdminNotice(
+						(string) $name,
+						(string) $details['message'],
+						(bool) ($details['force_update'] ?? false),
+						(string) $details['capability'],
+						(string) $details['cap_context'],
+						(bool) $details['dismissed'],
+						(string) ($details['type'] ?? 'info'),
+						(string) ($details['extra_css'] ?? '')
+					);
+					// new format for nag notices
+					$this->notice_collection->add($notice, sanitize_key($name));
+				} else {
+					try {
+						// old nag notices, that we want to convert to the new format
+						$this->notice_collection->add(
+							new PersistentAdminNotice(
+								(string) $name,
+								(string) $details,
+								false,
+								'',
+								'',
+								empty($details)
+							),
+							sanitize_key($name)
+						);
+					} catch (Exception $e) {
+						EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+					}
+				}
+				// each notice will self register when the action hook in registerNotices is triggered
+			}
+		}
+	}
+
+
+	/**
+	 * exposes the Persistent Admin Notice Collection via an action
+	 * so that PersistentAdminNotice objects can be added and/or removed
+	 * without compromising the actual collection like a filter would
+	 */
+	protected function registerNotices()
+	{
+		do_action(
+			'AHEE__EventEspresso_core_services_notifications_PersistentAdminNoticeManager__registerNotices',
+			$this->notice_collection
+		);
+	}
+
+
+	/**
+	 * @throws DomainException
+	 * @throws InvalidClassException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function displayNotices()
+	{
+		$this->notice_collection = $this->getPersistentAdminNoticeCollection();
+		if ($this->notice_collection->hasObjects()) {
+			$enqueue_assets = false;
+			// and display notices
+			foreach ($this->notice_collection as $persistent_admin_notice) {
+				/** @var PersistentAdminNotice $persistent_admin_notice */
+				// don't display notices that have already been dismissed
+				if ($persistent_admin_notice->getDismissed()) {
+					continue;
+				}
+				try {
+					$this->capabilities_checker->processCapCheck(
+						$persistent_admin_notice->getCapCheck()
+					);
+				} catch (InsufficientPermissionsException $e) {
+					// user does not have required cap, so skip to next notice
+					// and just eat the exception - nom nom nom nom
+					continue;
+				}
+				if ($persistent_admin_notice->getMessage() === '') {
+					continue;
+				}
+				$this->displayPersistentAdminNotice($persistent_admin_notice);
+				$enqueue_assets = true;
+			}
+			if ($enqueue_assets) {
+				$this->enqueueAssets();
+			}
+		}
+	}
+
+
+	/**
+	 * does what it's named
+	 *
+	 * @return void
+	 */
+	public function enqueueAssets()
+	{
+		wp_register_script(
+			'espresso_core',
+			EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js',
+			['jquery'],
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_register_script(
+			'ee_error_js',
+			EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js',
+			['espresso_core'],
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_localize_script(
+			'ee_error_js',
+			'ee_dismiss',
+			[
+				'return_url'    => urlencode($this->return_url),
+				'ajax_url'      => WP_AJAX_URL,
+				'unknown_error' => wp_strip_all_tags(
+					__(
+						'An unknown error has occurred on the server while attempting to dismiss this notice.',
+						'event_espresso'
+					)
+				),
+			]
+		);
+		wp_enqueue_script('ee_error_js');
+	}
+
+
+	/**
+	 * displayPersistentAdminNoticeHtml
+	 *
+	 * @param PersistentAdminNotice $persistent_admin_notice
+	 */
+	protected function displayPersistentAdminNotice(PersistentAdminNotice $persistent_admin_notice)
+	{
+		// used in template
+		$persistent_admin_notice_name    = $persistent_admin_notice->getName();
+		$persistent_admin_notice_message = $persistent_admin_notice->getMessage();
+		$persistent_admin_notice_type    = $persistent_admin_notice->getType();
+		$persistent_admin_notice_css     = $persistent_admin_notice->extraCss();
+		$is_dismissible                  = $persistent_admin_notice->getForceUpdate() !== true;
+		require EE_TEMPLATES . '/notifications/persistent_admin_notice.template.php';
+	}
+
+
+	/**
+	 * dismissNotice
+	 *
+	 * @param string $pan_name the name, or key of the Persistent Admin Notice to be dismissed
+	 * @param bool   $purge    if true, then delete it from the db
+	 * @param bool   $return   forget all of this AJAX or redirect nonsense, and just return
+	 * @return void
+	 * @throws InvalidEntityException
+	 * @throws InvalidInterfaceException
+	 * @throws DomainException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidArgumentException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function dismissNotice(string $pan_name = '', bool $purge = false, bool $return = false)
+	{
+		$pan_name                = $this->request->getRequestParam('ee_nag_notice', $pan_name);
+		$this->notice_collection = $this->getPersistentAdminNoticeCollection();
+		if (! empty($pan_name) && $this->notice_collection->has($pan_name)) {
+			/** @var PersistentAdminNotice $persistent_admin_notice */
+			$persistent_admin_notice = $this->notice_collection->get($pan_name);
+			try {
+				$this->capabilities_checker->processCapCheck(
+					$persistent_admin_notice->getCapCheck()
+				);
+			} catch (InsufficientPermissionsException $e) {
+				// user does not have required cap, so just eat the exception - nom nom nom nom
+				return;
+			}
+			$persistent_admin_notice->setDismissed(true);
+			$persistent_admin_notice->setPurge($purge);
+			$this->saveNotices();
+		}
+		if ($return) {
+			return;
+		}
+		if ($this->request->isAjax()) {
+			// grab any notices and concatenate into string
+			echo wp_json_encode(
+				[
+					'errors' => implode('<br />', EE_Error::get_notices(false)),
+				]
+			);
+			exit();
+		}
+		// save errors to a transient to be displayed on next request (after redirect)
+		EE_Error::get_notices(false, true);
+		wp_safe_redirect(
+			urldecode(
+				$this->request->getRequestParam('return_url', '')
+			)
+		);
+	}
+
+
+	/**
+	 * saveNotices
+	 *
+	 * @throws DomainException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function saveNotices()
+	{
+		$this->notice_collection = $this->getPersistentAdminNoticeCollection();
+		$new_notices_array = [];
+		if ($this->notice_collection->hasObjects()) {
+			$persistent_admin_notices = get_option(PersistentAdminNoticeManager::WP_OPTION_KEY, []);
+			// maybe initialize persistent_admin_notices
+			if (empty($persistent_admin_notices)) {
+				add_option(PersistentAdminNoticeManager::WP_OPTION_KEY, [], '', 'no');
+			}
+			foreach ($this->notice_collection as $persistent_admin_notice) {
+				// remove this notice ?
+				if ($persistent_admin_notice->getPurge()) {
+					continue;
+				}
+				/** @var PersistentAdminNotice $persistent_admin_notice */
+				$new_notices_array[ $persistent_admin_notice->getName() ] = [
+					'message'      => $persistent_admin_notice->getMessage(),
+					'capability'   => $persistent_admin_notice->getCapability(),
+					'cap_context'  => $persistent_admin_notice->getCapContext(),
+					'dismissed'    => $persistent_admin_notice->getDismissed(),
+					'force_update' => $persistent_admin_notice->getForceUpdate(),
+					'type'         => $persistent_admin_notice->getType(),
+					'extra_css'    => $persistent_admin_notice->extraCss(),
+				];
+			}
+		}
+		update_option(PersistentAdminNoticeManager::WP_OPTION_KEY, $new_notices_array);
+	}
+
+
+	/**
+	 * @throws DomainException
+	 * @throws InvalidEntityException
+	 * @throws InvalidInterfaceException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function registerAndSaveNotices()
+	{
+		$this->getPersistentAdminNoticeCollection();
+		$this->registerNotices();
+		$this->saveNotices();
+		add_filter(
+			'PersistentAdminNoticeManager__registerAndSaveNotices__complete',
+			'__return_true'
+		);
+	}
+
+
+	/**
+	 * @throws DomainException
+	 * @throws InvalidEntityException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public static function loadRegisterAndSaveNotices()
+	{
+		/** @var PersistentAdminNoticeManager $persistent_admin_notice_manager */
+		$persistent_admin_notice_manager = LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\services\notifications\PersistentAdminNoticeManager'
+		);
+		// if shutdown has already run, then call registerAndSaveNotices() manually
+		if (did_action('shutdown')) {
+			$persistent_admin_notice_manager->registerAndSaveNotices();
+		}
+	}
+
+
+	public static function hasPersistentAdminNotice(string $notice_name): bool
+	{
+		/** @var PersistentAdminNoticeManager $persistent_admin_notice_manager */
+		$persistent_admin_notice_manager = LoaderFactory::getLoader()->getShared(PersistentAdminNoticeManager::class);
+		$persistent_admin_notice_manager->getPersistentAdminNoticeCollection();
+		return $persistent_admin_notice_manager->notice_collection->has(sanitize_key($notice_name));
+	}
+
+
+	public static function dismissPersistentAdminNotice(string $notice_name)
+	{
+		/** @var PersistentAdminNoticeManager $persistent_admin_notice_manager */
+		$persistent_admin_notice_manager = LoaderFactory::getLoader()->getShared(PersistentAdminNoticeManager::class);
+		$persistent_admin_notice_manager->dismissNotice(sanitize_key($notice_name), true, true);
+	}
+
+
+	public static function deletePersistentAdminNotice(string $notice_name)
+	{
+		/** @var PersistentAdminNoticeManager $persistent_admin_notice_manager */
+		$persistent_admin_notice_manager = LoaderFactory::getLoader()->getShared(PersistentAdminNoticeManager::class);
+		$persistent_admin_notice_manager->getPersistentAdminNoticeCollection();
+		$notice = $persistent_admin_notice_manager->notice_collection->get(sanitize_key($notice_name));
+		if ($notice) {
+			$notice->setPurge(true);
+			$persistent_admin_notice_manager->notice_collection->remove($notice);
+			$persistent_admin_notice_manager->saveNotices();
+		}
+	}
 }

core/services/deprecated/DeprecationManager.php

Indentation +12 added lines, -12 removed lines

@@ -10,16 +10,16 @@
  */
 class DeprecationManager
 {
-    /**
-     * Load Deprecations
-     *
-     * @return void
-     */
-    public static function loadDeprecations(): void
-    {
-        $files = glob(EE_CORE . 'domain/deprecated/*.php');
-        foreach ($files as $filename) {
-            include $filename;
-        }
-    }
+	/**
+	 * Load Deprecations
+	 *
+	 * @return void
+	 */
+	public static function loadDeprecations(): void
+	{
+		$files = glob(EE_CORE . 'domain/deprecated/*.php');
+		foreach ($files as $filename) {
+			include $filename;
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
      */
     public static function loadDeprecations(): void
     {
-        $files = glob(EE_CORE . 'domain/deprecated/*.php');
+        $files = glob(EE_CORE.'domain/deprecated/*.php');
         foreach ($files as $filename) {
             include $filename;
         }

core/services/request/middleware/SkipRequests.php

Indentation +18 added lines, -18 removed lines

@@ -15,23 +15,23 @@
  */
 class SkipRequests extends Middleware
 {
-    /**
-     * converts a Request to a Response
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response): ResponseInterface
-    {
-        $this->request  = $request;
-        $this->response = $response;
+	/**
+	 * converts a Request to a Response
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response): ResponseInterface
+	{
+		$this->request  = $request;
+		$this->response = $response;
 
-        // don't load EE for favicon requests
-        if ($this->request->getServerParam('REQUEST_URI') === '/favicon.ico') {
-            $this->response->terminateRequest();
-        }
-        $this->response = $this->processRequestStack($this->request, $this->response);
-        return $this->response;
-    }
+		// don't load EE for favicon requests
+		if ($this->request->getServerParam('REQUEST_URI') === '/favicon.ico') {
+			$this->response->terminateRequest();
+		}
+		$this->response = $this->processRequestStack($this->request, $this->response);
+		return $this->response;
+	}
 }

core/services/request/DataType.php

Indentation +143 added lines, -143 removed lines

@@ -15,147 +15,147 @@
  */
 class DataType
 {
-    const ARRAY   = 'array';
-
-    const BOOL    = 'bool';
-
-    const BOOLEAN = 'bool';
-
-    const DOUBLE  = 'float';
-
-    const FLOAT   = 'float';
-
-    const EDITOR  = 'editor';
-
-    const EMAIL   = 'email';
-
-    const FQCN    = 'fqcn';
-
-    const HTML    = 'html';
-
-    const INT     = 'int';
-
-    const INTEGER = 'int';
-
-    const KEY     = 'key';
-
-    const OBJECT  = 'object';
-
-    const NULL    = 'null';
-
-    const TITLE   = 'title';
-
-    const URL     = 'url';
-
-    const STRING  = 'string';
-
-
-    private static array $valid_types = [
-        DataType::ARRAY,
-        DataType::BOOL,
-        DataType::BOOLEAN,
-        DataType::DOUBLE,
-        DataType::FLOAT,
-        DataType::EDITOR,
-        DataType::EMAIL,
-        DataType::FQCN,
-        DataType::HTML,
-        DataType::INT,
-        DataType::INTEGER,
-        DataType::KEY,
-        DataType::OBJECT,
-        DataType::NULL,
-        DataType::TITLE,
-        DataType::URL,
-        DataType::STRING,
-    ];
-
-
-    /**
-     * @param string $data_type
-     * @param bool   $throw_exception
-     * @return bool
-     * @throws InvalidArgumentException
-     * @since 5.0.42
-     */
-    public static function isValidDataType(string $data_type, bool $throw_exception = false): bool
-    {
-        if (in_array($data_type, DataType::$valid_types, true)) {
-            return true;
-        }
-        if (! $throw_exception) {
-            return false;
-        }
-        throw new InvalidArgumentException(
-            sprintf(
-                esc_html__(
-                    'The incoming argument (%1$s) must be one of the allowable types: %2$s',
-                    'event_espresso'
-                ),
-                $data_type,
-                implode(',', DataType::$valid_types)
-            )
-        );
-    }
-
-
-    /**
-     * @param mixed  $param
-     * @param string $type
-     * @return mixed
-     */
-    public static function setDataType($param, string $type)
-    {
-        switch ($type) {
-            case DataType::NULL:
-                return null;
-            case DataType::OBJECT:
-                return $param;
-            case DataType::EDITOR:
-            case DataType::EMAIL:
-            case DataType::FQCN:
-            case DataType::HTML:
-            case DataType::KEY:
-            case DataType::STRING:
-            case DataType::TITLE:
-            case DataType::URL:
-                settype($param, DataType::STRING);
-                break;
-            default:
-                settype($param, $type);
-        }
-        return $param;
-    }
-
-
-    public static function convertModelFieldSchemaType($schema_type): ?string
-    {
-        if (is_array($schema_type)) {
-            foreach ($schema_type as $type) {
-                $data_type = DataType::convertModelFieldSchemaType($type);
-                if ($data_type) {
-                    return $data_type;
-                }
-            }
-            $schema_type = reset($schema_type);
-        }
-        switch ($schema_type) {
-            case 'array':
-                return DataType::ARRAY;
-            case 'boolean':
-                return DataType::BOOL;
-            case 'integer':
-                return DataType::INT;
-            case 'null':
-                return DataType::NULL;
-            case 'number':
-                return DataType::FLOAT;
-            case 'object':
-                return DataType::OBJECT;
-            case 'string':
-                return DataType::STRING;
-            default:
-                return null;
-        }
-    }
+	const ARRAY   = 'array';
+
+	const BOOL    = 'bool';
+
+	const BOOLEAN = 'bool';
+
+	const DOUBLE  = 'float';
+
+	const FLOAT   = 'float';
+
+	const EDITOR  = 'editor';
+
+	const EMAIL   = 'email';
+
+	const FQCN    = 'fqcn';
+
+	const HTML    = 'html';
+
+	const INT     = 'int';
+
+	const INTEGER = 'int';
+
+	const KEY     = 'key';
+
+	const OBJECT  = 'object';
+
+	const NULL    = 'null';
+
+	const TITLE   = 'title';
+
+	const URL     = 'url';
+
+	const STRING  = 'string';
+
+
+	private static array $valid_types = [
+		DataType::ARRAY,
+		DataType::BOOL,
+		DataType::BOOLEAN,
+		DataType::DOUBLE,
+		DataType::FLOAT,
+		DataType::EDITOR,
+		DataType::EMAIL,
+		DataType::FQCN,
+		DataType::HTML,
+		DataType::INT,
+		DataType::INTEGER,
+		DataType::KEY,
+		DataType::OBJECT,
+		DataType::NULL,
+		DataType::TITLE,
+		DataType::URL,
+		DataType::STRING,
+	];
+
+
+	/**
+	 * @param string $data_type
+	 * @param bool   $throw_exception
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 * @since 5.0.42
+	 */
+	public static function isValidDataType(string $data_type, bool $throw_exception = false): bool
+	{
+		if (in_array($data_type, DataType::$valid_types, true)) {
+			return true;
+		}
+		if (! $throw_exception) {
+			return false;
+		}
+		throw new InvalidArgumentException(
+			sprintf(
+				esc_html__(
+					'The incoming argument (%1$s) must be one of the allowable types: %2$s',
+					'event_espresso'
+				),
+				$data_type,
+				implode(',', DataType::$valid_types)
+			)
+		);
+	}
+
+
+	/**
+	 * @param mixed  $param
+	 * @param string $type
+	 * @return mixed
+	 */
+	public static function setDataType($param, string $type)
+	{
+		switch ($type) {
+			case DataType::NULL:
+				return null;
+			case DataType::OBJECT:
+				return $param;
+			case DataType::EDITOR:
+			case DataType::EMAIL:
+			case DataType::FQCN:
+			case DataType::HTML:
+			case DataType::KEY:
+			case DataType::STRING:
+			case DataType::TITLE:
+			case DataType::URL:
+				settype($param, DataType::STRING);
+				break;
+			default:
+				settype($param, $type);
+		}
+		return $param;
+	}
+
+
+	public static function convertModelFieldSchemaType($schema_type): ?string
+	{
+		if (is_array($schema_type)) {
+			foreach ($schema_type as $type) {
+				$data_type = DataType::convertModelFieldSchemaType($type);
+				if ($data_type) {
+					return $data_type;
+				}
+			}
+			$schema_type = reset($schema_type);
+		}
+		switch ($schema_type) {
+			case 'array':
+				return DataType::ARRAY;
+			case 'boolean':
+				return DataType::BOOL;
+			case 'integer':
+				return DataType::INT;
+			case 'null':
+				return DataType::NULL;
+			case 'number':
+				return DataType::FLOAT;
+			case 'object':
+				return DataType::OBJECT;
+			case 'string':
+				return DataType::STRING;
+			default:
+				return null;
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
         if (in_array($data_type, DataType::$valid_types, true)) {
             return true;
         }
-        if (! $throw_exception) {
+        if ( ! $throw_exception) {
             return false;
         }
         throw new InvalidArgumentException(

core/services/request/RequestStackCoreApp.php

Indentation +81 added lines, -81 removed lines

@@ -30,92 +30,92 @@
  */
 class RequestStackCoreApp implements RequestDecoratorInterface, RequestStackCoreAppInterface
 {
-    protected RequestInterface $request;
+	protected RequestInterface $request;
 
-    protected ResponseInterface $response;
+	protected ResponseInterface $response;
 
 
-    /**
-     * handle
-     * sets hooks for running rest of system
-     * provides "AHEE__EE_System__construct__complete" hook for EE Addons to use as their starting point
-     * starting EE Addons from any other point may lead to problems
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     * @throws InvalidClassException
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response): ResponseInterface
-    {
-        $this->request  = $request;
-        $this->response = $response;
-        espresso_load_required('EE_Base', EE_CORE . 'EE_Base.core.php');
-        DeprecationManager::loadDeprecations();
-        // workarounds for PHP < 5.3
-        espresso_load_required('EEH_Class_Tools', EE_HELPERS . 'EEH_Class_Tools.helper.php');
-        do_action(
-            'EE_EventEspresso_core_services_request_RequestStackCoreApp__handle_request__initialize_core_loading'
-        );
-        // legacy action for backwards compatibility
-        do_action('EE_Load_Espresso_Core__handle_request__initialize_core_loading');
-        espressoLoadWpGraphQL();
-        $this->setupFramework();
-        $capabilities_checker = LoaderFactory::getShared(CapabilitiesChecker::class, [EE_Capabilities::instance()]);
-        LoaderFactory::getShared(PersistentAdminNoticeManager::class, [$capabilities_checker, $request]);
-        // needed
-        LoaderFactory::getShared(EE_Maintenance_Mode::class);
-        // load legacy Cron Tasks and new Cron Manager
-        LoaderFactory::getShared(EE_Cron_Tasks::class);
-        /** @var CronManager $cron_manager */
-        $cron_manager = LoaderFactory::getShared(CronManager::class, [LoaderFactory::getLoader()]);
-        $cron_manager->initialize();
-        LoaderFactory::getShared(EE_System::class);
-        return $this->response;
-    }
+	/**
+	 * handle
+	 * sets hooks for running rest of system
+	 * provides "AHEE__EE_System__construct__complete" hook for EE Addons to use as their starting point
+	 * starting EE Addons from any other point may lead to problems
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
+	 * @throws InvalidClassException
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response): ResponseInterface
+	{
+		$this->request  = $request;
+		$this->response = $response;
+		espresso_load_required('EE_Base', EE_CORE . 'EE_Base.core.php');
+		DeprecationManager::loadDeprecations();
+		// workarounds for PHP < 5.3
+		espresso_load_required('EEH_Class_Tools', EE_HELPERS . 'EEH_Class_Tools.helper.php');
+		do_action(
+			'EE_EventEspresso_core_services_request_RequestStackCoreApp__handle_request__initialize_core_loading'
+		);
+		// legacy action for backwards compatibility
+		do_action('EE_Load_Espresso_Core__handle_request__initialize_core_loading');
+		espressoLoadWpGraphQL();
+		$this->setupFramework();
+		$capabilities_checker = LoaderFactory::getShared(CapabilitiesChecker::class, [EE_Capabilities::instance()]);
+		LoaderFactory::getShared(PersistentAdminNoticeManager::class, [$capabilities_checker, $request]);
+		// needed
+		LoaderFactory::getShared(EE_Maintenance_Mode::class);
+		// load legacy Cron Tasks and new Cron Manager
+		LoaderFactory::getShared(EE_Cron_Tasks::class);
+		/** @var CronManager $cron_manager */
+		$cron_manager = LoaderFactory::getShared(CronManager::class, [LoaderFactory::getLoader()]);
+		$cron_manager->initialize();
+		LoaderFactory::getShared(EE_System::class);
+		return $this->response;
+	}
 
 
-    /**
-     * set framework for the rest of EE to hook into when loading
-     *
-     * @throws EE_Error
-     */
-    private function setupFramework()
-    {
-        espresso_load_required('EE_Bootstrap', EE_CORE . 'EE_Bootstrap.core.php');
-        add_action('plugins_loaded', ['EE_Bootstrap', 'load_espresso_addons']);
-        add_action('setup_theme', ['EE_Bootstrap', 'detect_activations_or_upgrades']);
-        add_action('after_setup_theme', ['EE_Bootstrap', 'load_core_configuration']);
-        add_action('after_setup_theme', ['EE_Bootstrap', 'register_shortcodes_modules_and_widgets'], 15);
-        add_action('init', ['EE_Bootstrap', 'brew_espresso'], 1);
-    }
+	/**
+	 * set framework for the rest of EE to hook into when loading
+	 *
+	 * @throws EE_Error
+	 */
+	private function setupFramework()
+	{
+		espresso_load_required('EE_Bootstrap', EE_CORE . 'EE_Bootstrap.core.php');
+		add_action('plugins_loaded', ['EE_Bootstrap', 'load_espresso_addons']);
+		add_action('setup_theme', ['EE_Bootstrap', 'detect_activations_or_upgrades']);
+		add_action('after_setup_theme', ['EE_Bootstrap', 'load_core_configuration']);
+		add_action('after_setup_theme', ['EE_Bootstrap', 'register_shortcodes_modules_and_widgets'], 15);
+		add_action('init', ['EE_Bootstrap', 'brew_espresso'], 1);
+	}
 
 
-    /**
-     * called after the request stack has been fully processed
-     * if any of the middleware apps has requested the plugin be deactivated, then we do that now
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     */
-    public function handleResponse(RequestInterface $request, ResponseInterface $response)
-    {
-        if ($response->pluginDeactivated()) {
-            espresso_deactivate_plugin(EE_PLUGIN_BASENAME);
-        }
-        $request_headers = $response->requestHeaders();
-        if ($request_headers) {
-            foreach ($request_headers as $request_header) {
-                header($request_header);
-            }
-            // headers set AND request terminated? then kill the current request
-            if ($response->requestTerminated()) {
-                exit;
-            }
-        }
-    }
+	/**
+	 * called after the request stack has been fully processed
+	 * if any of the middleware apps has requested the plugin be deactivated, then we do that now
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 */
+	public function handleResponse(RequestInterface $request, ResponseInterface $response)
+	{
+		if ($response->pluginDeactivated()) {
+			espresso_deactivate_plugin(EE_PLUGIN_BASENAME);
+		}
+		$request_headers = $response->requestHeaders();
+		if ($request_headers) {
+			foreach ($request_headers as $request_header) {
+				header($request_header);
+			}
+			// headers set AND request terminated? then kill the current request
+			if ($response->requestTerminated()) {
+				exit;
+			}
+		}
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -54,10 +54,10 @@ 
     {
         $this->request  = $request;
         $this->response = $response;
-        espresso_load_required('EE_Base', EE_CORE . 'EE_Base.core.php');
+        espresso_load_required('EE_Base', EE_CORE.'EE_Base.core.php');
         DeprecationManager::loadDeprecations();
         // workarounds for PHP < 5.3
-        espresso_load_required('EEH_Class_Tools', EE_HELPERS . 'EEH_Class_Tools.helper.php');
+        espresso_load_required('EEH_Class_Tools', EE_HELPERS.'EEH_Class_Tools.helper.php');
         do_action(
             'EE_EventEspresso_core_services_request_RequestStackCoreApp__handle_request__initialize_core_loading'
         );
@@ -86,7 +86,7 @@ 
      */
     private function setupFramework()
     {
-        espresso_load_required('EE_Bootstrap', EE_CORE . 'EE_Bootstrap.core.php');
+        espresso_load_required('EE_Bootstrap', EE_CORE.'EE_Bootstrap.core.php');
         add_action('plugins_loaded', ['EE_Bootstrap', 'load_espresso_addons']);
         add_action('setup_theme', ['EE_Bootstrap', 'detect_activations_or_upgrades']);
         add_action('after_setup_theme', ['EE_Bootstrap', 'load_core_configuration']);

core/services/request/sanitizers/RequestSanitizer.php

Indentation +80 added lines, -80 removed lines

@@ -7,90 +7,90 @@
 
 class RequestSanitizer
 {
-    private Basic $email_validator;
+	private Basic $email_validator;
 
 
-    /**
-     * @param Basic $email_validator
-     */
-    public function __construct(Basic $email_validator)
-    {
-        $this->email_validator = $email_validator;
-    }
+	/**
+	 * @param Basic $email_validator
+	 */
+	public function __construct(Basic $email_validator)
+	{
+		$this->email_validator = $email_validator;
+	}
 
 
-    /**
-     * Will sanitize the supplied request parameter based on the specified data type
-     *
-     * @param mixed  $param     the supplied request parameter
-     * @param string $type      the specified data type (default: "string")
-     *                          valid values: "bool", "float", "int", "key", "url", or "string"
-     * @param bool   $is_array  if true, then $param will be treated as an array of $type
-     * @param string $delimiter if $param is a CSV like value (ex: 1,2,3,4,5...) then this is the value separator
-     * @return array|bool|float|int|string
-     * @since 4.10.14.p
-     */
-    public function clean(
-        $param,
-        string $type = DataType::STRING,
-        bool $is_array = false,
-        string $delimiter = ''
-    ) {
-        if ($delimiter !== '' && is_string($param)) {
-            $param    = explode($delimiter, $param);
-            $is_array = is_array($param);
-            // unset the delimiter else this function will recurse forever when we loop over the array of results
-            $delimiter = '';
-        }
-        // check if we are getting an improperly typed array and correct
-        $is_array = $is_array && is_array($param);
-        if ($is_array) {
-            return array_map(
-                fn ($value) => $this->clean($value, $type, is_array($value), $delimiter),
-                (array) $param
-            );
-        }
-        return $this->sanitizeParam($param, $type);
-    }
+	/**
+	 * Will sanitize the supplied request parameter based on the specified data type
+	 *
+	 * @param mixed  $param     the supplied request parameter
+	 * @param string $type      the specified data type (default: "string")
+	 *                          valid values: "bool", "float", "int", "key", "url", or "string"
+	 * @param bool   $is_array  if true, then $param will be treated as an array of $type
+	 * @param string $delimiter if $param is a CSV like value (ex: 1,2,3,4,5...) then this is the value separator
+	 * @return array|bool|float|int|string
+	 * @since 4.10.14.p
+	 */
+	public function clean(
+		$param,
+		string $type = DataType::STRING,
+		bool $is_array = false,
+		string $delimiter = ''
+	) {
+		if ($delimiter !== '' && is_string($param)) {
+			$param    = explode($delimiter, $param);
+			$is_array = is_array($param);
+			// unset the delimiter else this function will recurse forever when we loop over the array of results
+			$delimiter = '';
+		}
+		// check if we are getting an improperly typed array and correct
+		$is_array = $is_array && is_array($param);
+		if ($is_array) {
+			return array_map(
+				fn ($value) => $this->clean($value, $type, is_array($value), $delimiter),
+				(array) $param
+			);
+		}
+		return $this->sanitizeParam($param, $type);
+	}
 
 
-    /**
-     * @param mixed  $param
-     * @param string $type
-     * @return mixed
-     * @since   4.10.20.p
-     */
-    public function sanitizeParam($param, string $type = DataType::STRING)
-    {
-        switch ($type) {
-            case DataType::BOOL:
-                return filter_var($param, FILTER_VALIDATE_BOOLEAN);
-            case DataType::EDITOR:
-                if ($param === null) {
-                    return '';
-                }
-                $allowed_tags = AllowedTags::getWithFullTags();
-                return wp_kses($param, $allowed_tags);
-            case DataType::EMAIL:
-                return $this->email_validator->validate($param) ? $param : '';
-            case DataType::FLOAT:
-                return (float) $param;
-            case DataType::FQCN:
-                return preg_replace('[^\\\w\d]', '', $param);
-            case DataType::HTML:
-                $allowed_tags = AllowedTags::getAllowedTags();
-                return wp_kses($param, $allowed_tags);
-            case DataType::INT:
-                return (int) $param;
-            case DataType::KEY:
-                return sanitize_key($param);
-            case DataType::TITLE:
-                return sanitize_title($param);
-            case DataType::URL:
-                return esc_url_raw($param);
-            case DataType::STRING:
-            default:
-                return sanitize_text_field($param);
-        }
-    }
+	/**
+	 * @param mixed  $param
+	 * @param string $type
+	 * @return mixed
+	 * @since   4.10.20.p
+	 */
+	public function sanitizeParam($param, string $type = DataType::STRING)
+	{
+		switch ($type) {
+			case DataType::BOOL:
+				return filter_var($param, FILTER_VALIDATE_BOOLEAN);
+			case DataType::EDITOR:
+				if ($param === null) {
+					return '';
+				}
+				$allowed_tags = AllowedTags::getWithFullTags();
+				return wp_kses($param, $allowed_tags);
+			case DataType::EMAIL:
+				return $this->email_validator->validate($param) ? $param : '';
+			case DataType::FLOAT:
+				return (float) $param;
+			case DataType::FQCN:
+				return preg_replace('[^\\\w\d]', '', $param);
+			case DataType::HTML:
+				$allowed_tags = AllowedTags::getAllowedTags();
+				return wp_kses($param, $allowed_tags);
+			case DataType::INT:
+				return (int) $param;
+			case DataType::KEY:
+				return sanitize_key($param);
+			case DataType::TITLE:
+				return sanitize_title($param);
+			case DataType::URL:
+				return esc_url_raw($param);
+			case DataType::STRING:
+			default:
+				return sanitize_text_field($param);
+		}
+	}
 }