eventespresso / event-espresso-core

core/helpers/EEH_Autoloader.helper.php

Spacing +18 added lines, -18 removed lines

@@ -57,7 +57,7 @@ 
     public static function instance(): EEH_Autoloader
     {
         // check if class object is instantiated
-        if (! EEH_Autoloader::$_instance instanceof EEH_Autoloader) {
+        if ( ! EEH_Autoloader::$_instance instanceof EEH_Autoloader) {
             EEH_Autoloader::$_instance = new EEH_Autoloader();
         }
         return EEH_Autoloader::$_instance;
@@ -72,8 +72,8 @@ 
      */
     public static function espresso_autoloader($class_name)
     {
-        if (isset(EEH_Autoloader::$_autoloaders[ $class_name ])) {
-            require_once(EEH_Autoloader::$_autoloaders[ $class_name ]);
+        if (isset(EEH_Autoloader::$_autoloaders[$class_name])) {
+            require_once(EEH_Autoloader::$_autoloaders[$class_name]);
         }
     }
 
@@ -127,10 +127,10 @@ 
                     )
                 );
             }
-            if (! isset(EEH_Autoloader::$_autoloaders[ $class ])) {
-                EEH_Autoloader::$_autoloaders[ $class ] = str_replace(['/', '\\'], '/', $path);
+            if ( ! isset(EEH_Autoloader::$_autoloaders[$class])) {
+                EEH_Autoloader::$_autoloaders[$class] = str_replace(['/', '\\'], '/', $path);
                 if (EE_DEBUG && (EEH_Autoloader::$debug === 'paths' || EEH_Autoloader::$debug === 'all' || $debug)) {
-                    EEH_Debug_Tools::printr(EEH_Autoloader::$_autoloaders[ $class ], $class, __FILE__, __LINE__);
+                    EEH_Debug_Tools::printr(EEH_Autoloader::$_autoloaders[$class], $class, __FILE__, __LINE__);
                 }
             }
         }
@@ -154,13 +154,13 @@ 
     {
         EEH_Autoloader::$debug = '';
         EEH_Autoloader::register_helpers_autoloaders();
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'interfaces');
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE.'interfaces');
         EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE);
         EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_INTERFACES, true);
         EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_MODELS, true);
         EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CLASSES);
         EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_FORM_SECTIONS, true);
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'messages');
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'messages');
         if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all') {
             Benchmark::displayResults();
         }
@@ -191,7 +191,7 @@ 
      */
     public static function register_line_item_display_autoloaders()
     {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'line_item_display', true);
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'line_item_display', true);
     }
 
 
@@ -201,7 +201,7 @@ 
      */
     public static function register_line_item_filter_autoloaders()
     {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'line_item_filters', true);
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'line_item_filters', true);
     }
 
 
@@ -211,7 +211,7 @@ 
      */
     public static function register_template_part_autoloaders()
     {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'template_parts', true);
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'template_parts', true);
     }
 
 
@@ -221,7 +221,7 @@ 
      */
     public static function register_business_classes()
     {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'business');
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE.'business');
     }
 
 
@@ -246,11 +246,11 @@ 
             Benchmark::startTimer(basename($folder));
         }
         // make sure last char is a /
-        $folder .= $folder[ strlen($folder) - 1 ] !== '/' ? '/' : '';
+        $folder .= $folder[strlen($folder) - 1] !== '/' ? '/' : '';
         $class_to_filepath_map = [];
         $exclude = ['index'];
         // get all the files in that folder that end in php
-        $filepaths = glob($folder . '*');
+        $filepaths = glob($folder.'*');
 
         if (empty($filepaths)) {
             return;
@@ -259,8 +259,8 @@ 
         foreach ($filepaths as $filepath) {
             if (substr($filepath, -4, 4) === '.php') {
                 $class_name = EEH_File::get_classname_from_filepath_with_standard_filename($filepath);
-                if (! in_array($class_name, $exclude)) {
-                    $class_to_filepath_map [ $class_name ] = $filepath;
+                if ( ! in_array($class_name, $exclude)) {
+                    $class_to_filepath_map [$class_name] = $filepath;
                 }
             } elseif ($recursive) {
                 EEH_Autoloader::register_autoloaders_for_each_file_in_folder($filepath, $recursive, $debug);
@@ -282,8 +282,8 @@ 
      */
     public static function add_alias(string $class_name, string $alias)
     {
-        if (isset(EEH_Autoloader::$_autoloaders[ $class_name ])) {
-            EEH_Autoloader::$_autoloaders[ $alias ] = EEH_Autoloader::$_autoloaders[ $class_name ];
+        if (isset(EEH_Autoloader::$_autoloaders[$class_name])) {
+            EEH_Autoloader::$_autoloaders[$alias] = EEH_Autoloader::$_autoloaders[$class_name];
         }
     }
 }

Indentation +271 added lines, -271 removed lines

@@ -13,275 +13,275 @@
  */
 class EEH_Autoloader extends EEH_Base
 {
-    /**
-     *    instance of the EE_System object
-     *
-     * @var    $_instance
-     */
-    private static $_instance = null;
-
-    /**
-     *   $_autoloaders
-     * @var array $_autoloaders
-     */
-    private static $_autoloaders;
-
-    /**
-     * set to "paths" to display autoloader class => path mappings
-     * set to "times" to display autoloader loading times
-     * set to "all" to display both
-     *
-     * @var string $debug
-     */
-    public static $debug = false;
-
-
-    /**
-     * @throws EE_Error
-     */
-    private function __construct()
-    {
-        if (EEH_Autoloader::$_autoloaders === null) {
-            EEH_Autoloader::$_autoloaders = [];
-            $this->_register_custom_autoloaders();
-            spl_autoload_register([$this, 'espresso_autoloader']);
-        }
-    }
-
-
-    /**
-     * @return EEH_Autoloader
-     */
-    public static function instance(): EEH_Autoloader
-    {
-        // check if class object is instantiated
-        if (! EEH_Autoloader::$_instance instanceof EEH_Autoloader) {
-            EEH_Autoloader::$_instance = new EEH_Autoloader();
-        }
-        return EEH_Autoloader::$_instance;
-    }
-
-
-    /**
-     * @param   $class_name
-     * @return  void
-     * @internal  param string $class_name - simple class name ie: session
-     * @internal  param $className
-     */
-    public static function espresso_autoloader($class_name)
-    {
-        if (isset(EEH_Autoloader::$_autoloaders[ $class_name ])) {
-            require_once(EEH_Autoloader::$_autoloaders[ $class_name ]);
-        }
-    }
-
-
-    /**
-     * @param array | string $class_paths - array of key => value pairings between class names and paths
-     * @param bool           $read_check  true if we need to check whether the file is readable or not.
-     * @param bool           $debug       **deprecated**
-     * @throws EE_Error
-     */
-    public static function register_autoloader($class_paths, $read_check = true, $debug = false)
-    {
-        $class_paths = is_array($class_paths) ? $class_paths : [$class_paths];
-        foreach ($class_paths as $class => $path) {
-            // skip all files that are not PHP
-            if (substr($path, strlen($path) - 3) !== 'php') {
-                continue;
-            }
-            // don't give up! you gotta...
-            // get some class
-            if (empty($class)) {
-                throw new EE_Error(
-                    sprintf(
-                        esc_html__(
-                            'No Class name was specified while registering an autoloader for the following path: %s.',
-                            'event_espresso'
-                        ),
-                        $path
-                    )
-                );
-            }
-            // one day you will find the path young grasshopper
-            if (empty($path)) {
-                throw new EE_Error(
-                    sprintf(
-                        esc_html__('No path was specified while registering an autoloader for the %s class.', 'event_espresso'),
-                        $class
-                    )
-                );
-            }
-            // is file readable ?
-            if ($read_check && ! is_readable($path)) {
-                throw new EE_Error(
-                    sprintf(
-                        esc_html__(
-                            'The file for the %s class could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s',
-                            'event_espresso'
-                        ),
-                        $class,
-                        $path
-                    )
-                );
-            }
-            if (! isset(EEH_Autoloader::$_autoloaders[ $class ])) {
-                EEH_Autoloader::$_autoloaders[ $class ] = str_replace(['/', '\\'], '/', $path);
-                if (EE_DEBUG && (EEH_Autoloader::$debug === 'paths' || EEH_Autoloader::$debug === 'all' || $debug)) {
-                    EEH_Debug_Tools::printr(EEH_Autoloader::$_autoloaders[ $class ], $class, __FILE__, __LINE__);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * @return array
-     */
-    public static function get_autoloaders(): array
-    {
-        return EEH_Autoloader::$_autoloaders;
-    }
-
-
-    /**
-     * @return void
-     * @throws EE_Error
-     */
-    private function _register_custom_autoloaders()
-    {
-        EEH_Autoloader::$debug = '';
-        EEH_Autoloader::register_helpers_autoloaders();
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'interfaces');
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE);
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_INTERFACES, true);
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_MODELS, true);
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CLASSES);
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_FORM_SECTIONS, true);
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'messages');
-        if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all') {
-            Benchmark::displayResults();
-        }
-    }
-
-
-    /**
-     * @throws EE_Error
-     */
-    public static function register_helpers_autoloaders()
-    {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_HELPERS);
-    }
-
-
-    /**
-     * @return void
-     */
-    public static function register_form_sections_autoloaders()
-    {
-        // EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_FORM_SECTIONS, true );
-    }
-
-
-    /**
-     * @return void
-     * @throws EE_Error
-     */
-    public static function register_line_item_display_autoloaders()
-    {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'line_item_display', true);
-    }
-
-
-    /**
-     * @return void
-     * @throws EE_Error
-     */
-    public static function register_line_item_filter_autoloaders()
-    {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'line_item_filters', true);
-    }
-
-
-    /**
-     * @return void
-     * @throws EE_Error
-     */
-    public static function register_template_part_autoloaders()
-    {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'template_parts', true);
-    }
-
-
-    /**
-     * @return void
-     * @throws EE_Error
-     */
-    public static function register_business_classes()
-    {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'business');
-    }
-
-
-    /**
-     * Assumes all the files in this folder have the normal naming scheme (namely that their classname
-     * is the file's name, plus ".whatever.php".) and adds each of them to the autoloader list.
-     * If that's not the case, you'll need to improve this function or just use
-     * EEH_File::get_classname_from_filepath_with_standard_filename() directly. Yes this has to scan the directory for
-     * files, but it only does it once -- not on EACH time the autoloader is used
-     *
-     * @param string $folder name, with or without trailing /, doesn't matter
-     * @param bool   $recursive
-     * @param bool   $debug  **deprecated**
-     * @throws EE_Error
-     */
-    public static function register_autoloaders_for_each_file_in_folder(
-        string $folder,
-        bool $recursive = false,
-        bool $debug = false
-    ) {
-        if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all' || $debug) {
-            Benchmark::startTimer(basename($folder));
-        }
-        // make sure last char is a /
-        $folder .= $folder[ strlen($folder) - 1 ] !== '/' ? '/' : '';
-        $class_to_filepath_map = [];
-        $exclude = ['index'];
-        // get all the files in that folder that end in php
-        $filepaths = glob($folder . '*');
-
-        if (empty($filepaths)) {
-            return;
-        }
-
-        foreach ($filepaths as $filepath) {
-            if (substr($filepath, -4, 4) === '.php') {
-                $class_name = EEH_File::get_classname_from_filepath_with_standard_filename($filepath);
-                if (! in_array($class_name, $exclude)) {
-                    $class_to_filepath_map [ $class_name ] = $filepath;
-                }
-            } elseif ($recursive) {
-                EEH_Autoloader::register_autoloaders_for_each_file_in_folder($filepath, $recursive, $debug);
-            }
-        }
-        // we remove the necessity to do a is_readable() check via the $read_check flag because glob by nature will not return non_readable files/directories.
-        EEH_Autoloader::register_autoloader($class_to_filepath_map, false, $debug);
-        if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all') {
-            Benchmark::stopTimer(basename($folder));
-        }
-    }
-
-
-    /**
-     * register additional autoloader based on variation of the classname for an existing autoloader
-     *
-     * @param string $class_name - simple class name ie: EE_Session
-     * @param string $alias      - variation on class name ie: EE_session, session, etc
-     */
-    public static function add_alias(string $class_name, string $alias)
-    {
-        if (isset(EEH_Autoloader::$_autoloaders[ $class_name ])) {
-            EEH_Autoloader::$_autoloaders[ $alias ] = EEH_Autoloader::$_autoloaders[ $class_name ];
-        }
-    }
+	/**
+	 *    instance of the EE_System object
+	 *
+	 * @var    $_instance
+	 */
+	private static $_instance = null;
+
+	/**
+	 *   $_autoloaders
+	 * @var array $_autoloaders
+	 */
+	private static $_autoloaders;
+
+	/**
+	 * set to "paths" to display autoloader class => path mappings
+	 * set to "times" to display autoloader loading times
+	 * set to "all" to display both
+	 *
+	 * @var string $debug
+	 */
+	public static $debug = false;
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	private function __construct()
+	{
+		if (EEH_Autoloader::$_autoloaders === null) {
+			EEH_Autoloader::$_autoloaders = [];
+			$this->_register_custom_autoloaders();
+			spl_autoload_register([$this, 'espresso_autoloader']);
+		}
+	}
+
+
+	/**
+	 * @return EEH_Autoloader
+	 */
+	public static function instance(): EEH_Autoloader
+	{
+		// check if class object is instantiated
+		if (! EEH_Autoloader::$_instance instanceof EEH_Autoloader) {
+			EEH_Autoloader::$_instance = new EEH_Autoloader();
+		}
+		return EEH_Autoloader::$_instance;
+	}
+
+
+	/**
+	 * @param   $class_name
+	 * @return  void
+	 * @internal  param string $class_name - simple class name ie: session
+	 * @internal  param $className
+	 */
+	public static function espresso_autoloader($class_name)
+	{
+		if (isset(EEH_Autoloader::$_autoloaders[ $class_name ])) {
+			require_once(EEH_Autoloader::$_autoloaders[ $class_name ]);
+		}
+	}
+
+
+	/**
+	 * @param array | string $class_paths - array of key => value pairings between class names and paths
+	 * @param bool           $read_check  true if we need to check whether the file is readable or not.
+	 * @param bool           $debug       **deprecated**
+	 * @throws EE_Error
+	 */
+	public static function register_autoloader($class_paths, $read_check = true, $debug = false)
+	{
+		$class_paths = is_array($class_paths) ? $class_paths : [$class_paths];
+		foreach ($class_paths as $class => $path) {
+			// skip all files that are not PHP
+			if (substr($path, strlen($path) - 3) !== 'php') {
+				continue;
+			}
+			// don't give up! you gotta...
+			// get some class
+			if (empty($class)) {
+				throw new EE_Error(
+					sprintf(
+						esc_html__(
+							'No Class name was specified while registering an autoloader for the following path: %s.',
+							'event_espresso'
+						),
+						$path
+					)
+				);
+			}
+			// one day you will find the path young grasshopper
+			if (empty($path)) {
+				throw new EE_Error(
+					sprintf(
+						esc_html__('No path was specified while registering an autoloader for the %s class.', 'event_espresso'),
+						$class
+					)
+				);
+			}
+			// is file readable ?
+			if ($read_check && ! is_readable($path)) {
+				throw new EE_Error(
+					sprintf(
+						esc_html__(
+							'The file for the %s class could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s',
+							'event_espresso'
+						),
+						$class,
+						$path
+					)
+				);
+			}
+			if (! isset(EEH_Autoloader::$_autoloaders[ $class ])) {
+				EEH_Autoloader::$_autoloaders[ $class ] = str_replace(['/', '\\'], '/', $path);
+				if (EE_DEBUG && (EEH_Autoloader::$debug === 'paths' || EEH_Autoloader::$debug === 'all' || $debug)) {
+					EEH_Debug_Tools::printr(EEH_Autoloader::$_autoloaders[ $class ], $class, __FILE__, __LINE__);
+				}
+			}
+		}
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public static function get_autoloaders(): array
+	{
+		return EEH_Autoloader::$_autoloaders;
+	}
+
+
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 */
+	private function _register_custom_autoloaders()
+	{
+		EEH_Autoloader::$debug = '';
+		EEH_Autoloader::register_helpers_autoloaders();
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'interfaces');
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_INTERFACES, true);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_MODELS, true);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CLASSES);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_FORM_SECTIONS, true);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'messages');
+		if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all') {
+			Benchmark::displayResults();
+		}
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	public static function register_helpers_autoloaders()
+	{
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_HELPERS);
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public static function register_form_sections_autoloaders()
+	{
+		// EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_FORM_SECTIONS, true );
+	}
+
+
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public static function register_line_item_display_autoloaders()
+	{
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'line_item_display', true);
+	}
+
+
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public static function register_line_item_filter_autoloaders()
+	{
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'line_item_filters', true);
+	}
+
+
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public static function register_template_part_autoloaders()
+	{
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'template_parts', true);
+	}
+
+
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public static function register_business_classes()
+	{
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'business');
+	}
+
+
+	/**
+	 * Assumes all the files in this folder have the normal naming scheme (namely that their classname
+	 * is the file's name, plus ".whatever.php".) and adds each of them to the autoloader list.
+	 * If that's not the case, you'll need to improve this function or just use
+	 * EEH_File::get_classname_from_filepath_with_standard_filename() directly. Yes this has to scan the directory for
+	 * files, but it only does it once -- not on EACH time the autoloader is used
+	 *
+	 * @param string $folder name, with or without trailing /, doesn't matter
+	 * @param bool   $recursive
+	 * @param bool   $debug  **deprecated**
+	 * @throws EE_Error
+	 */
+	public static function register_autoloaders_for_each_file_in_folder(
+		string $folder,
+		bool $recursive = false,
+		bool $debug = false
+	) {
+		if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all' || $debug) {
+			Benchmark::startTimer(basename($folder));
+		}
+		// make sure last char is a /
+		$folder .= $folder[ strlen($folder) - 1 ] !== '/' ? '/' : '';
+		$class_to_filepath_map = [];
+		$exclude = ['index'];
+		// get all the files in that folder that end in php
+		$filepaths = glob($folder . '*');
+
+		if (empty($filepaths)) {
+			return;
+		}
+
+		foreach ($filepaths as $filepath) {
+			if (substr($filepath, -4, 4) === '.php') {
+				$class_name = EEH_File::get_classname_from_filepath_with_standard_filename($filepath);
+				if (! in_array($class_name, $exclude)) {
+					$class_to_filepath_map [ $class_name ] = $filepath;
+				}
+			} elseif ($recursive) {
+				EEH_Autoloader::register_autoloaders_for_each_file_in_folder($filepath, $recursive, $debug);
+			}
+		}
+		// we remove the necessity to do a is_readable() check via the $read_check flag because glob by nature will not return non_readable files/directories.
+		EEH_Autoloader::register_autoloader($class_to_filepath_map, false, $debug);
+		if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all') {
+			Benchmark::stopTimer(basename($folder));
+		}
+	}
+
+
+	/**
+	 * register additional autoloader based on variation of the classname for an existing autoloader
+	 *
+	 * @param string $class_name - simple class name ie: EE_Session
+	 * @param string $alias      - variation on class name ie: EE_session, session, etc
+	 */
+	public static function add_alias(string $class_name, string $alias)
+	{
+		if (isset(EEH_Autoloader::$_autoloaders[ $class_name ])) {
+			EEH_Autoloader::$_autoloaders[ $alias ] = EEH_Autoloader::$_autoloaders[ $class_name ];
+		}
+	}
 }

core/Psr4Autoloader.php

Spacing +8 added lines, -8 removed lines

@@ -69,9 +69,9 @@ 
      */
     public function prefixes(string $prefix = ''): array
     {
-        if (! empty($prefix)) {
+        if ( ! empty($prefix)) {
             // are there any base directories for this namespace prefix?
-            return isset($this->prefixes[ $prefix ]) ? $this->prefixes[ $prefix ] : [];
+            return isset($this->prefixes[$prefix]) ? $this->prefixes[$prefix] : [];
         }
         return $this->prefixes;
     }
@@ -100,20 +100,20 @@ 
     public function addNamespace(string $prefix, string $base_dir, bool $prepend = false): bool
     {
         // normalize namespace prefix
-        $prefix = trim($prefix, Psr4Autoloader::NS) . Psr4Autoloader::NS;
+        $prefix = trim($prefix, Psr4Autoloader::NS).Psr4Autoloader::NS;
         // normalize the base directory with a trailing separator
         $base_dir = EEH_File::standardise_and_end_with_directory_separator($base_dir);
         // initialize the namespace prefix array
-        if (! isset($this->prefixes[ $prefix ])) {
-            $this->prefixes[ $prefix ] = [];
+        if ( ! isset($this->prefixes[$prefix])) {
+            $this->prefixes[$prefix] = [];
         }
         // retain the base directory for the namespace prefix
         if ($prepend) {
-            array_unshift($this->prefixes[ $prefix ], $base_dir);
+            array_unshift($this->prefixes[$prefix], $base_dir);
         } else {
-            $this->prefixes[ $prefix ][] = $base_dir;
+            $this->prefixes[$prefix][] = $base_dir;
         }
-        return isset($this->prefixes[ $prefix ]);
+        return isset($this->prefixes[$prefix]);
     }
 
 

Indentation +143 added lines, -143 removed lines

@@ -46,147 +46,147 @@
  */
 class Psr4Autoloader
 {
-    /**
-     * namespace separator
-     */
-    const NS = '\\';
-
-    /**
-     * An associative array where the key is a namespace prefix and the value
-     * is an array of base directories for classes in that namespace.
-     *
-     * @var array
-     */
-    protected $prefixes = [];
-
-
-    /**
-     * returns an array of registered namespace prefixes
-     *
-     * @param string $prefix
-     * @return array
-     */
-    public function prefixes(string $prefix = ''): array
-    {
-        if (! empty($prefix)) {
-            // are there any base directories for this namespace prefix?
-            return isset($this->prefixes[ $prefix ]) ? $this->prefixes[ $prefix ] : [];
-        }
-        return $this->prefixes;
-    }
-
-
-    /**
-     * Register loader with SPL autoloader stack.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        spl_autoload_register([$this, 'loadClass']);
-    }
-
-
-    /**
-     * Adds a base directory for a namespace prefix.
-     *
-     * @param string $prefix    The namespace prefix.
-     * @param string $base_dir  A base directory for class files in the namespace.
-     * @param bool $prepend     If true, prepend the base directory to the stack instead of appending it;
-     *                          this causes it to be searched first rather than last.
-     * @return bool             returns TRUE if the namespace was successfully added
-     */
-    public function addNamespace(string $prefix, string $base_dir, bool $prepend = false): bool
-    {
-        // normalize namespace prefix
-        $prefix = trim($prefix, Psr4Autoloader::NS) . Psr4Autoloader::NS;
-        // normalize the base directory with a trailing separator
-        $base_dir = EEH_File::standardise_and_end_with_directory_separator($base_dir);
-        // initialize the namespace prefix array
-        if (! isset($this->prefixes[ $prefix ])) {
-            $this->prefixes[ $prefix ] = [];
-        }
-        // retain the base directory for the namespace prefix
-        if ($prepend) {
-            array_unshift($this->prefixes[ $prefix ], $base_dir);
-        } else {
-            $this->prefixes[ $prefix ][] = $base_dir;
-        }
-        return isset($this->prefixes[ $prefix ]);
-    }
-
-
-    /**
-     * Loads the class file for a given class name.
-     *
-     * @param string $class The fully-qualified class name.
-     * @return string        The mapped file name on success, or boolean false on failure.
-     */
-    public function loadClass(string $class): string
-    {
-        // the current namespace prefix
-        $prefix = $class;
-        // work backwards through the namespace names of the fully-qualified
-        // class name to find a mapped file name
-        while (false !== $pos = strrpos($prefix, Psr4Autoloader::NS)) {
-            // retain the trailing namespace separator in the prefix
-            $prefix = substr($class, 0, $pos + 1);
-            // the rest is the relative class name
-            $relative_class = substr($class, $pos + 1);
-            // try to load a mapped file for the prefix and relative class
-            $mapped_file = $this->loadMappedFile($prefix, $relative_class);
-            if ($mapped_file) {
-                return $mapped_file;
-            }
-            // remove the trailing namespace separator for the next iteration of strrpos()
-            $prefix = rtrim($prefix, Psr4Autoloader::NS);
-        }
-        // never found a mapped file
-        return '';
-    }
-
-
-    /**
-     * Load the mapped file for a namespace prefix and relative class.
-     *
-     * @param string $prefix            The namespace prefix.
-     * @param string $relative_class    The relative class name.
-     * @return mixed                    Boolean false if no mapped file can be loaded,
-     *                                  or the name of the mapped file that was loaded.
-     */
-    protected function loadMappedFile(string $prefix, string $relative_class)
-    {
-        // look through base directories for this namespace prefix
-        foreach ($this->prefixes($prefix) as $base_dir) {
-            // replace the namespace prefix with the base directory,
-            // replace namespace separators with directory separators
-            // in the relative class name, append with .php
-            $file = $base_dir
-                    . str_replace(Psr4Autoloader::NS, '/', $relative_class)
-                    . '.php';
-            // if the mapped file exists, require it
-            if ($this->requireFile($file)) {
-                // yes, we're done
-                return $file;
-            }
-        }
-        // never found it
-        return false;
-    }
-
-
-    /**
-     * If a file exists, require it from the file system.
-     *
-     * @param string $file  The file to require.
-     * @return bool         True if the file exists, false if not.
-     */
-    protected function requireFile(string $file): bool
-    {
-        if (file_exists($file)) {
-            require $file;
-            return true;
-        }
-        return false;
-    }
+	/**
+	 * namespace separator
+	 */
+	const NS = '\\';
+
+	/**
+	 * An associative array where the key is a namespace prefix and the value
+	 * is an array of base directories for classes in that namespace.
+	 *
+	 * @var array
+	 */
+	protected $prefixes = [];
+
+
+	/**
+	 * returns an array of registered namespace prefixes
+	 *
+	 * @param string $prefix
+	 * @return array
+	 */
+	public function prefixes(string $prefix = ''): array
+	{
+		if (! empty($prefix)) {
+			// are there any base directories for this namespace prefix?
+			return isset($this->prefixes[ $prefix ]) ? $this->prefixes[ $prefix ] : [];
+		}
+		return $this->prefixes;
+	}
+
+
+	/**
+	 * Register loader with SPL autoloader stack.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		spl_autoload_register([$this, 'loadClass']);
+	}
+
+
+	/**
+	 * Adds a base directory for a namespace prefix.
+	 *
+	 * @param string $prefix    The namespace prefix.
+	 * @param string $base_dir  A base directory for class files in the namespace.
+	 * @param bool $prepend     If true, prepend the base directory to the stack instead of appending it;
+	 *                          this causes it to be searched first rather than last.
+	 * @return bool             returns TRUE if the namespace was successfully added
+	 */
+	public function addNamespace(string $prefix, string $base_dir, bool $prepend = false): bool
+	{
+		// normalize namespace prefix
+		$prefix = trim($prefix, Psr4Autoloader::NS) . Psr4Autoloader::NS;
+		// normalize the base directory with a trailing separator
+		$base_dir = EEH_File::standardise_and_end_with_directory_separator($base_dir);
+		// initialize the namespace prefix array
+		if (! isset($this->prefixes[ $prefix ])) {
+			$this->prefixes[ $prefix ] = [];
+		}
+		// retain the base directory for the namespace prefix
+		if ($prepend) {
+			array_unshift($this->prefixes[ $prefix ], $base_dir);
+		} else {
+			$this->prefixes[ $prefix ][] = $base_dir;
+		}
+		return isset($this->prefixes[ $prefix ]);
+	}
+
+
+	/**
+	 * Loads the class file for a given class name.
+	 *
+	 * @param string $class The fully-qualified class name.
+	 * @return string        The mapped file name on success, or boolean false on failure.
+	 */
+	public function loadClass(string $class): string
+	{
+		// the current namespace prefix
+		$prefix = $class;
+		// work backwards through the namespace names of the fully-qualified
+		// class name to find a mapped file name
+		while (false !== $pos = strrpos($prefix, Psr4Autoloader::NS)) {
+			// retain the trailing namespace separator in the prefix
+			$prefix = substr($class, 0, $pos + 1);
+			// the rest is the relative class name
+			$relative_class = substr($class, $pos + 1);
+			// try to load a mapped file for the prefix and relative class
+			$mapped_file = $this->loadMappedFile($prefix, $relative_class);
+			if ($mapped_file) {
+				return $mapped_file;
+			}
+			// remove the trailing namespace separator for the next iteration of strrpos()
+			$prefix = rtrim($prefix, Psr4Autoloader::NS);
+		}
+		// never found a mapped file
+		return '';
+	}
+
+
+	/**
+	 * Load the mapped file for a namespace prefix and relative class.
+	 *
+	 * @param string $prefix            The namespace prefix.
+	 * @param string $relative_class    The relative class name.
+	 * @return mixed                    Boolean false if no mapped file can be loaded,
+	 *                                  or the name of the mapped file that was loaded.
+	 */
+	protected function loadMappedFile(string $prefix, string $relative_class)
+	{
+		// look through base directories for this namespace prefix
+		foreach ($this->prefixes($prefix) as $base_dir) {
+			// replace the namespace prefix with the base directory,
+			// replace namespace separators with directory separators
+			// in the relative class name, append with .php
+			$file = $base_dir
+					. str_replace(Psr4Autoloader::NS, '/', $relative_class)
+					. '.php';
+			// if the mapped file exists, require it
+			if ($this->requireFile($file)) {
+				// yes, we're done
+				return $file;
+			}
+		}
+		// never found it
+		return false;
+	}
+
+
+	/**
+	 * If a file exists, require it from the file system.
+	 *
+	 * @param string $file  The file to require.
+	 * @return bool         True if the file exists, false if not.
+	 */
+	protected function requireFile(string $file): bool
+	{
+		if (file_exists($file)) {
+			require $file;
+			return true;
+		}
+		return false;
+	}
 }

core/services/addon/AddonManager.php

Indentation +93 added lines, -93 removed lines

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

Spacing +2 added lines, -2 removed lines

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

core/services/addon/api/IncompatibleAddonHandler.php

Spacing +4 added lines, -4 removed lines

@@ -43,14 +43,14 @@ 
         string $load_callback,
         string $plugin_file_constant
     ) {
-        if (! defined($version_constant)) {
+        if ( ! defined($version_constant)) {
             return;
         }
         $addon_version = constant($version_constant);
         if ($addon_version && version_compare($addon_version, $min_version_required, '<')) {
             remove_action('AHEE__EE_System__load_espresso_addons', $load_callback);
-            if (! function_exists('deactivate_plugins')) {
-                require_once ABSPATH . 'wp-admin/includes/plugin.php';
+            if ( ! function_exists('deactivate_plugins')) {
+                require_once ABSPATH.'wp-admin/includes/plugin.php';
             }
             deactivate_plugins(plugin_basename(constant($plugin_file_constant)));
             unset($_GET['activate'], $_REQUEST['activate'], $_GET['activate-multi'], $_REQUEST['activate-multi']);
@@ -64,7 +64,7 @@ 
                     $min_version_required
                 ),
                 __FILE__,
-                __FUNCTION__ . "({$addon_name})",
+                __FUNCTION__."({$addon_name})",
                 __LINE__
             );
             EE_Error::get_notices(false, true);

Indentation +69 added lines, -69 removed lines

@@ -6,75 +6,75 @@
 
 class IncompatibleAddonHandler
 {
-    /**
-     * @return void
-     */
-    public function deactivateIncompatibleAddons()
-    {
-        $this->deactivateIncompatibleAddon(
-            'Wait Lists',
-            'EE_WAIT_LISTS_VERSION',
-            '1.0.0.beta.074',
-            'load_espresso_wait_lists',
-            'EE_WAIT_LISTS_PLUGIN_FILE'
-        );
-        $this->deactivateIncompatibleAddon(
-            'Automated Upcoming Event Notifications',
-            'EE_AUTOMATED_UPCOMING_EVENT_NOTIFICATION_VERSION',
-            '1.0.0.beta.091',
-            'load_espresso_automated_upcoming_event_notification',
-            'EE_AUTOMATED_UPCOMING_EVENT_NOTIFICATION_PLUGIN_FILE'
-        );
-        // $this->deactivateIncompatibleAddon(
-        //     'WP Users Integration',
-        //     'EE_WPUSERS_VERSION',
-        //     '2.1.0.rc.003',
-        //     'load_ee_core_wpusers',
-        //     'EE_WPUSERS_PLUGIN_FILE'
-        // );
-    }
+	/**
+	 * @return void
+	 */
+	public function deactivateIncompatibleAddons()
+	{
+		$this->deactivateIncompatibleAddon(
+			'Wait Lists',
+			'EE_WAIT_LISTS_VERSION',
+			'1.0.0.beta.074',
+			'load_espresso_wait_lists',
+			'EE_WAIT_LISTS_PLUGIN_FILE'
+		);
+		$this->deactivateIncompatibleAddon(
+			'Automated Upcoming Event Notifications',
+			'EE_AUTOMATED_UPCOMING_EVENT_NOTIFICATION_VERSION',
+			'1.0.0.beta.091',
+			'load_espresso_automated_upcoming_event_notification',
+			'EE_AUTOMATED_UPCOMING_EVENT_NOTIFICATION_PLUGIN_FILE'
+		);
+		// $this->deactivateIncompatibleAddon(
+		//     'WP Users Integration',
+		//     'EE_WPUSERS_VERSION',
+		//     '2.1.0.rc.003',
+		//     'load_ee_core_wpusers',
+		//     'EE_WPUSERS_PLUGIN_FILE'
+		// );
+	}
 
 
-    /**
-     * @param string $addon_name
-     * @param string $version_constant
-     * @param string $min_version_required
-     * @param string $load_callback
-     * @param string $plugin_file_constant
-     * @return void
-     */
-    private function deactivateIncompatibleAddon(
-        string $addon_name,
-        string $version_constant,
-        string $min_version_required,
-        string $load_callback,
-        string $plugin_file_constant
-    ) {
-        if (! defined($version_constant)) {
-            return;
-        }
-        $addon_version = constant($version_constant);
-        if ($addon_version && version_compare($addon_version, $min_version_required, '<')) {
-            remove_action('AHEE__EE_System__load_espresso_addons', $load_callback);
-            if (! function_exists('deactivate_plugins')) {
-                require_once ABSPATH . 'wp-admin/includes/plugin.php';
-            }
-            deactivate_plugins(plugin_basename(constant($plugin_file_constant)));
-            unset($_GET['activate'], $_REQUEST['activate'], $_GET['activate-multi'], $_REQUEST['activate-multi']);
-            EE_Error::add_error(
-                sprintf(
-                    esc_html__(
-                        'We\'re sorry, but the Event Espresso %1$s addon was deactivated because version %2$s or higher is required with this version of Event Espresso core.',
-                        'event_espresso'
-                    ),
-                    $addon_name,
-                    $min_version_required
-                ),
-                __FILE__,
-                __FUNCTION__ . "({$addon_name})",
-                __LINE__
-            );
-            EE_Error::get_notices(false, true);
-        }
-    }
+	/**
+	 * @param string $addon_name
+	 * @param string $version_constant
+	 * @param string $min_version_required
+	 * @param string $load_callback
+	 * @param string $plugin_file_constant
+	 * @return void
+	 */
+	private function deactivateIncompatibleAddon(
+		string $addon_name,
+		string $version_constant,
+		string $min_version_required,
+		string $load_callback,
+		string $plugin_file_constant
+	) {
+		if (! defined($version_constant)) {
+			return;
+		}
+		$addon_version = constant($version_constant);
+		if ($addon_version && version_compare($addon_version, $min_version_required, '<')) {
+			remove_action('AHEE__EE_System__load_espresso_addons', $load_callback);
+			if (! function_exists('deactivate_plugins')) {
+				require_once ABSPATH . 'wp-admin/includes/plugin.php';
+			}
+			deactivate_plugins(plugin_basename(constant($plugin_file_constant)));
+			unset($_GET['activate'], $_REQUEST['activate'], $_GET['activate-multi'], $_REQUEST['activate-multi']);
+			EE_Error::add_error(
+				sprintf(
+					esc_html__(
+						'We\'re sorry, but the Event Espresso %1$s addon was deactivated because version %2$s or higher is required with this version of Event Espresso core.',
+						'event_espresso'
+					),
+					$addon_name,
+					$min_version_required
+				),
+				__FILE__,
+				__FUNCTION__ . "({$addon_name})",
+				__LINE__
+			);
+			EE_Error::get_notices(false, true);
+		}
+	}
 }

core/services/addon/api/AddonApiVersion.php

Indentation +282 added lines, -282 removed lines

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

Spacing +1 added lines, -1 removed lines

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

core/services/addon/api/ThirdPartyPluginHandler.php

Spacing +1 added lines, -1 removed lines

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

Indentation +39 added lines, -39 removed lines

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

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

Indentation +91 added lines, -91 removed lines

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

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

Indentation +22 added lines, -22 removed lines

@@ -8,26 +8,26 @@
 
 class RegisterAddon
 {
-    /**
-     * @param AddonApiV1 $addon
-     * @throws EE_Error
-     */
-    public function register(AddonApiV1 $addon)
-    {
-        EE_Register_Addon::register(
-            $addon->fqcn(),
-            [
-                'version'               => $addon->version(),
-                'plugin_slug'           => $addon->slug(),
-                'min_core_version'      => $addon->minCoreVersion(),
-                'min_wp_version'        => $addon->minWpVersion(),
-                'main_file_path'        => $addon->mainFile(),
-                'dms_paths'             => [$addon->dataMigrationScripts()],
-                'class_paths'           => [$addon->entityClasses()],
-                'model_paths'           => [$addon->entityModels()],
-                'class_extension_paths' => [$addon->entityClassExtensions()],
-                'model_extension_paths' => [$addon->entityModelExtensions()],
-            ]
-        );
-    }
+	/**
+	 * @param AddonApiV1 $addon
+	 * @throws EE_Error
+	 */
+	public function register(AddonApiV1 $addon)
+	{
+		EE_Register_Addon::register(
+			$addon->fqcn(),
+			[
+				'version'               => $addon->version(),
+				'plugin_slug'           => $addon->slug(),
+				'min_core_version'      => $addon->minCoreVersion(),
+				'min_wp_version'        => $addon->minWpVersion(),
+				'main_file_path'        => $addon->mainFile(),
+				'dms_paths'             => [$addon->dataMigrationScripts()],
+				'class_paths'           => [$addon->entityClasses()],
+				'model_paths'           => [$addon->entityModels()],
+				'class_extension_paths' => [$addon->entityClassExtensions()],
+				'model_extension_paths' => [$addon->entityModelExtensions()],
+			]
+		);
+	}
 }

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

Indentation +131 added lines, -131 removed lines

@@ -7,135 +7,135 @@
 class AddonApi extends AddonApiVersion
 {
 
-    /**
-     * @var DataMigrationApi
-     */
-    private $data_migration_api;
-
-    /**
-     * @var LegacyModelApi
-     */
-    private $legacy_model_api;
-
-
-    /**
-     * Bootstrap constructor.
-     *
-     * @param string $slug
-     * @param string $name
-     * @param string $namespace
-     * @param string $version
-     * @param string $min_core_version
-     * @param string $main_file
-     */
-    public function __construct(
-        string $slug,
-        string $name,
-        string $namespace,
-        string $version,
-        string $min_core_version,
-        string $main_file
-    ) {
-        parent::__construct(
-            $slug,
-            $name,
-            $namespace,
-            $version,
-            $min_core_version,
-            $main_file,
-            AddonApiVersion::V1
-        );
-        $this->legacy_model_api = new LegacyModelApi();
-        $this->data_migration_api = new DataMigrationApi();
-    }
-
-
-    /**
-     * @return string
-     */
-    public function dataMigrationScripts(): string
-    {
-        return $this->data_migration_api->dataMigrationScripts();
-    }
-
-
-    /**
-     * @param string $data_migration_scripts
-     */
-    public function addDataMigrationScripts(string $data_migration_scripts): void
-    {
-        $this->data_migration_api->addDataMigrationScripts($data_migration_scripts);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function entityClasses(): string
-    {
-        return $this->legacy_model_api->entityClasses();
-    }
-
-
-    /**
-     * @param string $entity_classes
-     */
-    public function addEntityClasses(string $entity_classes): void
-    {
-        $this->legacy_model_api->addEntityClasses($entity_classes);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function entityModels(): string
-    {
-        return $this->legacy_model_api->entityModels();
-    }
-
-
-    /**
-     * @param string $entity_models
-     */
-    public function addEntityModels(string $entity_models): void
-    {
-        $this->legacy_model_api->addEntityModels($entity_models);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function entityClassExtensions(): string
-    {
-        return $this->legacy_model_api->entityClassExtensions();
-    }
-
-
-    /**
-     * @param string $entity_class_extensions
-     */
-    public function addEntityClassExtensions(string $entity_class_extensions): void
-    {
-        $this->legacy_model_api->addEntityClassExtensions($entity_class_extensions);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function entityModelExtensions(): string
-    {
-        return $this->legacy_model_api->entityModelExtensions();
-    }
-
-
-    /**
-     * @param string $entity_model_extensions
-     */
-    public function addEntityModelExtensions(string $entity_model_extensions): void
-    {
-        $this->legacy_model_api->addEntityModelExtensions($entity_model_extensions);
-    }
+	/**
+	 * @var DataMigrationApi
+	 */
+	private $data_migration_api;
+
+	/**
+	 * @var LegacyModelApi
+	 */
+	private $legacy_model_api;
+
+
+	/**
+	 * Bootstrap constructor.
+	 *
+	 * @param string $slug
+	 * @param string $name
+	 * @param string $namespace
+	 * @param string $version
+	 * @param string $min_core_version
+	 * @param string $main_file
+	 */
+	public function __construct(
+		string $slug,
+		string $name,
+		string $namespace,
+		string $version,
+		string $min_core_version,
+		string $main_file
+	) {
+		parent::__construct(
+			$slug,
+			$name,
+			$namespace,
+			$version,
+			$min_core_version,
+			$main_file,
+			AddonApiVersion::V1
+		);
+		$this->legacy_model_api = new LegacyModelApi();
+		$this->data_migration_api = new DataMigrationApi();
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function dataMigrationScripts(): string
+	{
+		return $this->data_migration_api->dataMigrationScripts();
+	}
+
+
+	/**
+	 * @param string $data_migration_scripts
+	 */
+	public function addDataMigrationScripts(string $data_migration_scripts): void
+	{
+		$this->data_migration_api->addDataMigrationScripts($data_migration_scripts);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function entityClasses(): string
+	{
+		return $this->legacy_model_api->entityClasses();
+	}
+
+
+	/**
+	 * @param string $entity_classes
+	 */
+	public function addEntityClasses(string $entity_classes): void
+	{
+		$this->legacy_model_api->addEntityClasses($entity_classes);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function entityModels(): string
+	{
+		return $this->legacy_model_api->entityModels();
+	}
+
+
+	/**
+	 * @param string $entity_models
+	 */
+	public function addEntityModels(string $entity_models): void
+	{
+		$this->legacy_model_api->addEntityModels($entity_models);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function entityClassExtensions(): string
+	{
+		return $this->legacy_model_api->entityClassExtensions();
+	}
+
+
+	/**
+	 * @param string $entity_class_extensions
+	 */
+	public function addEntityClassExtensions(string $entity_class_extensions): void
+	{
+		$this->legacy_model_api->addEntityClassExtensions($entity_class_extensions);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function entityModelExtensions(): string
+	{
+		return $this->legacy_model_api->entityModelExtensions();
+	}
+
+
+	/**
+	 * @param string $entity_model_extensions
+	 */
+	public function addEntityModelExtensions(string $entity_model_extensions): void
+	{
+		$this->legacy_model_api->addEntityModelExtensions($entity_model_extensions);
+	}
 }