eventespresso / event-espresso-core

core/services/collections/LooseCollection.php

Indentation +31 added lines, -31 removed lines

@@ -16,37 +16,37 @@
 {
 
 
-    /**
-     * setCollectionInterface
-     *
-     * @access protected
-     * @param  string $collection_interface
-     */
-    protected function setCollectionInterface($collection_interface)
-    {
-        $this->collection_interface = '';
-    }
+	/**
+	 * setCollectionInterface
+	 *
+	 * @access protected
+	 * @param  string $collection_interface
+	 */
+	protected function setCollectionInterface($collection_interface)
+	{
+		$this->collection_interface = '';
+	}
 
 
-    /**
-     * add
-     * attaches an object to the Collection
-     * and sets any supplied data associated with the current iterator entry
-     * by calling EE_Object_Collection::set_identifier()
-     *
-     * @access public
-     * @param  mixed $object
-     * @param  mixed $identifier
-     * @return bool
-     * @throws InvalidEntityException
-     */
-    public function add($object, $identifier = null)
-    {
-        if (! is_object($object)) {
-            throw new InvalidEntityException($object, 'object');
-        }
-        $this->attach($object);
-        $this->setIdentifier($object, $identifier);
-        return $this->contains($object);
-    }
+	/**
+	 * add
+	 * attaches an object to the Collection
+	 * and sets any supplied data associated with the current iterator entry
+	 * by calling EE_Object_Collection::set_identifier()
+	 *
+	 * @access public
+	 * @param  mixed $object
+	 * @param  mixed $identifier
+	 * @return bool
+	 * @throws InvalidEntityException
+	 */
+	public function add($object, $identifier = null)
+	{
+		if (! is_object($object)) {
+			throw new InvalidEntityException($object, 'object');
+		}
+		$this->attach($object);
+		$this->setIdentifier($object, $identifier);
+		return $this->contains($object);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      */
     public function add($object, $identifier = null)
     {
-        if (! is_object($object)) {
+        if ( ! is_object($object)) {
             throw new InvalidEntityException($object, 'object');
         }
         $this->attach($object);

core/services/notices/NoticeConverter.php

Indentation +67 added lines, -67 removed lines

@@ -12,71 +12,71 @@
 abstract class NoticeConverter implements NoticeConverterInterface
 {
 
-    /**
-     * @var NoticesContainerInterface $notices
-     */
-    private $notices;
-
-    /**
-     * if set to true, then errors will be thrown as exceptions
-     *
-     * @var boolean $throw_exceptions
-     */
-    private $throw_exceptions;
-
-
-    /**
-     * NoticeConverter constructor.
-     *
-     * @param bool $throw_exceptions
-     */
-    public function __construct($throw_exceptions = false)
-    {
-        $this->throw_exceptions = $throw_exceptions;
-    }
-
-
-    /**
-     * @return NoticesContainerInterface
-     */
-    public function getNotices()
-    {
-        return $this->notices;
-    }
-
-
-    /**
-     * @param NoticesContainerInterface $notices
-     */
-    protected function setNotices(NoticesContainerInterface $notices)
-    {
-        $this->notices = $notices;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function getThrowExceptions()
-    {
-        return $this->throw_exceptions;
-    }
-
-
-    /**
-     * @param bool $throw_exceptions
-     */
-    public function setThrowExceptions($throw_exceptions)
-    {
-        $this->throw_exceptions = filter_var($throw_exceptions, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return void;
-     */
-    public function clearNotices()
-    {
-        $this->notices = null;
-    }
+	/**
+	 * @var NoticesContainerInterface $notices
+	 */
+	private $notices;
+
+	/**
+	 * if set to true, then errors will be thrown as exceptions
+	 *
+	 * @var boolean $throw_exceptions
+	 */
+	private $throw_exceptions;
+
+
+	/**
+	 * NoticeConverter constructor.
+	 *
+	 * @param bool $throw_exceptions
+	 */
+	public function __construct($throw_exceptions = false)
+	{
+		$this->throw_exceptions = $throw_exceptions;
+	}
+
+
+	/**
+	 * @return NoticesContainerInterface
+	 */
+	public function getNotices()
+	{
+		return $this->notices;
+	}
+
+
+	/**
+	 * @param NoticesContainerInterface $notices
+	 */
+	protected function setNotices(NoticesContainerInterface $notices)
+	{
+		$this->notices = $notices;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function getThrowExceptions()
+	{
+		return $this->throw_exceptions;
+	}
+
+
+	/**
+	 * @param bool $throw_exceptions
+	 */
+	public function setThrowExceptions($throw_exceptions)
+	{
+		$this->throw_exceptions = filter_var($throw_exceptions, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return void;
+	 */
+	public function clearNotices()
+	{
+		$this->notices = null;
+	}
 }

core/services/notices/AdminNotice.php

Indentation +115 added lines, -115 removed lines

@@ -13,119 +13,119 @@
 class AdminNotice
 {
 
-    const ERROR = 'notice-error';
-
-    const WARNING = 'notice-warning';
-
-    const SUCCESS = 'notice-success';
-
-    const INFORMATION = 'notice-info';
-
-    const DISMISSABLE = ' is-dismissible';
-
-    /**
-     * generic system notice to be converted into a WP admin notice
-     *
-     * @var NoticeInterface $notice
-     */
-    private $notice;
-
-
-    /**
-     * AdminNotice constructor.
-     *
-     * @param NoticeInterface $notice
-     * @param bool            $display_now
-     */
-    public function __construct(NoticeInterface $notice, $display_now = true)
-    {
-        $this->notice = $notice;
-        if (! did_action('admin_notices')) {
-            add_action('admin_notices', array($this, 'displayNotice'));
-        } elseif ($display_now) {
-            $this->displayNotice();
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    public function displayNotice()
-    {
-        echo $this->getNotice();
-    }
-
-
-    /**
-     * produces something  like:
-     *  <div class="notice notice-success is-dismissible event-espresso-admin-notice">
-     *      <p>YOU DID IT!</p>
-     *      <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this
-     *      notice.</span></button>
-     *  </div>
-     *
-     * @return string
-     */
-    public function getNotice()
-    {
-        return sprintf(
-            '<div class="notice %1$s%2$s event-espresso-admin-notice"><p>%3$s</p></div>',
-            $this->getType(),
-            $this->notice->isDismissible() ? AdminNotice::DISMISSABLE : '',
-            $this->getMessage()
-        );
-    }
-
-
-    /**
-     * @return string
-     */
-    private function getType()
-    {
-        switch ($this->notice->type()) {
-            case Notice::ERROR:
-                return AdminNotice::ERROR;
-                break;
-            case Notice::ATTENTION:
-                return AdminNotice::WARNING;
-                break;
-            case Notice::SUCCESS:
-                return AdminNotice::SUCCESS;
-                break;
-            case Notice::INFORMATION:
-            default:
-                return AdminNotice::INFORMATION;
-                break;
-        }
-    }
-
-
-    /**
-     * @return string
-     */
-    protected function getMessage()
-    {
-        $message = $this->notice->message();
-        if (WP_DEBUG && $this->getType() === AdminNotice::ERROR) {
-            $message .= '<br/><span class="tiny-text">' . $this->generateErrorCode() . '</span>';
-        }
-        return $message;
-    }
-
-
-    /**
-     * create error code from filepath, function name,
-     * and line number where notice was generated
-     *
-     * @return string
-     */
-    protected function generateErrorCode()
-    {
-        $file = explode('.', basename($this->notice->file()));
-        $error_code = ! empty($file[0]) ? $file[0] : '';
-        $error_code .= ! empty($error_code) ? ' - ' . $this->notice->func() : $this->notice->func();
-        $error_code .= ' - ' . $this->notice->line();
-        return $error_code;
-    }
+	const ERROR = 'notice-error';
+
+	const WARNING = 'notice-warning';
+
+	const SUCCESS = 'notice-success';
+
+	const INFORMATION = 'notice-info';
+
+	const DISMISSABLE = ' is-dismissible';
+
+	/**
+	 * generic system notice to be converted into a WP admin notice
+	 *
+	 * @var NoticeInterface $notice
+	 */
+	private $notice;
+
+
+	/**
+	 * AdminNotice constructor.
+	 *
+	 * @param NoticeInterface $notice
+	 * @param bool            $display_now
+	 */
+	public function __construct(NoticeInterface $notice, $display_now = true)
+	{
+		$this->notice = $notice;
+		if (! did_action('admin_notices')) {
+			add_action('admin_notices', array($this, 'displayNotice'));
+		} elseif ($display_now) {
+			$this->displayNotice();
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function displayNotice()
+	{
+		echo $this->getNotice();
+	}
+
+
+	/**
+	 * produces something  like:
+	 *  <div class="notice notice-success is-dismissible event-espresso-admin-notice">
+	 *      <p>YOU DID IT!</p>
+	 *      <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this
+	 *      notice.</span></button>
+	 *  </div>
+	 *
+	 * @return string
+	 */
+	public function getNotice()
+	{
+		return sprintf(
+			'<div class="notice %1$s%2$s event-espresso-admin-notice"><p>%3$s</p></div>',
+			$this->getType(),
+			$this->notice->isDismissible() ? AdminNotice::DISMISSABLE : '',
+			$this->getMessage()
+		);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	private function getType()
+	{
+		switch ($this->notice->type()) {
+			case Notice::ERROR:
+				return AdminNotice::ERROR;
+				break;
+			case Notice::ATTENTION:
+				return AdminNotice::WARNING;
+				break;
+			case Notice::SUCCESS:
+				return AdminNotice::SUCCESS;
+				break;
+			case Notice::INFORMATION:
+			default:
+				return AdminNotice::INFORMATION;
+				break;
+		}
+	}
+
+
+	/**
+	 * @return string
+	 */
+	protected function getMessage()
+	{
+		$message = $this->notice->message();
+		if (WP_DEBUG && $this->getType() === AdminNotice::ERROR) {
+			$message .= '<br/><span class="tiny-text">' . $this->generateErrorCode() . '</span>';
+		}
+		return $message;
+	}
+
+
+	/**
+	 * create error code from filepath, function name,
+	 * and line number where notice was generated
+	 *
+	 * @return string
+	 */
+	protected function generateErrorCode()
+	{
+		$file = explode('.', basename($this->notice->file()));
+		$error_code = ! empty($file[0]) ? $file[0] : '';
+		$error_code .= ! empty($error_code) ? ' - ' . $this->notice->func() : $this->notice->func();
+		$error_code .= ' - ' . $this->notice->line();
+		return $error_code;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
     public function __construct(NoticeInterface $notice, $display_now = true)
     {
         $this->notice = $notice;
-        if (! did_action('admin_notices')) {
+        if ( ! did_action('admin_notices')) {
             add_action('admin_notices', array($this, 'displayNotice'));
         } elseif ($display_now) {
             $this->displayNotice();
@@ -108,7 +108,7 @@ 
     {
         $message = $this->notice->message();
         if (WP_DEBUG && $this->getType() === AdminNotice::ERROR) {
-            $message .= '<br/><span class="tiny-text">' . $this->generateErrorCode() . '</span>';
+            $message .= '<br/><span class="tiny-text">'.$this->generateErrorCode().'</span>';
         }
         return $message;
     }
@@ -124,8 +124,8 @@ 
     {
         $file = explode('.', basename($this->notice->file()));
         $error_code = ! empty($file[0]) ? $file[0] : '';
-        $error_code .= ! empty($error_code) ? ' - ' . $this->notice->func() : $this->notice->func();
-        $error_code .= ' - ' . $this->notice->line();
+        $error_code .= ! empty($error_code) ? ' - '.$this->notice->func() : $this->notice->func();
+        $error_code .= ' - '.$this->notice->line();
         return $error_code;
     }
 }

core/services/notices/NoticesContainer.php

Indentation +214 added lines, -214 removed lines

@@ -15,218 +15,218 @@
 {
 
 
-    /**
-     * @var NoticeInterface[] $information
-     */
-    private $information = array();
-
-
-    /**
-     * @var NoticeInterface[] $attention
-     */
-    private $attention = array();
-
-
-    /**
-     * @var NoticeInterface[] $error
-     */
-    private $error = array();
-
-
-    /**
-     * @var NoticeInterface[] $success
-     */
-    private $success = array();
-
-
-    /**
-     * @param string $notice
-     * @param bool   $dismissible
-     * @param string $file
-     * @param string $func
-     * @param string $line
-     * @throws InvalidDataTypeException
-     */
-    public function addInformation($notice, $dismissible = true, $file = '', $func = '', $line = '')
-    {
-        $this->information[] = new Notice(
-            Notice::INFORMATION,
-            $notice,
-            $dismissible,
-            $file,
-            $func,
-            $line
-        );
-    }
-
-
-    /**
-     * @param string $notice
-     * @param bool   $dismissible
-     * @param string $file
-     * @param string $func
-     * @param string $line
-     * @throws InvalidDataTypeException
-     */
-    public function addAttention($notice, $dismissible = true, $file = '', $func = '', $line = '')
-    {
-        $this->attention[] = new Notice(
-            Notice::ATTENTION,
-            $notice,
-            $dismissible,
-            $file,
-            $func,
-            $line
-        );
-    }
-
-    // phpcs:disable PEAR.Functions.ValidDefaultValue.NotAtEnd
-    /**
-     * @param string $notice
-     * @param bool   $dismissible
-     * @param string $file
-     * @param string $func
-     * @param string $line
-     * @throws InvalidDataTypeException
-     */
-    public function addError($notice, $dismissible = true, $file, $func, $line)
-    {
-        $this->error[] = new Notice(
-            Notice::ERROR,
-            $notice,
-            $dismissible,
-            $file,
-            $func,
-            $line
-        );
-    }
-
-
-    /**
-     * @param string $notice
-     * @param bool   $dismissible
-     * @param string $file
-     * @param string $func
-     * @param string $line
-     * @throws InvalidDataTypeException
-     */
-    public function addSuccess($notice, $dismissible = true, $file = '', $func = '', $line = '')
-    {
-        $this->success[] = new Notice(
-            Notice::SUCCESS,
-            $notice,
-            $dismissible,
-            $file,
-            $func,
-            $line
-        );
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function hasInformation()
-    {
-        return ! empty($this->information);
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function hasAttention()
-    {
-        return ! empty($this->attention);
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function hasError()
-    {
-        return ! empty($this->error);
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function hasSuccess()
-    {
-        return ! empty($this->success);
-    }
-
-
-    /**
-     * @return int
-     */
-    public function countInformation()
-    {
-        return count($this->information);
-    }
-
-
-    /**
-     * @return int
-     */
-    public function countAttention()
-    {
-        return count($this->attention);
-    }
-
-
-    /**
-     * @return int
-     */
-    public function countError()
-    {
-        return count($this->error);
-    }
-
-
-    /**
-     * @return int
-     */
-    public function countSuccess()
-    {
-        return count($this->success);
-    }
-
-
-    /**
-     * @return NoticeInterface[]
-     */
-    public function getInformation()
-    {
-        return $this->information;
-    }
-
-
-    /**
-     * @return NoticeInterface[]
-     */
-    public function getAttention()
-    {
-        return $this->attention;
-    }
-
-
-    /**
-     * @return NoticeInterface[]
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
-
-
-    /**
-     * @return NoticeInterface[]
-     */
-    public function getSuccess()
-    {
-        return $this->success;
-    }
+	/**
+	 * @var NoticeInterface[] $information
+	 */
+	private $information = array();
+
+
+	/**
+	 * @var NoticeInterface[] $attention
+	 */
+	private $attention = array();
+
+
+	/**
+	 * @var NoticeInterface[] $error
+	 */
+	private $error = array();
+
+
+	/**
+	 * @var NoticeInterface[] $success
+	 */
+	private $success = array();
+
+
+	/**
+	 * @param string $notice
+	 * @param bool   $dismissible
+	 * @param string $file
+	 * @param string $func
+	 * @param string $line
+	 * @throws InvalidDataTypeException
+	 */
+	public function addInformation($notice, $dismissible = true, $file = '', $func = '', $line = '')
+	{
+		$this->information[] = new Notice(
+			Notice::INFORMATION,
+			$notice,
+			$dismissible,
+			$file,
+			$func,
+			$line
+		);
+	}
+
+
+	/**
+	 * @param string $notice
+	 * @param bool   $dismissible
+	 * @param string $file
+	 * @param string $func
+	 * @param string $line
+	 * @throws InvalidDataTypeException
+	 */
+	public function addAttention($notice, $dismissible = true, $file = '', $func = '', $line = '')
+	{
+		$this->attention[] = new Notice(
+			Notice::ATTENTION,
+			$notice,
+			$dismissible,
+			$file,
+			$func,
+			$line
+		);
+	}
+
+	// phpcs:disable PEAR.Functions.ValidDefaultValue.NotAtEnd
+	/**
+	 * @param string $notice
+	 * @param bool   $dismissible
+	 * @param string $file
+	 * @param string $func
+	 * @param string $line
+	 * @throws InvalidDataTypeException
+	 */
+	public function addError($notice, $dismissible = true, $file, $func, $line)
+	{
+		$this->error[] = new Notice(
+			Notice::ERROR,
+			$notice,
+			$dismissible,
+			$file,
+			$func,
+			$line
+		);
+	}
+
+
+	/**
+	 * @param string $notice
+	 * @param bool   $dismissible
+	 * @param string $file
+	 * @param string $func
+	 * @param string $line
+	 * @throws InvalidDataTypeException
+	 */
+	public function addSuccess($notice, $dismissible = true, $file = '', $func = '', $line = '')
+	{
+		$this->success[] = new Notice(
+			Notice::SUCCESS,
+			$notice,
+			$dismissible,
+			$file,
+			$func,
+			$line
+		);
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function hasInformation()
+	{
+		return ! empty($this->information);
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function hasAttention()
+	{
+		return ! empty($this->attention);
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function hasError()
+	{
+		return ! empty($this->error);
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function hasSuccess()
+	{
+		return ! empty($this->success);
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function countInformation()
+	{
+		return count($this->information);
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function countAttention()
+	{
+		return count($this->attention);
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function countError()
+	{
+		return count($this->error);
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function countSuccess()
+	{
+		return count($this->success);
+	}
+
+
+	/**
+	 * @return NoticeInterface[]
+	 */
+	public function getInformation()
+	{
+		return $this->information;
+	}
+
+
+	/**
+	 * @return NoticeInterface[]
+	 */
+	public function getAttention()
+	{
+		return $this->attention;
+	}
+
+
+	/**
+	 * @return NoticeInterface[]
+	 */
+	public function getError()
+	{
+		return $this->error;
+	}
+
+
+	/**
+	 * @return NoticeInterface[]
+	 */
+	public function getSuccess()
+	{
+		return $this->success;
+	}
 }

core/services/orm/ModelFieldFactory.php

Indentation +543 added lines, -543 removed lines

@@ -51,547 +51,547 @@
 class ModelFieldFactory
 {
 
-    /**
-     * @var LoaderInterface $loader
-     */
-    private $loader;
-
-
-    /**
-     * ModelFieldFactory constructor.
-     *
-     * @param LoaderInterface $loader
-     */
-    public function __construct(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_All_Caps_Text_Field
-     */
-    public function createAllCapsTextField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_All_Caps_Text_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @param string $model_name
-     * @return EE_Any_Foreign_Model_Name_Field
-     */
-    public function createAnyForeignModelNameField(
-        $table_column,
-        $nice_name,
-        $nullable,
-        $default_value = null,
-        $model_name
-    ) {
-        return $this->loader->getNew(
-            'EE_Any_Foreign_Model_Name_Field',
-            array($table_column, $nice_name, $nullable, $default_value, $model_name)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Boolean_Field
-     */
-    public function createBooleanField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Boolean_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param string $timezone_string
-     * @param bool   $nullable
-     * @param string $default_value
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @return EE_Datetime_Field
-     */
-    public function createDatetimeField(
-        $table_column,
-        $nice_name,
-        $nullable = false,
-        $default_value = EE_Datetime_Field::now
-    ) {
-        return $this->loader->getNew(
-            'EE_Datetime_Field',
-            array(
-                $table_column,
-                $nice_name,
-                $nullable,
-                $default_value,
-            )
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_DB_Only_Float_Field
-     */
-    public function createDbOnlyFloatField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_DB_Only_Float_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_DB_Only_Int_Field
-     */
-    public function createDbOnlyIntField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_DB_Only_Int_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_DB_Only_Text_Field
-     */
-    public function createDbOnlyTextField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_DB_Only_Text_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param string $default_value
-     * @return EE_Email_Field
-     */
-    public function createEmailField($table_column, $nice_name, $nullable = true, $default_value = '')
-    {
-        return $this->loader->getNew(
-            'EE_Email_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @param array  $allowed_enum_values keys are values to be used in the DB,
-     *                                    values are how they should be displayed
-     * @return EE_Enum_Integer_Field
-     */
-    public function createEnumIntegerField(
-        $table_column,
-        $nice_name,
-        $nullable,
-        $default_value = null,
-        array $allowed_enum_values
-    ) {
-        return $this->loader->getNew(
-            'EE_Enum_Integer_Field',
-            array($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @param array  $allowed_enum_values keys are values to be used in the DB,
-     *                                    values are how they should be displayed
-     * @return EE_Enum_Text_Field
-     */
-    public function createEnumTextField(
-        $table_column,
-        $nice_name,
-        $nullable,
-        $default_value,
-        array $allowed_enum_values
-    ) {
-        return $this->loader->getNew(
-            'EE_Enum_Text_Field',
-            array($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Float_Field
-     */
-    public function createFloatField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Float_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @param string $model_name
-     * @return EE_Foreign_Key_Int_Field
-     */
-    public function createForeignKeyIntField($table_column, $nice_name, $nullable, $default_value, $model_name)
-    {
-        return $this->loader->getNew(
-            'EE_Foreign_Key_Int_Field',
-            array($table_column, $nice_name, $nullable, $default_value, $model_name)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @param string $model_name
-     * @return EE_Foreign_Key_String_Field
-     */
-    public function createForeignKeyStringField(
-        $table_column,
-        $nice_name,
-        $nullable,
-        $default_value,
-        $model_name
-    ) {
-        return $this->loader->getNew(
-            'EE_Foreign_Key_String_Field',
-            array($table_column, $nice_name, $nullable, $default_value, $model_name)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Full_HTML_Field
-     */
-    public function createFullHtmlField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Full_HTML_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Infinite_Integer_Field
-     */
-    public function createInfiniteIntegerField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Infinite_Integer_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-    /**
-     * @param string  $table_column
-     * @param string  $nice_name
-     * @param bool    $nullable
-     * @param integer $default_value
-     * @return EE_Integer_Field
-     */
-    public function createIntegerField($table_column, $nice_name, $nullable = false, $default_value = 0)
-    {
-        return $this->loader->getNew(
-            'EE_Integer_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Maybe_Serialized_Simple_HTML_Field
-     */
-    public function createMaybeSerializedSimpleHtmlField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Maybe_Serialized_Simple_HTML_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Maybe_Serialized_Text_Field
-     */
-    public function createMaybeSerializedTextField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Maybe_Serialized_Text_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Money_Field
-     */
-    public function createMoneyField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Money_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param string $default_value
-     * @return EE_Plain_Text_Field
-     */
-    public function createPlainTextField($table_column, $nice_name, $nullable = true, $default_value = '')
-    {
-        return $this->loader->getNew(
-            'EE_Plain_Text_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Post_Content_Field
-     */
-    public function createPostContentField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Post_Content_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @return EE_Primary_Key_Int_Field
-     */
-    public function createPrimaryKeyIntField($table_column, $nice_name)
-    {
-        return $this->loader->getNew('EE_Primary_Key_Int_Field', array($table_column, $nice_name));
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @return EE_Primary_Key_String_Field
-     */
-    public function createPrimaryKeyStringField($table_column, $nice_name)
-    {
-        return $this->loader->getNew('EE_Primary_Key_String_Field', array($table_column, $nice_name));
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Serialized_Text_Field
-     */
-    public function createSerializedTextField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Serialized_Text_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Simple_HTML_Field
-     */
-    public function createSimpleHtmlField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Simple_HTML_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Slug_Field
-     */
-    public function createSlugField($table_column, $nice_name, $nullable = false, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Slug_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Trashed_Flag_Field
-     */
-    public function createTrashedFlagField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Trashed_Flag_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param mixed  $default_value
-     * @param array  $values                            If additional stati are to be used other than the default WP
-     *                                                  statuses, then they can be registered via this property. The
-     *                                                  format of the array should be as follows: array(
-     *                                                  'status_reference' => array(
-     *                                                  'label' => __('Status Reference Label', 'event_espresso'),
-     *                                                  'public' => true,                 // whether this status should
-     *                                                  be shown on the frontend of the site
-     *                                                  'exclude_from_search' => false,   // whether this status should
-     *                                                  be excluded from wp searches
-     *                                                  'show_in_admin_all_list' => true, // whether this status is
-     *                                                  included in queries for the admin "all" view in list table
-     *                                                  views.
-     *                                                  'show_in_admin_status_list' => true, // show in the list of
-     *                                                  statuses with post counts at the top of the admin list tables
-     *                                                  (i.e. Status Reference(2) )
-     *                                                  'label_count' => _n_noop(
-     *                                                  'Status Reference <span class="count">(%s)</span>',
-     *                                                  'Status References <span class="count">(%s)</span>'
-     *                                                  ),                                   // the text to display on
-     *                                                  the admin screen
-     *                                                  ( or you won't see your status count ).
-     *                                                  )
-     *                                                  )
-     * @link http://codex.wordpress.org/Function_Reference/register_post_status for more info
-     * @return EE_WP_Post_Status_Field
-     */
-    public function createWpPostStatusField(
-        $table_column,
-        $nice_name,
-        $nullable,
-        $default_value = null,
-        array $values = array()
-    ) {
-        return $this->loader->getNew(
-            'EE_WP_Post_Status_Field',
-            array($table_column, $nice_name, $nullable, $default_value, $values)
-        );
-    }
-
-
-    /**
-     * @param string $post_type
-     * @return EE_WP_Post_Type_Field
-     */
-    public function createWpPostTypeField($post_type)
-    {
-        return $this->loader->getNew('EE_WP_Post_Type_Field', array($post_type));
-    }
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @return EE_WP_User_Field
-     */
-    public function createWpUserField($table_column, $nice_name, $nullable)
-    {
-        return $this->loader->getNew('EE_WP_User_Field', array($table_column, $nice_name, $nullable));
-    }
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	private $loader;
+
+
+	/**
+	 * ModelFieldFactory constructor.
+	 *
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_All_Caps_Text_Field
+	 */
+	public function createAllCapsTextField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_All_Caps_Text_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @param string $model_name
+	 * @return EE_Any_Foreign_Model_Name_Field
+	 */
+	public function createAnyForeignModelNameField(
+		$table_column,
+		$nice_name,
+		$nullable,
+		$default_value = null,
+		$model_name
+	) {
+		return $this->loader->getNew(
+			'EE_Any_Foreign_Model_Name_Field',
+			array($table_column, $nice_name, $nullable, $default_value, $model_name)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Boolean_Field
+	 */
+	public function createBooleanField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Boolean_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param string $timezone_string
+	 * @param bool   $nullable
+	 * @param string $default_value
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @return EE_Datetime_Field
+	 */
+	public function createDatetimeField(
+		$table_column,
+		$nice_name,
+		$nullable = false,
+		$default_value = EE_Datetime_Field::now
+	) {
+		return $this->loader->getNew(
+			'EE_Datetime_Field',
+			array(
+				$table_column,
+				$nice_name,
+				$nullable,
+				$default_value,
+			)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_DB_Only_Float_Field
+	 */
+	public function createDbOnlyFloatField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_DB_Only_Float_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_DB_Only_Int_Field
+	 */
+	public function createDbOnlyIntField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_DB_Only_Int_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_DB_Only_Text_Field
+	 */
+	public function createDbOnlyTextField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_DB_Only_Text_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param string $default_value
+	 * @return EE_Email_Field
+	 */
+	public function createEmailField($table_column, $nice_name, $nullable = true, $default_value = '')
+	{
+		return $this->loader->getNew(
+			'EE_Email_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @param array  $allowed_enum_values keys are values to be used in the DB,
+	 *                                    values are how they should be displayed
+	 * @return EE_Enum_Integer_Field
+	 */
+	public function createEnumIntegerField(
+		$table_column,
+		$nice_name,
+		$nullable,
+		$default_value = null,
+		array $allowed_enum_values
+	) {
+		return $this->loader->getNew(
+			'EE_Enum_Integer_Field',
+			array($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @param array  $allowed_enum_values keys are values to be used in the DB,
+	 *                                    values are how they should be displayed
+	 * @return EE_Enum_Text_Field
+	 */
+	public function createEnumTextField(
+		$table_column,
+		$nice_name,
+		$nullable,
+		$default_value,
+		array $allowed_enum_values
+	) {
+		return $this->loader->getNew(
+			'EE_Enum_Text_Field',
+			array($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Float_Field
+	 */
+	public function createFloatField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Float_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @param string $model_name
+	 * @return EE_Foreign_Key_Int_Field
+	 */
+	public function createForeignKeyIntField($table_column, $nice_name, $nullable, $default_value, $model_name)
+	{
+		return $this->loader->getNew(
+			'EE_Foreign_Key_Int_Field',
+			array($table_column, $nice_name, $nullable, $default_value, $model_name)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @param string $model_name
+	 * @return EE_Foreign_Key_String_Field
+	 */
+	public function createForeignKeyStringField(
+		$table_column,
+		$nice_name,
+		$nullable,
+		$default_value,
+		$model_name
+	) {
+		return $this->loader->getNew(
+			'EE_Foreign_Key_String_Field',
+			array($table_column, $nice_name, $nullable, $default_value, $model_name)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Full_HTML_Field
+	 */
+	public function createFullHtmlField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Full_HTML_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Infinite_Integer_Field
+	 */
+	public function createInfiniteIntegerField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Infinite_Integer_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+	/**
+	 * @param string  $table_column
+	 * @param string  $nice_name
+	 * @param bool    $nullable
+	 * @param integer $default_value
+	 * @return EE_Integer_Field
+	 */
+	public function createIntegerField($table_column, $nice_name, $nullable = false, $default_value = 0)
+	{
+		return $this->loader->getNew(
+			'EE_Integer_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Maybe_Serialized_Simple_HTML_Field
+	 */
+	public function createMaybeSerializedSimpleHtmlField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Maybe_Serialized_Simple_HTML_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Maybe_Serialized_Text_Field
+	 */
+	public function createMaybeSerializedTextField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Maybe_Serialized_Text_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Money_Field
+	 */
+	public function createMoneyField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Money_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param string $default_value
+	 * @return EE_Plain_Text_Field
+	 */
+	public function createPlainTextField($table_column, $nice_name, $nullable = true, $default_value = '')
+	{
+		return $this->loader->getNew(
+			'EE_Plain_Text_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Post_Content_Field
+	 */
+	public function createPostContentField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Post_Content_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @return EE_Primary_Key_Int_Field
+	 */
+	public function createPrimaryKeyIntField($table_column, $nice_name)
+	{
+		return $this->loader->getNew('EE_Primary_Key_Int_Field', array($table_column, $nice_name));
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @return EE_Primary_Key_String_Field
+	 */
+	public function createPrimaryKeyStringField($table_column, $nice_name)
+	{
+		return $this->loader->getNew('EE_Primary_Key_String_Field', array($table_column, $nice_name));
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Serialized_Text_Field
+	 */
+	public function createSerializedTextField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Serialized_Text_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Simple_HTML_Field
+	 */
+	public function createSimpleHtmlField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Simple_HTML_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Slug_Field
+	 */
+	public function createSlugField($table_column, $nice_name, $nullable = false, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Slug_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Trashed_Flag_Field
+	 */
+	public function createTrashedFlagField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Trashed_Flag_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param mixed  $default_value
+	 * @param array  $values                            If additional stati are to be used other than the default WP
+	 *                                                  statuses, then they can be registered via this property. The
+	 *                                                  format of the array should be as follows: array(
+	 *                                                  'status_reference' => array(
+	 *                                                  'label' => __('Status Reference Label', 'event_espresso'),
+	 *                                                  'public' => true,                 // whether this status should
+	 *                                                  be shown on the frontend of the site
+	 *                                                  'exclude_from_search' => false,   // whether this status should
+	 *                                                  be excluded from wp searches
+	 *                                                  'show_in_admin_all_list' => true, // whether this status is
+	 *                                                  included in queries for the admin "all" view in list table
+	 *                                                  views.
+	 *                                                  'show_in_admin_status_list' => true, // show in the list of
+	 *                                                  statuses with post counts at the top of the admin list tables
+	 *                                                  (i.e. Status Reference(2) )
+	 *                                                  'label_count' => _n_noop(
+	 *                                                  'Status Reference <span class="count">(%s)</span>',
+	 *                                                  'Status References <span class="count">(%s)</span>'
+	 *                                                  ),                                   // the text to display on
+	 *                                                  the admin screen
+	 *                                                  ( or you won't see your status count ).
+	 *                                                  )
+	 *                                                  )
+	 * @link http://codex.wordpress.org/Function_Reference/register_post_status for more info
+	 * @return EE_WP_Post_Status_Field
+	 */
+	public function createWpPostStatusField(
+		$table_column,
+		$nice_name,
+		$nullable,
+		$default_value = null,
+		array $values = array()
+	) {
+		return $this->loader->getNew(
+			'EE_WP_Post_Status_Field',
+			array($table_column, $nice_name, $nullable, $default_value, $values)
+		);
+	}
+
+
+	/**
+	 * @param string $post_type
+	 * @return EE_WP_Post_Type_Field
+	 */
+	public function createWpPostTypeField($post_type)
+	{
+		return $this->loader->getNew('EE_WP_Post_Type_Field', array($post_type));
+	}
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @return EE_WP_User_Field
+	 */
+	public function createWpUserField($table_column, $nice_name, $nullable)
+	{
+		return $this->loader->getNew('EE_WP_User_Field', array($table_column, $nice_name, $nullable));
+	}
 }

core/services/container/CoffeeMill.php

Indentation +47 added lines, -47 removed lines

@@ -15,59 +15,59 @@
 class CoffeeMill
 {
 
-    /**
-     * @var CoffeeShop $coffee_shop
-     */
-    private static $coffee_shop;
+	/**
+	 * @var CoffeeShop $coffee_shop
+	 */
+	private static $coffee_shop;
 
 
-    /**
-     * @return mixed
-     */
-    public static function getCoffeeShop()
-    {
-        return self::$coffee_shop;
-    }
+	/**
+	 * @return mixed
+	 */
+	public static function getCoffeeShop()
+	{
+		return self::$coffee_shop;
+	}
 
 
-    /**
-     * @param CoffeeShop $coffee_shop
-     */
-    public static function setCoffeeShop(CoffeeShop $coffee_shop)
-    {
-        self::$coffee_shop = $coffee_shop;
-    }
+	/**
+	 * @param CoffeeShop $coffee_shop
+	 */
+	public static function setCoffeeShop(CoffeeShop $coffee_shop)
+	{
+		self::$coffee_shop = $coffee_shop;
+	}
 
 
-    /**
-     * @param string $identifier
-     * @param array  $arguments
-     * @param string $type
-     * @return mixed
-     * @throws ServiceNotFoundException
-     */
-    public static function createNew($identifier, $arguments = array(), $type = CoffeeMaker::BREW_NEW)
-    {
-        return self::$coffee_shop->brew($identifier, $arguments, $type);
-    }
+	/**
+	 * @param string $identifier
+	 * @param array  $arguments
+	 * @param string $type
+	 * @return mixed
+	 * @throws ServiceNotFoundException
+	 */
+	public static function createNew($identifier, $arguments = array(), $type = CoffeeMaker::BREW_NEW)
+	{
+		return self::$coffee_shop->brew($identifier, $arguments, $type);
+	}
 
 
-    /**
-     * IMPORTANT!!!
-     * Usage of this method is discouraged as it promotes service location.
-     * It's current use is only as a stop gap measure until the CoffeeShop
-     * Dependency Injection Container can be implemented properly for all classes.
-     * If it is at all possible, inject your dependencies via your class constructor.
-     * This method WILL BE DEPRECATED at some point in the near future.
-     *
-     * @param string $identifier
-     * @param array  $arguments
-     * @param string $type
-     * @return mixed
-     * @throws ServiceNotFoundException
-     */
-    public static function getService($identifier, $arguments = array(), $type = CoffeeMaker::BREW_SHARED)
-    {
-        return self::$coffee_shop->brew($identifier, $arguments, $type);
-    }
+	/**
+	 * IMPORTANT!!!
+	 * Usage of this method is discouraged as it promotes service location.
+	 * It's current use is only as a stop gap measure until the CoffeeShop
+	 * Dependency Injection Container can be implemented properly for all classes.
+	 * If it is at all possible, inject your dependencies via your class constructor.
+	 * This method WILL BE DEPRECATED at some point in the near future.
+	 *
+	 * @param string $identifier
+	 * @param array  $arguments
+	 * @param string $type
+	 * @return mixed
+	 * @throws ServiceNotFoundException
+	 */
+	public static function getService($identifier, $arguments = array(), $type = CoffeeMaker::BREW_SHARED)
+	{
+		return self::$coffee_shop->brew($identifier, $arguments, $type);
+	}
 }

core/services/container/exceptions/InstantiationException.php

Indentation +21 added lines, -21 removed lines

@@ -15,25 +15,25 @@
 class InstantiationException extends BadMethodCallException
 {
 
-    /**
-     * InstantiationException constructor.
-     *
-     * @param string     $identifier the name of the requested entity or service
-     * @param string     $message
-     * @param int        $code
-     * @param \Exception $previous
-     */
-    public function __construct($identifier, $message = '', $code = 0, \Exception $previous = null)
-    {
-        if (empty($message)) {
-            $message = sprintf(
-                __(
-                    'The "%1$s" class could not be constructed.',
-                    'event_espresso'
-                ),
-                $identifier
-            );
-        }
-        parent::__construct($message, $code, $previous);
-    }
+	/**
+	 * InstantiationException constructor.
+	 *
+	 * @param string     $identifier the name of the requested entity or service
+	 * @param string     $message
+	 * @param int        $code
+	 * @param \Exception $previous
+	 */
+	public function __construct($identifier, $message = '', $code = 0, \Exception $previous = null)
+	{
+		if (empty($message)) {
+			$message = sprintf(
+				__(
+					'The "%1$s" class could not be constructed.',
+					'event_espresso'
+				),
+				$identifier
+			);
+		}
+		parent::__construct($message, $code, $previous);
+	}
 }

core/services/container/exceptions/ServiceExistsException.php

Indentation +22 added lines, -22 removed lines

@@ -14,26 +14,26 @@
 {
 
 
-    /**
-     * ServiceExistsException constructor
-     *
-     * @param string     $service_name the name of the requested service
-     * @param string     $message
-     * @param int        $code
-     * @param \Exception $previous
-     */
-    public function __construct(
-        $service_name,
-        $message = '',
-        $code = 0,
-        \Exception $previous = null
-    ) {
-        if (empty($message)) {
-            $message = sprintf(
-                __('The "%1$s" service already exists in the CoffeeShop and can not be added again.', 'event_espresso'),
-                $service_name
-            );
-        }
-        parent::__construct($message, $code, $previous);
-    }
+	/**
+	 * ServiceExistsException constructor
+	 *
+	 * @param string     $service_name the name of the requested service
+	 * @param string     $message
+	 * @param int        $code
+	 * @param \Exception $previous
+	 */
+	public function __construct(
+		$service_name,
+		$message = '',
+		$code = 0,
+		\Exception $previous = null
+	) {
+		if (empty($message)) {
+			$message = sprintf(
+				__('The "%1$s" service already exists in the CoffeeShop and can not be added again.', 'event_espresso'),
+				$service_name
+			);
+		}
+		parent::__construct($message, $code, $previous);
+	}
 }

core/services/container/exceptions/ServiceNotFoundException.php

Indentation +22 added lines, -22 removed lines

@@ -12,26 +12,26 @@
 class ServiceNotFoundException extends \RuntimeException
 {
 
-    /**
-     * ServiceNotFoundException constructor
-     *
-     * @param string     $service_name the name of the requested service
-     * @param string     $message
-     * @param int        $code
-     * @param \Exception $previous
-     */
-    public function __construct(
-        $service_name,
-        $message = '',
-        $code = 0,
-        \Exception $previous = null
-    ) {
-        if (empty($message)) {
-            $message = sprintf(
-                __('The requested service "%1$s" could not found be found in the CoffeeShop.', 'event_espresso'),
-                $service_name
-            );
-        }
-        parent::__construct($message, $code, $previous);
-    }
+	/**
+	 * ServiceNotFoundException constructor
+	 *
+	 * @param string     $service_name the name of the requested service
+	 * @param string     $message
+	 * @param int        $code
+	 * @param \Exception $previous
+	 */
+	public function __construct(
+		$service_name,
+		$message = '',
+		$code = 0,
+		\Exception $previous = null
+	) {
+		if (empty($message)) {
+			$message = sprintf(
+				__('The requested service "%1$s" could not found be found in the CoffeeShop.', 'event_espresso'),
+				$service_name
+			);
+		}
+		parent::__construct($message, $code, $previous);
+	}
 }