pryley / castor-framework

src/Image.php

Spacing +21 added lines, -21 removed lines

@@ -12,7 +12,7 @@ 
 	protected $postmeta;
 	protected $utility;
 
-	public function __construct( PostMeta $postmeta, Utility $utility )
+	public function __construct(PostMeta $postmeta, Utility $utility)
 	{
 		$this->postmeta = $postmeta;
 		$this->utility  = $utility;
@@ -23,43 +23,43 @@ 
 	 *
 	 * @return self
 	 */
-	public function get( $attachment )
+	public function get($attachment)
 	{
-		$attachment = $this->normalize( $attachment );
-		if( $attachment && $thumbnail = wp_get_attachment_image_src( $attachment, 'thumbnail' )) {
-			$medium = $this->normalizeSrc( wp_get_attachment_image_src( $attachment, 'medium' ), $thumbnail );
-			$large = $this->normalizeSrc( wp_get_attachment_image_src( $attachment, 'large' ), $medium );
+		$attachment = $this->normalize($attachment);
+		if ($attachment && $thumbnail = wp_get_attachment_image_src($attachment, 'thumbnail')) {
+			$medium = $this->normalizeSrc(wp_get_attachment_image_src($attachment, 'medium'), $thumbnail);
+			$large = $this->normalizeSrc(wp_get_attachment_image_src($attachment, 'large'), $medium);
 
 			$this->image = (object) [
-				'alt'       => wp_strip_all_tags( get_post_meta( $attachment, '_wp_attachment_image_alt', true ), true ),
-				'caption'   => wp_get_attachment_caption( $attachment ),
-				'copyright' => wp_strip_all_tags( get_post_meta( $attachment, '_copyright', true ), true ),
+				'alt'       => wp_strip_all_tags(get_post_meta($attachment, '_wp_attachment_image_alt', true), true),
+				'caption'   => wp_get_attachment_caption($attachment),
+				'copyright' => wp_strip_all_tags(get_post_meta($attachment, '_copyright', true), true),
 				'ID'        => $attachment,
 				'large'     => $large,
 				'medium'    => $medium,
-				'permalink' => get_attachment_link( $attachment ),
-				'thumbnail' => $this->normalizeSrc( $thumbnail ),
+				'permalink' => get_attachment_link($attachment),
+				'thumbnail' => $this->normalizeSrc($thumbnail),
 			];
 		}
 		return $this;
 	}
 
-	public function render( $size = 'large' )
+	public function render($size = 'large')
 	{
-		if( $this->image ) {
-			return wp_get_attachment_image( $this->image->ID, $size );
+		if ($this->image) {
+			return wp_get_attachment_image($this->image->ID, $size);
 		}
 	}
 
-	protected function normalize( $attachmentId )
+	protected function normalize($attachmentId)
 	{
-		if( !filter_var( $attachmentId, FILTER_VALIDATE_INT )) {
-			$attachmentId = $this->postmeta->get( $attachmentId );
+		if (!filter_var($attachmentId, FILTER_VALIDATE_INT)) {
+			$attachmentId = $this->postmeta->get($attachmentId);
 		}
 
-		$attachment = get_post( $attachmentId );
+		$attachment = get_post($attachmentId);
 
-		if( is_null( $attachment ) || $attachment->post_type != 'attachment' )return;
+		if (is_null($attachment) || $attachment->post_type != 'attachment')return;
 
 		return $attachment->ID;
 	}
@@ -69,9 +69,9 @@ 
 	 *
 	 * @return array
 	 */
-	protected function normalizeSrc( array $image, $fallback = false )
+	protected function normalizeSrc(array $image, $fallback = false)
 	{
-		if( is_array( $fallback ) && count( array_diff( $image, $fallback )) < 2 ) {
+		if (is_array($fallback) && count(array_diff($image, $fallback)) < 2) {
 			$image = $fallback;
 		}
 		return [

Braces +3 added lines, -1 removed lines

@@ -59,7 +59,9 @@
 
 		$attachment = get_post( $attachmentId );
 
-		if( is_null( $attachment ) || $attachment->post_type != 'attachment' )return;
+		if( is_null( $attachment ) || $attachment->post_type != 'attachment' ) {
+			return;
+		}
 
 		return $attachment->ID;
 	}

src/Video.php

Spacing +24 added lines, -24 removed lines

@@ -20,7 +20,7 @@ 
 	protected $theme;
 	protected $utility;
 
-	public function __construct( Image $image, Oembed $oembed, PostMeta $postmeta, Theme $theme, Utility $utility )
+	public function __construct(Image $image, Oembed $oembed, PostMeta $postmeta, Theme $theme, Utility $utility)
 	{
 		$this->image    = $image;
 		$this->oembed   = $oembed;
@@ -29,11 +29,11 @@ 
 		$this->utility  = $utility;
 	}
 
-	public function get( $args = [] )
+	public function get($args = [])
 	{
-		$args = $this->normalize( $args );
-		$embed = $this->oembed->request( $args['url'], $args['player'] );
-		if( isset( $embed->type ) && $embed->type == 'video' ) {
+		$args = $this->normalize($args);
+		$embed = $this->oembed->request($args['url'], $args['player']);
+		if (isset($embed->type) && $embed->type == 'video') {
 			$this->video = $embed;
 		}
 		return $this;
@@ -41,7 +41,7 @@ 
 
 	public function render()
 	{
-		if( !isset( $this->video->html ))return;
+		if (!isset($this->video->html))return;
 		return sprintf(
 			'<div class="video embed">%s%s</div>',
 			$this->renderScreenshot(),
@@ -59,15 +59,15 @@ 
 				'<a href="%s" class="video-play-btn">%s</a>' .
 			'</div>',
 			$this->args['url'],
-			$this->theme->svg( 'play.svg' )
+			$this->theme->svg('play.svg')
 		);
 	}
 
 	public function renderScreenshot()
 	{
-		if( $this->args['image']
-			&& in_array( strtolower( $this->video->provider_name ), $this->supported )) {
-			return sprintf( '%s<div class="video-poster" style="background-image: url(%s)">%s</div>',
+		if ($this->args['image']
+			&& in_array(strtolower($this->video->provider_name), $this->supported)) {
+			return sprintf('%s<div class="video-poster" style="background-image: url(%s)">%s</div>',
 				$this->renderSpinner(),
 				$this->args['image'],
 				$this->renderPlayButton()
@@ -81,28 +81,28 @@ 
 			'<div class="video-spinner">' .
 				'<div class="spinner"><div class="spinner-dots">%s</div></div>' .
 			'</div>',
-			implode( '', array_fill( 0, 8, '<div class="spinner-dot"></div>' ))
+			implode('', array_fill(0, 8, '<div class="spinner-dot"></div>'))
 		);
 	}
 
-	protected function setImage( $image )
+	protected function setImage($image)
 	{
-		$image = $this->image->get( $image )->image;
-		$this->args['image'] = isset( $image->large )
+		$image = $this->image->get($image)->image;
+		$this->args['image'] = isset($image->large)
 			? $image->large['url']
 			: null;
 	}
 
-	protected function setUrl( $url )
+	protected function setUrl($url)
 	{
-		$this->args['url'] = !filter_var( $url, FILTER_VALIDATE_URL )
-			? $this->postmeta->get( $url )
+		$this->args['url'] = !filter_var($url, FILTER_VALIDATE_URL)
+			? $this->postmeta->get($url)
 			: $url;
 	}
 
-	protected function normalize( $args )
+	protected function normalize($args)
 	{
-		if( is_string( $args )) {
+		if (is_string($args)) {
 			$args = ['url' => $args];
 		}
 
@@ -110,12 +110,12 @@ 
 			'image'  => '', // string || int
 			'player' => '', // string || array
 			'url'    => '', // string
-		], $args );
+		], $args);
 
-		foreach( $this->args as $key => $value ) {
-			$method = $this->utility->buildMethodName( $key, 'set' );
-			if( !method_exists( $this, $method ))continue;
-			call_user_func([ $this, $method ], $value );
+		foreach ($this->args as $key => $value) {
+			$method = $this->utility->buildMethodName($key, 'set');
+			if (!method_exists($this, $method))continue;
+			call_user_func([$this, $method], $value);
 		}
 		return $this->args;
 	}

Braces +6 added lines, -2 removed lines

@@ -41,7 +41,9 @@ 
 
 	public function render()
 	{
-		if( !isset( $this->video->html ))return;
+		if( !isset( $this->video->html )) {
+			return;
+		}
 		return sprintf(
 			'<div class="video embed">%s%s</div>',
 			$this->renderScreenshot(),
@@ -114,7 +116,9 @@ 
 
 		foreach( $this->args as $key => $value ) {
 			$method = $this->utility->buildMethodName( $key, 'set' );
-			if( !method_exists( $this, $method ))continue;
+			if( !method_exists( $this, $method )) {
+				continue;
+			}
 			call_user_func([ $this, $method ], $value );
 		}
 		return $this->args;

src/Oembed.php

Spacing +27 added lines, -27 removed lines

@@ -22,69 +22,69 @@
 		'width',
 	];
 
-	public function __construct( Utility $utility )
+	public function __construct(Utility $utility)
 	{
 		$this->oembed  = _wp_oembed_get_object();
 		$this->utility = $utility;
 	}
 
-	public function request( $url, $args = '' )
+	public function request($url, $args = '')
 	{
-		$args = wp_parse_args( $args, [
+		$args = wp_parse_args($args, [
 			'embed_type' => '',
 		]);
-		$request = $this->oembed->fetch( $this->oembed->get_provider( $url ), $url, [
+		$request = $this->oembed->fetch($this->oembed->get_provider($url), $url, [
 			'width'  => 1280,
 			'height' => 1280,
 		]);
-		if( $request === false )return;
-		if( !empty( $args['embed_type'] ) && $args['embed_type'] != $request->type )return;
-		return $this->modifyRequest( $request, $args );
+		if ($request === false)return;
+		if (!empty($args['embed_type']) && $args['embed_type'] != $request->type)return;
+		return $this->modifyRequest($request, $args);
 	}
 
-	protected function domLoad( $html )
+	protected function domLoad($html)
 	{
 		$dom = new DomDocument;
-		$dom->loadHTML( $html );
+		$dom->loadHTML($html);
 		return $dom;
 	}
 
-	protected function modifyRequest( $request, $args )
+	protected function modifyRequest($request, $args)
 	{
-		$providerName = strtolower( $request->provider_name );
-		$provider = property_exists( $this, $providerName )
+		$providerName = strtolower($request->provider_name);
+		$provider = property_exists($this, $providerName)
 			? $this->$providerName
 			: [];
 
-		$method = $this->utility->buildMethodName( $providerName . '_request', 'modify' );
+		$method = $this->utility->buildMethodName($providerName . '_request', 'modify');
 
-		if( method_exists( $this, $method )) {
-			return call_user_func( [$this, $method], $request, array_intersect_key(
+		if (method_exists($this, $method)) {
+			return call_user_func([$this, $method], $request, array_intersect_key(
 				$args,
-				array_flip( $provider )
+				array_flip($provider)
 			));
 		}
 		return $request;
 	}
 
-	protected function modifyYoutubeRequest( $request, array $args )
+	protected function modifyYoutubeRequest($request, array $args)
 	{
-		$html = $this->domLoad( $request->html );
-		$node = $html->getElementsByTagName( 'iframe' )->item(0);
-		$url  = $node->getAttribute( 'src' );
+		$html = $this->domLoad($request->html);
+		$node = $html->getElementsByTagName('iframe')->item(0);
+		$url  = $node->getAttribute('src');
 
-		if( isset( $args['fs'] ) && $args['fs'] == 0 ) {
-			$node->removeAttribute( 'allowfullscreen' );
+		if (isset($args['fs']) && $args['fs'] == 0) {
+			$node->removeAttribute('allowfullscreen');
 		}
 
-		$args['origin'] = urlencode( get_bloginfo( 'url' ));
+		$args['origin'] = urlencode(get_bloginfo('url'));
 
-		$node->setAttribute( 'class', 'video-embed' );
-		$node->setAttribute( 'src',
-			add_query_arg( $args, remove_query_arg( 'feature', $url ))
+		$node->setAttribute('class', 'video-embed');
+		$node->setAttribute('src',
+			add_query_arg($args, remove_query_arg('feature', $url))
 		);
 
-		$request->html = $html->saveHTML( $node );
+		$request->html = $html->saveHTML($node);
 
 		return $request;
 	}

Braces +6 added lines, -2 removed lines

@@ -37,8 +37,12 @@
 			'width'  => 1280,
 			'height' => 1280,
 		]);
-		if( $request === false )return;
-		if( !empty( $args['embed_type'] ) && $args['embed_type'] != $request->type )return;
+		if( $request === false ) {
+			return;
+		}
+		if( !empty( $args['embed_type'] ) && $args['embed_type'] != $request->type ) {
+			return;
+		}
 		return $this->modifyRequest( $request, $args );
 	}
 

templates/email.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title><?= wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ); ?></title>
+    <title><?= wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); ?></title>
 </head>
 <body>
 

src/Services/Email.php

Braces +9 added lines, -3 removed lines

@@ -62,7 +62,9 @@ 
 		$this->to          = $email['to'];
 
 		add_action( 'phpmailer_init', function( PHPMailer $phpmailer ) {
-			if( $phpmailer->ContentType === 'text/plain' || !empty( $phpmailer->AltBody ))return;
+			if( $phpmailer->ContentType === 'text/plain' || !empty( $phpmailer->AltBody )) {
+				return;
+			}
 			$phpmailer->AltBody = $this->buildPlainTextMessage( $phpmailer->Body );
 		});
 
@@ -86,7 +88,9 @@ 
 	 */
 	public function send()
 	{
-		if( !$this->message || !$this->subject || !$this->to )return;
+		if( !$this->message || !$this->subject || !$this->to ) {
+			return;
+		}
 
 		$sent = wp_mail(
 			$this->to,
@@ -226,7 +230,9 @@ 
 		if( !file_exists( $file )) {
 			$file = sprintf( '%s/templates/%s.php', dirname( __DIR__ ), $templatePath );
 		}
-		if( !file_exists( $file ))return;
+		if( !file_exists( $file )) {
+			return;
+		}
 
 		ob_start();
 		include $file;

Spacing +63 added lines, -63 removed lines

@@ -36,7 +36,7 @@ 
 	 */
 	protected $to;
 
-	public function __construct( Template $template )
+	public function __construct(Template $template)
 	{
 		$this->template = $template;
 	}
@@ -44,19 +44,19 @@ 
 	/**
 	 * @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 $phpmailer ) {
-			if( $phpmailer->ContentType === 'text/plain' || !empty( $phpmailer->AltBody ))return;
-			$phpmailer->AltBody = $this->buildPlainTextMessage( $phpmailer->Body );
+		add_action('phpmailer_init', function(PHPMailer $phpmailer) {
+			if ($phpmailer->ContentType === 'text/plain' || !empty($phpmailer->AltBody))return;
+			$phpmailer->AltBody = $this->buildPlainTextMessage($phpmailer->Body);
 		});
 
 		return $this;
@@ -67,10 +67,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;
 	}
 
@@ -79,7 +79,7 @@ 
 	 */
 	public function send()
 	{
-		if( !$this->message || !$this->subject || !$this->to )return;
+		if (!$this->message || !$this->subject || !$this->to)return;
 
 		$sent = wp_mail(
 			$this->to,
@@ -97,7 +97,7 @@ 
 	/**
 	 * @return array
 	 */
-	protected function buildHeaders( array $email )
+	protected function buildHeaders(array $email)
 	{
 		$allowed = [
 			'bcc',
@@ -106,34 +106,34 @@ 
 			'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( 'email' );
+		$body = $this->renderTemplate('email');
 
-		$message = !empty( $email['template'] )
-			? $this->renderTemplate( $email['template'], $email['template-tags'] )
+		$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);
 	}
 
 	/**
@@ -141,9 +141,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);
 	}
 
 	/**
@@ -151,13 +151,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;
 	}
 
@@ -166,33 +166,33 @@ 
 	 */
 	protected function getDefaultFrom()
 	{
-		return sprintf( '%s <%s>',
-			wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ),
-			get_option( 'admin_email' )
+		return sprintf('%s <%s>',
+			wp_specialchars_decode(get_option('blogname'), ENT_QUOTES),
+			get_option('admin_email')
 		);
 	}
 
 	/**
 	 * @return array
 	 */
-	protected function normalize( $email )
+	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 );
+		$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);
 	}
 
 	/**
@@ -202,20 +202,20 @@ 
 	 *
 	 * @return void|string
 	 */
-	protected function renderTemplate( $templatePath, array $args = [] )
+	protected function renderTemplate($templatePath, array $args = [])
 	{
-		$file = $this->template->get( sprintf( 'castor/%s', $templatePath ));
+		$file = $this->template->get(sprintf('castor/%s', $templatePath));
 
-		if( !file_exists( $file )) {
-			$file = sprintf( '%s/templates/%s.php', dirname( __DIR__ ), $templatePath );
+		if (!file_exists($file)) {
+			$file = sprintf('%s/templates/%s.php', dirname(__DIR__), $templatePath);
 		}
-		if( !file_exists( $file ))return;
+		if (!file_exists($file))return;
 
 		ob_start();
 		include $file;
 		$template = ob_get_clean();
 
-		return $this->renderTemplateString( $template, $args );
+		return $this->renderTemplateString($template, $args);
 	}
 
 	/**
@@ -223,12 +223,12 @@ 
 	 *
 	 * @return string
 	 */
-	protected function renderTemplateString( $template, array $args = [] )
+	protected function renderTemplateString($template, array $args = [])
 	{
-		foreach( $args as $key => $value ) {
-			$template = str_replace( sprintf( '{%s}', $key ), $value, $template );
+		foreach ($args as $key => $value) {
+			$template = str_replace(sprintf('{%s}', $key), $value, $template);
 		}
-		return trim( $template );
+		return trim($template);
 	}
 
 	/**
@@ -251,16 +251,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');
 	}
 }

src/Services/Normalizer.php

Braces +9 added lines, -3 removed lines

@@ -148,7 +148,9 @@ 
 
 		// normalize truthy boolean attributes
 		foreach( $filtered as $key => $value ) {
-			if( !in_array( $key, self::BOOLEAN_ATTRIBUTES ))continue;
+			if( !in_array( $key, self::BOOLEAN_ATTRIBUTES )) {
+				continue;
+			}
 
 			if( $value !== false ) {
 				$filtered[ $key ] = '';
@@ -187,11 +189,15 @@ 
 
 				if( $result ) {
 					// only allow data attributes to have an empty value
-					if( $wildcard != 'data-' && empty( $value ))continue;
+					if( $wildcard != 'data-' && empty( $value )) {
+						continue;
+					}
 
 					if( is_array( $value )) {
 
-						if( $wildcard != 'data-' )continue;
+						if( $wildcard != 'data-' ) {
+							continue;
+						}
 
 						$value = json_encode( $value );
 					}

Spacing +51 added lines, -51 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,31 +142,31 @@ 
 	 *
 	 * @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 ))continue;
+		foreach ($filtered as $key => $value) {
+			if (!in_array($key, self::BOOLEAN_ATTRIBUTES))continue;
 
-			if( $value !== false ) {
-				$filtered[ $key ] = '';
+			if ($value !== false) {
+				$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));
 	}
 
 	/**
@@ -174,34 +174,34 @@ 
 	 */
 	protected function filterGlobalAttributes()
 	{
-		$global = $this->filterAttributes( self::GLOBAL_ATTRIBUTES );
+		$global = $this->filterAttributes(self::GLOBAL_ATTRIBUTES);
 
 		$wildcards = [];
 
-		foreach( self::GLOBAL_WILDCARD_ATTRIBUTES as $wildcard ) {
+		foreach (self::GLOBAL_WILDCARD_ATTRIBUTES as $wildcard) {
 
-			foreach( $this->args as $key => $value ) {
+			foreach ($this->args as $key => $value) {
 
-				$length = strlen( $wildcard );
-				$result = substr( $key, 0, $length) === $wildcard;
+				$length = strlen($wildcard);
+				$result = substr($key, 0, $length) === $wildcard;
 
-				if( $result ) {
+				if ($result) {
 					// only allow data attributes to have an empty value
-					if( $wildcard != 'data-' && empty( $value ))continue;
+					if ($wildcard != 'data-' && empty($value))continue;
 
-					if( is_array( $value )) {
+					if (is_array($value)) {
 
-						if( $wildcard != 'data-' )continue;
+						if ($wildcard != 'data-')continue;
 
-						$value = json_encode( $value );
+						$value = json_encode($value);
 					}
 
-					$wildcards[ $key ] = $value;
+					$wildcards[$key] = $value;
 				}
 			}
 		}
 
-		return array_merge( $global, $wildcards );
+		return array_merge($global, $wildcards);
 	}
 
 	/**
@@ -209,7 +209,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';
 		}
 	}
@@ -217,15 +217,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);
 	}
 }

src/Services/Validator.php

Braces +14 added lines, -8 removed lines

@@ -78,7 +78,9 @@ 
 			foreach( $rules as $rule ) {
 				$this->validateAttribute( $rule, $attribute );
 
-				if( $this->shouldStopValidating( $attribute ))break;
+				if( $this->shouldStopValidating( $attribute )) {
+					break;
+				}
 			}
 		}
 
@@ -161,7 +163,9 @@ 
 	 */
 	protected function getRule( $attribute, $rules )
 	{
-		if( !array_key_exists( $attribute, $this->rules ))return;
+		if( !array_key_exists( $attribute, $this->rules )) {
+			return;
+		}
 
 		$rules = (array) $rules;
 
@@ -188,8 +192,7 @@ 
 
 		if( is_numeric( $value ) && $hasNumeric ) {
 			return $value;
-		}
-		elseif( is_array( $value )) {
+		} elseif( is_array( $value )) {
 			return count( $value );
 		}
 
@@ -253,8 +256,7 @@ 
 		// If an object was provided, get its public properties
 		if( is_object( $data )) {
 			$this->data = get_object_vars( $data );
-		}
-		else {
+		} else {
 			$this->data = $data;
 		}
 
@@ -420,7 +422,9 @@ 
 			? $strings[ $key ]
 			: false;
 
-		if( !$message )return;
+		if( !$message ) {
+			return;
+		}
 
 		$message = str_replace( ':attribute', $attribute, $message );
 
@@ -464,7 +468,9 @@ 
 	{
 		list( $rule, $parameters ) = $this->parseRule( $rule );
 
-		if( $rule == '' )return;
+		if( $rule == '' ) {
+			return;
+		}
 
 		$method = "validate{$rule}";
 

Spacing +112 added lines, -112 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 ))break;
+				if ($this->shouldStopValidating($attribute))break;
 			}
 		}
 
@@ -93,14 +93,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;
+		$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);
 		}
 	}
 
@@ -112,11 +112,11 @@ 
 	 *
 	 * @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;
+		$this->failedRules[$attribute][$rule] = $parameters;
 	}
 
 	/**
@@ -125,9 +125,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';
 	}
@@ -140,15 +140,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);
 	}
 
 	/**
@@ -159,17 +159,17 @@ 
 	 *
 	 * @return array|null
 	 */
-	protected function getRule( $attribute, $rules )
+	protected function getRule($attribute, $rules)
 	{
-		if( !array_key_exists( $attribute, $this->rules ))return;
+		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 )) {
-				return [ $rule, $parameters ];
+			if (in_array($rule, $rules)) {
+				return [$rule, $parameters];
 			}
 		}
 	}
@@ -182,18 +182,18 @@ 
 	 *
 	 * @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);
 	}
 
 	/**
@@ -204,14 +204,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);
 	}
 
 	/**
@@ -221,10 +221,10 @@ 
 	 *
 	 * @return mixed
 	 */
-	protected function getValue( $attribute )
+	protected function getValue($attribute)
 	{
-		if( isset( $this->data[ $attribute ] )) {
-			return $this->data[ $attribute ];
+		if (isset($this->data[$attribute])) {
+			return $this->data[$attribute];
 		}
 	}
 
@@ -236,9 +236,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));
 	}
 
 	/**
@@ -248,11 +248,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;
@@ -269,13 +269,13 @@ 
 	 *
 	 * @return array
 	 */
-	protected function parseParameters( $rule, $parameter )
+	protected function parseParameters($rule, $parameter)
 	{
-		if( strtolower( $rule ) == 'regex' ) {
-			return [ $parameter ];
+		if (strtolower($rule) == 'regex') {
+			return [$parameter];
 		}
 
-		return str_getcsv( $parameter );
+		return str_getcsv($parameter);
 	}
 
 	/**
@@ -285,22 +285,22 @@ 
 	 *
 	 * @return array
 	 */
-	protected function parseRule( $rule )
+	protected function parseRule($rule)
 	{
 		$parameters = [];
 
 		// example: {rule}:{parameters}
-		if( strpos( $rule, ':' ) !== false ) {
-			list( $rule, $parameter ) = explode( ':', $rule, 2 );
+		if (strpos($rule, ':') !== false) {
+			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 ];
+		return [$rule, $parameters];
 	}
 
 	/**
@@ -310,9 +310,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);
 	}
 
 	/**
@@ -322,9 +322,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);
 	}
 
 	/**
@@ -334,9 +334,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);
 	}
 
 	/**
@@ -348,10 +348,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.");
 		}
 	}
 
@@ -360,10 +360,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;
@@ -378,11 +378,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);
 	}
 
 	/**
@@ -392,12 +392,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;
@@ -412,20 +412,20 @@ 
 	 *
 	 * @return string|null
 	 */
-	protected function translator( $key, $rule, $attribute, array $parameters )
+	protected function translator($key, $rule, $attribute, array $parameters)
 	{
-		$strings = glsr_resolve( 'Strings' )->validation();
+		$strings = glsr_resolve('Strings')->validation();
 
-		$message = isset( $strings[ $key ] )
-			? $strings[ $key ]
+		$message = isset($strings[$key])
+			? $strings[$key]
 			: false;
 
-		if( !$message )return;
+		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;
@@ -443,11 +443,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);
 	}
 
 	/**
@@ -459,20 +459,20 @@ 
 	 * @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 == '' )return;
+		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);
 		}
 	}
 
@@ -484,11 +484,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];
 	}
@@ -500,9 +500,9 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function validateEmail( $value )
+	protected function validateEmail($value)
 	{
-		return filter_var( $value, FILTER_VALIDATE_EMAIL ) !== false;
+		return filter_var($value, FILTER_VALIDATE_EMAIL) !== false;
 	}
 
 	/**
@@ -513,11 +513,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];
 	}
 
 	/**
@@ -528,11 +528,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];
 	}
 
 	/**
@@ -542,9 +542,9 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function validateNumeric( $value )
+	protected function validateNumeric($value)
 	{
-		return is_numeric( $value );
+		return is_numeric($value);
 	}
 
 	/**
@@ -554,12 +554,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;
 	}

src/Forms/Fields/Checkbox.php

Spacing +8 added lines, -8 removed lines

@@ -8,11 +8,11 @@ 
 {
 	protected $element = 'input';
 
-	public function __construct( array $args = [] )
+	public function __construct(array $args = [])
 	{
-		parent::__construct( $args );
+		parent::__construct($args);
 
-		if( count( $args['options'] ) > 1 ) {
+		if (count($args['options']) > 1) {
 			$this->multi = true;
 		}
 	}
@@ -24,16 +24,16 @@ 
 	{
 		$inline = $this->args['inline'] ? ' class="inline"' : '';
 
-		if( $this->multi ) {
-			return sprintf( '<ul%s>%s</ul>%s',
+		if ($this->multi) {
+			return sprintf('<ul%s>%s</ul>%s',
 				$inline,
-				$this->implodeOptions( 'multi_input_checkbox' ),
+				$this->implodeOptions('multi_input_checkbox'),
 				$this->generateDescription()
 			);
 		}
 
-		return sprintf( '%s%s',
-			$this->implodeOptions( 'single_input' ),
+		return sprintf('%s%s',
+			$this->implodeOptions('single_input'),
 			$this->generateDescription()
 		);
 	}

src/Forms/Fields/Radio.php

Spacing +3 added lines, -3 removed lines

@@ -11,13 +11,13 @@
 	/**
 	 * @return string
 	 */
-	public function render( $default = null )
+	public function render($default = null)
 	{
 		$inline = $this->args['inline'] ? ' class="inline"' : '';
 
-		return sprintf( '<ul%s>%s</ul>%s',
+		return sprintf('<ul%s>%s</ul>%s',
 			$inline,
-			$this->implodeOptions( 'multi_input', $default ),
+			$this->implodeOptions('multi_input', $default),
 			$this->generateDescription()
 		);
 	}