eventespresso / event-espresso-core

core/services/loaders/CachingLoader.php

Indentation +104 added lines, -104 removed lines

@@ -22,110 +22,110 @@
 class CachingLoader extends LoaderDecorator
 {
 
-    /**
-     * @var CollectionInterface $cache
-     */
-    protected $cache;
-
-    /**
-     * @var string $identifier
-     */
-    protected $identifier;
-
-
-
-    /**
-     * CachingLoader constructor.
-     *
-     * @param LoaderInterface     $loader
-     * @param CollectionInterface $cache
-     * @param string              $identifier
-     * @throws InvalidDataTypeException
-     */
-    public function __construct(LoaderInterface $loader, CollectionInterface $cache, $identifier = '')
-    {
-        parent::__construct($loader);
-        $this->cache = $cache;
-        $this->identifier = $this->setIdentifier($identifier);
-        if ($this->identifier !== '') {
-            // to only clear this cache, and assuming an identifier has been set, simply do the following:
-            // do_action('AHEE__EventEspresso\core\services\loaders\CachingLoader__resetCache__IDENTIFIER');
-            // where "IDENTIFIER" = the string that was set during construction
-            add_action(
-                "AHEE__EventEspresso\\core\\services\\loaders\\CachingLoader__resetCache__{$identifier}",
-                array($this, 'resetCache')
-            );
-        }
-        // to clear ALL caches, simply do the following:
-        // do_action('AHEE__EventEspresso\core\services\loaders\CachingLoader__resetCache');
-        add_action(
-            'AHEE__EventEspresso\core\services\loaders\CachingLoader__resetCache',
-            array($this, 'resetCache')
-        );
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function identifier()
-    {
-        return $this->identifier;
-    }
-
-
-
-    /**
-     * @param string $identifier
-     * @throws InvalidDataTypeException
-     */
-    public function setIdentifier($identifier)
-    {
-        if ( ! is_string($identifier)) {
-            throw new InvalidDataTypeException('$identifier', $identifier, 'string');
-        }
-        $this->identifier = $identifier;
-    }
-
-
-
-    /**
-     * @param string $fqcn
-     * @param array  $arguments
-     * @return mixed
-     * @throws InvalidEntityException
-     * @throws ServiceNotFoundException
-     */
-    public function load($fqcn, $arguments = array())
-    {
-        $fqcn = ltrim($fqcn, '\\');
-        // caching can be turned off via the following code:
-        // add_filter('FHEE__EventEspresso\core\services\loaders\CachingLoader__load__bypass_cache', '__return_true');
-        if(
-            apply_filters(
-                'FHEE__EventEspresso\core\services\loaders\CachingLoader__load__bypass_cache',
-                false,
-                $this
-            )
-        ){
-            return $this->loader->load($fqcn, $arguments);
-        }
-        $identifier = md5($fqcn . serialize($arguments));
-        if($this->cache->has($identifier)){
-            return $this->cache->get($identifier);
-        }
-        $object = $this->loader->load($fqcn, $arguments);
-        $this->cache->add($object, $identifier);
-        return $object;
-    }
-
-
-
-    public function resetCache()
-    {
-        $this->cache->reset();
-    }
+	/**
+	 * @var CollectionInterface $cache
+	 */
+	protected $cache;
+
+	/**
+	 * @var string $identifier
+	 */
+	protected $identifier;
+
+
+
+	/**
+	 * CachingLoader constructor.
+	 *
+	 * @param LoaderInterface     $loader
+	 * @param CollectionInterface $cache
+	 * @param string              $identifier
+	 * @throws InvalidDataTypeException
+	 */
+	public function __construct(LoaderInterface $loader, CollectionInterface $cache, $identifier = '')
+	{
+		parent::__construct($loader);
+		$this->cache = $cache;
+		$this->identifier = $this->setIdentifier($identifier);
+		if ($this->identifier !== '') {
+			// to only clear this cache, and assuming an identifier has been set, simply do the following:
+			// do_action('AHEE__EventEspresso\core\services\loaders\CachingLoader__resetCache__IDENTIFIER');
+			// where "IDENTIFIER" = the string that was set during construction
+			add_action(
+				"AHEE__EventEspresso\\core\\services\\loaders\\CachingLoader__resetCache__{$identifier}",
+				array($this, 'resetCache')
+			);
+		}
+		// to clear ALL caches, simply do the following:
+		// do_action('AHEE__EventEspresso\core\services\loaders\CachingLoader__resetCache');
+		add_action(
+			'AHEE__EventEspresso\core\services\loaders\CachingLoader__resetCache',
+			array($this, 'resetCache')
+		);
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function identifier()
+	{
+		return $this->identifier;
+	}
+
+
+
+	/**
+	 * @param string $identifier
+	 * @throws InvalidDataTypeException
+	 */
+	public function setIdentifier($identifier)
+	{
+		if ( ! is_string($identifier)) {
+			throw new InvalidDataTypeException('$identifier', $identifier, 'string');
+		}
+		$this->identifier = $identifier;
+	}
+
+
+
+	/**
+	 * @param string $fqcn
+	 * @param array  $arguments
+	 * @return mixed
+	 * @throws InvalidEntityException
+	 * @throws ServiceNotFoundException
+	 */
+	public function load($fqcn, $arguments = array())
+	{
+		$fqcn = ltrim($fqcn, '\\');
+		// caching can be turned off via the following code:
+		// add_filter('FHEE__EventEspresso\core\services\loaders\CachingLoader__load__bypass_cache', '__return_true');
+		if(
+			apply_filters(
+				'FHEE__EventEspresso\core\services\loaders\CachingLoader__load__bypass_cache',
+				false,
+				$this
+			)
+		){
+			return $this->loader->load($fqcn, $arguments);
+		}
+		$identifier = md5($fqcn . serialize($arguments));
+		if($this->cache->has($identifier)){
+			return $this->cache->get($identifier);
+		}
+		$object = $this->loader->load($fqcn, $arguments);
+		$this->cache->add($object, $identifier);
+		return $object;
+	}
+
+
+
+	public function resetCache()
+	{
+		$this->cache->reset();
+	}
 
 
 }

Spacing +4 added lines, -4 removed lines

@@ -102,17 +102,17 @@
         $fqcn = ltrim($fqcn, '\\');
         // caching can be turned off via the following code:
         // add_filter('FHEE__EventEspresso\core\services\loaders\CachingLoader__load__bypass_cache', '__return_true');
-        if(
+        if (
             apply_filters(
                 'FHEE__EventEspresso\core\services\loaders\CachingLoader__load__bypass_cache',
                 false,
                 $this
             )
-        ){
+        ) {
             return $this->loader->load($fqcn, $arguments);
         }
-        $identifier = md5($fqcn . serialize($arguments));
-        if($this->cache->has($identifier)){
+        $identifier = md5($fqcn.serialize($arguments));
+        if ($this->cache->has($identifier)) {
             return $this->cache->get($identifier);
         }
         $object = $this->loader->load($fqcn, $arguments);

core/services/loaders/Loader.php

Indentation +73 added lines, -73 removed lines

@@ -24,79 +24,79 @@
 {
 
 
-    /**
-     * @var LoaderInterface $new_loader
-     */
-    private $new_loader;
-
-
-    /**
-     * @var LoaderInterface $shared_loader
-     */
-    private $shared_loader;
-
-
-
-    /**
-     * Loader constructor.
-     *
-     * @param LoaderInterface|null $new_loader
-     * @param LoaderInterface|null $shared_loader
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     */
-    public function __construct(LoaderInterface $new_loader = null, LoaderInterface $shared_loader = null)
-    {
-        // if not already generated, create a standard loader
-        if (! $new_loader instanceof LoaderInterface) {
-            $new_loader = new CoreLoader(EE_Registry::instance());
-        }
-        $this->new_loader = $new_loader;
-        // if not already generated, create a caching loader
-        if (! $shared_loader instanceof LoaderInterface) {
-            $shared_loader = new CachingLoader(
-                new CoreLoader(EE_Registry::instance()),
-                new LooseCollection('')
-            );
-        }
-        $this->shared_loader = $shared_loader;
-    }
-
-
-
-    /**
-     * @return LoaderInterface
-     */
-    public function getNewLoader()
-    {
-        return $this->new_loader;
-    }
-
-
-
-    /**
-     * @return LoaderInterface
-     */
-    public function getSharedLoader()
-    {
-        return $this->shared_loader;
-    }
-
-
-
-    /**
-     * @param string $fqcn
-     * @param array  $arguments
-     * @param bool   $shared
-     * @return mixed
-     */
-    public function load($fqcn, $arguments = array(), $shared = true)
-    {
-        return $shared
-            ? $this->getSharedLoader()->load($fqcn, $arguments)
-            : $this->getNewLoader()->load($fqcn, $arguments);
-    }
+	/**
+	 * @var LoaderInterface $new_loader
+	 */
+	private $new_loader;
+
+
+	/**
+	 * @var LoaderInterface $shared_loader
+	 */
+	private $shared_loader;
+
+
+
+	/**
+	 * Loader constructor.
+	 *
+	 * @param LoaderInterface|null $new_loader
+	 * @param LoaderInterface|null $shared_loader
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 */
+	public function __construct(LoaderInterface $new_loader = null, LoaderInterface $shared_loader = null)
+	{
+		// if not already generated, create a standard loader
+		if (! $new_loader instanceof LoaderInterface) {
+			$new_loader = new CoreLoader(EE_Registry::instance());
+		}
+		$this->new_loader = $new_loader;
+		// if not already generated, create a caching loader
+		if (! $shared_loader instanceof LoaderInterface) {
+			$shared_loader = new CachingLoader(
+				new CoreLoader(EE_Registry::instance()),
+				new LooseCollection('')
+			);
+		}
+		$this->shared_loader = $shared_loader;
+	}
+
+
+
+	/**
+	 * @return LoaderInterface
+	 */
+	public function getNewLoader()
+	{
+		return $this->new_loader;
+	}
+
+
+
+	/**
+	 * @return LoaderInterface
+	 */
+	public function getSharedLoader()
+	{
+		return $this->shared_loader;
+	}
+
+
+
+	/**
+	 * @param string $fqcn
+	 * @param array  $arguments
+	 * @param bool   $shared
+	 * @return mixed
+	 */
+	public function load($fqcn, $arguments = array(), $shared = true)
+	{
+		return $shared
+			? $this->getSharedLoader()->load($fqcn, $arguments)
+			: $this->getNewLoader()->load($fqcn, $arguments);
+	}
 
 }
 // End of file Loader.php

Spacing +2 added lines, -2 removed lines

@@ -49,12 +49,12 @@
     public function __construct(LoaderInterface $new_loader = null, LoaderInterface $shared_loader = null)
     {
         // if not already generated, create a standard loader
-        if (! $new_loader instanceof LoaderInterface) {
+        if ( ! $new_loader instanceof LoaderInterface) {
             $new_loader = new CoreLoader(EE_Registry::instance());
         }
         $this->new_loader = $new_loader;
         // if not already generated, create a caching loader
-        if (! $shared_loader instanceof LoaderInterface) {
+        if ( ! $shared_loader instanceof LoaderInterface) {
             $shared_loader = new CachingLoader(
                 new CoreLoader(EE_Registry::instance()),
                 new LooseCollection('')

core/services/loaders/CoreLoader.php

Indentation +34 added lines, -34 removed lines

@@ -23,46 +23,46 @@
 class CoreLoader implements LoaderInterface
 {
 
-    /**
-     * @var EE_Registry|CoffeeShop $generator
-     */
-    private $generator;
+	/**
+	 * @var EE_Registry|CoffeeShop $generator
+	 */
+	private $generator;
 
 
 
-    /**
-     * CoreLoader constructor.
-     *
-     * @param EE_Registry|CoffeeShop $generator
-     * @throws InvalidArgumentException
-     */
-    public function __construct($generator)
-    {
-        if(!($generator instanceof EE_Registry || $generator instanceof CoffeeShop)) {
-            throw new InvalidArgumentException(
-                esc_html__(
-                    'The CoreLoader class must receive an instance of EE_Registry or the CoffeeShop DI container.',
-                    'event_espresso'
-                )
-            );
-        }
-        $this->generator = $generator;
-    }
+	/**
+	 * CoreLoader constructor.
+	 *
+	 * @param EE_Registry|CoffeeShop $generator
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct($generator)
+	{
+		if(!($generator instanceof EE_Registry || $generator instanceof CoffeeShop)) {
+			throw new InvalidArgumentException(
+				esc_html__(
+					'The CoreLoader class must receive an instance of EE_Registry or the CoffeeShop DI container.',
+					'event_espresso'
+				)
+			);
+		}
+		$this->generator = $generator;
+	}
 
 
 
-    /**
-     * @param string $fqcn
-     * @param array  $arguments
-     * @return mixed
-     * @throws ServiceNotFoundException
-     */
-    public function load($fqcn, $arguments = array())
-    {
-        return $this->generator instanceof EE_Registry
-            ? $this->generator->create($fqcn, $arguments)
-            : $this->generator->brew($fqcn, $arguments);
-    }
+	/**
+	 * @param string $fqcn
+	 * @param array  $arguments
+	 * @return mixed
+	 * @throws ServiceNotFoundException
+	 */
+	public function load($fqcn, $arguments = array())
+	{
+		return $this->generator instanceof EE_Registry
+			? $this->generator->create($fqcn, $arguments)
+			: $this->generator->brew($fqcn, $arguments);
+	}
 
 }
 // End of file CoreLoader.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
      */
     public function __construct($generator)
     {
-        if(!($generator instanceof EE_Registry || $generator instanceof CoffeeShop)) {
+        if ( ! ($generator instanceof EE_Registry || $generator instanceof CoffeeShop)) {
             throw new InvalidArgumentException(
                 esc_html__(
                     'The CoreLoader class must receive an instance of EE_Registry or the CoffeeShop DI container.',

core/services/loaders/LoaderDecorator.php

Indentation +16 added lines, -16 removed lines

@@ -19,22 +19,22 @@
 {
 
 
-    /**
-     * @var LoaderInterface $loader
-     */
-    protected $loader;
-
-
-
-    /**
-     * LoaderDecorator constructor.
-     *
-     * @param LoaderInterface $loader
-     */
-    public function __construct(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	protected $loader;
+
+
+
+	/**
+	 * LoaderDecorator constructor.
+	 *
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+	}
 
 
 

core/services/loaders/LoaderInterface.php

Indentation +6 added lines, -6 removed lines

@@ -9,12 +9,12 @@
 interface LoaderInterface
 {
 
-    /**
-     * @param string $fqcn
-     * @param array  $arguments
-     * @return mixed
-     */
-    public function load($fqcn, $arguments = array());
+	/**
+	 * @param string $fqcn
+	 * @param array  $arguments
+	 * @return mixed
+	 */
+	public function load($fqcn, $arguments = array());
 
 }
 // End of file LoaderInterface.php

core/services/collections/CollectionInterface.php

Indentation +10 added lines, -10 removed lines

@@ -113,12 +113,12 @@ 
 	public function previous();
 
 		/**
-	 * Returns the index of a given object, or false if not found
-	 *
-	 * @see http://stackoverflow.com/a/8736013
-	 * @param $object
-	 * @return boolean|int|string
-	 */
+		 * Returns the index of a given object, or false if not found
+		 *
+		 * @see http://stackoverflow.com/a/8736013
+		 * @param $object
+		 * @return boolean|int|string
+		 */
 	public function indexOf( $object );
 
 
@@ -160,10 +160,10 @@ 
 
 
 
-    /**
-     * Removes ALL objects from the Collection
-     */
-    public function reset();
+	/**
+	 * Removes ALL objects from the Collection
+	 */
+	public function reset();
 
 }
 // End of file CollectionInterface.php

Spacing +15 added lines, -15 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\collections;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -27,7 +27,7 @@ 
 	 * @param  mixed $identifier
 	 * @return bool
 	 */
-	public function add( $object, $identifier = null );
+	public function add($object, $identifier = null);
 
 	/**
 	 * setIdentifier
@@ -39,7 +39,7 @@ 
 	 * @param  mixed $identifier
 	 * @return bool
 	 */
-	public function setIdentifier( $object, $identifier = null );
+	public function setIdentifier($object, $identifier = null);
 
 	/**
 	 * get
@@ -50,7 +50,7 @@ 
 	 * @param mixed $identifier
 	 * @return mixed
 	 */
-	public function get( $identifier );
+	public function get($identifier);
 
 	/**
 	 * has
@@ -62,7 +62,7 @@ 
 	 * @param  mixed $identifier
 	 * @return bool
 	 */
-	public function has( $identifier );
+	public function has($identifier);
 
 	/**
 	 * hasObject
@@ -72,7 +72,7 @@ 
 	 * @param $object
 	 * @return bool
 	 */
-	public function hasObject( $object );
+	public function hasObject($object);
 
 	/**
 	 * remove
@@ -82,7 +82,7 @@ 
 	 * @param $object
 	 * @return bool
 	 */
-	public function remove( $object );
+	public function remove($object);
 
 	/**
 	 * setCurrent
@@ -92,7 +92,7 @@ 
 	 * @param mixed $identifier
 	 * @return boolean
 	 */
-	public function setCurrent( $identifier ) ;
+	public function setCurrent($identifier);
 
 	/**
 	 * setCurrentUsingObject
@@ -102,7 +102,7 @@ 
 	 * @param $object
 	 * @return boolean
 	 */
-	public function setCurrentUsingObject( $object );
+	public function setCurrentUsingObject($object);
 
 	/**
 	 * Returns the object occupying the index before the current object,
@@ -119,7 +119,7 @@ 
 	 * @param $object
 	 * @return boolean|int|string
 	 */
-	public function indexOf( $object );
+	public function indexOf($object);
 
 
 	/**
@@ -129,7 +129,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
@@ -139,7 +139,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
@@ -148,7 +148,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
@@ -156,7 +156,7 @@ 
 	 * @see http://stackoverflow.com/a/8736013
 	 * @param integer $index
 	 */
-	public function removeAt( $index ) ;
+	public function removeAt($index);
 
 
 

core/services/collections/Collection.php

Indentation +12 added lines, -13 removed lines

@@ -83,7 +83,6 @@ 
 
 	 /**
 	  * setIdentifier
-
 	  * Sets the data associated with an object in the Collection
 	  * if no $identifier is supplied, then the spl_object_hash() is used
 	  *
@@ -352,18 +351,18 @@ 
 
 
 
-     /**
-      * Removes ALL objects from the Collection
-      */
-     public function reset()
-     {
-         $this->rewind();
-         while ($this->valid()) {
-             $object = $this->current();
-             $this->next();
-             $this->detach($object);
-         }
-     }
+	 /**
+	  * Removes ALL objects from the Collection
+	  */
+	 public function reset()
+	 {
+		 $this->rewind();
+		 while ($this->valid()) {
+			 $object = $this->current();
+			 $this->next();
+			 $this->detach($object);
+		 }
+	 }