eventespresso / event-espresso-core

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

Indentation +91 added lines, -91 removed lines

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

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

Indentation +22 added lines, -22 removed lines

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

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

Indentation +131 added lines, -131 removed lines

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

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

Indentation +18 added lines, -18 removed lines

@@ -5,26 +5,26 @@
 class DataMigrationApi
 {
 
-    /**
-     * @var string path to DMS folder
-     */
-    private $data_migration_scripts;
+	/**
+	 * @var string path to DMS folder
+	 */
+	private $data_migration_scripts;
 
 
-    /**
-     * @return string
-     */
-    public function dataMigrationScripts(): string
-    {
-        return $this->data_migration_scripts;
-    }
+	/**
+	 * @return string
+	 */
+	public function dataMigrationScripts(): string
+	{
+		return $this->data_migration_scripts;
+	}
 
 
-    /**
-     * @param string $data_migration_scripts
-     */
-    public function addDataMigrationScripts(string $data_migration_scripts): void
-    {
-        $this->data_migration_scripts = $data_migration_scripts;
-    }
+	/**
+	 * @param string $data_migration_scripts
+	 */
+	public function addDataMigrationScripts(string $data_migration_scripts): void
+	{
+		$this->data_migration_scripts = $data_migration_scripts;
+	}
 }

core/domain/values/FilePath.php

Spacing +2 added lines, -2 removed lines

@@ -31,14 +31,14 @@
      */
     public function __construct(string $file_path)
     {
-        if (! is_string($file_path)) {
+        if ( ! is_string($file_path)) {
             throw new InvalidDataTypeException(
                 '$file_path',
                 $file_path,
                 'string'
             );
         }
-        if (! is_readable($file_path)) {
+        if ( ! is_readable($file_path)) {
             throw new InvalidFilePathException($file_path);
         }
         $this->file_path = $file_path;

Indentation +32 added lines, -32 removed lines

@@ -15,40 +15,40 @@
  */
 class FilePath
 {
-    /**
-     * @var string file_path
-     */
-    private $file_path;
+	/**
+	 * @var string file_path
+	 */
+	private $file_path;
 
 
-    /**
-     * FilePath constructor.
-     *
-     * @param string $file_path
-     * @throws InvalidDataTypeException
-     * @throws InvalidFilePathException
-     */
-    public function __construct(string $file_path)
-    {
-        if (! is_string($file_path)) {
-            throw new InvalidDataTypeException(
-                '$file_path',
-                $file_path,
-                'string'
-            );
-        }
-        if (! is_readable($file_path)) {
-            throw new InvalidFilePathException($file_path);
-        }
-        $this->file_path = $file_path;
-    }
+	/**
+	 * FilePath constructor.
+	 *
+	 * @param string $file_path
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidFilePathException
+	 */
+	public function __construct(string $file_path)
+	{
+		if (! is_string($file_path)) {
+			throw new InvalidDataTypeException(
+				'$file_path',
+				$file_path,
+				'string'
+			);
+		}
+		if (! is_readable($file_path)) {
+			throw new InvalidFilePathException($file_path);
+		}
+		$this->file_path = $file_path;
+	}
 
 
-    /**
-     * @return string
-     */
-    public function __toString(): string
-    {
-        return $this->file_path;
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString(): string
+	{
+		return $this->file_path;
+	}
 }

core/domain/values/FullyQualifiedName.php

Spacing +2 added lines, -2 removed lines

@@ -33,14 +33,14 @@
      */
     public function __construct(string $fully_qualified_name)
     {
-        if (! is_string($fully_qualified_name)) {
+        if ( ! is_string($fully_qualified_name)) {
             throw new InvalidDataTypeException(
                 '$fully_qualified_name',
                 $fully_qualified_name,
                 'string'
             );
         }
-        if (! class_exists($fully_qualified_name) && ! interface_exists($fully_qualified_name)) {
+        if ( ! class_exists($fully_qualified_name) && ! interface_exists($fully_qualified_name)) {
             if (strpos($fully_qualified_name, 'Interface') !== false) {
                 throw new InvalidInterfaceException($fully_qualified_name);
             }

Indentation +43 added lines, -43 removed lines

@@ -16,53 +16,53 @@
  */
 class FullyQualifiedName
 {
-    /**
-     * @var string $fully_qualified_name
-     */
-    private $fully_qualified_name;
+	/**
+	 * @var string $fully_qualified_name
+	 */
+	private $fully_qualified_name;
 
 
-    /**
-     * FullyQualifiedName constructor.
-     *
-     * @param string $fully_qualified_name
-     * @throws InvalidClassException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public function __construct(string $fully_qualified_name)
-    {
-        if (! is_string($fully_qualified_name)) {
-            throw new InvalidDataTypeException(
-                '$fully_qualified_name',
-                $fully_qualified_name,
-                'string'
-            );
-        }
-        if (! class_exists($fully_qualified_name) && ! interface_exists($fully_qualified_name)) {
-            if (strpos($fully_qualified_name, 'Interface') !== false) {
-                throw new InvalidInterfaceException($fully_qualified_name);
-            }
-            throw new InvalidClassException($fully_qualified_name);
-        }
-        $this->fully_qualified_name = $fully_qualified_name;
-    }
+	/**
+	 * FullyQualifiedName constructor.
+	 *
+	 * @param string $fully_qualified_name
+	 * @throws InvalidClassException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public function __construct(string $fully_qualified_name)
+	{
+		if (! is_string($fully_qualified_name)) {
+			throw new InvalidDataTypeException(
+				'$fully_qualified_name',
+				$fully_qualified_name,
+				'string'
+			);
+		}
+		if (! class_exists($fully_qualified_name) && ! interface_exists($fully_qualified_name)) {
+			if (strpos($fully_qualified_name, 'Interface') !== false) {
+				throw new InvalidInterfaceException($fully_qualified_name);
+			}
+			throw new InvalidClassException($fully_qualified_name);
+		}
+		$this->fully_qualified_name = $fully_qualified_name;
+	}
 
 
-    /**
-     * @return string
-     */
-    public function string(): string
-    {
-        return $this->fully_qualified_name;
-    }
+	/**
+	 * @return string
+	 */
+	public function string(): string
+	{
+		return $this->fully_qualified_name;
+	}
 
 
-    /**
-     * @return string
-     */
-    public function __toString(): string
-    {
-        return $this->fully_qualified_name;
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString(): string
+	{
+		return $this->fully_qualified_name;
+	}
 }

core/domain/DomainFactory.php

Indentation +89 added lines, -89 removed lines

@@ -22,101 +22,101 @@
  */
 class DomainFactory
 {
-    /**
-     * @var DomainInterface[]
-     */
-    protected static $domains = [];
+	/**
+	 * @var DomainInterface[]
+	 */
+	protected static $domains = [];
 
 
-    /**
-     * @param string $domain_fqcn       [required] Fully Qualified Class Name for the Domain class
-     * @param string $main_file         [required] path to the main plugin file
-     * @param string $version           [required] version string for the plugin
-     * @return DomainInterface
-     * @throws DomainException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function create(string $domain_fqcn, string $main_file, string $version): DomainInterface
-    {
-        $fqcn = new FullyQualifiedName($domain_fqcn);
-        return DomainFactory::getDomain($fqcn->string(), [$main_file, $version]);
-    }
+	/**
+	 * @param string $domain_fqcn       [required] Fully Qualified Class Name for the Domain class
+	 * @param string $main_file         [required] path to the main plugin file
+	 * @param string $version           [required] version string for the plugin
+	 * @return DomainInterface
+	 * @throws DomainException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function create(string $domain_fqcn, string $main_file, string $version): DomainInterface
+	{
+		$fqcn = new FullyQualifiedName($domain_fqcn);
+		return DomainFactory::getDomain($fqcn->string(), [$main_file, $version]);
+	}
 
 
-    /**
-     * @param FullyQualifiedName $domain_fqcn   [required] Fully Qualified Class Name for the Domain class
-     * @param array              $arguments     [required] array of arguments to be passed to the Domain class
-     *                                          constructor. Must at least include the following two value objects:
-     *                                          [
-     *                                              EventEspresso\core\domain\values\FilePath $plugin_file
-     *                                              EventEspresso\core\domain\values\Version $version
-     *                                          ]
-     * @return DomainInterface
-     * @throws DomainException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function getShared(FullyQualifiedName $domain_fqcn, array $arguments): DomainInterface
-    {
-        return DomainFactory::getDomain($domain_fqcn->string(), $arguments);
-    }
+	/**
+	 * @param FullyQualifiedName $domain_fqcn   [required] Fully Qualified Class Name for the Domain class
+	 * @param array              $arguments     [required] array of arguments to be passed to the Domain class
+	 *                                          constructor. Must at least include the following two value objects:
+	 *                                          [
+	 *                                              EventEspresso\core\domain\values\FilePath $plugin_file
+	 *                                              EventEspresso\core\domain\values\Version $version
+	 *                                          ]
+	 * @return DomainInterface
+	 * @throws DomainException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function getShared(FullyQualifiedName $domain_fqcn, array $arguments): DomainInterface
+	{
+		return DomainFactory::getDomain($domain_fqcn->string(), $arguments);
+	}
 
 
-    /**
-     * @return DomainInterface
-     * @throws DomainException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidFilePathException
-     * @throws InvalidInterfaceException
-     */
-    public static function getEventEspressoCoreDomain(): DomainInterface
-    {
-        $fqcn = 'EventEspresso\core\domain\Domain';
-        if (! isset(DomainFactory::$domains[ $fqcn ])) {
-            DomainFactory::getDomain($fqcn, [EVENT_ESPRESSO_MAIN_FILE, espresso_version()]);
-        }
-        return DomainFactory::$domains[ $fqcn ];
-    }
+	/**
+	 * @return DomainInterface
+	 * @throws DomainException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function getEventEspressoCoreDomain(): DomainInterface
+	{
+		$fqcn = 'EventEspresso\core\domain\Domain';
+		if (! isset(DomainFactory::$domains[ $fqcn ])) {
+			DomainFactory::getDomain($fqcn, [EVENT_ESPRESSO_MAIN_FILE, espresso_version()]);
+		}
+		return DomainFactory::$domains[ $fqcn ];
+	}
 
 
-    /**
-     * @param string $fqcn
-     * @param array  $arguments
-     * @return DomainInterface
-     */
-    private static function getDomain(string $fqcn, array $arguments): DomainInterface
-    {
-        if (! isset(DomainFactory::$domains[ $fqcn ])) {
-            if (! isset($arguments[0], $arguments[1])) {
-                throw new InvalidArgumentException(
-                    esc_html__(
-                        'You need to pass at least two arguments, representing the addon plugin file and version, in order to generate a Domain class',
-                        'event_espresso'
-                    )
-                );
-            }
-            $filepath = $arguments[0] instanceof FilePath ? $arguments[0] : new FilePath($arguments[0]);
-            $version  = $arguments[1] instanceof Version ? $arguments[1] : Version::fromString($arguments[1]);
-            $domain   = new $fqcn($filepath, $version);
-            if (! $domain instanceof DomainBase || ! $domain instanceof $fqcn) {
-                throw new DomainException(
-                    sprintf(
-                        esc_html__(
-                            'The requested Domain class "%1$s" could not be loaded.',
-                            'event_espresso'
-                        ),
-                        $fqcn
-                    )
-                );
-            }
-            DomainFactory::$domains[ $fqcn ] = $domain;
-            // we still need to share this with the core loader to facilitate automatic dependency injection
-            LoaderFactory::getLoader()->share($fqcn, $domain, [$filepath, $version, $domain->assetNamespace()]);
-        }
-        return DomainFactory::$domains[ $fqcn ];
-    }
+	/**
+	 * @param string $fqcn
+	 * @param array  $arguments
+	 * @return DomainInterface
+	 */
+	private static function getDomain(string $fqcn, array $arguments): DomainInterface
+	{
+		if (! isset(DomainFactory::$domains[ $fqcn ])) {
+			if (! isset($arguments[0], $arguments[1])) {
+				throw new InvalidArgumentException(
+					esc_html__(
+						'You need to pass at least two arguments, representing the addon plugin file and version, in order to generate a Domain class',
+						'event_espresso'
+					)
+				);
+			}
+			$filepath = $arguments[0] instanceof FilePath ? $arguments[0] : new FilePath($arguments[0]);
+			$version  = $arguments[1] instanceof Version ? $arguments[1] : Version::fromString($arguments[1]);
+			$domain   = new $fqcn($filepath, $version);
+			if (! $domain instanceof DomainBase || ! $domain instanceof $fqcn) {
+				throw new DomainException(
+					sprintf(
+						esc_html__(
+							'The requested Domain class "%1$s" could not be loaded.',
+							'event_espresso'
+						),
+						$fqcn
+					)
+				);
+			}
+			DomainFactory::$domains[ $fqcn ] = $domain;
+			// we still need to share this with the core loader to facilitate automatic dependency injection
+			LoaderFactory::getLoader()->share($fqcn, $domain, [$filepath, $version, $domain->assetNamespace()]);
+		}
+		return DomainFactory::$domains[ $fqcn ];
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -76,10 +76,10 @@ 
     public static function getEventEspressoCoreDomain(): DomainInterface
     {
         $fqcn = 'EventEspresso\core\domain\Domain';
-        if (! isset(DomainFactory::$domains[ $fqcn ])) {
+        if ( ! isset(DomainFactory::$domains[$fqcn])) {
             DomainFactory::getDomain($fqcn, [EVENT_ESPRESSO_MAIN_FILE, espresso_version()]);
         }
-        return DomainFactory::$domains[ $fqcn ];
+        return DomainFactory::$domains[$fqcn];
     }
 
 
@@ -90,8 +90,8 @@ 
      */
     private static function getDomain(string $fqcn, array $arguments): DomainInterface
     {
-        if (! isset(DomainFactory::$domains[ $fqcn ])) {
-            if (! isset($arguments[0], $arguments[1])) {
+        if ( ! isset(DomainFactory::$domains[$fqcn])) {
+            if ( ! isset($arguments[0], $arguments[1])) {
                 throw new InvalidArgumentException(
                     esc_html__(
                         'You need to pass at least two arguments, representing the addon plugin file and version, in order to generate a Domain class',
@@ -102,7 +102,7 @@ 
             $filepath = $arguments[0] instanceof FilePath ? $arguments[0] : new FilePath($arguments[0]);
             $version  = $arguments[1] instanceof Version ? $arguments[1] : Version::fromString($arguments[1]);
             $domain   = new $fqcn($filepath, $version);
-            if (! $domain instanceof DomainBase || ! $domain instanceof $fqcn) {
+            if ( ! $domain instanceof DomainBase || ! $domain instanceof $fqcn) {
                 throw new DomainException(
                     sprintf(
                         esc_html__(
@@ -113,10 +113,10 @@ 
                     )
                 );
             }
-            DomainFactory::$domains[ $fqcn ] = $domain;
+            DomainFactory::$domains[$fqcn] = $domain;
             // we still need to share this with the core loader to facilitate automatic dependency injection
             LoaderFactory::getLoader()->share($fqcn, $domain, [$filepath, $version, $domain->assetNamespace()]);
         }
-        return DomainFactory::$domains[ $fqcn ];
+        return DomainFactory::$domains[$fqcn];
     }
 }

core/domain/DomainBase.php

Spacing +9 added lines, -9 removed lines

@@ -89,7 +89,7 @@ 
      */
     public function initialize($asset_namespace = Domain::ASSET_NAMESPACE)
     {
-        if (! $this->initialized) {
+        if ( ! $this->initialized) {
             $this->plugin_basename = plugin_basename($this->pluginFile());
             $this->plugin_path     = plugin_dir_path($this->pluginFile());
             $this->plugin_url      = plugin_dir_url($this->pluginFile());
@@ -106,7 +106,7 @@ 
      */
     public function setAssetNamespace($asset_namespace = Domain::ASSET_NAMESPACE)
     {
-        if (! $this->asset_namespace) {
+        if ( ! $this->asset_namespace) {
             $this->asset_namespace = sanitize_key(
                 // convert directory separators to dashes and remove file extension
                 str_replace(['/', '.php'], ['-', ''], $asset_namespace)
@@ -122,8 +122,8 @@ 
     private function setDistributionAssetsPath()
     {
         $assets_folder_paths = [
-            $this->plugin_path . DomainBase::ASSETS_FOLDER,
-            $this->plugin_path . 'src/' . DomainBase::ASSETS_FOLDER,
+            $this->plugin_path.DomainBase::ASSETS_FOLDER,
+            $this->plugin_path.'src/'.DomainBase::ASSETS_FOLDER,
         ];
         foreach ($assets_folder_paths as $assets_folder_path) {
             if (is_readable($assets_folder_path)) {
@@ -169,7 +169,7 @@ 
     public function pluginPath($additional_path = ''): string
     {
         return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_path . $additional_path
+            ? $this->plugin_path.$additional_path
             : $this->plugin_path;
     }
 
@@ -181,7 +181,7 @@ 
     public function pluginUrl($additional_path = ''): string
     {
         return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_url . $additional_path
+            ? $this->plugin_url.$additional_path
             : $this->plugin_url;
     }
 
@@ -220,7 +220,7 @@ 
     public function distributionAssetsPath($additional_path = ''): string
     {
         return is_string($additional_path) && $additional_path !== ''
-            ? $this->assets_path . $additional_path
+            ? $this->assets_path.$additional_path
             : $this->assets_path;
     }
 
@@ -232,8 +232,8 @@ 
     public function distributionAssetsUrl($additional_path = ''): string
     {
         return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_url . DomainBase::ASSETS_FOLDER . $additional_path
-            : $this->plugin_url . DomainBase::ASSETS_FOLDER;
+            ? $this->plugin_url.DomainBase::ASSETS_FOLDER.$additional_path
+            : $this->plugin_url.DomainBase::ASSETS_FOLDER;
     }
 
 

Indentation +227 added lines, -227 removed lines

@@ -16,231 +16,231 @@
  */
 abstract class DomainBase implements DomainInterface
 {
-    const ASSETS_FOLDER = 'assets/';
-
-    /**
-     * Equivalent to `__FILE__` for main plugin file.
-     *
-     * @var FilePath
-     */
-    private $plugin_file;
-
-    /**
-     * String indicating version for plugin
-     *
-     * @var string
-     */
-    private $version;
-
-    /**
-     * @var string $plugin_basename
-     */
-    private $plugin_basename;
-
-    /**
-     * @var string $plugin_path
-     */
-    private $plugin_path;
-
-    /**
-     * @var string $plugin_url
-     */
-    private $plugin_url;
-
-    /**
-     * @var string $asset_namespace
-     */
-    private $asset_namespace;
-
-    /**
-     * @var string $assets_path
-     */
-    private $assets_path;
-
-    /**
-     * @var bool
-     */
-    protected $initialized = false;
-
-
-    /**
-     * Initializes internal properties.
-     *
-     * @param FilePath $plugin_file
-     * @param Version  $version
-     * @param string $asset_namespace
-     */
-    public function __construct(
-        FilePath $plugin_file,
-        Version $version,
-        string $asset_namespace = Domain::ASSET_NAMESPACE
-    ) {
-        $this->plugin_file = $plugin_file;
-        $this->version     = $version;
-        $this->initialize($asset_namespace);
-    }
-
-
-    /**
-     * @param string $asset_namespace
-     * @return void
-     * @since 5.0.0.p
-     */
-    public function initialize($asset_namespace = Domain::ASSET_NAMESPACE)
-    {
-        if (! $this->initialized) {
-            $this->plugin_basename = plugin_basename($this->pluginFile());
-            $this->plugin_path     = plugin_dir_path($this->pluginFile());
-            $this->plugin_url      = plugin_dir_url($this->pluginFile());
-            $this->setAssetNamespace($asset_namespace);
-            $this->setDistributionAssetsPath();
-            $this->initialized = true;
-        }
-    }
-
-
-    /**
-     * @param string $asset_namespace
-     * @return void
-     */
-    public function setAssetNamespace($asset_namespace = Domain::ASSET_NAMESPACE)
-    {
-        if (! $this->asset_namespace) {
-            $this->asset_namespace = sanitize_key(
-                // convert directory separators to dashes and remove file extension
-                str_replace(['/', '.php'], ['-', ''], $asset_namespace)
-            );
-        }
-    }
-
-
-    /**
-     * @throws DomainException
-     * @since 5.0.0.p
-     */
-    private function setDistributionAssetsPath()
-    {
-        $assets_folder_paths = [
-            $this->plugin_path . DomainBase::ASSETS_FOLDER,
-            $this->plugin_path . 'src/' . DomainBase::ASSETS_FOLDER,
-        ];
-        foreach ($assets_folder_paths as $assets_folder_path) {
-            if (is_readable($assets_folder_path)) {
-                $this->assets_path = trailingslashit($assets_folder_path);
-                // once we find a valid path, just break out of loop
-                break;
-            }
-        }
-    }
-
-
-    /**
-     * @return string
-     */
-    public function pluginFile(): string
-    {
-        return (string) $this->plugin_file;
-    }
-
-
-    /**
-     * @return FilePath
-     */
-    public function pluginFileObject(): FilePath
-    {
-        return $this->plugin_file;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function pluginBasename(): string
-    {
-        return $this->plugin_basename;
-    }
-
-
-    /**
-     * @param string $additional_path
-     * @return string
-     */
-    public function pluginPath($additional_path = ''): string
-    {
-        return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_path . $additional_path
-            : $this->plugin_path;
-    }
-
-
-    /**
-     * @param string $additional_path
-     * @return string
-     */
-    public function pluginUrl($additional_path = ''): string
-    {
-        return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_url . $additional_path
-            : $this->plugin_url;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function version(): string
-    {
-        return (string) $this->version;
-    }
-
-
-    /**
-     * @return Version
-     */
-    public function versionValueObject()
-    {
-        return $this->version;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function distributionAssetsFolder(): string
-    {
-        return DomainBase::ASSETS_FOLDER;
-    }
-
-
-    /**
-     * @param string $additional_path
-     * @return string
-     */
-    public function distributionAssetsPath($additional_path = ''): string
-    {
-        return is_string($additional_path) && $additional_path !== ''
-            ? $this->assets_path . $additional_path
-            : $this->assets_path;
-    }
-
-
-    /**
-     * @param string $additional_path
-     * @return string
-     */
-    public function distributionAssetsUrl($additional_path = ''): string
-    {
-        return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_url . DomainBase::ASSETS_FOLDER . $additional_path
-            : $this->plugin_url . DomainBase::ASSETS_FOLDER;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function assetNamespace(): string
-    {
-        return $this->asset_namespace;
-    }
+	const ASSETS_FOLDER = 'assets/';
+
+	/**
+	 * Equivalent to `__FILE__` for main plugin file.
+	 *
+	 * @var FilePath
+	 */
+	private $plugin_file;
+
+	/**
+	 * String indicating version for plugin
+	 *
+	 * @var string
+	 */
+	private $version;
+
+	/**
+	 * @var string $plugin_basename
+	 */
+	private $plugin_basename;
+
+	/**
+	 * @var string $plugin_path
+	 */
+	private $plugin_path;
+
+	/**
+	 * @var string $plugin_url
+	 */
+	private $plugin_url;
+
+	/**
+	 * @var string $asset_namespace
+	 */
+	private $asset_namespace;
+
+	/**
+	 * @var string $assets_path
+	 */
+	private $assets_path;
+
+	/**
+	 * @var bool
+	 */
+	protected $initialized = false;
+
+
+	/**
+	 * Initializes internal properties.
+	 *
+	 * @param FilePath $plugin_file
+	 * @param Version  $version
+	 * @param string $asset_namespace
+	 */
+	public function __construct(
+		FilePath $plugin_file,
+		Version $version,
+		string $asset_namespace = Domain::ASSET_NAMESPACE
+	) {
+		$this->plugin_file = $plugin_file;
+		$this->version     = $version;
+		$this->initialize($asset_namespace);
+	}
+
+
+	/**
+	 * @param string $asset_namespace
+	 * @return void
+	 * @since 5.0.0.p
+	 */
+	public function initialize($asset_namespace = Domain::ASSET_NAMESPACE)
+	{
+		if (! $this->initialized) {
+			$this->plugin_basename = plugin_basename($this->pluginFile());
+			$this->plugin_path     = plugin_dir_path($this->pluginFile());
+			$this->plugin_url      = plugin_dir_url($this->pluginFile());
+			$this->setAssetNamespace($asset_namespace);
+			$this->setDistributionAssetsPath();
+			$this->initialized = true;
+		}
+	}
+
+
+	/**
+	 * @param string $asset_namespace
+	 * @return void
+	 */
+	public function setAssetNamespace($asset_namespace = Domain::ASSET_NAMESPACE)
+	{
+		if (! $this->asset_namespace) {
+			$this->asset_namespace = sanitize_key(
+				// convert directory separators to dashes and remove file extension
+				str_replace(['/', '.php'], ['-', ''], $asset_namespace)
+			);
+		}
+	}
+
+
+	/**
+	 * @throws DomainException
+	 * @since 5.0.0.p
+	 */
+	private function setDistributionAssetsPath()
+	{
+		$assets_folder_paths = [
+			$this->plugin_path . DomainBase::ASSETS_FOLDER,
+			$this->plugin_path . 'src/' . DomainBase::ASSETS_FOLDER,
+		];
+		foreach ($assets_folder_paths as $assets_folder_path) {
+			if (is_readable($assets_folder_path)) {
+				$this->assets_path = trailingslashit($assets_folder_path);
+				// once we find a valid path, just break out of loop
+				break;
+			}
+		}
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function pluginFile(): string
+	{
+		return (string) $this->plugin_file;
+	}
+
+
+	/**
+	 * @return FilePath
+	 */
+	public function pluginFileObject(): FilePath
+	{
+		return $this->plugin_file;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function pluginBasename(): string
+	{
+		return $this->plugin_basename;
+	}
+
+
+	/**
+	 * @param string $additional_path
+	 * @return string
+	 */
+	public function pluginPath($additional_path = ''): string
+	{
+		return is_string($additional_path) && $additional_path !== ''
+			? $this->plugin_path . $additional_path
+			: $this->plugin_path;
+	}
+
+
+	/**
+	 * @param string $additional_path
+	 * @return string
+	 */
+	public function pluginUrl($additional_path = ''): string
+	{
+		return is_string($additional_path) && $additional_path !== ''
+			? $this->plugin_url . $additional_path
+			: $this->plugin_url;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function version(): string
+	{
+		return (string) $this->version;
+	}
+
+
+	/**
+	 * @return Version
+	 */
+	public function versionValueObject()
+	{
+		return $this->version;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function distributionAssetsFolder(): string
+	{
+		return DomainBase::ASSETS_FOLDER;
+	}
+
+
+	/**
+	 * @param string $additional_path
+	 * @return string
+	 */
+	public function distributionAssetsPath($additional_path = ''): string
+	{
+		return is_string($additional_path) && $additional_path !== ''
+			? $this->assets_path . $additional_path
+			: $this->assets_path;
+	}
+
+
+	/**
+	 * @param string $additional_path
+	 * @return string
+	 */
+	public function distributionAssetsUrl($additional_path = ''): string
+	{
+		return is_string($additional_path) && $additional_path !== ''
+			? $this->plugin_url . DomainBase::ASSETS_FOLDER . $additional_path
+			: $this->plugin_url . DomainBase::ASSETS_FOLDER;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function assetNamespace(): string
+	{
+		return $this->asset_namespace;
+	}
 }

admin_pages/messages/help_tabs/messages_templates.help_tab.php

Indentation +15 added lines, -15 removed lines

@@ -3,25 +3,25 @@
 </p>
 <p>
     <?php
-    printf(
-        esc_html__(
-            'Message Templates are the %1$sformat%2$s of the messages going out. Think of them as a “form letter”. Templates tell the Messages system how to style your messages and the content (information) they will have when they are delivered.',
-            'event_espresso'
-        ),
-        '<em>',
-        '</em>'
-    );
-    ?>
+	printf(
+		esc_html__(
+			'Message Templates are the %1$sformat%2$s of the messages going out. Think of them as a “form letter”. Templates tell the Messages system how to style your messages and the content (information) they will have when they are delivered.',
+			'event_espresso'
+		),
+		'<em>',
+		'</em>'
+	);
+	?>
 </p>
 <p>
     <?php esc_html_e(
-        'There is a template created for each Messenger / Message Type and context combination. For example, messages that are sent for Payment Confirmation have a template for Event Administrator and a different one for Primary Registrant.  Whereas, messages that are sent for the Registration confirmation have 3 templates: one for Event Administrator, one for the Primary Registrant, and another for each additional Registrant(s).',
-        'event_espresso'
-    ); ?>
+		'There is a template created for each Messenger / Message Type and context combination. For example, messages that are sent for Payment Confirmation have a template for Event Administrator and a different one for Primary Registrant.  Whereas, messages that are sent for the Registration confirmation have 3 templates: one for Event Administrator, one for the Primary Registrant, and another for each additional Registrant(s).',
+		'event_espresso'
+	); ?>
 </p>
 <p>
     <?php esc_html_e(
-        'With the Event Espresso Messages system, every Messenger, Message Type, and context will have a global template created with some default content on creation. You have the ability to edit the global template that will be used for all events you create. Additionally, you have the ability to create custom templates for each event on the edit event page for the event (in a metabox labelled "Notifications").',
-        'event_espresso'
-    ); ?>
+		'With the Event Espresso Messages system, every Messenger, Message Type, and context will have a global template created with some default content on creation. You have the ability to edit the global template that will be used for all events you create. Additionally, you have the ability to create custom templates for each event on the edit event page for the event (in a metabox labelled "Notifications").',
+		'event_espresso'
+	); ?>
 </p>