intraxia / jaxion

src/Assets/ServiceProvider.php

Indentation +32 added lines, -32 removed lines

@@ -11,40 +11,40 @@
  * @subpackage Assets
  */
 class ServiceProvider implements ServiceProviderContract {
-	/**
-	 * Container to register with.
-	 *
-	 * @var Container
-	 */
-	protected $container;
+    /**
+     * Container to register with.
+     *
+     * @var Container
+     */
+    protected $container;
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @param Container $container
-	 */
-	public function register( Container $container ) {
-		$this->container = $container;
+    /**
+     * {@inheritDoc}
+     *
+     * @param Container $container
+     */
+    public function register( Container $container ) {
+        $this->container = $container;
 
-		$container->define(
-			array( 'assets' => 'Intraxia\Jaxion\Contract\Assets\Register' ),
-			$register = new Register( $container->fetch( 'url' ), $container->fetch( 'version' ) )
-		);
+        $container->define(
+            array( 'assets' => 'Intraxia\Jaxion\Contract\Assets\Register' ),
+            $register = new Register( $container->fetch( 'url' ), $container->fetch( 'version' ) )
+        );
 
-		$this->add_assets( $register );
-	}
+        $this->add_assets( $register );
+    }
 
-	/**
-	 * Registers the assets on the generated Register.
-	 *
-	 * This is a no-op by default by can be overwritten by the implementing developer
-	 * to provide a single, clean location to register their assets.
-	 *
-	 * @param Register $register
-	 *
-	 * @codeCoverageIgnore
-	 */
-	protected function add_assets( Register $register ) {
-		// no-op
-	}
+    /**
+     * Registers the assets on the generated Register.
+     *
+     * This is a no-op by default by can be overwritten by the implementing developer
+     * to provide a single, clean location to register their assets.
+     *
+     * @param Register $register
+     *
+     * @codeCoverageIgnore
+     */
+    protected function add_assets( Register $register ) {
+        // no-op
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -23,15 +23,15 @@ 
 	 *
 	 * @param Container $container
 	 */
-	public function register( Container $container ) {
+	public function register(Container $container) {
 		$this->container = $container;
 
 		$container->define(
-			array( 'assets' => 'Intraxia\Jaxion\Contract\Assets\Register' ),
-			$register = new Register( $container->fetch( 'url' ), $container->fetch( 'version' ) )
+			array('assets' => 'Intraxia\Jaxion\Contract\Assets\Register'),
+			$register = new Register($container->fetch('url'), $container->fetch('version'))
 		);
 
-		$this->add_assets( $register );
+		$this->add_assets($register);
 	}
 
 	/**
@@ -44,7 +44,7 @@ 
 	 *
 	 * @codeCoverageIgnore
 	 */
-	protected function add_assets( Register $register ) {
+	protected function add_assets(Register $register) {
 		// no-op
 	}
 }

src/Core/Loader.php

Indentation +97 added lines, -97 removed lines

@@ -15,109 +15,109 @@
  * @subpackage Core
  */
 class Loader implements LoaderContract {
-	/**
-	 * Array of action hooks to attach.
-	 *
-	 * @var array[]
-	 */
-	protected $actions = array();
+    /**
+     * Array of action hooks to attach.
+     *
+     * @var array[]
+     */
+    protected $actions = array();
 
-	/**
-	 * Array of filter hooks to attach.
-	 *
-	 * @var array[]
-	 */
-	protected $filters = array();
+    /**
+     * Array of filter hooks to attach.
+     *
+     * @var array[]
+     */
+    protected $filters = array();
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function run() {
-		foreach ( $this->actions as $action ) {
-			add_action(
-				$action['hook'],
-				array( $action['service'], $action['method'] ),
-				$action['priority'],
-				$action['args']
-			);
-		}
+    /**
+     * {@inheritDoc}
+     */
+    public function run() {
+        foreach ( $this->actions as $action ) {
+            add_action(
+                $action['hook'],
+                array( $action['service'], $action['method'] ),
+                $action['priority'],
+                $action['args']
+            );
+        }
 
-		foreach ( $this->filters as $filter ) {
-			add_filter(
-				$filter['hook'],
-				array( $filter['service'], $filter['method'] ),
-				$filter['priority'],
-				$filter['args']
-			);
-		}
-	}
+        foreach ( $this->filters as $filter ) {
+            add_filter(
+                $filter['hook'],
+                array( $filter['service'], $filter['method'] ),
+                $filter['priority'],
+                $filter['args']
+            );
+        }
+    }
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @param HasActions $service
-	 */
-	public function register_actions( HasActions $service ) {
-		foreach ( $service->action_hooks() as $action ) {
-			$this->actions = $this->add(
-				$this->actions,
-				$action['hook'],
-				$service,
-				$action['method'],
-				isset( $action['priority'] ) ? $action['priority'] : 10,
-				isset( $action['args'] ) ? $action['args'] : 1
-			);
-		}
-	}
+    /**
+     * {@inheritDoc}
+     *
+     * @param HasActions $service
+     */
+    public function register_actions( HasActions $service ) {
+        foreach ( $service->action_hooks() as $action ) {
+            $this->actions = $this->add(
+                $this->actions,
+                $action['hook'],
+                $service,
+                $action['method'],
+                isset( $action['priority'] ) ? $action['priority'] : 10,
+                isset( $action['args'] ) ? $action['args'] : 1
+            );
+        }
+    }
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @param HasFilters $service
-	 */
-	public function register_filters( HasFilters $service ) {
-		foreach ( $service->filter_hooks() as $filter ) {
-			$this->filters = $this->add(
-				$this->filters,
-				$filter['hook'],
-				$service,
-				$filter['method'],
-				isset( $filter['priority'] ) ? $filter['priority'] : 10,
-				isset( $filter['args'] ) ? $filter['args'] : 1
-			);
-		}
-	}
+    /**
+     * {@inheritDoc}
+     *
+     * @param HasFilters $service
+     */
+    public function register_filters( HasFilters $service ) {
+        foreach ( $service->filter_hooks() as $filter ) {
+            $this->filters = $this->add(
+                $this->filters,
+                $filter['hook'],
+                $service,
+                $filter['method'],
+                isset( $filter['priority'] ) ? $filter['priority'] : 10,
+                isset( $filter['args'] ) ? $filter['args'] : 1
+            );
+        }
+    }
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @param HasShortcode $service
-	 */
-	public function register_shortcode( HasShortcode $service ) {
-		add_shortcode( $service->shortcode_name(), array( $service, 'do_shortcode' ) );
-	}
+    /**
+     * {@inheritDoc}
+     *
+     * @param HasShortcode $service
+     */
+    public function register_shortcode( HasShortcode $service ) {
+        add_shortcode( $service->shortcode_name(), array( $service, 'do_shortcode' ) );
+    }
 
-	/**
-	 * Utility to register the actions and hooks into a single collection.
-	 *
-	 * @param array  $hooks
-	 * @param string $hook
-	 * @param object $service
-	 * @param string $method
-	 * @param int    $priority
-	 * @param int    $accepted_args
-	 *
-	 * @return array
-	 */
-	protected function add( $hooks, $hook, $service, $method, $priority, $accepted_args ) {
-		$hooks[] = array(
-			'hook'     => $hook,
-			'service'  => $service,
-			'method'   => $method,
-			'priority' => $priority,
-			'args'     => $accepted_args,
-		);
+    /**
+     * Utility to register the actions and hooks into a single collection.
+     *
+     * @param array  $hooks
+     * @param string $hook
+     * @param object $service
+     * @param string $method
+     * @param int    $priority
+     * @param int    $accepted_args
+     *
+     * @return array
+     */
+    protected function add( $hooks, $hook, $service, $method, $priority, $accepted_args ) {
+        $hooks[] = array(
+            'hook'     => $hook,
+            'service'  => $service,
+            'method'   => $method,
+            'priority' => $priority,
+            'args'     => $accepted_args,
+        );
 
-		return $hooks;
-	}
+        return $hooks;
+    }
 }

Spacing +15 added lines, -15 removed lines

@@ -33,19 +33,19 @@ 
 	 * {@inheritDoc}
 	 */
 	public function run() {
-		foreach ( $this->actions as $action ) {
+		foreach ($this->actions as $action) {
 			add_action(
 				$action['hook'],
-				array( $action['service'], $action['method'] ),
+				array($action['service'], $action['method']),
 				$action['priority'],
 				$action['args']
 			);
 		}
 
-		foreach ( $this->filters as $filter ) {
+		foreach ($this->filters as $filter) {
 			add_filter(
 				$filter['hook'],
-				array( $filter['service'], $filter['method'] ),
+				array($filter['service'], $filter['method']),
 				$filter['priority'],
 				$filter['args']
 			);
@@ -57,15 +57,15 @@ 
 	 *
 	 * @param HasActions $service
 	 */
-	public function register_actions( HasActions $service ) {
-		foreach ( $service->action_hooks() as $action ) {
+	public function register_actions(HasActions $service) {
+		foreach ($service->action_hooks() as $action) {
 			$this->actions = $this->add(
 				$this->actions,
 				$action['hook'],
 				$service,
 				$action['method'],
-				isset( $action['priority'] ) ? $action['priority'] : 10,
-				isset( $action['args'] ) ? $action['args'] : 1
+				isset($action['priority']) ? $action['priority'] : 10,
+				isset($action['args']) ? $action['args'] : 1
 			);
 		}
 	}
@@ -75,15 +75,15 @@ 
 	 *
 	 * @param HasFilters $service
 	 */
-	public function register_filters( HasFilters $service ) {
-		foreach ( $service->filter_hooks() as $filter ) {
+	public function register_filters(HasFilters $service) {
+		foreach ($service->filter_hooks() as $filter) {
 			$this->filters = $this->add(
 				$this->filters,
 				$filter['hook'],
 				$service,
 				$filter['method'],
-				isset( $filter['priority'] ) ? $filter['priority'] : 10,
-				isset( $filter['args'] ) ? $filter['args'] : 1
+				isset($filter['priority']) ? $filter['priority'] : 10,
+				isset($filter['args']) ? $filter['args'] : 1
 			);
 		}
 	}
@@ -93,8 +93,8 @@ 
 	 *
 	 * @param HasShortcode $service
 	 */
-	public function register_shortcode( HasShortcode $service ) {
-		add_shortcode( $service->shortcode_name(), array( $service, 'do_shortcode' ) );
+	public function register_shortcode(HasShortcode $service) {
+		add_shortcode($service->shortcode_name(), array($service, 'do_shortcode'));
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 	 *
 	 * @return array
 	 */
-	protected function add( $hooks, $hook, $service, $method, $priority, $accepted_args ) {
+	protected function add($hooks, $hook, $service, $method, $priority, $accepted_args) {
 		$hooks[] = array(
 			'hook'     => $hook,
 			'service'  => $service,

src/Core/Container.php

Indentation +318 added lines, -318 removed lines

@@ -13,322 +13,322 @@
  * @subpackage Core
  */
 class Container implements ContainerContract {
-	/**
-	 * ServiceProvider names to register with the container.
-	 *
-	 * Can be overwritten to include predefined providers.
-	 *
-	 * @var string[]
-	 */
-	protected $providers = array();
-
-	/**
-	 * Registered definitions.
-	 *
-	 * @var mixed[]
-	 */
-	private $definitions = array();
-
-	/**
-	 * Aliases to share between fetches.
-	 *
-	 * @var <string, true>[]
-	 */
-	private $shared = array();
-
-	/**
-	 * Aliases of all the registered services.
-	 *
-	 * @var <string, true>[]
-	 */
-	private $aliases = array();
-
-	/**
-	 * Array of classes registered on the container.
-	 *
-	 * @var <string, true>[]
-	 */
-	private $classes = array();
-
-	/**
-	 * Current position in the loop.
-	 *
-	 * @var int
-	 */
-	private $position;
-
-	/**
-	 * 0-indexed array of aliases for looping.
-	 *
-	 * @var string[]
-	 */
-	private $keys = array();
-
-	/**
-	 * Create a new container with the given providers.
-	 *
-	 * Providers can be instances or the class of the provider as a string.
-	 *
-	 * @param ServiceProvider[]|string[] $providers
-	 */
-	public function __construct( array $providers = array() ) {
-		// array_unique ensures we only register each provider once.
-		$providers = array_unique( array_merge( $this->providers, $providers ) );
-
-		foreach ( $providers as $provider ) {
-			if ( is_string( $provider ) && class_exists( $provider ) ) {
-				$provider = new $provider;
-			}
-
-			if ( $provider instanceof ServiceProvider ) {
-				$this->register( $provider );
-			}
-		}
-	}
-
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param string|array $alias
-	 * @param mixed        $definition
-	 *
-	 * @throws DefinedAliasException
-	 *
-	 * @return $this
-	 */
-	public function define( $alias, $definition ) {
-		if ( is_array( $alias ) ) {
-			$class = current( $alias );
-			$alias = key( $alias );
-		}
-
-		if ( isset( $this->aliases[ $alias ] ) ) {
-			throw new DefinedAliasException( $alias );
-		}
-
-		$this->aliases[ $alias ]     = true;
-		$this->definitions[ $alias ] = $definition;
-
-		// Closures are treated as factories unless
-		// defined via Container::share.
-		if ( ! $definition instanceof \Closure ) {
-			$this->shared[ $alias ] = true;
-		}
-
-		if ( isset( $class ) ) {
-			$this->classes[ $class ] = $alias;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param string|array $alias
-	 * @param mixed        $definition
-	 *
-	 * @throws DefinedAliasException
-	 *
-	 * @return $this
-	 */
-	public function share( $alias, $definition ) {
-		$this->define( $alias, $definition );
-
-		if ( is_array( $alias ) ) {
-			$alias = key( $alias );
-		}
-
-		$this->shared[ $alias ] = true;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param string $alias
-	 *
-	 * @throws UndefinedAliasException
-	 *
-	 * @return mixed
-	 */
-	public function fetch( $alias ) {
-		if ( isset( $this->classes[ $alias ] ) ) {
-			// If the alias is a class name,
-			// then retrieve its linked alias.
-			// This is only registered when
-			// registering using an array.
-			$alias = $this->classes[ $alias ];
-		}
-
-		if ( ! isset( $this->aliases[ $alias ] ) ) {
-			throw new UndefinedAliasException( $alias );
-		}
-
-		$value = $this->definitions[ $alias ];
-
-		// If the shared value is a closure,
-		// execute it and assign the result
-		// in place of the closure.
-		if ( $value instanceof \Closure ) {
-			$factory = $value;
-			$value   = $factory( $this );
-		}
-
-		// If the value is shared, save the shared value.
-		if ( isset( $this->shared[ $alias ] ) ) {
-			$this->definitions[ $alias ] = $value;
-		}
-
-		// Return the fetched value.
-		return $value;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param  string $alias
-	 *
-	 * @return bool
-	 */
-	public function has( $alias ) {
-		return isset( $this->aliases[ $alias ] );
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @param string $alias
-	 *
-	 * @return $this
-	 */
-	public function remove( $alias ) {
-		if ( isset( $this->aliases[ $alias ] ) ) {
-			/**
-			 * If there's no reference in the aliases array,
-			 * the service won't be found on fetching and
-			 * can be overwritten on setting.
-			 *
-			 * Pros: Quick setting/unsetting, faster
-			 * performance on those operations when doing
-			 * a lot of these.
-			 *
-			 * Cons: Objects and values set in the container
-			 * can't get garbage collected.
-			 *
-			 * If this is a problem, this may need to be revisited.
-			 */
-			unset( $this->aliases[ $alias ] );
-		}
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @param ServiceProvider $provider
-	 *
-	 * @return $this
-	 */
-	public function register( ServiceProvider $provider ) {
-		// @todo make sure provider is only registered once
-		$provider->register( $this );
-
-		return $this;
-	}
-
-	/**
-	 * Set a value into the container.
-	 *
-	 * @param  string $id
-	 * @param  mixed  $value
-	 *
-	 * @see    define
-	 */
-	public function offsetSet( $id, $value ) {
-		$this->define( $id, $value );
-	}
-
-	/**
-	 * Get an value from the container.
-	 *
-	 * @param  string $id
-	 *
-	 * @return object
-	 * @throws UndefinedAliasException
-	 *
-	 * @see    fetch
-	 */
-	public function offsetGet( $id ) {
-		return $this->fetch( $id );
-	}
-
-	/**
-	 * Checks if a key is set on the container.
-	 *
-	 * @param  string $id
-	 *
-	 * @return bool
-	 *
-	 * @see    has
-	 */
-	public function offsetExists( $id ) {
-		return $this->has( $id );
-	}
-
-	/**
-	 * Remove a key from the container.
-	 *
-	 * @param string $id
-	 *
-	 * @see   remove
-	 */
-	public function offsetUnset( $id ) {
-		$this->remove( $id );
-	}
-
-	/**
-	 * Sets the object properties to prepare for the loop.
-	 */
-	public function rewind() {
-		$this->position = 0;
-		$this->keys     = array_keys( $this->aliases );
-	}
-
-	/**
-	 * Retrieves the service object for the current step in the loop.
-	 *
-	 * @return object
-	 */
-	public function current() {
-		return $this->fetch( $this->keys[ $this->position ] );
-	}
-
-	/**
-	 * Retrieves the key for the current step in the loop.
-	 *
-	 * @return string
-	 */
-	public function key() {
-		return $this->keys[ $this->position ];
-	}
-
-	/**
-	 * Increments to the next step in the loop.
-	 */
-	public function next() {
-		$this->position ++;
-	}
-
-	/**
-	 * Checks if the next step in the loop in valid.
-	 *
-	 * @return bool
-	 */
-	public function valid() {
-		return isset( $this->keys[ $this->position ] );
-	}
+    /**
+     * ServiceProvider names to register with the container.
+     *
+     * Can be overwritten to include predefined providers.
+     *
+     * @var string[]
+     */
+    protected $providers = array();
+
+    /**
+     * Registered definitions.
+     *
+     * @var mixed[]
+     */
+    private $definitions = array();
+
+    /**
+     * Aliases to share between fetches.
+     *
+     * @var <string, true>[]
+     */
+    private $shared = array();
+
+    /**
+     * Aliases of all the registered services.
+     *
+     * @var <string, true>[]
+     */
+    private $aliases = array();
+
+    /**
+     * Array of classes registered on the container.
+     *
+     * @var <string, true>[]
+     */
+    private $classes = array();
+
+    /**
+     * Current position in the loop.
+     *
+     * @var int
+     */
+    private $position;
+
+    /**
+     * 0-indexed array of aliases for looping.
+     *
+     * @var string[]
+     */
+    private $keys = array();
+
+    /**
+     * Create a new container with the given providers.
+     *
+     * Providers can be instances or the class of the provider as a string.
+     *
+     * @param ServiceProvider[]|string[] $providers
+     */
+    public function __construct( array $providers = array() ) {
+        // array_unique ensures we only register each provider once.
+        $providers = array_unique( array_merge( $this->providers, $providers ) );
+
+        foreach ( $providers as $provider ) {
+            if ( is_string( $provider ) && class_exists( $provider ) ) {
+                $provider = new $provider;
+            }
+
+            if ( $provider instanceof ServiceProvider ) {
+                $this->register( $provider );
+            }
+        }
+    }
+
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param string|array $alias
+     * @param mixed        $definition
+     *
+     * @throws DefinedAliasException
+     *
+     * @return $this
+     */
+    public function define( $alias, $definition ) {
+        if ( is_array( $alias ) ) {
+            $class = current( $alias );
+            $alias = key( $alias );
+        }
+
+        if ( isset( $this->aliases[ $alias ] ) ) {
+            throw new DefinedAliasException( $alias );
+        }
+
+        $this->aliases[ $alias ]     = true;
+        $this->definitions[ $alias ] = $definition;
+
+        // Closures are treated as factories unless
+        // defined via Container::share.
+        if ( ! $definition instanceof \Closure ) {
+            $this->shared[ $alias ] = true;
+        }
+
+        if ( isset( $class ) ) {
+            $this->classes[ $class ] = $alias;
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param string|array $alias
+     * @param mixed        $definition
+     *
+     * @throws DefinedAliasException
+     *
+     * @return $this
+     */
+    public function share( $alias, $definition ) {
+        $this->define( $alias, $definition );
+
+        if ( is_array( $alias ) ) {
+            $alias = key( $alias );
+        }
+
+        $this->shared[ $alias ] = true;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param string $alias
+     *
+     * @throws UndefinedAliasException
+     *
+     * @return mixed
+     */
+    public function fetch( $alias ) {
+        if ( isset( $this->classes[ $alias ] ) ) {
+            // If the alias is a class name,
+            // then retrieve its linked alias.
+            // This is only registered when
+            // registering using an array.
+            $alias = $this->classes[ $alias ];
+        }
+
+        if ( ! isset( $this->aliases[ $alias ] ) ) {
+            throw new UndefinedAliasException( $alias );
+        }
+
+        $value = $this->definitions[ $alias ];
+
+        // If the shared value is a closure,
+        // execute it and assign the result
+        // in place of the closure.
+        if ( $value instanceof \Closure ) {
+            $factory = $value;
+            $value   = $factory( $this );
+        }
+
+        // If the value is shared, save the shared value.
+        if ( isset( $this->shared[ $alias ] ) ) {
+            $this->definitions[ $alias ] = $value;
+        }
+
+        // Return the fetched value.
+        return $value;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param  string $alias
+     *
+     * @return bool
+     */
+    public function has( $alias ) {
+        return isset( $this->aliases[ $alias ] );
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param string $alias
+     *
+     * @return $this
+     */
+    public function remove( $alias ) {
+        if ( isset( $this->aliases[ $alias ] ) ) {
+            /**
+             * If there's no reference in the aliases array,
+             * the service won't be found on fetching and
+             * can be overwritten on setting.
+             *
+             * Pros: Quick setting/unsetting, faster
+             * performance on those operations when doing
+             * a lot of these.
+             *
+             * Cons: Objects and values set in the container
+             * can't get garbage collected.
+             *
+             * If this is a problem, this may need to be revisited.
+             */
+            unset( $this->aliases[ $alias ] );
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param ServiceProvider $provider
+     *
+     * @return $this
+     */
+    public function register( ServiceProvider $provider ) {
+        // @todo make sure provider is only registered once
+        $provider->register( $this );
+
+        return $this;
+    }
+
+    /**
+     * Set a value into the container.
+     *
+     * @param  string $id
+     * @param  mixed  $value
+     *
+     * @see    define
+     */
+    public function offsetSet( $id, $value ) {
+        $this->define( $id, $value );
+    }
+
+    /**
+     * Get an value from the container.
+     *
+     * @param  string $id
+     *
+     * @return object
+     * @throws UndefinedAliasException
+     *
+     * @see    fetch
+     */
+    public function offsetGet( $id ) {
+        return $this->fetch( $id );
+    }
+
+    /**
+     * Checks if a key is set on the container.
+     *
+     * @param  string $id
+     *
+     * @return bool
+     *
+     * @see    has
+     */
+    public function offsetExists( $id ) {
+        return $this->has( $id );
+    }
+
+    /**
+     * Remove a key from the container.
+     *
+     * @param string $id
+     *
+     * @see   remove
+     */
+    public function offsetUnset( $id ) {
+        $this->remove( $id );
+    }
+
+    /**
+     * Sets the object properties to prepare for the loop.
+     */
+    public function rewind() {
+        $this->position = 0;
+        $this->keys     = array_keys( $this->aliases );
+    }
+
+    /**
+     * Retrieves the service object for the current step in the loop.
+     *
+     * @return object
+     */
+    public function current() {
+        return $this->fetch( $this->keys[ $this->position ] );
+    }
+
+    /**
+     * Retrieves the key for the current step in the loop.
+     *
+     * @return string
+     */
+    public function key() {
+        return $this->keys[ $this->position ];
+    }
+
+    /**
+     * Increments to the next step in the loop.
+     */
+    public function next() {
+        $this->position ++;
+    }
+
+    /**
+     * Checks if the next step in the loop in valid.
+     *
+     * @return bool
+     */
+    public function valid() {
+        return isset( $this->keys[ $this->position ] );
+    }
 }

Spacing +53 added lines, -53 removed lines

@@ -71,17 +71,17 @@ 
 	 *
 	 * @param ServiceProvider[]|string[] $providers
 	 */
-	public function __construct( array $providers = array() ) {
+	public function __construct(array $providers = array()) {
 		// array_unique ensures we only register each provider once.
-		$providers = array_unique( array_merge( $this->providers, $providers ) );
+		$providers = array_unique(array_merge($this->providers, $providers));
 
-		foreach ( $providers as $provider ) {
-			if ( is_string( $provider ) && class_exists( $provider ) ) {
+		foreach ($providers as $provider) {
+			if (is_string($provider) && class_exists($provider)) {
 				$provider = new $provider;
 			}
 
-			if ( $provider instanceof ServiceProvider ) {
-				$this->register( $provider );
+			if ($provider instanceof ServiceProvider) {
+				$this->register($provider);
 			}
 		}
 	}
@@ -97,27 +97,27 @@ 
 	 *
 	 * @return $this
 	 */
-	public function define( $alias, $definition ) {
-		if ( is_array( $alias ) ) {
-			$class = current( $alias );
-			$alias = key( $alias );
+	public function define($alias, $definition) {
+		if (is_array($alias)) {
+			$class = current($alias);
+			$alias = key($alias);
 		}
 
-		if ( isset( $this->aliases[ $alias ] ) ) {
-			throw new DefinedAliasException( $alias );
+		if (isset($this->aliases[$alias])) {
+			throw new DefinedAliasException($alias);
 		}
 
-		$this->aliases[ $alias ]     = true;
-		$this->definitions[ $alias ] = $definition;
+		$this->aliases[$alias]     = true;
+		$this->definitions[$alias] = $definition;
 
 		// Closures are treated as factories unless
 		// defined via Container::share.
-		if ( ! $definition instanceof \Closure ) {
-			$this->shared[ $alias ] = true;
+		if (!$definition instanceof \Closure) {
+			$this->shared[$alias] = true;
 		}
 
-		if ( isset( $class ) ) {
-			$this->classes[ $class ] = $alias;
+		if (isset($class)) {
+			$this->classes[$class] = $alias;
 		}
 
 		return $this;
@@ -133,14 +133,14 @@ 
 	 *
 	 * @return $this
 	 */
-	public function share( $alias, $definition ) {
-		$this->define( $alias, $definition );
+	public function share($alias, $definition) {
+		$this->define($alias, $definition);
 
-		if ( is_array( $alias ) ) {
-			$alias = key( $alias );
+		if (is_array($alias)) {
+			$alias = key($alias);
 		}
 
-		$this->shared[ $alias ] = true;
+		$this->shared[$alias] = true;
 
 		return $this;
 	}
@@ -154,32 +154,32 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function fetch( $alias ) {
-		if ( isset( $this->classes[ $alias ] ) ) {
+	public function fetch($alias) {
+		if (isset($this->classes[$alias])) {
 			// If the alias is a class name,
 			// then retrieve its linked alias.
 			// This is only registered when
 			// registering using an array.
-			$alias = $this->classes[ $alias ];
+			$alias = $this->classes[$alias];
 		}
 
-		if ( ! isset( $this->aliases[ $alias ] ) ) {
-			throw new UndefinedAliasException( $alias );
+		if (!isset($this->aliases[$alias])) {
+			throw new UndefinedAliasException($alias);
 		}
 
-		$value = $this->definitions[ $alias ];
+		$value = $this->definitions[$alias];
 
 		// If the shared value is a closure,
 		// execute it and assign the result
 		// in place of the closure.
-		if ( $value instanceof \Closure ) {
+		if ($value instanceof \Closure) {
 			$factory = $value;
-			$value   = $factory( $this );
+			$value   = $factory($this);
 		}
 
 		// If the value is shared, save the shared value.
-		if ( isset( $this->shared[ $alias ] ) ) {
-			$this->definitions[ $alias ] = $value;
+		if (isset($this->shared[$alias])) {
+			$this->definitions[$alias] = $value;
 		}
 
 		// Return the fetched value.
@@ -193,8 +193,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function has( $alias ) {
-		return isset( $this->aliases[ $alias ] );
+	public function has($alias) {
+		return isset($this->aliases[$alias]);
 	}
 
 	/**
@@ -204,8 +204,8 @@ 
 	 *
 	 * @return $this
 	 */
-	public function remove( $alias ) {
-		if ( isset( $this->aliases[ $alias ] ) ) {
+	public function remove($alias) {
+		if (isset($this->aliases[$alias])) {
 			/**
 			 * If there's no reference in the aliases array,
 			 * the service won't be found on fetching and
@@ -220,7 +220,7 @@ 
 			 *
 			 * If this is a problem, this may need to be revisited.
 			 */
-			unset( $this->aliases[ $alias ] );
+			unset($this->aliases[$alias]);
 		}
 
 		return $this;
@@ -233,9 +233,9 @@ 
 	 *
 	 * @return $this
 	 */
-	public function register( ServiceProvider $provider ) {
+	public function register(ServiceProvider $provider) {
 		// @todo make sure provider is only registered once
-		$provider->register( $this );
+		$provider->register($this);
 
 		return $this;
 	}
@@ -248,8 +248,8 @@ 
 	 *
 	 * @see    define
 	 */
-	public function offsetSet( $id, $value ) {
-		$this->define( $id, $value );
+	public function offsetSet($id, $value) {
+		$this->define($id, $value);
 	}
 
 	/**
@@ -262,8 +262,8 @@ 
 	 *
 	 * @see    fetch
 	 */
-	public function offsetGet( $id ) {
-		return $this->fetch( $id );
+	public function offsetGet($id) {
+		return $this->fetch($id);
 	}
 
 	/**
@@ -275,8 +275,8 @@ 
 	 *
 	 * @see    has
 	 */
-	public function offsetExists( $id ) {
-		return $this->has( $id );
+	public function offsetExists($id) {
+		return $this->has($id);
 	}
 
 	/**
@@ -286,8 +286,8 @@ 
 	 *
 	 * @see   remove
 	 */
-	public function offsetUnset( $id ) {
-		$this->remove( $id );
+	public function offsetUnset($id) {
+		$this->remove($id);
 	}
 
 	/**
@@ -295,7 +295,7 @@ 
 	 */
 	public function rewind() {
 		$this->position = 0;
-		$this->keys     = array_keys( $this->aliases );
+		$this->keys     = array_keys($this->aliases);
 	}
 
 	/**
@@ -304,7 +304,7 @@ 
 	 * @return object
 	 */
 	public function current() {
-		return $this->fetch( $this->keys[ $this->position ] );
+		return $this->fetch($this->keys[$this->position]);
 	}
 
 	/**
@@ -313,14 +313,14 @@ 
 	 * @return string
 	 */
 	public function key() {
-		return $this->keys[ $this->position ];
+		return $this->keys[$this->position];
 	}
 
 	/**
 	 * Increments to the next step in the loop.
 	 */
 	public function next() {
-		$this->position ++;
+		$this->position++;
 	}
 
 	/**
@@ -329,6 +329,6 @@ 
 	 * @return bool
 	 */
 	public function valid() {
-		return isset( $this->keys[ $this->position ] );
+		return isset($this->keys[$this->position]);
 	}
 }

src/Utility/Str.php

Indentation +32 added lines, -32 removed lines

@@ -11,39 +11,39 @@
  * @subpackage Utility
  */
 class Str {
-	/**
-	 * Determine if a given string starts with a given substring.
-	 *
-	 * @param  string       $haystack
-	 * @param  string|array $needles
-	 *
-	 * @return bool
-	 */
-	public static function starts_with( $haystack, $needles ) {
-		foreach ( (array) $needles as $needle ) {
-			if ( '' !== $needle && 0 === strpos( $haystack, $needle ) ) {
-				return true;
-			}
-		}
+    /**
+     * Determine if a given string starts with a given substring.
+     *
+     * @param  string       $haystack
+     * @param  string|array $needles
+     *
+     * @return bool
+     */
+    public static function starts_with( $haystack, $needles ) {
+        foreach ( (array) $needles as $needle ) {
+            if ( '' !== $needle && 0 === strpos( $haystack, $needle ) ) {
+                return true;
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * Determine if a given string ends with a given substring.
-	 *
-	 * @param  string       $haystack
-	 * @param  string|array $needles
-	 *
-	 * @return bool
-	 */
-	public static function ends_with( $haystack, $needles ) {
-		foreach ( (array) $needles as $needle ) {
-			if ( substr( $haystack, - strlen( $needle ) ) === (string) $needle ) {
-				return true;
-			}
-		}
+    /**
+     * Determine if a given string ends with a given substring.
+     *
+     * @param  string       $haystack
+     * @param  string|array $needles
+     *
+     * @return bool
+     */
+    public static function ends_with( $haystack, $needles ) {
+        foreach ( (array) $needles as $needle ) {
+            if ( substr( $haystack, - strlen( $needle ) ) === (string) $needle ) {
+                return true;
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -19,9 +19,9 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function starts_with( $haystack, $needles ) {
-		foreach ( (array) $needles as $needle ) {
-			if ( '' !== $needle && 0 === strpos( $haystack, $needle ) ) {
+	public static function starts_with($haystack, $needles) {
+		foreach ((array) $needles as $needle) {
+			if ('' !== $needle && 0 === strpos($haystack, $needle)) {
 				return true;
 			}
 		}
@@ -37,9 +37,9 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function ends_with( $haystack, $needles ) {
-		foreach ( (array) $needles as $needle ) {
-			if ( substr( $haystack, - strlen( $needle ) ) === (string) $needle ) {
+	public static function ends_with($haystack, $needles) {
+		foreach ((array) $needles as $needle) {
+			if (substr($haystack, - strlen($needle)) === (string) $needle) {
 				return true;
 			}
 		}

src/Contract/Core/I18n.php

Indentation +6 added lines, -6 removed lines

@@ -2,10 +2,10 @@
 namespace Intraxia\Jaxion\Contract\Core;
 
 interface I18n {
-	/**
-	 * Loads the plugin's textdomain.
-	 *
-	 * @return void
-	 */
-	public function load_plugin_textdomain();
+    /**
+     * Loads the plugin's textdomain.
+     *
+     * @return void
+     */
+    public function load_plugin_textdomain();
 }

src/Core/I18n.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param $basename
 	 * @param $path
 	 */
-	public function __construct( $basename, $path ) {
+	public function __construct($basename, $path) {
 		$this->basename = $basename;
 		$this->path = $path;
 	}
@@ -43,7 +43,7 @@ 
 		load_plugin_textdomain(
 			$this->basename,
 			false,
-			basename( $this->path ) . '/languages/'
+			basename($this->path).'/languages/'
 		);
 	}
 

Indentation +45 added lines, -45 removed lines

@@ -11,53 +11,53 @@
  * @subpackage Core
  */
 class I18n implements I18nContract, HasActions {
-	/**
-	 * Plugin basename
-	 *
-	 * @var string
-	 */
-	private $basename;
+    /**
+     * Plugin basename
+     *
+     * @var string
+     */
+    private $basename;
 
-	/**
-	 * Plugin path.
-	 *
-	 * @var string
-	 */
-	private $path;
+    /**
+     * Plugin path.
+     *
+     * @var string
+     */
+    private $path;
 
-	/**
-	 * I18n constructor.
-	 *
-	 * @param string $basename Plugin basename.
-	 * @param string $path     Plugin path.
-	 */
-	public function __construct( $basename, $path ) {
-		$this->basename = $basename;
-		$this->path = $path;
-	}
+    /**
+     * I18n constructor.
+     *
+     * @param string $basename Plugin basename.
+     * @param string $path     Plugin path.
+     */
+    public function __construct( $basename, $path ) {
+        $this->basename = $basename;
+        $this->path = $path;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function load_plugin_textdomain() {
-		load_plugin_textdomain(
-			$this->basename,
-			false,
-			basename( $this->path ) . '/languages/'
-		);
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function load_plugin_textdomain() {
+        load_plugin_textdomain(
+            $this->basename,
+            false,
+            basename( $this->path ) . '/languages/'
+        );
+    }
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @return array
-	 */
-	public function action_hooks() {
-		return array(
-			array(
-				'hook'   => 'init',
-				'method' => 'load_plugin_textdomain',
-			),
-		);
-	}
+    /**
+     * {@inheritDoc}
+     *
+     * @return array
+     */
+    public function action_hooks() {
+        return array(
+            array(
+                'hook'   => 'init',
+                'method' => 'load_plugin_textdomain',
+            ),
+        );
+    }
 }

src/Axolotl/Model.php

Spacing +121 added lines, -121 removed lines

@@ -114,16 +114,16 @@ 
 	 *
 	 * @param array <string, mixed> $attributes
 	 */
-	public function __construct( array $attributes = array() ) {
+	public function __construct(array $attributes = array()) {
 		$this->maybe_boot();
 		$this->sync_original();
 
-		if ( $this->uses_wp_object() ) {
+		if ($this->uses_wp_object()) {
 			$this->create_wp_object();
 		}
 
 		$this->unguard();
-		$this->refresh( $attributes );
+		$this->refresh($attributes);
 		$this->reguard();
 	}
 
@@ -137,10 +137,10 @@ 
 	 *
 	 * @return $this
 	 */
-	public function refresh( array $attributes ) {
+	public function refresh(array $attributes) {
 		$this->clear();
 
-		return $this->merge( $attributes );
+		return $this->merge($attributes);
 	}
 
 	/**
@@ -150,9 +150,9 @@ 
 	 *
 	 * @return $this
 	 */
-	public function merge( array $attributes ) {
-		foreach ( $attributes as $name => $value ) {
-			$this->set_attribute( $name, $value );
+	public function merge(array $attributes) {
+		foreach ($attributes as $name => $value) {
+			$this->set_attribute($name, $value);
 		}
 
 		return $this;
@@ -167,7 +167,7 @@ 
 	 * @return array
 	 */
 	public function get_table_attributes() {
-		return $this->attributes[ self::TABLE_KEY ];
+		return $this->attributes[self::TABLE_KEY];
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 * @return array
 	 */
 	public function get_original_table_attributes() {
-		return $this->original[ self::TABLE_KEY ];
+		return $this->original[self::TABLE_KEY];
 	}
 
 	/**
@@ -189,11 +189,11 @@ 
 	public function get_changed_table_attributes() {
 		$changed = array();
 
-		foreach ( $this->get_table_attributes() as $key => $value ) {
-			if ( $value !==
-			     $this->get_original_attribute( $key )
+		foreach ($this->get_table_attributes() as $key => $value) {
+			if ($value !==
+			     $this->get_original_attribute($key)
 			) {
-				$changed[ $key ] = $value;
+				$changed[$key] = $value;
 			}
 		}
 
@@ -209,8 +209,8 @@ 
 	 * @return false|WP_Post|WP_Term
 	 */
 	public function get_underlying_wp_object() {
-		if ( isset( $this->attributes[ self::OBJECT_KEY ] ) ) {
-			return $this->attributes[ self::OBJECT_KEY ];
+		if (isset($this->attributes[self::OBJECT_KEY])) {
+			return $this->attributes[self::OBJECT_KEY];
 		}
 
 		return false;
@@ -222,7 +222,7 @@ 
 	 * @return WP_Post
 	 */
 	public function get_original_underlying_wp_object() {
-		return $this->original[ self::OBJECT_KEY ];
+		return $this->original[self::OBJECT_KEY];
 	}
 
 	/**
@@ -235,11 +235,11 @@ 
 	public function get_changed_wp_object_attributes() {
 		$changed = array();
 
-		foreach ( $this->get_wp_object_keys() as $key ) {
-			if ( $this->get_attribute( $key ) !==
-			     $this->get_original_attribute( $key )
+		foreach ($this->get_wp_object_keys() as $key) {
+			if ($this->get_attribute($key) !==
+			     $this->get_original_attribute($key)
 			) {
-				$changed[ $key ] = $this->get_attribute( $key );
+				$changed[$key] = $this->get_attribute($key);
 			}
 		}
 
@@ -254,8 +254,8 @@ 
 	 * @param string $name
 	 * @param mixed  $value
 	 */
-	public function __set( $name, $value ) {
-		$this->set_attribute( $name, $value );
+	public function __set($name, $value) {
+		$this->set_attribute($name, $value);
 	}
 
 	/**
@@ -273,23 +273,23 @@ 
 	 * @throws Exception
 	 * @throws GuardedPropertyException
 	 */
-	public function set_attribute( $name, $value ) {
-		if ( self::OBJECT_KEY === $name ) {
-			return $this->override_wp_object( $value );
+	public function set_attribute($name, $value) {
+		if (self::OBJECT_KEY === $name) {
+			return $this->override_wp_object($value);
 		}
 
-		if ( self::TABLE_KEY === $name ) {
-			return $this->override_table( $value );
+		if (self::TABLE_KEY === $name) {
+			return $this->override_table($value);
 		}
 
-		if ( ! $this->is_fillable( $name ) ) {
+		if (!$this->is_fillable($name)) {
 			throw new GuardedPropertyException;
 		}
 
-		if ( $method = $this->has_map_method( $name ) ) {
-			$this->attributes[ self::OBJECT_KEY ]->{$this->{$method}()} = $value;
+		if ($method = $this->has_map_method($name)) {
+			$this->attributes[self::OBJECT_KEY]->{$this->{$method}()} = $value;
 		} else {
-			$this->attributes[ self::TABLE_KEY ][ $name ] = $value;
+			$this->attributes[self::TABLE_KEY][$name] = $value;
 		}
 
 		return $this;
@@ -301,11 +301,11 @@ 
 	 * @return array
 	 */
 	public function get_attribute_keys() {
-		if ( isset( self::$memo[ get_called_class() ][ __METHOD__ ] ) ) {
-			return self::$memo[ get_called_class() ][ __METHOD__ ];
+		if (isset(self::$memo[get_called_class()][__METHOD__])) {
+			return self::$memo[get_called_class()][__METHOD__];
 		}
 
-		return self::$memo[ get_called_class() ][ __METHOD__ ]
+		return self::$memo[get_called_class()][__METHOD__]
 			= array_merge(
 				$this->fillable,
 				$this->guarded,
@@ -319,21 +319,21 @@ 
 	 * @return array
 	 */
 	public function get_table_keys() {
-		if ( isset( self::$memo[ get_called_class() ][ __METHOD__ ] ) ) {
-			return self::$memo[ get_called_class() ][ __METHOD__ ];
+		if (isset(self::$memo[get_called_class()][__METHOD__])) {
+			return self::$memo[get_called_class()][__METHOD__];
 		}
 
 		$keys = array();
 
-		foreach ( $this->get_attribute_keys() as $key ) {
-			if ( ! $this->has_map_method( $key ) &&
-			     ! $this->has_compute_method( $key )
+		foreach ($this->get_attribute_keys() as $key) {
+			if (!$this->has_map_method($key) &&
+			     !$this->has_compute_method($key)
 			) {
 				$keys[] = $key;
 			}
 		}
 
-		return self::$memo[ get_called_class() ][ __METHOD__ ] = $keys;
+		return self::$memo[get_called_class()][__METHOD__] = $keys;
 	}
 
 	/**
@@ -342,19 +342,19 @@ 
 	 * @return array
 	 */
 	public function get_wp_object_keys() {
-		if ( isset( self::$memo[ get_called_class() ][ __METHOD__ ] ) ) {
-			return self::$memo[ get_called_class() ][ __METHOD__ ];
+		if (isset(self::$memo[get_called_class()][__METHOD__])) {
+			return self::$memo[get_called_class()][__METHOD__];
 		}
 
 		$keys = array();
 
-		foreach ( $this->get_attribute_keys() as $key ) {
-			if ( $this->has_map_method( $key ) ) {
+		foreach ($this->get_attribute_keys() as $key) {
+			if ($this->has_map_method($key)) {
 				$keys[] = $key;
 			}
 		}
 
-		return self::$memo[ get_called_class() ][ __METHOD__ ] = $keys;
+		return self::$memo[get_called_class()][__METHOD__] = $keys;
 	}
 
 	/**
@@ -363,19 +363,19 @@ 
 	 * @return array
 	 */
 	public function get_computed_keys() {
-		if ( isset( self::$memo[ get_called_class() ][ __METHOD__ ] ) ) {
-			return self::$memo[ get_called_class() ][ __METHOD__ ];
+		if (isset(self::$memo[get_called_class()][__METHOD__])) {
+			return self::$memo[get_called_class()][__METHOD__];
 		}
 
 		$keys = array();
 
-		foreach ( $this->get_attribute_keys() as $key ) {
-			if ( $this->has_compute_method( $key ) ) {
+		foreach ($this->get_attribute_keys() as $key) {
+			if ($this->has_compute_method($key)) {
 				$keys[] = $key;
 			}
 		}
 
-		return self::$memo[ get_called_class() ][ __METHOD__ ] = $keys;
+		return self::$memo[get_called_class()][__METHOD__] = $keys;
 	}
 
 	/**
@@ -386,32 +386,32 @@ 
 	public function serialize() {
 		$attributes = array();
 
-		if ( $this->visible ) {
+		if ($this->visible) {
 			// If visible attributes are set, we'll only reveal those.
-			foreach ( $this->visible as $key ) {
-				$attributes[ $key ] = $this->get_attribute( $key );
+			foreach ($this->visible as $key) {
+				$attributes[$key] = $this->get_attribute($key);
 			}
-		} elseif ( $this->hidden ) {
+		} elseif ($this->hidden) {
 			// If hidden attributes are set, we'll grab everything and hide those.
-			foreach ( $this->get_attribute_keys() as $key ) {
-				if ( ! in_array( $key, $this->hidden ) ) {
-					$attributes[ $key ] = $this->get_attribute( $key );
+			foreach ($this->get_attribute_keys() as $key) {
+				if (!in_array($key, $this->hidden)) {
+					$attributes[$key] = $this->get_attribute($key);
 				}
 			}
 		} else {
 			// If nothing is hidden/visible, we'll grab and reveal everything.
-			foreach ( $this->get_attribute_keys() as $key ) {
-				$attributes[ $key ] = $this->get_attribute( $key );
+			foreach ($this->get_attribute_keys() as $key) {
+				$attributes[$key] = $this->get_attribute($key);
 			}
 		}
 
-		return array_map( function ( $attribute ) {
-			if ( $attribute instanceof Serializes ) {
+		return array_map(function($attribute) {
+			if ($attribute instanceof Serializes) {
 				return $attribute->serialize();
 			}
 
 			return $attribute;
-		}, $attributes );
+		}, $attributes);
 	}
 
 	/**
@@ -422,13 +422,13 @@ 
 	public function sync_original() {
 		$this->original = $this->attributes;
 
-		if ( $this->attributes[ self::OBJECT_KEY ] ) {
-			$this->original[ self::OBJECT_KEY ] = clone $this->attributes[ self::OBJECT_KEY ];
+		if ($this->attributes[self::OBJECT_KEY]) {
+			$this->original[self::OBJECT_KEY] = clone $this->attributes[self::OBJECT_KEY];
 		}
 
-		foreach ( $this->original[ self::TABLE_KEY ] as $key => $item ) {
-			if ( is_object( $item ) ) {
-				$this->original[ $key ] = clone $item;
+		foreach ($this->original[self::TABLE_KEY] as $key => $item) {
+			if (is_object($item)) {
+				$this->original[$key] = clone $item;
 			}
 		}
 
@@ -444,24 +444,24 @@ 
 	 *
 	 * @return bool
 	 */
-	private function is_fillable( $name ) {
+	private function is_fillable($name) {
 		// If this model isn't guarded, everything is fillable.
-		if ( ! $this->is_guarded ) {
+		if (!$this->is_guarded) {
 			return true;
 		}
 
 		// If it's in the fillable array, then it's fillable.
-		if ( in_array( $name, $this->fillable ) ) {
+		if (in_array($name, $this->fillable)) {
 			return true;
 		}
 
 		// If it's explicitly guarded, then it's not fillable.
-		if ( in_array( $name, $this->guarded ) ) {
+		if (in_array($name, $this->guarded)) {
 			return false;
 		}
 
 		// If fillable hasn't been defined, then everything else fillable.
-		return ! $this->fillable;
+		return !$this->fillable;
 	}
 
 	/**
@@ -473,13 +473,13 @@ 
 	 *
 	 * @return $this
 	 */
-	private function override_wp_object( $value ) {
-		if ( is_object( $value ) ) {
-			$this->attributes[ self::OBJECT_KEY ] = $this->set_wp_object_constants( $value );
+	private function override_wp_object($value) {
+		if (is_object($value)) {
+			$this->attributes[self::OBJECT_KEY] = $this->set_wp_object_constants($value);
 		} else {
-			$this->attributes[ self::OBJECT_KEY ] = null;
+			$this->attributes[self::OBJECT_KEY] = null;
 
-			if ( $this->uses_wp_object() ) {
+			if ($this->uses_wp_object()) {
 				$this->create_wp_object();
 			}
 		}
@@ -494,8 +494,8 @@ 
 	 *
 	 * @return $this
 	 */
-	private function override_table( array $value ) {
-		$this->attributes[ self::TABLE_KEY ] = $value;
+	private function override_table(array $value) {
+		$this->attributes[self::TABLE_KEY] = $value;
 
 		return $this;
 	}
@@ -509,19 +509,19 @@ 
 	 * @throws LogicException
 	 */
 	private function create_wp_object() {
-		switch ( true ) {
+		switch (true) {
 			case $this instanceof UsesWordPressPost:
-				$object = new WP_Post( (object) array() );
+				$object = new WP_Post((object) array());
 				break;
 			case $this instanceof UsesWordPressTerm:
-				$object = new WP_Term( (object) array() );
+				$object = new WP_Term((object) array());
 				break;
 			default:
 				throw new LogicException;
 				break;
 		}
 
-		$this->attributes[ self::OBJECT_KEY ] = $this->set_wp_object_constants( $object );
+		$this->attributes[self::OBJECT_KEY] = $this->set_wp_object_constants($object);
 	}
 
 	/**
@@ -535,12 +535,12 @@ 
 	 *
 	 * @return object
 	 */
-	protected function set_wp_object_constants( $object ) {
-		if ( $this instanceof UsesWordPressPost ) {
+	protected function set_wp_object_constants($object) {
+		if ($this instanceof UsesWordPressPost) {
 			$object->post_type = static::get_post_type();
 		}
 
-		if ( $this instanceof UsesWordPressTerm ) {
+		if ($this instanceof UsesWordPressTerm) {
 			$object->taxonomy = static::get_taxonomy();
 		}
 
@@ -556,8 +556,8 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function __get( $name ) {
-		return $this->get_attribute( $name );
+	public function __get($name) {
+		return $this->get_attribute($name);
 	}
 
 	/**
@@ -569,24 +569,24 @@ 
 	 *
 	 * @throws PropertyDoesNotExistException If property isn't found.
 	 */
-	public function get_attribute( $name ) {
-		if ( $method = $this->has_map_method( $name ) ) {
-			return $this->attributes[ self::OBJECT_KEY ]->{$this->{$method}()};
+	public function get_attribute($name) {
+		if ($method = $this->has_map_method($name)) {
+			return $this->attributes[self::OBJECT_KEY]->{$this->{$method}()};
 		}
 
-		if ( $method = $this->has_compute_method( $name ) ) {
+		if ($method = $this->has_compute_method($name)) {
 			return $this->{$method}();
 		}
 
-		if ( isset( $this->attributes[ self::TABLE_KEY ][ $name ] ) ) {
-			return $this->attributes[ self::TABLE_KEY ][ $name ];
+		if (isset($this->attributes[self::TABLE_KEY][$name])) {
+			return $this->attributes[self::TABLE_KEY][$name];
 		}
 
-		if ( isset( $this->defaults[ $name ] ) ) {
-			return $this->defaults[ $name ];
+		if (isset($this->defaults[$name])) {
+			return $this->defaults[$name];
 		}
 
-		throw new PropertyDoesNotExistException( $name );
+		throw new PropertyDoesNotExistException($name);
 	}
 
 	/**
@@ -598,18 +598,18 @@ 
 	 *
 	 * @throws PropertyDoesNotExistException If property isn't found.
 	 */
-	public function get_original_attribute( $name ) {
+	public function get_original_attribute($name) {
 		$original_attributes = $this->original;
 
-		if ( ! is_object( $original_attributes[ static::OBJECT_KEY ] ) ) {
-			unset( $original_attributes[ static::OBJECT_KEY ] );
+		if (!is_object($original_attributes[static::OBJECT_KEY])) {
+			unset($original_attributes[static::OBJECT_KEY]);
 		}
 
-		$original = new static( $original_attributes );
+		$original = new static($original_attributes);
 
 		try {
-			return $original->get_attribute( $name );
-		} catch ( Exception $exception ) {
+			return $original->get_attribute($name);
+		} catch (Exception $exception) {
 			return null;
 		}
 	}
@@ -623,11 +623,11 @@ 
 	 * @throws LogicException
 	 */
 	public function get_primary_id() {
-		if ( $this instanceof UsesWordPressPost ) {
+		if ($this instanceof UsesWordPressPost) {
 			return $this->get_underlying_wp_object()->ID;
 		}
 
-		if ( $this instanceof UsesWordPressTerm ) {
+		if ($this instanceof UsesWordPressTerm) {
 			return $this->get_underlying_wp_object()->term_id;
 		}
 
@@ -646,8 +646,8 @@ 
 	 *
 	 * @return false|string
 	 */
-	protected function has_map_method( $name ) {
-		if ( method_exists( $this, $method = "map_{$name}" ) ) {
+	protected function has_map_method($name) {
+		if (method_exists($this, $method = "map_{$name}")) {
 			return $method;
 		}
 
@@ -664,8 +664,8 @@ 
 	 *
 	 * @return false|string
 	 */
-	protected function has_compute_method( $name ) {
-		if ( method_exists( $this, $method = "compute_{$name}" ) ) {
+	protected function has_compute_method($name) {
+		if (method_exists($this, $method = "compute_{$name}")) {
 			return $method;
 		}
 
@@ -686,10 +686,10 @@ 
 			$this->get_wp_object_keys()
 		);
 
-		foreach ( $keys as $key ) {
+		foreach ($keys as $key) {
 			try {
-				$this->set_attribute( $key, null );
-			} catch ( GuardedPropertyException $e ) {
+				$this->set_attribute($key, null);
+			} catch (GuardedPropertyException $e) {
 				// We won't clear out guarded attributes.
 			}
 		}
@@ -723,13 +723,13 @@ 
 	 * @return array
 	 */
 	protected function get_compute_methods() {
-		$methods = get_class_methods( get_called_class() );
-		$methods = array_filter( $methods, function ( $method ) {
-			return strrpos( $method, 'compute_', - strlen( $method ) ) !== false;
+		$methods = get_class_methods(get_called_class());
+		$methods = array_filter($methods, function($method) {
+			return strrpos($method, 'compute_', - strlen($method)) !== false;
 		} );
-		$methods = array_map( function ( $method ) {
-			return substr( $method, strlen( 'compute_' ) );
-		}, $methods );
+		$methods = array_map(function($method) {
+			return substr($method, strlen('compute_'));
+		}, $methods);
 
 		return $methods;
 	}
@@ -738,8 +738,8 @@ 
 	 * Sets up the memo array for the creating model.
 	 */
 	private function maybe_boot() {
-		if ( ! isset( self::$memo[ get_called_class() ] ) ) {
-			self::$memo[ get_called_class() ] = array();
+		if (!isset(self::$memo[get_called_class()])) {
+			self::$memo[get_called_class()] = array();
 		}
 	}
 

Indentation +730 added lines, -730 removed lines

@@ -21,734 +21,734 @@
  * @since      0.1.0
  */
 abstract class Model implements Serializes {
-	/**
-	 * Table attribute key.
-	 */
-	const TABLE_KEY = '@@table';
-
-	/**
-	 * Object attribute key.
-	 */
-	const OBJECT_KEY = '@@object';
-
-	/**
-	 * Memoized values for class methods.
-	 *
-	 * @var array
-	 */
-	private static $memo = array();
-
-	/**
-	 * Model attributes.
-	 *
-	 * @var array
-	 */
-	private $attributes = array(
-		self::TABLE_KEY  => array(),
-		self::OBJECT_KEY => null,
-	);
-
-	/**
-	 * Model's original attributes.
-	 *
-	 * @var array
-	 */
-	private $original = array(
-		self::TABLE_KEY  => array(),
-		self::OBJECT_KEY => null,
-	);
-
-	/**
-	 * Default attribute values.
-	 *
-	 * @var array
-	 */
-	protected $defaults = array();
-
-	/**
-	 * Properties which are allowed to be set on the model.
-	 *
-	 * If this array is empty, any attributes can be set on the model.
-	 *
-	 * @var string[]
-	 */
-	protected $fillable = array();
-
-	/**
-	 * Properties which cannot be automatically filled on the model.
-	 *
-	 * If the model is unguarded, these properties can be filled.
-	 *
-	 * @var array
-	 */
-	protected $guarded = array();
-
-	/**
-	 * Properties which should not be serialized.
-	 *
-	 * @var array
-	 */
-	protected $hidden = array();
-
-	/**
-	 * Properties which should be serialized.
-	 *
-	 * @var array
-	 */
-	protected $visible = array();
-
-	/**
-	 * Whether the model's properties are guarded.
-	 *
-	 * When false, allows guarded properties to be filled.
-	 *
-	 * @var bool
-	 */
-	protected $is_guarded = true;
-
-	/**
-	 * Constructs a new model with provided attributes.
-	 *
-	 * If self::OBJECT_KEY is passed as one of the attributes, the underlying post
-	 * will be overwritten.
-	 *
-	 * @param array <string, mixed> $attributes
-	 */
-	public function __construct( array $attributes = array() ) {
-		$this->maybe_boot();
-		$this->sync_original();
-
-		if ( $this->uses_wp_object() ) {
-			$this->create_wp_object();
-		}
-
-		$this->unguard();
-		$this->refresh( $attributes );
-		$this->reguard();
-	}
-
-	/**
-	 * Refreshes the model's current attributes with the provided array.
-	 *
-	 * The model's attributes will match what was provided in the array,
-	 * and any attributes not passed
-	 *
-	 * @param array $attributes
-	 *
-	 * @return $this
-	 */
-	public function refresh( array $attributes ) {
-		$this->clear();
-
-		return $this->merge( $attributes );
-	}
-
-	/**
-	 * Merges the provided attributes with the provided array.
-	 *
-	 * @param array $attributes
-	 *
-	 * @return $this
-	 */
-	public function merge( array $attributes ) {
-		foreach ( $attributes as $name => $value ) {
-			$this->set_attribute( $name, $value );
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Get the model's table attributes.
-	 *
-	 * Returns the array of for the model that will either need to be
-	 * saved in postmeta or a separate table.
-	 *
-	 * @return array
-	 */
-	public function get_table_attributes() {
-		return $this->attributes[ self::TABLE_KEY ];
-	}
-
-	/**
-	 * Get the model's original attributes.
-	 *
-	 * @return array
-	 */
-	public function get_original_table_attributes() {
-		return $this->original[ self::TABLE_KEY ];
-	}
-
-	/**
-	 * Retrieve an array of the attributes on the model
-	 * that have changed compared to the model's
-	 * original data.
-	 *
-	 * @return array
-	 */
-	public function get_changed_table_attributes() {
-		$changed = array();
-
-		foreach ( $this->get_table_attributes() as $key => $value ) {
-			if ( $value !==
-			     $this->get_original_attribute( $key )
-			) {
-				$changed[ $key ] = $value;
-			}
-		}
-
-		return $changed;
-	}
-
-	/**
-	 * Get the model's underlying post.
-	 *
-	 * Returns the underlying WP_Post object for the model, representing
-	 * the data that will be save in the wp_posts table.
-	 *
-	 * @return false|WP_Post|WP_Term
-	 */
-	public function get_underlying_wp_object() {
-		if ( isset( $this->attributes[ self::OBJECT_KEY ] ) ) {
-			return $this->attributes[ self::OBJECT_KEY ];
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get the model's original underlying post.
-	 *
-	 * @return WP_Post
-	 */
-	public function get_original_underlying_wp_object() {
-		return $this->original[ self::OBJECT_KEY ];
-	}
-
-	/**
-	 * Get the model attributes on the WordPress object
-	 * that have changed compared to the model's
-	 * original attributes.
-	 *
-	 * @return array
-	 */
-	public function get_changed_wp_object_attributes() {
-		$changed = array();
-
-		foreach ( $this->get_wp_object_keys() as $key ) {
-			if ( $this->get_attribute( $key ) !==
-			     $this->get_original_attribute( $key )
-			) {
-				$changed[ $key ] = $this->get_attribute( $key );
-			}
-		}
-
-		return $changed;
-	}
-
-	/**
-	 * Magic __set method.
-	 *
-	 * Passes the name and value to set_attribute, which is where the magic happens.
-	 *
-	 * @param string $name
-	 * @param mixed  $value
-	 */
-	public function __set( $name, $value ) {
-		$this->set_attribute( $name, $value );
-	}
-
-	/**
-	 * Sets the model attributes.
-	 *
-	 * Checks whether the model attribute can be set, check if it
-	 * maps to the WP_Post property, otherwise, assigns it to the
-	 * table attribute array.
-	 *
-	 * @param string $name
-	 * @param mixed  $value
-	 *
-	 * @return $this
-	 *
-	 * @throws GuardedPropertyException
-	 */
-	public function set_attribute( $name, $value ) {
-		if ( self::OBJECT_KEY === $name ) {
-			return $this->override_wp_object( $value );
-		}
-
-		if ( self::TABLE_KEY === $name ) {
-			return $this->override_table( $value );
-		}
-
-		if ( ! $this->is_fillable( $name ) ) {
-			throw new GuardedPropertyException;
-		}
-
-		if ( $method = $this->has_map_method( $name ) ) {
-			$this->attributes[ self::OBJECT_KEY ]->{$this->{$method}()} = $value;
-		} else {
-			$this->attributes[ self::TABLE_KEY ][ $name ] = $value;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Retrieves all the attribute keys for the model.
-	 *
-	 * @return array
-	 */
-	public function get_attribute_keys() {
-		if ( isset( self::$memo[ get_called_class() ][ __METHOD__ ] ) ) {
-			return self::$memo[ get_called_class() ][ __METHOD__ ];
-		}
-
-		return self::$memo[ get_called_class() ][ __METHOD__ ]
-			= array_merge(
-				$this->fillable,
-				$this->guarded,
-				$this->get_compute_methods()
-			);
-	}
-
-	/**
-	 * Retrieves the attribute keys that aren't mapped to a post.
-	 *
-	 * @return array
-	 */
-	public function get_table_keys() {
-		if ( isset( self::$memo[ get_called_class() ][ __METHOD__ ] ) ) {
-			return self::$memo[ get_called_class() ][ __METHOD__ ];
-		}
-
-		$keys = array();
-
-		foreach ( $this->get_attribute_keys() as $key ) {
-			if ( ! $this->has_map_method( $key ) &&
-			     ! $this->has_compute_method( $key )
-			) {
-				$keys[] = $key;
-			}
-		}
-
-		return self::$memo[ get_called_class() ][ __METHOD__ ] = $keys;
-	}
-
-	/**
-	 * Retrieves the attribute keys that are mapped to a post.
-	 *
-	 * @return array
-	 */
-	public function get_wp_object_keys() {
-		if ( isset( self::$memo[ get_called_class() ][ __METHOD__ ] ) ) {
-			return self::$memo[ get_called_class() ][ __METHOD__ ];
-		}
-
-		$keys = array();
-
-		foreach ( $this->get_attribute_keys() as $key ) {
-			if ( $this->has_map_method( $key ) ) {
-				$keys[] = $key;
-			}
-		}
-
-		return self::$memo[ get_called_class() ][ __METHOD__ ] = $keys;
-	}
-
-	/**
-	 * Returns the model's keys that are computed at call time.
-	 *
-	 * @return array
-	 */
-	public function get_computed_keys() {
-		if ( isset( self::$memo[ get_called_class() ][ __METHOD__ ] ) ) {
-			return self::$memo[ get_called_class() ][ __METHOD__ ];
-		}
-
-		$keys = array();
-
-		foreach ( $this->get_attribute_keys() as $key ) {
-			if ( $this->has_compute_method( $key ) ) {
-				$keys[] = $key;
-			}
-		}
-
-		return self::$memo[ get_called_class() ][ __METHOD__ ] = $keys;
-	}
-
-	/**
-	 * Serializes the model's public data into an array.
-	 *
-	 * @return array
-	 */
-	public function serialize() {
-		$attributes = array();
-
-		if ( $this->visible ) {
-			// If visible attributes are set, we'll only reveal those.
-			foreach ( $this->visible as $key ) {
-				$attributes[ $key ] = $this->get_attribute( $key );
-			}
-		} elseif ( $this->hidden ) {
-			// If hidden attributes are set, we'll grab everything and hide those.
-			foreach ( $this->get_attribute_keys() as $key ) {
-				if ( ! in_array( $key, $this->hidden ) ) {
-					$attributes[ $key ] = $this->get_attribute( $key );
-				}
-			}
-		} else {
-			// If nothing is hidden/visible, we'll grab and reveal everything.
-			foreach ( $this->get_attribute_keys() as $key ) {
-				$attributes[ $key ] = $this->get_attribute( $key );
-			}
-		}
-
-		return array_map( function ( $attribute ) {
-			if ( $attribute instanceof Serializes ) {
-				return $attribute->serialize();
-			}
-
-			return $attribute;
-		}, $attributes );
-	}
-
-	/**
-	 * Syncs the current attributes to the model's original.
-	 *
-	 * @return $this
-	 */
-	public function sync_original() {
-		$this->original = $this->attributes;
-
-		if ( $this->attributes[ self::OBJECT_KEY ] ) {
-			$this->original[ self::OBJECT_KEY ] = clone $this->attributes[ self::OBJECT_KEY ];
-		}
-
-		foreach ( $this->original[ self::TABLE_KEY ] as $key => $item ) {
-			if ( is_object( $item ) ) {
-				$this->original[ $key ] = clone $item;
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Checks if a given attribute is mass-fillable.
-	 *
-	 * Returns true if the attribute can be filled, false if it can't.
-	 *
-	 * @param string $name
-	 *
-	 * @return bool
-	 */
-	private function is_fillable( $name ) {
-		// If this model isn't guarded, everything is fillable.
-		if ( ! $this->is_guarded ) {
-			return true;
-		}
-
-		// If it's in the fillable array, then it's fillable.
-		if ( in_array( $name, $this->fillable ) ) {
-			return true;
-		}
-
-		// If it's explicitly guarded, then it's not fillable.
-		if ( in_array( $name, $this->guarded ) ) {
-			return false;
-		}
-
-		// If fillable hasn't been defined, then everything else fillable.
-		return ! $this->fillable;
-	}
-
-	/**
-	 * Overrides the current WordPress object with a provided one.
-	 *
-	 * Resets the post's default values and stores it in the attributes.
-	 *
-	 * @param WP_Post|WP_Term|null $value
-	 *
-	 * @return $this
-	 */
-	private function override_wp_object( $value ) {
-		if ( is_object( $value ) ) {
-			$this->attributes[ self::OBJECT_KEY ] = $this->set_wp_object_constants( $value );
-		} else {
-			$this->attributes[ self::OBJECT_KEY ] = null;
-
-			if ( $this->uses_wp_object() ) {
-				$this->create_wp_object();
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Overrides the current table attributes array with a provided one.
-	 *
-	 * @param array $value
-	 *
-	 * @return $this
-	 */
-	private function override_table( array $value ) {
-		$this->attributes[ self::TABLE_KEY ] = $value;
-
-		return $this;
-	}
-
-	/**
-	 * Create and set with a new blank post.
-	 *
-	 * Creates a new WP_Post object, assigns it the default attributes,
-	 * and stores it in the attributes.
-	 *
-	 * @throws LogicException
-	 */
-	private function create_wp_object() {
-		switch ( true ) {
-			case $this instanceof UsesWordPressPost:
-				$object = new WP_Post( (object) array() );
-				break;
-			case $this instanceof UsesWordPressTerm:
-				$object = new WP_Term( (object) array() );
-				break;
-			default:
-				throw new LogicException;
-				break;
-		}
-
-		$this->attributes[ self::OBJECT_KEY ] = $this->set_wp_object_constants( $object );
-	}
-
-	/**
-	 * Enforces values on the post that can't change.
-	 *
-	 * Primarily, this is used to make sure the post_type always maps
-	 * to the model's "$type" property, but this can all be overridden
-	 * by the developer to enforce other values in the model.
-	 *
-	 * @param object $object
-	 *
-	 * @return object
-	 */
-	protected function set_wp_object_constants( $object ) {
-		if ( $this instanceof UsesWordPressPost ) {
-			$object->post_type = static::get_post_type();
-		}
-
-		if ( $this instanceof UsesWordPressTerm ) {
-			$object->taxonomy = static::get_taxonomy();
-		}
-
-		return $object;
-	}
-
-	/**
-	 * Magic __get method.
-	 *
-	 * Passes the name and value to get_attribute, which is where the magic happens.
-	 *
-	 * @param string $name
-	 *
-	 * @return mixed
-	 */
-	public function __get( $name ) {
-		return $this->get_attribute( $name );
-	}
-
-	/**
-	 * Retrieves the model attribute.
-	 *
-	 * @param string $name
-	 *
-	 * @return mixed
-	 *
-	 * @throws PropertyDoesNotExistException If property isn't found.
-	 */
-	public function get_attribute( $name ) {
-		if ( $method = $this->has_map_method( $name ) ) {
-			return $this->attributes[ self::OBJECT_KEY ]->{$this->{$method}()};
-		}
-
-		if ( $method = $this->has_compute_method( $name ) ) {
-			return $this->{$method}();
-		}
-
-		if ( isset( $this->attributes[ self::TABLE_KEY ][ $name ] ) ) {
-			return $this->attributes[ self::TABLE_KEY ][ $name ];
-		}
-
-		if ( isset( $this->defaults[ $name ] ) ) {
-			return $this->defaults[ $name ];
-		}
-
-		throw new PropertyDoesNotExistException( $name );
-	}
-
-	/**
-	 * Retrieve the model's original attribute value.
-	 *
-	 * @param string $name
-	 *
-	 * @return mixed
-	 *
-	 * @throws PropertyDoesNotExistException If property isn't found.
-	 */
-	public function get_original_attribute( $name ) {
-		$original_attributes = $this->original;
-
-		if ( ! is_object( $original_attributes[ static::OBJECT_KEY ] ) ) {
-			unset( $original_attributes[ static::OBJECT_KEY ] );
-		}
-
-		$original = new static( $original_attributes );
-
-		try {
-			return $original->get_attribute( $name );
-		} catch ( Exception $exception ) {
-			return null;
-		}
-	}
-
-	/**
-	 * Fetches the Model's primary ID, depending on the model
-	 * implementation.
-	 *
-	 * @return int
-	 *
-	 * @throws LogicException
-	 */
-	public function get_primary_id() {
-		if ( $this instanceof UsesWordPressPost ) {
-			return $this->get_underlying_wp_object()->ID;
-		}
-
-		if ( $this instanceof UsesWordPressTerm ) {
-			return $this->get_underlying_wp_object()->term_id;
-		}
-
-		// Model w/o wp_object not yet supported.
-		throw new LogicException;
-	}
-
-	/**
-	 * Checks whether the attribute has a map method.
-	 *
-	 * This is used to determine whether the attribute maps to a
-	 * property on the underlying WP_Post object. Returns the
-	 * method if one exists, returns false if it doesn't.
-	 *
-	 * @param string $name
-	 *
-	 * @return false|string
-	 */
-	protected function has_map_method( $name ) {
-		if ( method_exists( $this, $method = "map_{$name}" ) ) {
-			return $method;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Checks whether the attribute has a compute method.
-	 *
-	 * This is used to determine if the attribute should be computed
-	 * from other attributes.
-	 *
-	 * @param string $name
-	 *
-	 * @return false|string
-	 */
-	protected function has_compute_method( $name ) {
-		if ( method_exists( $this, $method = "compute_{$name}" ) ) {
-			return $method;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Clears all the current attributes from the model.
-	 *
-	 * This does not touch the model's original attributes, and will
-	 * only clear fillable attributes, unless the model is unguarded.
-	 *
-	 * @return $this
-	 */
-	public function clear() {
-		$keys = array_merge(
-			$this->get_table_keys(),
-			$this->get_wp_object_keys()
-		);
-
-		foreach ( $keys as $key ) {
-			try {
-				$this->set_attribute( $key, null );
-			} catch ( GuardedPropertyException $e ) {
-				// We won't clear out guarded attributes.
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Unguards the model.
-	 *
-	 * Sets the model to be unguarded, allowing the filling of
-	 * guarded attributes.
-	 */
-	public function unguard() {
-		$this->is_guarded = false;
-	}
-
-	/**
-	 * Reguards the model.
-	 *
-	 * Sets the model to be guarded, preventing filling of
-	 * guarded attributes.
-	 */
-	public function reguard() {
-		$this->is_guarded = true;
-	}
-
-	/**
-	 * Retrieves all the compute methods on the model.
-	 *
-	 * @return array
-	 */
-	protected function get_compute_methods() {
-		$methods = get_class_methods( get_called_class() );
-		$methods = array_filter( $methods, function ( $method ) {
-			return strrpos( $method, 'compute_', - strlen( $method ) ) !== false;
-		} );
-		$methods = array_map( function ( $method ) {
-			return substr( $method, strlen( 'compute_' ) );
-		}, $methods );
-
-		return $methods;
-	}
-
-	/**
-	 * Sets up the memo array for the creating model.
-	 */
-	private function maybe_boot() {
-		if ( ! isset( self::$memo[ get_called_class() ] ) ) {
-			self::$memo[ get_called_class() ] = array();
-		}
-	}
-
-	/**
-	 * Whether this Model uses an underlying WordPress object.
-	 *
-	 * @return bool
-	 */
-	protected function uses_wp_object() {
-		return $this instanceof UsesWordPressPost ||
-			$this instanceof UsesWordPressTerm;
-	}
+    /**
+     * Table attribute key.
+     */
+    const TABLE_KEY = '@@table';
+
+    /**
+     * Object attribute key.
+     */
+    const OBJECT_KEY = '@@object';
+
+    /**
+     * Memoized values for class methods.
+     *
+     * @var array
+     */
+    private static $memo = array();
+
+    /**
+     * Model attributes.
+     *
+     * @var array
+     */
+    private $attributes = array(
+        self::TABLE_KEY  => array(),
+        self::OBJECT_KEY => null,
+    );
+
+    /**
+     * Model's original attributes.
+     *
+     * @var array
+     */
+    private $original = array(
+        self::TABLE_KEY  => array(),
+        self::OBJECT_KEY => null,
+    );
+
+    /**
+     * Default attribute values.
+     *
+     * @var array
+     */
+    protected $defaults = array();
+
+    /**
+     * Properties which are allowed to be set on the model.
+     *
+     * If this array is empty, any attributes can be set on the model.
+     *
+     * @var string[]
+     */
+    protected $fillable = array();
+
+    /**
+     * Properties which cannot be automatically filled on the model.
+     *
+     * If the model is unguarded, these properties can be filled.
+     *
+     * @var array
+     */
+    protected $guarded = array();
+
+    /**
+     * Properties which should not be serialized.
+     *
+     * @var array
+     */
+    protected $hidden = array();
+
+    /**
+     * Properties which should be serialized.
+     *
+     * @var array
+     */
+    protected $visible = array();
+
+    /**
+     * Whether the model's properties are guarded.
+     *
+     * When false, allows guarded properties to be filled.
+     *
+     * @var bool
+     */
+    protected $is_guarded = true;
+
+    /**
+     * Constructs a new model with provided attributes.
+     *
+     * If self::OBJECT_KEY is passed as one of the attributes, the underlying post
+     * will be overwritten.
+     *
+     * @param array <string, mixed> $attributes
+     */
+    public function __construct( array $attributes = array() ) {
+        $this->maybe_boot();
+        $this->sync_original();
+
+        if ( $this->uses_wp_object() ) {
+            $this->create_wp_object();
+        }
+
+        $this->unguard();
+        $this->refresh( $attributes );
+        $this->reguard();
+    }
+
+    /**
+     * Refreshes the model's current attributes with the provided array.
+     *
+     * The model's attributes will match what was provided in the array,
+     * and any attributes not passed
+     *
+     * @param array $attributes
+     *
+     * @return $this
+     */
+    public function refresh( array $attributes ) {
+        $this->clear();
+
+        return $this->merge( $attributes );
+    }
+
+    /**
+     * Merges the provided attributes with the provided array.
+     *
+     * @param array $attributes
+     *
+     * @return $this
+     */
+    public function merge( array $attributes ) {
+        foreach ( $attributes as $name => $value ) {
+            $this->set_attribute( $name, $value );
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the model's table attributes.
+     *
+     * Returns the array of for the model that will either need to be
+     * saved in postmeta or a separate table.
+     *
+     * @return array
+     */
+    public function get_table_attributes() {
+        return $this->attributes[ self::TABLE_KEY ];
+    }
+
+    /**
+     * Get the model's original attributes.
+     *
+     * @return array
+     */
+    public function get_original_table_attributes() {
+        return $this->original[ self::TABLE_KEY ];
+    }
+
+    /**
+     * Retrieve an array of the attributes on the model
+     * that have changed compared to the model's
+     * original data.
+     *
+     * @return array
+     */
+    public function get_changed_table_attributes() {
+        $changed = array();
+
+        foreach ( $this->get_table_attributes() as $key => $value ) {
+            if ( $value !==
+                    $this->get_original_attribute( $key )
+            ) {
+                $changed[ $key ] = $value;
+            }
+        }
+
+        return $changed;
+    }
+
+    /**
+     * Get the model's underlying post.
+     *
+     * Returns the underlying WP_Post object for the model, representing
+     * the data that will be save in the wp_posts table.
+     *
+     * @return false|WP_Post|WP_Term
+     */
+    public function get_underlying_wp_object() {
+        if ( isset( $this->attributes[ self::OBJECT_KEY ] ) ) {
+            return $this->attributes[ self::OBJECT_KEY ];
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the model's original underlying post.
+     *
+     * @return WP_Post
+     */
+    public function get_original_underlying_wp_object() {
+        return $this->original[ self::OBJECT_KEY ];
+    }
+
+    /**
+     * Get the model attributes on the WordPress object
+     * that have changed compared to the model's
+     * original attributes.
+     *
+     * @return array
+     */
+    public function get_changed_wp_object_attributes() {
+        $changed = array();
+
+        foreach ( $this->get_wp_object_keys() as $key ) {
+            if ( $this->get_attribute( $key ) !==
+                    $this->get_original_attribute( $key )
+            ) {
+                $changed[ $key ] = $this->get_attribute( $key );
+            }
+        }
+
+        return $changed;
+    }
+
+    /**
+     * Magic __set method.
+     *
+     * Passes the name and value to set_attribute, which is where the magic happens.
+     *
+     * @param string $name
+     * @param mixed  $value
+     */
+    public function __set( $name, $value ) {
+        $this->set_attribute( $name, $value );
+    }
+
+    /**
+     * Sets the model attributes.
+     *
+     * Checks whether the model attribute can be set, check if it
+     * maps to the WP_Post property, otherwise, assigns it to the
+     * table attribute array.
+     *
+     * @param string $name
+     * @param mixed  $value
+     *
+     * @return $this
+     *
+     * @throws GuardedPropertyException
+     */
+    public function set_attribute( $name, $value ) {
+        if ( self::OBJECT_KEY === $name ) {
+            return $this->override_wp_object( $value );
+        }
+
+        if ( self::TABLE_KEY === $name ) {
+            return $this->override_table( $value );
+        }
+
+        if ( ! $this->is_fillable( $name ) ) {
+            throw new GuardedPropertyException;
+        }
+
+        if ( $method = $this->has_map_method( $name ) ) {
+            $this->attributes[ self::OBJECT_KEY ]->{$this->{$method}()} = $value;
+        } else {
+            $this->attributes[ self::TABLE_KEY ][ $name ] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Retrieves all the attribute keys for the model.
+     *
+     * @return array
+     */
+    public function get_attribute_keys() {
+        if ( isset( self::$memo[ get_called_class() ][ __METHOD__ ] ) ) {
+            return self::$memo[ get_called_class() ][ __METHOD__ ];
+        }
+
+        return self::$memo[ get_called_class() ][ __METHOD__ ]
+            = array_merge(
+                $this->fillable,
+                $this->guarded,
+                $this->get_compute_methods()
+            );
+    }
+
+    /**
+     * Retrieves the attribute keys that aren't mapped to a post.
+     *
+     * @return array
+     */
+    public function get_table_keys() {
+        if ( isset( self::$memo[ get_called_class() ][ __METHOD__ ] ) ) {
+            return self::$memo[ get_called_class() ][ __METHOD__ ];
+        }
+
+        $keys = array();
+
+        foreach ( $this->get_attribute_keys() as $key ) {
+            if ( ! $this->has_map_method( $key ) &&
+                 ! $this->has_compute_method( $key )
+            ) {
+                $keys[] = $key;
+            }
+        }
+
+        return self::$memo[ get_called_class() ][ __METHOD__ ] = $keys;
+    }
+
+    /**
+     * Retrieves the attribute keys that are mapped to a post.
+     *
+     * @return array
+     */
+    public function get_wp_object_keys() {
+        if ( isset( self::$memo[ get_called_class() ][ __METHOD__ ] ) ) {
+            return self::$memo[ get_called_class() ][ __METHOD__ ];
+        }
+
+        $keys = array();
+
+        foreach ( $this->get_attribute_keys() as $key ) {
+            if ( $this->has_map_method( $key ) ) {
+                $keys[] = $key;
+            }
+        }
+
+        return self::$memo[ get_called_class() ][ __METHOD__ ] = $keys;
+    }
+
+    /**
+     * Returns the model's keys that are computed at call time.
+     *
+     * @return array
+     */
+    public function get_computed_keys() {
+        if ( isset( self::$memo[ get_called_class() ][ __METHOD__ ] ) ) {
+            return self::$memo[ get_called_class() ][ __METHOD__ ];
+        }
+
+        $keys = array();
+
+        foreach ( $this->get_attribute_keys() as $key ) {
+            if ( $this->has_compute_method( $key ) ) {
+                $keys[] = $key;
+            }
+        }
+
+        return self::$memo[ get_called_class() ][ __METHOD__ ] = $keys;
+    }
+
+    /**
+     * Serializes the model's public data into an array.
+     *
+     * @return array
+     */
+    public function serialize() {
+        $attributes = array();
+
+        if ( $this->visible ) {
+            // If visible attributes are set, we'll only reveal those.
+            foreach ( $this->visible as $key ) {
+                $attributes[ $key ] = $this->get_attribute( $key );
+            }
+        } elseif ( $this->hidden ) {
+            // If hidden attributes are set, we'll grab everything and hide those.
+            foreach ( $this->get_attribute_keys() as $key ) {
+                if ( ! in_array( $key, $this->hidden ) ) {
+                    $attributes[ $key ] = $this->get_attribute( $key );
+                }
+            }
+        } else {
+            // If nothing is hidden/visible, we'll grab and reveal everything.
+            foreach ( $this->get_attribute_keys() as $key ) {
+                $attributes[ $key ] = $this->get_attribute( $key );
+            }
+        }
+
+        return array_map( function ( $attribute ) {
+            if ( $attribute instanceof Serializes ) {
+                return $attribute->serialize();
+            }
+
+            return $attribute;
+        }, $attributes );
+    }
+
+    /**
+     * Syncs the current attributes to the model's original.
+     *
+     * @return $this
+     */
+    public function sync_original() {
+        $this->original = $this->attributes;
+
+        if ( $this->attributes[ self::OBJECT_KEY ] ) {
+            $this->original[ self::OBJECT_KEY ] = clone $this->attributes[ self::OBJECT_KEY ];
+        }
+
+        foreach ( $this->original[ self::TABLE_KEY ] as $key => $item ) {
+            if ( is_object( $item ) ) {
+                $this->original[ $key ] = clone $item;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Checks if a given attribute is mass-fillable.
+     *
+     * Returns true if the attribute can be filled, false if it can't.
+     *
+     * @param string $name
+     *
+     * @return bool
+     */
+    private function is_fillable( $name ) {
+        // If this model isn't guarded, everything is fillable.
+        if ( ! $this->is_guarded ) {
+            return true;
+        }
+
+        // If it's in the fillable array, then it's fillable.
+        if ( in_array( $name, $this->fillable ) ) {
+            return true;
+        }
+
+        // If it's explicitly guarded, then it's not fillable.
+        if ( in_array( $name, $this->guarded ) ) {
+            return false;
+        }
+
+        // If fillable hasn't been defined, then everything else fillable.
+        return ! $this->fillable;
+    }
+
+    /**
+     * Overrides the current WordPress object with a provided one.
+     *
+     * Resets the post's default values and stores it in the attributes.
+     *
+     * @param WP_Post|WP_Term|null $value
+     *
+     * @return $this
+     */
+    private function override_wp_object( $value ) {
+        if ( is_object( $value ) ) {
+            $this->attributes[ self::OBJECT_KEY ] = $this->set_wp_object_constants( $value );
+        } else {
+            $this->attributes[ self::OBJECT_KEY ] = null;
+
+            if ( $this->uses_wp_object() ) {
+                $this->create_wp_object();
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Overrides the current table attributes array with a provided one.
+     *
+     * @param array $value
+     *
+     * @return $this
+     */
+    private function override_table( array $value ) {
+        $this->attributes[ self::TABLE_KEY ] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Create and set with a new blank post.
+     *
+     * Creates a new WP_Post object, assigns it the default attributes,
+     * and stores it in the attributes.
+     *
+     * @throws LogicException
+     */
+    private function create_wp_object() {
+        switch ( true ) {
+            case $this instanceof UsesWordPressPost:
+                $object = new WP_Post( (object) array() );
+                break;
+            case $this instanceof UsesWordPressTerm:
+                $object = new WP_Term( (object) array() );
+                break;
+            default:
+                throw new LogicException;
+                break;
+        }
+
+        $this->attributes[ self::OBJECT_KEY ] = $this->set_wp_object_constants( $object );
+    }
+
+    /**
+     * Enforces values on the post that can't change.
+     *
+     * Primarily, this is used to make sure the post_type always maps
+     * to the model's "$type" property, but this can all be overridden
+     * by the developer to enforce other values in the model.
+     *
+     * @param object $object
+     *
+     * @return object
+     */
+    protected function set_wp_object_constants( $object ) {
+        if ( $this instanceof UsesWordPressPost ) {
+            $object->post_type = static::get_post_type();
+        }
+
+        if ( $this instanceof UsesWordPressTerm ) {
+            $object->taxonomy = static::get_taxonomy();
+        }
+
+        return $object;
+    }
+
+    /**
+     * Magic __get method.
+     *
+     * Passes the name and value to get_attribute, which is where the magic happens.
+     *
+     * @param string $name
+     *
+     * @return mixed
+     */
+    public function __get( $name ) {
+        return $this->get_attribute( $name );
+    }
+
+    /**
+     * Retrieves the model attribute.
+     *
+     * @param string $name
+     *
+     * @return mixed
+     *
+     * @throws PropertyDoesNotExistException If property isn't found.
+     */
+    public function get_attribute( $name ) {
+        if ( $method = $this->has_map_method( $name ) ) {
+            return $this->attributes[ self::OBJECT_KEY ]->{$this->{$method}()};
+        }
+
+        if ( $method = $this->has_compute_method( $name ) ) {
+            return $this->{$method}();
+        }
+
+        if ( isset( $this->attributes[ self::TABLE_KEY ][ $name ] ) ) {
+            return $this->attributes[ self::TABLE_KEY ][ $name ];
+        }
+
+        if ( isset( $this->defaults[ $name ] ) ) {
+            return $this->defaults[ $name ];
+        }
+
+        throw new PropertyDoesNotExistException( $name );
+    }
+
+    /**
+     * Retrieve the model's original attribute value.
+     *
+     * @param string $name
+     *
+     * @return mixed
+     *
+     * @throws PropertyDoesNotExistException If property isn't found.
+     */
+    public function get_original_attribute( $name ) {
+        $original_attributes = $this->original;
+
+        if ( ! is_object( $original_attributes[ static::OBJECT_KEY ] ) ) {
+            unset( $original_attributes[ static::OBJECT_KEY ] );
+        }
+
+        $original = new static( $original_attributes );
+
+        try {
+            return $original->get_attribute( $name );
+        } catch ( Exception $exception ) {
+            return null;
+        }
+    }
+
+    /**
+     * Fetches the Model's primary ID, depending on the model
+     * implementation.
+     *
+     * @return int
+     *
+     * @throws LogicException
+     */
+    public function get_primary_id() {
+        if ( $this instanceof UsesWordPressPost ) {
+            return $this->get_underlying_wp_object()->ID;
+        }
+
+        if ( $this instanceof UsesWordPressTerm ) {
+            return $this->get_underlying_wp_object()->term_id;
+        }
+
+        // Model w/o wp_object not yet supported.
+        throw new LogicException;
+    }
+
+    /**
+     * Checks whether the attribute has a map method.
+     *
+     * This is used to determine whether the attribute maps to a
+     * property on the underlying WP_Post object. Returns the
+     * method if one exists, returns false if it doesn't.
+     *
+     * @param string $name
+     *
+     * @return false|string
+     */
+    protected function has_map_method( $name ) {
+        if ( method_exists( $this, $method = "map_{$name}" ) ) {
+            return $method;
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks whether the attribute has a compute method.
+     *
+     * This is used to determine if the attribute should be computed
+     * from other attributes.
+     *
+     * @param string $name
+     *
+     * @return false|string
+     */
+    protected function has_compute_method( $name ) {
+        if ( method_exists( $this, $method = "compute_{$name}" ) ) {
+            return $method;
+        }
+
+        return false;
+    }
+
+    /**
+     * Clears all the current attributes from the model.
+     *
+     * This does not touch the model's original attributes, and will
+     * only clear fillable attributes, unless the model is unguarded.
+     *
+     * @return $this
+     */
+    public function clear() {
+        $keys = array_merge(
+            $this->get_table_keys(),
+            $this->get_wp_object_keys()
+        );
+
+        foreach ( $keys as $key ) {
+            try {
+                $this->set_attribute( $key, null );
+            } catch ( GuardedPropertyException $e ) {
+                // We won't clear out guarded attributes.
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Unguards the model.
+     *
+     * Sets the model to be unguarded, allowing the filling of
+     * guarded attributes.
+     */
+    public function unguard() {
+        $this->is_guarded = false;
+    }
+
+    /**
+     * Reguards the model.
+     *
+     * Sets the model to be guarded, preventing filling of
+     * guarded attributes.
+     */
+    public function reguard() {
+        $this->is_guarded = true;
+    }
+
+    /**
+     * Retrieves all the compute methods on the model.
+     *
+     * @return array
+     */
+    protected function get_compute_methods() {
+        $methods = get_class_methods( get_called_class() );
+        $methods = array_filter( $methods, function ( $method ) {
+            return strrpos( $method, 'compute_', - strlen( $method ) ) !== false;
+        } );
+        $methods = array_map( function ( $method ) {
+            return substr( $method, strlen( 'compute_' ) );
+        }, $methods );
+
+        return $methods;
+    }
+
+    /**
+     * Sets up the memo array for the creating model.
+     */
+    private function maybe_boot() {
+        if ( ! isset( self::$memo[ get_called_class() ] ) ) {
+            self::$memo[ get_called_class() ] = array();
+        }
+    }
+
+    /**
+     * Whether this Model uses an underlying WordPress object.
+     *
+     * @return bool
+     */
+    protected function uses_wp_object() {
+        return $this instanceof UsesWordPressPost ||
+            $this instanceof UsesWordPressTerm;
+    }
 }

src/Contract/Axolotl/EntityManager.php

Indentation +46 added lines, -46 removed lines

@@ -6,54 +6,54 @@
 use WP_Error;
 
 interface EntityManager {
-	/**
-	 * Get a single model of the provided class with the given ID.
-	 *
-	 * @param string $class Fully qualified class name of model.
-	 * @param int    $id    ID of the model.
-	 *
-	 * @return Model|WP_Error
-	 */
-	public function find( $class, $id );
+    /**
+     * Get a single model of the provided class with the given ID.
+     *
+     * @param string $class Fully qualified class name of model.
+     * @param int    $id    ID of the model.
+     *
+     * @return Model|WP_Error
+     */
+    public function find( $class, $id );
 
-	/**
-	 * Finds all the models of the provided class for the given params.
-	 *
-	 * This method will return an empty Collection if the query returns no models.
-	 *
-	 * @param string $class  Fully qualified class name of models to find.
-	 * @param array  $params Params to constrain the find.
-	 *
-	 * @return Collection|WP_Error
-	 */
-	public function find_by( $class, array $params = array() );
+    /**
+     * Finds all the models of the provided class for the given params.
+     *
+     * This method will return an empty Collection if the query returns no models.
+     *
+     * @param string $class  Fully qualified class name of models to find.
+     * @param array  $params Params to constrain the find.
+     *
+     * @return Collection|WP_Error
+     */
+    public function find_by( $class, array $params = array() );
 
-	/**
-	 * Saves a new model of the provided class with the given data.
-	 *
-	 * @param string $class
-	 * @param array  $data
-	 *
-	 * @return Model|WP_Error
-	 */
-	public function create( $class, array $data = array() );
+    /**
+     * Saves a new model of the provided class with the given data.
+     *
+     * @param string $class
+     * @param array  $data
+     *
+     * @return Model|WP_Error
+     */
+    public function create( $class, array $data = array() );
 
-	/**
-	 * Updates a model with its latest dataE.
-	 *
-	 * @param Model $model
-	 *
-	 * @return Model|WP_Error
-	 */
-	public function persist( Model $model );
+    /**
+     * Updates a model with its latest dataE.
+     *
+     * @param Model $model
+     *
+     * @return Model|WP_Error
+     */
+    public function persist( Model $model );
 
-	/**
-	 * Delete the provide
-	 *
-	 * @param Model $model
-	 * @param bool  $force
-	 *
-	 * @return mixed
-	 */
-	public function delete( Model $model, $force = false );
+    /**
+     * Delete the provide
+     *
+     * @param Model $model
+     * @param bool  $force
+     *
+     * @return mixed
+     */
+    public function delete( Model $model, $force = false );
 }

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 	 *
 	 * @return Model|WP_Error
 	 */
-	public function find( $class, $id );
+	public function find($class, $id);
 
 	/**
 	 * Finds all the models of the provided class for the given params.
@@ -26,7 +26,7 @@ 
 	 *
 	 * @return Collection|WP_Error
 	 */
-	public function find_by( $class, array $params = array() );
+	public function find_by($class, array $params = array());
 
 	/**
 	 * Saves a new model of the provided class with the given data.
@@ -36,7 +36,7 @@ 
 	 *
 	 * @return Model|WP_Error
 	 */
-	public function create( $class, array $data = array() );
+	public function create($class, array $data = array());
 
 	/**
 	 * Updates a model with its latest dataE.
@@ -45,7 +45,7 @@ 
 	 *
 	 * @return Model|WP_Error
 	 */
-	public function persist( Model $model );
+	public function persist(Model $model);
 
 	/**
 	 * Delete the provide
@@ -55,5 +55,5 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function delete( Model $model, $force = false );
+	public function delete(Model $model, $force = false);
 }

src/Axolotl/Collection.php

Indentation +223 added lines, -223 removed lines

@@ -14,227 +14,227 @@
  * @subpackage Axolotl
  */
 class Collection implements Countable, Iterator, Serializes {
-	/**
-	 * Collection elements.
-	 *
-	 * @var array
-	 */
-	protected $elements = array();
-
-	/**
-	 * Collection configuration.
-	 *
-	 * @var array
-	 */
-	protected $config = array();
-
-	/**
-	 * Models registered to the collection.
-	 *
-	 * @var string
-	 */
-	protected $model;
-
-	/**
-	 * Where Collection is in loop.
-	 *
-	 * @var int
-	 */
-	protected $position = 0;
-
-	/**
-	 * Collection constructor.
-	 *
-	 * @param array $elements
-	 * @param array $config
-	 */
-	public function __construct( array $elements = array(), array $config = array() ) {
-		$this->parse_config( $this->config = $config );
-
-		foreach ( $elements as $element ) {
-			$this->add( $element );
-		}
-	}
-
-	/**
-	 * Adds a new element to the Collection.
-	 *
-	 * @param mixed $element
-	 *
-	 * @throws RuntimeException
-	 *
-	 * @return $this
-	 */
-	public function add( $element ) {
-		if ( $this->model && is_array( $element ) ) {
-			$element = new $this->model( $element );
-		}
-
-		if ( $this->model && ! ( $element instanceof $this->model ) ) {
-			throw new RuntimeException;
-		}
-
-		$this->elements[] = $element;
-
-		return $this;
-	}
-
-	/**
-	 * Removes an element by index or value.
-	 *
-	 * @param mixed $index
-	 *
-	 * @return $this
-	 */
-	public function remove( $index ) {
-		if ( ! is_string( $index ) || ! is_numeric( $index ) || ! isset( $this->elements[ $index ] ) ) {
-			foreach ( $this->elements as $key => $element ) {
-				if ( $element === $index ) {
-					$index = $key;
-					break;
-				}
-			}
-		}
-
-		if ( isset( $this->elements[ $index ] ) ) {
-			unset( $this->elements[ $index ] );
-			$this->elements = array_values( $this->elements );
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Fetches the element at the provided index.
-	 *
-	 * @param int $index
-	 *
-	 * @return mixed|null
-	 */
-	public function at( $index ) {
-		return isset( $this->elements[ $index ] ) ? $this->elements[ $index ] : null;
-	}
-
-	/**
-	 * Maps over the Collection's elements,
-	 *
-	 * @param callable $callback
-	 *
-	 * @return Collection
-	 */
-	protected function map( callable $callback ) {
-		return new Collection( array_map( $callback, $this->elements ), $this->config );
-	}
-
-	/**
-	 * Filters the Collection's elements.
-	 *
-	 * @param callable $callback
-	 *
-	 * @return Collection
-	 */
-	public function filter( callable $callback ) {
-		return new Collection( array_filter( $this->elements, $callback ) );
-	}
-
-	/**
-	 * Fetches a single element in the Collection by callback.
-	 *
-	 * @param callable $callback
-	 *
-	 * @return mixed|null
-	 */
-	public function find( callable $callback ) {
-		foreach ( $this->elements as $element ) {
-			if ( call_user_func( $callback, $element ) ) {
-				return $element;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @return array
-	 */
-	public function serialize() {
-		return array_map(function( $element ) {
-			if ( $element instanceof Serializes ) {
-				return $element->serialize();
-			}
-
-			return $element;
-		}, $this->elements);
-	}
-
-	/**
-	 * Return the current element.
-	 *
-	 * @return mixed
-	 */
-	public function current() {
-		return $this->at( $this->position );
-	}
-
-	/**
-	 * Move forward to next element.
-	 */
-	public function next() {
-		$this->position ++;
-	}
-
-	/**
-	 * Return the key of the current element.
-	 *
-	 * @return mixed
-	 */
-	public function key() {
-		return $this->position;
-	}
-
-	/**
-	 * Checks if current position is valid.
-	 *
-	 * @return bool
-	 */
-	public function valid() {
-		return isset( $this->elements[ $this->position ] );
-	}
-
-	/**
-	 * Rewind the Iterator to the first element.
-	 */
-	public function rewind() {
-		$this->position = 0;
-	}
-
-	/**
-	 * Count elements of an object.
-	 *
-	 * @return int
-	 */
-	public function count() {
-		return count( $this->elements );
-	}
-
-	/**
-	 * Parses the Collection config to set its properties.
-	 *
-	 * @param array $config
-	 *
-	 * @throws LogicException
-	 */
-	protected function parse_config( array $config ) {
-		if ( isset( $config['model'] ) ) {
-			$model = $config['model'];
-
-			if ( ! is_subclass_of( $model, 'Intraxia\Jaxion\Axolotl\Model' ) ) {
-				throw new LogicException;
-			}
-
-			$this->model = $model;
-		}
-	}
+    /**
+     * Collection elements.
+     *
+     * @var array
+     */
+    protected $elements = array();
+
+    /**
+     * Collection configuration.
+     *
+     * @var array
+     */
+    protected $config = array();
+
+    /**
+     * Models registered to the collection.
+     *
+     * @var string
+     */
+    protected $model;
+
+    /**
+     * Where Collection is in loop.
+     *
+     * @var int
+     */
+    protected $position = 0;
+
+    /**
+     * Collection constructor.
+     *
+     * @param array $elements
+     * @param array $config
+     */
+    public function __construct( array $elements = array(), array $config = array() ) {
+        $this->parse_config( $this->config = $config );
+
+        foreach ( $elements as $element ) {
+            $this->add( $element );
+        }
+    }
+
+    /**
+     * Adds a new element to the Collection.
+     *
+     * @param mixed $element
+     *
+     * @throws RuntimeException
+     *
+     * @return $this
+     */
+    public function add( $element ) {
+        if ( $this->model && is_array( $element ) ) {
+            $element = new $this->model( $element );
+        }
+
+        if ( $this->model && ! ( $element instanceof $this->model ) ) {
+            throw new RuntimeException;
+        }
+
+        $this->elements[] = $element;
+
+        return $this;
+    }
+
+    /**
+     * Removes an element by index or value.
+     *
+     * @param mixed $index
+     *
+     * @return $this
+     */
+    public function remove( $index ) {
+        if ( ! is_string( $index ) || ! is_numeric( $index ) || ! isset( $this->elements[ $index ] ) ) {
+            foreach ( $this->elements as $key => $element ) {
+                if ( $element === $index ) {
+                    $index = $key;
+                    break;
+                }
+            }
+        }
+
+        if ( isset( $this->elements[ $index ] ) ) {
+            unset( $this->elements[ $index ] );
+            $this->elements = array_values( $this->elements );
+        }
+
+        return $this;
+    }
+
+    /**
+     * Fetches the element at the provided index.
+     *
+     * @param int $index
+     *
+     * @return mixed|null
+     */
+    public function at( $index ) {
+        return isset( $this->elements[ $index ] ) ? $this->elements[ $index ] : null;
+    }
+
+    /**
+     * Maps over the Collection's elements,
+     *
+     * @param callable $callback
+     *
+     * @return Collection
+     */
+    protected function map( callable $callback ) {
+        return new Collection( array_map( $callback, $this->elements ), $this->config );
+    }
+
+    /**
+     * Filters the Collection's elements.
+     *
+     * @param callable $callback
+     *
+     * @return Collection
+     */
+    public function filter( callable $callback ) {
+        return new Collection( array_filter( $this->elements, $callback ) );
+    }
+
+    /**
+     * Fetches a single element in the Collection by callback.
+     *
+     * @param callable $callback
+     *
+     * @return mixed|null
+     */
+    public function find( callable $callback ) {
+        foreach ( $this->elements as $element ) {
+            if ( call_user_func( $callback, $element ) ) {
+                return $element;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return array
+     */
+    public function serialize() {
+        return array_map(function( $element ) {
+            if ( $element instanceof Serializes ) {
+                return $element->serialize();
+            }
+
+            return $element;
+        }, $this->elements);
+    }
+
+    /**
+     * Return the current element.
+     *
+     * @return mixed
+     */
+    public function current() {
+        return $this->at( $this->position );
+    }
+
+    /**
+     * Move forward to next element.
+     */
+    public function next() {
+        $this->position ++;
+    }
+
+    /**
+     * Return the key of the current element.
+     *
+     * @return mixed
+     */
+    public function key() {
+        return $this->position;
+    }
+
+    /**
+     * Checks if current position is valid.
+     *
+     * @return bool
+     */
+    public function valid() {
+        return isset( $this->elements[ $this->position ] );
+    }
+
+    /**
+     * Rewind the Iterator to the first element.
+     */
+    public function rewind() {
+        $this->position = 0;
+    }
+
+    /**
+     * Count elements of an object.
+     *
+     * @return int
+     */
+    public function count() {
+        return count( $this->elements );
+    }
+
+    /**
+     * Parses the Collection config to set its properties.
+     *
+     * @param array $config
+     *
+     * @throws LogicException
+     */
+    protected function parse_config( array $config ) {
+        if ( isset( $config['model'] ) ) {
+            $model = $config['model'];
+
+            if ( ! is_subclass_of( $model, 'Intraxia\Jaxion\Axolotl\Model' ) ) {
+                throw new LogicException;
+            }
+
+            $this->model = $model;
+        }
+    }
 }

Spacing +33 added lines, -33 removed lines

@@ -48,11 +48,11 @@ 
 	 * @param array $elements
 	 * @param array $config
 	 */
-	public function __construct( array $elements = array(), array $config = array() ) {
-		$this->parse_config( $this->config = $config );
+	public function __construct(array $elements = array(), array $config = array()) {
+		$this->parse_config($this->config = $config);
 
-		foreach ( $elements as $element ) {
-			$this->add( $element );
+		foreach ($elements as $element) {
+			$this->add($element);
 		}
 	}
 
@@ -65,12 +65,12 @@ 
 	 *
 	 * @return $this
 	 */
-	public function add( $element ) {
-		if ( $this->model && is_array( $element ) ) {
-			$element = new $this->model( $element );
+	public function add($element) {
+		if ($this->model && is_array($element)) {
+			$element = new $this->model($element);
 		}
 
-		if ( $this->model && ! ( $element instanceof $this->model ) ) {
+		if ($this->model && !($element instanceof $this->model)) {
 			throw new RuntimeException;
 		}
 
@@ -86,19 +86,19 @@ 
 	 *
 	 * @return $this
 	 */
-	public function remove( $index ) {
-		if ( ! is_string( $index ) || ! is_numeric( $index ) || ! isset( $this->elements[ $index ] ) ) {
-			foreach ( $this->elements as $key => $element ) {
-				if ( $element === $index ) {
+	public function remove($index) {
+		if (!is_string($index) || !is_numeric($index) || !isset($this->elements[$index])) {
+			foreach ($this->elements as $key => $element) {
+				if ($element === $index) {
 					$index = $key;
 					break;
 				}
 			}
 		}
 
-		if ( isset( $this->elements[ $index ] ) ) {
-			unset( $this->elements[ $index ] );
-			$this->elements = array_values( $this->elements );
+		if (isset($this->elements[$index])) {
+			unset($this->elements[$index]);
+			$this->elements = array_values($this->elements);
 		}
 
 		return $this;
@@ -111,8 +111,8 @@ 
 	 *
 	 * @return mixed|null
 	 */
-	public function at( $index ) {
-		return isset( $this->elements[ $index ] ) ? $this->elements[ $index ] : null;
+	public function at($index) {
+		return isset($this->elements[$index]) ? $this->elements[$index] : null;
 	}
 
 	/**
@@ -122,8 +122,8 @@ 
 	 *
 	 * @return Collection
 	 */
-	protected function map( callable $callback ) {
-		return new Collection( array_map( $callback, $this->elements ), $this->config );
+	protected function map(callable $callback) {
+		return new Collection(array_map($callback, $this->elements), $this->config);
 	}
 
 	/**
@@ -133,8 +133,8 @@ 
 	 *
 	 * @return Collection
 	 */
-	public function filter( callable $callback ) {
-		return new Collection( array_filter( $this->elements, $callback ) );
+	public function filter(callable $callback) {
+		return new Collection(array_filter($this->elements, $callback));
 	}
 
 	/**
@@ -144,9 +144,9 @@ 
 	 *
 	 * @return mixed|null
 	 */
-	public function find( callable $callback ) {
-		foreach ( $this->elements as $element ) {
-			if ( call_user_func( $callback, $element ) ) {
+	public function find(callable $callback) {
+		foreach ($this->elements as $element) {
+			if (call_user_func($callback, $element)) {
 				return $element;
 			}
 		}
@@ -160,8 +160,8 @@ 
 	 * @return array
 	 */
 	public function serialize() {
-		return array_map(function( $element ) {
-			if ( $element instanceof Serializes ) {
+		return array_map(function($element) {
+			if ($element instanceof Serializes) {
 				return $element->serialize();
 			}
 
@@ -175,14 +175,14 @@ 
 	 * @return mixed
 	 */
 	public function current() {
-		return $this->at( $this->position );
+		return $this->at($this->position);
 	}
 
 	/**
 	 * Move forward to next element.
 	 */
 	public function next() {
-		$this->position ++;
+		$this->position++;
 	}
 
 	/**
@@ -200,7 +200,7 @@ 
 	 * @return bool
 	 */
 	public function valid() {
-		return isset( $this->elements[ $this->position ] );
+		return isset($this->elements[$this->position]);
 	}
 
 	/**
@@ -216,7 +216,7 @@ 
 	 * @return int
 	 */
 	public function count() {
-		return count( $this->elements );
+		return count($this->elements);
 	}
 
 	/**
@@ -226,11 +226,11 @@ 
 	 *
 	 * @throws LogicException
 	 */
-	protected function parse_config( array $config ) {
-		if ( isset( $config['model'] ) ) {
+	protected function parse_config(array $config) {
+		if (isset($config['model'])) {
 			$model = $config['model'];
 
-			if ( ! is_subclass_of( $model, 'Intraxia\Jaxion\Axolotl\Model' ) ) {
+			if (!is_subclass_of($model, 'Intraxia\Jaxion\Axolotl\Model')) {
 				throw new LogicException;
 			}