formers / former

src/Former/Interfaces/FrameworkInterface.php

Indentation +137 added lines, -137 removed lines

@@ -8,141 +8,141 @@
  */
 interface FrameworkInterface
 {
-	/**
-	 * Filter buttons classes
-	 *
-	 * @param  array $classes An array of classes
-	 *
-	 * @return array A filtered array
-	 */
-	public function filterButtonClasses($classes);
-
-	/**
-	 * Filter field classes
-	 *
-	 * @param  array $classes An array of classes
-	 *
-	 * @return array A filtered array
-	 */
-	public function filterFieldClasses($classes);
-
-	/**
-	 * Add classes to a field
-	 *
-	 * @param Field $field
-	 * @param array $classes The possible classes to add
-	 *
-	 * @return Field
-	 */
-	public function getFieldClasses(Field $field, $classes);
-
-	/**
-	 * Add group classes
-	 *
-	 * @return string A list of group classes
-	 */
-	public function getGroupClasses();
-
-	/**
-	 * Add label classes
-	 *
-	 * @return array An array of attributes with the label class
-	 */
-	public function getLabelClasses();
-
-	/**
-	 * Add uneditable field classes
-	 *
-	 * @return array An array of attributes with the uneditable class
-	 */
-	public function getUneditableClasses();
-
-	/**
-	 * Add plain text field classes
-	 *
-	 * @return array An array of attributes with the plain text class
-	 */
-	public function getPlainTextClasses();
-
-	/**
-	 * Add form class
-	 *
-	 * @param  string $type The type of form to add
-	 *
-	 * @return array
-	 */
-	public function getFormClasses($type);
-
-	/**
-	 * Add actions block class
-	 *
-	 * @return array
-	 */
-	public function getActionClasses();
-
-	/**
-	 * Render an help text
-	 *
-	 * @param string $text
-	 * @param array  $attributes
-	 *
-	 * @return string
-	 */
-	public function createHelp($text, $attributes = array());
-
-	/**
-	 * Render a disabled field
-	 *
-	 * @param Field $field
-	 *
-	 * @return string
-	 */
-	public function createDisabledField(Field $field);
-
-	/**
-	 * Render a plain text field
-	 *
-	 * @param Field $field
-	 *
-	 * @return string
-	 */
-	public function createPlainTextField(Field $field);
-
-	/**
-	 * Render an icon
-	 *
-	 * @param array $attributes Its attributes
-	 *
-	 * @return string
-	 */
-	public function createIcon($iconType, $attributes = array());
-
-	/**
-	 * Wrap an item to be prepended or appended to the current field
-	 *
-	 * @param  string $item
-	 *
-	 * @return string A wrapped item
-	 */
-	public function placeAround($item);
-
-	/**
-	 * Wrap a field with prepended and appended items
-	 *
-	 * @param  Field $field
-	 * @param  array $prepend
-	 * @param  array $append
-	 *
-	 * @return string A field concatented with prepended and/or appended items
-	 */
-	public function prependAppend($field, $prepend, $append);
-
-	/**
-	 * Wrap a field with potential additional tags
-	 *
-	 * @param  Field $field
-	 *
-	 * @return string A wrapped field
-	 */
-	public function wrapField($field);
+    /**
+     * Filter buttons classes
+     *
+     * @param  array $classes An array of classes
+     *
+     * @return array A filtered array
+     */
+    public function filterButtonClasses($classes);
+
+    /**
+     * Filter field classes
+     *
+     * @param  array $classes An array of classes
+     *
+     * @return array A filtered array
+     */
+    public function filterFieldClasses($classes);
+
+    /**
+     * Add classes to a field
+     *
+     * @param Field $field
+     * @param array $classes The possible classes to add
+     *
+     * @return Field
+     */
+    public function getFieldClasses(Field $field, $classes);
+
+    /**
+     * Add group classes
+     *
+     * @return string A list of group classes
+     */
+    public function getGroupClasses();
+
+    /**
+     * Add label classes
+     *
+     * @return array An array of attributes with the label class
+     */
+    public function getLabelClasses();
+
+    /**
+     * Add uneditable field classes
+     *
+     * @return array An array of attributes with the uneditable class
+     */
+    public function getUneditableClasses();
+
+    /**
+     * Add plain text field classes
+     *
+     * @return array An array of attributes with the plain text class
+     */
+    public function getPlainTextClasses();
+
+    /**
+     * Add form class
+     *
+     * @param  string $type The type of form to add
+     *
+     * @return array
+     */
+    public function getFormClasses($type);
+
+    /**
+     * Add actions block class
+     *
+     * @return array
+     */
+    public function getActionClasses();
+
+    /**
+     * Render an help text
+     *
+     * @param string $text
+     * @param array  $attributes
+     *
+     * @return string
+     */
+    public function createHelp($text, $attributes = array());
+
+    /**
+     * Render a disabled field
+     *
+     * @param Field $field
+     *
+     * @return string
+     */
+    public function createDisabledField(Field $field);
+
+    /**
+     * Render a plain text field
+     *
+     * @param Field $field
+     *
+     * @return string
+     */
+    public function createPlainTextField(Field $field);
+
+    /**
+     * Render an icon
+     *
+     * @param array $attributes Its attributes
+     *
+     * @return string
+     */
+    public function createIcon($iconType, $attributes = array());
+
+    /**
+     * Wrap an item to be prepended or appended to the current field
+     *
+     * @param  string $item
+     *
+     * @return string A wrapped item
+     */
+    public function placeAround($item);
+
+    /**
+     * Wrap a field with prepended and appended items
+     *
+     * @param  Field $field
+     * @param  array $prepend
+     * @param  array $append
+     *
+     * @return string A field concatented with prepended and/or appended items
+     */
+    public function prependAppend($field, $prepend, $append);
+
+    /**
+     * Wrap a field with potential additional tags
+     *
+     * @param  Field $field
+     *
+     * @return string A wrapped field
+     */
+    public function wrapField($field);
 }

src/Former/Interfaces/FieldInterface.php

Indentation +6 added lines, -6 removed lines

@@ -6,10 +6,10 @@
  */
 interface FieldInterface
 {
-	/**
-	 * Renders the field
-	 *
-	 * @return string
-	 */
-	public function render();
+    /**
+     * Renders the field
+     *
+     * @return string
+     */
+    public function render();
 }

src/Former/Populator.php

Indentation +167 added lines, -167 removed lines

@@ -11,171 +11,171 @@
  */
 class Populator extends Collection
 {
-	/**
-	 * Create a new collection.
-	 *
-	 * @param  array|Model $items
-	 *
-	 * @return void
-	 */
-	public function __construct($items = array())
-	{
-		$this->items = $items;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////// INDIVIDUAL VALUES ////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Get the value of a field
-	 *
-	 * @param string $field The field's name
-	 *
-	 * @return mixed
-	 */
-	public function get($field, $fallback = null)
-	{
-		// Anonymous fields should not return any value
-		if ($field == null) {
-			return null;
-		}
-
-		// Plain array
-		if (is_array($this->items) and !str_contains($field, '[')) {
-			return parent::get($field, $fallback);
-		}
-
-		// Transform the name into an array
-		$value = $this->items;
-		$field = $this->parseFieldAsArray($field);
-
-		// Dive into the model
-		foreach ($field as $relationship) {
-
-			// Get attribute from model
-			if (!is_array($value)) {
-				$value = $this->getAttributeFromModel($value, $relationship, $fallback);
-
-				continue;
-			}
-
-			// Get attribute from model
-			if (array_key_exists($relationship, $value)) {
-				$value = $value[$relationship];
-			} else {
-				// Check array for submodels that may contain the relationship
-				$inSubmodel = false;
-
-				foreach ($value as $key => $submodel) {
-					$value[$key] = $this->getAttributeFromModel($submodel, $relationship, $fallback);
-
-					if ($value[$key] !== $fallback) {
-						$inSubmodel = true;
-					}
-				}
-
-				// If no submodels contained the relationship, return the fallback, not an array of fallbacks
-				if (!$inSubmodel) {
-					$value = $fallback;
-					break;
-				}
-			}
-		}
-
-		return $value;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////////// SWAPPERS /////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Replace the items
-	 *
-	 * @param  mixed $items
-	 *
-	 * @return void
-	 */
-	public function replace($items)
-	{
-		$this->items = $items;
-	}
-
-	/**
-	 * Reset the current values array
-	 *
-	 * @return void
-	 */
-	public function reset()
-	{
-		$this->items = array();
-	}
-
-	////////////////////////////////////////////////////////////////////
-	////////////////////////////// HELPERS /////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Parses the name of a field to a tree of fields
-	 *
-	 * @param string $field The field's name
-	 *
-	 * @return array A tree of field
-	 */
-	protected function parseFieldAsArray($field)
-	{
-		if (Str::contains($field, '[]')) {
-			return (array) $field;
-		}
-
-		// Transform array notation to dot notation
-		if (Str::contains($field, '[')) {
-			$field = preg_replace("/[\[\]]/", '.', $field);
-			$field = str_replace('..', '.', $field);
-			$field = trim($field, '.');
-		}
-
-		// Parse dot notation
-		if (Str::contains($field, '.')) {
-			$field = explode('.', $field);
-		} else {
-			$field = (array) $field;
-		}
-
-		return $field;
-	}
-
-	/**
-	 * Get an attribute from a model
-	 *
-	 * @param object $model     The model
-	 * @param string $attribute The attribute's name
-	 * @param string $fallback  Fallback value
-	 *
-	 * @return mixed
-	 */
-	public function getAttributeFromModel($model, $attribute, $fallback)
-	{
-		if ($model instanceof Model) {
-			// Return fallback if attribute is null
-			$value = $model->getAttribute($attribute);
-			return is_null($value) ? $fallback : $value;
-		}
-
-		if ($model instanceof Collection) {
-			return $model->get($attribute, $fallback);
-		}
-
-		if (is_object($model) && method_exists($model, 'toArray')) {
-			$model = $model->toArray();
-		} else {
-			$model = (array) $model;
-		}
-		if (array_key_exists($attribute, $model)) {
-			return $model[$attribute];
-		}
-
-		return $fallback;
-	}
+    /**
+     * Create a new collection.
+     *
+     * @param  array|Model $items
+     *
+     * @return void
+     */
+    public function __construct($items = array())
+    {
+        $this->items = $items;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////// INDIVIDUAL VALUES ////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Get the value of a field
+     *
+     * @param string $field The field's name
+     *
+     * @return mixed
+     */
+    public function get($field, $fallback = null)
+    {
+        // Anonymous fields should not return any value
+        if ($field == null) {
+            return null;
+        }
+
+        // Plain array
+        if (is_array($this->items) and !str_contains($field, '[')) {
+            return parent::get($field, $fallback);
+        }
+
+        // Transform the name into an array
+        $value = $this->items;
+        $field = $this->parseFieldAsArray($field);
+
+        // Dive into the model
+        foreach ($field as $relationship) {
+
+            // Get attribute from model
+            if (!is_array($value)) {
+                $value = $this->getAttributeFromModel($value, $relationship, $fallback);
+
+                continue;
+            }
+
+            // Get attribute from model
+            if (array_key_exists($relationship, $value)) {
+                $value = $value[$relationship];
+            } else {
+                // Check array for submodels that may contain the relationship
+                $inSubmodel = false;
+
+                foreach ($value as $key => $submodel) {
+                    $value[$key] = $this->getAttributeFromModel($submodel, $relationship, $fallback);
+
+                    if ($value[$key] !== $fallback) {
+                        $inSubmodel = true;
+                    }
+                }
+
+                // If no submodels contained the relationship, return the fallback, not an array of fallbacks
+                if (!$inSubmodel) {
+                    $value = $fallback;
+                    break;
+                }
+            }
+        }
+
+        return $value;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////////// SWAPPERS /////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Replace the items
+     *
+     * @param  mixed $items
+     *
+     * @return void
+     */
+    public function replace($items)
+    {
+        $this->items = $items;
+    }
+
+    /**
+     * Reset the current values array
+     *
+     * @return void
+     */
+    public function reset()
+    {
+        $this->items = array();
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////////// HELPERS /////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Parses the name of a field to a tree of fields
+     *
+     * @param string $field The field's name
+     *
+     * @return array A tree of field
+     */
+    protected function parseFieldAsArray($field)
+    {
+        if (Str::contains($field, '[]')) {
+            return (array) $field;
+        }
+
+        // Transform array notation to dot notation
+        if (Str::contains($field, '[')) {
+            $field = preg_replace("/[\[\]]/", '.', $field);
+            $field = str_replace('..', '.', $field);
+            $field = trim($field, '.');
+        }
+
+        // Parse dot notation
+        if (Str::contains($field, '.')) {
+            $field = explode('.', $field);
+        } else {
+            $field = (array) $field;
+        }
+
+        return $field;
+    }
+
+    /**
+     * Get an attribute from a model
+     *
+     * @param object $model     The model
+     * @param string $attribute The attribute's name
+     * @param string $fallback  Fallback value
+     *
+     * @return mixed
+     */
+    public function getAttributeFromModel($model, $attribute, $fallback)
+    {
+        if ($model instanceof Model) {
+            // Return fallback if attribute is null
+            $value = $model->getAttribute($attribute);
+            return is_null($value) ? $fallback : $value;
+        }
+
+        if ($model instanceof Collection) {
+            return $model->get($attribute, $fallback);
+        }
+
+        if (is_object($model) && method_exists($model, 'toArray')) {
+            $model = $model->toArray();
+        } else {
+            $model = (array) $model;
+        }
+        if (array_key_exists($attribute, $model)) {
+            return $model[$attribute];
+        }
+
+        return $fallback;
+    }
 }

src/Laravel/File.php

Indentation +121 added lines, -121 removed lines

@@ -7,128 +7,128 @@
 
 class File
 {
-	private static $mimes = array(
-		'ai'    => 'application/postscript',
-		'aif'   => 'audio/x-aiff',
-		'aifc'  => 'audio/x-aiff',
-		'aiff'  => 'audio/x-aiff',
-		'avi'   => 'video/x-msvideo',
-		'bin'   => 'application/macbinary',
-		'bmp'   => 'image/bmp',
-		'class' => 'application/octet-stream',
-		'cpt'   => 'application/mac-compactpro',
-		'css'   => 'text/css',
-		'csv'   => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream'),
-		'dcr'   => 'application/x-director',
-		'dir'   => 'application/x-director',
-		'dll'   => 'application/octet-stream',
-		'dms'   => 'application/octet-stream',
-		'doc'   => 'application/msword',
-		'docx'  => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-		'dvi'   => 'application/x-dvi',
-		'dxr'   => 'application/x-director',
-		'eml'   => 'message/rfc822',
-		'eps'   => 'application/postscript',
-		'exe'   => array('application/octet-stream', 'application/x-msdownload'),
-		'gif'   => 'image/gif',
-		'gtar'  => 'application/x-gtar',
-		'gz'    => 'application/x-gzip',
-		'hqx'   => 'application/mac-binhex40',
-		'htm'   => 'text/html',
-		'html'  => 'text/html',
-		'jpe'   => array('image/jpeg', 'image/pjpeg'),
-		'jpeg'  => array('image/jpeg', 'image/pjpeg'),
-		'jpg'   => array('image/jpeg', 'image/pjpeg'),
-		'js'    => 'application/x-javascript',
-		'json'  => array('application/json', 'text/json'),
-		'lha'   => 'application/octet-stream',
-		'log'   => array('text/plain', 'text/x-log'),
-		'lzh'   => 'application/octet-stream',
-		'mid'   => 'audio/midi',
-		'midi'  => 'audio/midi',
-		'mif'   => 'application/vnd.mif',
-		'mov'   => 'video/quicktime',
-		'movie' => 'video/x-sgi-movie',
-		'mp2'   => 'audio/mpeg',
-		'mp3'   => array('audio/mpeg', 'audio/mpg', 'audio/mpeg3', 'audio/mp3'),
-		'mpe'   => 'video/mpeg',
-		'mpeg'  => 'video/mpeg',
-		'mpg'   => 'video/mpeg',
-		'mpga'  => 'audio/mpeg',
-		'oda'   => 'application/oda',
-		'odp'   => 'application/vnd.oasis.opendocument.presentation',
-		'ods'   => 'application/vnd.oasis.opendocument.spreadsheet',
-		'odt'   => 'application/vnd.oasis.opendocument.text',
-		'pdf'   => array('application/pdf', 'application/x-download'),
-		'php'   => array('application/x-httpd-php', 'text/x-php'),
-		'php3'  => 'application/x-httpd-php',
-		'php4'  => 'application/x-httpd-php',
-		'phps'  => 'application/x-httpd-php-source',
-		'phtml' => 'application/x-httpd-php',
-		'png'   => 'image/png',
-		'pps'   => array('application/mspowerpoint', 'application/vnd.ms-powerpoint'),
-		'ppsx'  => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
-		'ppt'   => array('application/vnd.ms-powerpoint', 'application/powerpoint'),
-		'pptx'  => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-		'ps'    => 'application/postscript',
-		'psd'   => 'application/x-photoshop',
-		'qt'    => 'video/quicktime',
-		'ra'    => 'audio/x-realaudio',
-		'ram'   => 'audio/x-pn-realaudio',
-		'rm'    => 'audio/x-pn-realaudio',
-		'rpm'   => 'audio/x-pn-realaudio-plugin',
-		'rtf'   => array('application/rtf', 'text/rtf'),
-		'rtx'   => 'text/richtext',
-		'rv'    => 'video/vnd.rn-realvideo',
-		'sea'   => 'application/octet-stream',
-		'shtml' => 'text/html',
-		'sit'   => 'application/x-stuffit',
-		'smi'   => 'application/smil',
-		'smil'  => 'application/smil',
-		'so'    => 'application/octet-stream',
-		'swf'   => 'application/x-shockwave-flash',
-		'tar'   => 'application/x-tar',
-		'text'  => 'text/plain',
-		'tgz'   => array('application/x-tar', 'application/x-gzip-compressed'),
-		'tif'   => 'image/tiff',
-		'tiff'  => 'image/tiff',
-		'txt'   => 'text/plain',
-		'wav'   => 'audio/x-wav',
-		'wbxml' => 'application/wbxml',
-		'wmlc'  => 'application/wmlc',
-		'word'  => array('application/msword', 'application/octet-stream'),
-		'xht'   => 'application/xhtml+xml',
-		'xhtml' => 'application/xhtml+xml',
-		'xl'    => 'application/excel',
-		'xls'   => array('application/vnd.ms-excel', 'application/excel', 'application/msexcel'),
-		'xlsx'  => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-		'xml'   => 'text/xml',
-		'xsl'   => 'text/xml',
-		'zip'   => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'),
-	);
+    private static $mimes = array(
+        'ai'    => 'application/postscript',
+        'aif'   => 'audio/x-aiff',
+        'aifc'  => 'audio/x-aiff',
+        'aiff'  => 'audio/x-aiff',
+        'avi'   => 'video/x-msvideo',
+        'bin'   => 'application/macbinary',
+        'bmp'   => 'image/bmp',
+        'class' => 'application/octet-stream',
+        'cpt'   => 'application/mac-compactpro',
+        'css'   => 'text/css',
+        'csv'   => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream'),
+        'dcr'   => 'application/x-director',
+        'dir'   => 'application/x-director',
+        'dll'   => 'application/octet-stream',
+        'dms'   => 'application/octet-stream',
+        'doc'   => 'application/msword',
+        'docx'  => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+        'dvi'   => 'application/x-dvi',
+        'dxr'   => 'application/x-director',
+        'eml'   => 'message/rfc822',
+        'eps'   => 'application/postscript',
+        'exe'   => array('application/octet-stream', 'application/x-msdownload'),
+        'gif'   => 'image/gif',
+        'gtar'  => 'application/x-gtar',
+        'gz'    => 'application/x-gzip',
+        'hqx'   => 'application/mac-binhex40',
+        'htm'   => 'text/html',
+        'html'  => 'text/html',
+        'jpe'   => array('image/jpeg', 'image/pjpeg'),
+        'jpeg'  => array('image/jpeg', 'image/pjpeg'),
+        'jpg'   => array('image/jpeg', 'image/pjpeg'),
+        'js'    => 'application/x-javascript',
+        'json'  => array('application/json', 'text/json'),
+        'lha'   => 'application/octet-stream',
+        'log'   => array('text/plain', 'text/x-log'),
+        'lzh'   => 'application/octet-stream',
+        'mid'   => 'audio/midi',
+        'midi'  => 'audio/midi',
+        'mif'   => 'application/vnd.mif',
+        'mov'   => 'video/quicktime',
+        'movie' => 'video/x-sgi-movie',
+        'mp2'   => 'audio/mpeg',
+        'mp3'   => array('audio/mpeg', 'audio/mpg', 'audio/mpeg3', 'audio/mp3'),
+        'mpe'   => 'video/mpeg',
+        'mpeg'  => 'video/mpeg',
+        'mpg'   => 'video/mpeg',
+        'mpga'  => 'audio/mpeg',
+        'oda'   => 'application/oda',
+        'odp'   => 'application/vnd.oasis.opendocument.presentation',
+        'ods'   => 'application/vnd.oasis.opendocument.spreadsheet',
+        'odt'   => 'application/vnd.oasis.opendocument.text',
+        'pdf'   => array('application/pdf', 'application/x-download'),
+        'php'   => array('application/x-httpd-php', 'text/x-php'),
+        'php3'  => 'application/x-httpd-php',
+        'php4'  => 'application/x-httpd-php',
+        'phps'  => 'application/x-httpd-php-source',
+        'phtml' => 'application/x-httpd-php',
+        'png'   => 'image/png',
+        'pps'   => array('application/mspowerpoint', 'application/vnd.ms-powerpoint'),
+        'ppsx'  => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+        'ppt'   => array('application/vnd.ms-powerpoint', 'application/powerpoint'),
+        'pptx'  => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+        'ps'    => 'application/postscript',
+        'psd'   => 'application/x-photoshop',
+        'qt'    => 'video/quicktime',
+        'ra'    => 'audio/x-realaudio',
+        'ram'   => 'audio/x-pn-realaudio',
+        'rm'    => 'audio/x-pn-realaudio',
+        'rpm'   => 'audio/x-pn-realaudio-plugin',
+        'rtf'   => array('application/rtf', 'text/rtf'),
+        'rtx'   => 'text/richtext',
+        'rv'    => 'video/vnd.rn-realvideo',
+        'sea'   => 'application/octet-stream',
+        'shtml' => 'text/html',
+        'sit'   => 'application/x-stuffit',
+        'smi'   => 'application/smil',
+        'smil'  => 'application/smil',
+        'so'    => 'application/octet-stream',
+        'swf'   => 'application/x-shockwave-flash',
+        'tar'   => 'application/x-tar',
+        'text'  => 'text/plain',
+        'tgz'   => array('application/x-tar', 'application/x-gzip-compressed'),
+        'tif'   => 'image/tiff',
+        'tiff'  => 'image/tiff',
+        'txt'   => 'text/plain',
+        'wav'   => 'audio/x-wav',
+        'wbxml' => 'application/wbxml',
+        'wmlc'  => 'application/wmlc',
+        'word'  => array('application/msword', 'application/octet-stream'),
+        'xht'   => 'application/xhtml+xml',
+        'xhtml' => 'application/xhtml+xml',
+        'xl'    => 'application/excel',
+        'xls'   => array('application/vnd.ms-excel', 'application/excel', 'application/msexcel'),
+        'xlsx'  => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+        'xml'   => 'text/xml',
+        'xsl'   => 'text/xml',
+        'zip'   => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'),
+    );
 
-	/**
-	 * Get a file MIME type by extension.
-	 * <code>
-	 *    // Determine the MIME type for the .tar extension
-	 *    $mime = File::mime('tar');
-	 *    // Return a default value if the MIME can't be determined
-	 *    $mime = File::mime('ext', 'application/octet-stream');
-	 * </code>
-	 *
-	 * @param  string $extension
-	 * @param  string $default
-	 *
-	 * @return string
-	 */
-	public static function mime($extension, $default = 'application/octet-stream')
-	{
-		$mimes = self::$mimes;
+    /**
+     * Get a file MIME type by extension.
+     * <code>
+     *    // Determine the MIME type for the .tar extension
+     *    $mime = File::mime('tar');
+     *    // Return a default value if the MIME can't be determined
+     *    $mime = File::mime('ext', 'application/octet-stream');
+     * </code>
+     *
+     * @param  string $extension
+     * @param  string $default
+     *
+     * @return string
+     */
+    public static function mime($extension, $default = 'application/octet-stream')
+    {
+        $mimes = self::$mimes;
 
-		if (!array_key_exists($extension, $mimes)) {
-			return $default;
-		}
+        if (!array_key_exists($extension, $mimes)) {
+            return $default;
+        }
 
-		return (is_array($mimes[$extension])) ? $mimes[$extension][0] : $mimes[$extension];
-	}
+        return (is_array($mimes[$extension])) ? $mimes[$extension][0] : $mimes[$extension];
+    }
 }

src/config/former.php

Indentation +179 added lines, -179 removed lines

@@ -1,184 +1,184 @@
 <?php return array(
 
-	// Markup
-	////////////////////////////////////////////////////////////////////
-
-	// Whether labels should be automatically computed from name
-	'automatic_label'         => true,
-
-	// The default form type
-	'default_form_type'       => 'horizontal',
-
-	// Validation
-	////////////////////////////////////////////////////////////////////
-
-	// Whether Former should fetch errors from Session
-	'fetch_errors'            => true,
-
-	// Whether Former should try to apply Validator rules as attributes
-	'live_validation'         => true,
-
-	// Whether Former should automatically fetch error messages and
-	// display them next to the matching fields
-	'error_messages'          => true,
-
-	// Checkables
-	////////////////////////////////////////////////////////////////////
-
-	// Whether checkboxes should always be present in the POST data,
-	// no matter if you checked them or not
-	'push_checkboxes'         => false,
-
-	// The value a checkbox will have in the POST array if unchecked
-	'unchecked_value'         => 0,
-
-	// Required fields
-	////////////////////////////////////////////////////////////////////
-
-	// The class to be added to required fields
-	'required_class'          => 'required',
-
-	// A facultative text to append to the labels of required fields
-	'required_text'           => '<sup>*</sup>',
-
-	// Translations
-	////////////////////////////////////////////////////////////////////
-
-	// Where Former should look for translations
-	'translate_from'          => 'validation.attributes',
-
-	// Whether text that comes out of the translated
-	// should be capitalized (ex: email => Email) automatically
-	'capitalize_translations' => true,
-
-	// An array of attributes to automatically translate
-	'translatable'            => array(
-		'help',
-		'inlineHelp',
-		'blockHelp',
-		'placeholder',
-		'data_placeholder',
-		'label',
-	),
-
-	// Framework
-	////////////////////////////////////////////////////////////////////
-
-	// The framework to be used by Former
-	'framework'               => 'TwitterBootstrap3',
-
-	'TwitterBootstrap3'       => array(
-
-		// Map Former-supported viewports to Bootstrap 3 equivalents
-		'viewports'   => array(
-			'large'  => 'lg',
-			'medium' => 'md',
-			'small'  => 'sm',
-			'mini'   => 'xs',
-		),
-		// Width of labels for horizontal forms expressed as viewport => grid columns
-		'labelWidths' => array(
-			'large' => 2,
-			'small' => 4,
-		),
-		// HTML markup and classes used by Bootstrap 3 for icons
-		'icon'        => array(
-			'tag'    => 'span',
-			'set'    => 'glyphicon',
-			'prefix' => 'glyphicon',
-		),
-
-	),
-
-	'Nude'                    => array(  // No-framework markup
-		'icon' => array(
-			'tag'    => 'i',
-			'set'    => null,
-			'prefix' => 'icon',
-		),
-	),
-
-	'TwitterBootstrap'        => array( // Twitter Bootstrap version 2
-		'icon' => array(
-			'tag'    => 'i',
-			'set'    => null,
-			'prefix' => 'icon',
-		),
-	),
-
-	'ZurbFoundation5'         => array(
-		// Map Former-supported viewports to Foundation 5 equivalents
-		'viewports'           => array(
-			'large'  => 'large',
-			'medium' => null,
-			'small'  => 'small',
-			'mini'   => null,
-		),
-		// Width of labels for horizontal forms expressed as viewport => grid columns
-		'labelWidths'         => array(
-			'small' => 3,
-		),
-		// Classes to be applied to wrapped labels in horizontal forms
-		'wrappedLabelClasses' => array('right', 'inline'),
-		// HTML markup and classes used by Foundation 5 for icons
-		'icon'                => array(
-			'tag'    => 'i',
-			'set'    => null,
-			'prefix' => 'fi',
-		),
-		// CSS for inline validation errors
-		'error_classes'       => array('class' => 'error'),
-	),
-
-	'ZurbFoundation4'         => array(
-		// Foundation 4 also has an experimental "medium" breakpoint
-		// explained at http://foundation.zurb.com/docs/components/grid.html
-		'viewports'           => array(
-			'large'  => 'large',
-			'medium' => null,
-			'small'  => 'small',
-			'mini'   => null,
-		),
-		// Width of labels for horizontal forms expressed as viewport => grid columns
-		'labelWidths'         => array(
-			'small' => 3,
-		),
-		// Classes to be applied to wrapped labels in horizontal forms
-		'wrappedLabelClasses' => array('right', 'inline'),
-		// HTML markup and classes used by Foundation 4 for icons
-		'icon'                => array(
-			'tag'    => 'i',
-			'set'    => 'general',
-			'prefix' => 'foundicon',
-		),
-		// CSS for inline validation errors
-		'error_classes'       => array('class' => 'alert-box radius warning'),
-	),
-
-	'ZurbFoundation'          => array( // Foundation 3
-		'viewports'           => array(
-			'large'  => '',
-			'medium' => null,
-			'small'  => 'mobile-',
-			'mini'   => null,
-		),
-		// Width of labels for horizontal forms expressed as viewport => grid columns
-		'labelWidths'         => array(
-			'large' => 2,
-			'small' => 4,
-		),
-		// Classes to be applied to wrapped labels in horizontal forms
-		'wrappedLabelClasses' => array('right', 'inline'),
-		// HTML markup and classes used by Foundation 3 for icons
-		'icon'                => array(
-			'tag'    => 'i',
-			'set'    => null,
-			'prefix' => 'fi',
-		),
-		// CSS for inline validation errors
-		// should work for Zurb 2 and 3
-		'error_classes'       => array('class' => 'alert-box alert error'),
-	),
+    // Markup
+    ////////////////////////////////////////////////////////////////////
+
+    // Whether labels should be automatically computed from name
+    'automatic_label'         => true,
+
+    // The default form type
+    'default_form_type'       => 'horizontal',
+
+    // Validation
+    ////////////////////////////////////////////////////////////////////
+
+    // Whether Former should fetch errors from Session
+    'fetch_errors'            => true,
+
+    // Whether Former should try to apply Validator rules as attributes
+    'live_validation'         => true,
+
+    // Whether Former should automatically fetch error messages and
+    // display them next to the matching fields
+    'error_messages'          => true,
+
+    // Checkables
+    ////////////////////////////////////////////////////////////////////
+
+    // Whether checkboxes should always be present in the POST data,
+    // no matter if you checked them or not
+    'push_checkboxes'         => false,
+
+    // The value a checkbox will have in the POST array if unchecked
+    'unchecked_value'         => 0,
+
+    // Required fields
+    ////////////////////////////////////////////////////////////////////
+
+    // The class to be added to required fields
+    'required_class'          => 'required',
+
+    // A facultative text to append to the labels of required fields
+    'required_text'           => '<sup>*</sup>',
+
+    // Translations
+    ////////////////////////////////////////////////////////////////////
+
+    // Where Former should look for translations
+    'translate_from'          => 'validation.attributes',
+
+    // Whether text that comes out of the translated
+    // should be capitalized (ex: email => Email) automatically
+    'capitalize_translations' => true,
+
+    // An array of attributes to automatically translate
+    'translatable'            => array(
+        'help',
+        'inlineHelp',
+        'blockHelp',
+        'placeholder',
+        'data_placeholder',
+        'label',
+    ),
+
+    // Framework
+    ////////////////////////////////////////////////////////////////////
+
+    // The framework to be used by Former
+    'framework'               => 'TwitterBootstrap3',
+
+    'TwitterBootstrap3'       => array(
+
+        // Map Former-supported viewports to Bootstrap 3 equivalents
+        'viewports'   => array(
+            'large'  => 'lg',
+            'medium' => 'md',
+            'small'  => 'sm',
+            'mini'   => 'xs',
+        ),
+        // Width of labels for horizontal forms expressed as viewport => grid columns
+        'labelWidths' => array(
+            'large' => 2,
+            'small' => 4,
+        ),
+        // HTML markup and classes used by Bootstrap 3 for icons
+        'icon'        => array(
+            'tag'    => 'span',
+            'set'    => 'glyphicon',
+            'prefix' => 'glyphicon',
+        ),
+
+    ),
+
+    'Nude'                    => array(  // No-framework markup
+        'icon' => array(
+            'tag'    => 'i',
+            'set'    => null,
+            'prefix' => 'icon',
+        ),
+    ),
+
+    'TwitterBootstrap'        => array( // Twitter Bootstrap version 2
+        'icon' => array(
+            'tag'    => 'i',
+            'set'    => null,
+            'prefix' => 'icon',
+        ),
+    ),
+
+    'ZurbFoundation5'         => array(
+        // Map Former-supported viewports to Foundation 5 equivalents
+        'viewports'           => array(
+            'large'  => 'large',
+            'medium' => null,
+            'small'  => 'small',
+            'mini'   => null,
+        ),
+        // Width of labels for horizontal forms expressed as viewport => grid columns
+        'labelWidths'         => array(
+            'small' => 3,
+        ),
+        // Classes to be applied to wrapped labels in horizontal forms
+        'wrappedLabelClasses' => array('right', 'inline'),
+        // HTML markup and classes used by Foundation 5 for icons
+        'icon'                => array(
+            'tag'    => 'i',
+            'set'    => null,
+            'prefix' => 'fi',
+        ),
+        // CSS for inline validation errors
+        'error_classes'       => array('class' => 'error'),
+    ),
+
+    'ZurbFoundation4'         => array(
+        // Foundation 4 also has an experimental "medium" breakpoint
+        // explained at http://foundation.zurb.com/docs/components/grid.html
+        'viewports'           => array(
+            'large'  => 'large',
+            'medium' => null,
+            'small'  => 'small',
+            'mini'   => null,
+        ),
+        // Width of labels for horizontal forms expressed as viewport => grid columns
+        'labelWidths'         => array(
+            'small' => 3,
+        ),
+        // Classes to be applied to wrapped labels in horizontal forms
+        'wrappedLabelClasses' => array('right', 'inline'),
+        // HTML markup and classes used by Foundation 4 for icons
+        'icon'                => array(
+            'tag'    => 'i',
+            'set'    => 'general',
+            'prefix' => 'foundicon',
+        ),
+        // CSS for inline validation errors
+        'error_classes'       => array('class' => 'alert-box radius warning'),
+    ),
+
+    'ZurbFoundation'          => array( // Foundation 3
+        'viewports'           => array(
+            'large'  => '',
+            'medium' => null,
+            'small'  => 'mobile-',
+            'mini'   => null,
+        ),
+        // Width of labels for horizontal forms expressed as viewport => grid columns
+        'labelWidths'         => array(
+            'large' => 2,
+            'small' => 4,
+        ),
+        // Classes to be applied to wrapped labels in horizontal forms
+        'wrappedLabelClasses' => array('right', 'inline'),
+        // HTML markup and classes used by Foundation 3 for icons
+        'icon'                => array(
+            'tag'    => 'i',
+            'set'    => null,
+            'prefix' => 'fi',
+        ),
+        // CSS for inline validation errors
+        // should work for Zurb 2 and 3
+        'error_classes'       => array('class' => 'alert-box alert error'),
+    ),
 
 
 );

src/Former/Form/Fields/File.php

Indentation +123 added lines, -124 removed lines

@@ -12,128 +12,127 @@
 class File extends Field
 {
 
-	/**
-	 * The maximum file size
-	 *
-	 * @var integer
-	 */
-	private $maxSize;
-
-	/**
-	 * An array of mime groups to use as shortcuts
-	 *
-	 * @var array
-	 */
-	private $mimeGroups = array('audio', 'video', 'image');
-
-	/**
-	 * A list of properties to be injected in the attributes
-	 *
-	 * @var array
-	 */
-	protected $injectedProperties = array('type', 'name');
-
-	////////////////////////////////////////////////////////////////////
-	/////////////////////////// CORE METHODS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Easier arguments order for hidden fields
-	 *
-	 * @param Container $app        The Illuminate Container
-	 * @param string    $type       file
-	 * @param string    $name       Field name
-	 * @param string    $label      Its label
-	 * @param string    $value      Its value
-	 * @param array     $attributes Attributes
-	 */
-	public function __construct(Container $app, $type, $name, $label, $value, $attributes)
-	{
-		// Multiple files field
-		if ($type == 'files') {
-			$attributes['multiple'] = 'true';
-			$type                   = 'file';
-			$name                   = $name.'[]';
-		}
-
-		parent::__construct($app, $type, $name, $label, $value, $attributes);
-	}
-
-	/**
-	 * Prints out the current tag
-	 *
-	 * @return string An input file tag
-	 */
-	public function render()
-	{
-		// Maximum file size
-		$hidden = $this->maxSize
-			? HtmlInput::hidden('MAX_FILE_SIZE', $this->maxSize)
-			: null;
-
-		return $hidden.parent::render();
-	}
-
-	////////////////////////////////////////////////////////////////////
-	////////////////////////// FIELD METHODS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Set which types of files are accepted by the file input
-
-	 */
-	public function accept()
-	{
-		$mimes = array();
-
-		// Transform all extensions/groups to mime types
-		foreach (func_get_args() as $mime) {
-
-			// Shortcuts and extensions
-			if (in_array($mime, $this->mimeGroups)) {
-				$mime .= '/*';
-			}
-			$mime = LaravelFile::mime($mime, $mime);
-
-			$mimes[] = $mime;
-		}
-
-		// Add accept attribute by concatenating the mimes
-		$this->attributes['accept'] = implode(',', $mimes);
-
-		return $this;
-	}
-
-	/**
-	 * Set a maximum size for files
-	 *
-	 * @param integer $size  A maximum size
-	 * @param string  $units The size's unit
-	 */
-	public function max($size, $units = 'KB')
-	{
-		// Bytes or bits ?
-		$unit = substr($units, -1);
-		$base = 1024;
-		if ($unit == 'b') {
-			$size = $size / 8;
-		}
-
-		// Convert
-		switch ($units[0]) {
-			case 'K':
-				$size = $size * $base;
-				break;
-			case 'M':
-				$size = $size * pow($base, 2);
-				break;
-			case 'G':
-				$size = $size * pow($base, 3);
-				break;
-		}
-
-		$this->maxSize = (int) $size;
-
-		return $this;
-	}
+    /**
+     * The maximum file size
+     *
+     * @var integer
+     */
+    private $maxSize;
+
+    /**
+     * An array of mime groups to use as shortcuts
+     *
+     * @var array
+     */
+    private $mimeGroups = array('audio', 'video', 'image');
+
+    /**
+     * A list of properties to be injected in the attributes
+     *
+     * @var array
+     */
+    protected $injectedProperties = array('type', 'name');
+
+    ////////////////////////////////////////////////////////////////////
+    /////////////////////////// CORE METHODS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Easier arguments order for hidden fields
+     *
+     * @param Container $app        The Illuminate Container
+     * @param string    $type       file
+     * @param string    $name       Field name
+     * @param string    $label      Its label
+     * @param string    $value      Its value
+     * @param array     $attributes Attributes
+     */
+    public function __construct(Container $app, $type, $name, $label, $value, $attributes)
+    {
+        // Multiple files field
+        if ($type == 'files') {
+            $attributes['multiple'] = 'true';
+            $type                   = 'file';
+            $name                   = $name.'[]';
+        }
+
+        parent::__construct($app, $type, $name, $label, $value, $attributes);
+    }
+
+    /**
+     * Prints out the current tag
+     *
+     * @return string An input file tag
+     */
+    public function render()
+    {
+        // Maximum file size
+        $hidden = $this->maxSize
+            ? HtmlInput::hidden('MAX_FILE_SIZE', $this->maxSize)
+            : null;
+
+        return $hidden.parent::render();
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////// FIELD METHODS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Set which types of files are accepted by the file input
+     */
+    public function accept()
+    {
+        $mimes = array();
+
+        // Transform all extensions/groups to mime types
+        foreach (func_get_args() as $mime) {
+
+            // Shortcuts and extensions
+            if (in_array($mime, $this->mimeGroups)) {
+                $mime .= '/*';
+            }
+            $mime = LaravelFile::mime($mime, $mime);
+
+            $mimes[] = $mime;
+        }
+
+        // Add accept attribute by concatenating the mimes
+        $this->attributes['accept'] = implode(',', $mimes);
+
+        return $this;
+    }
+
+    /**
+     * Set a maximum size for files
+     *
+     * @param integer $size  A maximum size
+     * @param string  $units The size's unit
+     */
+    public function max($size, $units = 'KB')
+    {
+        // Bytes or bits ?
+        $unit = substr($units, -1);
+        $base = 1024;
+        if ($unit == 'b') {
+            $size = $size / 8;
+        }
+
+        // Convert
+        switch ($units[0]) {
+            case 'K':
+                $size = $size * $base;
+                break;
+            case 'M':
+                $size = $size * pow($base, 2);
+                break;
+            case 'G':
+                $size = $size * pow($base, 3);
+                break;
+        }
+
+        $this->maxSize = (int) $size;
+
+        return $this;
+    }
 }