intraxia / jaxion

src/Axolotl/Dictionary.php

Spacing +63 added lines, -63 removed lines

@@ -58,15 +58,15 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function __construct( $key_type, $val_type, array $storage = array() ) {
-		$this->key_type = new Type( $key_type, true );
-		$this->val_type = new Type( $val_type );
+	public function __construct($key_type, $val_type, array $storage = array()) {
+		$this->key_type = new Type($key_type, true);
+		$this->val_type = new Type($val_type);
 
-		foreach ( $storage as $key => $val ) {
-			$this->key_type->validate_element( $key );
-			$this->val_type->validate_element( $val );
+		foreach ($storage as $key => $val) {
+			$this->key_type->validate_element($key);
+			$this->val_type->validate_element($val);
 
-			$this->storage[ $key ] = $val;
+			$this->storage[$key] = $val;
 		}
 	}
 
@@ -95,8 +95,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function exists( $key ) {
-		return array_key_exists( $key, $this->storage );
+	public function exists($key) {
+		return array_key_exists($key, $this->storage);
 	}
 
 	/**
@@ -106,8 +106,8 @@ 
 	 *
 	 * @return mixed|null
 	 */
-	public function get( $key ) {
-		return $this->exists( $key ) ? $this->storage[ $key ] : null;
+	public function get($key) {
+		return $this->exists($key) ? $this->storage[$key] : null;
 	}
 
 	/**
@@ -117,13 +117,13 @@ 
 	 *
 	 * @return DictionaryContract
 	 */
-	public function delete( $key ) {
+	public function delete($key) {
 		$storage = $this->storage;
-		if ( $this->exists( $key ) ) {
-			unset( $storage[ $key ] );
+		if ($this->exists($key)) {
+			unset($storage[$key]);
 		}
 
-		return new static( $this->get_key_type(), $this->get_value_type(), $storage );
+		return new static($this->get_key_type(), $this->get_value_type(), $storage);
 	}
 
 	/**
@@ -133,22 +133,22 @@ 
 	 *
 	 * @return bool
 	 */
-	public function value_exists( $value ) {
-		return in_array( $value, $this->storage );
+	public function value_exists($value) {
+		return in_array($value, $this->storage);
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
 	public function count() {
-		return count( $this->storage );
+		return count($this->storage);
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
 	public function clear() {
-		return new static( $this->get_key_type(), $this->get_value_type() );
+		return new static($this->get_key_type(), $this->get_value_type());
 	}
 
 	/**
@@ -167,16 +167,16 @@ 
 	 *
 	 * @return DictionaryContract
 	 */
-	public function filter( $condition ) {
+	public function filter($condition) {
 		$storage = array();
 
-		foreach ( $this->storage as $key => $value ) {
-			if ( call_user_func( $condition, $value, $key ) ) {
-				$storage[ $key ] = $value;
+		foreach ($this->storage as $key => $value) {
+			if (call_user_func($condition, $value, $key)) {
+				$storage[$key] = $value;
 			}
 		}
 
-		return new static( $this->get_key_type(), $this->get_value_type(), $storage );
+		return new static($this->get_key_type(), $this->get_value_type(), $storage);
 	}
 
 	/**
@@ -186,9 +186,9 @@ 
 	 *
 	 * @return DictionaryContract
 	 */
-	public function reject( $condition ) {
-		return $this->filter( function ( $v, $k ) use ( $condition ) {
-			return ! call_user_func( $condition, $v, $k );
+	public function reject($condition) {
+		return $this->filter(function($v, $k) use ($condition) {
+			return !call_user_func($condition, $v, $k);
 		} );
 	}
 
@@ -200,11 +200,11 @@ 
 	 *
 	 * @return DictionaryContract
 	 */
-	public function add( $key, $value ) {
+	public function add($key, $value) {
 		$storage         = $this->storage;
-		$storage[ $key ] = $value;
+		$storage[$key] = $value;
 
-		return new static( $this->get_key_type(), $this->get_value_type(), $storage );
+		return new static($this->get_key_type(), $this->get_value_type(), $storage);
 	}
 
 	/**
@@ -212,9 +212,9 @@ 
 	 *
 	 * @param callable $callable Function to call.
 	 */
-	public function each( $callable ) {
-		foreach ( $this->storage as $key => $value ) {
-			call_user_func( $callable, $value, $key );
+	public function each($callable) {
+		foreach ($this->storage as $key => $value) {
+			call_user_func($callable, $value, $key);
 		}
 	}
 
@@ -226,22 +226,22 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function get_or_else( $key, $default ) {
-		return ( $this->exists( $key ) ) ? $this->get( $key ) : $default;
+	public function get_or_else($key, $default) {
+		return ($this->exists($key)) ? $this->get($key) : $default;
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
 	public function keys() {
-		return array_keys( $this->storage );
+		return array_keys($this->storage);
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
 	public function values() {
-		return array_values( $this->storage );
+		return array_values($this->storage);
 	}
 
 	/**
@@ -251,21 +251,21 @@ 
 	 *
 	 * @return DictionaryContract
 	 */
-	public function map( $callable ) {
+	public function map($callable) {
 		$items = array();
 		$val_type = null;
 
-		foreach ( $this->storage as $key => $val ) {
-			$v = call_user_func( $callable, $val, $key );
+		foreach ($this->storage as $key => $val) {
+			$v = call_user_func($callable, $val, $key);
 
-			if ( ! isset( $val_type ) ) {
-				$val_type = gettype( $v );
+			if (!isset($val_type)) {
+				$val_type = gettype($v);
 			}
 
-			$items[ $key ] = $v;
+			$items[$key] = $v;
 		}
 
-		return new static( $this->get_key_type(), $val_type ? : $this->get_value_type(), $items );
+		return new static($this->get_key_type(), $val_type ?: $this->get_value_type(), $items);
 	}
 
 	/**
@@ -277,16 +277,16 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function merge( $source ) {
-		if ( $source instanceof self ) {
+	public function merge($source) {
+		if ($source instanceof self) {
 			$source = $source->to_array();
 		}
 
-		if ( ! is_array( $source ) ) {
-			throw new InvalidArgumentException( 'Combine must be a Dictionary or an array' );
+		if (!is_array($source)) {
+			throw new InvalidArgumentException('Combine must be a Dictionary or an array');
 		}
 
-		return new static( $this->get_key_type(), $this->get_value_type(), array_merge( $this->storage, $source ) );
+		return new static($this->get_key_type(), $this->get_value_type(), array_merge($this->storage, $source));
 	}
 
 
@@ -297,9 +297,9 @@ 
 	 *
 	 * @return bool
 	 */
-	public function contains( $callable ) {
-		foreach ( $this->storage as $key => $value ) {
-			if ( call_user_func( $callable, $value, $key ) ) {
+	public function contains($callable) {
+		foreach ($this->storage as $key => $value) {
+			if (call_user_func($callable, $value, $key)) {
 				return true;
 			}
 		}
@@ -315,11 +315,11 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function reduce( $callable, $initial ) {
+	public function reduce($callable, $initial) {
 		$carry = $initial;
 
-		foreach ( $this->storage as $key => $value ) {
-			$carry = $callable( $carry, $value, $key );
+		foreach ($this->storage as $key => $value) {
+			$carry = $callable($carry, $value, $key);
 		}
 
 		return $carry;
@@ -331,15 +331,15 @@ 
 	 * @return mixed
 	 */
 	public function current() {
-		$key = $this->keys[ $this->position ];
-		return $this->storage[ $key ];
+		$key = $this->keys[$this->position];
+		return $this->storage[$key];
 	}
 
 	/**
 	 * Move forward to next element.
 	 */
 	public function next() {
-		$this->position ++;
+		$this->position++;
 	}
 
 	/**
@@ -348,7 +348,7 @@ 
 	 * @return mixed
 	 */
 	public function key() {
-		return $this->keys[ $this->position ];
+		return $this->keys[$this->position];
 	}
 
 	/**
@@ -357,7 +357,7 @@ 
 	 * @return bool
 	 */
 	public function valid() {
-		return isset( $this->keys[ $this->position ] );
+		return isset($this->keys[$this->position]);
 	}
 
 	/**
@@ -365,7 +365,7 @@ 
 	 */
 	public function rewind() {
 		$this->position = 0;
-		$this->keys = array_keys( $this->storage );
+		$this->keys = array_keys($this->storage);
 	}
 
 	/**
@@ -374,8 +374,8 @@ 
 	 * @return array
 	 */
 	public function serialize() {
-		return $this->map(function( $val ) {
-			if ( $val instanceof Serializes ) {
+		return $this->map(function($val) {
+			if ($val instanceof Serializes) {
 				$val = $val->serialize();
 			}
 

src/Assets/Register.php

Spacing +32 added lines, -32 removed lines

@@ -59,7 +59,7 @@ 
 	 * @param string $url
 	 * @param string $version
 	 */
-	public function __construct( $url, $version = null ) {
+	public function __construct($url, $version = null) {
 		$this->url     = $url;
 		$this->version = $version ?: null; // Empty string should remain null.
 	}
@@ -69,8 +69,8 @@ 
 	 *
 	 * @param bool $debug
 	 */
-	public function set_debug( $debug ) {
-		if ( $debug ) {
+	public function set_debug($debug) {
+		if ($debug) {
 			$this->min = '';
 		} else {
 			$this->min = '.min';
@@ -82,7 +82,7 @@ 
 	 *
 	 * @param array $script
 	 */
-	public function register_script( $script ) {
+	public function register_script($script) {
 		$this->scripts[] = $script;
 	}
 
@@ -91,7 +91,7 @@ 
 	 *
 	 * @param array $style
 	 */
-	public function register_style( $style ) {
+	public function register_style($style) {
 		$this->styles[] = $style;
 	}
 
@@ -99,9 +99,9 @@ 
 	 * {@inheritDoc}
 	 */
 	public function enqueue_web_scripts() {
-		foreach ( $this->scripts as $script ) {
-			if ( in_array( $script['type'], array( 'web', 'shared' ) ) ) {
-				$this->enqueue_script( $script );
+		foreach ($this->scripts as $script) {
+			if (in_array($script['type'], array('web', 'shared'))) {
+				$this->enqueue_script($script);
 			}
 		}
 	}
@@ -110,9 +110,9 @@ 
 	 * {@inheritDoc}
 	 */
 	public function enqueue_web_styles() {
-		foreach ( $this->styles as $style ) {
-			if ( in_array( $style['type'], array( 'web', 'shared' ) ) ) {
-				$this->enqueue_style( $style );
+		foreach ($this->styles as $style) {
+			if (in_array($style['type'], array('web', 'shared'))) {
+				$this->enqueue_style($style);
 			}
 		}
 	}
@@ -122,10 +122,10 @@ 
 	 *
 	 * @param string $hook Passes a string representing the current page.
 	 */
-	public function enqueue_admin_scripts( $hook ) {
-		foreach ( $this->scripts as $script ) {
-			if ( in_array( $script['type'], array( 'admin', 'shared' ) ) ) {
-				$this->enqueue_script( $script, $hook );
+	public function enqueue_admin_scripts($hook) {
+		foreach ($this->scripts as $script) {
+			if (in_array($script['type'], array('admin', 'shared'))) {
+				$this->enqueue_script($script, $hook);
 			}
 		}
 	}
@@ -135,10 +135,10 @@ 
 	 *
 	 * @param string $hook Passes a string representing the current page.
 	 */
-	public function enqueue_admin_styles( $hook ) {
-		foreach ( $this->styles as $style ) {
-			if ( in_array( $style['type'], array( 'admin', 'shared' ) ) ) {
-				$this->enqueue_style( $style, $hook );
+	public function enqueue_admin_styles($hook) {
+		foreach ($this->styles as $style) {
+			if (in_array($style['type'], array('admin', 'shared'))) {
+				$this->enqueue_style($style, $hook);
 			}
 		}
 	}
@@ -175,19 +175,19 @@ 
 	 * @param array  $script The script attachment callback.
 	 * @param string $hook   The location hook. Only passed on admin side.
 	 */
-	protected function enqueue_script( $script, $hook = null ) {
-		if ( $script['condition']( $hook ) ) {
+	protected function enqueue_script($script, $hook = null) {
+		if ($script['condition']($hook)) {
 			wp_enqueue_script(
 				$script['handle'],
-				$this->url . $script['src'] . $this->min . '.js',
-				isset( $script['deps'] ) ? $script['deps'] : array(),
+				$this->url.$script['src'].$this->min.'.js',
+				isset($script['deps']) ? $script['deps'] : array(),
 				$this->version,
-				isset( $script['footer'] ) ? $script['footer'] : false
+				isset($script['footer']) ? $script['footer'] : false
 			);
 
-			if ( isset( $script['localize'] ) ) {
-				if ( is_callable( $script['localize'] ) ) { // @todo make all properties callables
-					$script['localize'] = call_user_func( $script['localize'] );
+			if (isset($script['localize'])) {
+				if (is_callable($script['localize'])) { // @todo make all properties callables
+					$script['localize'] = call_user_func($script['localize']);
 				}
 
 				wp_localize_script(
@@ -205,14 +205,14 @@ 
 	 * @param array  $style The style attachment callback.
 	 * @param string $hook  The location hook.
 	 */
-	protected function enqueue_style( $style, $hook = null ) {
-		if ( $style['condition']( $hook ) ) {
+	protected function enqueue_style($style, $hook = null) {
+		if ($style['condition']($hook)) {
 			wp_enqueue_style(
 				$style['handle'],
-				$this->url . $style['src'] . $this->min . '.css',
-				isset( $style['deps'] ) ? $style['deps'] : array(),
+				$this->url.$style['src'].$this->min.'.css',
+				isset($style['deps']) ? $style['deps'] : array(),
 				$this->version,
-				isset( $style['media'] ) ? $style['media'] : 'all'
+				isset($style['media']) ? $style['media'] : 'all'
 			);
 		}
 	}

src/Core/Application.php

Spacing +36 added lines, -36 removed lines

@@ -36,24 +36,24 @@ 
 	 *
 	 * @throws ApplicationAlreadyBootedException
 	 */
-	public function __construct( $config, array $providers = array() ) {
-		if ( isset( static::$instances[ get_called_class() ] ) ) {
+	public function __construct($config, array $providers = array()) {
+		if (isset(static::$instances[get_called_class()])) {
 			throw new ApplicationAlreadyBootedException;
 		}
 
-		static::$instances[ get_called_class() ] = $this;
+		static::$instances[get_called_class()] = $this;
 
-		if ( ! ( $config instanceof Config ) ) {
-			$config = new Config( ConfigType::PLUGIN, $config );
+		if (!($config instanceof Config)) {
+			$config = new Config(ConfigType::PLUGIN, $config);
 		}
 
-		$this->register_constants( $config );
-		$this->register_core_services( $config );
+		$this->register_constants($config);
+		$this->register_core_services($config);
 
-		register_activation_hook( $config->file, array( $this, 'activate' ) );
-		register_deactivation_hook( $config->file, array( $this, 'deactivate' ) );
+		register_activation_hook($config->file, array($this, 'activate'));
+		register_deactivation_hook($config->file, array($this, 'deactivate'));
 
-		parent::__construct( $providers );
+		parent::__construct($providers);
 	}
 
 	/**
@@ -62,27 +62,27 @@ 
 	 * @throws UnexpectedValueException
 	 */
 	public function boot() {
-		$loader = $this->fetch( 'loader' );
+		$loader = $this->fetch('loader');
 
-		if ( ! ( $loader instanceof LoaderContract ) ) {
+		if (!($loader instanceof LoaderContract)) {
 			throw new UnexpectedValueException;
 		}
 
-		foreach ( $this as $alias => $value ) {
-			if ( $value instanceof HasActions ) {
-				$loader->register_actions( $value );
+		foreach ($this as $alias => $value) {
+			if ($value instanceof HasActions) {
+				$loader->register_actions($value);
 			}
 
-			if ( $value instanceof HasFilters ) {
-				$loader->register_filters( $value );
+			if ($value instanceof HasFilters) {
+				$loader->register_filters($value);
 			}
 
-			if ( $value instanceof HasShortcode ) {
-				$loader->register_shortcode( $value );
+			if ($value instanceof HasShortcode) {
+				$loader->register_shortcode($value);
 			}
 		}
 
-		add_action( 'plugins_loaded', array( $loader, 'run' ) );
+		add_action('plugins_loaded', array($loader, 'run'));
 	}
 
 	/**
@@ -110,19 +110,19 @@ 
 	 * @throws ApplicationNotBootedException
 	 */
 	public static function instance() {
-		if ( ! isset( static::$instances[ get_called_class() ] ) ) {
+		if (!isset(static::$instances[get_called_class()])) {
 			throw new ApplicationNotBootedException;
 		}
 
-		return static::$instances[ get_called_class() ];
+		return static::$instances[get_called_class()];
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	public static function shutdown() {
-		if ( isset( static::$instances[ get_called_class() ] ) ) {
-			unset( static::$instances[ get_called_class() ] );
+		if (isset(static::$instances[get_called_class()])) {
+			unset(static::$instances[get_called_class()]);
 		}
 	}
 
@@ -131,23 +131,23 @@ 
 	 *
 	 * @param Config $config
 	 */
-	private function register_constants( Config $config ) {
-		$this->share( 'file', function() use ( $config ) {
+	private function register_constants(Config $config) {
+		$this->share('file', function() use ($config) {
 			return $config->file;
 		} );
-		$this->share( 'url', function() use ( $config ) {
+		$this->share('url', function() use ($config) {
 			return $config->url;
 		} );
-		$this->share( 'path', function() use ( $config ) {
+		$this->share('path', function() use ($config) {
 			return $config->path;
 		} );
-		$this->share( 'basename', function() use ( $config ) {
+		$this->share('basename', function() use ($config) {
 			return $config->basename;
 		} );
-		$this->share( 'slug', function() use ( $config ) {
+		$this->share('slug', function() use ($config) {
 			return $config->slug;
 		} );
-		$this->share( 'version', static::VERSION );
+		$this->share('version', static::VERSION);
 	}
 
 	/**
@@ -155,13 +155,13 @@ 
 	 *
 	 * @param Config $config
 	 */
-	private function register_core_services( Config $config ) {
-		$this->share( array( 'config' => 'Intraxia\Jaxion\Core\Config' ), $config );
-		$this->share( array( 'loader' => 'Intraxia\Jaxion\Contract\Core\Loader' ), function () {
+	private function register_core_services(Config $config) {
+		$this->share(array('config' => 'Intraxia\Jaxion\Core\Config'), $config);
+		$this->share(array('loader' => 'Intraxia\Jaxion\Contract\Core\Loader'), function() {
 			return new Loader;
 		} );
-		$this->share( array( 'i18n' => 'Intaxia\Jaxion\Contract\Core\I18n' ), function ( Container $app ) {
-			return new I18n( $app->fetch( 'basename' ), $app->fetch( 'path' ) );
+		$this->share(array('i18n' => 'Intaxia\Jaxion\Contract\Core\I18n'), function(Container $app) {
+			return new I18n($app->fetch('basename'), $app->fetch('path'));
 		} );
 	}
 }

src/Core/Config.php

Spacing +17 added lines, -17 removed lines

@@ -66,21 +66,21 @@ 
 	 * @param string $type
 	 * @param string $file
 	 */
-	public function __construct( $type, $file ) {
-		$this->type = new ConfigType( $type );
+	public function __construct($type, $file) {
+		$this->type = new ConfigType($type);
 		$this->file = $file;
 
-		switch ( $this->type->getValue() ) {
+		switch ($this->type->getValue()) {
 			case ConfigType::PLUGIN:
 			case ConfigType::MU_PLUGIN:
-				$this->url = plugin_dir_url( $file );
-				$this->path = plugin_dir_path( $file );
-				$this->slug = dirname( $this->basename = plugin_basename( $file ) );
+				$this->url = plugin_dir_url($file);
+				$this->path = plugin_dir_path($file);
+				$this->slug = dirname($this->basename = plugin_basename($file));
 				break;
 			case ConfigType::THEME:
-				$this->url = get_stylesheet_directory_uri() . '/';
-				$this->path = get_stylesheet_directory() . '/';
-				$this->slug = dirname( $this->basename = plugin_basename( $file ) );
+				$this->url = get_stylesheet_directory_uri().'/';
+				$this->path = get_stylesheet_directory().'/';
+				$this->slug = dirname($this->basename = plugin_basename($file));
 				break;
 		}
 	}
@@ -92,23 +92,23 @@ 
 	 *
 	 * @return array|null
 	 */
-	public function get_config_json( $filename ) {
-		if ( isset( $this->loaded[ $filename ] ) ) {
-			return $this->loaded[ $filename ];
+	public function get_config_json($filename) {
+		if (isset($this->loaded[$filename])) {
+			return $this->loaded[$filename];
 		}
 
-		$config = $this->path . 'config/' . $filename . '.json';
+		$config = $this->path.'config/'.$filename.'.json';
 
-		if ( ! file_exists( $config ) ) {
+		if (!file_exists($config)) {
 			return null;
 		}
 
-		$contents = file_get_contents( $config );
+		$contents = file_get_contents($config);
 
-		if ( false === $contents ) {
+		if (false === $contents) {
 			return null;
 		}
 
-		return $this->loaded[ $filename ] = json_decode( $contents, true );
+		return $this->loaded[$filename] = json_decode($contents, true);
 	}
 }

src/Axolotl/Model.php

Spacing +122 added lines, -122 removed lines

@@ -115,16 +115,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();
 	}
 
@@ -138,10 +138,10 @@ 
 	 *
 	 * @return $this
 	 */
-	public function refresh( array $attributes ) {
+	public function refresh(array $attributes) {
 		$this->clear();
 
-		return $this->merge( $attributes );
+		return $this->merge($attributes);
 	}
 
 	/**
@@ -151,9 +151,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;
@@ -168,7 +168,7 @@ 
 	 * @return array
 	 */
 	public function get_table_attributes() {
-		return $this->attributes[ self::TABLE_KEY ];
+		return $this->attributes[self::TABLE_KEY];
 	}
 
 	/**
@@ -177,7 +177,7 @@ 
 	 * @return array
 	 */
 	public function get_original_table_attributes() {
-		return $this->original[ self::TABLE_KEY ];
+		return $this->original[self::TABLE_KEY];
 	}
 
 	/**
@@ -190,11 +190,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;
 			}
 		}
 
@@ -210,8 +210,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;
@@ -223,7 +223,7 @@ 
 	 * @return WP_Post
 	 */
 	public function get_original_underlying_wp_object() {
-		return $this->original[ self::OBJECT_KEY ];
+		return $this->original[self::OBJECT_KEY];
 	}
 
 	/**
@@ -236,11 +236,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);
 			}
 		}
 
@@ -255,8 +255,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 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,21 +569,21 @@ 
 	 *
 	 * @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];
 		}
 
 		return null;
@@ -598,16 +598,16 @@ 
 	 *
 	 * @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);
 
-		return $original->get_attribute( $name );
+		return $original->get_attribute($name);
 	}
 
 	/**
@@ -619,16 +619,16 @@ 
 	 * @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;
 		}
 
-		if ( $this instanceof UsesCustomTable ) {
-			return $this->get_attribute( $this->get_primary_key() );
+		if ($this instanceof UsesCustomTable) {
+			return $this->get_attribute($this->get_primary_key());
 		}
 
 		// Model w/o wp_object not yet supported.
@@ -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,12 +686,12 @@ 
 			$this->get_wp_object_keys()
 		);
 
-		foreach ( $keys as $key ) {
+		foreach ($keys as $key) {
 			try {
-				$this->set_attribute( $key, null );
-			} catch ( Exception $e ) {
+				$this->set_attribute($key, null);
+			} catch (Exception $e) {
 				// We won't clear out guarded attributes.
-				if ( ! ( $e instanceof GuardedPropertyException ) ) {
+				if (!($e instanceof GuardedPropertyException)) {
 					throw $e;
 				}
 			}
@@ -726,13 +726,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;
 	}
@@ -741,8 +741,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();
 		}
 	}