eventespresso / event-espresso-core

core/services/locators/FqcnLocator.php

Indentation +154 added lines, -154 removed lines

@@ -17,158 +17,158 @@
 class FqcnLocator extends Locator
 {
 
-    /**
-     * @var array $FQCNs
-     */
-    protected $FQCNs = array();
-
-    /**
-     * @var array $namespaces
-     */
-    protected $namespaces = array();
-
-
-    /**
-     * @access protected
-     * @param string $namespace
-     * @param string $namespace_base_dir
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     */
-    protected function setNamespace($namespace, $namespace_base_dir)
-    {
-        if (! is_string($namespace)) {
-            throw new InvalidDataTypeException('$namespace', $namespace, 'string');
-        }
-        if (! is_string($namespace_base_dir)) {
-            throw new InvalidDataTypeException('$namespace_base_dir', $namespace_base_dir, 'string');
-        }
-        $this->namespaces[ $namespace ] = $namespace_base_dir;
-    }
-
-
-    /**
-     * @access public
-     * @return array
-     */
-    public function getFQCNs()
-    {
-        return $this->FQCNs;
-    }
-
-
-    /**
-     * @access public
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->FQCNs);
-    }
-
-
-    /**
-     * given a valid namespace, will find all files that match the provided mask
-     *
-     * @access public
-     * @param string|array $namespaces
-     * @return FilesystemIterator
-     * @throws \EventEspresso\core\exceptions\InvalidClassException
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     */
-    public function locate($namespaces)
-    {
-        if (! (is_string($namespaces) || is_array($namespaces))) {
-            throw new InvalidDataTypeException('$namespaces', $namespaces, 'string or array');
-        }
-        foreach ((array) $namespaces as $namespace) {
-            foreach ($this->FindFQCNsByNamespace($namespace) as $key => $file) {
-                $this->FQCNs[ $key ] = $file;
-            }
-        }
-        return $this->FQCNs;
-    }
-
-
-    // phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-
-    /**
-     * given a partial namespace, will find all files in that folder
-     * ** PLZ NOTE **
-     * This assumes that all files within the specified folder should be loaded
-     *
-     * @access protected
-     * @param array $partial_namespace
-     * @return FilesystemIterator
-     * @throws \EventEspresso\core\exceptions\InvalidClassException
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     */
-    protected function FindFQCNsByNamespace($partial_namespace)
-    {
-        $iterator = new FilesystemIterator(
-            $this->getDirectoryFromPartialNamespace($partial_namespace)
-        );
-        foreach ($this->flags as $flag) {
-            $iterator->setFlags($flag);
-        }
-        if (iterator_count($iterator) === 0) {
-            return array();
-        }
-        foreach ($iterator as $file) {
-            $file = \EEH_File::standardise_directory_separators($file);
-            foreach ($this->namespaces as $namespace => $base_dir) {
-                $namespace .= Psr4Autoloader::NS;
-                if (strpos($file, $base_dir) === 0) {
-                    $this->FQCNs[] = Psr4Autoloader::NS . str_replace(
-                        array($base_dir, DS, '.php'),
-                        array($namespace, Psr4Autoloader::NS, ''),
-                        $file
-                    );
-                }
-            }
-        }
-        return $this->FQCNs;
-    }
-
-
-    /**
-     * getDirectoryFromPartialNamespace
-     *
-     * @access protected
-     * @param  string $partial_namespace almost fully qualified class name ?
-     * @return string
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     * @throws \EventEspresso\core\exceptions\InvalidClassException
-     */
-    protected function getDirectoryFromPartialNamespace($partial_namespace)
-    {
-        if (empty($partial_namespace)) {
-            throw new InvalidClassException($partial_namespace);
-        }
-        // load our PSR-4 Autoloader so we can get the list of registered namespaces from it
-        $psr4_loader = \EE_Psr4AutoloaderInit::psr4_loader();
-        // breakup the incoming namespace into segments then loop thru them
-        $namespace_segments = explode(Psr4Autoloader::NS, trim($partial_namespace, Psr4Autoloader::NS));
-        $prefix = null;
-        $namespace_segments_to_try = $namespace_segments;
-        $removed_namespace_segments = [];
-        while( ! empty($namespace_segments_to_try)) {
-            $namespace_to_try = implode( Psr4Autoloader::NS, $namespace_segments_to_try);
-            // check if there's a base directory registered for that namespace
-            $prefix = $psr4_loader->prefixes($namespace_to_try . Psr4Autoloader::NS);
-            // nope? then the incoming namespace is invalid
-            if (! empty($prefix) && ! empty($prefix[0])) {
-                break;
-            }
-            array_unshift(
-                $removed_namespace_segments,
-                array_pop($namespace_segments_to_try)
-            );
-        }// nope? then the incoming namespace is invalid
-        if (empty($prefix) || empty($prefix[0])) {
-            throw new InvalidClassException($partial_namespace);
-        }
-        $this->setNamespace($namespace_to_try, $prefix[0]);
-        // but if it's good, add that base directory to the rest of the path, and return it
-        return $prefix[0] . implode(DS, $removed_namespace_segments) . DS;
-    }
+	/**
+	 * @var array $FQCNs
+	 */
+	protected $FQCNs = array();
+
+	/**
+	 * @var array $namespaces
+	 */
+	protected $namespaces = array();
+
+
+	/**
+	 * @access protected
+	 * @param string $namespace
+	 * @param string $namespace_base_dir
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 */
+	protected function setNamespace($namespace, $namespace_base_dir)
+	{
+		if (! is_string($namespace)) {
+			throw new InvalidDataTypeException('$namespace', $namespace, 'string');
+		}
+		if (! is_string($namespace_base_dir)) {
+			throw new InvalidDataTypeException('$namespace_base_dir', $namespace_base_dir, 'string');
+		}
+		$this->namespaces[ $namespace ] = $namespace_base_dir;
+	}
+
+
+	/**
+	 * @access public
+	 * @return array
+	 */
+	public function getFQCNs()
+	{
+		return $this->FQCNs;
+	}
+
+
+	/**
+	 * @access public
+	 * @return int
+	 */
+	public function count()
+	{
+		return count($this->FQCNs);
+	}
+
+
+	/**
+	 * given a valid namespace, will find all files that match the provided mask
+	 *
+	 * @access public
+	 * @param string|array $namespaces
+	 * @return FilesystemIterator
+	 * @throws \EventEspresso\core\exceptions\InvalidClassException
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 */
+	public function locate($namespaces)
+	{
+		if (! (is_string($namespaces) || is_array($namespaces))) {
+			throw new InvalidDataTypeException('$namespaces', $namespaces, 'string or array');
+		}
+		foreach ((array) $namespaces as $namespace) {
+			foreach ($this->FindFQCNsByNamespace($namespace) as $key => $file) {
+				$this->FQCNs[ $key ] = $file;
+			}
+		}
+		return $this->FQCNs;
+	}
+
+
+	// phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+
+	/**
+	 * given a partial namespace, will find all files in that folder
+	 * ** PLZ NOTE **
+	 * This assumes that all files within the specified folder should be loaded
+	 *
+	 * @access protected
+	 * @param array $partial_namespace
+	 * @return FilesystemIterator
+	 * @throws \EventEspresso\core\exceptions\InvalidClassException
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 */
+	protected function FindFQCNsByNamespace($partial_namespace)
+	{
+		$iterator = new FilesystemIterator(
+			$this->getDirectoryFromPartialNamespace($partial_namespace)
+		);
+		foreach ($this->flags as $flag) {
+			$iterator->setFlags($flag);
+		}
+		if (iterator_count($iterator) === 0) {
+			return array();
+		}
+		foreach ($iterator as $file) {
+			$file = \EEH_File::standardise_directory_separators($file);
+			foreach ($this->namespaces as $namespace => $base_dir) {
+				$namespace .= Psr4Autoloader::NS;
+				if (strpos($file, $base_dir) === 0) {
+					$this->FQCNs[] = Psr4Autoloader::NS . str_replace(
+						array($base_dir, DS, '.php'),
+						array($namespace, Psr4Autoloader::NS, ''),
+						$file
+					);
+				}
+			}
+		}
+		return $this->FQCNs;
+	}
+
+
+	/**
+	 * getDirectoryFromPartialNamespace
+	 *
+	 * @access protected
+	 * @param  string $partial_namespace almost fully qualified class name ?
+	 * @return string
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 * @throws \EventEspresso\core\exceptions\InvalidClassException
+	 */
+	protected function getDirectoryFromPartialNamespace($partial_namespace)
+	{
+		if (empty($partial_namespace)) {
+			throw new InvalidClassException($partial_namespace);
+		}
+		// load our PSR-4 Autoloader so we can get the list of registered namespaces from it
+		$psr4_loader = \EE_Psr4AutoloaderInit::psr4_loader();
+		// breakup the incoming namespace into segments then loop thru them
+		$namespace_segments = explode(Psr4Autoloader::NS, trim($partial_namespace, Psr4Autoloader::NS));
+		$prefix = null;
+		$namespace_segments_to_try = $namespace_segments;
+		$removed_namespace_segments = [];
+		while( ! empty($namespace_segments_to_try)) {
+			$namespace_to_try = implode( Psr4Autoloader::NS, $namespace_segments_to_try);
+			// check if there's a base directory registered for that namespace
+			$prefix = $psr4_loader->prefixes($namespace_to_try . Psr4Autoloader::NS);
+			// nope? then the incoming namespace is invalid
+			if (! empty($prefix) && ! empty($prefix[0])) {
+				break;
+			}
+			array_unshift(
+				$removed_namespace_segments,
+				array_pop($namespace_segments_to_try)
+			);
+		}// nope? then the incoming namespace is invalid
+		if (empty($prefix) || empty($prefix[0])) {
+			throw new InvalidClassException($partial_namespace);
+		}
+		$this->setNamespace($namespace_to_try, $prefix[0]);
+		// but if it's good, add that base directory to the rest of the path, and return it
+		return $prefix[0] . implode(DS, $removed_namespace_segments) . DS;
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -36,13 +36,13 @@ 
      */
     protected function setNamespace($namespace, $namespace_base_dir)
     {
-        if (! is_string($namespace)) {
+        if ( ! is_string($namespace)) {
             throw new InvalidDataTypeException('$namespace', $namespace, 'string');
         }
-        if (! is_string($namespace_base_dir)) {
+        if ( ! is_string($namespace_base_dir)) {
             throw new InvalidDataTypeException('$namespace_base_dir', $namespace_base_dir, 'string');
         }
-        $this->namespaces[ $namespace ] = $namespace_base_dir;
+        $this->namespaces[$namespace] = $namespace_base_dir;
     }
 
 
@@ -77,12 +77,12 @@ 
      */
     public function locate($namespaces)
     {
-        if (! (is_string($namespaces) || is_array($namespaces))) {
+        if ( ! (is_string($namespaces) || is_array($namespaces))) {
             throw new InvalidDataTypeException('$namespaces', $namespaces, 'string or array');
         }
         foreach ((array) $namespaces as $namespace) {
             foreach ($this->FindFQCNsByNamespace($namespace) as $key => $file) {
-                $this->FQCNs[ $key ] = $file;
+                $this->FQCNs[$key] = $file;
             }
         }
         return $this->FQCNs;
@@ -118,7 +118,7 @@ 
             foreach ($this->namespaces as $namespace => $base_dir) {
                 $namespace .= Psr4Autoloader::NS;
                 if (strpos($file, $base_dir) === 0) {
-                    $this->FQCNs[] = Psr4Autoloader::NS . str_replace(
+                    $this->FQCNs[] = Psr4Autoloader::NS.str_replace(
                         array($base_dir, DS, '.php'),
                         array($namespace, Psr4Autoloader::NS, ''),
                         $file
@@ -151,12 +151,12 @@ 
         $prefix = null;
         $namespace_segments_to_try = $namespace_segments;
         $removed_namespace_segments = [];
-        while( ! empty($namespace_segments_to_try)) {
-            $namespace_to_try = implode( Psr4Autoloader::NS, $namespace_segments_to_try);
+        while ( ! empty($namespace_segments_to_try)) {
+            $namespace_to_try = implode(Psr4Autoloader::NS, $namespace_segments_to_try);
             // check if there's a base directory registered for that namespace
-            $prefix = $psr4_loader->prefixes($namespace_to_try . Psr4Autoloader::NS);
+            $prefix = $psr4_loader->prefixes($namespace_to_try.Psr4Autoloader::NS);
             // nope? then the incoming namespace is invalid
-            if (! empty($prefix) && ! empty($prefix[0])) {
+            if ( ! empty($prefix) && ! empty($prefix[0])) {
                 break;
             }
             array_unshift(
@@ -169,6 +169,6 @@ 
         }
         $this->setNamespace($namespace_to_try, $prefix[0]);
         // but if it's good, add that base directory to the rest of the path, and return it
-        return $prefix[0] . implode(DS, $removed_namespace_segments) . DS;
+        return $prefix[0].implode(DS, $removed_namespace_segments).DS;
     }
 }

core/services/options/JsonWpOptionManager.php

Indentation +32 added lines, -32 removed lines

@@ -16,39 +16,39 @@
  */
 class JsonWpOptionManager
 {
-    /**
-     * Updates the object with what's in the DB (specifically, the wp_options table). If nothing is in the DB, leaves
-     * the object alone and returns false.
-     * @since $VID:$
-     * @param JsonWpOptionSerializableInterface $obj
-     * @return bool
-     */
-    public function populateFromDb(JsonWpOptionSerializableInterface $obj)
-    {
-        $option = get_option($obj->getWpOptionName());
-        if ($option) {
-            $json = json_decode($option);
-            if (is_array($json) || $json instanceof stdClass) {
-                return $obj->fromJsonSerializedData($json);
-            }
-        }
-        return false;
-    }
+	/**
+	 * Updates the object with what's in the DB (specifically, the wp_options table). If nothing is in the DB, leaves
+	 * the object alone and returns false.
+	 * @since $VID:$
+	 * @param JsonWpOptionSerializableInterface $obj
+	 * @return bool
+	 */
+	public function populateFromDb(JsonWpOptionSerializableInterface $obj)
+	{
+		$option = get_option($obj->getWpOptionName());
+		if ($option) {
+			$json = json_decode($option);
+			if (is_array($json) || $json instanceof stdClass) {
+				return $obj->fromJsonSerializedData($json);
+			}
+		}
+		return false;
+	}
 
-    /**
-     * Saves the object's data to the wp_options table for later use.
-     * @since $VID:$
-     * @param JsonWpOptionSerializableInterface $obj
-     * @return bool
-     */
-    public function saveToDb(JsonWpOptionSerializableInterface $obj)
-    {
-        return update_option(
-            $obj->getWpOptionName(),
-            wp_json_encode($obj->toJsonSerializableData()),
-            false
-        );
-    }
+	/**
+	 * Saves the object's data to the wp_options table for later use.
+	 * @since $VID:$
+	 * @param JsonWpOptionSerializableInterface $obj
+	 * @return bool
+	 */
+	public function saveToDb(JsonWpOptionSerializableInterface $obj)
+	{
+		return update_option(
+			$obj->getWpOptionName(),
+			wp_json_encode($obj->toJsonSerializableData()),
+			false
+		);
+	}
 
 }
 // End of file JsonWpOptionManager.php

core/services/options/JsonWpOptionSerializableInterface.php

Indentation +7 added lines, -7 removed lines

@@ -17,13 +17,13 @@
  */
 interface JsonWpOptionSerializableInterface extends JsonSerializableAndUnserializable
 {
-    /**
-     * Gets the value to use for wp_options.option_name. Note this is not static, so it can use object properties to
-     * determine what option name to use.
-     * @since $VID:$
-     * @return string
-     */
-    public function getWpOptionName();
+	/**
+	 * Gets the value to use for wp_options.option_name. Note this is not static, so it can use object properties to
+	 * determine what option name to use.
+	 * @since $VID:$
+	 * @return string
+	 */
+	public function getWpOptionName();
 }
 // End of file JsonWpOptionSerializableInterface.php
 // Location: EventEspresso\core\services\options/JsonWpOptionSerializableInterface.php

core/services/json/JsonSerializableAndUnserializable.php

Indentation +14 added lines, -14 removed lines

@@ -15,21 +15,21 @@
  */
 interface JsonSerializableAndUnserializable
 {
-    /**
-     * Creates a simple PHP array or stdClass from this object's properties, which can be easily serialized using
-     * wp_json_serialize().
-     * @since $VID:$
-     * @return mixed
-     */
-    public function toJsonSerializableData();
+	/**
+	 * Creates a simple PHP array or stdClass from this object's properties, which can be easily serialized using
+	 * wp_json_serialize().
+	 * @since $VID:$
+	 * @return mixed
+	 */
+	public function toJsonSerializableData();
 
-    /**
-     * Initializes this object from data
-     * @since $VID:$
-     * @param mixed $data
-     * @return boolean success
-     */
-    public function fromJsonSerializedData($data);
+	/**
+	 * Initializes this object from data
+	 * @since $VID:$
+	 * @param mixed $data
+	 * @return boolean success
+	 */
+	public function fromJsonSerializedData($data);
 
 }
 // End of file JsonSerializableAndUnserializable.php

core/services/request/files/FileSubmission.php

Spacing +4 added lines, -4 removed lines

@@ -71,7 +71,7 @@ 
      */
     public function getType()
     {
-        if (!$this->type) {
+        if ( ! $this->type) {
             $this->type = $this->determineType();
         }
         return $this->type;
@@ -83,7 +83,7 @@ 
      */
     protected function determineType()
     {
-        if (!$this->getTmpFile()) {
+        if ( ! $this->getTmpFile()) {
             return '';
         }
         $finfo = new finfo(FILEINFO_MIME_TYPE);
@@ -97,7 +97,7 @@ 
      */
     public function getExtension()
     {
-        if (!$this->extension) {
+        if ( ! $this->extension) {
             $this->extension = $this->determineExtension();
         }
         return $this->extension;
@@ -110,7 +110,7 @@ 
      */
     protected function determineExtension()
     {
-        if (!$this->getTmpFile()) {
+        if ( ! $this->getTmpFile()) {
             return '';
         }
         return pathinfo($this->getTmpFile(), PATHINFO_EXTENSION);

Indentation +154 added lines, -154 removed lines

@@ -19,160 +19,160 @@
  */
 class FileSubmission implements FileSubmissionInterface
 {
-    /**
-     * @var string original name on the client machine
-     */
-    protected $name;
-
-    /**
-     * @var string mime type
-     */
-    protected $type;
-
-    /**
-     * @var string file extension
-     */
-    protected $extension;
-
-    /**
-     * @var int in bytes
-     */
-    protected $size;
-
-    /**
-     * @var string local filepath to the temporary file
-     */
-    protected $tmp_file;
-
-    /**
-     * @var int one of UPLOAD_ERR_OK, UPLOAD_ERR_NO_FILE, UPLOAD_ERR_INI_SIZE, UPLOAD_ERR_FORM_SIZE or other values
-     * although those aren't expected.
-     */
-    protected $error_code;
-
-    /**
-     * FileSubmission constructor.
-     * @param $name
-     * @param $tmp_file
-     * @param $size
-     * @param null $error_code
-     * @throws InvalidArgumentException
-     */
-    public function __construct($name, $tmp_file, $size, $error_code = null)
-    {
-        $this->name = basename($name);
-        $scheme = parse_url($tmp_file, PHP_URL_SCHEME);
-        if (in_array($scheme, ['http', 'https'])) {
-            // Wait a minute- just local filepaths please, no URL schemes allowed!
-            throw new InvalidArgumentException(
-                sprintf(
-                    // @codingStandardsIgnoreStart
-                    esc_html__('The scheme ("%1$s") on the temporary file ("%2$s") indicates is located elsewhere, that’s not ok!', 'event_espresso'),
-                    // @codingStandardsIgnoreEnd
-                    $scheme,
-                    $tmp_file
-                )
-            );
-        }
-        $this->tmp_file = (string) $tmp_file;
-        $this->size = (int) $size;
-        $this->error_code = (int) $error_code;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Gets the file's mime type
-     * @return string
-     */
-    public function getType()
-    {
-        if (!$this->type) {
-            $this->type = $this->determineType();
-        }
-        return $this->type;
-    }
-
-    /**
-     * @since $VID:$
-     * @return string
-     */
-    protected function determineType()
-    {
-        if (!$this->getTmpFile()) {
-            return '';
-        }
-        $finfo = new finfo(FILEINFO_MIME_TYPE);
-        return $finfo->file($this->getTmpFile());
-    }
-
-    /**
-     * Gets the file's extension.
-     * @since $VID:$
-     * @return string
-     */
-    public function getExtension()
-    {
-        if (!$this->extension) {
-            $this->extension = $this->determineExtension();
-        }
-        return $this->extension;
-    }
-
-    /**
-     * Determine's the file's extension given the temporary file.
-     * @since $VID:$
-     * @return string
-     */
-    protected function determineExtension()
-    {
-        if (!$this->getTmpFile()) {
-            return '';
-        }
-        return pathinfo($this->getTmpFile(), PATHINFO_EXTENSION);
-    }
-
-    /**
-     * Gets the size of the file
-     * @return int
-     */
-    public function getSize()
-    {
-        return $this->size;
-    }
-
-    /**
-     * Gets the path to the temporary file which was uploaded.
-     * @return string
-     */
-    public function getTmpFile()
-    {
-        return $this->tmp_file;
-    }
-
-    /**
-     * @since $VID:$
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getTmpFile();
-    }
-
-    /**
-     * Gets the error code PHP reported for the file upload.
-     * @return string
-     */
-    public function getErrorCode()
-    {
-        return $this->error_code;
-    }
+	/**
+	 * @var string original name on the client machine
+	 */
+	protected $name;
+
+	/**
+	 * @var string mime type
+	 */
+	protected $type;
+
+	/**
+	 * @var string file extension
+	 */
+	protected $extension;
+
+	/**
+	 * @var int in bytes
+	 */
+	protected $size;
+
+	/**
+	 * @var string local filepath to the temporary file
+	 */
+	protected $tmp_file;
+
+	/**
+	 * @var int one of UPLOAD_ERR_OK, UPLOAD_ERR_NO_FILE, UPLOAD_ERR_INI_SIZE, UPLOAD_ERR_FORM_SIZE or other values
+	 * although those aren't expected.
+	 */
+	protected $error_code;
+
+	/**
+	 * FileSubmission constructor.
+	 * @param $name
+	 * @param $tmp_file
+	 * @param $size
+	 * @param null $error_code
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct($name, $tmp_file, $size, $error_code = null)
+	{
+		$this->name = basename($name);
+		$scheme = parse_url($tmp_file, PHP_URL_SCHEME);
+		if (in_array($scheme, ['http', 'https'])) {
+			// Wait a minute- just local filepaths please, no URL schemes allowed!
+			throw new InvalidArgumentException(
+				sprintf(
+					// @codingStandardsIgnoreStart
+					esc_html__('The scheme ("%1$s") on the temporary file ("%2$s") indicates is located elsewhere, that’s not ok!', 'event_espresso'),
+					// @codingStandardsIgnoreEnd
+					$scheme,
+					$tmp_file
+				)
+			);
+		}
+		$this->tmp_file = (string) $tmp_file;
+		$this->size = (int) $size;
+		$this->error_code = (int) $error_code;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * Gets the file's mime type
+	 * @return string
+	 */
+	public function getType()
+	{
+		if (!$this->type) {
+			$this->type = $this->determineType();
+		}
+		return $this->type;
+	}
+
+	/**
+	 * @since $VID:$
+	 * @return string
+	 */
+	protected function determineType()
+	{
+		if (!$this->getTmpFile()) {
+			return '';
+		}
+		$finfo = new finfo(FILEINFO_MIME_TYPE);
+		return $finfo->file($this->getTmpFile());
+	}
+
+	/**
+	 * Gets the file's extension.
+	 * @since $VID:$
+	 * @return string
+	 */
+	public function getExtension()
+	{
+		if (!$this->extension) {
+			$this->extension = $this->determineExtension();
+		}
+		return $this->extension;
+	}
+
+	/**
+	 * Determine's the file's extension given the temporary file.
+	 * @since $VID:$
+	 * @return string
+	 */
+	protected function determineExtension()
+	{
+		if (!$this->getTmpFile()) {
+			return '';
+		}
+		return pathinfo($this->getTmpFile(), PATHINFO_EXTENSION);
+	}
+
+	/**
+	 * Gets the size of the file
+	 * @return int
+	 */
+	public function getSize()
+	{
+		return $this->size;
+	}
+
+	/**
+	 * Gets the path to the temporary file which was uploaded.
+	 * @return string
+	 */
+	public function getTmpFile()
+	{
+		return $this->tmp_file;
+	}
+
+	/**
+	 * @since $VID:$
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->getTmpFile();
+	}
+
+	/**
+	 * Gets the error code PHP reported for the file upload.
+	 * @return string
+	 */
+	public function getErrorCode()
+	{
+		return $this->error_code;
+	}
 }
 // End of file FileSubmission.php
 // Location: EventEspresso\core\services\request\files/FileSubmission.php

core/services/request/files/FileSubmissionInterface.php

Indentation +30 added lines, -30 removed lines

@@ -15,36 +15,36 @@
 interface FileSubmissionInterface
 {
 
-    /**
-     * @return string
-     */
-    public function getName();
-
-    /**
-     * @return string
-     */
-    public function getType();
-
-    /**
-     * @return int
-     */
-    public function getSize();
-
-    /**
-     * @return string
-     */
-    public function getTmpFile();
-
-    /**
-     * @since $VID:$
-     * @return string
-     */
-    public function __toString();
-
-    /**
-     * @return string
-     */
-    public function getErrorCode();
+	/**
+	 * @return string
+	 */
+	public function getName();
+
+	/**
+	 * @return string
+	 */
+	public function getType();
+
+	/**
+	 * @return int
+	 */
+	public function getSize();
+
+	/**
+	 * @return string
+	 */
+	public function getTmpFile();
+
+	/**
+	 * @since $VID:$
+	 * @return string
+	 */
+	public function __toString();
+
+	/**
+	 * @return string
+	 */
+	public function getErrorCode();
 }
 // End of file FileSubmissionInterface.php
 // Location: EventEspresso\core\services\request\files/FileSubmissionInterface.php

core/services/request/files/FilesDataHandler.php

Indentation +242 added lines, -242 removed lines

@@ -38,260 +38,260 @@
  */
 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;
+	}
 
-    /**
-     * @since $VID:$
-     * @return CollectionInterface | FileSubmissionInterface[]
-     * @throws UnexpectedValueException
-     * @throws InvalidArgumentException
-     */
-    protected function getFileObjects()
-    {
-        $this->initialize();
-        return $this->file_objects;
-    }
+	/**
+	 * @since $VID:$
+	 * @return CollectionInterface | FileSubmissionInterface[]
+	 * @throws UnexpectedValueException
+	 * @throws InvalidArgumentException
+	 */
+	protected function getFileObjects()
+	{
+		$this->initialize();
+		return $this->file_objects;
+	}
 
-    /**
-     * Sets up the file objects from the request's $_FILES data.
-     * @since $VID:$
-     * @throws UnexpectedValueException
-     * @throws InvalidArgumentException
-     * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
-     */
-    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.
+	 * @since $VID:$
+	 * @throws UnexpectedValueException
+	 * @throws InvalidArgumentException
+	 * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
+	 */
+	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.
-     * @since $VID:$
-     * @param $files_data
-     * @return bool
-     * @throws UnexpectedValueException
-     */
-    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.
+	 * @since $VID:$
+	 * @param $files_data
+	 * @return bool
+	 * @throws UnexpectedValueException
+	 */
+	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.
-     * @since $VID:$
-     * @param $files_data
-     * @return array
-     */
-    protected function fixFilesDataArray($files_data)
-    {
-        $sane_files_array = [];
-        foreach ($files_data as $top_key => $top_key_value) {
-            foreach ($top_key_value as $lower_key => $lower_key_value) {
-                foreach ($lower_key_value as $lowest_key => $lowest_key_value) {
-                    $next_data = [
-                        $top_key => [
-                            $lowest_key => $this->organizeFilesData($lowest_key_value, $lower_key, $lowest_key)
-                        ]
-                    ];
-                    $sane_files_array = array_merge_recursive(
-                        $sane_files_array,
-                        $next_data
-                    );
-                }
-            }
-        }
-        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.
+	 * @since $VID:$
+	 * @param $files_data
+	 * @return array
+	 */
+	protected function fixFilesDataArray($files_data)
+	{
+		$sane_files_array = [];
+		foreach ($files_data as $top_key => $top_key_value) {
+			foreach ($top_key_value as $lower_key => $lower_key_value) {
+				foreach ($lower_key_value as $lowest_key => $lowest_key_value) {
+					$next_data = [
+						$top_key => [
+							$lowest_key => $this->organizeFilesData($lowest_key_value, $lower_key, $lowest_key)
+						]
+					];
+					$sane_files_array = array_merge_recursive(
+						$sane_files_array,
+						$next_data
+					);
+				}
+			}
+		}
+		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.
-     * @since $VID:$
-     * @param $data either 'name', 'tmp_name', 'size', or 'error'
-     * @param $type
-     * @return array
-     */
-    protected function organizeFilesData($data, $type)
-    {
-        $organized_data = [];
-        foreach ($data as $key => $val) {
-            if (is_array($val)) {
-                $organized_data[ $key ] = $this->organizeFilesData($val, $type);
-            } else {
-                $organized_data[ $key ][ $type ] = $val;
-            }
-        }
-        return $organized_data;
-    }
+	/**
+	 * Recursively explores the array until it finds a leaf node, and tacks `$type` as a final index in front of it.
+	 * @since $VID:$
+	 * @param $data either 'name', 'tmp_name', 'size', or 'error'
+	 * @param $type
+	 * @return array
+	 */
+	protected function organizeFilesData($data, $type)
+	{
+		$organized_data = [];
+		foreach ($data as $key => $val) {
+			if (is_array($val)) {
+				$organized_data[ $key ] = $this->organizeFilesData($val, $type);
+			} else {
+				$organized_data[ $key ][ $type ] = $val;
+			}
+		}
+		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 $_GET or $_POST, 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`.
-     * @since $VID:$
-     * @param array $organized_files $_FILES but organized like $_POST
-     * @param array $name_parts_so_far for multidimensional HTML form names,
-     * @throws UnexpectedValueException
-     * @throws InvalidArgumentException
-     */
-    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) {
-            array_push(
-                $name_parts_so_far,
-                $key
-            );
-            if (isset($value['name'], $value['tmp_name'], $value['size'])) {
-                $html_name = $this->inputNameFromParts($name_parts_so_far);
-                $this->file_objects->add(
-                    new FileSubmission(
-                        $html_name,
-                        $value['name'],
-                        $value['tmp_name'],
-                        $value['size'],
-                        $value['error']
-                    ),
-                    $html_name
-                );
-            } else {
-                $this->createFileObjects($value, $name_parts_so_far);
-            }
-        }
-    }
+	/**
+	 * Takes the organized $_FILES array (where all file info is located at the same spot as you'd expect an input
+	 * to be in $_GET or $_POST, 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`.
+	 * @since $VID:$
+	 * @param array $organized_files $_FILES but organized like $_POST
+	 * @param array $name_parts_so_far for multidimensional HTML form names,
+	 * @throws UnexpectedValueException
+	 * @throws InvalidArgumentException
+	 */
+	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) {
+			array_push(
+				$name_parts_so_far,
+				$key
+			);
+			if (isset($value['name'], $value['tmp_name'], $value['size'])) {
+				$html_name = $this->inputNameFromParts($name_parts_so_far);
+				$this->file_objects->add(
+					new FileSubmission(
+						$html_name,
+						$value['name'],
+						$value['tmp_name'],
+						$value['size'],
+						$value['error']
+					),
+					$html_name
+				);
+			} else {
+				$this->createFileObjects($value, $name_parts_so_far);
+			}
+		}
+	}
 
-    /**
-     * Takes the input name parts, like `['my', 'great', 'file', 'input1']`
-     * and returns the HTML name for it, "my[great][file][input1]"
-     * @since $VID:$
-     * @param $parts
-     * @throws UnexpectedValueException
-     */
-    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) {
-            if ($generated_string === '') {
-                $generated_string = (string) $part;
-            } else {
-                $generated_string .= '[' . (string) $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]"
+	 * @since $VID:$
+	 * @param $parts
+	 * @throws UnexpectedValueException
+	 */
+	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) {
+			if ($generated_string === '') {
+				$generated_string = (string) $part;
+			} else {
+				$generated_string .= '[' . (string) $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]');`
-     * @since $VID:$
-     * @param $name_parts
-     * @throws UnexpectedValueException
-     * @return FileSubmissionInterface
-     */
-    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]');`
+	 * @since $VID:$
+	 * @param $name_parts
+	 * @throws UnexpectedValueException
+	 * @return FileSubmissionInterface
+	 */
+	public function getFileObjectFromNameParts($name_parts)
+	{
+		return $this->getFileObjects()->get($this->inputNameFromParts($name_parts));
+	}
 
-    /**
-     * Gets the FileSubmissionInterface corresponding to the HTML name provided.
-     * @since $VID:$
-     * @param $html_name
-     * @return mixed
-     * @throws InvalidArgumentException
-     * @throws UnexpectedValueException
-     */
-    public function getFileObject($html_name)
-    {
-        return $this->getFileObjects()->get($html_name);
-    }
+	/**
+	 * Gets the FileSubmissionInterface corresponding to the HTML name provided.
+	 * @since $VID:$
+	 * @param $html_name
+	 * @return mixed
+	 * @throws InvalidArgumentException
+	 * @throws UnexpectedValueException
+	 */
+	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 +7 added lines, -7 removed lines

@@ -114,7 +114,7 @@ 
      */
     protected function isStrangeFilesArray($files_data)
     {
-        if (!is_array($files_data)) {
+        if ( ! is_array($files_data)) {
             throw new UnexpectedValueException(
                 sprintf(
                     esc_html__(
@@ -126,7 +126,7 @@ 
             );
         }
         $first_value = reset($files_data);
-        if (!is_array($first_value)) {
+        if ( ! is_array($first_value)) {
             throw new UnexpectedValueException(
                 sprintf(
                     esc_html__(
@@ -188,9 +188,9 @@ 
         $organized_data = [];
         foreach ($data as $key => $val) {
             if (is_array($val)) {
-                $organized_data[ $key ] = $this->organizeFilesData($val, $type);
+                $organized_data[$key] = $this->organizeFilesData($val, $type);
             } else {
-                $organized_data[ $key ][ $type ] = $val;
+                $organized_data[$key][$type] = $val;
             }
         }
         return $organized_data;
@@ -208,7 +208,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__(
@@ -251,7 +251,7 @@ 
      */
     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 = '';
@@ -259,7 +259,7 @@ 
             if ($generated_string === '') {
                 $generated_string = (string) $part;
             } else {
-                $generated_string .= '[' . (string) $part . ']';
+                $generated_string .= '['.(string) $part.']';
             }
         }
         return $generated_string;

core/entities/forms/UploadedFile.php

Doc Comments +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
      * Makes sure the input has the desired key and casts it as the appropriate type.
      * @since $VID:$
      * @param $php_file_info_array
-     * @param $desired_key
+     * @param string $desired_key
      * @param string $cast_as "string" or "int"
      * @return int|string
      * @throws InvalidArgumentException

Indentation +103 added lines, -103 removed lines

@@ -17,121 +17,121 @@
  */
 class UploadedFile
 {
-    /**
-     * @var string original name on the client machine
-     */
-    protected $name;
+	/**
+	 * @var string original name on the client machine
+	 */
+	protected $name;
 
-    /**
-     * @var string mime type
-     */
-    protected $type;
+	/**
+	 * @var string mime type
+	 */
+	protected $type;
 
-    /**
-     * @var int in bytes
-     */
-    protected $size;
+	/**
+	 * @var int in bytes
+	 */
+	protected $size;
 
-    /**
-     * @var string local filepath to the temporary file
-     */
-    protected $tmp_name;
+	/**
+	 * @var string local filepath to the temporary file
+	 */
+	protected $tmp_name;
 
-    /**
-     * @var string one of https://secure.php.net/manual/en/features.file-upload.errors.php
-     */
-    protected $error;
+	/**
+	 * @var string one of https://secure.php.net/manual/en/features.file-upload.errors.php
+	 */
+	protected $error;
 
-    public function __construct($php_file_info)
-    {
-        $this->name = $this->extractFromArrayOrThrowException($php_file_info, 'name');
-        try {
-            $this->type = $this->extractFromArrayOrThrowException($php_file_info, 'type');
-        } catch (InvalidArgumentException $e) {
-            // The browser must have not provided the mimetype, oh well.
-            $this->type = 'text/html';
-        }
-        $this->size = $this->extractFromArrayOrThrowException($php_file_info, 'size', 'int');
-        $this->tmp_name = $this->extractFromArrayOrThrowException($php_file_info, 'tmp_name');
-    }
+	public function __construct($php_file_info)
+	{
+		$this->name = $this->extractFromArrayOrThrowException($php_file_info, 'name');
+		try {
+			$this->type = $this->extractFromArrayOrThrowException($php_file_info, 'type');
+		} catch (InvalidArgumentException $e) {
+			// The browser must have not provided the mimetype, oh well.
+			$this->type = 'text/html';
+		}
+		$this->size = $this->extractFromArrayOrThrowException($php_file_info, 'size', 'int');
+		$this->tmp_name = $this->extractFromArrayOrThrowException($php_file_info, 'tmp_name');
+	}
 
-    /**
-     * Makes sure the input has the desired key and casts it as the appropriate type.
-     * @since $VID:$
-     * @param $php_file_info_array
-     * @param $desired_key
-     * @param string $cast_as "string" or "int"
-     * @return int|string
-     * @throws InvalidArgumentException
-     */
-    protected function extractFromArrayOrThrowException($php_file_info_array, $desired_key, $cast_as = 'string')
-    {
-        if (!isset($php_file_info_array[$desired_key])) {
-            throw new InvalidArgumentException(
-                sprintf(
-                    esc_html__('PHP Upload data for a file was missing the key %1$s', 'event_espresso'),
-                    $desired_key
-                )
-            );
-        }
-        $raw_value = $php_file_info_array[$desired_key];
-        switch ($cast_as) {
-            case 'int':
-                return (int)$raw_value;
-            case 'string':
-            default:
-                return (string)$raw_value;
-        }
-    }
+	/**
+	 * Makes sure the input has the desired key and casts it as the appropriate type.
+	 * @since $VID:$
+	 * @param $php_file_info_array
+	 * @param $desired_key
+	 * @param string $cast_as "string" or "int"
+	 * @return int|string
+	 * @throws InvalidArgumentException
+	 */
+	protected function extractFromArrayOrThrowException($php_file_info_array, $desired_key, $cast_as = 'string')
+	{
+		if (!isset($php_file_info_array[$desired_key])) {
+			throw new InvalidArgumentException(
+				sprintf(
+					esc_html__('PHP Upload data for a file was missing the key %1$s', 'event_espresso'),
+					$desired_key
+				)
+			);
+		}
+		$raw_value = $php_file_info_array[$desired_key];
+		switch ($cast_as) {
+			case 'int':
+				return (int)$raw_value;
+			case 'string':
+			default:
+				return (string)$raw_value;
+		}
+	}
 
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
 
-    /**
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
+	/**
+	 * @return string
+	 */
+	public function getType()
+	{
+		return $this->type;
+	}
 
-    /**
-     * @return int
-     */
-    public function getSize()
-    {
-        return $this->size;
-    }
+	/**
+	 * @return int
+	 */
+	public function getSize()
+	{
+		return $this->size;
+	}
 
-    /**
-     * @return string
-     */
-    public function getTmpName()
-    {
-        return $this->tmp_name;
-    }
+	/**
+	 * @return string
+	 */
+	public function getTmpName()
+	{
+		return $this->tmp_name;
+	}
 
-    /**
-     * @return string
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
+	/**
+	 * @return string
+	 */
+	public function getError()
+	{
+		return $this->error;
+	}
 
-    /**
-     * @since $VID:$
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getTmpName();
-    }
+	/**
+	 * @since $VID:$
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->getTmpName();
+	}
 }
 // End of file UploadedFile.php
 // Location: EventEspresso\core\entities\forms/UploadedFile.php

Spacing +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
      */
     protected function extractFromArrayOrThrowException($php_file_info_array, $desired_key, $cast_as = 'string')
     {
-        if (!isset($php_file_info_array[$desired_key])) {
+        if ( ! isset($php_file_info_array[$desired_key])) {
             throw new InvalidArgumentException(
                 sprintf(
                     esc_html__('PHP Upload data for a file was missing the key %1$s', 'event_espresso'),
@@ -77,10 +77,10 @@ 
         $raw_value = $php_file_info_array[$desired_key];
         switch ($cast_as) {
             case 'int':
-                return (int)$raw_value;
+                return (int) $raw_value;
             case 'string':
             default:
-                return (string)$raw_value;
+                return (string) $raw_value;
         }
     }
 

core/libraries/form_sections/inputs/EE_File_Input.input.php

Indentation +125 added lines, -125 removed lines

@@ -15,59 +15,59 @@ 
  */
 class EE_File_Input extends EE_Form_Input_Base
 {
-    /**
-     * @var array
-     */
-    protected $allowed_file_extensions;
+	/**
+	 * @var array
+	 */
+	protected $allowed_file_extensions;
 
-    /**
-     * @var
-     */
-    protected $allowed_mime_types;
+	/**
+	 * @var
+	 */
+	protected $allowed_mime_types;
 
-    /**
-     * @param array $options
-     * @throws InvalidArgumentException
-     */
-    public function __construct($options = array())
-    {
-        if (isset($options['allowed_file_extensions'])) {
-            if (!is_array($options['allowed_file_extensions'])) {
-                throw new InvalidArgumentException(esc_html__('A valid allowed_file_extensions array was not provided to EE_File_Input', 'event_espresso'));
-            }
-            $this->allowed_file_extensions = $options['allowed_file_extensions'];
-        } else {
-            $this->allowed_file_extensions = ['csv'];
-        }
-        if (isset($options['allowed_mime_types'])) {
-            if (!is_array($options['allowed_mime_types'])) {
-                throw new InvalidArgumentException(esc_html__('A valid allowed_mime_types array was not provided to EE_File_Input', 'event_espresso'));
-            }
-            $this->allowed_mime_types = $options['allowed_file_extensions'];
-        } else {
-            $this->allowed_mime_types = ['text/csv'];
-        }
+	/**
+	 * @param array $options
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct($options = array())
+	{
+		if (isset($options['allowed_file_extensions'])) {
+			if (!is_array($options['allowed_file_extensions'])) {
+				throw new InvalidArgumentException(esc_html__('A valid allowed_file_extensions array was not provided to EE_File_Input', 'event_espresso'));
+			}
+			$this->allowed_file_extensions = $options['allowed_file_extensions'];
+		} else {
+			$this->allowed_file_extensions = ['csv'];
+		}
+		if (isset($options['allowed_mime_types'])) {
+			if (!is_array($options['allowed_mime_types'])) {
+				throw new InvalidArgumentException(esc_html__('A valid allowed_mime_types array was not provided to EE_File_Input', 'event_espresso'));
+			}
+			$this->allowed_mime_types = $options['allowed_file_extensions'];
+		} else {
+			$this->allowed_mime_types = ['text/csv'];
+		}
 
-        $this->_set_display_strategy(new EE_File_Input_Display_Strategy());
-        $this->_set_normalization_strategy(new EE_File_Normalization());
-        $this->add_validation_strategy(
-            new EE_Text_Validation_Strategy(
-                sprintf(
-                // translators: %1$s is a list of allowed file extensions.
-                    esc_html__('Please provide a file of the requested filetype: %1$s', 'event_espresso'),
-                    implode(', ', $this->allowed_file_extensions)
-                ),
-                '~.*\.(' . implode('|', $this->allowed_file_extensions) . ')$~'
-            )
-        );
-        parent::__construct($options);
+		$this->_set_display_strategy(new EE_File_Input_Display_Strategy());
+		$this->_set_normalization_strategy(new EE_File_Normalization());
+		$this->add_validation_strategy(
+			new EE_Text_Validation_Strategy(
+				sprintf(
+				// translators: %1$s is a list of allowed file extensions.
+					esc_html__('Please provide a file of the requested filetype: %1$s', 'event_espresso'),
+					implode(', ', $this->allowed_file_extensions)
+				),
+				'~.*\.(' . implode('|', $this->allowed_file_extensions) . ')$~'
+			)
+		);
+		parent::__construct($options);
 
 //        It would be great to add this HTML attribute, but jQuery validate chokes on it.
-        $this->set_other_html_attributes(
-            $this->other_html_attributes()
-            . ' extension="'
-            . implode(
-                ',',
+		$this->set_other_html_attributes(
+			$this->other_html_attributes()
+			. ' extension="'
+			. implode(
+				',',
 //                array_merge(
 //                    array_map(
 //                        function ($mime_type) {
@@ -80,86 +80,86 @@ 
 //                        },
 //                        $this->allowed_mime_types
 //                    )
-                    array_map(
-                        function ($file_extension) {
-                            return  $file_extension;
-                        },
-                        $this->allowed_file_extensions
-                    )
+					array_map(
+						function ($file_extension) {
+							return  $file_extension;
+						},
+						$this->allowed_file_extensions
+					)
 //                )
-            )
-            . '"'
-        );
-    }
+			)
+			. '"'
+		);
+	}
 
-    /**
-     * 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", "temp_file", etc. So that file's data is located at "my[name][hierarchical][form]",
-     * "my[size][hierarchical][form]", "my[temp_name][hierarchical][form]", etc. It's really weird.
-     * @since $VID:$
-     * @param array $req_data
-     * @return array|mixed|NULL
-     * @throws EE_Error
-     */
-    public function find_form_data_for_this_section($req_data)
-    {
-        $name_parts = $this->getInputNameParts();
-        // now get the value for the input
-        $value = $this->findFileData($name_parts, $req_data);
+	/**
+	 * 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", "temp_file", etc. So that file's data is located at "my[name][hierarchical][form]",
+	 * "my[size][hierarchical][form]", "my[temp_name][hierarchical][form]", etc. It's really weird.
+	 * @since $VID:$
+	 * @param array $req_data
+	 * @return array|mixed|NULL
+	 * @throws EE_Error
+	 */
+	public function find_form_data_for_this_section($req_data)
+	{
+		$name_parts = $this->getInputNameParts();
+		// now get the value for the input
+		$value = $this->findFileData($name_parts, $req_data);
 
-        if (empty($value)) {
-            $value = $this->findFileData($name_parts, $_FILES);
-        }
-        if (empty($value)) {
-            array_shift($name_parts);
-            // check if this thing's name is at the TOP level of the request data
-            $value = $this->findFileData($name_parts, $req_data);
-        }
-        return $value;
-    }
+		if (empty($value)) {
+			$value = $this->findFileData($name_parts, $_FILES);
+		}
+		if (empty($value)) {
+			array_shift($name_parts);
+			// check if this thing's name is at the TOP level of the request data
+			$value = $this->findFileData($name_parts, $req_data);
+		}
+		return $value;
+	}
 
-    /**
-     * Look for the file's data in this request data.
-     * @since $VID:$
-     * @param $name_parts
-     * @param $req_data
-     * @return array
-     */
-    protected function findFileData($name_parts, $req_data)
-    {
-        $file_parts = [
-            'name',
-            'error',
-            'size',
-            'tmp_name',
-            'type'
-        ];
-        $file_data = [];
-        foreach($file_parts as $file_part){
-            $datum = $this->findRequestForSectionUsingNameParts($this->getFileDataNameParts($name_parts, $file_part),$req_data);
-            if(!empty($datum)) {
-                $file_data[$file_part] = $datum;
-            }
-        }
-        return $file_data;
-    }
+	/**
+	 * Look for the file's data in this request data.
+	 * @since $VID:$
+	 * @param $name_parts
+	 * @param $req_data
+	 * @return array
+	 */
+	protected function findFileData($name_parts, $req_data)
+	{
+		$file_parts = [
+			'name',
+			'error',
+			'size',
+			'tmp_name',
+			'type'
+		];
+		$file_data = [];
+		foreach($file_parts as $file_part){
+			$datum = $this->findRequestForSectionUsingNameParts($this->getFileDataNameParts($name_parts, $file_part),$req_data);
+			if(!empty($datum)) {
+				$file_data[$file_part] = $datum;
+			}
+		}
+		return $file_data;
+	}
 
-    /**
-     * Finds the file name parts for the desired file data.
-     * @since $VID:$
-     * @param $original_name_parts
-     * @param $file_data_sought
-     * @return array
-     */
-    protected function getFileDataNameParts($original_name_parts, $file_data_sought){
-        return
-            array_merge(
-                [
-                    $original_name_parts[0],
-                    $file_data_sought
-                ],
-            array_slice($original_name_parts, 1)
-        );
-    }
+	/**
+	 * Finds the file name parts for the desired file data.
+	 * @since $VID:$
+	 * @param $original_name_parts
+	 * @param $file_data_sought
+	 * @return array
+	 */
+	protected function getFileDataNameParts($original_name_parts, $file_data_sought){
+		return
+			array_merge(
+				[
+					$original_name_parts[0],
+					$file_data_sought
+				],
+			array_slice($original_name_parts, 1)
+		);
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
     public function __construct($options = array())
     {
         if (isset($options['allowed_file_extensions'])) {
-            if (!is_array($options['allowed_file_extensions'])) {
+            if ( ! is_array($options['allowed_file_extensions'])) {
                 throw new InvalidArgumentException(esc_html__('A valid allowed_file_extensions array was not provided to EE_File_Input', 'event_espresso'));
             }
             $this->allowed_file_extensions = $options['allowed_file_extensions'];
@@ -40,7 +40,7 @@ 
             $this->allowed_file_extensions = ['csv'];
         }
         if (isset($options['allowed_mime_types'])) {
-            if (!is_array($options['allowed_mime_types'])) {
+            if ( ! is_array($options['allowed_mime_types'])) {
                 throw new InvalidArgumentException(esc_html__('A valid allowed_mime_types array was not provided to EE_File_Input', 'event_espresso'));
             }
             $this->allowed_mime_types = $options['allowed_file_extensions'];
@@ -57,7 +57,7 @@ 
                     esc_html__('Please provide a file of the requested filetype: %1$s', 'event_espresso'),
                     implode(', ', $this->allowed_file_extensions)
                 ),
-                '~.*\.(' . implode('|', $this->allowed_file_extensions) . ')$~'
+                '~.*\.('.implode('|', $this->allowed_file_extensions).')$~'
             )
         );
         parent::__construct($options);
@@ -81,7 +81,7 @@ 
 //                        $this->allowed_mime_types
 //                    )
                     array_map(
-                        function ($file_extension) {
+                        function($file_extension) {
                             return  $file_extension;
                         },
                         $this->allowed_file_extensions
@@ -136,9 +136,9 @@ 
             'type'
         ];
         $file_data = [];
-        foreach($file_parts as $file_part){
-            $datum = $this->findRequestForSectionUsingNameParts($this->getFileDataNameParts($name_parts, $file_part),$req_data);
-            if(!empty($datum)) {
+        foreach ($file_parts as $file_part) {
+            $datum = $this->findRequestForSectionUsingNameParts($this->getFileDataNameParts($name_parts, $file_part), $req_data);
+            if ( ! empty($datum)) {
                 $file_data[$file_part] = $datum;
             }
         }
@@ -152,7 +152,7 @@ 
      * @param $file_data_sought
      * @return array
      */
-    protected function getFileDataNameParts($original_name_parts, $file_data_sought){
+    protected function getFileDataNameParts($original_name_parts, $file_data_sought) {
         return
             array_merge(
                 [