eventespresso / event-espresso-core

core/services/collections/Collection.php

Unused Use Statements +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
 namespace EventEspresso\core\services\collections;
 
-use  EventEspresso\core\exceptions\InvalidEntityException;
-use  EventEspresso\core\exceptions\InvalidInterfaceException;
+use EventEspresso\core\exceptions\InvalidEntityException;
+use EventEspresso\core\exceptions\InvalidInterfaceException;
 use LimitIterator;
 use SplObjectStorage;
 

Indentation +52 added lines, -53 removed lines

@@ -47,37 +47,37 @@ 
 	  */
 	 public function __construct( $collection_interface ) {
 		 $this->setCollectionInterface( $collection_interface );
-	     $this->setCollectionIdentifier();
+		 $this->setCollectionIdentifier();
 	 }
 
 
-     /**
-      * @return string
-      */
-     public function collectionIdentifier()
-     {
-         return $this->collection_identifier;
-     }
+	 /**
+	  * @return string
+	  */
+	 public function collectionIdentifier()
+	 {
+		 return $this->collection_identifier;
+	 }
 
 
 
 	 /**
-      * creates a very readable unique 9 character identifier like:  CF2-532-DAC
-      * and appends it to the non-qualified class name, ex: ThingCollection-CF2-532-DAC
-      *
+	  * creates a very readable unique 9 character identifier like:  CF2-532-DAC
+	  * and appends it to the non-qualified class name, ex: ThingCollection-CF2-532-DAC
+	  *
 	  * @return void
 	  */
 	 protected function setCollectionIdentifier() {
-         // hash a few collection details
-	     $identifier = md5(spl_object_hash($this) . $this->collection_interface . time());
-	     // grab a few characters from the start, middle, and end of the hash
-	     $id = array();
-	     for($x=0; $x<19; $x+=9){
-             $id[] = substr($identifier, $x, 3);
-         }
-         $identifier = basename(str_replace('\\', '/', get_class($this)));
-         $identifier .= '-' . strtoupper(implode('-', $id));
-         $this->collection_identifier = $identifier;
+		 // hash a few collection details
+		 $identifier = md5(spl_object_hash($this) . $this->collection_interface . time());
+		 // grab a few characters from the start, middle, and end of the hash
+		 $id = array();
+		 for($x=0; $x<19; $x+=9){
+			 $id[] = substr($identifier, $x, 3);
+		 }
+		 $identifier = basename(str_replace('\\', '/', get_class($this)));
+		 $identifier .= '-' . strtoupper(implode('-', $id));
+		 $this->collection_identifier = $identifier;
 	 }
 
 
@@ -123,7 +123,6 @@ 
 
 	 /**
 	  * setIdentifier
-
 	  * Sets the data associated with an object in the Collection
 	  * if no $identifier is supplied, then the spl_object_hash() is used
 	  *
@@ -212,9 +211,9 @@ 
 
 	 /**
 	  * hasObjects
-      * returns true if there are objects within the Collection, and false if it is empty
-      *
-      * @access public
+	  * returns true if there are objects within the Collection, and false if it is empty
+	  *
+	  * @access public
 	  * @return bool
 	  */
 	 public function hasObjects() {
@@ -418,34 +417,34 @@ 
 
 
 
-     /**
-      * detaches ALL objects from the Collection
-      */
-     public function detachAll()
-     {
-         $this->rewind();
-         while ($this->valid()) {
-             $object = $this->current();
-             $this->next();
-             $this->detach($object);
-         }
-     }
-
-
-
-     /**
-      * unsets and detaches ALL objects from the Collection
-      */
-     public function trashAndDetachAll()
-     {
-         $this->rewind();
-         while ($this->valid()) {
-             $object = $this->current();
-             $this->next();
-             $this->detach($object);
-             unset($object);
-         }
-     }
+	 /**
+	  * detaches ALL objects from the Collection
+	  */
+	 public function detachAll()
+	 {
+		 $this->rewind();
+		 while ($this->valid()) {
+			 $object = $this->current();
+			 $this->next();
+			 $this->detach($object);
+		 }
+	 }
+
+
+
+	 /**
+	  * unsets and detaches ALL objects from the Collection
+	  */
+	 public function trashAndDetachAll()
+	 {
+		 $this->rewind();
+		 while ($this->valid()) {
+			 $object = $this->current();
+			 $this->next();
+			 $this->detach($object);
+			 unset($object);
+		 }
+	 }
 
 
 

Spacing +66 added lines, -66 removed lines

@@ -6,8 +6,8 @@ 
 use LimitIterator;
 use SplObjectStorage;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Class Collection
@@ -45,8 +45,8 @@ 
 	  * @param string $collection_interface
 	  * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
 	  */
-	 public function __construct( $collection_interface ) {
-		 $this->setCollectionInterface( $collection_interface );
+	 public function __construct($collection_interface) {
+		 $this->setCollectionInterface($collection_interface);
 	     $this->setCollectionIdentifier();
 	 }
 
@@ -69,14 +69,14 @@ 
 	  */
 	 protected function setCollectionIdentifier() {
          // hash a few collection details
-	     $identifier = md5(spl_object_hash($this) . $this->collection_interface . time());
+	     $identifier = md5(spl_object_hash($this).$this->collection_interface.time());
 	     // grab a few characters from the start, middle, and end of the hash
 	     $id = array();
-	     for($x=0; $x<19; $x+=9){
+	     for ($x = 0; $x < 19; $x += 9) {
              $id[] = substr($identifier, $x, 3);
          }
          $identifier = basename(str_replace('\\', '/', get_class($this)));
-         $identifier .= '-' . strtoupper(implode('-', $id));
+         $identifier .= '-'.strtoupper(implode('-', $id));
          $this->collection_identifier = $identifier;
 	 }
 
@@ -89,9 +89,9 @@ 
 	  * @param  string $collection_interface
 	  * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
 	  */
-	 protected function setCollectionInterface( $collection_interface ) {
-		 if ( ! ( interface_exists( $collection_interface ) || class_exists( $collection_interface ) ) ) {
-			 throw new InvalidInterfaceException( $collection_interface );
+	 protected function setCollectionInterface($collection_interface) {
+		 if ( ! (interface_exists($collection_interface) || class_exists($collection_interface))) {
+			 throw new InvalidInterfaceException($collection_interface);
 		 }
 		 $this->collection_interface = $collection_interface;
 	 }
@@ -110,13 +110,13 @@ 
 	  * @return bool
 	  * @throws \EventEspresso\core\exceptions\InvalidEntityException
 	  */
-	 public function add( $object, $identifier = null ) {
-		 if ( ! $object instanceof $this->collection_interface ) {
-			 throw new InvalidEntityException( $object, $this->collection_interface );
+	 public function add($object, $identifier = null) {
+		 if ( ! $object instanceof $this->collection_interface) {
+			 throw new InvalidEntityException($object, $this->collection_interface);
 		 }
-		 $this->attach( $object );
-		 $this->setIdentifier( $object, $identifier );
-		 return $this->contains( $object );
+		 $this->attach($object);
+		 $this->setIdentifier($object, $identifier);
+		 return $this->contains($object);
 	 }
 
 
@@ -132,12 +132,12 @@ 
 	  * @param  mixed $identifier
 	  * @return bool
 	  */
-	 public function setIdentifier( $object, $identifier = null ) {
-		 $identifier = ! empty( $identifier ) ? $identifier : spl_object_hash( $object );
+	 public function setIdentifier($object, $identifier = null) {
+		 $identifier = ! empty($identifier) ? $identifier : spl_object_hash($object);
 		 $this->rewind();
-		 while ( $this->valid() ) {
-			 if ( $object === $this->current() ) {
-				 $this->setInfo( $identifier );
+		 while ($this->valid()) {
+			 if ($object === $this->current()) {
+				 $this->setInfo($identifier);
 				 $this->rewind();
 				 return true;
 			 }
@@ -157,10 +157,10 @@ 
 	  * @param mixed $identifier
 	  * @return mixed
 	  */
-	 public function get( $identifier ) {
+	 public function get($identifier) {
 		 $this->rewind();
-		 while ( $this->valid() ) {
-			 if ( $identifier === $this->getInfo() ) {
+		 while ($this->valid()) {
+			 if ($identifier === $this->getInfo()) {
 				 $object = $this->current();
 				 $this->rewind();
 				 return $object;
@@ -182,10 +182,10 @@ 
 	  * @param  mixed $identifier
 	  * @return bool
 	  */
-	 public function has( $identifier ) {
+	 public function has($identifier) {
 		 $this->rewind();
-		 while ( $this->valid() ) {
-			 if ( $identifier === $this->getInfo() ) {
+		 while ($this->valid()) {
+			 if ($identifier === $this->getInfo()) {
 				 $this->rewind();
 				 return true;
 			 }
@@ -204,8 +204,8 @@ 
 	  * @param $object
 	  * @return bool
 	  */
-	 public function hasObject( $object ) {
-		 return $this->contains( $object );
+	 public function hasObject($object) {
+		 return $this->contains($object);
 	 }
 
 
@@ -244,8 +244,8 @@ 
 	  * @param $object
 	  * @return bool
 	  */
-	 public function remove( $object ) {
-		 $this->detach( $object );
+	 public function remove($object) {
+		 $this->detach($object);
 		 return true;
 	 }
 
@@ -259,10 +259,10 @@ 
 	  * @param mixed $identifier
 	  * @return boolean
 	  */
-	 public function setCurrent( $identifier ) {
+	 public function setCurrent($identifier) {
 		 $this->rewind();
-		 while ( $this->valid() ) {
-			 if ( $identifier === $this->getInfo() ) {
+		 while ($this->valid()) {
+			 if ($identifier === $this->getInfo()) {
 				 return true;
 			 }
 			 $this->next();
@@ -280,10 +280,10 @@ 
 	  * @param $object
 	  * @return boolean
 	  */
-	 public function setCurrentUsingObject( $object ) {
+	 public function setCurrentUsingObject($object) {
 		 $this->rewind();
-		 while ( $this->valid() ) {
-			 if ( $this->current() === $object ) {
+		 while ($this->valid()) {
+			 if ($this->current() === $object) {
 				 return true;
 			 }
 			 $this->next();
@@ -300,12 +300,12 @@ 
 	  * @return mixed
 	  */
 	 public function previous() {
-		 $index = $this->indexOf( $this->current() );
-		 if ( $index === 0 ) {
+		 $index = $this->indexOf($this->current());
+		 if ($index === 0) {
 			 return $this->current();
 		 }
 		 $index--;
-		 return $this->objectAtIndex( $index );
+		 return $this->objectAtIndex($index);
 	 }
 
 
@@ -317,12 +317,12 @@ 
 	  * @param $object
 	  * @return boolean|int|string
 	  */
-	 public function indexOf( $object ) {
-		 if ( ! $this->contains( $object ) ) {
+	 public function indexOf($object) {
+		 if ( ! $this->contains($object)) {
 			 return false;
 		 }
-		 foreach ( $this as $index => $obj ) {
-			 if ( $obj === $object ) {
+		 foreach ($this as $index => $obj) {
+			 if ($obj === $object) {
 				 return $index;
 			 }
 		 }
@@ -338,8 +338,8 @@ 
 	  * @param int $index
 	  * @return mixed
 	  */
-	 public function objectAtIndex( $index ) {
-		 $iterator = new LimitIterator( $this, $index, 1 );
+	 public function objectAtIndex($index) {
+		 $iterator = new LimitIterator($this, $index, 1);
 		 $iterator->rewind();
 		 return $iterator->current();
 	 }
@@ -354,10 +354,10 @@ 
 	  * @param int $length
 	  * @return array
 	  */
-	 public function slice( $offset, $length ) {
+	 public function slice($offset, $length) {
 		 $slice = array();
-		 $iterator = new LimitIterator( $this, $offset, $length );
-		 foreach ( $iterator as $object ) {
+		 $iterator = new LimitIterator($this, $offset, $length);
+		 foreach ($iterator as $object) {
 			 $slice[] = $object;
 		 }
 		 return $slice;
@@ -372,35 +372,35 @@ 
 	  * @param mixed $objects A single object or an array of objects
 	  * @param int $index
 	  */
-	 public function insertAt( $objects, $index ) {
-		 if ( ! is_array( $objects ) ) {
-			 $objects = array( $objects );
+	 public function insertAt($objects, $index) {
+		 if ( ! is_array($objects)) {
+			 $objects = array($objects);
 		 }
 		 // check to ensure that objects don't already exist in the collection
-		 foreach ( $objects as $key => $object ) {
-			 if ( $this->contains( $object ) ) {
-				 unset( $objects[ $key ] );
+		 foreach ($objects as $key => $object) {
+			 if ($this->contains($object)) {
+				 unset($objects[$key]);
 			 }
 		 }
 		 // do we have any objects left?
-		 if ( ! $objects ) {
+		 if ( ! $objects) {
 			 return;
 		 }
 		 // detach any objects at or past this index
 		 $remaining = array();
-		 if ( $index < $this->count() ) {
-			 $remaining = $this->slice( $index, $this->count() - $index );
-			 foreach ( $remaining as $object ) {
-				 $this->detach( $object );
+		 if ($index < $this->count()) {
+			 $remaining = $this->slice($index, $this->count() - $index);
+			 foreach ($remaining as $object) {
+				 $this->detach($object);
 			 }
 		 }
 		 // add the new objects we're splicing in
-		 foreach ( $objects as $object ) {
-			 $this->attach( $object );
+		 foreach ($objects as $object) {
+			 $this->attach($object);
 		 }
 		 // attach the objects we previously detached
-		 foreach ( $remaining as $object ) {
-			 $this->attach( $object );
+		 foreach ($remaining as $object) {
+			 $this->attach($object);
 		 }
 	 }
 
@@ -412,8 +412,8 @@ 
 	  * @see http://stackoverflow.com/a/8736013
 	  * @param int $index
 	  */
-	 public function removeAt( $index ) {
-		 $this->detach( $this->objectAtIndex( $index ) );
+	 public function removeAt($index) {
+		 $this->detach($this->objectAtIndex($index));
 	 }
 
 

core/services/collections/CollectionLoader.php

Doc Comments +1 added lines, -1 removed lines

@@ -176,7 +176,7 @@
 	 *
 	 * @access protected
 	 * @param        $entity
-	 * @param  mixed $identifier
+	 * @param  string $identifier
 	 * @return string
 	 * @throws InvalidEntityException
 	 */

Unused Use Statements +4 added lines, -4 removed lines

@@ -3,10 +3,10 @@
 
 use EE_Error;
 use EE_Registry;
-use  EventEspresso\core\exceptions\InvalidClassException;
-use  EventEspresso\core\exceptions\InvalidDataTypeException;
-use  EventEspresso\core\exceptions\InvalidEntityException;
-use  EventEspresso\core\exceptions\InvalidFilePathException;
+use EventEspresso\core\exceptions\InvalidClassException;
+use EventEspresso\core\exceptions\InvalidDataTypeException;
+use EventEspresso\core\exceptions\InvalidEntityException;
+use EventEspresso\core\exceptions\InvalidFilePathException;
 use EventEspresso\core\exceptions\InvalidInterfaceException;
 use EventEspresso\core\services\locators\LocatorInterface;
 use EventEspresso\core\services\locators\FileLocator;

Indentation +78 added lines, -78 removed lines

@@ -67,21 +67,21 @@ 
 	protected $file_locator;
 
 
-    /**
-     * CollectionLoader constructor.
-     *
-     * @param CollectionDetailsInterface $collection_details
-     * @param CollectionInterface        $collection
-     * @param LocatorInterface           $file_locator
-     * @throws ReflectionException
-     * @throws InvalidArgumentException
-     * @throws EE_Error
-     * @throws InvalidInterfaceException
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidFilePathException
-     * @throws InvalidEntityException
-     */
+	/**
+	 * CollectionLoader constructor.
+	 *
+	 * @param CollectionDetailsInterface $collection_details
+	 * @param CollectionInterface        $collection
+	 * @param LocatorInterface           $file_locator
+	 * @throws ReflectionException
+	 * @throws InvalidArgumentException
+	 * @throws EE_Error
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidEntityException
+	 */
 	public function __construct(
 		CollectionDetailsInterface $collection_details,
 		CollectionInterface $collection = null,
@@ -206,13 +206,13 @@ 
 			);
 			return CollectionLoader::ENTITY_ADDED;
 		}
-        do_action(
-            'FHEE__CollectionLoader__addEntityToCollection__entity_not_added',
-            $this,
-            $this->collection_details->collectionName(),
-            $this->collection_details
-        );
-        return CollectionLoader::ENTITY_NOT_ADDED;
+		do_action(
+			'FHEE__CollectionLoader__addEntityToCollection__entity_not_added',
+			$this,
+			$this->collection_details->collectionName(),
+			$this->collection_details
+		);
+		return CollectionLoader::ENTITY_NOT_ADDED;
 	}
 
 
@@ -227,37 +227,37 @@ 
 	 * @throws InvalidEntityException
 	 */
 	protected function setIdentifier( $entity, $identifier ) {
-	    switch($this->collection_details->identifierType()) {
-	        // every unique object gets added to the collection, but not duplicates of the exact same object
-            case CollectionDetails::ID_OBJECT_HASH :
-                $identifier = spl_object_hash($entity);
-                break;
-            // only one entity per class can be added to collection, like a singleton
-            case CollectionDetails::ID_CLASS_NAME :
-                $identifier = get_class($entity);
-                break;
-            // objects added to the collection based on entity callback, so the entity itself decides
-            case CollectionDetails::ID_CALLBACK_METHOD :
-                $identifier_callback = $this->collection_details->identifierCallback();
-                if ( ! method_exists($entity, $identifier_callback)) {
-                    throw new InvalidEntityException(
-                        $entity,
-                        $this->collection_details->getCollectionInterface(),
-                        sprintf(
-                            __(
-                                'The current collection is configured to use a method named "%1$s" when setting or retrieving objects. The supplied entity is an instance
+		switch($this->collection_details->identifierType()) {
+			// every unique object gets added to the collection, but not duplicates of the exact same object
+			case CollectionDetails::ID_OBJECT_HASH :
+				$identifier = spl_object_hash($entity);
+				break;
+			// only one entity per class can be added to collection, like a singleton
+			case CollectionDetails::ID_CLASS_NAME :
+				$identifier = get_class($entity);
+				break;
+			// objects added to the collection based on entity callback, so the entity itself decides
+			case CollectionDetails::ID_CALLBACK_METHOD :
+				$identifier_callback = $this->collection_details->identifierCallback();
+				if ( ! method_exists($entity, $identifier_callback)) {
+					throw new InvalidEntityException(
+						$entity,
+						$this->collection_details->getCollectionInterface(),
+						sprintf(
+							__(
+								'The current collection is configured to use a method named "%1$s" when setting or retrieving objects. The supplied entity is an instance
                                 of "%2$s", but does not contain this method.',
-                                'event_espresso'
-                            ),
-                            $identifier_callback,
-                            get_class($entity)
-                        )
-                    );
-                }
-                $identifier = $entity->{$identifier_callback}();
-                break;
-
-        }
+								'event_espresso'
+							),
+							$identifier_callback,
+							get_class($entity)
+						)
+					);
+				}
+				$identifier = $entity->{$identifier_callback}();
+				break;
+
+		}
 		return apply_filters(
 			'FHEE__CollectionLoader__addEntityToCollection__identifier',
 			$identifier,
@@ -267,18 +267,18 @@ 
 	}
 
 
-    /**
-     * loadFromFQCNs
-     *
-     * @access protected
-     * @throws ReflectionException
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws EE_Error
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     */
+	/**
+	 * loadFromFQCNs
+	 *
+	 * @access protected
+	 * @throws ReflectionException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws EE_Error
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 */
 	protected function loadFromFQCNs() {
 		$FQCNs = $this->collection_details->getCollectionFQCNs();
 		$FQCNs = (array) apply_filters(
@@ -293,20 +293,20 @@ 
 	}
 
 
-    /**
-     * loadClassFromFQCN
-     *
-     * @access protected
-     * @param  string $FQCN Fully Qualified Class Name
-     * @return string
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @throws EE_Error
-     * @throws InvalidEntityException
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     */
+	/**
+	 * loadClassFromFQCN
+	 *
+	 * @access protected
+	 * @param  string $FQCN Fully Qualified Class Name
+	 * @return string
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @throws EE_Error
+	 * @throws InvalidEntityException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 */
 	protected function loadClassFromFQCN( $FQCN ) {
 		if ( ! is_string( $FQCN ) ) {
 			throw new InvalidDataTypeException( '$FQCN', $FQCN, 'string' );

Spacing +34 added lines, -34 removed lines

@@ -13,8 +13,8 @@ 
 use InvalidArgumentException;
 use ReflectionException;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -88,8 +88,8 @@ 
 		LocatorInterface $file_locator = null
 	) {
 		$this->collection_details = $collection_details;
-		if ( ! $collection instanceof CollectionInterface ) {
-			$collection = new Collection( $this->collection_details->getCollectionInterface() );
+		if ( ! $collection instanceof CollectionInterface) {
+			$collection = new Collection($this->collection_details->getCollectionInterface());
 		}
 		$this->collection = $collection;
 		$this->file_locator = $file_locator;
@@ -117,12 +117,12 @@ 
 	 * @throws InvalidEntityException
 	 */
 	protected function loadAllFromFilepaths() {
-		if ( ! $this->file_locator instanceof FileLocator ) {
+		if ( ! $this->file_locator instanceof FileLocator) {
 			$this->file_locator = new FileLocator();
 		}
-		$this->file_locator->setFileMask( $this->collection_details->getFileMask() );
+		$this->file_locator->setFileMask($this->collection_details->getFileMask());
 		// find all of the files that match the file mask in the specified folder
-		$this->file_locator->locate( $this->collection_details->getCollectionPaths() );
+		$this->file_locator->locate($this->collection_details->getCollectionPaths());
 		// filter the results
 		$filepaths = (array) apply_filters(
 			'FHEE__CollectionLoader__loadAllFromFilepath__filepaths',
@@ -130,11 +130,11 @@ 
 			$this->collection_details->collectionName(),
 			$this->collection_details
 		);
-		if ( empty( $filepaths ) ) {
+		if (empty($filepaths)) {
 			return;
 		}
-		foreach ( $filepaths as $filepath ) {
-			$this->loadClassFromFilepath( $filepath );
+		foreach ($filepaths as $filepath) {
+			$this->loadClassFromFilepath($filepath);
 		}
 	}
 
@@ -151,22 +151,22 @@ 
 	 * @throws InvalidFilePathException
 	 * @throws InvalidClassException
 	 */
-	protected function loadClassFromFilepath( $filepath ) {
-		if ( ! is_string( $filepath ) ) {
-			throw new InvalidDataTypeException( '$filepath', $filepath, 'string' );
+	protected function loadClassFromFilepath($filepath) {
+		if ( ! is_string($filepath)) {
+			throw new InvalidDataTypeException('$filepath', $filepath, 'string');
 		}
-		if ( ! is_readable( $filepath ) ) {
-			throw new InvalidFilePathException( $filepath );
+		if ( ! is_readable($filepath)) {
+			throw new InvalidFilePathException($filepath);
 		}
 		require_once $filepath;
 		// extract filename from path
-		$file_name = basename( $filepath );
+		$file_name = basename($filepath);
 		// now remove any file extensions
-		$class_name = \EEH_File::get_classname_from_filepath_with_standard_filename( $file_name );
-		if ( ! class_exists( $class_name ) ) {
-			throw new InvalidClassException( $class_name );
+		$class_name = \EEH_File::get_classname_from_filepath_with_standard_filename($file_name);
+		if ( ! class_exists($class_name)) {
+			throw new InvalidClassException($class_name);
 		}
-		return $this->addEntityToCollection( new $class_name(), $file_name );
+		return $this->addEntityToCollection(new $class_name(), $file_name);
 	}
 
 
@@ -180,15 +180,15 @@ 
 	 * @return string
 	 * @throws InvalidEntityException
 	 */
-	protected function addEntityToCollection( $entity, $identifier ) {
+	protected function addEntityToCollection($entity, $identifier) {
 		do_action(
 			'FHEE__CollectionLoader__addEntityToCollection__entity',
 			$entity,
 			$this->collection_details->collectionName(),
 			$this->collection_details
 		);
-		$identifier = $this->setIdentifier( $entity, $identifier );
-		if ( $this->collection->has( $identifier ) ) {
+		$identifier = $this->setIdentifier($entity, $identifier);
+		if ($this->collection->has($identifier)) {
 			do_action(
 				'FHEE__CollectionLoader__addEntityToCollection__entity_already_added',
 				$this,
@@ -197,7 +197,7 @@ 
 			);
 			return CollectionLoader::ENTITY_EXISTS;
 		}
-		if( $this->collection->add( $entity, $identifier ) ) {
+		if ($this->collection->add($entity, $identifier)) {
 			do_action(
 				'FHEE__CollectionLoader__addEntityToCollection__entity_added',
 				$this,
@@ -226,8 +226,8 @@ 
 	 * @return string
 	 * @throws InvalidEntityException
 	 */
-	protected function setIdentifier( $entity, $identifier ) {
-	    switch($this->collection_details->identifierType()) {
+	protected function setIdentifier($entity, $identifier) {
+	    switch ($this->collection_details->identifierType()) {
 	        // every unique object gets added to the collection, but not duplicates of the exact same object
             case CollectionDetails::ID_OBJECT_HASH :
                 $identifier = spl_object_hash($entity);
@@ -287,8 +287,8 @@ 
 			$this->collection_details->collectionName(),
 			$this->collection_details
 		);
-		foreach ( $FQCNs as $FQCN ) {
-			$this->loadClassFromFQCN( $FQCN );
+		foreach ($FQCNs as $FQCN) {
+			$this->loadClassFromFQCN($FQCN);
 		}
 	}
 
@@ -307,15 +307,15 @@ 
      * @throws InvalidDataTypeException
      * @throws InvalidClassException
      */
-	protected function loadClassFromFQCN( $FQCN ) {
-		if ( ! is_string( $FQCN ) ) {
-			throw new InvalidDataTypeException( '$FQCN', $FQCN, 'string' );
+	protected function loadClassFromFQCN($FQCN) {
+		if ( ! is_string($FQCN)) {
+			throw new InvalidDataTypeException('$FQCN', $FQCN, 'string');
 		}
-		if ( ! class_exists( $FQCN ) ) {
-			throw new InvalidClassException( $FQCN );
+		if ( ! class_exists($FQCN)) {
+			throw new InvalidClassException($FQCN);
 		}
 		return $this->addEntityToCollection(
-			EE_Registry::instance()->create( $FQCN ),
+			EE_Registry::instance()->create($FQCN),
 			$FQCN
 		);
 	}

core/exceptions/InvalidEntityException.php

Indentation +26 added lines, -26 removed lines

@@ -20,32 +20,32 @@
 class InvalidEntityException extends InvalidArgumentException
 {
 
-    /**
-     * InvalidEntityException constructor.
-     *
-     * @param mixed     $actual   the actual object (or thing) we got
-     * @param string    $expected classname of the entity we wanted
-     * @param string    $message
-     * @param int       $code
-     * @param Exception $previous
-     */
-    public function __construct($actual, $expected, $message = '', $code = 0, Exception $previous = null)
-    {
-        if (empty($message)) {
-            $message = sprintf(
-                __(
-                    'The supplied entity is an instance of "%1$s", but an instance of "%2$s" was expected. Object: %3$s',
-                    'event_espresso'
-                ),
-                is_object($actual)
-                    ? get_class($actual)
-                    : gettype($actual),
-                $expected,
-                var_export($actual, true)
-            );
-        }
-        parent::__construct($message, $code, $previous);
-    }
+	/**
+	 * InvalidEntityException constructor.
+	 *
+	 * @param mixed     $actual   the actual object (or thing) we got
+	 * @param string    $expected classname of the entity we wanted
+	 * @param string    $message
+	 * @param int       $code
+	 * @param Exception $previous
+	 */
+	public function __construct($actual, $expected, $message = '', $code = 0, Exception $previous = null)
+	{
+		if (empty($message)) {
+			$message = sprintf(
+				__(
+					'The supplied entity is an instance of "%1$s", but an instance of "%2$s" was expected. Object: %3$s',
+					'event_espresso'
+				),
+				is_object($actual)
+					? get_class($actual)
+					: gettype($actual),
+				$expected,
+				var_export($actual, true)
+			);
+		}
+		parent::__construct($message, $code, $previous);
+	}
 
 }
 // End of file InvalidEntityException.php

core/services/collections/CollectionInterface.php

Spacing +15 added lines, -15 removed lines

@@ -7,8 +7,8 @@ 
 use Iterator;
 use Serializable;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -33,7 +33,7 @@ 
 	 * @param  mixed $identifier
 	 * @return bool
 	 */
-	public function add( $object, $identifier = null );
+	public function add($object, $identifier = null);
 
 	/**
 	 * setIdentifier
@@ -45,7 +45,7 @@ 
 	 * @param  mixed $identifier
 	 * @return bool
 	 */
-	public function setIdentifier( $object, $identifier = null );
+	public function setIdentifier($object, $identifier = null);
 
 	/**
 	 * get
@@ -56,7 +56,7 @@ 
 	 * @param mixed $identifier
 	 * @return mixed
 	 */
-	public function get( $identifier );
+	public function get($identifier);
 
 	/**
 	 * has
@@ -68,7 +68,7 @@ 
 	 * @param  mixed $identifier
 	 * @return bool
 	 */
-	public function has( $identifier );
+	public function has($identifier);
 
 	/**
 	 * hasObject
@@ -78,7 +78,7 @@ 
 	 * @param $object
 	 * @return bool
 	 */
-	public function hasObject( $object );
+	public function hasObject($object);
 
 	/**
 	 * remove
@@ -88,7 +88,7 @@ 
 	 * @param $object
 	 * @return bool
 	 */
-	public function remove( $object );
+	public function remove($object);
 
 	/**
 	 * setCurrent
@@ -98,7 +98,7 @@ 
 	 * @param mixed $identifier
 	 * @return boolean
 	 */
-	public function setCurrent( $identifier ) ;
+	public function setCurrent($identifier);
 
 	/**
 	 * setCurrentUsingObject
@@ -108,7 +108,7 @@ 
 	 * @param $object
 	 * @return boolean
 	 */
-	public function setCurrentUsingObject( $object );
+	public function setCurrentUsingObject($object);
 
 	/**
 	 * Returns the object occupying the index before the current object,
@@ -125,7 +125,7 @@ 
 	 * @param $object
 	 * @return boolean|int|string
 	 */
-	public function indexOf( $object );
+	public function indexOf($object);
 
 
 	/**
@@ -135,7 +135,7 @@ 
 	 * @param $index
 	 * @return mixed
 	 */
-	public function objectAtIndex( $index );
+	public function objectAtIndex($index);
 
 	/**
 	 * Returns the sequence of objects as specified by the offset and length
@@ -145,7 +145,7 @@ 
 	 * @param int $length
 	 * @return array
 	 */
-	public function slice( $offset, $length );
+	public function slice($offset, $length);
 
 	/**
 	 * Inserts an object (or an array of objects) at a certain point
@@ -154,7 +154,7 @@ 
 	 * @param mixed   $objects A single object or an array of objects
 	 * @param integer $index
 	 */
-	public function insertAt( $objects, $index );
+	public function insertAt($objects, $index);
 
 	/**
 	 * Removes the object at the given index
@@ -162,7 +162,7 @@ 
 	 * @see http://stackoverflow.com/a/8736013
 	 * @param integer $index
 	 */
-	public function removeAt( $index ) ;
+	public function removeAt($index);
 
 
 

core/domain/entities/editor/EditorBlockCollection.php

Indentation +47 added lines, -47 removed lines

@@ -20,55 +20,55 @@
 class EditorBlockCollection extends Collection
 {
 
-    /**
-     * Collection constructor
-     *
-     * @throws InvalidInterfaceException
-     */
-    public function __construct()
-    {
-        parent::__construct('EventEspresso\core\domain\entities\editor\EditorBlockInterface');
-    }
+	/**
+	 * Collection constructor
+	 *
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct()
+	{
+		parent::__construct('EventEspresso\core\domain\entities\editor\EditorBlockInterface');
+	}
 
 
-    /**
-     * unRegisterBlock
-     * finds block in the Collection based on the identifier that was set using addObject()
-     * and calls unRegisterBlock() on it. Returns block if successful and false if block was not found.
-     * PLZ NOTE: the pointer is reset to the beginning of the collection afterwards
-     *
-     * @param mixed $identifier
-     * @return boolean
-     */
-    public function unRegisterBlock($identifier)
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if ($identifier === $this->getInfo()) {
-                $object = $this->current();
-                $this->rewind();
-                return $object->unRegisterBlock();
-            }
-            $this->next();
-        }
-        return false;
-    }
+	/**
+	 * unRegisterBlock
+	 * finds block in the Collection based on the identifier that was set using addObject()
+	 * and calls unRegisterBlock() on it. Returns block if successful and false if block was not found.
+	 * PLZ NOTE: the pointer is reset to the beginning of the collection afterwards
+	 *
+	 * @param mixed $identifier
+	 * @return boolean
+	 */
+	public function unRegisterBlock($identifier)
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			if ($identifier === $this->getInfo()) {
+				$object = $this->current();
+				$this->rewind();
+				return $object->unRegisterBlock();
+			}
+			$this->next();
+		}
+		return false;
+	}
 
 
-    /**
-     * unRegisterAllBlocks
-     * calls unRegisterBlock() on all blocks in Collection.
-     * PLZ NOTE: the pointer is reset to the beginning of the collection afterwards
-     *
-     * @return void
-     */
-    public function unRegisterAllBlocks()
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            $this->current()->unRegisterBlock();
-            $this->next();
-        }
-        $this->rewind();
-    }
+	/**
+	 * unRegisterAllBlocks
+	 * calls unRegisterBlock() on all blocks in Collection.
+	 * PLZ NOTE: the pointer is reset to the beginning of the collection afterwards
+	 *
+	 * @return void
+	 */
+	public function unRegisterAllBlocks()
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			$this->current()->unRegisterBlock();
+			$this->next();
+		}
+		$this->rewind();
+	}
 }

core/domain/entities/editor/EditorBlockInterface.php

Indentation +68 added lines, -68 removed lines

@@ -25,72 +25,72 @@
 interface EditorBlockInterface
 {
 
-    /**
-     * Perform any early setup required by the block
-     * including setting the block type and supported post types
-     *
-     * @return void
-     */
-    public function initialize();
-
-
-    /**
-     * @return string
-     */
-    public function editorBlockType();
-
-
-    /**
-     * Registers the Editor Block with WP core;
-     * Returns the registered block type on success, or false on failure.
-     *
-     * @return WP_Block_Type|false
-     */
-    public function registerBlock();
-
-
-    /**
-     * Un-registers the Editor Block with WP core;
-     * Returns the registered block type on success, or false on failure.
-     *
-     * @return WP_Block_Type|false
-     */
-    public function unRegisterBlock();
-
-
-    /**
-     * returns true if the block type applies for the supplied post type
-     * and should be added to that post type's editor
-     *
-     * @param string $post_type
-     * @return boolean
-     */
-    public function appliesToPostType($post_type);
-
-
-    /**
-     * @return array
-     */
-    public function getEditorContainer();
-
-
-    /**
-     * @return  void
-     */
-    public function registerScripts();
-
-
-    /**
-     * @return void
-     */
-    public function registerStyles();
-
-
-    /**
-     * returns the rendered HTML for the block
-     *
-     * @param array $attributes
-     * @return string
-     */
-    public function renderBlock(array $attributes = array());
+	/**
+	 * Perform any early setup required by the block
+	 * including setting the block type and supported post types
+	 *
+	 * @return void
+	 */
+	public function initialize();
+
+
+	/**
+	 * @return string
+	 */
+	public function editorBlockType();
+
+
+	/**
+	 * Registers the Editor Block with WP core;
+	 * Returns the registered block type on success, or false on failure.
+	 *
+	 * @return WP_Block_Type|false
+	 */
+	public function registerBlock();
+
+
+	/**
+	 * Un-registers the Editor Block with WP core;
+	 * Returns the registered block type on success, or false on failure.
+	 *
+	 * @return WP_Block_Type|false
+	 */
+	public function unRegisterBlock();
+
+
+	/**
+	 * returns true if the block type applies for the supplied post type
+	 * and should be added to that post type's editor
+	 *
+	 * @param string $post_type
+	 * @return boolean
+	 */
+	public function appliesToPostType($post_type);
+
+
+	/**
+	 * @return array
+	 */
+	public function getEditorContainer();
+
+
+	/**
+	 * @return  void
+	 */
+	public function registerScripts();
+
+
+	/**
+	 * @return void
+	 */
+	public function registerStyles();
+
+
+	/**
+	 * returns the rendered HTML for the block
+	 *
+	 * @param array $attributes
+	 * @return string
+	 */
+	public function renderBlock(array $attributes = array());
 }

core/domain/DomainInterface.php

Indentation +40 added lines, -40 removed lines

@@ -16,61 +16,61 @@
 interface DomainInterface extends InterminableInterface
 {
 
-    /**
-     * @return string
-     * @throws DomainException
-     */
-    public function pluginFile();
+	/**
+	 * @return string
+	 * @throws DomainException
+	 */
+	public function pluginFile();
 
 
-    /**
-     * @return string
-     * @throws DomainException
-     */
-    public function pluginBasename();
+	/**
+	 * @return string
+	 * @throws DomainException
+	 */
+	public function pluginBasename();
 
 
-    /**
-     * @return string
-     */
-    public function pluginPath();
+	/**
+	 * @return string
+	 */
+	public function pluginPath();
 
 
-    /**
-     * @return string
-     * @throws DomainException
-     */
-    public function pluginUrl();
+	/**
+	 * @return string
+	 * @throws DomainException
+	 */
+	public function pluginUrl();
 
 
-    /**
-     * @return string
-     * @throws DomainException
-     */
-    public function version();
+	/**
+	 * @return string
+	 * @throws DomainException
+	 */
+	public function version();
 
 
-    /**
-     * @return string
-     */
-    public function sourceAssetsPath();
+	/**
+	 * @return string
+	 */
+	public function sourceAssetsPath();
 
 
-    /**
-     * @return string
-     */
-    public function sourceAssetsUrl();
+	/**
+	 * @return string
+	 */
+	public function sourceAssetsUrl();
 
 
-    /**
-     * @return string
-     */
-    public function distributionAssetsPath();
+	/**
+	 * @return string
+	 */
+	public function distributionAssetsPath();
 
 
-    /**
-     * @return string
-     */
-    public function distributionAssetsUrl();
+	/**
+	 * @return string
+	 */
+	public function distributionAssetsUrl();
 
 }

core/domain/DomainBase.php

Indentation +136 added lines, -136 removed lines

@@ -19,144 +19,144 @@
 abstract class DomainBase implements DomainInterface
 {
 
-    /**
-     * Equivalent to `__FILE__` for main plugin file.
-     *
-     * @var FilePath
-     */
-    private $plugin_file;
+	/**
+	 * Equivalent to `__FILE__` for main plugin file.
+	 *
+	 * @var FilePath
+	 */
+	private $plugin_file;
 
-    /**
-     * String indicating version for plugin
-     *
-     * @var string
-     */
-    private $version;
-
-    /**
-     * @var string $plugin_basename
-     */
-    private $plugin_basename;
-
-    /**
-     * @var string $plugin_path
-     */
-    private $plugin_path;
-
-    /**
-     * @var string $plugin_url
-     */
-    private $plugin_url;
-
-
-
-    /**
-     * Initializes internal properties.
-     *
-     * @param FilePath $plugin_file
-     * @param Version  $version
-     */
-    public function __construct(FilePath $plugin_file, Version $version)
-    {
-        $this->plugin_file = $plugin_file;
-        $this->version = $version;
-        $this->plugin_basename = plugin_basename($this->pluginFile());
-        $this->plugin_path = plugin_dir_path($this->pluginFile());
-        $this->plugin_url = plugin_dir_url($this->pluginFile());
-    }
-
-
-    /**
-     * @return string
-     */
-    public function pluginFile()
-    {
-        return (string) $this->plugin_file;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function pluginBasename()
-    {
-        return $this->plugin_basename;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function pluginPath()
-    {
-        return $this->plugin_path;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function pluginUrl()
-    {
-        return $this->plugin_url;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function version()
-    {
-        return (string) $this->version;
-    }
-
-
-
-    /**
-     * @return Version
-     */
-    public function versionValueObject()
-    {
-        return $this->version;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function sourceAssetsPath()
-    {
-        return $this->pluginPath() . 'assets/src/';
-    }
+	/**
+	 * String indicating version for plugin
+	 *
+	 * @var string
+	 */
+	private $version;
+
+	/**
+	 * @var string $plugin_basename
+	 */
+	private $plugin_basename;
+
+	/**
+	 * @var string $plugin_path
+	 */
+	private $plugin_path;
+
+	/**
+	 * @var string $plugin_url
+	 */
+	private $plugin_url;
+
+
+
+	/**
+	 * Initializes internal properties.
+	 *
+	 * @param FilePath $plugin_file
+	 * @param Version  $version
+	 */
+	public function __construct(FilePath $plugin_file, Version $version)
+	{
+		$this->plugin_file = $plugin_file;
+		$this->version = $version;
+		$this->plugin_basename = plugin_basename($this->pluginFile());
+		$this->plugin_path = plugin_dir_path($this->pluginFile());
+		$this->plugin_url = plugin_dir_url($this->pluginFile());
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function pluginFile()
+	{
+		return (string) $this->plugin_file;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function pluginBasename()
+	{
+		return $this->plugin_basename;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function pluginPath()
+	{
+		return $this->plugin_path;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function pluginUrl()
+	{
+		return $this->plugin_url;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function version()
+	{
+		return (string) $this->version;
+	}
+
+
+
+	/**
+	 * @return Version
+	 */
+	public function versionValueObject()
+	{
+		return $this->version;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function sourceAssetsPath()
+	{
+		return $this->pluginPath() . 'assets/src/';
+	}
 
-
-    /**
-     * @return string
-     */
-    public function sourceAssetsUrl()
-    {
-        return $this->pluginUrl() . 'assets/src/';
-    }
+
+	/**
+	 * @return string
+	 */
+	public function sourceAssetsUrl()
+	{
+		return $this->pluginUrl() . 'assets/src/';
+	}
 
 
-    /**
-     * @return string
-     */
-    public function distributionAssetsPath()
-    {
-        return $this->pluginPath() . 'assets/dist/';
-    }
-
-
-    /**
-     * @return string
-     */
-    public function distributionAssetsUrl()
-    {
-        return $this->pluginUrl() . 'assets/dist/';
-    }
+	/**
+	 * @return string
+	 */
+	public function distributionAssetsPath()
+	{
+		return $this->pluginPath() . 'assets/dist/';
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function distributionAssetsUrl()
+	{
+		return $this->pluginUrl() . 'assets/dist/';
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -130,7 +130,7 @@ 
      */
     public function sourceAssetsPath()
     {
-        return $this->pluginPath() . 'assets/src/';
+        return $this->pluginPath().'assets/src/';
     }
 
 
@@ -139,7 +139,7 @@ 
      */
     public function sourceAssetsUrl()
     {
-        return $this->pluginUrl() . 'assets/src/';
+        return $this->pluginUrl().'assets/src/';
     }
 
 
@@ -148,7 +148,7 @@ 
      */
     public function distributionAssetsPath()
     {
-        return $this->pluginPath() . 'assets/dist/';
+        return $this->pluginPath().'assets/dist/';
     }
 
 
@@ -157,6 +157,6 @@ 
      */
     public function distributionAssetsUrl()
     {
-        return $this->pluginUrl() . 'assets/dist/';
+        return $this->pluginUrl().'assets/dist/';
     }
 }

core/services/bootstrap/BootstrapCore.php

Indentation +229 added lines, -229 removed lines

@@ -52,235 +52,235 @@
 class BootstrapCore
 {
 
-    /**
-     * @type LoaderInterface $loader
-     */
-    private $loader;
-
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
-
-    /**
-     * @var ResponseInterface $response
-     */
-    protected $response;
-
-    /**
-     * @var RequestStackBuilder $request_stack_builder
-     */
-    protected $request_stack_builder;
-
-    /**
-     * @var RequestStack $request_stack
-     */
-    protected $request_stack;
-
-
-    /**
-     * BootstrapCore constructor.
-     */
-    public function __construct()
-    {
-        // construct request stack and run middleware apps as soon as all WP plugins are loaded
-        add_action('plugins_loaded', array($this, 'initialize'), 0);
-    }
-
-
-    /**
-     * @throws InvalidRequestStackMiddlewareException
-     * @throws InvalidFilePathException
-     * @throws InvalidClassException
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function initialize()
-    {
-        $this->bootstrapDependencyInjectionContainer();
-        $this->bootstrapDomain();
-        $bootstrap_request = $this->bootstrapRequestResponseObjects();
-        add_action(
-            'EE_Load_Espresso_Core__handle_request__initialize_core_loading',
-            array($bootstrap_request, 'setupLegacyRequest')
-        );
-        $this->runRequestStack();
-    }
-
-
-    /**
-     * @throws ReflectionException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private function bootstrapDependencyInjectionContainer()
-    {
-        $bootstrap_di = new BootstrapDependencyInjectionContainer();
-        $bootstrap_di->buildLegacyDependencyInjectionContainer();
-        $bootstrap_di->buildLoader();
-        $registry = $bootstrap_di->getRegistry();
-        $dependency_map = $bootstrap_di->getDependencyMap();
-        $dependency_map->initialize();
-        $registry->initialize();
-        $this->loader = $bootstrap_di->getLoader();
-    }
-
-
-    /**
-     * configures the Domain object for core
-     *
-     * @return void
-     * @throws DomainException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     * @throws InvalidFilePathException
-     * @throws InvalidInterfaceException
-     */
-    private function bootstrapDomain()
-    {
-        DomainFactory::getShared(
-            new FullyQualifiedName(
-                'EventEspresso\core\domain\Domain'
-            ),
-            array(
-                new FilePath(EVENT_ESPRESSO_MAIN_FILE),
-                Version::fromString(espresso_version())
-            )
-        );
-    }
-
-
-    /**
-     * sets up the request and response objects
-     *
-     * @return BootstrapRequestResponseObjects
-     * @throws InvalidArgumentException
-     */
-    private function bootstrapRequestResponseObjects()
-    {
-        /** @var BootstrapRequestResponseObjects $bootstrap_request */
-        $bootstrap_request = $this->loader->getShared(
-            'EventEspresso\core\services\bootstrap\BootstrapRequestResponseObjects',
-            array($this->loader)
-        );
-        $bootstrap_request->buildRequestResponse();
-        $bootstrap_request->shareRequestResponse();
-        $this->request  = $this->loader->getShared('EventEspresso\core\services\request\Request');
-        $this->response = $this->loader->getShared('EventEspresso\core\services\request\Response');
-        return $bootstrap_request;
-    }
-
-
-    /**
-     * run_request_stack
-     * construct request stack and run middleware apps
-     *
-     * @throws InvalidRequestStackMiddlewareException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws EE_Error
-     */
-    public function runRequestStack()
-    {
-        $this->loadAutoloader();
-        $this->setAutoloadersForRequiredFiles();
-        $this->request_stack_builder = $this->buildRequestStack();
-        $this->request_stack         = $this->request_stack_builder->resolve(
-            new RequestStackCoreApp()
-        );
-        $this->request_stack->handleRequest($this->request, $this->response);
-        $this->request_stack->handleResponse();
-    }
-
-
-    /**
-     * load_autoloader
-     *
-     * @throws EE_Error
-     */
-    protected function loadAutoloader()
-    {
-        // load interfaces
-        espresso_load_required(
-            'EEH_Autoloader',
-            EE_CORE . 'helpers' . DS . 'EEH_Autoloader.helper.php'
-        );
-        EEH_Autoloader::instance();
-    }
-
-
-
-    /**
-     * load_required_files
-     *
-     * @throws EE_Error
-     */
-    protected function setAutoloadersForRequiredFiles()
-    {
-        // load interfaces
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'interfaces', true);
-        // load helpers
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_HELPERS);
-        // load request stack
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'request_stack' . DS);
-        // load middleware
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'middleware' . DS);
-    }
-
-
-
-    /**
-     * build_request_stack
-     *
-     * @return RequestStackBuilder
-     */
-    public function buildRequestStack()
-    {
-        $request_stack_builder = new RequestStackBuilder($this->loader);
-        /**
-         * ! IMPORTANT ! The middleware stack operates FILO : FIRST IN LAST OUT
-         * so items at the beginning of the final middleware stack will run last.
-         * First parameter is the middleware classname, second is an array of arguments
-         */
-        $stack_apps            = apply_filters(
-            'FHEE__EventEspresso_core_services_bootstrap_BootstrapCore__buildRequestStack__stack_apps',
-            array(
-                // first in last out
-                'EventEspresso\core\services\request\middleware\BotDetector' => array(),
-                'EventEspresso\core\services\request\middleware\DetectFileEditorRequest' => array(),
-                'EventEspresso\core\services\request\middleware\PreProductionVersionWarning' => array(),
-                'EventEspresso\core\services\request\middleware\RecommendedVersions' => array(),
-                // last in first out
-                'EventEspresso\core\services\request\middleware\DetectLogin' => array(),
-            )
-        );
-        // legacy filter for backwards compatibility
-        $stack_apps            = apply_filters(
-            'FHEE__EE_Bootstrap__build_request_stack__stack_apps',
-            $stack_apps
-        );
-        // load middleware onto stack : FILO (First In Last Out)
-        // items at the beginning of the $stack_apps array will run last
-        foreach ((array) $stack_apps as $stack_app => $stack_app_args) {
-            $request_stack_builder->push(array($stack_app, $stack_app_args));
-        }
-        // finally, we'll add this on its own because we need it to always be part of the stack
-        // and we also need it to always run first because the rest of the system relies on it
-        $request_stack_builder->push(
-            array('EventEspresso\core\services\request\middleware\SetRequestTypeContextChecker', array())
-        );
-        return apply_filters(
-            'FHEE__EE_Bootstrap__build_request_stack__request_stack_builder',
-            $request_stack_builder
-        );
-    }
+	/**
+	 * @type LoaderInterface $loader
+	 */
+	private $loader;
+
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
+
+	/**
+	 * @var ResponseInterface $response
+	 */
+	protected $response;
+
+	/**
+	 * @var RequestStackBuilder $request_stack_builder
+	 */
+	protected $request_stack_builder;
+
+	/**
+	 * @var RequestStack $request_stack
+	 */
+	protected $request_stack;
+
+
+	/**
+	 * BootstrapCore constructor.
+	 */
+	public function __construct()
+	{
+		// construct request stack and run middleware apps as soon as all WP plugins are loaded
+		add_action('plugins_loaded', array($this, 'initialize'), 0);
+	}
+
+
+	/**
+	 * @throws InvalidRequestStackMiddlewareException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidClassException
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function initialize()
+	{
+		$this->bootstrapDependencyInjectionContainer();
+		$this->bootstrapDomain();
+		$bootstrap_request = $this->bootstrapRequestResponseObjects();
+		add_action(
+			'EE_Load_Espresso_Core__handle_request__initialize_core_loading',
+			array($bootstrap_request, 'setupLegacyRequest')
+		);
+		$this->runRequestStack();
+	}
+
+
+	/**
+	 * @throws ReflectionException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private function bootstrapDependencyInjectionContainer()
+	{
+		$bootstrap_di = new BootstrapDependencyInjectionContainer();
+		$bootstrap_di->buildLegacyDependencyInjectionContainer();
+		$bootstrap_di->buildLoader();
+		$registry = $bootstrap_di->getRegistry();
+		$dependency_map = $bootstrap_di->getDependencyMap();
+		$dependency_map->initialize();
+		$registry->initialize();
+		$this->loader = $bootstrap_di->getLoader();
+	}
+
+
+	/**
+	 * configures the Domain object for core
+	 *
+	 * @return void
+	 * @throws DomainException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidInterfaceException
+	 */
+	private function bootstrapDomain()
+	{
+		DomainFactory::getShared(
+			new FullyQualifiedName(
+				'EventEspresso\core\domain\Domain'
+			),
+			array(
+				new FilePath(EVENT_ESPRESSO_MAIN_FILE),
+				Version::fromString(espresso_version())
+			)
+		);
+	}
+
+
+	/**
+	 * sets up the request and response objects
+	 *
+	 * @return BootstrapRequestResponseObjects
+	 * @throws InvalidArgumentException
+	 */
+	private function bootstrapRequestResponseObjects()
+	{
+		/** @var BootstrapRequestResponseObjects $bootstrap_request */
+		$bootstrap_request = $this->loader->getShared(
+			'EventEspresso\core\services\bootstrap\BootstrapRequestResponseObjects',
+			array($this->loader)
+		);
+		$bootstrap_request->buildRequestResponse();
+		$bootstrap_request->shareRequestResponse();
+		$this->request  = $this->loader->getShared('EventEspresso\core\services\request\Request');
+		$this->response = $this->loader->getShared('EventEspresso\core\services\request\Response');
+		return $bootstrap_request;
+	}
+
+
+	/**
+	 * run_request_stack
+	 * construct request stack and run middleware apps
+	 *
+	 * @throws InvalidRequestStackMiddlewareException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws EE_Error
+	 */
+	public function runRequestStack()
+	{
+		$this->loadAutoloader();
+		$this->setAutoloadersForRequiredFiles();
+		$this->request_stack_builder = $this->buildRequestStack();
+		$this->request_stack         = $this->request_stack_builder->resolve(
+			new RequestStackCoreApp()
+		);
+		$this->request_stack->handleRequest($this->request, $this->response);
+		$this->request_stack->handleResponse();
+	}
+
+
+	/**
+	 * load_autoloader
+	 *
+	 * @throws EE_Error
+	 */
+	protected function loadAutoloader()
+	{
+		// load interfaces
+		espresso_load_required(
+			'EEH_Autoloader',
+			EE_CORE . 'helpers' . DS . 'EEH_Autoloader.helper.php'
+		);
+		EEH_Autoloader::instance();
+	}
+
+
+
+	/**
+	 * load_required_files
+	 *
+	 * @throws EE_Error
+	 */
+	protected function setAutoloadersForRequiredFiles()
+	{
+		// load interfaces
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'interfaces', true);
+		// load helpers
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_HELPERS);
+		// load request stack
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'request_stack' . DS);
+		// load middleware
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'middleware' . DS);
+	}
+
+
+
+	/**
+	 * build_request_stack
+	 *
+	 * @return RequestStackBuilder
+	 */
+	public function buildRequestStack()
+	{
+		$request_stack_builder = new RequestStackBuilder($this->loader);
+		/**
+		 * ! IMPORTANT ! The middleware stack operates FILO : FIRST IN LAST OUT
+		 * so items at the beginning of the final middleware stack will run last.
+		 * First parameter is the middleware classname, second is an array of arguments
+		 */
+		$stack_apps            = apply_filters(
+			'FHEE__EventEspresso_core_services_bootstrap_BootstrapCore__buildRequestStack__stack_apps',
+			array(
+				// first in last out
+				'EventEspresso\core\services\request\middleware\BotDetector' => array(),
+				'EventEspresso\core\services\request\middleware\DetectFileEditorRequest' => array(),
+				'EventEspresso\core\services\request\middleware\PreProductionVersionWarning' => array(),
+				'EventEspresso\core\services\request\middleware\RecommendedVersions' => array(),
+				// last in first out
+				'EventEspresso\core\services\request\middleware\DetectLogin' => array(),
+			)
+		);
+		// legacy filter for backwards compatibility
+		$stack_apps            = apply_filters(
+			'FHEE__EE_Bootstrap__build_request_stack__stack_apps',
+			$stack_apps
+		);
+		// load middleware onto stack : FILO (First In Last Out)
+		// items at the beginning of the $stack_apps array will run last
+		foreach ((array) $stack_apps as $stack_app => $stack_app_args) {
+			$request_stack_builder->push(array($stack_app, $stack_app_args));
+		}
+		// finally, we'll add this on its own because we need it to always be part of the stack
+		// and we also need it to always run first because the rest of the system relies on it
+		$request_stack_builder->push(
+			array('EventEspresso\core\services\request\middleware\SetRequestTypeContextChecker', array())
+		);
+		return apply_filters(
+			'FHEE__EE_Bootstrap__build_request_stack__request_stack_builder',
+			$request_stack_builder
+		);
+	}
 
 
 }