pryley / castor-framework

src/Forms/Form.php

Indentation +251 added lines, -251 removed lines

@@ -7,255 +7,255 @@
 
 class Form
 {
-    /**
-     * @var array
-     */
-    protected $args;
-
-    /**
-     * @var array
-     */
-    protected $dependencies;
-
-    /**
-     * @var Field
-     */
-    protected $field;
-
-    /**
-     * @var array
-     */
-    protected $fields;
-
-    /**
-     * @var Normalizer
-     */
-    protected $normalize;
-
-    public function __construct(Field $field, Normalizer $normalize)
-    {
-        $this->args = [];
-        $this->dependencies = [];
-        $this->field = $field;
-        $this->fields = [];
-        $this->normalize = $normalize;
-    }
-
-    /**
-     * @param string $property
-     *
-     * @return mixed
-     * @throws Exception
-     */
-    public function __get($property)
-    {
-        switch ($property) {
-            case 'args':
-            case 'dependencies':
-            case 'fields':
-                return $this->$property;
-        }
-        throw new Exception(sprintf('Invalid %s property: %s', __CLASS__, $property));
-    }
-
-    /**
-     * @param string $property
-     * @param string $value
-     *
-     * @return void
-     * @throws Exception
-     */
-    public function __set($property, $value)
-    {
-        switch ($property) {
-            case 'args':
-            case 'dependencies':
-            case 'fields':
-                $this->$property = $value;
-                break;
-            default:
-                throw new Exception(sprintf('Invalid %s property: %s', __CLASS__, $property));
-        }
-    }
-
-    /**
-     * Add a field to the form.
-     *
-     * @return Form
-     */
-    public function addField(array $args = [])
-    {
-        $field = $this->field->normalize($args);
-
-        if (false !== $field->args['render']) {
-            $this->dependencies = array_unique(
-                array_merge($field->dependencies, $this->dependencies)
-            );
-            $this->fields[] = $field;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Normalize the form arguments.
-     *
-     * @return Form
-     */
-    public function normalize(array $args = [])
-    {
-        $defaults = [
-            'action' => '',
-            'attributes' => '',
-            'id' => '',
-            'class' => '',
-            'enctype' => 'multipart/form-data',
-            'method' => 'post',
-            'nonce' => '',
-            'submit' => __('Submit', 'site-reviews'),
-        ];
-
-        $this->args = array_merge($defaults, $args);
-
-        $attributes = $this->normalize->form($this->args, 'implode');
-
-        $this->args['attributes'] = $attributes;
-
-        return $this;
-    }
-
-    /**
-     * Render the form.
-     *
-     * @param mixed $print
-     *
-     * @return string|void
-     */
-    public function render($print = true)
-    {
-        $rendered = sprintf('<form %s>%s%s</form>',
-            $this->args['attributes'],
-            $this->generateFields(),
-            $this->generateSubmitButton()
-        );
-
-        if ((bool) $print && 'return' !== $print) {
-            echo $rendered;
-        }
-
-        return $rendered;
-    }
-
-    /**
-     * Reset the Form.
-     *
-     * @return Form
-     */
-    public function reset()
-    {
-        $this->args = [];
-        $this->dependencies = [];
-        $this->fields = [];
-        return $this;
-    }
-
-    /**
-     * Generate the form fields.
-     *
-     * @return string
-     */
-    protected function generateFields()
-    {
-        $hiddenFields = '';
-
-        $fields = array_reduce($this->fields, function ($carry, $formField) use (&$hiddenFields) {
-            $stringLegend = '<legend class="screen-reader-text"><span>%s</span></legend>';
-            $stringFieldset = '<fieldset%s>%s%s</fieldset>';
-            $stringRendered = '<tr class="glsr-field %s"><th scope="row">%s</th><td>%s</td></tr>';
-            $outsideRendered = '</tbody></table>%s<table class="form-table"><tbody>';
-
-            // set field value only when rendering because we need to check the default setting
-            // against the database
-            $field = $formField->setValue()->getField();
-
-            $multi = true === $field->multi;
-            $label = $field->generateLabel();
-            $rendered = $field->render();
-
-            // render hidden inputs outside the table
-            if ('hidden' === $field->args['type']) {
-                $hiddenFields .= $rendered;
-                return $carry;
-            }
-
-            $hiddenClass = $this->isFieldHidden($formField) ? 'hidden' : '';
-
-            if ($multi) {
-                if ($depends = $formField->getDataDepends()) {
-                    $depends = sprintf(' data-depends=\'%s\'', json_encode($depends));
-                }
-
-                $legend = $label ? sprintf($stringLegend, $label) : '';
-                $rendered = sprintf($stringFieldset, $depends, $legend, $rendered);
-            }
-
-            $renderedField = $field->outside
-                ? sprintf($outsideRendered, $rendered)
-                : sprintf($stringRendered, $hiddenClass, $label, $rendered);
-
-            return $carry.$renderedField;
-        });
-
-        return sprintf('<table class="form-table"><tbody>%s</tbody></table>%s', $fields, $hiddenFields);
-    }
-
-    /**
-     * Generate the form submit button.
-     *
-     * @return string|null
-     */
-    protected function generateSubmitButton()
-    {
-        $args = $this->args['submit'];
-
-        is_array($args) ?: $args = ['text' => $args];
-
-        $args = shortcode_atts([
-            'text' => __('Save Changes', 'site-reviews'),
-            'type' => 'primary',
-            'name' => 'submit',
-            'wrap' => true,
-            'other_attributes' => null,
-        ], $args);
-
-        if (is_admin()) {
-            ob_start();
-            submit_button($args['text'], $args['type'], $args['name'], $args['wrap'], $args['other_attributes']);
-            return ob_get_clean();
-        }
-    }
-
-    /**
-     * @param object $field GeminiLabs\Castor\Form\Fields\*
-     *
-     * @return bool|null
-     */
-    protected function isFieldHidden($field)
-    {
-        if (!($dependsOn = $field->getDataDepends())) {
-            return;
-        }
-
-        foreach ($this->fields as $formField) {
-            if ($dependsOn['name'] !== $formField->args['name']) {
-                continue;
-            }
-
-            if (is_array($dependsOn['value'])) {
-                return !in_array($formField->args['value'], $dependsOn['value']);
-            }
-
-            return $dependsOn['value'] != $formField->args['value'];
-        }
-    }
+	/**
+	 * @var array
+	 */
+	protected $args;
+
+	/**
+	 * @var array
+	 */
+	protected $dependencies;
+
+	/**
+	 * @var Field
+	 */
+	protected $field;
+
+	/**
+	 * @var array
+	 */
+	protected $fields;
+
+	/**
+	 * @var Normalizer
+	 */
+	protected $normalize;
+
+	public function __construct(Field $field, Normalizer $normalize)
+	{
+		$this->args = [];
+		$this->dependencies = [];
+		$this->field = $field;
+		$this->fields = [];
+		$this->normalize = $normalize;
+	}
+
+	/**
+	 * @param string $property
+	 *
+	 * @return mixed
+	 * @throws Exception
+	 */
+	public function __get($property)
+	{
+		switch ($property) {
+			case 'args':
+			case 'dependencies':
+			case 'fields':
+				return $this->$property;
+		}
+		throw new Exception(sprintf('Invalid %s property: %s', __CLASS__, $property));
+	}
+
+	/**
+	 * @param string $property
+	 * @param string $value
+	 *
+	 * @return void
+	 * @throws Exception
+	 */
+	public function __set($property, $value)
+	{
+		switch ($property) {
+			case 'args':
+			case 'dependencies':
+			case 'fields':
+				$this->$property = $value;
+				break;
+			default:
+				throw new Exception(sprintf('Invalid %s property: %s', __CLASS__, $property));
+		}
+	}
+
+	/**
+	 * Add a field to the form.
+	 *
+	 * @return Form
+	 */
+	public function addField(array $args = [])
+	{
+		$field = $this->field->normalize($args);
+
+		if (false !== $field->args['render']) {
+			$this->dependencies = array_unique(
+				array_merge($field->dependencies, $this->dependencies)
+			);
+			$this->fields[] = $field;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Normalize the form arguments.
+	 *
+	 * @return Form
+	 */
+	public function normalize(array $args = [])
+	{
+		$defaults = [
+			'action' => '',
+			'attributes' => '',
+			'id' => '',
+			'class' => '',
+			'enctype' => 'multipart/form-data',
+			'method' => 'post',
+			'nonce' => '',
+			'submit' => __('Submit', 'site-reviews'),
+		];
+
+		$this->args = array_merge($defaults, $args);
+
+		$attributes = $this->normalize->form($this->args, 'implode');
+
+		$this->args['attributes'] = $attributes;
+
+		return $this;
+	}
+
+	/**
+	 * Render the form.
+	 *
+	 * @param mixed $print
+	 *
+	 * @return string|void
+	 */
+	public function render($print = true)
+	{
+		$rendered = sprintf('<form %s>%s%s</form>',
+			$this->args['attributes'],
+			$this->generateFields(),
+			$this->generateSubmitButton()
+		);
+
+		if ((bool) $print && 'return' !== $print) {
+			echo $rendered;
+		}
+
+		return $rendered;
+	}
+
+	/**
+	 * Reset the Form.
+	 *
+	 * @return Form
+	 */
+	public function reset()
+	{
+		$this->args = [];
+		$this->dependencies = [];
+		$this->fields = [];
+		return $this;
+	}
+
+	/**
+	 * Generate the form fields.
+	 *
+	 * @return string
+	 */
+	protected function generateFields()
+	{
+		$hiddenFields = '';
+
+		$fields = array_reduce($this->fields, function ($carry, $formField) use (&$hiddenFields) {
+			$stringLegend = '<legend class="screen-reader-text"><span>%s</span></legend>';
+			$stringFieldset = '<fieldset%s>%s%s</fieldset>';
+			$stringRendered = '<tr class="glsr-field %s"><th scope="row">%s</th><td>%s</td></tr>';
+			$outsideRendered = '</tbody></table>%s<table class="form-table"><tbody>';
+
+			// set field value only when rendering because we need to check the default setting
+			// against the database
+			$field = $formField->setValue()->getField();
+
+			$multi = true === $field->multi;
+			$label = $field->generateLabel();
+			$rendered = $field->render();
+
+			// render hidden inputs outside the table
+			if ('hidden' === $field->args['type']) {
+				$hiddenFields .= $rendered;
+				return $carry;
+			}
+
+			$hiddenClass = $this->isFieldHidden($formField) ? 'hidden' : '';
+
+			if ($multi) {
+				if ($depends = $formField->getDataDepends()) {
+					$depends = sprintf(' data-depends=\'%s\'', json_encode($depends));
+				}
+
+				$legend = $label ? sprintf($stringLegend, $label) : '';
+				$rendered = sprintf($stringFieldset, $depends, $legend, $rendered);
+			}
+
+			$renderedField = $field->outside
+				? sprintf($outsideRendered, $rendered)
+				: sprintf($stringRendered, $hiddenClass, $label, $rendered);
+
+			return $carry.$renderedField;
+		});
+
+		return sprintf('<table class="form-table"><tbody>%s</tbody></table>%s', $fields, $hiddenFields);
+	}
+
+	/**
+	 * Generate the form submit button.
+	 *
+	 * @return string|null
+	 */
+	protected function generateSubmitButton()
+	{
+		$args = $this->args['submit'];
+
+		is_array($args) ?: $args = ['text' => $args];
+
+		$args = shortcode_atts([
+			'text' => __('Save Changes', 'site-reviews'),
+			'type' => 'primary',
+			'name' => 'submit',
+			'wrap' => true,
+			'other_attributes' => null,
+		], $args);
+
+		if (is_admin()) {
+			ob_start();
+			submit_button($args['text'], $args['type'], $args['name'], $args['wrap'], $args['other_attributes']);
+			return ob_get_clean();
+		}
+	}
+
+	/**
+	 * @param object $field GeminiLabs\Castor\Form\Fields\*
+	 *
+	 * @return bool|null
+	 */
+	protected function isFieldHidden($field)
+	{
+		if (!($dependsOn = $field->getDataDepends())) {
+			return;
+		}
+
+		foreach ($this->fields as $formField) {
+			if ($dependsOn['name'] !== $formField->args['name']) {
+				continue;
+			}
+
+			if (is_array($dependsOn['value'])) {
+				return !in_array($formField->args['value'], $dependsOn['value']);
+			}
+
+			return $dependsOn['value'] != $formField->args['value'];
+		}
+	}
 }

Spacing +41 added lines, -41 removed lines

@@ -32,7 +32,7 @@ 
      */
     protected $normalize;
 
-    public function __construct(Field $field, Normalizer $normalize)
+    public function __construct( Field $field, Normalizer $normalize )
     {
         $this->args = [];
         $this->dependencies = [];
@@ -47,15 +47,15 @@ 
      * @return mixed
      * @throws Exception
      */
-    public function __get($property)
+    public function __get( $property )
     {
-        switch ($property) {
+        switch( $property ) {
             case 'args':
             case 'dependencies':
             case 'fields':
                 return $this->$property;
         }
-        throw new Exception(sprintf('Invalid %s property: %s', __CLASS__, $property));
+        throw new Exception( sprintf( 'Invalid %s property: %s', __CLASS__, $property ) );
     }
 
     /**
@@ -65,16 +65,16 @@ 
      * @return void
      * @throws Exception
      */
-    public function __set($property, $value)
+    public function __set( $property, $value )
     {
-        switch ($property) {
+        switch( $property ) {
             case 'args':
             case 'dependencies':
             case 'fields':
                 $this->$property = $value;
                 break;
             default:
-                throw new Exception(sprintf('Invalid %s property: %s', __CLASS__, $property));
+                throw new Exception( sprintf( 'Invalid %s property: %s', __CLASS__, $property ) );
         }
     }
 
@@ -83,13 +83,13 @@ 
      *
      * @return Form
      */
-    public function addField(array $args = [])
+    public function addField( array $args = [] )
     {
-        $field = $this->field->normalize($args);
+        $field = $this->field->normalize( $args );
 
-        if (false !== $field->args['render']) {
+        if( false !== $field->args['render'] ) {
             $this->dependencies = array_unique(
-                array_merge($field->dependencies, $this->dependencies)
+                array_merge( $field->dependencies, $this->dependencies )
             );
             $this->fields[] = $field;
         }
@@ -102,7 +102,7 @@ 
      *
      * @return Form
      */
-    public function normalize(array $args = [])
+    public function normalize( array $args = [] )
     {
         $defaults = [
             'action' => '',
@@ -112,12 +112,12 @@ 
             'enctype' => 'multipart/form-data',
             'method' => 'post',
             'nonce' => '',
-            'submit' => __('Submit', 'site-reviews'),
+            'submit' => __( 'Submit', 'site-reviews' ),
         ];
 
-        $this->args = array_merge($defaults, $args);
+        $this->args = array_merge( $defaults, $args );
 
-        $attributes = $this->normalize->form($this->args, 'implode');
+        $attributes = $this->normalize->form( $this->args, 'implode' );
 
         $this->args['attributes'] = $attributes;
 
@@ -131,15 +131,15 @@ 
      *
      * @return string|void
      */
-    public function render($print = true)
+    public function render( $print = true )
     {
-        $rendered = sprintf('<form %s>%s%s</form>',
+        $rendered = sprintf( '<form %s>%s%s</form>',
             $this->args['attributes'],
             $this->generateFields(),
             $this->generateSubmitButton()
         );
 
-        if ((bool) $print && 'return' !== $print) {
+        if( (bool) $print && 'return' !== $print ) {
             echo $rendered;
         }
 
@@ -168,7 +168,7 @@ 
     {
         $hiddenFields = '';
 
-        $fields = array_reduce($this->fields, function ($carry, $formField) use (&$hiddenFields) {
+        $fields = array_reduce( $this->fields, function( $carry, $formField ) use ( &$hiddenFields ) {
             $stringLegend = '<legend class="screen-reader-text"><span>%s</span></legend>';
             $stringFieldset = '<fieldset%s>%s%s</fieldset>';
             $stringRendered = '<tr class="glsr-field %s"><th scope="row">%s</th><td>%s</td></tr>';
@@ -183,30 +183,30 @@ 
             $rendered = $field->render();
 
             // render hidden inputs outside the table
-            if ('hidden' === $field->args['type']) {
+            if( 'hidden' === $field->args['type'] ) {
                 $hiddenFields .= $rendered;
                 return $carry;
             }
 
-            $hiddenClass = $this->isFieldHidden($formField) ? 'hidden' : '';
+            $hiddenClass = $this->isFieldHidden( $formField ) ? 'hidden' : '';
 
-            if ($multi) {
-                if ($depends = $formField->getDataDepends()) {
-                    $depends = sprintf(' data-depends=\'%s\'', json_encode($depends));
+            if( $multi ) {
+                if( $depends = $formField->getDataDepends() ) {
+                    $depends = sprintf( ' data-depends=\'%s\'', json_encode( $depends ) );
                 }
 
-                $legend = $label ? sprintf($stringLegend, $label) : '';
-                $rendered = sprintf($stringFieldset, $depends, $legend, $rendered);
+                $legend = $label ? sprintf( $stringLegend, $label ) : '';
+                $rendered = sprintf( $stringFieldset, $depends, $legend, $rendered );
             }
 
             $renderedField = $field->outside
-                ? sprintf($outsideRendered, $rendered)
-                : sprintf($stringRendered, $hiddenClass, $label, $rendered);
+                ? sprintf( $outsideRendered, $rendered )
+                : sprintf( $stringRendered, $hiddenClass, $label, $rendered );
 
             return $carry.$renderedField;
         });
 
-        return sprintf('<table class="form-table"><tbody>%s</tbody></table>%s', $fields, $hiddenFields);
+        return sprintf( '<table class="form-table"><tbody>%s</tbody></table>%s', $fields, $hiddenFields );
     }
 
     /**
@@ -218,19 +218,19 @@ 
     {
         $args = $this->args['submit'];
 
-        is_array($args) ?: $args = ['text' => $args];
+        is_array( $args ) ?: $args = ['text' => $args];
 
-        $args = shortcode_atts([
-            'text' => __('Save Changes', 'site-reviews'),
+        $args = shortcode_atts( [
+            'text' => __( 'Save Changes', 'site-reviews' ),
             'type' => 'primary',
             'name' => 'submit',
             'wrap' => true,
             'other_attributes' => null,
-        ], $args);
+        ], $args );
 
-        if (is_admin()) {
+        if( is_admin() ) {
             ob_start();
-            submit_button($args['text'], $args['type'], $args['name'], $args['wrap'], $args['other_attributes']);
+            submit_button( $args['text'], $args['type'], $args['name'], $args['wrap'], $args['other_attributes'] );
             return ob_get_clean();
         }
     }
@@ -240,19 +240,19 @@ 
      *
      * @return bool|null
      */
-    protected function isFieldHidden($field)
+    protected function isFieldHidden( $field )
     {
-        if (!($dependsOn = $field->getDataDepends())) {
+        if( !( $dependsOn = $field->getDataDepends() ) ) {
             return;
         }
 
-        foreach ($this->fields as $formField) {
-            if ($dependsOn['name'] !== $formField->args['name']) {
+        foreach( $this->fields as $formField ) {
+            if( $dependsOn['name'] !== $formField->args['name'] ) {
                 continue;
             }
 
-            if (is_array($dependsOn['value'])) {
-                return !in_array($formField->args['value'], $dependsOn['value']);
+            if( is_array( $dependsOn['value'] ) ) {
+                return !in_array( $formField->args['value'], $dependsOn['value'] );
             }
 
             return $dependsOn['value'] != $formField->args['value'];

Braces +1 added lines, -2 removed lines

@@ -5,8 +5,7 @@
 use Exception;
 use GeminiLabs\Castor\Services\Normalizer;
 
-class Form
-{
+class Form {
     /**
      * @var array
      */

src/AliasLoader.php

Indentation +64 added lines, -64 removed lines

@@ -4,78 +4,78 @@
 
 class AliasLoader
 {
-    /**
-     * The singleton instance of the loader.
-     *
-     * @var AliasLoader
-     */
-    protected static $instance;
+	/**
+	 * The singleton instance of the loader.
+	 *
+	 * @var AliasLoader
+	 */
+	protected static $instance;
 
-    /**
-     * The array of class aliases.
-     *
-     * @var array
-     */
-    protected $aliases;
+	/**
+	 * The array of class aliases.
+	 *
+	 * @var array
+	 */
+	protected $aliases;
 
-    /**
-     * Indicates if a loader has been registered.
-     *
-     * @var bool
-     */
-    protected $registered = false;
+	/**
+	 * Indicates if a loader has been registered.
+	 *
+	 * @var bool
+	 */
+	protected $registered = false;
 
-    private function __construct(array $aliases)
-    {
-        $this->aliases = $aliases;
-    }
+	private function __construct(array $aliases)
+	{
+		$this->aliases = $aliases;
+	}
 
-    private function __clone()
-    {
-    }
+	private function __clone()
+	{
+	}
 
-    /**
-     * Get or create the singleton alias loader instance.
-     *
-     * @return AliasLoader
-     */
-    public static function getInstance(array $aliases = [])
-    {
-        if (is_null(static::$instance)) {
-            return static::$instance = new static($aliases);
-        }
+	/**
+	 * Get or create the singleton alias loader instance.
+	 *
+	 * @return AliasLoader
+	 */
+	public static function getInstance(array $aliases = [])
+	{
+		if (is_null(static::$instance)) {
+			return static::$instance = new static($aliases);
+		}
 
-        $aliases = array_merge(static::$instance->aliases, $aliases);
+		$aliases = array_merge(static::$instance->aliases, $aliases);
 
-        static::$instance->aliases = $aliases;
+		static::$instance->aliases = $aliases;
 
-        return static::$instance;
-    }
+		return static::$instance;
+	}
 
-    /**
-     * Load a class alias if it is registered.
-     *
-     * @param string $alias
-     *
-     * @return bool|null
-     */
-    public function load($alias)
-    {
-        if (isset($this->aliases[$alias])) {
-            return class_alias($this->aliases[$alias], $alias);
-        }
-    }
+	/**
+	 * Load a class alias if it is registered.
+	 *
+	 * @param string $alias
+	 *
+	 * @return bool|null
+	 */
+	public function load($alias)
+	{
+		if (isset($this->aliases[$alias])) {
+			return class_alias($this->aliases[$alias], $alias);
+		}
+	}
 
-    /**
-     * Register the loader on the auto-loader stack.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        if (!$this->registered) {
-            spl_autoload_register([$this, 'load'], true, true);
-            $this->registered = true;
-        }
-    }
+	/**
+	 * Register the loader on the auto-loader stack.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		if (!$this->registered) {
+			spl_autoload_register([$this, 'load'], true, true);
+			$this->registered = true;
+		}
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -25,7 +25,7 @@ 
      */
     protected $registered = false;
 
-    private function __construct(array $aliases)
+    private function __construct( array $aliases )
     {
         $this->aliases = $aliases;
     }
@@ -39,13 +39,13 @@ 
      *
      * @return AliasLoader
      */
-    public static function getInstance(array $aliases = [])
+    public static function getInstance( array $aliases = [] )
     {
-        if (is_null(static::$instance)) {
-            return static::$instance = new static($aliases);
+        if( is_null( static::$instance ) ) {
+            return static::$instance = new static( $aliases );
         }
 
-        $aliases = array_merge(static::$instance->aliases, $aliases);
+        $aliases = array_merge( static::$instance->aliases, $aliases );
 
         static::$instance->aliases = $aliases;
 
@@ -59,10 +59,10 @@ 
      *
      * @return bool|null
      */
-    public function load($alias)
+    public function load( $alias )
     {
-        if (isset($this->aliases[$alias])) {
-            return class_alias($this->aliases[$alias], $alias);
+        if( isset( $this->aliases[$alias] ) ) {
+            return class_alias( $this->aliases[$alias], $alias );
         }
     }
 
@@ -73,8 +73,8 @@ 
      */
     public function register()
     {
-        if (!$this->registered) {
-            spl_autoload_register([$this, 'load'], true, true);
+        if( !$this->registered ) {
+            spl_autoload_register( [$this, 'load'], true, true );
             $this->registered = true;
         }
     }

Braces +1 added lines, -2 removed lines

@@ -2,8 +2,7 @@
 
 namespace GeminiLabs\Castor;
 
-class AliasLoader
-{
+class AliasLoader {
     /**
      * The singleton instance of the loader.
      *

src/Services/Validator.php

Indentation +562 added lines, -562 removed lines

@@ -7,566 +7,566 @@
 
 class Validator
 {
-    /**
-     * @var array
-     */
-    public $errors = [];
-
-    /**
-     * The data under validation.
-     *
-     * @var array
-     */
-    protected $data = [];
-
-    /**
-     * The failed validation rules.
-     *
-     * @var array
-     */
-    protected $failedRules = [];
-
-    /**
-     * The rules to be applied to the data.
-     *
-     * @var array
-     */
-    protected $rules = [];
-
-    /**
-     * The size related validation rules.
-     *
-     * @var array
-     */
-    protected $sizeRules = [
-        'Between',
-        'Max',
-        'Min',
-    ];
-
-    /**
-     * The validation rules that imply the field is required.
-     *
-     * @var array
-     */
-    protected $implicitRules = [
-        'Required',
-    ];
-
-    /**
-     * The numeric related validation rules.
-     *
-     * @var array
-     */
-    protected $numericRules = [
-        'Numeric',
-    ];
-
-    /**
-     * Run the validator's rules against its data.
-     *
-     * @param mixed $data
-     *
-     * @return array
-     */
-    public function validate($data, array $rules = [])
-    {
-        $this->normalizeData($data);
-        $this->setRules($rules);
-
-        foreach ($this->rules as $attribute => $rules) {
-            foreach ($rules as $rule) {
-                $this->validateAttribute($rule, $attribute);
-
-                if ($this->shouldStopValidating($attribute)) {
-                    break;
-                }
-            }
-        }
-
-        return $this->errors;
-    }
-
-    /**
-     * Add an error message to the validator's collection of errors.
-     *
-     * @param string $attribute
-     * @param string $rule
-     *
-     * @return void
-     */
-    protected function addError($attribute, $rule, array $parameters)
-    {
-        $message = $this->getMessage($attribute, $rule, $parameters);
-
-        $this->errors[$attribute]['errors'][] = $message;
-
-        if (!isset($this->errors[$attribute]['value'])) {
-            $this->errors[$attribute]['value'] = $this->getValue($attribute);
-        }
-    }
-
-    /**
-     * Add a failed rule and error message to the collection.
-     *
-     * @param string $attribute
-     * @param string $rule
-     *
-     * @return void
-     */
-    protected function addFailure($attribute, $rule, array $parameters)
-    {
-        $this->addError($attribute, $rule, $parameters);
-
-        $this->failedRules[$attribute][$rule] = $parameters;
-    }
-
-    /**
-     * Get the data type of the given attribute.
-     *
-     * @param  string  $attribute
-     * @return string
-     */
-    protected function getAttributeType($attribute)
-    {
-        return $this->hasRule($attribute, $this->numericRules)
-            ? 'numeric'
-            : 'string';
-    }
-
-    /**
-     * Get the validation message for an attribute and rule.
-     *
-     * @param string $attribute
-     * @param string $rule
-     *
-     * @return string|null
-     */
-    protected function getMessage($attribute, $rule, array $parameters)
-    {
-        if (in_array($rule, $this->sizeRules)) {
-            return $this->getSizeMessage($attribute, $rule, $parameters);
-        }
-
-        $lowerRule = $this->snakeCase($rule);
-
-        return $this->translator($lowerRule, $rule, $attribute, $parameters);
-    }
-
-    /**
-     * Get a rule and its parameters for a given attribute.
-     *
-     * @param string       $attribute
-     * @param string|array $rules
-     *
-     * @return array|null
-     */
-    protected function getRule($attribute, $rules)
-    {
-        if (!array_key_exists($attribute, $this->rules)) {
-            return;
-        }
-
-        $rules = (array) $rules;
-
-        foreach ($this->rules[$attribute] as $rule) {
-            list($rule, $parameters) = $this->parseRule($rule);
-
-            if (in_array($rule, $rules)) {
-                return [$rule, $parameters];
-            }
-        }
-    }
-
-    /**
-     * Get the size of an attribute.
-     *
-     * @param string $attribute
-     * @param mixed  $value
-     *
-     * @return mixed
-     */
-    protected function getSize($attribute, $value)
-    {
-        $hasNumeric = $this->hasRule($attribute, $this->numericRules);
-
-        if (is_numeric($value) && $hasNumeric) {
-            return $value;
-        } elseif (is_array($value)) {
-            return count($value);
-        }
-
-        return mb_strlen($value);
-    }
-
-    /**
-     * Get the proper error message for an attribute and size rule.
-     *
-     * @param string $attribute
-     * @param string $rule
-     *
-     * @return string|null
-     */
-    protected function getSizeMessage($attribute, $rule, array $parameters)
-    {
-        $lowerRule = $this->snakeCase($rule);
-        $type = $this->getAttributeType($attribute);
-
-        $lowerRule .= ".{$type}";
-
-        return $this->translator($lowerRule, $rule, $attribute, $parameters);
-    }
-
-    /**
-     * Get the value of a given attribute.
-     *
-     * @param string $attribute
-     *
-     * @return mixed
-     */
-    protected function getValue($attribute)
-    {
-        if (isset($this->data[$attribute])) {
-            return $this->data[$attribute];
-        }
-    }
-
-    /**
-     * Determine if the given attribute has a rule in the given set.
-     *
-     * @param string       $attribute
-     * @param string|array $rules
-     *
-     * @return bool
-     */
-    protected function hasRule($attribute, $rules)
-    {
-        return !is_null($this->getRule($attribute, $rules));
-    }
-
-    /**
-     * Normalize the provided data to an array.
-     *
-     * @param mixed $data
-     *
-     * @return $this
-     */
-    protected function normalizeData($data)
-    {
-        // If an object was provided, get its public properties
-        if (is_object($data)) {
-            $this->data = get_object_vars($data);
-        } else {
-            $this->data = $data;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Parse a parameter list.
-     *
-     * @param string $rule
-     * @param string $parameter
-     *
-     * @return array
-     */
-    protected function parseParameters($rule, $parameter)
-    {
-        if ('regex' == strtolower($rule)) {
-            return [$parameter];
-        }
-
-        return str_getcsv($parameter);
-    }
-
-    /**
-     * Extract the rule name and parameters from a rule.
-     *
-     * @param string $rule
-     *
-     * @return array
-     */
-    protected function parseRule($rule)
-    {
-        $parameters = [];
-
-        // example: {rule}:{parameters}
-        if (false !== strpos($rule, ':')) {
-            list($rule, $parameter) = explode(':', $rule, 2);
-
-            // example: {parameter1,parameter2,...}
-            $parameters = $this->parseParameters($rule, $parameter);
-        }
-
-        $rule = ucwords(str_replace(['-', '_'], ' ', trim($rule)));
-        $rule = str_replace(' ', '', $rule);
-
-        return [$rule, $parameters];
-    }
-
-    /**
-     * Replace all placeholders for the between rule.
-     *
-     * @param string $message
-     *
-     * @return string
-     */
-    protected function replaceBetween($message, array $parameters)
-    {
-        return str_replace([':min', ':max'], $parameters, $message);
-    }
-
-    /**
-     * Replace all placeholders for the max rule.
-     *
-     * @param string $message
-     *
-     * @return string
-     */
-    protected function replaceMax($message, array $parameters)
-    {
-        return str_replace(':max', $parameters[0], $message);
-    }
-
-    /**
-     * Replace all placeholders for the min rule.
-     *
-     * @param string $message
-     *
-     * @return string
-     */
-    protected function replaceMin($message, array $parameters)
-    {
-        return str_replace(':min', $parameters[0], $message);
-    }
-
-    /**
-     * Require a certain number of parameters to be present.
-     *
-     * @param int    $count
-     * @param string $rule
-     *
-     * @return void
-     * @throws InvalidArgumentException
-     */
-    protected function requireParameterCount($count, array $parameters, $rule)
-    {
-        if (count($parameters) < $count) {
-            throw new InvalidArgumentException("Validation rule $rule requires at least $count parameters.");
-        }
-    }
-
-    /**
-     * Set the validation rules.
-     *
-     * @return $this
-     */
-    protected function setRules(array $rules)
-    {
-        foreach ($rules as $key => $rule) {
-            $rules[$key] = is_string($rule) ? explode('|', $rule) : $rule;
-        }
-
-        $this->rules = $rules;
-
-        return $this;
-    }
-
-    /**
-     * Check if we should stop further validations on a given attribute.
-     *
-     * @param string $attribute
-     *
-     * @return bool
-     */
-    protected function shouldStopValidating($attribute)
-    {
-        return $this->hasRule($attribute, $this->implicitRules)
-            && isset($this->failedRules[$attribute])
-            && array_intersect(array_keys($this->failedRules[$attribute]), $this->implicitRules);
-    }
-
-    /**
-     * Convert a string to snake case.
-     *
-     * @param string $string
-     *
-     * @return string
-     */
-    protected function snakeCase($string)
-    {
-        if (!ctype_lower($string)) {
-            $string = preg_replace('/\s+/u', '', $string);
-            $string = preg_replace('/(.)(?=[A-Z])/u', '$1_', $string);
-            $string = mb_strtolower($string, 'UTF-8');
-        }
-
-        return $string;
-    }
-
-    /**
-     * Returns a translated message for the attribute.
-     *
-     * @param string $key
-     * @param string $rule
-     * @param string $attribute
-     *
-     * @return string|null
-     */
-    protected function translator($key, $rule, $attribute, array $parameters)
-    {
-        $strings = []; //glsr_resolve( 'Strings' )->validation();
-
-        $message = isset($strings[$key])
-            ? $strings[$key]
-            : false;
-
-        if (!$message) {
-            return;
-        }
-
-        $message = str_replace(':attribute', $attribute, $message);
-
-        if (method_exists($this, $replacer = "replace{$rule}")) {
-            $message = $this->$replacer($message, $parameters);
-        }
-
-        return $message;
-    }
-
-    // Rules Validation
-    // ---------------------------------------------------------------------------------------------
-
-    /**
-     * Validate that an attribute was "accepted".
-     *
-     * This validation rule implies the attribute is "required".
-     *
-     * @param mixed  $value
-     *
-     * @return bool
-     */
-    protected function validateAccepted($value)
-    {
-        $acceptable = ['yes', 'on', '1', 1, true, 'true'];
-
-        return $this->validateRequired($value) && in_array($value, $acceptable, true);
-    }
-
-    /**
-     * Validate a given attribute against a rule.
-     *
-     * @param string $rule
-     * @param string $attribute
-     *
-     * @return void
-     * @throws BadMethodCallException
-     */
-    protected function validateAttribute($rule, $attribute)
-    {
-        list($rule, $parameters) = $this->parseRule($rule);
-
-        if ('' == $rule) {
-            return;
-        }
-
-        $method = "validate{$rule}";
-
-        if (!method_exists($this, $method)) {
-            throw new BadMethodCallException("Method [$method] does not exist.");
-        }
-
-        if (!$this->$method($this->getValue($attribute), $attribute, $parameters)) {
-            $this->addFailure($attribute, $rule, $parameters);
-        }
-    }
-
-    /**
-     * Validate the size of an attribute is between a set of values.
-     *
-     * @param mixed  $value
-     * @param string $attribute
-     *
-     * @return bool
-     */
-    protected function validateBetween($value, $attribute, array $parameters)
-    {
-        $this->requireParameterCount(2, $parameters, 'between');
-
-        $size = $this->getSize($attribute, $value);
-
-        return $size >= $parameters[0] && $size <= $parameters[1];
-    }
-
-    /**
-     * Validate that an attribute is a valid e-mail address.
-     *
-     * @param mixed $value
-     *
-     * @return bool
-     */
-    protected function validateEmail($value)
-    {
-        return false !== filter_var($value, FILTER_VALIDATE_EMAIL);
-    }
-
-    /**
-     * Validate the size of an attribute is less than a maximum value.
-     *
-     * @param mixed  $value
-     * @param string $attribute
-     *
-     * @return bool
-     */
-    protected function validateMax($value, $attribute, array $parameters)
-    {
-        $this->requireParameterCount(1, $parameters, 'max');
-
-        return $this->getSize($attribute, $value) <= $parameters[0];
-    }
-
-    /**
-     * Validate the size of an attribute is greater than a minimum value.
-     *
-     * @param mixed  $value
-     * @param string $attribute
-     *
-     * @return bool
-     */
-    protected function validateMin($value, $attribute, array $parameters)
-    {
-        $this->requireParameterCount(1, $parameters, 'min');
-
-        return $this->getSize($attribute, $value) >= $parameters[0];
-    }
-
-    /**
-     * Validate that an attribute is numeric.
-     *
-     * @param mixed $value
-     *
-     * @return bool
-     */
-    protected function validateNumeric($value)
-    {
-        return is_numeric($value);
-    }
-
-    /**
-     * Validate that a required attribute exists.
-     *
-     * @param mixed $value
-     *
-     * @return bool
-     */
-    protected function validateRequired($value)
-    {
-        if (is_string($value)) {
-            $value = trim($value);
-        }
-        return is_null($value) || empty($value)
-            ? false
-            : true;
-    }
+	/**
+	 * @var array
+	 */
+	public $errors = [];
+
+	/**
+	 * The data under validation.
+	 *
+	 * @var array
+	 */
+	protected $data = [];
+
+	/**
+	 * The failed validation rules.
+	 *
+	 * @var array
+	 */
+	protected $failedRules = [];
+
+	/**
+	 * The rules to be applied to the data.
+	 *
+	 * @var array
+	 */
+	protected $rules = [];
+
+	/**
+	 * The size related validation rules.
+	 *
+	 * @var array
+	 */
+	protected $sizeRules = [
+		'Between',
+		'Max',
+		'Min',
+	];
+
+	/**
+	 * The validation rules that imply the field is required.
+	 *
+	 * @var array
+	 */
+	protected $implicitRules = [
+		'Required',
+	];
+
+	/**
+	 * The numeric related validation rules.
+	 *
+	 * @var array
+	 */
+	protected $numericRules = [
+		'Numeric',
+	];
+
+	/**
+	 * Run the validator's rules against its data.
+	 *
+	 * @param mixed $data
+	 *
+	 * @return array
+	 */
+	public function validate($data, array $rules = [])
+	{
+		$this->normalizeData($data);
+		$this->setRules($rules);
+
+		foreach ($this->rules as $attribute => $rules) {
+			foreach ($rules as $rule) {
+				$this->validateAttribute($rule, $attribute);
+
+				if ($this->shouldStopValidating($attribute)) {
+					break;
+				}
+			}
+		}
+
+		return $this->errors;
+	}
+
+	/**
+	 * Add an error message to the validator's collection of errors.
+	 *
+	 * @param string $attribute
+	 * @param string $rule
+	 *
+	 * @return void
+	 */
+	protected function addError($attribute, $rule, array $parameters)
+	{
+		$message = $this->getMessage($attribute, $rule, $parameters);
+
+		$this->errors[$attribute]['errors'][] = $message;
+
+		if (!isset($this->errors[$attribute]['value'])) {
+			$this->errors[$attribute]['value'] = $this->getValue($attribute);
+		}
+	}
+
+	/**
+	 * Add a failed rule and error message to the collection.
+	 *
+	 * @param string $attribute
+	 * @param string $rule
+	 *
+	 * @return void
+	 */
+	protected function addFailure($attribute, $rule, array $parameters)
+	{
+		$this->addError($attribute, $rule, $parameters);
+
+		$this->failedRules[$attribute][$rule] = $parameters;
+	}
+
+	/**
+	 * Get the data type of the given attribute.
+	 *
+	 * @param  string  $attribute
+	 * @return string
+	 */
+	protected function getAttributeType($attribute)
+	{
+		return $this->hasRule($attribute, $this->numericRules)
+			? 'numeric'
+			: 'string';
+	}
+
+	/**
+	 * Get the validation message for an attribute and rule.
+	 *
+	 * @param string $attribute
+	 * @param string $rule
+	 *
+	 * @return string|null
+	 */
+	protected function getMessage($attribute, $rule, array $parameters)
+	{
+		if (in_array($rule, $this->sizeRules)) {
+			return $this->getSizeMessage($attribute, $rule, $parameters);
+		}
+
+		$lowerRule = $this->snakeCase($rule);
+
+		return $this->translator($lowerRule, $rule, $attribute, $parameters);
+	}
+
+	/**
+	 * Get a rule and its parameters for a given attribute.
+	 *
+	 * @param string       $attribute
+	 * @param string|array $rules
+	 *
+	 * @return array|null
+	 */
+	protected function getRule($attribute, $rules)
+	{
+		if (!array_key_exists($attribute, $this->rules)) {
+			return;
+		}
+
+		$rules = (array) $rules;
+
+		foreach ($this->rules[$attribute] as $rule) {
+			list($rule, $parameters) = $this->parseRule($rule);
+
+			if (in_array($rule, $rules)) {
+				return [$rule, $parameters];
+			}
+		}
+	}
+
+	/**
+	 * Get the size of an attribute.
+	 *
+	 * @param string $attribute
+	 * @param mixed  $value
+	 *
+	 * @return mixed
+	 */
+	protected function getSize($attribute, $value)
+	{
+		$hasNumeric = $this->hasRule($attribute, $this->numericRules);
+
+		if (is_numeric($value) && $hasNumeric) {
+			return $value;
+		} elseif (is_array($value)) {
+			return count($value);
+		}
+
+		return mb_strlen($value);
+	}
+
+	/**
+	 * Get the proper error message for an attribute and size rule.
+	 *
+	 * @param string $attribute
+	 * @param string $rule
+	 *
+	 * @return string|null
+	 */
+	protected function getSizeMessage($attribute, $rule, array $parameters)
+	{
+		$lowerRule = $this->snakeCase($rule);
+		$type = $this->getAttributeType($attribute);
+
+		$lowerRule .= ".{$type}";
+
+		return $this->translator($lowerRule, $rule, $attribute, $parameters);
+	}
+
+	/**
+	 * Get the value of a given attribute.
+	 *
+	 * @param string $attribute
+	 *
+	 * @return mixed
+	 */
+	protected function getValue($attribute)
+	{
+		if (isset($this->data[$attribute])) {
+			return $this->data[$attribute];
+		}
+	}
+
+	/**
+	 * Determine if the given attribute has a rule in the given set.
+	 *
+	 * @param string       $attribute
+	 * @param string|array $rules
+	 *
+	 * @return bool
+	 */
+	protected function hasRule($attribute, $rules)
+	{
+		return !is_null($this->getRule($attribute, $rules));
+	}
+
+	/**
+	 * Normalize the provided data to an array.
+	 *
+	 * @param mixed $data
+	 *
+	 * @return $this
+	 */
+	protected function normalizeData($data)
+	{
+		// If an object was provided, get its public properties
+		if (is_object($data)) {
+			$this->data = get_object_vars($data);
+		} else {
+			$this->data = $data;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Parse a parameter list.
+	 *
+	 * @param string $rule
+	 * @param string $parameter
+	 *
+	 * @return array
+	 */
+	protected function parseParameters($rule, $parameter)
+	{
+		if ('regex' == strtolower($rule)) {
+			return [$parameter];
+		}
+
+		return str_getcsv($parameter);
+	}
+
+	/**
+	 * Extract the rule name and parameters from a rule.
+	 *
+	 * @param string $rule
+	 *
+	 * @return array
+	 */
+	protected function parseRule($rule)
+	{
+		$parameters = [];
+
+		// example: {rule}:{parameters}
+		if (false !== strpos($rule, ':')) {
+			list($rule, $parameter) = explode(':', $rule, 2);
+
+			// example: {parameter1,parameter2,...}
+			$parameters = $this->parseParameters($rule, $parameter);
+		}
+
+		$rule = ucwords(str_replace(['-', '_'], ' ', trim($rule)));
+		$rule = str_replace(' ', '', $rule);
+
+		return [$rule, $parameters];
+	}
+
+	/**
+	 * Replace all placeholders for the between rule.
+	 *
+	 * @param string $message
+	 *
+	 * @return string
+	 */
+	protected function replaceBetween($message, array $parameters)
+	{
+		return str_replace([':min', ':max'], $parameters, $message);
+	}
+
+	/**
+	 * Replace all placeholders for the max rule.
+	 *
+	 * @param string $message
+	 *
+	 * @return string
+	 */
+	protected function replaceMax($message, array $parameters)
+	{
+		return str_replace(':max', $parameters[0], $message);
+	}
+
+	/**
+	 * Replace all placeholders for the min rule.
+	 *
+	 * @param string $message
+	 *
+	 * @return string
+	 */
+	protected function replaceMin($message, array $parameters)
+	{
+		return str_replace(':min', $parameters[0], $message);
+	}
+
+	/**
+	 * Require a certain number of parameters to be present.
+	 *
+	 * @param int    $count
+	 * @param string $rule
+	 *
+	 * @return void
+	 * @throws InvalidArgumentException
+	 */
+	protected function requireParameterCount($count, array $parameters, $rule)
+	{
+		if (count($parameters) < $count) {
+			throw new InvalidArgumentException("Validation rule $rule requires at least $count parameters.");
+		}
+	}
+
+	/**
+	 * Set the validation rules.
+	 *
+	 * @return $this
+	 */
+	protected function setRules(array $rules)
+	{
+		foreach ($rules as $key => $rule) {
+			$rules[$key] = is_string($rule) ? explode('|', $rule) : $rule;
+		}
+
+		$this->rules = $rules;
+
+		return $this;
+	}
+
+	/**
+	 * Check if we should stop further validations on a given attribute.
+	 *
+	 * @param string $attribute
+	 *
+	 * @return bool
+	 */
+	protected function shouldStopValidating($attribute)
+	{
+		return $this->hasRule($attribute, $this->implicitRules)
+			&& isset($this->failedRules[$attribute])
+			&& array_intersect(array_keys($this->failedRules[$attribute]), $this->implicitRules);
+	}
+
+	/**
+	 * Convert a string to snake case.
+	 *
+	 * @param string $string
+	 *
+	 * @return string
+	 */
+	protected function snakeCase($string)
+	{
+		if (!ctype_lower($string)) {
+			$string = preg_replace('/\s+/u', '', $string);
+			$string = preg_replace('/(.)(?=[A-Z])/u', '$1_', $string);
+			$string = mb_strtolower($string, 'UTF-8');
+		}
+
+		return $string;
+	}
+
+	/**
+	 * Returns a translated message for the attribute.
+	 *
+	 * @param string $key
+	 * @param string $rule
+	 * @param string $attribute
+	 *
+	 * @return string|null
+	 */
+	protected function translator($key, $rule, $attribute, array $parameters)
+	{
+		$strings = []; //glsr_resolve( 'Strings' )->validation();
+
+		$message = isset($strings[$key])
+			? $strings[$key]
+			: false;
+
+		if (!$message) {
+			return;
+		}
+
+		$message = str_replace(':attribute', $attribute, $message);
+
+		if (method_exists($this, $replacer = "replace{$rule}")) {
+			$message = $this->$replacer($message, $parameters);
+		}
+
+		return $message;
+	}
+
+	// Rules Validation
+	// ---------------------------------------------------------------------------------------------
+
+	/**
+	 * Validate that an attribute was "accepted".
+	 *
+	 * This validation rule implies the attribute is "required".
+	 *
+	 * @param mixed  $value
+	 *
+	 * @return bool
+	 */
+	protected function validateAccepted($value)
+	{
+		$acceptable = ['yes', 'on', '1', 1, true, 'true'];
+
+		return $this->validateRequired($value) && in_array($value, $acceptable, true);
+	}
+
+	/**
+	 * Validate a given attribute against a rule.
+	 *
+	 * @param string $rule
+	 * @param string $attribute
+	 *
+	 * @return void
+	 * @throws BadMethodCallException
+	 */
+	protected function validateAttribute($rule, $attribute)
+	{
+		list($rule, $parameters) = $this->parseRule($rule);
+
+		if ('' == $rule) {
+			return;
+		}
+
+		$method = "validate{$rule}";
+
+		if (!method_exists($this, $method)) {
+			throw new BadMethodCallException("Method [$method] does not exist.");
+		}
+
+		if (!$this->$method($this->getValue($attribute), $attribute, $parameters)) {
+			$this->addFailure($attribute, $rule, $parameters);
+		}
+	}
+
+	/**
+	 * Validate the size of an attribute is between a set of values.
+	 *
+	 * @param mixed  $value
+	 * @param string $attribute
+	 *
+	 * @return bool
+	 */
+	protected function validateBetween($value, $attribute, array $parameters)
+	{
+		$this->requireParameterCount(2, $parameters, 'between');
+
+		$size = $this->getSize($attribute, $value);
+
+		return $size >= $parameters[0] && $size <= $parameters[1];
+	}
+
+	/**
+	 * Validate that an attribute is a valid e-mail address.
+	 *
+	 * @param mixed $value
+	 *
+	 * @return bool
+	 */
+	protected function validateEmail($value)
+	{
+		return false !== filter_var($value, FILTER_VALIDATE_EMAIL);
+	}
+
+	/**
+	 * Validate the size of an attribute is less than a maximum value.
+	 *
+	 * @param mixed  $value
+	 * @param string $attribute
+	 *
+	 * @return bool
+	 */
+	protected function validateMax($value, $attribute, array $parameters)
+	{
+		$this->requireParameterCount(1, $parameters, 'max');
+
+		return $this->getSize($attribute, $value) <= $parameters[0];
+	}
+
+	/**
+	 * Validate the size of an attribute is greater than a minimum value.
+	 *
+	 * @param mixed  $value
+	 * @param string $attribute
+	 *
+	 * @return bool
+	 */
+	protected function validateMin($value, $attribute, array $parameters)
+	{
+		$this->requireParameterCount(1, $parameters, 'min');
+
+		return $this->getSize($attribute, $value) >= $parameters[0];
+	}
+
+	/**
+	 * Validate that an attribute is numeric.
+	 *
+	 * @param mixed $value
+	 *
+	 * @return bool
+	 */
+	protected function validateNumeric($value)
+	{
+		return is_numeric($value);
+	}
+
+	/**
+	 * Validate that a required attribute exists.
+	 *
+	 * @param mixed $value
+	 *
+	 * @return bool
+	 */
+	protected function validateRequired($value)
+	{
+		if (is_string($value)) {
+			$value = trim($value);
+		}
+		return is_null($value) || empty($value)
+			? false
+			: true;
+	}
 }

Spacing +104 added lines, -104 removed lines

@@ -69,16 +69,16 @@ 
      *
      * @return array
      */
-    public function validate($data, array $rules = [])
+    public function validate( $data, array $rules = [] )
     {
-        $this->normalizeData($data);
-        $this->setRules($rules);
+        $this->normalizeData( $data );
+        $this->setRules( $rules );
 
-        foreach ($this->rules as $attribute => $rules) {
-            foreach ($rules as $rule) {
-                $this->validateAttribute($rule, $attribute);
+        foreach( $this->rules as $attribute => $rules ) {
+            foreach( $rules as $rule ) {
+                $this->validateAttribute( $rule, $attribute );
 
-                if ($this->shouldStopValidating($attribute)) {
+                if( $this->shouldStopValidating( $attribute ) ) {
                     break;
                 }
             }
@@ -95,14 +95,14 @@ 
      *
      * @return void
      */
-    protected function addError($attribute, $rule, array $parameters)
+    protected function addError( $attribute, $rule, array $parameters )
     {
-        $message = $this->getMessage($attribute, $rule, $parameters);
+        $message = $this->getMessage( $attribute, $rule, $parameters );
 
         $this->errors[$attribute]['errors'][] = $message;
 
-        if (!isset($this->errors[$attribute]['value'])) {
-            $this->errors[$attribute]['value'] = $this->getValue($attribute);
+        if( !isset( $this->errors[$attribute]['value'] ) ) {
+            $this->errors[$attribute]['value'] = $this->getValue( $attribute );
         }
     }
 
@@ -114,9 +114,9 @@ 
      *
      * @return void
      */
-    protected function addFailure($attribute, $rule, array $parameters)
+    protected function addFailure( $attribute, $rule, array $parameters )
     {
-        $this->addError($attribute, $rule, $parameters);
+        $this->addError( $attribute, $rule, $parameters );
 
         $this->failedRules[$attribute][$rule] = $parameters;
     }
@@ -127,9 +127,9 @@ 
      * @param  string  $attribute
      * @return string
      */
-    protected function getAttributeType($attribute)
+    protected function getAttributeType( $attribute )
     {
-        return $this->hasRule($attribute, $this->numericRules)
+        return $this->hasRule( $attribute, $this->numericRules )
             ? 'numeric'
             : 'string';
     }
@@ -142,15 +142,15 @@ 
      *
      * @return string|null
      */
-    protected function getMessage($attribute, $rule, array $parameters)
+    protected function getMessage( $attribute, $rule, array $parameters )
     {
-        if (in_array($rule, $this->sizeRules)) {
-            return $this->getSizeMessage($attribute, $rule, $parameters);
+        if( in_array( $rule, $this->sizeRules ) ) {
+            return $this->getSizeMessage( $attribute, $rule, $parameters );
         }
 
-        $lowerRule = $this->snakeCase($rule);
+        $lowerRule = $this->snakeCase( $rule );
 
-        return $this->translator($lowerRule, $rule, $attribute, $parameters);
+        return $this->translator( $lowerRule, $rule, $attribute, $parameters );
     }
 
     /**
@@ -161,18 +161,18 @@ 
      *
      * @return array|null
      */
-    protected function getRule($attribute, $rules)
+    protected function getRule( $attribute, $rules )
     {
-        if (!array_key_exists($attribute, $this->rules)) {
+        if( !array_key_exists( $attribute, $this->rules ) ) {
             return;
         }
 
         $rules = (array) $rules;
 
-        foreach ($this->rules[$attribute] as $rule) {
-            list($rule, $parameters) = $this->parseRule($rule);
+        foreach( $this->rules[$attribute] as $rule ) {
+            list( $rule, $parameters ) = $this->parseRule( $rule );
 
-            if (in_array($rule, $rules)) {
+            if( in_array( $rule, $rules ) ) {
                 return [$rule, $parameters];
             }
         }
@@ -186,17 +186,17 @@ 
      *
      * @return mixed
      */
-    protected function getSize($attribute, $value)
+    protected function getSize( $attribute, $value )
     {
-        $hasNumeric = $this->hasRule($attribute, $this->numericRules);
+        $hasNumeric = $this->hasRule( $attribute, $this->numericRules );
 
-        if (is_numeric($value) && $hasNumeric) {
+        if( is_numeric( $value ) && $hasNumeric ) {
             return $value;
-        } elseif (is_array($value)) {
-            return count($value);
+        } elseif( is_array( $value ) ) {
+            return count( $value );
         }
 
-        return mb_strlen($value);
+        return mb_strlen( $value );
     }
 
     /**
@@ -207,14 +207,14 @@ 
      *
      * @return string|null
      */
-    protected function getSizeMessage($attribute, $rule, array $parameters)
+    protected function getSizeMessage( $attribute, $rule, array $parameters )
     {
-        $lowerRule = $this->snakeCase($rule);
-        $type = $this->getAttributeType($attribute);
+        $lowerRule = $this->snakeCase( $rule );
+        $type = $this->getAttributeType( $attribute );
 
         $lowerRule .= ".{$type}";
 
-        return $this->translator($lowerRule, $rule, $attribute, $parameters);
+        return $this->translator( $lowerRule, $rule, $attribute, $parameters );
     }
 
     /**
@@ -224,9 +224,9 @@ 
      *
      * @return mixed
      */
-    protected function getValue($attribute)
+    protected function getValue( $attribute )
     {
-        if (isset($this->data[$attribute])) {
+        if( isset( $this->data[$attribute] ) ) {
             return $this->data[$attribute];
         }
     }
@@ -239,9 +239,9 @@ 
      *
      * @return bool
      */
-    protected function hasRule($attribute, $rules)
+    protected function hasRule( $attribute, $rules )
     {
-        return !is_null($this->getRule($attribute, $rules));
+        return !is_null( $this->getRule( $attribute, $rules ) );
     }
 
     /**
@@ -251,11 +251,11 @@ 
      *
      * @return $this
      */
-    protected function normalizeData($data)
+    protected function normalizeData( $data )
     {
         // If an object was provided, get its public properties
-        if (is_object($data)) {
-            $this->data = get_object_vars($data);
+        if( is_object( $data ) ) {
+            $this->data = get_object_vars( $data );
         } else {
             $this->data = $data;
         }
@@ -271,13 +271,13 @@ 
      *
      * @return array
      */
-    protected function parseParameters($rule, $parameter)
+    protected function parseParameters( $rule, $parameter )
     {
-        if ('regex' == strtolower($rule)) {
+        if( 'regex' == strtolower( $rule ) ) {
             return [$parameter];
         }
 
-        return str_getcsv($parameter);
+        return str_getcsv( $parameter );
     }
 
     /**
@@ -287,20 +287,20 @@ 
      *
      * @return array
      */
-    protected function parseRule($rule)
+    protected function parseRule( $rule )
     {
         $parameters = [];
 
         // example: {rule}:{parameters}
-        if (false !== strpos($rule, ':')) {
-            list($rule, $parameter) = explode(':', $rule, 2);
+        if( false !== strpos( $rule, ':' ) ) {
+            list( $rule, $parameter ) = explode( ':', $rule, 2 );
 
             // example: {parameter1,parameter2,...}
-            $parameters = $this->parseParameters($rule, $parameter);
+            $parameters = $this->parseParameters( $rule, $parameter );
         }
 
-        $rule = ucwords(str_replace(['-', '_'], ' ', trim($rule)));
-        $rule = str_replace(' ', '', $rule);
+        $rule = ucwords( str_replace( ['-', '_'], ' ', trim( $rule ) ) );
+        $rule = str_replace( ' ', '', $rule );
 
         return [$rule, $parameters];
     }
@@ -312,9 +312,9 @@ 
      *
      * @return string
      */
-    protected function replaceBetween($message, array $parameters)
+    protected function replaceBetween( $message, array $parameters )
     {
-        return str_replace([':min', ':max'], $parameters, $message);
+        return str_replace( [':min', ':max'], $parameters, $message );
     }
 
     /**
@@ -324,9 +324,9 @@ 
      *
      * @return string
      */
-    protected function replaceMax($message, array $parameters)
+    protected function replaceMax( $message, array $parameters )
     {
-        return str_replace(':max', $parameters[0], $message);
+        return str_replace( ':max', $parameters[0], $message );
     }
 
     /**
@@ -336,9 +336,9 @@ 
      *
      * @return string
      */
-    protected function replaceMin($message, array $parameters)
+    protected function replaceMin( $message, array $parameters )
     {
-        return str_replace(':min', $parameters[0], $message);
+        return str_replace( ':min', $parameters[0], $message );
     }
 
     /**
@@ -350,10 +350,10 @@ 
      * @return void
      * @throws InvalidArgumentException
      */
-    protected function requireParameterCount($count, array $parameters, $rule)
+    protected function requireParameterCount( $count, array $parameters, $rule )
     {
-        if (count($parameters) < $count) {
-            throw new InvalidArgumentException("Validation rule $rule requires at least $count parameters.");
+        if( count( $parameters ) < $count ) {
+            throw new InvalidArgumentException( "Validation rule $rule requires at least $count parameters." );
         }
     }
 
@@ -362,10 +362,10 @@ 
      *
      * @return $this
      */
-    protected function setRules(array $rules)
+    protected function setRules( array $rules )
     {
-        foreach ($rules as $key => $rule) {
-            $rules[$key] = is_string($rule) ? explode('|', $rule) : $rule;
+        foreach( $rules as $key => $rule ) {
+            $rules[$key] = is_string( $rule ) ? explode( '|', $rule ) : $rule;
         }
 
         $this->rules = $rules;
@@ -380,11 +380,11 @@ 
      *
      * @return bool
      */
-    protected function shouldStopValidating($attribute)
+    protected function shouldStopValidating( $attribute )
     {
-        return $this->hasRule($attribute, $this->implicitRules)
-            && isset($this->failedRules[$attribute])
-            && array_intersect(array_keys($this->failedRules[$attribute]), $this->implicitRules);
+        return $this->hasRule( $attribute, $this->implicitRules )
+            && isset( $this->failedRules[$attribute] )
+            && array_intersect( array_keys( $this->failedRules[$attribute] ), $this->implicitRules );
     }
 
     /**
@@ -394,12 +394,12 @@ 
      *
      * @return string
      */
-    protected function snakeCase($string)
+    protected function snakeCase( $string )
     {
-        if (!ctype_lower($string)) {
-            $string = preg_replace('/\s+/u', '', $string);
-            $string = preg_replace('/(.)(?=[A-Z])/u', '$1_', $string);
-            $string = mb_strtolower($string, 'UTF-8');
+        if( !ctype_lower( $string ) ) {
+            $string = preg_replace( '/\s+/u', '', $string );
+            $string = preg_replace( '/(.)(?=[A-Z])/u', '$1_', $string );
+            $string = mb_strtolower( $string, 'UTF-8' );
         }
 
         return $string;
@@ -414,22 +414,22 @@ 
      *
      * @return string|null
      */
-    protected function translator($key, $rule, $attribute, array $parameters)
+    protected function translator( $key, $rule, $attribute, array $parameters )
     {
         $strings = []; //glsr_resolve( 'Strings' )->validation();
 
-        $message = isset($strings[$key])
+        $message = isset( $strings[$key] )
             ? $strings[$key]
             : false;
 
-        if (!$message) {
+        if( !$message ) {
             return;
         }
 
-        $message = str_replace(':attribute', $attribute, $message);
+        $message = str_replace( ':attribute', $attribute, $message );
 
-        if (method_exists($this, $replacer = "replace{$rule}")) {
-            $message = $this->$replacer($message, $parameters);
+        if( method_exists( $this, $replacer = "replace{$rule}" ) ) {
+            $message = $this->$replacer( $message, $parameters );
         }
 
         return $message;
@@ -447,11 +447,11 @@ 
      *
      * @return bool
      */
-    protected function validateAccepted($value)
+    protected function validateAccepted( $value )
     {
         $acceptable = ['yes', 'on', '1', 1, true, 'true'];
 
-        return $this->validateRequired($value) && in_array($value, $acceptable, true);
+        return $this->validateRequired( $value ) && in_array( $value, $acceptable, true );
     }
 
     /**
@@ -463,22 +463,22 @@ 
      * @return void
      * @throws BadMethodCallException
      */
-    protected function validateAttribute($rule, $attribute)
+    protected function validateAttribute( $rule, $attribute )
     {
-        list($rule, $parameters) = $this->parseRule($rule);
+        list( $rule, $parameters ) = $this->parseRule( $rule );
 
-        if ('' == $rule) {
+        if( '' == $rule ) {
             return;
         }
 
         $method = "validate{$rule}";
 
-        if (!method_exists($this, $method)) {
-            throw new BadMethodCallException("Method [$method] does not exist.");
+        if( !method_exists( $this, $method ) ) {
+            throw new BadMethodCallException( "Method [$method] does not exist." );
         }
 
-        if (!$this->$method($this->getValue($attribute), $attribute, $parameters)) {
-            $this->addFailure($attribute, $rule, $parameters);
+        if( !$this->$method( $this->getValue( $attribute ), $attribute, $parameters ) ) {
+            $this->addFailure( $attribute, $rule, $parameters );
         }
     }
 
@@ -490,11 +490,11 @@ 
      *
      * @return bool
      */
-    protected function validateBetween($value, $attribute, array $parameters)
+    protected function validateBetween( $value, $attribute, array $parameters )
     {
-        $this->requireParameterCount(2, $parameters, 'between');
+        $this->requireParameterCount( 2, $parameters, 'between' );
 
-        $size = $this->getSize($attribute, $value);
+        $size = $this->getSize( $attribute, $value );
 
         return $size >= $parameters[0] && $size <= $parameters[1];
     }
@@ -506,9 +506,9 @@ 
      *
      * @return bool
      */
-    protected function validateEmail($value)
+    protected function validateEmail( $value )
     {
-        return false !== filter_var($value, FILTER_VALIDATE_EMAIL);
+        return false !== filter_var( $value, FILTER_VALIDATE_EMAIL );
     }
 
     /**
@@ -519,11 +519,11 @@ 
      *
      * @return bool
      */
-    protected function validateMax($value, $attribute, array $parameters)
+    protected function validateMax( $value, $attribute, array $parameters )
     {
-        $this->requireParameterCount(1, $parameters, 'max');
+        $this->requireParameterCount( 1, $parameters, 'max' );
 
-        return $this->getSize($attribute, $value) <= $parameters[0];
+        return $this->getSize( $attribute, $value ) <= $parameters[0];
     }
 
     /**
@@ -534,11 +534,11 @@ 
      *
      * @return bool
      */
-    protected function validateMin($value, $attribute, array $parameters)
+    protected function validateMin( $value, $attribute, array $parameters )
     {
-        $this->requireParameterCount(1, $parameters, 'min');
+        $this->requireParameterCount( 1, $parameters, 'min' );
 
-        return $this->getSize($attribute, $value) >= $parameters[0];
+        return $this->getSize( $attribute, $value ) >= $parameters[0];
     }
 
     /**
@@ -548,9 +548,9 @@ 
      *
      * @return bool
      */
-    protected function validateNumeric($value)
+    protected function validateNumeric( $value )
     {
-        return is_numeric($value);
+        return is_numeric( $value );
     }
 
     /**
@@ -560,12 +560,12 @@ 
      *
      * @return bool
      */
-    protected function validateRequired($value)
+    protected function validateRequired( $value )
     {
-        if (is_string($value)) {
-            $value = trim($value);
+        if( is_string( $value ) ) {
+            $value = trim( $value );
         }
-        return is_null($value) || empty($value)
+        return is_null( $value ) || empty( $value )
             ? false
             : true;
     }

Braces +5 added lines, -4 removed lines

@@ -5,8 +5,7 @@ 
 use BadMethodCallException;
 use InvalidArgumentException;
 
-class Validator
-{
+class Validator {
     /**
      * @var array
      */
@@ -192,7 +191,8 @@ 
 
         if (is_numeric($value) && $hasNumeric) {
             return $value;
-        } elseif (is_array($value)) {
+        }
+        elseif (is_array($value)) {
             return count($value);
         }
 
@@ -256,7 +256,8 @@ 
         // If an object was provided, get its public properties
         if (is_object($data)) {
             $this->data = get_object_vars($data);
-        } else {
+        }
+        else {
             $this->data = $data;
         }
 

src/Services/Normalizer.php

Indentation +227 added lines, -227 removed lines

@@ -4,231 +4,231 @@
 
 class Normalizer
 {
-    const BOOLEAN_ATTRIBUTES = [
-        'autofocus', 'capture', 'checked', 'disabled', 'draggable', 'formnovalidate', 'hidden',
-        'multiple', 'novalidate', 'readonly', 'required', 'selected', 'spellcheck',
-        'webkitdirectory',
-    ];
-
-    const FORM_ATTRIBUTES = [
-        'accept', 'accept-charset', 'action', 'autocapitalize', 'autocomplete', 'enctype',
-        'method', 'name', 'novalidate', 'target',
-    ];
-
-    const GLOBAL_ATTRIBUTES = [
-        'accesskey', 'class', 'contenteditable', 'contextmenu', 'dir', 'draggable', 'dropzone',
-        'hidden', 'id', 'lang', 'spellcheck', 'style', 'tabindex', 'title',
-    ];
-
-    const GLOBAL_WILDCARD_ATTRIBUTES = [
-        'aria-', 'data-', 'item', 'on',
-    ];
-
-    const INPUT_ATTRIBUTES = [
-        'accept', 'autocapitalize', 'autocomplete', 'autocorrect', 'autofocus', 'capture',
-        'checked', 'disabled', 'form', 'formaction', 'formenctype', 'formmethod',
-        'formnovalidate', 'formtarget', 'height', 'incremental', 'inputmode', 'list', 'max',
-        'maxlength', 'min', 'minlength', 'mozactionhint', 'multiple', 'name', 'pattern',
-        'placeholder', 'readonly', 'required', 'results', 'selectionDirection', 'size', 'src',
-        'step', 'type', 'value', 'webkitdirectory', 'width', 'x-moz-errormessage',
-    ];
-
-    const INPUT_TYPES = [
-        'button', 'checkbox', 'color', 'date', 'datetime', 'datetime-local', 'email', 'file',
-        'hidden', 'image', 'max', 'min', 'month', 'number', 'password', 'radio', 'range',
-        'reset', 'search', 'step', 'submit', 'tel', 'text', 'time', 'url', 'value', 'week',
-    ];
-
-    const SELECT_ATTRIBUTES = [
-        'autofocus', 'disabled', 'form', 'multiple', 'name', 'required', 'size',
-    ];
-
-    const TEXTAREA_ATTRIBUTES = [
-        'autocapitalize', 'autocomplete', 'autofocus', 'cols', 'disabled', 'form', 'maxlength',
-        'minlength', 'name', 'placeholder', 'readonly', 'required', 'rows',
-        'selectionDirection', 'selectionEnd', 'selectionStart', 'wrap',
-    ];
-
-    /**
-     * @var array
-     */
-    protected $args;
-
-    public function __construct()
-    {
-        $this->args = [];
-    }
-
-    /**
-     * Normalize form attributes.
-     *
-     * @return array|string
-     */
-    public function form(array $args = [], $implode = false)
-    {
-        $attributes = $this->parseAttributes(self::FORM_ATTRIBUTES, $args);
-
-        return $this->maybeImplode($attributes, $implode);
-    }
-
-    /**
-     * Normalize input attributes.
-     *
-     * @return array|string
-     */
-    public function input(array $args = [], $implode = false)
-    {
-        $this->filterInputType();
-
-        $attributes = $this->parseAttributes(self::INPUT_ATTRIBUTES, $args);
-
-        return $this->maybeImplode($attributes, $implode);
-    }
-
-    /**
-     * Possibly implode attributes into a string.
-     *
-     * @param bool|string $implode
-     *
-     * @return array|string
-     */
-    public function maybeImplode(array $attributes, $implode = true)
-    {
-        if (!$implode || 'implode' !== $implode) {
-            return $attributes;
-        }
-        $results = [];
-        foreach ($attributes as $key => $value) {
-            // if data attributes, use single quotes in case of json encoded values
-            $quotes = false !== stripos($key, 'data-') ? "'" : '"';
-            if (is_array($value)) {
-                $value = json_encode($value);
-                $quotes = "'";
-            }
-            $results[] = is_string($key)
-                ? sprintf('%1$s=%3$s%2$s%3$s', $key, $value, $quotes)
-                : $value;
-        }
-        return implode(' ', $results);
-    }
-
-    /**
-     * Normalize select attributes.
-     *
-     * @return array|string
-     */
-    public function select(array $args = [], $implode = false)
-    {
-        $attributes = $this->parseAttributes(self::SELECT_ATTRIBUTES, $args);
-
-        return $this->maybeImplode($attributes, $implode);
-    }
-
-    /**
-     * Normalize textarea attributes.
-     *
-     * @return array|string
-     */
-    public function textarea(array $args = [], $implode = false)
-    {
-        $attributes = $this->parseAttributes(self::TEXTAREA_ATTRIBUTES, $args);
-
-        return $this->maybeImplode($attributes, $implode);
-    }
-
-    /**
-     * Filter attributes by the provided attrribute keys and remove any non-boolean keys
-     * with empty values.
-     *
-     * @return array
-     */
-    protected function filterAttributes(array $attributeKeys)
-    {
-        $filtered = array_intersect_key($this->args, array_flip($attributeKeys));
-
-        // normalize truthy boolean attributes
-        foreach ($filtered as $key => $value) {
-            if (!in_array($key, self::BOOLEAN_ATTRIBUTES)) {
-                continue;
-            }
-
-            if (false !== $value) {
-                $filtered[$key] = '';
-                continue;
-            }
-
-            unset($filtered[$key]);
-        }
-
-        $filteredKeys = array_filter(array_keys($filtered), function ($key) use ($filtered) {
-            return !(
-                empty($filtered[$key])
-                && !is_numeric($filtered[$key])
-                && !in_array($key, self::BOOLEAN_ATTRIBUTES)
-            );
-        });
-
-        return array_intersect_key($filtered, array_flip($filteredKeys));
-    }
-
-    /**
-     * @return array
-     */
-    protected function filterGlobalAttributes()
-    {
-        $global = $this->filterAttributes(self::GLOBAL_ATTRIBUTES);
-
-        $wildcards = [];
-
-        foreach (self::GLOBAL_WILDCARD_ATTRIBUTES as $wildcard) {
-            foreach ($this->args as $key => $value) {
-                $length = strlen($wildcard);
-                $result = substr($key, 0, $length) === $wildcard;
-
-                if ($result) {
-                    // only allow data attributes to have an empty value
-                    if ('data-' != $wildcard && empty($value)) {
-                        continue;
-                    }
-
-                    if (is_array($value)) {
-                        if ('data-' != $wildcard) {
-                            continue;
-                        }
-
-                        $value = json_encode($value);
-                    }
-
-                    $wildcards[$key] = $value;
-                }
-            }
-        }
-
-        return array_merge($global, $wildcards);
-    }
-
-    /**
-     * @return void
-     */
-    protected function filterInputType()
-    {
-        if (!isset($this->args['type']) || !in_array($this->args['type'], self::INPUT_TYPES)) {
-            $this->args['type'] = 'text';
-        }
-    }
-
-    /**
-     * @return array
-     */
-    protected function parseAttributes(array $attributes, array $args = [])
-    {
-        if (!empty($args)) {
-            $this->args = array_change_key_case($args);
-        }
-
-        $global = $this->filterGlobalAttributes();
-        $local = $this->filterAttributes($attributes);
-
-        return array_merge($global, $local);
-    }
+	const BOOLEAN_ATTRIBUTES = [
+		'autofocus', 'capture', 'checked', 'disabled', 'draggable', 'formnovalidate', 'hidden',
+		'multiple', 'novalidate', 'readonly', 'required', 'selected', 'spellcheck',
+		'webkitdirectory',
+	];
+
+	const FORM_ATTRIBUTES = [
+		'accept', 'accept-charset', 'action', 'autocapitalize', 'autocomplete', 'enctype',
+		'method', 'name', 'novalidate', 'target',
+	];
+
+	const GLOBAL_ATTRIBUTES = [
+		'accesskey', 'class', 'contenteditable', 'contextmenu', 'dir', 'draggable', 'dropzone',
+		'hidden', 'id', 'lang', 'spellcheck', 'style', 'tabindex', 'title',
+	];
+
+	const GLOBAL_WILDCARD_ATTRIBUTES = [
+		'aria-', 'data-', 'item', 'on',
+	];
+
+	const INPUT_ATTRIBUTES = [
+		'accept', 'autocapitalize', 'autocomplete', 'autocorrect', 'autofocus', 'capture',
+		'checked', 'disabled', 'form', 'formaction', 'formenctype', 'formmethod',
+		'formnovalidate', 'formtarget', 'height', 'incremental', 'inputmode', 'list', 'max',
+		'maxlength', 'min', 'minlength', 'mozactionhint', 'multiple', 'name', 'pattern',
+		'placeholder', 'readonly', 'required', 'results', 'selectionDirection', 'size', 'src',
+		'step', 'type', 'value', 'webkitdirectory', 'width', 'x-moz-errormessage',
+	];
+
+	const INPUT_TYPES = [
+		'button', 'checkbox', 'color', 'date', 'datetime', 'datetime-local', 'email', 'file',
+		'hidden', 'image', 'max', 'min', 'month', 'number', 'password', 'radio', 'range',
+		'reset', 'search', 'step', 'submit', 'tel', 'text', 'time', 'url', 'value', 'week',
+	];
+
+	const SELECT_ATTRIBUTES = [
+		'autofocus', 'disabled', 'form', 'multiple', 'name', 'required', 'size',
+	];
+
+	const TEXTAREA_ATTRIBUTES = [
+		'autocapitalize', 'autocomplete', 'autofocus', 'cols', 'disabled', 'form', 'maxlength',
+		'minlength', 'name', 'placeholder', 'readonly', 'required', 'rows',
+		'selectionDirection', 'selectionEnd', 'selectionStart', 'wrap',
+	];
+
+	/**
+	 * @var array
+	 */
+	protected $args;
+
+	public function __construct()
+	{
+		$this->args = [];
+	}
+
+	/**
+	 * Normalize form attributes.
+	 *
+	 * @return array|string
+	 */
+	public function form(array $args = [], $implode = false)
+	{
+		$attributes = $this->parseAttributes(self::FORM_ATTRIBUTES, $args);
+
+		return $this->maybeImplode($attributes, $implode);
+	}
+
+	/**
+	 * Normalize input attributes.
+	 *
+	 * @return array|string
+	 */
+	public function input(array $args = [], $implode = false)
+	{
+		$this->filterInputType();
+
+		$attributes = $this->parseAttributes(self::INPUT_ATTRIBUTES, $args);
+
+		return $this->maybeImplode($attributes, $implode);
+	}
+
+	/**
+	 * Possibly implode attributes into a string.
+	 *
+	 * @param bool|string $implode
+	 *
+	 * @return array|string
+	 */
+	public function maybeImplode(array $attributes, $implode = true)
+	{
+		if (!$implode || 'implode' !== $implode) {
+			return $attributes;
+		}
+		$results = [];
+		foreach ($attributes as $key => $value) {
+			// if data attributes, use single quotes in case of json encoded values
+			$quotes = false !== stripos($key, 'data-') ? "'" : '"';
+			if (is_array($value)) {
+				$value = json_encode($value);
+				$quotes = "'";
+			}
+			$results[] = is_string($key)
+				? sprintf('%1$s=%3$s%2$s%3$s', $key, $value, $quotes)
+				: $value;
+		}
+		return implode(' ', $results);
+	}
+
+	/**
+	 * Normalize select attributes.
+	 *
+	 * @return array|string
+	 */
+	public function select(array $args = [], $implode = false)
+	{
+		$attributes = $this->parseAttributes(self::SELECT_ATTRIBUTES, $args);
+
+		return $this->maybeImplode($attributes, $implode);
+	}
+
+	/**
+	 * Normalize textarea attributes.
+	 *
+	 * @return array|string
+	 */
+	public function textarea(array $args = [], $implode = false)
+	{
+		$attributes = $this->parseAttributes(self::TEXTAREA_ATTRIBUTES, $args);
+
+		return $this->maybeImplode($attributes, $implode);
+	}
+
+	/**
+	 * Filter attributes by the provided attrribute keys and remove any non-boolean keys
+	 * with empty values.
+	 *
+	 * @return array
+	 */
+	protected function filterAttributes(array $attributeKeys)
+	{
+		$filtered = array_intersect_key($this->args, array_flip($attributeKeys));
+
+		// normalize truthy boolean attributes
+		foreach ($filtered as $key => $value) {
+			if (!in_array($key, self::BOOLEAN_ATTRIBUTES)) {
+				continue;
+			}
+
+			if (false !== $value) {
+				$filtered[$key] = '';
+				continue;
+			}
+
+			unset($filtered[$key]);
+		}
+
+		$filteredKeys = array_filter(array_keys($filtered), function ($key) use ($filtered) {
+			return !(
+				empty($filtered[$key])
+				&& !is_numeric($filtered[$key])
+				&& !in_array($key, self::BOOLEAN_ATTRIBUTES)
+			);
+		});
+
+		return array_intersect_key($filtered, array_flip($filteredKeys));
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function filterGlobalAttributes()
+	{
+		$global = $this->filterAttributes(self::GLOBAL_ATTRIBUTES);
+
+		$wildcards = [];
+
+		foreach (self::GLOBAL_WILDCARD_ATTRIBUTES as $wildcard) {
+			foreach ($this->args as $key => $value) {
+				$length = strlen($wildcard);
+				$result = substr($key, 0, $length) === $wildcard;
+
+				if ($result) {
+					// only allow data attributes to have an empty value
+					if ('data-' != $wildcard && empty($value)) {
+						continue;
+					}
+
+					if (is_array($value)) {
+						if ('data-' != $wildcard) {
+							continue;
+						}
+
+						$value = json_encode($value);
+					}
+
+					$wildcards[$key] = $value;
+				}
+			}
+		}
+
+		return array_merge($global, $wildcards);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function filterInputType()
+	{
+		if (!isset($this->args['type']) || !in_array($this->args['type'], self::INPUT_TYPES)) {
+			$this->args['type'] = 'text';
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function parseAttributes(array $attributes, array $args = [])
+	{
+		if (!empty($args)) {
+			$this->args = array_change_key_case($args);
+		}
+
+		$global = $this->filterGlobalAttributes();
+		$local = $this->filterAttributes($attributes);
+
+		return array_merge($global, $local);
+	}
 }

Spacing +49 added lines, -49 removed lines

@@ -64,11 +64,11 @@ 
      *
      * @return array|string
      */
-    public function form(array $args = [], $implode = false)
+    public function form( array $args = [], $implode = false )
     {
-        $attributes = $this->parseAttributes(self::FORM_ATTRIBUTES, $args);
+        $attributes = $this->parseAttributes( self::FORM_ATTRIBUTES, $args );
 
-        return $this->maybeImplode($attributes, $implode);
+        return $this->maybeImplode( $attributes, $implode );
     }
 
     /**
@@ -76,13 +76,13 @@ 
      *
      * @return array|string
      */
-    public function input(array $args = [], $implode = false)
+    public function input( array $args = [], $implode = false )
     {
         $this->filterInputType();
 
-        $attributes = $this->parseAttributes(self::INPUT_ATTRIBUTES, $args);
+        $attributes = $this->parseAttributes( self::INPUT_ATTRIBUTES, $args );
 
-        return $this->maybeImplode($attributes, $implode);
+        return $this->maybeImplode( $attributes, $implode );
     }
 
     /**
@@ -92,24 +92,24 @@ 
      *
      * @return array|string
      */
-    public function maybeImplode(array $attributes, $implode = true)
+    public function maybeImplode( array $attributes, $implode = true )
     {
-        if (!$implode || 'implode' !== $implode) {
+        if( !$implode || 'implode' !== $implode ) {
             return $attributes;
         }
         $results = [];
-        foreach ($attributes as $key => $value) {
+        foreach( $attributes as $key => $value ) {
             // if data attributes, use single quotes in case of json encoded values
-            $quotes = false !== stripos($key, 'data-') ? "'" : '"';
-            if (is_array($value)) {
-                $value = json_encode($value);
+            $quotes = false !== stripos( $key, 'data-' ) ? "'" : '"';
+            if( is_array( $value ) ) {
+                $value = json_encode( $value );
                 $quotes = "'";
             }
-            $results[] = is_string($key)
-                ? sprintf('%1$s=%3$s%2$s%3$s', $key, $value, $quotes)
+            $results[] = is_string( $key )
+                ? sprintf( '%1$s=%3$s%2$s%3$s', $key, $value, $quotes )
                 : $value;
         }
-        return implode(' ', $results);
+        return implode( ' ', $results );
     }
 
     /**
@@ -117,11 +117,11 @@ 
      *
      * @return array|string
      */
-    public function select(array $args = [], $implode = false)
+    public function select( array $args = [], $implode = false )
     {
-        $attributes = $this->parseAttributes(self::SELECT_ATTRIBUTES, $args);
+        $attributes = $this->parseAttributes( self::SELECT_ATTRIBUTES, $args );
 
-        return $this->maybeImplode($attributes, $implode);
+        return $this->maybeImplode( $attributes, $implode );
     }
 
     /**
@@ -129,11 +129,11 @@ 
      *
      * @return array|string
      */
-    public function textarea(array $args = [], $implode = false)
+    public function textarea( array $args = [], $implode = false )
     {
-        $attributes = $this->parseAttributes(self::TEXTAREA_ATTRIBUTES, $args);
+        $attributes = $this->parseAttributes( self::TEXTAREA_ATTRIBUTES, $args );
 
-        return $this->maybeImplode($attributes, $implode);
+        return $this->maybeImplode( $attributes, $implode );
     }
 
     /**
@@ -142,33 +142,33 @@ 
      *
      * @return array
      */
-    protected function filterAttributes(array $attributeKeys)
+    protected function filterAttributes( array $attributeKeys )
     {
-        $filtered = array_intersect_key($this->args, array_flip($attributeKeys));
+        $filtered = array_intersect_key( $this->args, array_flip( $attributeKeys ) );
 
         // normalize truthy boolean attributes
-        foreach ($filtered as $key => $value) {
-            if (!in_array($key, self::BOOLEAN_ATTRIBUTES)) {
+        foreach( $filtered as $key => $value ) {
+            if( !in_array( $key, self::BOOLEAN_ATTRIBUTES ) ) {
                 continue;
             }
 
-            if (false !== $value) {
+            if( false !== $value ) {
                 $filtered[$key] = '';
                 continue;
             }
 
-            unset($filtered[$key]);
+            unset( $filtered[$key] );
         }
 
-        $filteredKeys = array_filter(array_keys($filtered), function ($key) use ($filtered) {
+        $filteredKeys = array_filter( array_keys( $filtered ), function( $key ) use ( $filtered ) {
             return !(
-                empty($filtered[$key])
-                && !is_numeric($filtered[$key])
-                && !in_array($key, self::BOOLEAN_ATTRIBUTES)
+                empty( $filtered[$key] )
+                && !is_numeric( $filtered[$key] )
+                && !in_array( $key, self::BOOLEAN_ATTRIBUTES )
             );
         });
 
-        return array_intersect_key($filtered, array_flip($filteredKeys));
+        return array_intersect_key( $filtered, array_flip( $filteredKeys ) );
     }
 
     /**
@@ -176,27 +176,27 @@ 
      */
     protected function filterGlobalAttributes()
     {
-        $global = $this->filterAttributes(self::GLOBAL_ATTRIBUTES);
+        $global = $this->filterAttributes( self::GLOBAL_ATTRIBUTES );
 
         $wildcards = [];
 
-        foreach (self::GLOBAL_WILDCARD_ATTRIBUTES as $wildcard) {
-            foreach ($this->args as $key => $value) {
-                $length = strlen($wildcard);
-                $result = substr($key, 0, $length) === $wildcard;
+        foreach( self::GLOBAL_WILDCARD_ATTRIBUTES as $wildcard ) {
+            foreach( $this->args as $key => $value ) {
+                $length = strlen( $wildcard );
+                $result = substr( $key, 0, $length ) === $wildcard;
 
-                if ($result) {
+                if( $result ) {
                     // only allow data attributes to have an empty value
-                    if ('data-' != $wildcard && empty($value)) {
+                    if( 'data-' != $wildcard && empty( $value ) ) {
                         continue;
                     }
 
-                    if (is_array($value)) {
-                        if ('data-' != $wildcard) {
+                    if( is_array( $value ) ) {
+                        if( 'data-' != $wildcard ) {
                             continue;
                         }
 
-                        $value = json_encode($value);
+                        $value = json_encode( $value );
                     }
 
                     $wildcards[$key] = $value;
@@ -204,7 +204,7 @@ 
             }
         }
 
-        return array_merge($global, $wildcards);
+        return array_merge( $global, $wildcards );
     }
 
     /**
@@ -212,7 +212,7 @@ 
      */
     protected function filterInputType()
     {
-        if (!isset($this->args['type']) || !in_array($this->args['type'], self::INPUT_TYPES)) {
+        if( !isset( $this->args['type'] ) || !in_array( $this->args['type'], self::INPUT_TYPES ) ) {
             $this->args['type'] = 'text';
         }
     }
@@ -220,15 +220,15 @@ 
     /**
      * @return array
      */
-    protected function parseAttributes(array $attributes, array $args = [])
+    protected function parseAttributes( array $attributes, array $args = [] )
     {
-        if (!empty($args)) {
-            $this->args = array_change_key_case($args);
+        if( !empty( $args ) ) {
+            $this->args = array_change_key_case( $args );
         }
 
         $global = $this->filterGlobalAttributes();
-        $local = $this->filterAttributes($attributes);
+        $local = $this->filterAttributes( $attributes );
 
-        return array_merge($global, $local);
+        return array_merge( $global, $local );
     }
 }

Braces +1 added lines, -2 removed lines

@@ -2,8 +2,7 @@
 
 namespace GeminiLabs\Castor\Services;
 
-class Normalizer
-{
+class Normalizer {
     const BOOLEAN_ATTRIBUTES = [
         'autofocus', 'capture', 'checked', 'disabled', 'draggable', 'formnovalidate', 'hidden',
         'multiple', 'novalidate', 'readonly', 'required', 'selected', 'spellcheck',

castor.php

Braces +2 added lines, -1 removed lines

@@ -24,7 +24,8 @@
 
 if (version_compare($wp_version, '5.3', '<')) {
     require_once ABSPATH.'/'.WPINC.'/class-oembed.php';
-} else {
+}
+else {
     require_once ABSPATH.'/'.WPINC.'/class-wp-oembed.php';
 }
 

Indentation +17 added lines, -17 removed lines

@@ -5,36 +5,36 @@
 global $wp_version;
 
 if (!is_admin() && version_compare('7.1', phpversion(), '>')) {
-    wp_die(
-        __('You must be using PHP 7.1.0 or greater.', 'castor'),
-        __('Unsupported PHP version', 'castor')
-    );
+	wp_die(
+		__('You must be using PHP 7.1.0 or greater.', 'castor'),
+		__('Unsupported PHP version', 'castor')
+	);
 }
 if (!is_admin() && version_compare('5.2', $wp_version, '>')) {
-    wp_die(
-        __('You must be using WordPress 5.2.0 or greater.', 'castor'),
-        __('Unsupported WordPress version', 'castor')
-    );
+	wp_die(
+		__('You must be using WordPress 5.2.0 or greater.', 'castor'),
+		__('Unsupported WordPress version', 'castor')
+	);
 }
 if (is_customize_preview() && filter_input(INPUT_GET, 'theme')) {
-    wp_die(
-        __('Theme must be activated prior to using the customizer.', 'castor')
-    );
+	wp_die(
+		__('Theme must be activated prior to using the customizer.', 'castor')
+	);
 }
 
 define('CASTOR_FRAMEWORK_VERSION', '1.4.3');
 
 if (version_compare($wp_version, '5.3', '<')) {
-    require_once ABSPATH.'/'.WPINC.'/class-oembed.php';
+	require_once ABSPATH.'/'.WPINC.'/class-oembed.php';
 } else {
-    require_once ABSPATH.'/'.WPINC.'/class-wp-oembed.php';
+	require_once ABSPATH.'/'.WPINC.'/class-wp-oembed.php';
 }
 
 if (!function_exists('castor_app')) {
-    function castor_app()
-    {
-        return \GeminiLabs\Castor\Application::getInstance();
-    }
+	function castor_app()
+	{
+		return \GeminiLabs\Castor\Application::getInstance();
+	}
 }
 
 \GeminiLabs\Castor\Application::getInstance()->init();

Spacing +12 added lines, -12 removed lines

@@ -1,36 +1,36 @@
 <?php
 
-defined('WPINC') || die;
+defined( 'WPINC' ) || die;
 
 global $wp_version;
 
-if (!is_admin() && version_compare('7.1', phpversion(), '>')) {
+if( !is_admin() && version_compare( '7.1', phpversion(), '>' ) ) {
     wp_die(
-        __('You must be using PHP 7.1.0 or greater.', 'castor'),
-        __('Unsupported PHP version', 'castor')
+        __( 'You must be using PHP 7.1.0 or greater.', 'castor' ),
+        __( 'Unsupported PHP version', 'castor' )
     );
 }
-if (!is_admin() && version_compare('5.2', $wp_version, '>')) {
+if( !is_admin() && version_compare( '5.2', $wp_version, '>' ) ) {
     wp_die(
-        __('You must be using WordPress 5.2.0 or greater.', 'castor'),
-        __('Unsupported WordPress version', 'castor')
+        __( 'You must be using WordPress 5.2.0 or greater.', 'castor' ),
+        __( 'Unsupported WordPress version', 'castor' )
     );
 }
-if (is_customize_preview() && filter_input(INPUT_GET, 'theme')) {
+if( is_customize_preview() && filter_input( INPUT_GET, 'theme' ) ) {
     wp_die(
-        __('Theme must be activated prior to using the customizer.', 'castor')
+        __( 'Theme must be activated prior to using the customizer.', 'castor' )
     );
 }
 
-define('CASTOR_FRAMEWORK_VERSION', '1.4.3');
+define( 'CASTOR_FRAMEWORK_VERSION', '1.4.3' );
 
-if (version_compare($wp_version, '5.3', '<')) {
+if( version_compare( $wp_version, '5.3', '<' ) ) {
     require_once ABSPATH.'/'.WPINC.'/class-oembed.php';
 } else {
     require_once ABSPATH.'/'.WPINC.'/class-wp-oembed.php';
 }
 
-if (!function_exists('castor_app')) {
+if( !function_exists( 'castor_app' ) ) {
     function castor_app()
     {
         return \GeminiLabs\Castor\Application::getInstance();

src/Container.php

Indentation +221 added lines, -221 removed lines

@@ -9,225 +9,225 @@
 
 abstract class Container
 {
-    /**
-     * The current globally available container (if any).
-     *
-     * @var static
-     */
-    protected static $instance;
-
-    /**
-     * The container's bound services.
-     *
-     * @var array
-     */
-    protected $services = [];
-
-    /**
-     * The container's bucket items.
-     *
-     * @var array
-     */
-    protected $bucket = [];
-
-    /**
-     * Set the globally available instance of the container.
-     *
-     * @return static
-     */
-    public static function getInstance()
-    {
-        if (is_null(static::$instance)) {
-            static::$instance = new static();
-        }
-
-        return static::$instance;
-    }
-
-    /**
-     * Bind a service to the container.
-     *
-     * @param string $alias
-     * @param mixed  $concrete
-     *
-     * @return mixed
-     */
-    public function bind($alias, $concrete)
-    {
-        $this->services[$alias] = $concrete;
-    }
-
-    /**
-     * Resolve the given type from the container.
-     * Allow unbound aliases that omit the root namespace
-     * i.e. 'Controller' translates to 'GeminiLabs\Castor\Controller'.
-     *
-     * @param mixed $abstract
-     *
-     * @return mixed
-     */
-    public function make($abstract)
-    {
-        $service = isset($this->services[$abstract])
-            ? $this->services[$abstract]
-            : $this->addNamespace($abstract);
-
-        if (is_callable($service)) {
-            return call_user_func_array($service, [$this]);
-        }
-        if (is_object($service)) {
-            return $service;
-        }
-
-        return $this->resolve($service);
-    }
-
-    /**
-     * Register a shared binding in the container.
-     *
-     * @param string               $abstract
-     * @param \Closure|string|null $concrete
-     *
-     * @return void
-     */
-    public function singleton($abstract, $concrete)
-    {
-        $this->bind($abstract, $this->make($concrete));
-    }
-
-    /**
-     * Dynamically access container bucket items.
-     *
-     * @param string $item
-     *
-     * @return mixed
-     */
-    public function __get($item)
-    {
-        return isset($this->bucket[$item])
-            ? $this->bucket[$item]
-            : null;
-    }
-
-    /**
-     * Dynamically set container bucket items.
-     *
-     * @param string $item
-     * @param mixed  $value
-     *
-     * @return void
-     */
-    public function __set($item, $value)
-    {
-        $this->bucket[$item] = $value;
-    }
-
-    /**
-     * Prefix the current namespace to the abstract if absent.
-     *
-     * @param string $abstract
-     *
-     * @return string
-     */
-    protected function addNamespace($abstract)
-    {
-        if (false === strpos($abstract, __NAMESPACE__) && !class_exists($abstract)) {
-            $abstract = __NAMESPACE__."\\$abstract";
-        }
-
-        return $abstract;
-    }
-
-    /**
-     * @param \ReflectionParameter $parameter
-     * @return null|\ReflectionClass|\ReflectionNamedType|\ReflectionType
-     */
-    protected function getClass($parameter)
-    {
-        if (version_compare(phpversion(), '8', '<')) {
-            return $parameter->getClass(); // @compat PHP < 8
-        }
-        return $parameter->getType();
-    }
-
-    /**
-     * Throw an exception that the concrete is not instantiable.
-     *
-     * @param string $concrete
-     *
-     * @return void
-     * @throws BindingResolutionException
-     */
-    protected function notInstantiable($concrete)
-    {
-        $message = "Target [$concrete] is not instantiable.";
-
-        throw new BindingResolutionException($message);
-    }
-
-    /**
-     * Resolve a class based dependency from the container.
-     *
-     * @param mixed $concrete
-     *
-     * @return mixed
-     * @throws BindingResolutionException
-     */
-    protected function resolve($concrete)
-    {
-        if ($concrete instanceof Closure) {
-            return $concrete($this);
-        }
-
-        $reflector = new ReflectionClass($concrete);
-
-        if (!$reflector->isInstantiable()) {
-            return $this->notInstantiable($concrete);
-        }
-
-        if (is_null(($constructor = $reflector->getConstructor()))) {
-            return new $concrete();
-        }
-
-        return $reflector->newInstanceArgs(
-            $this->resolveDependencies($constructor->getParameters())
-        );
-    }
-
-    /**
-     * Resolve a class based dependency from the container.
-     *
-     * @return mixed
-     * @throws BindingResolutionException
-     */
-    protected function resolveClass(ReflectionParameter $parameter)
-    {
-        try {
-            return $this->make($this->getClass($parameter)->getName());
-        } catch (BindingResolutionException $e) {
-            if ($parameter->isOptional()) {
-                return $parameter->getDefaultValue();
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Resolve all of the dependencies from the ReflectionParameters.
-     *
-     * @return array
-     */
-    protected function resolveDependencies(array $dependencies)
-    {
-        $results = [];
-
-        foreach ($dependencies as $dependency) {
-            // If the class is null, the dependency is a string or some other primitive type
-            $results[] = !is_null($class = $this->getClass($dependency))
-                ? $this->resolveClass($dependency)
-                : null;
-        }
-
-        return $results;
-    }
+	/**
+	 * The current globally available container (if any).
+	 *
+	 * @var static
+	 */
+	protected static $instance;
+
+	/**
+	 * The container's bound services.
+	 *
+	 * @var array
+	 */
+	protected $services = [];
+
+	/**
+	 * The container's bucket items.
+	 *
+	 * @var array
+	 */
+	protected $bucket = [];
+
+	/**
+	 * Set the globally available instance of the container.
+	 *
+	 * @return static
+	 */
+	public static function getInstance()
+	{
+		if (is_null(static::$instance)) {
+			static::$instance = new static();
+		}
+
+		return static::$instance;
+	}
+
+	/**
+	 * Bind a service to the container.
+	 *
+	 * @param string $alias
+	 * @param mixed  $concrete
+	 *
+	 * @return mixed
+	 */
+	public function bind($alias, $concrete)
+	{
+		$this->services[$alias] = $concrete;
+	}
+
+	/**
+	 * Resolve the given type from the container.
+	 * Allow unbound aliases that omit the root namespace
+	 * i.e. 'Controller' translates to 'GeminiLabs\Castor\Controller'.
+	 *
+	 * @param mixed $abstract
+	 *
+	 * @return mixed
+	 */
+	public function make($abstract)
+	{
+		$service = isset($this->services[$abstract])
+			? $this->services[$abstract]
+			: $this->addNamespace($abstract);
+
+		if (is_callable($service)) {
+			return call_user_func_array($service, [$this]);
+		}
+		if (is_object($service)) {
+			return $service;
+		}
+
+		return $this->resolve($service);
+	}
+
+	/**
+	 * Register a shared binding in the container.
+	 *
+	 * @param string               $abstract
+	 * @param \Closure|string|null $concrete
+	 *
+	 * @return void
+	 */
+	public function singleton($abstract, $concrete)
+	{
+		$this->bind($abstract, $this->make($concrete));
+	}
+
+	/**
+	 * Dynamically access container bucket items.
+	 *
+	 * @param string $item
+	 *
+	 * @return mixed
+	 */
+	public function __get($item)
+	{
+		return isset($this->bucket[$item])
+			? $this->bucket[$item]
+			: null;
+	}
+
+	/**
+	 * Dynamically set container bucket items.
+	 *
+	 * @param string $item
+	 * @param mixed  $value
+	 *
+	 * @return void
+	 */
+	public function __set($item, $value)
+	{
+		$this->bucket[$item] = $value;
+	}
+
+	/**
+	 * Prefix the current namespace to the abstract if absent.
+	 *
+	 * @param string $abstract
+	 *
+	 * @return string
+	 */
+	protected function addNamespace($abstract)
+	{
+		if (false === strpos($abstract, __NAMESPACE__) && !class_exists($abstract)) {
+			$abstract = __NAMESPACE__."\\$abstract";
+		}
+
+		return $abstract;
+	}
+
+	/**
+	 * @param \ReflectionParameter $parameter
+	 * @return null|\ReflectionClass|\ReflectionNamedType|\ReflectionType
+	 */
+	protected function getClass($parameter)
+	{
+		if (version_compare(phpversion(), '8', '<')) {
+			return $parameter->getClass(); // @compat PHP < 8
+		}
+		return $parameter->getType();
+	}
+
+	/**
+	 * Throw an exception that the concrete is not instantiable.
+	 *
+	 * @param string $concrete
+	 *
+	 * @return void
+	 * @throws BindingResolutionException
+	 */
+	protected function notInstantiable($concrete)
+	{
+		$message = "Target [$concrete] is not instantiable.";
+
+		throw new BindingResolutionException($message);
+	}
+
+	/**
+	 * Resolve a class based dependency from the container.
+	 *
+	 * @param mixed $concrete
+	 *
+	 * @return mixed
+	 * @throws BindingResolutionException
+	 */
+	protected function resolve($concrete)
+	{
+		if ($concrete instanceof Closure) {
+			return $concrete($this);
+		}
+
+		$reflector = new ReflectionClass($concrete);
+
+		if (!$reflector->isInstantiable()) {
+			return $this->notInstantiable($concrete);
+		}
+
+		if (is_null(($constructor = $reflector->getConstructor()))) {
+			return new $concrete();
+		}
+
+		return $reflector->newInstanceArgs(
+			$this->resolveDependencies($constructor->getParameters())
+		);
+	}
+
+	/**
+	 * Resolve a class based dependency from the container.
+	 *
+	 * @return mixed
+	 * @throws BindingResolutionException
+	 */
+	protected function resolveClass(ReflectionParameter $parameter)
+	{
+		try {
+			return $this->make($this->getClass($parameter)->getName());
+		} catch (BindingResolutionException $e) {
+			if ($parameter->isOptional()) {
+				return $parameter->getDefaultValue();
+			}
+			throw $e;
+		}
+	}
+
+	/**
+	 * Resolve all of the dependencies from the ReflectionParameters.
+	 *
+	 * @return array
+	 */
+	protected function resolveDependencies(array $dependencies)
+	{
+		$results = [];
+
+		foreach ($dependencies as $dependency) {
+			// If the class is null, the dependency is a string or some other primitive type
+			$results[] = !is_null($class = $this->getClass($dependency))
+				? $this->resolveClass($dependency)
+				: null;
+		}
+
+		return $results;
+	}
 }

Spacing +36 added lines, -36 removed lines

@@ -37,7 +37,7 @@ 
      */
     public static function getInstance()
     {
-        if (is_null(static::$instance)) {
+        if( is_null( static::$instance ) ) {
             static::$instance = new static();
         }
 
@@ -52,7 +52,7 @@ 
      *
      * @return mixed
      */
-    public function bind($alias, $concrete)
+    public function bind( $alias, $concrete )
     {
         $this->services[$alias] = $concrete;
     }
@@ -66,20 +66,20 @@ 
      *
      * @return mixed
      */
-    public function make($abstract)
+    public function make( $abstract )
     {
-        $service = isset($this->services[$abstract])
+        $service = isset( $this->services[$abstract] )
             ? $this->services[$abstract]
-            : $this->addNamespace($abstract);
+            : $this->addNamespace( $abstract );
 
-        if (is_callable($service)) {
-            return call_user_func_array($service, [$this]);
+        if( is_callable( $service ) ) {
+            return call_user_func_array( $service, [$this] );
         }
-        if (is_object($service)) {
+        if( is_object( $service ) ) {
             return $service;
         }
 
-        return $this->resolve($service);
+        return $this->resolve( $service );
     }
 
     /**
@@ -90,9 +90,9 @@ 
      *
      * @return void
      */
-    public function singleton($abstract, $concrete)
+    public function singleton( $abstract, $concrete )
     {
-        $this->bind($abstract, $this->make($concrete));
+        $this->bind( $abstract, $this->make( $concrete ) );
     }
 
     /**
@@ -102,9 +102,9 @@ 
      *
      * @return mixed
      */
-    public function __get($item)
+    public function __get( $item )
     {
-        return isset($this->bucket[$item])
+        return isset( $this->bucket[$item] )
             ? $this->bucket[$item]
             : null;
     }
@@ -117,7 +117,7 @@ 
      *
      * @return void
      */
-    public function __set($item, $value)
+    public function __set( $item, $value )
     {
         $this->bucket[$item] = $value;
     }
@@ -129,9 +129,9 @@ 
      *
      * @return string
      */
-    protected function addNamespace($abstract)
+    protected function addNamespace( $abstract )
     {
-        if (false === strpos($abstract, __NAMESPACE__) && !class_exists($abstract)) {
+        if( false === strpos( $abstract, __NAMESPACE__ ) && !class_exists( $abstract ) ) {
             $abstract = __NAMESPACE__."\\$abstract";
         }
 
@@ -142,9 +142,9 @@ 
      * @param \ReflectionParameter $parameter
      * @return null|\ReflectionClass|\ReflectionNamedType|\ReflectionType
      */
-    protected function getClass($parameter)
+    protected function getClass( $parameter )
     {
-        if (version_compare(phpversion(), '8', '<')) {
+        if( version_compare( phpversion(), '8', '<' ) ) {
             return $parameter->getClass(); // @compat PHP < 8
         }
         return $parameter->getType();
@@ -158,11 +158,11 @@ 
      * @return void
      * @throws BindingResolutionException
      */
-    protected function notInstantiable($concrete)
+    protected function notInstantiable( $concrete )
     {
         $message = "Target [$concrete] is not instantiable.";
 
-        throw new BindingResolutionException($message);
+        throw new BindingResolutionException( $message );
     }
 
     /**
@@ -173,24 +173,24 @@ 
      * @return mixed
      * @throws BindingResolutionException
      */
-    protected function resolve($concrete)
+    protected function resolve( $concrete )
     {
-        if ($concrete instanceof Closure) {
-            return $concrete($this);
+        if( $concrete instanceof Closure ) {
+            return $concrete( $this );
         }
 
-        $reflector = new ReflectionClass($concrete);
+        $reflector = new ReflectionClass( $concrete );
 
-        if (!$reflector->isInstantiable()) {
-            return $this->notInstantiable($concrete);
+        if( !$reflector->isInstantiable() ) {
+            return $this->notInstantiable( $concrete );
         }
 
-        if (is_null(($constructor = $reflector->getConstructor()))) {
+        if( is_null( ( $constructor = $reflector->getConstructor() ) ) ) {
             return new $concrete();
         }
 
         return $reflector->newInstanceArgs(
-            $this->resolveDependencies($constructor->getParameters())
+            $this->resolveDependencies( $constructor->getParameters() )
         );
     }
 
@@ -200,12 +200,12 @@ 
      * @return mixed
      * @throws BindingResolutionException
      */
-    protected function resolveClass(ReflectionParameter $parameter)
+    protected function resolveClass( ReflectionParameter $parameter )
     {
         try {
-            return $this->make($this->getClass($parameter)->getName());
-        } catch (BindingResolutionException $e) {
-            if ($parameter->isOptional()) {
+            return $this->make( $this->getClass( $parameter )->getName() );
+        } catch( BindingResolutionException $e ) {
+            if( $parameter->isOptional() ) {
                 return $parameter->getDefaultValue();
             }
             throw $e;
@@ -217,14 +217,14 @@ 
      *
      * @return array
      */
-    protected function resolveDependencies(array $dependencies)
+    protected function resolveDependencies( array $dependencies )
     {
         $results = [];
 
-        foreach ($dependencies as $dependency) {
+        foreach( $dependencies as $dependency ) {
             // If the class is null, the dependency is a string or some other primitive type
-            $results[] = !is_null($class = $this->getClass($dependency))
-                ? $this->resolveClass($dependency)
+            $results[] = !is_null( $class = $this->getClass( $dependency ) )
+                ? $this->resolveClass( $dependency )
                 : null;
         }
 

Braces +3 added lines, -3 removed lines

@@ -7,8 +7,7 @@ 
 use ReflectionClass;
 use ReflectionParameter;
 
-abstract class Container
-{
+abstract class Container {
     /**
      * The current globally available container (if any).
      *
@@ -204,7 +203,8 @@ 
     {
         try {
             return $this->make($this->getClass($parameter)->getName());
-        } catch (BindingResolutionException $e) {
+        }
+        catch (BindingResolutionException $e) {
             if ($parameter->isOptional()) {
                 return $parameter->getDefaultValue();
             }

src/Application.php

Indentation +73 added lines, -73 removed lines

@@ -6,85 +6,85 @@
 
 final class Application extends Container
 {
-    public $assets;
-    public $cssDir;
-    public $imgDir;
-    public $jsDir;
+	public $assets;
+	public $cssDir;
+	public $imgDir;
+	public $jsDir;
 
-    public function __construct()
-    {
-        $this->assets = sprintf('%s/assets/', dirname(__DIR__));
-        Facade::clearResolvedInstances();
-        Facade::setFacadeApplication($this);
-        $this->registerAliases();
-        $this->registerBindings();
-    }
+	public function __construct()
+	{
+		$this->assets = sprintf('%s/assets/', dirname(__DIR__));
+		Facade::clearResolvedInstances();
+		Facade::setFacadeApplication($this);
+		$this->registerAliases();
+		$this->registerBindings();
+	}
 
-    public function init()
-    {
-        $controller = $this->make(Controller::class);
+	public function init()
+	{
+		$controller = $this->make(Controller::class);
 
-        // Action hooks
-        add_action('after_setup_theme', [$controller, 'afterSetupTheme'], 20);
-        add_action('login_head', [$controller, 'loadAdminFavicon']);
-        add_action('admin_head', [$controller, 'loadAdminFavicon']);
-        add_action('login_head', [$controller, 'login']);
-        add_action('admin_enqueue_scripts', [$controller, 'registerAdminAssets']);
-        add_action('wp_enqueue_scripts', [$controller, 'registerAssets']);
-        add_action('customize_register', [$controller, 'registerCustomizer']);
-        add_action('customize_preview_init', [$controller, 'registerCustomizerAssets']);
-        add_action('widgets_init', [$controller, 'registerSidebars']);
+		// Action hooks
+		add_action('after_setup_theme', [$controller, 'afterSetupTheme'], 20);
+		add_action('login_head', [$controller, 'loadAdminFavicon']);
+		add_action('admin_head', [$controller, 'loadAdminFavicon']);
+		add_action('login_head', [$controller, 'login']);
+		add_action('admin_enqueue_scripts', [$controller, 'registerAdminAssets']);
+		add_action('wp_enqueue_scripts', [$controller, 'registerAssets']);
+		add_action('customize_register', [$controller, 'registerCustomizer']);
+		add_action('customize_preview_init', [$controller, 'registerCustomizerAssets']);
+		add_action('widgets_init', [$controller, 'registerSidebars']);
 
-        // Filter hooks
-        add_filter('body_class', [$controller, 'filterBodyClasses']);
-        add_filter('template_include', [$controller, 'filterTemplate']);
-        add_filter('login_headertext', [$controller, 'filterLoginTitle']);
-        add_filter('login_headerurl', [$controller, 'filterLoginUrl']);
+		// Filter hooks
+		add_filter('body_class', [$controller, 'filterBodyClasses']);
+		add_filter('template_include', [$controller, 'filterTemplate']);
+		add_filter('login_headertext', [$controller, 'filterLoginTitle']);
+		add_filter('login_headerurl', [$controller, 'filterLoginUrl']);
 
-        foreach ($this->getTemplateTypes() as $type) {
-            add_filter("{$type}_template_hierarchy", [$controller, 'filterTemplateHierarchy']);
-        }
-    }
+		foreach ($this->getTemplateTypes() as $type) {
+			add_filter("{$type}_template_hierarchy", [$controller, 'filterTemplateHierarchy']);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    public function registerAliases()
-    {
-        $aliases = [
-            'Development' => Facades\Development::class,
-            'Log' => Facades\Log::class,
-            'Media' => Facades\Media::class,
-            'PostMeta' => Facades\PostMeta::class,
-            'Render' => Facades\Render::class,
-            'SiteMeta' => Facades\SiteMeta::class,
-            'Template' => Facades\Template::class,
-            'Theme' => Facades\Theme::class,
-            'Utility' => Facades\Utility::class,
-        ];
-        $aliases = apply_filters('castor/register/aliases', $aliases);
-        AliasLoader::getInstance($aliases)->register();
-    }
+	/**
+	 * @return void
+	 */
+	public function registerAliases()
+	{
+		$aliases = [
+			'Development' => Facades\Development::class,
+			'Log' => Facades\Log::class,
+			'Media' => Facades\Media::class,
+			'PostMeta' => Facades\PostMeta::class,
+			'Render' => Facades\Render::class,
+			'SiteMeta' => Facades\SiteMeta::class,
+			'Template' => Facades\Template::class,
+			'Theme' => Facades\Theme::class,
+			'Utility' => Facades\Utility::class,
+		];
+		$aliases = apply_filters('castor/register/aliases', $aliases);
+		AliasLoader::getInstance($aliases)->register();
+	}
 
-    /**
-     * @return void
-     */
-    public function registerBindings()
-    {
-        $this->bind(Helpers\Log::class, function () {
-            return new Helpers\Log(trailingslashit(get_stylesheet_directory()).'castor-debug.log');
-        });
-    }
+	/**
+	 * @return void
+	 */
+	public function registerBindings()
+	{
+		$this->bind(Helpers\Log::class, function () {
+			return new Helpers\Log(trailingslashit(get_stylesheet_directory()).'castor-debug.log');
+		});
+	}
 
-    /**
-     * @return array
-     */
-    protected function getTemplateTypes()
-    {
-        return [
-            '404', 'archive', 'attachment', 'author', 'category', 'date',
-            'embed', 'frontpage', 'home', 'index', 'page', 'paged',
-            'search', 'single', 'singular', 'tag', 'taxonomy',
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function getTemplateTypes()
+	{
+		return [
+			'404', 'archive', 'attachment', 'author', 'category', 'date',
+			'embed', 'frontpage', 'home', 'index', 'page', 'paged',
+			'search', 'single', 'singular', 'tag', 'taxonomy',
+		];
+	}
 }

Spacing +22 added lines, -22 removed lines

@@ -13,36 +13,36 @@ 
 
     public function __construct()
     {
-        $this->assets = sprintf('%s/assets/', dirname(__DIR__));
+        $this->assets = sprintf( '%s/assets/', dirname( __DIR__ ) );
         Facade::clearResolvedInstances();
-        Facade::setFacadeApplication($this);
+        Facade::setFacadeApplication( $this );
         $this->registerAliases();
         $this->registerBindings();
     }
 
     public function init()
     {
-        $controller = $this->make(Controller::class);
+        $controller = $this->make( Controller::class );
 
         // Action hooks
-        add_action('after_setup_theme', [$controller, 'afterSetupTheme'], 20);
-        add_action('login_head', [$controller, 'loadAdminFavicon']);
-        add_action('admin_head', [$controller, 'loadAdminFavicon']);
-        add_action('login_head', [$controller, 'login']);
-        add_action('admin_enqueue_scripts', [$controller, 'registerAdminAssets']);
-        add_action('wp_enqueue_scripts', [$controller, 'registerAssets']);
-        add_action('customize_register', [$controller, 'registerCustomizer']);
-        add_action('customize_preview_init', [$controller, 'registerCustomizerAssets']);
-        add_action('widgets_init', [$controller, 'registerSidebars']);
+        add_action( 'after_setup_theme', [$controller, 'afterSetupTheme'], 20 );
+        add_action( 'login_head', [$controller, 'loadAdminFavicon'] );
+        add_action( 'admin_head', [$controller, 'loadAdminFavicon'] );
+        add_action( 'login_head', [$controller, 'login'] );
+        add_action( 'admin_enqueue_scripts', [$controller, 'registerAdminAssets'] );
+        add_action( 'wp_enqueue_scripts', [$controller, 'registerAssets'] );
+        add_action( 'customize_register', [$controller, 'registerCustomizer'] );
+        add_action( 'customize_preview_init', [$controller, 'registerCustomizerAssets'] );
+        add_action( 'widgets_init', [$controller, 'registerSidebars'] );
 
         // Filter hooks
-        add_filter('body_class', [$controller, 'filterBodyClasses']);
-        add_filter('template_include', [$controller, 'filterTemplate']);
-        add_filter('login_headertext', [$controller, 'filterLoginTitle']);
-        add_filter('login_headerurl', [$controller, 'filterLoginUrl']);
+        add_filter( 'body_class', [$controller, 'filterBodyClasses'] );
+        add_filter( 'template_include', [$controller, 'filterTemplate'] );
+        add_filter( 'login_headertext', [$controller, 'filterLoginTitle'] );
+        add_filter( 'login_headerurl', [$controller, 'filterLoginUrl'] );
 
-        foreach ($this->getTemplateTypes() as $type) {
-            add_filter("{$type}_template_hierarchy", [$controller, 'filterTemplateHierarchy']);
+        foreach( $this->getTemplateTypes() as $type ) {
+            add_filter( "{$type}_template_hierarchy", [$controller, 'filterTemplateHierarchy'] );
         }
     }
 
@@ -62,8 +62,8 @@ 
             'Theme' => Facades\Theme::class,
             'Utility' => Facades\Utility::class,
         ];
-        $aliases = apply_filters('castor/register/aliases', $aliases);
-        AliasLoader::getInstance($aliases)->register();
+        $aliases = apply_filters( 'castor/register/aliases', $aliases );
+        AliasLoader::getInstance( $aliases )->register();
     }
 
     /**
@@ -71,8 +71,8 @@ 
      */
     public function registerBindings()
     {
-        $this->bind(Helpers\Log::class, function () {
-            return new Helpers\Log(trailingslashit(get_stylesheet_directory()).'castor-debug.log');
+        $this->bind( Helpers\Log::class, function() {
+            return new Helpers\Log( trailingslashit( get_stylesheet_directory() ).'castor-debug.log' );
         });
     }
 

Braces +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
 
 use GeminiLabs\Castor\Controller;
 
-final class Application extends Container
-{
+final class Application extends Container {
     public $assets;
     public $cssDir;
     public $imgDir;

src/Services/Email.php

Indentation +262 added lines, -262 removed lines

@@ -6,266 +6,266 @@
 
 class Email
 {
-    /**
-     * @var Template
-     */
-    public $template;
-
-    /**
-     * @var array
-     */
-    protected $attachments;
-
-    /**
-     * @var array
-     */
-    protected $headers;
-
-    /**
-     * @var string
-     */
-    protected $message;
-
-    /**
-     * @var string
-     */
-    protected $subject;
-
-    /**
-     * @var string
-     */
-    protected $to;
-
-    public function __construct(Template $template)
-    {
-        $this->template = $template;
-    }
-
-    /**
-     * @return Email
-     */
-    public function compose(array $email)
-    {
-        $email = $this->normalize($email);
-
-        $this->attachments = $email['attachments'];
-        $this->headers = $this->buildHeaders($email);
-        $this->message = $this->buildHtmlMessage($email);
-        $this->subject = $email['subject'];
-        $this->to = $email['to'];
-
-        add_action('phpmailer_init', function ($phpmailer) {
-            if ('text/plain' === $phpmailer->ContentType || !empty($phpmailer->AltBody)) {
-                return;
-            }
-            $phpmailer->AltBody = $this->buildPlainTextMessage($phpmailer->Body);
-        });
-
-        return $this;
-    }
-
-    /**
-     * @param bool $plaintext
-     *
-     * @return string|null
-     */
-    public function read($plaintext = false)
-    {
-        return $plaintext
-            ? $this->buildPlainTextMessage($this->message)
-            : $this->message;
-    }
-
-    /**
-     * @return bool|null
-     */
-    public function send()
-    {
-        if (!$this->message || !$this->subject || !$this->to) {
-            return;
-        }
-
-        $sent = wp_mail(
-            $this->to,
-            $this->subject,
-            $this->message,
-            $this->headers,
-            $this->attachments
-        );
-
-        $this->reset();
-
-        return $sent;
-    }
-
-    /**
-     * @return array
-     */
-    protected function buildHeaders(array $email)
-    {
-        $allowed = [
-            'bcc',
-            'cc',
-            'from',
-            'reply-to',
-        ];
-
-        $headers = array_intersect_key($email, array_flip($allowed));
-        $headers = array_filter($headers);
-
-        foreach ($headers as $key => $value) {
-            unset($headers[$key]);
-            $headers[] = sprintf('%s: %s', $key, $value);
-        }
-
-        $headers[] = 'Content-Type: text/html';
-
-        return apply_filters('castor/email/headers', $headers, $this);
-    }
-
-    /**
-     * @return string
-     */
-    protected function buildHtmlMessage(array $email)
-    {
-        $body = $this->renderTemplate('index');
-        $message = !empty($email['template'])
-            ? $this->renderTemplate($email['template'], $email['template-tags'])
-            : $email['message'];
-
-        $message = $this->filterHtml($email['before'].$message.$email['after']);
-        $message = str_replace('{message}', $message, $body);
-
-        return apply_filters('castor/email/message', $message, 'html', $this);
-    }
-
-    /**
-     * @param string $message
-     *
-     * @return string
-     */
-    protected function buildPlainTextMessage($message)
-    {
-        return apply_filters('castor/email/message', $this->stripHtmlTags($message), 'text', $this);
-    }
-
-    /**
-     * @param string $message
-     *
-     * @return string
-     */
-    protected function filterHtml($message)
-    {
-        $message = strip_shortcodes($message);
-        $message = wptexturize($message);
-        $message = wpautop($message);
-        $message = str_replace(['<> ', ']]>'], ['', ']]>'], $message);
-        $message = stripslashes($message);
-        return $message;
-    }
-
-    /**
-     * @return string
-     */
-    protected function getDefaultFrom()
-    {
-        return sprintf('%s <%s>',
-            wp_specialchars_decode((string) get_option('blogname'), ENT_QUOTES),
-            (string) get_option('admin_email')
-        );
-    }
-
-    /**
-     * @return array
-     */
-    protected function normalize($email)
-    {
-        $defaults = array_fill_keys([
-            'after', 'attachments', 'bcc', 'before', 'cc', 'from', 'message', 'reply-to', 'subject',
-            'template', 'template-tags', 'to',
-        ], '');
-        $defaults['from'] = $this->getDefaultFrom();
-
-        $email = shortcode_atts($defaults, $email);
-
-        foreach (['attachments', 'template-tags'] as $key) {
-            $email[$key] = array_filter((array) $email[$key]);
-        }
-        if (empty($email['reply-to'])) {
-            $email['reply-to'] = $email['from'];
-        }
-
-        return apply_filters('castor/email/compose', $email, $this);
-    }
-
-    /**
-     * Override by adding the custom template to "templates/castor/" in your theme.
-     *
-     * @param string $templatePath
-     *
-     * @return void|string
-     */
-    protected function renderTemplate($templatePath, array $args = [])
-    {
-        $file = $this->template->get('castor/email/'.$templatePath);
-
-        if (!file_exists($file)) {
-            $file = sprintf('%s/templates/email/%s.php', dirname(dirname(__DIR__)), $templatePath);
-        }
-        if (!file_exists($file)) {
-            return;
-        }
-
-        ob_start();
-        include $file;
-        $template = ob_get_clean();
-
-        return $this->renderTemplateString($template, $args);
-    }
-
-    /**
-     * @param string $template
-     *
-     * @return string
-     */
-    protected function renderTemplateString($template, array $args = [])
-    {
-        foreach ($args as $key => $value) {
-            $template = str_replace('{'.$key.'}', $value, $template);
-        }
-        return trim($template);
-    }
-
-    /**
-     * @return void
-     */
-    protected function reset()
-    {
-        $this->attachments = [];
-        $this->headers = [];
-        $this->message = null;
-        $this->subject = null;
-        $this->to = null;
-    }
-
-    /**
-     * - remove invisible elements
-     * - replace certain elements with a line-break
-     * - replace certain table elements with a space
-     * - add a placeholder for plain-text bullets to list elements
-     * - strip all remaining HTML tags.
-     * @return string
-     */
-    protected function stripHtmlTags($string)
-    {
-        $string = preg_replace('@<(embed|head|noembed|noscript|object|script|style)[^>]*?>.*?</\\1>@siu', '', $string);
-        $string = preg_replace('@</(div|h[1-9]|p|pre|tr)@iu', "\r\n\$0", $string);
-        $string = preg_replace('@</(td|th)@iu', ' $0', $string);
-        $string = preg_replace('@<(li)[^>]*?>@siu', '$0-o-^-o-', $string);
-        $string = wp_strip_all_tags($string);
-        $string = wp_specialchars_decode($string, ENT_QUOTES);
-        $string = preg_replace('/\v(?:[\v\h]+){2,}/', "\r\n\r\n", $string);
-        $string = str_replace('-o-^-o-', ' - ', $string);
-        return html_entity_decode($string, ENT_QUOTES, 'UTF-8');
-    }
+	/**
+	 * @var Template
+	 */
+	public $template;
+
+	/**
+	 * @var array
+	 */
+	protected $attachments;
+
+	/**
+	 * @var array
+	 */
+	protected $headers;
+
+	/**
+	 * @var string
+	 */
+	protected $message;
+
+	/**
+	 * @var string
+	 */
+	protected $subject;
+
+	/**
+	 * @var string
+	 */
+	protected $to;
+
+	public function __construct(Template $template)
+	{
+		$this->template = $template;
+	}
+
+	/**
+	 * @return Email
+	 */
+	public function compose(array $email)
+	{
+		$email = $this->normalize($email);
+
+		$this->attachments = $email['attachments'];
+		$this->headers = $this->buildHeaders($email);
+		$this->message = $this->buildHtmlMessage($email);
+		$this->subject = $email['subject'];
+		$this->to = $email['to'];
+
+		add_action('phpmailer_init', function ($phpmailer) {
+			if ('text/plain' === $phpmailer->ContentType || !empty($phpmailer->AltBody)) {
+				return;
+			}
+			$phpmailer->AltBody = $this->buildPlainTextMessage($phpmailer->Body);
+		});
+
+		return $this;
+	}
+
+	/**
+	 * @param bool $plaintext
+	 *
+	 * @return string|null
+	 */
+	public function read($plaintext = false)
+	{
+		return $plaintext
+			? $this->buildPlainTextMessage($this->message)
+			: $this->message;
+	}
+
+	/**
+	 * @return bool|null
+	 */
+	public function send()
+	{
+		if (!$this->message || !$this->subject || !$this->to) {
+			return;
+		}
+
+		$sent = wp_mail(
+			$this->to,
+			$this->subject,
+			$this->message,
+			$this->headers,
+			$this->attachments
+		);
+
+		$this->reset();
+
+		return $sent;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function buildHeaders(array $email)
+	{
+		$allowed = [
+			'bcc',
+			'cc',
+			'from',
+			'reply-to',
+		];
+
+		$headers = array_intersect_key($email, array_flip($allowed));
+		$headers = array_filter($headers);
+
+		foreach ($headers as $key => $value) {
+			unset($headers[$key]);
+			$headers[] = sprintf('%s: %s', $key, $value);
+		}
+
+		$headers[] = 'Content-Type: text/html';
+
+		return apply_filters('castor/email/headers', $headers, $this);
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function buildHtmlMessage(array $email)
+	{
+		$body = $this->renderTemplate('index');
+		$message = !empty($email['template'])
+			? $this->renderTemplate($email['template'], $email['template-tags'])
+			: $email['message'];
+
+		$message = $this->filterHtml($email['before'].$message.$email['after']);
+		$message = str_replace('{message}', $message, $body);
+
+		return apply_filters('castor/email/message', $message, 'html', $this);
+	}
+
+	/**
+	 * @param string $message
+	 *
+	 * @return string
+	 */
+	protected function buildPlainTextMessage($message)
+	{
+		return apply_filters('castor/email/message', $this->stripHtmlTags($message), 'text', $this);
+	}
+
+	/**
+	 * @param string $message
+	 *
+	 * @return string
+	 */
+	protected function filterHtml($message)
+	{
+		$message = strip_shortcodes($message);
+		$message = wptexturize($message);
+		$message = wpautop($message);
+		$message = str_replace(['&lt;&gt; ', ']]>'], ['', ']]&gt;'], $message);
+		$message = stripslashes($message);
+		return $message;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getDefaultFrom()
+	{
+		return sprintf('%s <%s>',
+			wp_specialchars_decode((string) get_option('blogname'), ENT_QUOTES),
+			(string) get_option('admin_email')
+		);
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function normalize($email)
+	{
+		$defaults = array_fill_keys([
+			'after', 'attachments', 'bcc', 'before', 'cc', 'from', 'message', 'reply-to', 'subject',
+			'template', 'template-tags', 'to',
+		], '');
+		$defaults['from'] = $this->getDefaultFrom();
+
+		$email = shortcode_atts($defaults, $email);
+
+		foreach (['attachments', 'template-tags'] as $key) {
+			$email[$key] = array_filter((array) $email[$key]);
+		}
+		if (empty($email['reply-to'])) {
+			$email['reply-to'] = $email['from'];
+		}
+
+		return apply_filters('castor/email/compose', $email, $this);
+	}
+
+	/**
+	 * Override by adding the custom template to "templates/castor/" in your theme.
+	 *
+	 * @param string $templatePath
+	 *
+	 * @return void|string
+	 */
+	protected function renderTemplate($templatePath, array $args = [])
+	{
+		$file = $this->template->get('castor/email/'.$templatePath);
+
+		if (!file_exists($file)) {
+			$file = sprintf('%s/templates/email/%s.php', dirname(dirname(__DIR__)), $templatePath);
+		}
+		if (!file_exists($file)) {
+			return;
+		}
+
+		ob_start();
+		include $file;
+		$template = ob_get_clean();
+
+		return $this->renderTemplateString($template, $args);
+	}
+
+	/**
+	 * @param string $template
+	 *
+	 * @return string
+	 */
+	protected function renderTemplateString($template, array $args = [])
+	{
+		foreach ($args as $key => $value) {
+			$template = str_replace('{'.$key.'}', $value, $template);
+		}
+		return trim($template);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function reset()
+	{
+		$this->attachments = [];
+		$this->headers = [];
+		$this->message = null;
+		$this->subject = null;
+		$this->to = null;
+	}
+
+	/**
+	 * - remove invisible elements
+	 * - replace certain elements with a line-break
+	 * - replace certain table elements with a space
+	 * - add a placeholder for plain-text bullets to list elements
+	 * - strip all remaining HTML tags.
+	 * @return string
+	 */
+	protected function stripHtmlTags($string)
+	{
+		$string = preg_replace('@<(embed|head|noembed|noscript|object|script|style)[^>]*?>.*?</\\1>@siu', '', $string);
+		$string = preg_replace('@</(div|h[1-9]|p|pre|tr)@iu', "\r\n\$0", $string);
+		$string = preg_replace('@</(td|th)@iu', ' $0', $string);
+		$string = preg_replace('@<(li)[^>]*?>@siu', '$0-o-^-o-', $string);
+		$string = wp_strip_all_tags($string);
+		$string = wp_specialchars_decode($string, ENT_QUOTES);
+		$string = preg_replace('/\v(?:[\v\h]+){2,}/', "\r\n\r\n", $string);
+		$string = str_replace('-o-^-o-', ' - ', $string);
+		return html_entity_decode($string, ENT_QUOTES, 'UTF-8');
+	}
 }

Spacing +64 added lines, -64 removed lines

@@ -36,7 +36,7 @@ 
      */
     protected $to;
 
-    public function __construct(Template $template)
+    public function __construct( Template $template )
     {
         $this->template = $template;
     }
@@ -44,21 +44,21 @@ 
     /**
      * @return Email
      */
-    public function compose(array $email)
+    public function compose( array $email )
     {
-        $email = $this->normalize($email);
+        $email = $this->normalize( $email );
 
         $this->attachments = $email['attachments'];
-        $this->headers = $this->buildHeaders($email);
-        $this->message = $this->buildHtmlMessage($email);
+        $this->headers = $this->buildHeaders( $email );
+        $this->message = $this->buildHtmlMessage( $email );
         $this->subject = $email['subject'];
         $this->to = $email['to'];
 
-        add_action('phpmailer_init', function ($phpmailer) {
-            if ('text/plain' === $phpmailer->ContentType || !empty($phpmailer->AltBody)) {
+        add_action( 'phpmailer_init', function( $phpmailer ) {
+            if( 'text/plain' === $phpmailer->ContentType || !empty( $phpmailer->AltBody ) ) {
                 return;
             }
-            $phpmailer->AltBody = $this->buildPlainTextMessage($phpmailer->Body);
+            $phpmailer->AltBody = $this->buildPlainTextMessage( $phpmailer->Body );
         });
 
         return $this;
@@ -69,10 +69,10 @@ 
      *
      * @return string|null
      */
-    public function read($plaintext = false)
+    public function read( $plaintext = false )
     {
         return $plaintext
-            ? $this->buildPlainTextMessage($this->message)
+            ? $this->buildPlainTextMessage( $this->message )
             : $this->message;
     }
 
@@ -81,7 +81,7 @@ 
      */
     public function send()
     {
-        if (!$this->message || !$this->subject || !$this->to) {
+        if( !$this->message || !$this->subject || !$this->to ) {
             return;
         }
 
@@ -101,7 +101,7 @@ 
     /**
      * @return array
      */
-    protected function buildHeaders(array $email)
+    protected function buildHeaders( array $email )
     {
         $allowed = [
             'bcc',
@@ -110,33 +110,33 @@ 
             'reply-to',
         ];
 
-        $headers = array_intersect_key($email, array_flip($allowed));
-        $headers = array_filter($headers);
+        $headers = array_intersect_key( $email, array_flip( $allowed ) );
+        $headers = array_filter( $headers );
 
-        foreach ($headers as $key => $value) {
-            unset($headers[$key]);
-            $headers[] = sprintf('%s: %s', $key, $value);
+        foreach( $headers as $key => $value ) {
+            unset( $headers[$key] );
+            $headers[] = sprintf( '%s: %s', $key, $value );
         }
 
         $headers[] = 'Content-Type: text/html';
 
-        return apply_filters('castor/email/headers', $headers, $this);
+        return apply_filters( 'castor/email/headers', $headers, $this );
     }
 
     /**
      * @return string
      */
-    protected function buildHtmlMessage(array $email)
+    protected function buildHtmlMessage( array $email )
     {
-        $body = $this->renderTemplate('index');
-        $message = !empty($email['template'])
-            ? $this->renderTemplate($email['template'], $email['template-tags'])
+        $body = $this->renderTemplate( 'index' );
+        $message = !empty( $email['template'] )
+            ? $this->renderTemplate( $email['template'], $email['template-tags'] )
             : $email['message'];
 
-        $message = $this->filterHtml($email['before'].$message.$email['after']);
-        $message = str_replace('{message}', $message, $body);
+        $message = $this->filterHtml( $email['before'].$message.$email['after'] );
+        $message = str_replace( '{message}', $message, $body );
 
-        return apply_filters('castor/email/message', $message, 'html', $this);
+        return apply_filters( 'castor/email/message', $message, 'html', $this );
     }
 
     /**
@@ -144,9 +144,9 @@ 
      *
      * @return string
      */
-    protected function buildPlainTextMessage($message)
+    protected function buildPlainTextMessage( $message )
     {
-        return apply_filters('castor/email/message', $this->stripHtmlTags($message), 'text', $this);
+        return apply_filters( 'castor/email/message', $this->stripHtmlTags( $message ), 'text', $this );
     }
 
     /**
@@ -154,13 +154,13 @@ 
      *
      * @return string
      */
-    protected function filterHtml($message)
+    protected function filterHtml( $message )
     {
-        $message = strip_shortcodes($message);
-        $message = wptexturize($message);
-        $message = wpautop($message);
-        $message = str_replace(['<> ', ']]>'], ['', ']]>'], $message);
-        $message = stripslashes($message);
+        $message = strip_shortcodes( $message );
+        $message = wptexturize( $message );
+        $message = wpautop( $message );
+        $message = str_replace( ['<> ', ']]>'], ['', ']]>'], $message );
+        $message = stripslashes( $message );
         return $message;
     }
 
@@ -169,33 +169,33 @@ 
      */
     protected function getDefaultFrom()
     {
-        return sprintf('%s <%s>',
-            wp_specialchars_decode((string) get_option('blogname'), ENT_QUOTES),
-            (string) get_option('admin_email')
+        return sprintf( '%s <%s>',
+            wp_specialchars_decode( (string) get_option( 'blogname' ), ENT_QUOTES ),
+            (string) get_option( 'admin_email' )
         );
     }
 
     /**
      * @return array
      */
-    protected function normalize($email)
+    protected function normalize( $email )
     {
-        $defaults = array_fill_keys([
+        $defaults = array_fill_keys( [
             'after', 'attachments', 'bcc', 'before', 'cc', 'from', 'message', 'reply-to', 'subject',
             'template', 'template-tags', 'to',
-        ], '');
+        ], '' );
         $defaults['from'] = $this->getDefaultFrom();
 
-        $email = shortcode_atts($defaults, $email);
+        $email = shortcode_atts( $defaults, $email );
 
-        foreach (['attachments', 'template-tags'] as $key) {
-            $email[$key] = array_filter((array) $email[$key]);
+        foreach( ['attachments', 'template-tags'] as $key ) {
+            $email[$key] = array_filter( (array) $email[$key] );
         }
-        if (empty($email['reply-to'])) {
+        if( empty( $email['reply-to'] ) ) {
             $email['reply-to'] = $email['from'];
         }
 
-        return apply_filters('castor/email/compose', $email, $this);
+        return apply_filters( 'castor/email/compose', $email, $this );
     }
 
     /**
@@ -205,14 +205,14 @@ 
      *
      * @return void|string
      */
-    protected function renderTemplate($templatePath, array $args = [])
+    protected function renderTemplate( $templatePath, array $args = [] )
     {
-        $file = $this->template->get('castor/email/'.$templatePath);
+        $file = $this->template->get( 'castor/email/'.$templatePath );
 
-        if (!file_exists($file)) {
-            $file = sprintf('%s/templates/email/%s.php', dirname(dirname(__DIR__)), $templatePath);
+        if( !file_exists( $file ) ) {
+            $file = sprintf( '%s/templates/email/%s.php', dirname( dirname( __DIR__ ) ), $templatePath );
         }
-        if (!file_exists($file)) {
+        if( !file_exists( $file ) ) {
             return;
         }
 
@@ -220,7 +220,7 @@ 
         include $file;
         $template = ob_get_clean();
 
-        return $this->renderTemplateString($template, $args);
+        return $this->renderTemplateString( $template, $args );
     }
 
     /**
@@ -228,12 +228,12 @@ 
      *
      * @return string
      */
-    protected function renderTemplateString($template, array $args = [])
+    protected function renderTemplateString( $template, array $args = [] )
     {
-        foreach ($args as $key => $value) {
-            $template = str_replace('{'.$key.'}', $value, $template);
+        foreach( $args as $key => $value ) {
+            $template = str_replace( '{'.$key.'}', $value, $template );
         }
-        return trim($template);
+        return trim( $template );
     }
 
     /**
@@ -256,16 +256,16 @@ 
      * - strip all remaining HTML tags.
      * @return string
      */
-    protected function stripHtmlTags($string)
+    protected function stripHtmlTags( $string )
     {
-        $string = preg_replace('@<(embed|head|noembed|noscript|object|script|style)[^>]*?>.*?</\\1>@siu', '', $string);
-        $string = preg_replace('@</(div|h[1-9]|p|pre|tr)@iu', "\r\n\$0", $string);
-        $string = preg_replace('@</(td|th)@iu', ' $0', $string);
-        $string = preg_replace('@<(li)[^>]*?>@siu', '$0-o-^-o-', $string);
-        $string = wp_strip_all_tags($string);
-        $string = wp_specialchars_decode($string, ENT_QUOTES);
-        $string = preg_replace('/\v(?:[\v\h]+){2,}/', "\r\n\r\n", $string);
-        $string = str_replace('-o-^-o-', ' - ', $string);
-        return html_entity_decode($string, ENT_QUOTES, 'UTF-8');
+        $string = preg_replace( '@<(embed|head|noembed|noscript|object|script|style)[^>]*?>.*?</\\1>@siu', '', $string );
+        $string = preg_replace( '@</(div|h[1-9]|p|pre|tr)@iu', "\r\n\$0", $string );
+        $string = preg_replace( '@</(td|th)@iu', ' $0', $string );
+        $string = preg_replace( '@<(li)[^>]*?>@siu', '$0-o-^-o-', $string );
+        $string = wp_strip_all_tags( $string );
+        $string = wp_specialchars_decode( $string, ENT_QUOTES );
+        $string = preg_replace( '/\v(?:[\v\h]+){2,}/', "\r\n\r\n", $string );
+        $string = str_replace( '-o-^-o-', ' - ', $string );
+        return html_entity_decode( $string, ENT_QUOTES, 'UTF-8' );
     }
 }

Braces +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
 
 use GeminiLabs\Castor\Helpers\Template;
 
-class Email
-{
+class Email {
     /**
      * @var Template
      */