eventespresso / event-espresso-core

core/services/container/RegistryContainer.php

Indentation +161 added lines, -161 removed lines

@@ -17,165 +17,165 @@
 class RegistryContainer implements ArrayAccess, CountableTraversableAggregate
 {
 
-    /**
-     * @var array $container
-     */
-    private $container = [];
-
-    /**
-     * RegistryContainer constructor.
-     * Container data can be seeded by passing parameters to constructor.
-     * Each parameter will become its own element in the container
-     */
-    public function __construct()
-    {
-    }
-
-
-    /**
-     * @param mixed $offset
-     * @param mixed $value
-     */
-    public function offsetSet($offset, $value)
-    {
-        $this->container[ $offset ] = $value;
-    }
-
-
-    /**
-     * @param mixed $offset
-     * @return bool
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[ $offset ]);
-    }
-
-
-    /**
-     * @param mixed $offset
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[ $offset ]);
-    }
-
-
-    /**
-     * @param mixed $offset
-     * @return mixed|null
-     */
-    public function offsetGet($offset)
-    {
-        return $this->offsetExists($offset) ? $this->container[ $offset ] : null;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->container);
-    }
-
-
-    /**
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->container);
-    }
-
-
-    /**
-     * @param $offset
-     * @param $value
-     */
-    public function __set($offset, $value)
-    {
-        $this->offsetSet($offset, $value);
-    }
-
-
-    /**
-     * @param $offset
-     * @return mixed
-     * @throws OutOfBoundsException
-     */
-    public function __get($offset)
-    {
-        if (! array_key_exists($offset, $this->container)) {
-            $trace = debug_backtrace();
-            throw new OutOfBoundsException(
-                sprintf(
-                    esc_html__('Invalid offset: %1$s %2$sCalled from %3$s on line %4$d', 'event_espresso'),
-                    $offset,
-                    '<br  />',
-                    $trace[0]['file'],
-                    $trace[0]['line']
-                )
-            );
-        }
-        return $this->offsetGet($offset);
-    }
-
-
-    /**
-     * @param $offset
-     * @return bool
-     */
-    public function __isset($offset)
-    {
-        return $this->offsetExists($offset);
-    }
-
-
-    /**
-     * @param $offset
-     */
-    public function __unset($offset)
-    {
-        $this->offsetUnset($offset);
-    }
-
-
-    /**
-     * @param $offset
-     * @param $value
-     */
-    public function add($offset, $value)
-    {
-        $this->offsetSet($offset, $value);
-    }
-
-
-    /**
-     * @param $offset
-     */
-    public function remove($offset)
-    {
-        $this->offsetUnset($offset);
-    }
-
-
-    /**
-     * @param $offset
-     * @return bool
-     */
-    public function has($offset)
-    {
-        return $this->offsetExists($offset);
-    }
-
-
-    /**
-     * @param $offset
-     * @return mixed|null
-     */
-    public function get($offset)
-    {
-        return $this->offsetGet($offset);
-    }
+	/**
+	 * @var array $container
+	 */
+	private $container = [];
+
+	/**
+	 * RegistryContainer constructor.
+	 * Container data can be seeded by passing parameters to constructor.
+	 * Each parameter will become its own element in the container
+	 */
+	public function __construct()
+	{
+	}
+
+
+	/**
+	 * @param mixed $offset
+	 * @param mixed $value
+	 */
+	public function offsetSet($offset, $value)
+	{
+		$this->container[ $offset ] = $value;
+	}
+
+
+	/**
+	 * @param mixed $offset
+	 * @return bool
+	 */
+	public function offsetExists($offset)
+	{
+		return isset($this->container[ $offset ]);
+	}
+
+
+	/**
+	 * @param mixed $offset
+	 */
+	public function offsetUnset($offset)
+	{
+		unset($this->container[ $offset ]);
+	}
+
+
+	/**
+	 * @param mixed $offset
+	 * @return mixed|null
+	 */
+	public function offsetGet($offset)
+	{
+		return $this->offsetExists($offset) ? $this->container[ $offset ] : null;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function count()
+	{
+		return count($this->container);
+	}
+
+
+	/**
+	 * @return ArrayIterator
+	 */
+	public function getIterator()
+	{
+		return new ArrayIterator($this->container);
+	}
+
+
+	/**
+	 * @param $offset
+	 * @param $value
+	 */
+	public function __set($offset, $value)
+	{
+		$this->offsetSet($offset, $value);
+	}
+
+
+	/**
+	 * @param $offset
+	 * @return mixed
+	 * @throws OutOfBoundsException
+	 */
+	public function __get($offset)
+	{
+		if (! array_key_exists($offset, $this->container)) {
+			$trace = debug_backtrace();
+			throw new OutOfBoundsException(
+				sprintf(
+					esc_html__('Invalid offset: %1$s %2$sCalled from %3$s on line %4$d', 'event_espresso'),
+					$offset,
+					'<br  />',
+					$trace[0]['file'],
+					$trace[0]['line']
+				)
+			);
+		}
+		return $this->offsetGet($offset);
+	}
+
+
+	/**
+	 * @param $offset
+	 * @return bool
+	 */
+	public function __isset($offset)
+	{
+		return $this->offsetExists($offset);
+	}
+
+
+	/**
+	 * @param $offset
+	 */
+	public function __unset($offset)
+	{
+		$this->offsetUnset($offset);
+	}
+
+
+	/**
+	 * @param $offset
+	 * @param $value
+	 */
+	public function add($offset, $value)
+	{
+		$this->offsetSet($offset, $value);
+	}
+
+
+	/**
+	 * @param $offset
+	 */
+	public function remove($offset)
+	{
+		$this->offsetUnset($offset);
+	}
+
+
+	/**
+	 * @param $offset
+	 * @return bool
+	 */
+	public function has($offset)
+	{
+		return $this->offsetExists($offset);
+	}
+
+
+	/**
+	 * @param $offset
+	 * @return mixed|null
+	 */
+	public function get($offset)
+	{
+		return $this->offsetGet($offset);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -38,7 +38,7 @@ 
      */
     public function offsetSet($offset, $value)
     {
-        $this->container[ $offset ] = $value;
+        $this->container[$offset] = $value;
     }
 
 
@@ -48,7 +48,7 @@ 
      */
     public function offsetExists($offset)
     {
-        return isset($this->container[ $offset ]);
+        return isset($this->container[$offset]);
     }
 
 
@@ -57,7 +57,7 @@ 
      */
     public function offsetUnset($offset)
     {
-        unset($this->container[ $offset ]);
+        unset($this->container[$offset]);
     }
 
 
@@ -67,7 +67,7 @@ 
      */
     public function offsetGet($offset)
     {
-        return $this->offsetExists($offset) ? $this->container[ $offset ] : null;
+        return $this->offsetExists($offset) ? $this->container[$offset] : null;
     }
 
 
@@ -106,7 +106,7 @@ 
      */
     public function __get($offset)
     {
-        if (! array_key_exists($offset, $this->container)) {
+        if ( ! array_key_exists($offset, $this->container)) {
             $trace = debug_backtrace();
             throw new OutOfBoundsException(
                 sprintf(

core/services/loaders/Loader.php

Indentation +123 added lines, -123 removed lines

@@ -15,127 +15,127 @@
 class Loader implements LoaderInterface
 {
 
-    /**
-     * @var LoaderDecoratorInterface $new_loader
-     */
-    private $new_loader;
-
-    /**
-     * @var LoaderDecoratorInterface $shared_loader
-     */
-    private $shared_loader;
-
-    /**
-     * @var ClassInterfaceCache $class_cache
-     */
-    private $class_cache;
-
-    /**
-     * Loader constructor.
-     *
-     * @param LoaderDecoratorInterface        $new_loader
-     * @param CachingLoaderDecoratorInterface $shared_loader
-     * @param ClassInterfaceCache             $class_cache
-     */
-    public function __construct(
-        LoaderDecoratorInterface $new_loader,
-        CachingLoaderDecoratorInterface $shared_loader,
-        ClassInterfaceCache $class_cache
-    ) {
-        $this->new_loader    = $new_loader;
-        $this->shared_loader = $shared_loader;
-        $this->class_cache   = $class_cache;
-    }
-
-
-    /**
-     * @return LoaderDecoratorInterface
-     */
-    public function getNewLoader()
-    {
-        return $this->new_loader;
-    }
-
-
-    /**
-     * @return CachingLoaderDecoratorInterface
-     */
-    public function getSharedLoader()
-    {
-        return $this->shared_loader;
-    }
-
-
-    /**
-     * @param FullyQualifiedName|string $fqcn
-     * @param array                     $arguments
-     * @param bool                      $shared
-     * @return mixed
-     */
-    public function load($fqcn, array $arguments = array(), $shared = true)
-    {
-        $fqcn = $this->class_cache->getFqn($fqcn);
-        if ($this->class_cache->hasInterface($fqcn, 'EventEspresso\core\interfaces\ReservedInstanceInterface')) {
-            $shared = true;
-        }
-        return $shared
-            ? $this->getSharedLoader()->load($fqcn, $arguments, $shared)
-            : $this->getNewLoader()->load($fqcn, $arguments, $shared);
-    }
-
-
-    /**
-     * @param FullyQualifiedName|string $fqcn
-     * @param array                     $arguments
-     * @return mixed
-     */
-    public function getNew($fqcn, array $arguments = array())
-    {
-        return $this->load($fqcn, $arguments, false);
-    }
-
-
-    /**
-     * @param FullyQualifiedName|string $fqcn
-     * @param array                     $arguments
-     * @return mixed
-     */
-    public function getShared($fqcn, array $arguments = array())
-    {
-        return $this->load($fqcn, $arguments);
-    }
-
-
-    /**
-     * @param FullyQualifiedName|string $fqcn
-     * @param mixed                     $object
-     * @return bool
-     * @throws InvalidArgumentException
-     */
-    public function share($fqcn, $object)
-    {
-        $fqcn = $this->class_cache->getFqn($fqcn);
-        return $this->getSharedLoader()->share($fqcn, $object);
-    }
-
-
-    /**
-     * @param FullyQualifiedName|string $fqcn
-     * @return bool
-     * @throws InvalidArgumentException
-     */
-    public function remove($fqcn, array $arguments = [])
-    {
-        $fqcn = $this->class_cache->getFqn($fqcn);
-        return $this->getSharedLoader()->remove($fqcn, $arguments);
-    }
-
-
-    /**
-     * calls reset() on loaders if that method exists
-     */
-    public function reset()
-    {
-        $this->shared_loader->reset();
-    }
+	/**
+	 * @var LoaderDecoratorInterface $new_loader
+	 */
+	private $new_loader;
+
+	/**
+	 * @var LoaderDecoratorInterface $shared_loader
+	 */
+	private $shared_loader;
+
+	/**
+	 * @var ClassInterfaceCache $class_cache
+	 */
+	private $class_cache;
+
+	/**
+	 * Loader constructor.
+	 *
+	 * @param LoaderDecoratorInterface        $new_loader
+	 * @param CachingLoaderDecoratorInterface $shared_loader
+	 * @param ClassInterfaceCache             $class_cache
+	 */
+	public function __construct(
+		LoaderDecoratorInterface $new_loader,
+		CachingLoaderDecoratorInterface $shared_loader,
+		ClassInterfaceCache $class_cache
+	) {
+		$this->new_loader    = $new_loader;
+		$this->shared_loader = $shared_loader;
+		$this->class_cache   = $class_cache;
+	}
+
+
+	/**
+	 * @return LoaderDecoratorInterface
+	 */
+	public function getNewLoader()
+	{
+		return $this->new_loader;
+	}
+
+
+	/**
+	 * @return CachingLoaderDecoratorInterface
+	 */
+	public function getSharedLoader()
+	{
+		return $this->shared_loader;
+	}
+
+
+	/**
+	 * @param FullyQualifiedName|string $fqcn
+	 * @param array                     $arguments
+	 * @param bool                      $shared
+	 * @return mixed
+	 */
+	public function load($fqcn, array $arguments = array(), $shared = true)
+	{
+		$fqcn = $this->class_cache->getFqn($fqcn);
+		if ($this->class_cache->hasInterface($fqcn, 'EventEspresso\core\interfaces\ReservedInstanceInterface')) {
+			$shared = true;
+		}
+		return $shared
+			? $this->getSharedLoader()->load($fqcn, $arguments, $shared)
+			: $this->getNewLoader()->load($fqcn, $arguments, $shared);
+	}
+
+
+	/**
+	 * @param FullyQualifiedName|string $fqcn
+	 * @param array                     $arguments
+	 * @return mixed
+	 */
+	public function getNew($fqcn, array $arguments = array())
+	{
+		return $this->load($fqcn, $arguments, false);
+	}
+
+
+	/**
+	 * @param FullyQualifiedName|string $fqcn
+	 * @param array                     $arguments
+	 * @return mixed
+	 */
+	public function getShared($fqcn, array $arguments = array())
+	{
+		return $this->load($fqcn, $arguments);
+	}
+
+
+	/**
+	 * @param FullyQualifiedName|string $fqcn
+	 * @param mixed                     $object
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 */
+	public function share($fqcn, $object)
+	{
+		$fqcn = $this->class_cache->getFqn($fqcn);
+		return $this->getSharedLoader()->share($fqcn, $object);
+	}
+
+
+	/**
+	 * @param FullyQualifiedName|string $fqcn
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 */
+	public function remove($fqcn, array $arguments = [])
+	{
+		$fqcn = $this->class_cache->getFqn($fqcn);
+		return $this->getSharedLoader()->remove($fqcn, $arguments);
+	}
+
+
+	/**
+	 * calls reset() on loaders if that method exists
+	 */
+	public function reset()
+	{
+		$this->shared_loader->reset();
+	}
 }

core/services/loaders/CachingLoaderDecoratorInterface.php

Indentation +14 added lines, -14 removed lines

@@ -11,20 +11,20 @@
 interface CachingLoaderDecoratorInterface extends LoaderDecoratorInterface
 {
 
-    /**
-     * @param string $fqcn
-     * @param mixed  $object
-     * @return bool
-     * @throws InvalidArgumentException
-     */
-    public function share($fqcn, $object);
+	/**
+	 * @param string $fqcn
+	 * @param mixed  $object
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 */
+	public function share($fqcn, $object);
 
 
-    /**
-     * @param string $fqcn
-     * @param array  $arguments
-     * @return bool
-     * @throws InvalidArgumentException
-     */
-    public function remove($fqcn, array $arguments = []);
+	/**
+	 * @param string $fqcn
+	 * @param array  $arguments
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 */
+	public function remove($fqcn, array $arguments = []);
 }

core/services/loaders/LoaderInterface.php

Indentation +43 added lines, -43 removed lines

@@ -8,57 +8,57 @@
 interface LoaderInterface
 {
 
-    /**
-     * Can be for instantiating a new instance of a class,
-     * or for getting a shared instance of a class (default)
-     *
-     * @param FullyQualifiedName|string $fqcn
-     * @param array                     $arguments
-     * @param bool                      $shared
-     * @return mixed
-     */
-    public function load($fqcn, array $arguments = array(), $shared = true);
+	/**
+	 * Can be for instantiating a new instance of a class,
+	 * or for getting a shared instance of a class (default)
+	 *
+	 * @param FullyQualifiedName|string $fqcn
+	 * @param array                     $arguments
+	 * @param bool                      $shared
+	 * @return mixed
+	 */
+	public function load($fqcn, array $arguments = array(), $shared = true);
 
 
-    /**
-     * Used for instantiating a new instance of a class
-     *
-     * @param FullyQualifiedName|string $fqcn
-     * @param array                     $arguments
-     * @return mixed
-     */
-    public function getNew($fqcn, array $arguments = array());
+	/**
+	 * Used for instantiating a new instance of a class
+	 *
+	 * @param FullyQualifiedName|string $fqcn
+	 * @param array                     $arguments
+	 * @return mixed
+	 */
+	public function getNew($fqcn, array $arguments = array());
 
 
-    /**
-     * Used for getting a shared instance of a class
-     *
-     * @param FullyQualifiedName|string $fqcn
-     * @param array                     $arguments
-     * @return mixed
-     */
-    public function getShared($fqcn, array $arguments = array());
+	/**
+	 * Used for getting a shared instance of a class
+	 *
+	 * @param FullyQualifiedName|string $fqcn
+	 * @param array                     $arguments
+	 * @return mixed
+	 */
+	public function getShared($fqcn, array $arguments = array());
 
 
-    /**
-     * @param FullyQualifiedName|string $fqcn
-     * @param mixed                     $object
-     * @return bool
-     * @throws InvalidArgumentException
-     */
-    public function share($fqcn, $object);
+	/**
+	 * @param FullyQualifiedName|string $fqcn
+	 * @param mixed                     $object
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 */
+	public function share($fqcn, $object);
 
 
-    /**
-     * @param FullyQualifiedName|string $fqcn
-     * @return bool
-     * @throws InvalidArgumentException
-     */
-    public function remove($fqcn);
+	/**
+	 * @param FullyQualifiedName|string $fqcn
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 */
+	public function remove($fqcn);
 
 
-    /**
-     * calls reset() on loader if method exists
-     */
-    public function reset();
+	/**
+	 * calls reset() on loader if method exists
+	 */
+	public function reset();
 }

core/services/request/files/FilesDataHandler.php

Indentation +251 added lines, -251 removed lines

@@ -40,279 +40,279 @@
  */
 class FilesDataHandler
 {
-    /**
-     * @var Request
-     */
-    protected $request;
+	/**
+	 * @var Request
+	 */
+	protected $request;
 
-    /**
-     * @var CollectionInterface | FileSubmissionInterface[]
-     */
-    protected $file_objects;
+	/**
+	 * @var CollectionInterface | FileSubmissionInterface[]
+	 */
+	protected $file_objects;
 
-    /**
-     * @var bool
-     */
-    protected $initialized = false;
+	/**
+	 * @var bool
+	 */
+	protected $initialized = false;
 
 
-    /**
-     * FilesDataHandler constructor.
-     *
-     * @param Request $request
-     */
-    public function __construct(Request $request)
-    {
-        $this->request = $request;
-    }
+	/**
+	 * FilesDataHandler constructor.
+	 *
+	 * @param Request $request
+	 */
+	public function __construct(Request $request)
+	{
+		$this->request = $request;
+	}
 
 
-    /**
-     * @return CollectionInterface | FileSubmissionInterface[]
-     * @throws UnexpectedValueException
-     * @throws InvalidArgumentException
-     * @since 4.9.80.p
-     */
-    protected function getFileObjects()
-    {
-        $this->initialize();
-        return $this->file_objects;
-    }
+	/**
+	 * @return CollectionInterface | FileSubmissionInterface[]
+	 * @throws UnexpectedValueException
+	 * @throws InvalidArgumentException
+	 * @since 4.9.80.p
+	 */
+	protected function getFileObjects()
+	{
+		$this->initialize();
+		return $this->file_objects;
+	}
 
 
-    /**
-     * Sets up the file objects from the request's $_FILES data.
-     *
-     * @throws UnexpectedValueException
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @since 4.9.80.p
-     */
-    protected function initialize()
-    {
-        if ($this->initialized) {
-            return;
-        }
-        $this->file_objects = new Collection(
-        // collection interface
-            'EventEspresso\core\services\request\files\FileSubmissionInterface',
-            // collection name
-            'submitted_files'
-        );
-        $files_raw_data     = $this->request->filesParams();
-        if (empty($files_raw_data)) {
-            return;
-        }
-        if ($this->isStrangeFilesArray($files_raw_data)) {
-            $data = $this->fixFilesDataArray($files_raw_data);
-        } else {
-            $data = $files_raw_data;
-        }
-        $this->createFileObjects($data);
-        $this->initialized = true;
-    }
+	/**
+	 * Sets up the file objects from the request's $_FILES data.
+	 *
+	 * @throws UnexpectedValueException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @since 4.9.80.p
+	 */
+	protected function initialize()
+	{
+		if ($this->initialized) {
+			return;
+		}
+		$this->file_objects = new Collection(
+		// collection interface
+			'EventEspresso\core\services\request\files\FileSubmissionInterface',
+			// collection name
+			'submitted_files'
+		);
+		$files_raw_data     = $this->request->filesParams();
+		if (empty($files_raw_data)) {
+			return;
+		}
+		if ($this->isStrangeFilesArray($files_raw_data)) {
+			$data = $this->fixFilesDataArray($files_raw_data);
+		} else {
+			$data = $files_raw_data;
+		}
+		$this->createFileObjects($data);
+		$this->initialized = true;
+	}
 
 
-    /**
-     * Detects if $_FILES is a weird multi-dimensional array that needs fixing or not.
-     *
-     * @param $files_data
-     * @return bool
-     * @throws UnexpectedValueException
-     * @since 4.9.80.p
-     */
-    protected function isStrangeFilesArray($files_data)
-    {
-        if (! is_array($files_data)) {
-            throw new UnexpectedValueException(
-                sprintf(
-                    esc_html__(
-                        'Unexpected PHP $_FILES data format. "%1$s" was expected to be an array.',
-                        'event_espresso'
-                    ),
-                    (string) $files_data
-                )
-            );
-        }
-        $first_value = reset($files_data);
-        if (! is_array($first_value)) {
-            throw new UnexpectedValueException(
-                sprintf(
-                    esc_html__(
-                        'Unexpected PHP $_FILES data format. "%1$s" was expected to be an array.',
-                        'event_espresso'
-                    ),
-                    (string) $first_value
-                )
-            );
-        }
-        $first_sub_array_item = reset($first_value);
-        if (is_array($first_sub_array_item)) {
-            // not just a 2d array
-            return true;
-        }
-        // yep, just 2d array
-        return false;
-    }
+	/**
+	 * Detects if $_FILES is a weird multi-dimensional array that needs fixing or not.
+	 *
+	 * @param $files_data
+	 * @return bool
+	 * @throws UnexpectedValueException
+	 * @since 4.9.80.p
+	 */
+	protected function isStrangeFilesArray($files_data)
+	{
+		if (! is_array($files_data)) {
+			throw new UnexpectedValueException(
+				sprintf(
+					esc_html__(
+						'Unexpected PHP $_FILES data format. "%1$s" was expected to be an array.',
+						'event_espresso'
+					),
+					(string) $files_data
+				)
+			);
+		}
+		$first_value = reset($files_data);
+		if (! is_array($first_value)) {
+			throw new UnexpectedValueException(
+				sprintf(
+					esc_html__(
+						'Unexpected PHP $_FILES data format. "%1$s" was expected to be an array.',
+						'event_espresso'
+					),
+					(string) $first_value
+				)
+			);
+		}
+		$first_sub_array_item = reset($first_value);
+		if (is_array($first_sub_array_item)) {
+			// not just a 2d array
+			return true;
+		}
+		// yep, just 2d array
+		return false;
+	}
 
 
-    /**
-     * Takes into account that $_FILES does a weird thing when you have hierarchical form names (eg `<input type="file"
-     * name="my[hierarchical][form]">`): it leaves the top-level form part alone, but replaces the SECOND part with
-     * "name", "size", "tmp_name", etc. So that file's data is located at "my[name][hierarchical][form]",
-     * "my[size][hierarchical][form]", "my[tmp_name][hierarchical][form]", etc. It's really weird.
-     *
-     * @param $files_data
-     * @return array
-     * @since 4.9.80.p
-     */
-    protected function fixFilesDataArray($files_data)
-    {
-        $sane_files_array = [];
-        foreach ($files_data as $top_level_name => $top_level_children) {
-            $sub_array                           = [];
-            $sane_files_array[ $top_level_name ] = [];
-            foreach ($top_level_children as $file_data_part => $second_level_children) {
-                foreach ($second_level_children as $next_level_name => $sub_values) {
-                    $sub_array[ $next_level_name ] = $this->organizeFilesData($sub_values, $file_data_part);
-                }
-                $sane_files_array[ $top_level_name ] = array_replace_recursive(
-                    $sub_array,
-                    $sane_files_array[ $top_level_name ]
-                );
-            }
-        }
-        return $sane_files_array;
-    }
+	/**
+	 * Takes into account that $_FILES does a weird thing when you have hierarchical form names (eg `<input type="file"
+	 * name="my[hierarchical][form]">`): it leaves the top-level form part alone, but replaces the SECOND part with
+	 * "name", "size", "tmp_name", etc. So that file's data is located at "my[name][hierarchical][form]",
+	 * "my[size][hierarchical][form]", "my[tmp_name][hierarchical][form]", etc. It's really weird.
+	 *
+	 * @param $files_data
+	 * @return array
+	 * @since 4.9.80.p
+	 */
+	protected function fixFilesDataArray($files_data)
+	{
+		$sane_files_array = [];
+		foreach ($files_data as $top_level_name => $top_level_children) {
+			$sub_array                           = [];
+			$sane_files_array[ $top_level_name ] = [];
+			foreach ($top_level_children as $file_data_part => $second_level_children) {
+				foreach ($second_level_children as $next_level_name => $sub_values) {
+					$sub_array[ $next_level_name ] = $this->organizeFilesData($sub_values, $file_data_part);
+				}
+				$sane_files_array[ $top_level_name ] = array_replace_recursive(
+					$sub_array,
+					$sane_files_array[ $top_level_name ]
+				);
+			}
+		}
+		return $sane_files_array;
+	}
 
 
-    /**
-     * Recursively explores the array until it finds a leaf node, and tacks `$type` as a final index in front of it.
-     *
-     * @param $data array|string
-     * @param $type 'name', 'tmp_name', 'size', or 'error'
-     * @return array
-     * @since 4.9.80.p
-     */
-    protected function organizeFilesData($data, $type)
-    {
-        if (! is_array($data)) {
-            return [
-                $type => $data,
-            ];
-        }
-        $organized_data = [];
-        foreach ($data as $input_name_part => $sub_inputs_or_value) {
-            if (is_array($sub_inputs_or_value)) {
-                $organized_data[ $input_name_part ] = $this->organizeFilesData($sub_inputs_or_value, $type);
-            } else {
-                $organized_data[ $input_name_part ][ $type ] = $sub_inputs_or_value;
-            }
-        }
-        return $organized_data;
-    }
+	/**
+	 * Recursively explores the array until it finds a leaf node, and tacks `$type` as a final index in front of it.
+	 *
+	 * @param $data array|string
+	 * @param $type 'name', 'tmp_name', 'size', or 'error'
+	 * @return array
+	 * @since 4.9.80.p
+	 */
+	protected function organizeFilesData($data, $type)
+	{
+		if (! is_array($data)) {
+			return [
+				$type => $data,
+			];
+		}
+		$organized_data = [];
+		foreach ($data as $input_name_part => $sub_inputs_or_value) {
+			if (is_array($sub_inputs_or_value)) {
+				$organized_data[ $input_name_part ] = $this->organizeFilesData($sub_inputs_or_value, $type);
+			} else {
+				$organized_data[ $input_name_part ][ $type ] = $sub_inputs_or_value;
+			}
+		}
+		return $organized_data;
+	}
 
 
-    /**
-     * Takes the organized $_FILES array (where all file info is located at the same spot as you'd expect an input
-     * to be in post data, with all the file's data located side-by-side in an array) and creates a
-     * multi-dimensional array of FileSubmissionInterface objects. Stores it in `$this->file_objects`.
-     *
-     * @param array $organized_files   $_FILES but organized like $_POST
-     * @param array $name_parts_so_far for multidimensional HTML form names,
-     * @throws UnexpectedValueException
-     * @throws InvalidArgumentException
-     * @since 4.9.80.p
-     */
-    protected function createFileObjects($organized_files, $name_parts_so_far = [])
-    {
-        if (! is_array($organized_files)) {
-            throw new UnexpectedValueException(
-                sprintf(
-                    esc_html__(
-                        'Unexpected PHP $organized_files data format. "%1$s" was expected to be an array.',
-                        'event_espresso'
-                    ),
-                    (string) $organized_files
-                )
-            );
-        }
-        foreach ($organized_files as $key => $value) {
-            $this_input_name_parts = $name_parts_so_far;
-            array_push(
-                $this_input_name_parts,
-                $key
-            );
-            if (isset($value['name'], $value['tmp_name'], $value['size'])) {
-                $html_name = $this->inputNameFromParts($this_input_name_parts);
-                $this->file_objects->add(
-                    new FileSubmission(
-                        $value['name'],
-                        $value['tmp_name'],
-                        $value['size'],
-                        $value['error']
-                    ),
-                    $html_name
-                );
-            } else {
-                $this->createFileObjects($value, $this_input_name_parts);
-            }
-        }
-    }
+	/**
+	 * Takes the organized $_FILES array (where all file info is located at the same spot as you'd expect an input
+	 * to be in post data, with all the file's data located side-by-side in an array) and creates a
+	 * multi-dimensional array of FileSubmissionInterface objects. Stores it in `$this->file_objects`.
+	 *
+	 * @param array $organized_files   $_FILES but organized like $_POST
+	 * @param array $name_parts_so_far for multidimensional HTML form names,
+	 * @throws UnexpectedValueException
+	 * @throws InvalidArgumentException
+	 * @since 4.9.80.p
+	 */
+	protected function createFileObjects($organized_files, $name_parts_so_far = [])
+	{
+		if (! is_array($organized_files)) {
+			throw new UnexpectedValueException(
+				sprintf(
+					esc_html__(
+						'Unexpected PHP $organized_files data format. "%1$s" was expected to be an array.',
+						'event_espresso'
+					),
+					(string) $organized_files
+				)
+			);
+		}
+		foreach ($organized_files as $key => $value) {
+			$this_input_name_parts = $name_parts_so_far;
+			array_push(
+				$this_input_name_parts,
+				$key
+			);
+			if (isset($value['name'], $value['tmp_name'], $value['size'])) {
+				$html_name = $this->inputNameFromParts($this_input_name_parts);
+				$this->file_objects->add(
+					new FileSubmission(
+						$value['name'],
+						$value['tmp_name'],
+						$value['size'],
+						$value['error']
+					),
+					$html_name
+				);
+			} else {
+				$this->createFileObjects($value, $this_input_name_parts);
+			}
+		}
+	}
 
 
-    /**
-     * Takes the input name parts, like `['my', 'great', 'file', 'input1']`
-     * and returns the HTML name for it, "my[great][file][input1]"
-     *
-     * @throws UnexpectedValueException
-     * @since 4.9.80.p
-     */
-    protected function inputNameFromParts($parts)
-    {
-        if (! is_array($parts)) {
-            throw new UnexpectedValueException(esc_html__('Name parts should be an array.', 'event_espresso'));
-        }
-        $generated_string = '';
-        foreach ($parts as $part) {
-            $part = (string) $part;
-            // wrap all but the first part in []
-            $generated_string .= $generated_string === '' ? $part : '[' . $part . ']';
-        }
-        return $generated_string;
-    }
+	/**
+	 * Takes the input name parts, like `['my', 'great', 'file', 'input1']`
+	 * and returns the HTML name for it, "my[great][file][input1]"
+	 *
+	 * @throws UnexpectedValueException
+	 * @since 4.9.80.p
+	 */
+	protected function inputNameFromParts($parts)
+	{
+		if (! is_array($parts)) {
+			throw new UnexpectedValueException(esc_html__('Name parts should be an array.', 'event_espresso'));
+		}
+		$generated_string = '';
+		foreach ($parts as $part) {
+			$part = (string) $part;
+			// wrap all but the first part in []
+			$generated_string .= $generated_string === '' ? $part : '[' . $part . ']';
+		}
+		return $generated_string;
+	}
 
 
-    /**
-     * Gets the input by the indicated $name_parts.
-     * Eg if you're looking for an input named "my[great][file][input1]", $name_parts
-     * should be `['my', 'great', 'file', 'input1']`.
-     * Alternatively, you could use `FileDataHandler::getFileObject('my[great][file][input1]');`
-     *
-     * @param $name_parts
-     * @return FileSubmissionInterface
-     * @throws UnexpectedValueException
-     * @since 4.9.80.p
-     */
-    public function getFileObjectFromNameParts($name_parts)
-    {
-        return $this->getFileObjects()->get($this->inputNameFromParts($name_parts));
-    }
+	/**
+	 * Gets the input by the indicated $name_parts.
+	 * Eg if you're looking for an input named "my[great][file][input1]", $name_parts
+	 * should be `['my', 'great', 'file', 'input1']`.
+	 * Alternatively, you could use `FileDataHandler::getFileObject('my[great][file][input1]');`
+	 *
+	 * @param $name_parts
+	 * @return FileSubmissionInterface
+	 * @throws UnexpectedValueException
+	 * @since 4.9.80.p
+	 */
+	public function getFileObjectFromNameParts($name_parts)
+	{
+		return $this->getFileObjects()->get($this->inputNameFromParts($name_parts));
+	}
 
 
-    /**
-     * Gets the FileSubmissionInterface corresponding to the HTML name provided.
-     *
-     * @param $html_name
-     * @return mixed
-     * @throws InvalidArgumentException
-     * @throws UnexpectedValueException
-     * @since 4.9.80.p
-     */
-    public function getFileObject($html_name)
-    {
-        return $this->getFileObjects()->get($html_name);
-    }
+	/**
+	 * Gets the FileSubmissionInterface corresponding to the HTML name provided.
+	 *
+	 * @param $html_name
+	 * @return mixed
+	 * @throws InvalidArgumentException
+	 * @throws UnexpectedValueException
+	 * @since 4.9.80.p
+	 */
+	public function getFileObject($html_name)
+	{
+		return $this->getFileObjects()->get($html_name);
+	}
 }
 // End of file FilesDataHandler.php
 // Location: EventEspresso\core\services\request\files/FilesDataHandler.php

Spacing +13 added lines, -13 removed lines

@@ -99,7 +99,7 @@ 
             // collection name
             'submitted_files'
         );
-        $files_raw_data     = $this->request->filesParams();
+        $files_raw_data = $this->request->filesParams();
         if (empty($files_raw_data)) {
             return;
         }
@@ -123,7 +123,7 @@ 
      */
     protected function isStrangeFilesArray($files_data)
     {
-        if (! is_array($files_data)) {
+        if ( ! is_array($files_data)) {
             throw new UnexpectedValueException(
                 sprintf(
                     esc_html__(
@@ -135,7 +135,7 @@ 
             );
         }
         $first_value = reset($files_data);
-        if (! is_array($first_value)) {
+        if ( ! is_array($first_value)) {
             throw new UnexpectedValueException(
                 sprintf(
                     esc_html__(
@@ -171,14 +171,14 @@ 
         $sane_files_array = [];
         foreach ($files_data as $top_level_name => $top_level_children) {
             $sub_array                           = [];
-            $sane_files_array[ $top_level_name ] = [];
+            $sane_files_array[$top_level_name] = [];
             foreach ($top_level_children as $file_data_part => $second_level_children) {
                 foreach ($second_level_children as $next_level_name => $sub_values) {
-                    $sub_array[ $next_level_name ] = $this->organizeFilesData($sub_values, $file_data_part);
+                    $sub_array[$next_level_name] = $this->organizeFilesData($sub_values, $file_data_part);
                 }
-                $sane_files_array[ $top_level_name ] = array_replace_recursive(
+                $sane_files_array[$top_level_name] = array_replace_recursive(
                     $sub_array,
-                    $sane_files_array[ $top_level_name ]
+                    $sane_files_array[$top_level_name]
                 );
             }
         }
@@ -196,7 +196,7 @@ 
      */
     protected function organizeFilesData($data, $type)
     {
-        if (! is_array($data)) {
+        if ( ! is_array($data)) {
             return [
                 $type => $data,
             ];
@@ -204,9 +204,9 @@ 
         $organized_data = [];
         foreach ($data as $input_name_part => $sub_inputs_or_value) {
             if (is_array($sub_inputs_or_value)) {
-                $organized_data[ $input_name_part ] = $this->organizeFilesData($sub_inputs_or_value, $type);
+                $organized_data[$input_name_part] = $this->organizeFilesData($sub_inputs_or_value, $type);
             } else {
-                $organized_data[ $input_name_part ][ $type ] = $sub_inputs_or_value;
+                $organized_data[$input_name_part][$type] = $sub_inputs_or_value;
             }
         }
         return $organized_data;
@@ -226,7 +226,7 @@ 
      */
     protected function createFileObjects($organized_files, $name_parts_so_far = [])
     {
-        if (! is_array($organized_files)) {
+        if ( ! is_array($organized_files)) {
             throw new UnexpectedValueException(
                 sprintf(
                     esc_html__(
@@ -270,14 +270,14 @@ 
      */
     protected function inputNameFromParts($parts)
     {
-        if (! is_array($parts)) {
+        if ( ! is_array($parts)) {
             throw new UnexpectedValueException(esc_html__('Name parts should be an array.', 'event_espresso'));
         }
         $generated_string = '';
         foreach ($parts as $part) {
             $part = (string) $part;
             // wrap all but the first part in []
-            $generated_string .= $generated_string === '' ? $part : '[' . $part . ']';
+            $generated_string .= $generated_string === '' ? $part : '['.$part.']';
         }
         return $generated_string;
     }

core/services/request/sanitizers/ServerSanitizer.php

Indentation +55 added lines, -55 removed lines

@@ -11,59 +11,59 @@
  */
 class ServerSanitizer
 {
-    /**
-     * @param string $value
-     * @return mixed|string
-     */
-    public function clean($key, $value)
-    {
-        switch ($key) {
-            case 'AUTH_TYPE':
-                $valid_types = [
-                    'Basic',
-                    'Bearer',
-                    'Digest',
-                    'HOBA',
-                    'Mutual',
-                    'Negotiate',
-                    'OAuth',
-                    'SCRAM-SHA-1',
-                    'SCRAM-SHA-256',
-                    'vapid',
-                ];
-                return in_array($value, $valid_types, true) ? $value : 'Basic';
-            case 'argc':
-            case 'HTTP_DNT':
-            case 'HTTP_UPGRADE_INSECURE_REQUESTS':
-            case 'SERVER_PORT':
-            case 'REMOTE_PORT':
-            case 'REQUEST_TIME':
-                return (int) filter_var($value, FILTER_SANITIZE_NUMBER_INT);
-            case 'REQUEST_TIME_FLOAT':
-                return (float) filter_var($value, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
-            case 'REQUEST_METHOD':
-                $valid_types = [
-                    'CONNECT',
-                    'DELETE',
-                    'GET',
-                    'HEAD',
-                    'OPTIONS',
-                    'PATCH',
-                    'POST',
-                    'PUT',
-                    'TRACE',
-                ];
-                return in_array($value, $valid_types, true) ? $value : 'GET';
-            case 'HTTP_HOST':
-            case 'QUERY_STRING':
-            case 'REQUEST_URI':
-            case 'SCRIPT_NAME':
-            case 'SERVER_NAME':
-                return filter_var($value, FILTER_SANITIZE_URL);
-            case 'SERVER_ADMIN':
-                return filter_var($value, FILTER_SANITIZE_EMAIL);
-            default:
-                return filter_var($value, FILTER_SANITIZE_STRING);
-        }
-    }
+	/**
+	 * @param string $value
+	 * @return mixed|string
+	 */
+	public function clean($key, $value)
+	{
+		switch ($key) {
+			case 'AUTH_TYPE':
+				$valid_types = [
+					'Basic',
+					'Bearer',
+					'Digest',
+					'HOBA',
+					'Mutual',
+					'Negotiate',
+					'OAuth',
+					'SCRAM-SHA-1',
+					'SCRAM-SHA-256',
+					'vapid',
+				];
+				return in_array($value, $valid_types, true) ? $value : 'Basic';
+			case 'argc':
+			case 'HTTP_DNT':
+			case 'HTTP_UPGRADE_INSECURE_REQUESTS':
+			case 'SERVER_PORT':
+			case 'REMOTE_PORT':
+			case 'REQUEST_TIME':
+				return (int) filter_var($value, FILTER_SANITIZE_NUMBER_INT);
+			case 'REQUEST_TIME_FLOAT':
+				return (float) filter_var($value, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			case 'REQUEST_METHOD':
+				$valid_types = [
+					'CONNECT',
+					'DELETE',
+					'GET',
+					'HEAD',
+					'OPTIONS',
+					'PATCH',
+					'POST',
+					'PUT',
+					'TRACE',
+				];
+				return in_array($value, $valid_types, true) ? $value : 'GET';
+			case 'HTTP_HOST':
+			case 'QUERY_STRING':
+			case 'REQUEST_URI':
+			case 'SCRIPT_NAME':
+			case 'SERVER_NAME':
+				return filter_var($value, FILTER_SANITIZE_URL);
+			case 'SERVER_ADMIN':
+				return filter_var($value, FILTER_SANITIZE_EMAIL);
+			default:
+				return filter_var($value, FILTER_SANITIZE_STRING);
+		}
+	}
 }

core/services/request/LegacyRequestInterface.php

Indentation +87 added lines, -87 removed lines

@@ -12,125 +12,125 @@
 interface LegacyRequestInterface
 {
 
-    /**
-     * @return array
-     */
-    public function get_params();
+	/**
+	 * @return array
+	 */
+	public function get_params();
 
 
-    /**
-     * @return array
-     */
-    public function post_params();
+	/**
+	 * @return array
+	 */
+	public function post_params();
 
 
-    /**
-     * @return array
-     */
-    public function cookie_params();
+	/**
+	 * @return array
+	 */
+	public function cookie_params();
 
 
-    /**
-     * @return array
-     */
-    public function server_params();
+	/**
+	 * @return array
+	 */
+	public function server_params();
 
 
-    /**
-     * returns sanitized contents of $_REQUEST
-     *
-     * @return array
-     */
-    public function params();
+	/**
+	 * returns sanitized contents of $_REQUEST
+	 *
+	 * @return array
+	 */
+	public function params();
 
 
-    /**
-     * @param      $key
-     * @param      $value
-     * @param bool $override_ee
-     * @return    void
-     */
-    public function set($key, $value, $override_ee = false);
+	/**
+	 * @param      $key
+	 * @param      $value
+	 * @param bool $override_ee
+	 * @return    void
+	 */
+	public function set($key, $value, $override_ee = false);
 
 
-    /**
-     * returns   the value for a request param if the given key exists
-     *
-     * @param       $key
-     * @param null  $default
-     * @return mixed
-     */
-    public function get($key, $default = null);
+	/**
+	 * returns   the value for a request param if the given key exists
+	 *
+	 * @param       $key
+	 * @param null  $default
+	 * @return mixed
+	 */
+	public function get($key, $default = null);
 
 
-    /**
-     * check if param exists
-     *
-     * @param       $key
-     * @return bool
-     */
-    public function is_set($key);
+	/**
+	 * check if param exists
+	 *
+	 * @param       $key
+	 * @return bool
+	 */
+	public function is_set($key);
 
 
-    /**
-     * remove param
-     *
-     * @param      $key
-     * @param bool $unset_from_global_too
-     */
-    public function un_set($key, $unset_from_global_too = false);
+	/**
+	 * remove param
+	 *
+	 * @param      $key
+	 * @param bool $unset_from_global_too
+	 */
+	public function un_set($key, $unset_from_global_too = false);
 
 
-    /**
-     * @return string
-     */
-    public function ip_address();
+	/**
+	 * @return string
+	 */
+	public function ip_address();
 
 
-    /**
-     * @return bool
-     */
-    public function isAdmin();
+	/**
+	 * @return bool
+	 */
+	public function isAdmin();
 
 
-    /**
-     * @return mixed
-     */
-    public function isAjax();
+	/**
+	 * @return mixed
+	 */
+	public function isAjax();
 
 
-    /**
-     * @return mixed
-     */
-    public function isFrontAjax();
+	/**
+	 * @return mixed
+	 */
+	public function isFrontAjax();
 
 
-    /**
-     * @return mixed|string
-     */
-    public function requestUri();
+	/**
+	 * @return mixed|string
+	 */
+	public function requestUri();
 
 
-    /**
-     * @return string
-     */
-    public function userAgent();
+	/**
+	 * @return string
+	 */
+	public function userAgent();
 
 
-    /**
-     * @param string $user_agent
-     */
-    public function setUserAgent($user_agent = '');
+	/**
+	 * @param string $user_agent
+	 */
+	public function setUserAgent($user_agent = '');
 
 
-    /**
-     * @return bool
-     */
-    public function isBot();
+	/**
+	 * @return bool
+	 */
+	public function isBot();
 
 
-    /**
-     * @param bool $is_bot
-     */
-    public function setIsBot($is_bot);
+	/**
+	 * @param bool $is_bot
+	 */
+	public function setIsBot($is_bot);
 }

core/services/privacy/policy/PrivacyPolicyManager.php

Indentation +60 added lines, -60 removed lines

@@ -26,71 +26,71 @@
 class PrivacyPolicyManager
 {
 
-    public function __construct()
-    {
-        add_action('current_screen', array($this, 'addPrivacyPolicy'), 9);
-    }
+	public function __construct()
+	{
+		add_action('current_screen', array($this, 'addPrivacyPolicy'), 9);
+	}
 
 
-    /**
-     * For all the registered `PrivacyPolicyInterface`s, add their privacy policy content
-     *
-     * @param WP_Screen $screen
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidFilePathException
-     * @throws InvalidIdentifierException
-     * @throws InvalidInterfaceException
-     */
-    public function addPrivacyPolicy(WP_Screen $screen)
-    {
-        /** @var RequestInterface $request */
-        $request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
+	/**
+	 * For all the registered `PrivacyPolicyInterface`s, add their privacy policy content
+	 *
+	 * @param WP_Screen $screen
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidInterfaceException
+	 */
+	public function addPrivacyPolicy(WP_Screen $screen)
+	{
+		/** @var RequestInterface $request */
+		$request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
 
-        if ($screen->id === 'tools' && $request->requestParamIsSet('wp-privacy-policy-guide')) {
-            // load all the privacy policy stuff
-            // add post policy text
-            foreach ($this->loadPrivacyPolicyCollection() as $privacy_policy) {
-                wp_add_privacy_policy_content($privacy_policy->getName(), $privacy_policy->getContent());
-            }
-        }
-    }
+		if ($screen->id === 'tools' && $request->requestParamIsSet('wp-privacy-policy-guide')) {
+			// load all the privacy policy stuff
+			// add post policy text
+			foreach ($this->loadPrivacyPolicyCollection() as $privacy_policy) {
+				wp_add_privacy_policy_content($privacy_policy->getName(), $privacy_policy->getContent());
+			}
+		}
+	}
 
 
-    /**
-     * @return CollectionInterface|PrivacyPolicyInterface[]
-     * @throws InvalidIdentifierException
-     * @throws InvalidInterfaceException
-     * @throws InvalidFilePathException
-     * @throws InvalidEntityException
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     */
-    protected function loadPrivacyPolicyCollection()
-    {
-        $loader = new CollectionLoader(
-            new CollectionDetails(
-                // collection name
-                'privacy_policies',
-                // collection interface
-                'EventEspresso\core\services\privacy\policy\PrivacyPolicyInterface',
-                // FQCNs for classes to add (all classes within that namespace will be loaded)
-                apply_filters(
-                    'FHEE__EventEspresso_core_services_privacy_policy_PrivacyPolicyManager__privacy_policies',
-                    array('EventEspresso\core\domain\services\admin\privacy\policy\PrivacyPolicy')
-                ),
-                // filepaths to classes to add
-                array(),
-                // file mask to use if parsing folder for files to add
-                '',
-                // what to use as identifier for collection entities
-                // using CLASS NAME prevents duplicates (works like a singleton)
-                CollectionDetails::ID_CLASS_NAME
-            )
-        );
-        return $loader->getCollection();
-    }
+	/**
+	 * @return CollectionInterface|PrivacyPolicyInterface[]
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidEntityException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 */
+	protected function loadPrivacyPolicyCollection()
+	{
+		$loader = new CollectionLoader(
+			new CollectionDetails(
+				// collection name
+				'privacy_policies',
+				// collection interface
+				'EventEspresso\core\services\privacy\policy\PrivacyPolicyInterface',
+				// FQCNs for classes to add (all classes within that namespace will be loaded)
+				apply_filters(
+					'FHEE__EventEspresso_core_services_privacy_policy_PrivacyPolicyManager__privacy_policies',
+					array('EventEspresso\core\domain\services\admin\privacy\policy\PrivacyPolicy')
+				),
+				// filepaths to classes to add
+				array(),
+				// file mask to use if parsing folder for files to add
+				'',
+				// what to use as identifier for collection entities
+				// using CLASS NAME prevents duplicates (works like a singleton)
+				CollectionDetails::ID_CLASS_NAME
+			)
+		);
+		return $loader->getCollection();
+	}
 }
 // End of file PrivacyPolicyManager.php
 // Location: EventEspresso\core\domain\services\admin/PrivacyPolicyManager.php

core/libraries/payment_methods/EE_Offsite_Gateway.lib.php

Indentation +102 added lines, -102 removed lines

@@ -15,117 +15,117 @@
 abstract class EE_Offsite_Gateway extends EE_Gateway
 {
 
-    /**
-     * whether or not the gateway uses an IPN
-     * that is sent in a separate request than the returning registrant.
-     * if false, then we need to process the payment results manually
-     * as soon as the registrant returns from the off-site gateway
-     *
-     * @type bool
-     */
-    protected $_uses_separate_IPN_request = false;
+	/**
+	 * whether or not the gateway uses an IPN
+	 * that is sent in a separate request than the returning registrant.
+	 * if false, then we need to process the payment results manually
+	 * as soon as the registrant returns from the off-site gateway
+	 *
+	 * @type bool
+	 */
+	protected $_uses_separate_IPN_request = false;
 
 
-    /**
-     * @return EE_Offsite_Gateway
-     */
-    public function __construct()
-    {
-        $this->_supports_receiving_refunds = true;
-        parent::__construct();
-    }
+	/**
+	 * @return EE_Offsite_Gateway
+	 */
+	public function __construct()
+	{
+		$this->_supports_receiving_refunds = true;
+		parent::__construct();
+	}
 
 
-    /**
-     * Adds information into the payment object's redirect_url and redirect_args so
-     * client code can use that payment to know where (and with what information)
-     * to redirect the user to in order to make the payment on the offsite gateway's website.
-     * Saving the payment from within this method is unnecessary,
-     * as it is the responsibility of client code to save it.
-     *
-     * @param EE_Payment $payment    to process
-     * @param array      $billing_info
-     * @param string     $return_url URL to send the user to after a successful payment on the payment provider's
-     *                               website
-     * @param string     $notify_url URL to send the instant payment notification
-     * @param string     $cancel_url URL to send the user to after a cancelled payment attempt on teh payment
-     *                               provider's website
-     * @return EE_Payment
-     */
-    abstract public function set_redirection_info(
-        $payment,
-        $billing_info = array(),
-        $return_url = null,
-        $notify_url = null,
-        $cancel_url = null
-    );
+	/**
+	 * Adds information into the payment object's redirect_url and redirect_args so
+	 * client code can use that payment to know where (and with what information)
+	 * to redirect the user to in order to make the payment on the offsite gateway's website.
+	 * Saving the payment from within this method is unnecessary,
+	 * as it is the responsibility of client code to save it.
+	 *
+	 * @param EE_Payment $payment    to process
+	 * @param array      $billing_info
+	 * @param string     $return_url URL to send the user to after a successful payment on the payment provider's
+	 *                               website
+	 * @param string     $notify_url URL to send the instant payment notification
+	 * @param string     $cancel_url URL to send the user to after a cancelled payment attempt on teh payment
+	 *                               provider's website
+	 * @return EE_Payment
+	 */
+	abstract public function set_redirection_info(
+		$payment,
+		$billing_info = array(),
+		$return_url = null,
+		$notify_url = null,
+		$cancel_url = null
+	);
 
 
-    /**
-     * Often used for IPNs. But applies the info in $update_info to the payment.
-     * What is $update_info? Often the contents of request, but not necessarily. Whatever
-     * the payment method passes in. Saving the payment from within this method is unnecessary,
-     * as it is the responsibility of client code to save it.
-     *
-     * @param array           $update_info of whatever
-     * @param EEI_Transaction $transaction
-     * @return EEI_Payment updated
-     */
-    abstract public function handle_payment_update($update_info, $transaction);
+	/**
+	 * Often used for IPNs. But applies the info in $update_info to the payment.
+	 * What is $update_info? Often the contents of request, but not necessarily. Whatever
+	 * the payment method passes in. Saving the payment from within this method is unnecessary,
+	 * as it is the responsibility of client code to save it.
+	 *
+	 * @param array           $update_info of whatever
+	 * @param EEI_Transaction $transaction
+	 * @return EEI_Payment updated
+	 */
+	abstract public function handle_payment_update($update_info, $transaction);
 
 
-    /**
-     * uses_separate_IPN_request
-     *
-     * return true or false for whether or not the gateway uses an IPN
-     * that is sent in a separate request than the returning registrant.
-     * if false, then we need to process the payment results manually
-     * as soon as the registrant returns from the off-site gateway
-     *
-     * @deprecated since version 4.8.39.rc.001 please use handle_IPN_in_this_request() instead
-     *
-     * @return bool
-     */
-    public function uses_separate_IPN_request()
-    {
-        return $this->_uses_separate_IPN_request;
-    }
+	/**
+	 * uses_separate_IPN_request
+	 *
+	 * return true or false for whether or not the gateway uses an IPN
+	 * that is sent in a separate request than the returning registrant.
+	 * if false, then we need to process the payment results manually
+	 * as soon as the registrant returns from the off-site gateway
+	 *
+	 * @deprecated since version 4.8.39.rc.001 please use handle_IPN_in_this_request() instead
+	 *
+	 * @return bool
+	 */
+	public function uses_separate_IPN_request()
+	{
+		return $this->_uses_separate_IPN_request;
+	}
 
 
-    /**
-     * set_uses_separate_IPN_request
-     *
-     * @access protected
-     * @param boolean $uses_separate_IPN_request
-     */
-    protected function set_uses_separate_IPN_request($uses_separate_IPN_request)
-    {
-        $this->_uses_separate_IPN_request = filter_var($uses_separate_IPN_request, FILTER_VALIDATE_BOOLEAN);
-    }
+	/**
+	 * set_uses_separate_IPN_request
+	 *
+	 * @access protected
+	 * @param boolean $uses_separate_IPN_request
+	 */
+	protected function set_uses_separate_IPN_request($uses_separate_IPN_request)
+	{
+		$this->_uses_separate_IPN_request = filter_var($uses_separate_IPN_request, FILTER_VALIDATE_BOOLEAN);
+	}
 
-    /**
-     * Allows gateway to dynamically decide whether or not to handle a payment update
-     * by overriding this method. By default, if this is a "true" IPN (meaning
-     * it's a separate request from when the user returns from the offsite gateway)
-     * and this gateway class is setup to handle IPNs in separate "true" IPNs, then
-     * this will return true, otherwise it will return false.
-     * If however, this is a request when the user is returning
-     * from an offsite gateway, and this gateway class is setup to process the payment
-     * data when the user returns, then this will return true.
-     *
-     * @param array   $request_data
-     * @param boolean $separate_IPN_request
-     * @return boolean
-     */
-    public function handle_IPN_in_this_request($request_data, $separate_IPN_request)
-    {
-        if ($separate_IPN_request) {
-            // payment data being sent in a request separate from the user
-            // it is this other request that will update the TXN and payment info
-            return $this->_uses_separate_IPN_request;
-        } else {
-            // it's a request where the user returned from an offsite gateway WITH the payment data
-            return ! $this->_uses_separate_IPN_request;
-        }
-    }
+	/**
+	 * Allows gateway to dynamically decide whether or not to handle a payment update
+	 * by overriding this method. By default, if this is a "true" IPN (meaning
+	 * it's a separate request from when the user returns from the offsite gateway)
+	 * and this gateway class is setup to handle IPNs in separate "true" IPNs, then
+	 * this will return true, otherwise it will return false.
+	 * If however, this is a request when the user is returning
+	 * from an offsite gateway, and this gateway class is setup to process the payment
+	 * data when the user returns, then this will return true.
+	 *
+	 * @param array   $request_data
+	 * @param boolean $separate_IPN_request
+	 * @return boolean
+	 */
+	public function handle_IPN_in_this_request($request_data, $separate_IPN_request)
+	{
+		if ($separate_IPN_request) {
+			// payment data being sent in a request separate from the user
+			// it is this other request that will update the TXN and payment info
+			return $this->_uses_separate_IPN_request;
+		} else {
+			// it's a request where the user returned from an offsite gateway WITH the payment data
+			return ! $this->_uses_separate_IPN_request;
+		}
+	}
 }