eventespresso / event-espresso-core

core/services/loaders/ClassInterfaceCache.php

Spacing +14 added lines, -14 removed lines

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

Indentation +161 added lines, -161 removed lines

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

core/domain/services/custom_post_types/RegisterCustomPostTypes.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
     {
         $custom_post_types = $this->custom_post_types->getDefinitions();
         foreach ($custom_post_types as $custom_post_type => $CPT) {
-            $this->wp_post_types[ $custom_post_type ] = $this->registerCustomPostType(
+            $this->wp_post_types[$custom_post_type] = $this->registerCustomPostType(
                 $custom_post_type,
                 $CPT['singular_name'],
                 $CPT['plural_name'],

Indentation +221 added lines, -221 removed lines

@@ -18,240 +18,240 @@
 class RegisterCustomPostTypes
 {
 
-    /**
-     * @var CustomPostTypeDefinitions $custom_post_types
-     */
-    public $custom_post_types;
+	/**
+	 * @var CustomPostTypeDefinitions $custom_post_types
+	 */
+	public $custom_post_types;
 
-    /**
-     * @var WP_Post_Type[] $wp_post_types
-     */
-    public $wp_post_types = array();
+	/**
+	 * @var WP_Post_Type[] $wp_post_types
+	 */
+	public $wp_post_types = array();
 
 
-    /**
-     * RegisterCustomPostTypes constructor.
-     *
-     * @param CustomPostTypeDefinitions $custom_post_types
-     */
-    public function __construct(CustomPostTypeDefinitions $custom_post_types)
-    {
-        $this->custom_post_types = $custom_post_types;
-    }
+	/**
+	 * RegisterCustomPostTypes constructor.
+	 *
+	 * @param CustomPostTypeDefinitions $custom_post_types
+	 */
+	public function __construct(CustomPostTypeDefinitions $custom_post_types)
+	{
+		$this->custom_post_types = $custom_post_types;
+	}
 
 
-    /**
-     * @return WP_Post_Type[]
-     */
-    public function getRegisteredCustomPostTypes()
-    {
-        return $this->wp_post_types;
-    }
+	/**
+	 * @return WP_Post_Type[]
+	 */
+	public function getRegisteredCustomPostTypes()
+	{
+		return $this->wp_post_types;
+	}
 
 
-    /**
-     * @return void
-     * @throws DomainException
-     */
-    public function registerCustomPostTypes()
-    {
-        $custom_post_types = $this->custom_post_types->getDefinitions();
-        foreach ($custom_post_types as $custom_post_type => $CPT) {
-            $this->wp_post_types[ $custom_post_type ] = $this->registerCustomPostType(
-                $custom_post_type,
-                $CPT['singular_name'],
-                $CPT['plural_name'],
-                $CPT['singular_slug'],
-                $CPT['plural_slug'],
-                $CPT['args']
-            );
-        }
-    }
+	/**
+	 * @return void
+	 * @throws DomainException
+	 */
+	public function registerCustomPostTypes()
+	{
+		$custom_post_types = $this->custom_post_types->getDefinitions();
+		foreach ($custom_post_types as $custom_post_type => $CPT) {
+			$this->wp_post_types[ $custom_post_type ] = $this->registerCustomPostType(
+				$custom_post_type,
+				$CPT['singular_name'],
+				$CPT['plural_name'],
+				$CPT['singular_slug'],
+				$CPT['plural_slug'],
+				$CPT['args']
+			);
+		}
+	}
 
 
-    /**
-     * Registers a new custom post type. Sets default settings given only the following params.
-     * Returns the registered post type object, or an error object.
-     *
-     * @param string $post_type          the actual post type name
-     *                                   IMPORTANT:
-     *                                   this must match what the slug is for admin pages related to this CPT
-     *                                   Also any models must use this slug as well
-     * @param string $singular_name      a pre-internationalized string for the singular name of the objects
-     * @param string $plural_name        a pre-internationalized string for the plural name of the objects
-     * @param string $singular_slug
-     * @param string $plural_slug
-     * @param array  $override_arguments exactly like $args as described in
-     *                                   http://codex.wordpress.org/Function_Reference/register_post_type
-     * @return WP_Post_Type|WP_Error
-     * @throws DomainException
-     */
-    public function registerCustomPostType(
-        $post_type,
-        $singular_name,
-        $plural_name,
-        $singular_slug = '',
-        $plural_slug = '',
-        array $override_arguments = array()
-    ) {
-        $wp_post_type = register_post_type(
-            $post_type,
-            $this->prepareArguments(
-                $post_type,
-                $singular_name,
-                $plural_name,
-                $singular_slug,
-                $plural_slug,
-                $override_arguments
-            )
-        );
-        if ($wp_post_type instanceof WP_Error) {
-            throw new DomainException($wp_post_type->get_error_message());
-        }
-        return $wp_post_type;
-    }
+	/**
+	 * Registers a new custom post type. Sets default settings given only the following params.
+	 * Returns the registered post type object, or an error object.
+	 *
+	 * @param string $post_type          the actual post type name
+	 *                                   IMPORTANT:
+	 *                                   this must match what the slug is for admin pages related to this CPT
+	 *                                   Also any models must use this slug as well
+	 * @param string $singular_name      a pre-internationalized string for the singular name of the objects
+	 * @param string $plural_name        a pre-internationalized string for the plural name of the objects
+	 * @param string $singular_slug
+	 * @param string $plural_slug
+	 * @param array  $override_arguments exactly like $args as described in
+	 *                                   http://codex.wordpress.org/Function_Reference/register_post_type
+	 * @return WP_Post_Type|WP_Error
+	 * @throws DomainException
+	 */
+	public function registerCustomPostType(
+		$post_type,
+		$singular_name,
+		$plural_name,
+		$singular_slug = '',
+		$plural_slug = '',
+		array $override_arguments = array()
+	) {
+		$wp_post_type = register_post_type(
+			$post_type,
+			$this->prepareArguments(
+				$post_type,
+				$singular_name,
+				$plural_name,
+				$singular_slug,
+				$plural_slug,
+				$override_arguments
+			)
+		);
+		if ($wp_post_type instanceof WP_Error) {
+			throw new DomainException($wp_post_type->get_error_message());
+		}
+		return $wp_post_type;
+	}
 
 
-    /**
-     * @param string $post_type          the actual post type name
-     * @param string $singular_name      a pre-internationalized string for the singular name of the objects
-     * @param string $plural_name        a pre-internationalized string for the plural name of the objects
-     * @param string $singular_slug
-     * @param string $plural_slug
-     * @param array  $override_arguments The default values set in this function will be overridden
-     *                                   by whatever you set in $override_arguments
-     * @return array
-     */
-    protected function prepareArguments(
-        $post_type,
-        $singular_name,
-        $plural_name,
-        $singular_slug,
-        $plural_slug,
-        array $override_arguments = array()
-    ) {
-        // verify plural slug and singular slug, if they aren't we'll use $singular_name and $plural_name
-        $singular_slug = ! empty($singular_slug) ? $singular_slug : $singular_name;
-        $plural_slug = ! empty($plural_slug) ? $plural_slug : $plural_name;
-        $labels = $this->getLabels(
-            $singular_name,
-            $plural_name,
-            $singular_slug,
-            $plural_slug
-        );
-        // note the page_templates arg in the supports index is something specific to EE.
-        // WordPress doesn't actually have that in their register_post_type api.
-        $arguments = $this->getDefaultArguments($labels, $post_type, $plural_slug);
-        if ($override_arguments) {
-            if (isset($override_arguments['labels'])) {
-                $labels = array_merge($arguments['labels'], $override_arguments['labels']);
-            }
-            $arguments = array_merge($arguments, $override_arguments);
-            $arguments['labels'] = $labels;
-        }
-        return $arguments;
-    }
+	/**
+	 * @param string $post_type          the actual post type name
+	 * @param string $singular_name      a pre-internationalized string for the singular name of the objects
+	 * @param string $plural_name        a pre-internationalized string for the plural name of the objects
+	 * @param string $singular_slug
+	 * @param string $plural_slug
+	 * @param array  $override_arguments The default values set in this function will be overridden
+	 *                                   by whatever you set in $override_arguments
+	 * @return array
+	 */
+	protected function prepareArguments(
+		$post_type,
+		$singular_name,
+		$plural_name,
+		$singular_slug,
+		$plural_slug,
+		array $override_arguments = array()
+	) {
+		// verify plural slug and singular slug, if they aren't we'll use $singular_name and $plural_name
+		$singular_slug = ! empty($singular_slug) ? $singular_slug : $singular_name;
+		$plural_slug = ! empty($plural_slug) ? $plural_slug : $plural_name;
+		$labels = $this->getLabels(
+			$singular_name,
+			$plural_name,
+			$singular_slug,
+			$plural_slug
+		);
+		// note the page_templates arg in the supports index is something specific to EE.
+		// WordPress doesn't actually have that in their register_post_type api.
+		$arguments = $this->getDefaultArguments($labels, $post_type, $plural_slug);
+		if ($override_arguments) {
+			if (isset($override_arguments['labels'])) {
+				$labels = array_merge($arguments['labels'], $override_arguments['labels']);
+			}
+			$arguments = array_merge($arguments, $override_arguments);
+			$arguments['labels'] = $labels;
+		}
+		return $arguments;
+	}
 
 
-    /**
-     * @param string $singular_name
-     * @param string $plural_name
-     * @param string $singular_slug
-     * @param string $plural_slug
-     * @return array
-     */
-    private function getLabels($singular_name, $plural_name, $singular_slug, $plural_slug)
-    {
-        return array(
-            'name'               => $plural_name,
-            'singular_name'      => $singular_name,
-            'singular_slug'      => $singular_slug,
-            'plural_slug'        => $plural_slug,
-            'add_new'            => sprintf(
-                esc_html_x('Add %s', 'Add Event', 'event_espresso'),
-                $singular_name
-            ),
-            'add_new_item'       => sprintf(
-                esc_html_x('Add New %s', 'Add New Event', 'event_espresso'),
-                $singular_name
-            ),
-            'edit_item'          => sprintf(
-                esc_html_x('Edit %s', 'Edit Event', 'event_espresso'),
-                $singular_name
-            ),
-            'new_item'           => sprintf(
-                esc_html_x('New %s', 'New Event', 'event_espresso'),
-                $singular_name
-            ),
-            'all_items'          => sprintf(
-                esc_html_x('All %s', 'All Events', 'event_espresso'),
-                $plural_name
-            ),
-            'view_item'          => sprintf(
-                esc_html_x('View %s', 'View Event', 'event_espresso'),
-                $singular_name
-            ),
-            'search_items'       => sprintf(
-                esc_html_x('Search %s', 'Search Events', 'event_espresso'),
-                $plural_name
-            ),
-            'not_found'          => sprintf(
-                esc_html_x('No %s found', 'No Events found', 'event_espresso'),
-                $plural_name
-            ),
-            'not_found_in_trash' => sprintf(
-                esc_html_x('No %s found in Trash', 'No Events found in Trash', 'event_espresso'),
-                $plural_name
-            ),
-            'parent_item_colon'  => '',
-            'menu_name'          => $plural_name,
-        );
-    }
+	/**
+	 * @param string $singular_name
+	 * @param string $plural_name
+	 * @param string $singular_slug
+	 * @param string $plural_slug
+	 * @return array
+	 */
+	private function getLabels($singular_name, $plural_name, $singular_slug, $plural_slug)
+	{
+		return array(
+			'name'               => $plural_name,
+			'singular_name'      => $singular_name,
+			'singular_slug'      => $singular_slug,
+			'plural_slug'        => $plural_slug,
+			'add_new'            => sprintf(
+				esc_html_x('Add %s', 'Add Event', 'event_espresso'),
+				$singular_name
+			),
+			'add_new_item'       => sprintf(
+				esc_html_x('Add New %s', 'Add New Event', 'event_espresso'),
+				$singular_name
+			),
+			'edit_item'          => sprintf(
+				esc_html_x('Edit %s', 'Edit Event', 'event_espresso'),
+				$singular_name
+			),
+			'new_item'           => sprintf(
+				esc_html_x('New %s', 'New Event', 'event_espresso'),
+				$singular_name
+			),
+			'all_items'          => sprintf(
+				esc_html_x('All %s', 'All Events', 'event_espresso'),
+				$plural_name
+			),
+			'view_item'          => sprintf(
+				esc_html_x('View %s', 'View Event', 'event_espresso'),
+				$singular_name
+			),
+			'search_items'       => sprintf(
+				esc_html_x('Search %s', 'Search Events', 'event_espresso'),
+				$plural_name
+			),
+			'not_found'          => sprintf(
+				esc_html_x('No %s found', 'No Events found', 'event_espresso'),
+				$plural_name
+			),
+			'not_found_in_trash' => sprintf(
+				esc_html_x('No %s found in Trash', 'No Events found in Trash', 'event_espresso'),
+				$plural_name
+			),
+			'parent_item_colon'  => '',
+			'menu_name'          => $plural_name,
+		);
+	}
 
 
-    /**
-     * @param array  $labels
-     * @param string $post_type
-     * @param string $plural_slug
-     * @return array
-     */
-    private function getDefaultArguments(array $labels, $post_type, $plural_slug)
-    {
-        return array(
-            'labels'             => $labels,
-            'public'             => true,
-            'publicly_queryable' => true,
-            'show_ui'            => false,
-            'show_ee_ui'         => true,
-            'show_in_menu'       => false,
-            'show_in_nav_menus'  => false,
-            'query_var'          => true,
-            'rewrite'            => apply_filters(
-                'FHEE__EventEspresso_core_domain_entities_custom_post_types_RegisterCustomPostTypes__getDefaultArguments__rewrite',
-                // legacy filter applied for now,
-                // later on we'll run a has_filter($tag) check and throw a doing_it_wrong() notice
-                apply_filters(
-                    'FHEE__EE_Register_CPTs__register_CPT__rewrite',
-                    array('slug' => $plural_slug),
-                    $post_type
-                ),
-                $post_type,
-                $plural_slug
-            ),
-            'capability_type'    => 'post',
-            'map_meta_cap'       => true,
-            'has_archive'        => true,
-            'hierarchical'       => false,
-            'menu_position'      => null,
-            'supports'           => array(
-                'title',
-                'editor',
-                'author',
-                'thumbnail',
-                'excerpt',
-                'custom-fields',
-                'comments',
-            ),
-        );
-    }
+	/**
+	 * @param array  $labels
+	 * @param string $post_type
+	 * @param string $plural_slug
+	 * @return array
+	 */
+	private function getDefaultArguments(array $labels, $post_type, $plural_slug)
+	{
+		return array(
+			'labels'             => $labels,
+			'public'             => true,
+			'publicly_queryable' => true,
+			'show_ui'            => false,
+			'show_ee_ui'         => true,
+			'show_in_menu'       => false,
+			'show_in_nav_menus'  => false,
+			'query_var'          => true,
+			'rewrite'            => apply_filters(
+				'FHEE__EventEspresso_core_domain_entities_custom_post_types_RegisterCustomPostTypes__getDefaultArguments__rewrite',
+				// legacy filter applied for now,
+				// later on we'll run a has_filter($tag) check and throw a doing_it_wrong() notice
+				apply_filters(
+					'FHEE__EE_Register_CPTs__register_CPT__rewrite',
+					array('slug' => $plural_slug),
+					$post_type
+				),
+				$post_type,
+				$plural_slug
+			),
+			'capability_type'    => 'post',
+			'map_meta_cap'       => true,
+			'has_archive'        => true,
+			'hierarchical'       => false,
+			'menu_position'      => null,
+			'supports'           => array(
+				'title',
+				'editor',
+				'author',
+				'thumbnail',
+				'excerpt',
+				'custom-fields',
+				'comments',
+			),
+		);
+	}
 }

core/services/collections/InvalidCollectionIdentifierException.php

Indentation +21 added lines, -21 removed lines

@@ -16,26 +16,26 @@
 class InvalidCollectionIdentifierException extends OutOfBoundsException
 {
 
-    /**
-     * InvalidCollectionIdentifierException constructor.
-     *
-     * @param                $identifier
-     * @param string         $message
-     * @param int            $code
-     * @param Exception|null $previous
-     */
-    public function __construct($identifier, $message = '', $code = 0, Exception $previous = null)
-    {
-        if (empty($message)) {
-            $message = sprintf(
-                __(
-                    'The supplied identifier "%1$s" does not exist within this collection. 
+	/**
+	 * InvalidCollectionIdentifierException constructor.
+	 *
+	 * @param                $identifier
+	 * @param string         $message
+	 * @param int            $code
+	 * @param Exception|null $previous
+	 */
+	public function __construct($identifier, $message = '', $code = 0, Exception $previous = null)
+	{
+		if (empty($message)) {
+			$message = sprintf(
+				__(
+					'The supplied identifier "%1$s" does not exist within this collection. 
                     You may need to delay adding this asset until the required dependency has been added.',
-                    'event_espresso'
-                ),
-                $identifier
-            );
-        }
-        parent::__construct($message, $code, $previous);
-    }
+					'event_espresso'
+				),
+				$identifier
+			);
+		}
+		parent::__construct($message, $code, $previous);
+	}
 }

core/services/collections/DuplicateCollectionIdentifierException.php

Indentation +21 added lines, -21 removed lines

@@ -16,25 +16,25 @@
 class DuplicateCollectionIdentifierException extends OutOfRangeException
 {
 
-    /**
-     * DuplicateCollectionIdentifierException constructor.
-     *
-     * @param                $identifier
-     * @param string         $message
-     * @param int            $code
-     * @param Exception|null $previous
-     */
-    public function __construct($identifier, $message = '', $code = 0, Exception $previous = null)
-    {
-        if (empty($message)) {
-            $message = sprintf(
-                __(
-                    'The supplied identifier "%1$s" already exists within this collection.',
-                    'event_espresso'
-                ),
-                $identifier
-            );
-        }
-        parent::__construct($message, $code, $previous);
-    }
+	/**
+	 * DuplicateCollectionIdentifierException constructor.
+	 *
+	 * @param                $identifier
+	 * @param string         $message
+	 * @param int            $code
+	 * @param Exception|null $previous
+	 */
+	public function __construct($identifier, $message = '', $code = 0, Exception $previous = null)
+	{
+		if (empty($message)) {
+			$message = sprintf(
+				__(
+					'The supplied identifier "%1$s" already exists within this collection.',
+					'event_espresso'
+				),
+				$identifier
+			);
+		}
+		parent::__construct($message, $code, $previous);
+	}
 }

core/exceptions/InvalidIdentifierException.php

Indentation +23 added lines, -23 removed lines

@@ -16,28 +16,28 @@
 class InvalidIdentifierException extends InvalidArgumentException
 {
 
-    /**
-     * InvalidIdentifierException constructor.
-     *
-     * @param string     $actual   the identifier that was supplied
-     * @param string     $expected example of an acceptable identifier
-     * @param string     $message
-     * @param int        $code
-     * @param Exception $previous
-     */
-    public function __construct($actual, $expected, $message = '', $code = 0, Exception $previous = null)
-    {
-        if (empty($message)) {
-            $message = sprintf(
-                __(
-                    'The supplied identifier "%1$s" is invalid. A value like "%2$s" was expected.',
-                    'event_espresso'
-                ),
-                $actual,
-                $expected
-            );
-        }
-        parent::__construct($message, $code, $previous);
-    }
+	/**
+	 * InvalidIdentifierException constructor.
+	 *
+	 * @param string     $actual   the identifier that was supplied
+	 * @param string     $expected example of an acceptable identifier
+	 * @param string     $message
+	 * @param int        $code
+	 * @param Exception $previous
+	 */
+	public function __construct($actual, $expected, $message = '', $code = 0, Exception $previous = null)
+	{
+		if (empty($message)) {
+			$message = sprintf(
+				__(
+					'The supplied identifier "%1$s" is invalid. A value like "%2$s" was expected.',
+					'event_espresso'
+				),
+				$actual,
+				$expected
+			);
+		}
+		parent::__construct($message, $code, $previous);
+	}
 }
 // Location: core/exceptions/InvalidIdentifierException.php

core/domain/values/assets/ManifestFile.php

Indentation +22 added lines, -22 removed lines

@@ -16,26 +16,26 @@
 class ManifestFile extends Asset
 {
 
-    /**
-     * Asset constructor.
-     *
-     * @param DomainInterface $domain
-     * @throws InvalidDataTypeException
-     */
-    public function __construct(DomainInterface $domain)
-    {
-        parent::__construct(Asset::TYPE_MANIFEST, $domain->assetNamespace(), $domain);
-    }
-
-
-    public function urlBase()
-    {
-        return $this->domain->distributionAssetsUrl();
-    }
-
-
-    public function filepath()
-    {
-        return $this->domain->distributionAssetsPath();
-    }
+	/**
+	 * Asset constructor.
+	 *
+	 * @param DomainInterface $domain
+	 * @throws InvalidDataTypeException
+	 */
+	public function __construct(DomainInterface $domain)
+	{
+		parent::__construct(Asset::TYPE_MANIFEST, $domain->assetNamespace(), $domain);
+	}
+
+
+	public function urlBase()
+	{
+		return $this->domain->distributionAssetsUrl();
+	}
+
+
+	public function filepath()
+	{
+		return $this->domain->distributionAssetsPath();
+	}
 }

core/domain/values/assets/Asset.php

Spacing +2 added lines, -2 removed lines

@@ -82,7 +82,7 @@ 
      */
     private function setType($type)
     {
-        if (! in_array($type, $this->validAssetTypes(), true)) {
+        if ( ! in_array($type, $this->validAssetTypes(), true)) {
             throw new InvalidDataTypeException(
                 'Asset::$type',
                 $type,
@@ -99,7 +99,7 @@ 
      */
     private function setHandle($handle)
     {
-        if (! is_string($handle)) {
+        if ( ! is_string($handle)) {
             throw new InvalidDataTypeException(
                 '$handle',
                 $handle,

Indentation +150 added lines, -150 removed lines

@@ -16,154 +16,154 @@
 abstract class Asset
 {
 
-    /**
-     * indicates the file extension for a build distribution CSS file
-     */
-    const FILE_EXTENSION_DISTRIBUTION_CSS = '.dist.css';
-
-    /**
-     * indicates the file extension for a build distribution JS file
-     */
-    const FILE_EXTENSION_DISTRIBUTION_JS = '.dist.js';
-
-    /**
-     * indicates a Cascading Style Sheet asset
-     */
-    const TYPE_CSS = 'css';
-
-    /**
-     * indicates a Javascript asset
-     */
-    const TYPE_JS = 'js';
-
-    /**
-     * indicates a Javascript manifest file
-     */
-    const TYPE_MANIFEST = 'manifest';
-
-    /**
-     * @var DomainInterface $domain
-     */
-    protected $domain;
-
-    /**
-     * @var string $type
-     */
-    private $type;
-
-    /**
-     * @var string $handle
-     */
-    private $handle;
-
-    /**
-     * @var bool $registered
-     */
-    private $registered = false;
-
-
-    /**
-     * Asset constructor.
-     *
-     * @param                 $type
-     * @param string          $handle
-     * @param DomainInterface $domain
-     * @throws InvalidDataTypeException
-     */
-    public function __construct($type, $handle, DomainInterface $domain)
-    {
-        $this->domain = $domain;
-        $this->setType($type);
-        $this->setHandle($handle);
-    }
-
-
-    /**
-     * @return array
-     */
-    public function validAssetTypes()
-    {
-        return array(
-            Asset::TYPE_CSS,
-            Asset::TYPE_JS,
-            Asset::TYPE_MANIFEST,
-        );
-    }
-
-
-    /**
-     * @param string $type
-     * @throws InvalidDataTypeException
-     */
-    private function setType($type)
-    {
-        if (! in_array($type, $this->validAssetTypes(), true)) {
-            throw new InvalidDataTypeException(
-                'Asset::$type',
-                $type,
-                'one of the TYPE_* class constants on \EventEspresso\core\domain\values\Asset is required'
-            );
-        }
-        $this->type = $type;
-    }
-
-
-    /**
-     * @param string $handle
-     * @throws InvalidDataTypeException
-     */
-    private function setHandle($handle)
-    {
-        if (! is_string($handle)) {
-            throw new InvalidDataTypeException(
-                '$handle',
-                $handle,
-                'string'
-            );
-        }
-        $this->handle = $handle;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function assetNamespace()
-    {
-        return $this->domain->assetNamespace();
-    }
-
-
-    /**
-     * @return string
-     */
-    public function type()
-    {
-        return $this->type;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function handle()
-    {
-        return $this->handle;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isRegistered()
-    {
-        return $this->registered;
-    }
-
-    /**
-     * @param bool $registered
-     */
-    public function setRegistered($registered = true)
-    {
-        $this->registered = filter_var($registered, FILTER_VALIDATE_BOOLEAN);
-    }
+	/**
+	 * indicates the file extension for a build distribution CSS file
+	 */
+	const FILE_EXTENSION_DISTRIBUTION_CSS = '.dist.css';
+
+	/**
+	 * indicates the file extension for a build distribution JS file
+	 */
+	const FILE_EXTENSION_DISTRIBUTION_JS = '.dist.js';
+
+	/**
+	 * indicates a Cascading Style Sheet asset
+	 */
+	const TYPE_CSS = 'css';
+
+	/**
+	 * indicates a Javascript asset
+	 */
+	const TYPE_JS = 'js';
+
+	/**
+	 * indicates a Javascript manifest file
+	 */
+	const TYPE_MANIFEST = 'manifest';
+
+	/**
+	 * @var DomainInterface $domain
+	 */
+	protected $domain;
+
+	/**
+	 * @var string $type
+	 */
+	private $type;
+
+	/**
+	 * @var string $handle
+	 */
+	private $handle;
+
+	/**
+	 * @var bool $registered
+	 */
+	private $registered = false;
+
+
+	/**
+	 * Asset constructor.
+	 *
+	 * @param                 $type
+	 * @param string          $handle
+	 * @param DomainInterface $domain
+	 * @throws InvalidDataTypeException
+	 */
+	public function __construct($type, $handle, DomainInterface $domain)
+	{
+		$this->domain = $domain;
+		$this->setType($type);
+		$this->setHandle($handle);
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function validAssetTypes()
+	{
+		return array(
+			Asset::TYPE_CSS,
+			Asset::TYPE_JS,
+			Asset::TYPE_MANIFEST,
+		);
+	}
+
+
+	/**
+	 * @param string $type
+	 * @throws InvalidDataTypeException
+	 */
+	private function setType($type)
+	{
+		if (! in_array($type, $this->validAssetTypes(), true)) {
+			throw new InvalidDataTypeException(
+				'Asset::$type',
+				$type,
+				'one of the TYPE_* class constants on \EventEspresso\core\domain\values\Asset is required'
+			);
+		}
+		$this->type = $type;
+	}
+
+
+	/**
+	 * @param string $handle
+	 * @throws InvalidDataTypeException
+	 */
+	private function setHandle($handle)
+	{
+		if (! is_string($handle)) {
+			throw new InvalidDataTypeException(
+				'$handle',
+				$handle,
+				'string'
+			);
+		}
+		$this->handle = $handle;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function assetNamespace()
+	{
+		return $this->domain->assetNamespace();
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function type()
+	{
+		return $this->type;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function handle()
+	{
+		return $this->handle;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isRegistered()
+	{
+		return $this->registered;
+	}
+
+	/**
+	 * @param bool $registered
+	 */
+	public function setRegistered($registered = true)
+	{
+		$this->registered = filter_var($registered, FILTER_VALIDATE_BOOLEAN);
+	}
 }

core/domain/values/assets/BrowserAsset.php

Spacing +2 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
      */
     private function setSource($source)
     {
-        if (! is_string($source)) {
+        if ( ! is_string($source)) {
             throw new InvalidDataTypeException(
                 '$source',
                 $source,
@@ -126,7 +126,7 @@ 
      */
     public function setVersion($version = EVENT_ESPRESSO_VERSION)
     {
-        if (! is_string($version)) {
+        if ( ! is_string($version)) {
             throw new InvalidDataTypeException(
                 '$version',
                 $version,

Indentation +132 added lines, -132 removed lines

@@ -16,136 +16,136 @@
 abstract class BrowserAsset extends Asset
 {
 
-    /**
-     * @var string $source
-     */
-    private $source;
-
-    /**
-     * @var array $dependencies
-     */
-    private $dependencies;
-
-    /**
-     * @var string $version
-     */
-    private $version;
-
-
-    /**
-     * Asset constructor.
-     *
-     * @param string          $type
-     * @param string          $handle
-     * @param string          $source
-     * @param array           $dependencies
-     * @param DomainInterface $domain
-     * @throws InvalidDataTypeException
-     */
-    public function __construct($type, $handle, $source, array $dependencies, DomainInterface $domain)
-    {
-        parent::__construct($type, $handle, $domain);
-        $this->setSource($source);
-        $this->setDependencies($dependencies);
-    }
-
-
-    /**
-     * @since 4.9.62.p
-     */
-    abstract public function enqueueAsset();
-
-
-    /**
-     * @return array
-     */
-    public function dependencies()
-    {
-        return $this->dependencies;
-    }
-
-
-    /**
-     * @param array $dependencies
-     */
-    private function setDependencies(array $dependencies)
-    {
-        $this->dependencies = $dependencies;
-    }
-
-
-    /**
-     * @since 4.9.62.p
-     * @return bool
-     */
-    public function hasDependencies()
-    {
-        return count($this->dependencies) > 0;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function source()
-    {
-        return $this->source;
-    }
-
-
-    /**
-     * @param string $source
-     * @throws InvalidDataTypeException
-     */
-    private function setSource($source)
-    {
-        if (! is_string($source)) {
-            throw new InvalidDataTypeException(
-                '$source',
-                $source,
-                'string'
-            );
-        }
-        $this->source = $source;
-    }
-
-
-    /**
-     * @return string
-     * @throws InvalidDataTypeException
-     */
-    public function version()
-    {
-        // if version is NOT set and this asset was NOT built for distribution,
-        // then set the version equal to the EE core plugin version
-        if (
-            $this->version === null
-            && (
-                substr($this->source, -8) !== Asset::FILE_EXTENSION_DISTRIBUTION_JS
-                || substr($this->source, -9) !== Asset::FILE_EXTENSION_DISTRIBUTION_CSS
-            )
-        ) {
-            $this->setVersion();
-        }
-        return $this->version;
-    }
-
-
-    /**
-     * @param string $version
-     * @return BrowserAsset
-     * @throws InvalidDataTypeException
-     */
-    public function setVersion($version = EVENT_ESPRESSO_VERSION)
-    {
-        if (! is_string($version)) {
-            throw new InvalidDataTypeException(
-                '$version',
-                $version,
-                'string'
-            );
-        }
-        $this->version = $version;
-        return $this;
-    }
+	/**
+	 * @var string $source
+	 */
+	private $source;
+
+	/**
+	 * @var array $dependencies
+	 */
+	private $dependencies;
+
+	/**
+	 * @var string $version
+	 */
+	private $version;
+
+
+	/**
+	 * Asset constructor.
+	 *
+	 * @param string          $type
+	 * @param string          $handle
+	 * @param string          $source
+	 * @param array           $dependencies
+	 * @param DomainInterface $domain
+	 * @throws InvalidDataTypeException
+	 */
+	public function __construct($type, $handle, $source, array $dependencies, DomainInterface $domain)
+	{
+		parent::__construct($type, $handle, $domain);
+		$this->setSource($source);
+		$this->setDependencies($dependencies);
+	}
+
+
+	/**
+	 * @since 4.9.62.p
+	 */
+	abstract public function enqueueAsset();
+
+
+	/**
+	 * @return array
+	 */
+	public function dependencies()
+	{
+		return $this->dependencies;
+	}
+
+
+	/**
+	 * @param array $dependencies
+	 */
+	private function setDependencies(array $dependencies)
+	{
+		$this->dependencies = $dependencies;
+	}
+
+
+	/**
+	 * @since 4.9.62.p
+	 * @return bool
+	 */
+	public function hasDependencies()
+	{
+		return count($this->dependencies) > 0;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function source()
+	{
+		return $this->source;
+	}
+
+
+	/**
+	 * @param string $source
+	 * @throws InvalidDataTypeException
+	 */
+	private function setSource($source)
+	{
+		if (! is_string($source)) {
+			throw new InvalidDataTypeException(
+				'$source',
+				$source,
+				'string'
+			);
+		}
+		$this->source = $source;
+	}
+
+
+	/**
+	 * @return string
+	 * @throws InvalidDataTypeException
+	 */
+	public function version()
+	{
+		// if version is NOT set and this asset was NOT built for distribution,
+		// then set the version equal to the EE core plugin version
+		if (
+			$this->version === null
+			&& (
+				substr($this->source, -8) !== Asset::FILE_EXTENSION_DISTRIBUTION_JS
+				|| substr($this->source, -9) !== Asset::FILE_EXTENSION_DISTRIBUTION_CSS
+			)
+		) {
+			$this->setVersion();
+		}
+		return $this->version;
+	}
+
+
+	/**
+	 * @param string $version
+	 * @return BrowserAsset
+	 * @throws InvalidDataTypeException
+	 */
+	public function setVersion($version = EVENT_ESPRESSO_VERSION)
+	{
+		if (! is_string($version)) {
+			throw new InvalidDataTypeException(
+				'$version',
+				$version,
+				'string'
+			);
+		}
+		$this->version = $version;
+		return $this;
+	}
 }

core/domain/values/assets/StylesheetAsset.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
      */
     private function setMedia($media)
     {
-        if (! is_string($media)) {
+        if ( ! is_string($media)) {
             throw new InvalidDataTypeException(
                 '$media',
                 $media,

Indentation +48 added lines, -48 removed lines

@@ -16,60 +16,60 @@
 class StylesheetAsset extends BrowserAsset
 {
 
-    /**
-     * @var string $media
-     */
-    private $media;
+	/**
+	 * @var string $media
+	 */
+	private $media;
 
 
-    /**
-     * CssFile constructor.
-     *
-     * @param                 $handle
-     * @param string          $source
-     * @param array           $dependencies
-     * @param DomainInterface $domain
-     * @param                 $media
-     * @throws InvalidDataTypeException
-     */
-    public function __construct($handle, $source, array $dependencies, DomainInterface $domain, $media = 'all')
-    {
-        parent::__construct(Asset::TYPE_CSS, $handle, $source, $dependencies, $domain);
-        $this->setMedia($media);
-    }
+	/**
+	 * CssFile constructor.
+	 *
+	 * @param                 $handle
+	 * @param string          $source
+	 * @param array           $dependencies
+	 * @param DomainInterface $domain
+	 * @param                 $media
+	 * @throws InvalidDataTypeException
+	 */
+	public function __construct($handle, $source, array $dependencies, DomainInterface $domain, $media = 'all')
+	{
+		parent::__construct(Asset::TYPE_CSS, $handle, $source, $dependencies, $domain);
+		$this->setMedia($media);
+	}
 
 
-    /**
-     * @return string
-     */
-    public function media()
-    {
-        return $this->media;
-    }
+	/**
+	 * @return string
+	 */
+	public function media()
+	{
+		return $this->media;
+	}
 
 
-    /**
-     * @param string $media
-     * @throws InvalidDataTypeException
-     */
-    private function setMedia($media)
-    {
-        if (! is_string($media)) {
-            throw new InvalidDataTypeException(
-                '$media',
-                $media,
-                'string'
-            );
-        }
-        $this->media = $media;
-    }
+	/**
+	 * @param string $media
+	 * @throws InvalidDataTypeException
+	 */
+	private function setMedia($media)
+	{
+		if (! is_string($media)) {
+			throw new InvalidDataTypeException(
+				'$media',
+				$media,
+				'string'
+			);
+		}
+		$this->media = $media;
+	}
 
 
-    /**
-     * @since 4.9.62.p
-     */
-    public function enqueueAsset()
-    {
-        wp_enqueue_style($this->handle());
-    }
+	/**
+	 * @since 4.9.62.p
+	 */
+	public function enqueueAsset()
+	{
+		wp_enqueue_style($this->handle());
+	}
 }