anrw / classy

app/classes/hierarchy.php

Braces +10 added lines, -4 removed lines

@@ -54,9 +54,11 @@ 
 
 		elseif ( is_paged() ) : return 'paged';
 
-		else :
+		else {
+			:
 
 			return 'index';
+		}
 
 		endif;
 
@@ -97,7 +99,8 @@ 
 
 			return THEME_PATH . $folder . '/' . $view . '.blade.php';
 
-		} elseif ( 'scope' === $type ) {
+		}
+		elseif ( 'scope' === $type ) {
 
 			$folder = ClassyScope::$folder;
 
@@ -234,7 +237,8 @@ 
 
 					list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
 
-				} else {
+				}
+				else {
 
 					list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
 
@@ -347,9 +351,11 @@ 
 
 			// Default
 
-		else :
+		else {
+			:
 
 			$views[] = $type;
+		}
 
 		endif;
 

Doc Comments +2 added lines, -2 removed lines

@@ -121,7 +121,7 @@ 
 	 * @param string $type View|scope.
 	 * @param string $page Request type like: home, single etc.
 	 *
-	 * @return array|bool
+	 * @return string|false
 	 */
 	public static function get_available_file( $type = 'view', $page ) {
 		$views = self::get_request_hierarchy_list( $page );
@@ -306,7 +306,7 @@ 
 	/**
 	 * Returns classy template name or boolean if this is not classy template.
 	 *
-	 * @return mixed
+	 * @return string|false
 	 */
 	public static function get_classy_template() {
 		preg_match( '/classy\-(.*)/', get_page_template_slug(), $matches );

Spacing +65 added lines, -65 removed lines

@@ -26,39 +26,39 @@ 
 	 */
 	protected static function check_request() {
 
-		if ( is_404() ) : return '404';
+		if (is_404()) : return '404';
 
-		elseif ( is_search() ) : return 'search';
+		elseif (is_search()) : return 'search';
 
-		elseif ( is_front_page() ) : return 'front-page';
+		elseif (is_front_page()) : return 'front-page';
 
-		elseif ( is_home() ) : return 'home';
+		elseif (is_home()) : return 'home';
 
-		elseif ( is_post_type_archive() ) : return 'post_type_archive';
+		elseif (is_post_type_archive()) : return 'post_type_archive';
 
-		elseif ( is_tax() ) : return 'taxonomy';
+		elseif (is_tax()) : return 'taxonomy';
 
-		elseif ( is_attachment() ) : return 'attachment';
+		elseif (is_attachment()) : return 'attachment';
 
-		elseif ( is_single() ) : return 'single';
+		elseif (is_single()) : return 'single';
 
-		elseif ( self::is_classy_template() ) : return 'classy-template';
+		elseif (self::is_classy_template()) : return 'classy-template';
 
-		elseif ( is_page() ) : return 'page';
+		elseif (is_page()) : return 'page';
 
-		elseif ( is_singular() ) : return 'singular';
+		elseif (is_singular()) : return 'singular';
 
-		elseif ( is_category() ) : return 'category';
+		elseif (is_category()) : return 'category';
 
-		elseif ( is_tag() ) : return 'tag';
+		elseif (is_tag()) : return 'tag';
 
-		elseif ( is_author() ) : return 'author';
+		elseif (is_author()) : return 'author';
 
-		elseif ( is_date() ) : return 'date';
+		elseif (is_date()) : return 'date';
 
-		elseif ( is_archive() ) : return 'archive';
+		elseif (is_archive()) : return 'archive';
 
-		elseif ( is_paged() ) : return 'paged';
+		elseif (is_paged()) : return 'paged';
 
 		else :
 
@@ -73,7 +73,7 @@ 
 	 * @return string
 	 */
 	public static function get_current_request() {
-		if ( is_null( self::$current_request ) ) {
+		if (is_null(self::$current_request)) {
 			self::$current_request = self::check_request();
 		}
 
@@ -89,13 +89,13 @@ 
 	 *
 	 * @return string Full file path.
 	 */
-	public static function get_file_path( $type = 'view', $view ) {
-		$view = str_replace( '.', '/', $view );
+	public static function get_file_path($type = 'view', $view) {
+		$view = str_replace('.', '/', $view);
 
-		if ( 'view' === $type ) {
-			return CLASSY_THEME_PATH . View::$folder . '/' . $view . '.blade.php';
-		} elseif ( 'scope' === $type ) {
-			return CLASSY_THEME_PATH . Scope::$folder . '/' . $view . '.php';
+		if ('view' === $type) {
+			return CLASSY_THEME_PATH.View::$folder.'/'.$view.'.blade.php';
+		} elseif ('scope' === $type) {
+			return CLASSY_THEME_PATH.Scope::$folder.'/'.$view.'.php';
 		}
 
 		return '';
@@ -109,9 +109,9 @@ 
 	 *
 	 * @return boolean true|false
 	 */
-	public static function file_exists( $type = 'view', $file ) {
+	public static function file_exists($type = 'view', $file) {
 		return file_exists(
-			self::get_file_path( $type, str_replace( '.', '/', $file ) )
+			self::get_file_path($type, str_replace('.', '/', $file))
 		);
 	}
 
@@ -123,11 +123,11 @@ 
 	 *
 	 * @return array|bool
 	 */
-	public static function get_available_file( $type = 'view', $page ) {
-		$views = self::get_request_hierarchy_list( $page );
+	public static function get_available_file($type = 'view', $page) {
+		$views = self::get_request_hierarchy_list($page);
 
-		foreach ( $views as $view ) {
-			if ( self::file_exists( $type, $view ) ) {
+		foreach ($views as $view) {
+			if (self::file_exists($type, $view)) {
 				return $view;
 			}
 		}
@@ -142,26 +142,26 @@ 
 	 *
 	 * @return array
 	 */
-	private static function get_request_hierarchy_list( $type ) {
+	private static function get_request_hierarchy_list($type) {
 		$views = array();
 
-		if ( 'home' === $type ) :
+		if ('home' === $type) :
 			$views[] = 'home';
-		elseif ( 'single' === $type ) :
+		elseif ('single' === $type) :
 
-			$views[] = get_post_type() . '.single';
+			$views[] = get_post_type().'.single';
 			$views[] = 'single';
 
-		elseif ( 'post_type_archive' === $type ) :
+		elseif ('post_type_archive' === $type) :
 
-			$views[] = get_post_type() . '.archive';
+			$views[] = get_post_type().'.archive';
 			$views[] = 'archive';
 
-		elseif ( 'taxonomy' === $type ) :
+		elseif ('taxonomy' === $type) :
 
 			$term = get_queried_object();
 
-			if ( ! empty( $term->slug ) ) {
+			if (!empty($term->slug)) {
 				$taxonomy = $term->taxonomy;
 
 				$views[] = "taxonomy.$taxonomy-{$term->slug}";
@@ -171,11 +171,11 @@ 
 			$views[] = 'taxonomy.taxonomy';
 			$views[] = 'taxonomy';
 
-		elseif ( 'category' === $type ) :
+		elseif ('category' === $type) :
 
 			$category = get_queried_object();
 
-			if ( ! empty( $category->slug ) ) {
+			if (!empty($category->slug)) {
 				$views[] = "category.{$category->slug}";
 				$views[] = "category.{$category->term_id}";
 			}
@@ -183,18 +183,18 @@ 
 			$views[] = 'category.category';
 			$views[] = 'category';
 
-		elseif ( 'attachment' === $type ) :
+		elseif ('attachment' === $type) :
 
 			$attachment = get_queried_object();
 
-			if ( $attachment ) {
-				if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
-					list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
+			if ($attachment) {
+				if (false !== strpos($attachment->post_mime_type, '/')) {
+					list($type, $subtype) = explode('/', $attachment->post_mime_type);
 				} else {
-					list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
+					list($type, $subtype) = array($attachment->post_mime_type, '');
 				}
 
-				if ( ! empty( $subtype ) ) {
+				if (!empty($subtype)) {
 					$views[] = "attachment.{$type}.{$subtype}";
 					$views[] = "attachment.{$subtype}";
 
@@ -209,11 +209,11 @@ 
 			$views[] = 'attachment.attachment';
 			$views[] = 'attachment';
 
-		elseif ( 'tag' === $type ) :
+		elseif ('tag' === $type) :
 
 			$tag = get_queried_object();
 
-			if ( ! empty( $tag->slug ) ) {
+			if (!empty($tag->slug)) {
 				$views[] = "post.tag.{$tag->slug}";
 				$views[] = "post.tag.{$tag->term_id}";
 
@@ -224,11 +224,11 @@ 
 			$views[] = 'post.tag';
 			$views[] = 'tag';
 
-		elseif ( 'author' === $type ) :
+		elseif ('author' === $type) :
 
 			$author = get_queried_object();
 
-			if ( $author instanceof \WP_User ) {
+			if ($author instanceof \WP_User) {
 				$views[] = "post.author.{$author->user_nicename}";
 				$views[] = "post.author.{$author->ID}";
 
@@ -239,7 +239,7 @@ 
 			$views[] = 'post.author';
 			$views[] = 'author';
 
-		elseif ( 'front-page' === $type ) :
+		elseif ('front-page' === $type) :
 
 			$views[] = 'front-page.front-page';
 			$views[] = 'front-page';
@@ -247,37 +247,37 @@ 
 			$views[] = 'home.home';
 			$views[] = 'home';
 
-			$views = array_merge( $views, self::get_request_hierarchy_list( 'post_type_archive' ) );
+			$views = array_merge($views, self::get_request_hierarchy_list('post_type_archive'));
 
-		elseif ( 'classy-template' === $type ) :
+		elseif ('classy-template' === $type) :
 
 			$template = self::get_classy_template();
 
 			$views[] = $template;
-			$views[] = 'page.' . $template;
-			$views[] = 'template.' . $template;
+			$views[] = 'page.'.$template;
+			$views[] = 'template.'.$template;
 			$views[] = 'page.page';
 			$views[] = 'page';
 
-		elseif ( 'page' === $type ) :
+		elseif ('page' === $type) :
 
 			$id = get_queried_object_id();
 
-			$pagename = get_query_var( 'pagename' );
+			$pagename = get_query_var('pagename');
 
-			if ( ! $pagename && $id ) {
+			if (!$pagename && $id) {
 				// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object.
-				if ( $post = get_queried_object() ) {
+				if ($post = get_queried_object()) {
 					$pagename = $post->post_name;
 				}
 			}
 
-			if ( $pagename ) {
-				$views[] = 'page.' . $pagename;
+			if ($pagename) {
+				$views[] = 'page.'.$pagename;
 			}
 
-			if ( $id ) {
-				$views[] = 'page.' . $id;
+			if ($id) {
+				$views[] = 'page.'.$id;
 			}
 
 			$views[] = 'page.page';
@@ -309,9 +309,9 @@ 
 	 * @return mixed
 	 */
 	public static function get_classy_template() {
-		preg_match( '/classy\-(.*)/', get_page_template_slug(), $matches );
+		preg_match('/classy\-(.*)/', get_page_template_slug(), $matches);
 
-		if ( ! empty( $matches ) && isset( $matches[1] ) ) {
+		if (!empty($matches) && isset($matches[1])) {
 			return $matches[1];
 		}
 

app/classes/scope.php

Braces +2 added lines, -1 removed lines

@@ -43,7 +43,8 @@
 		
 			wp_register_script( 'theme_plugins', THEME_DIR . 'assets/js/min/production.js', array( 'jquery' ), THEME_VERSION, true );
 		
-		} else {
+		}
+		else {
 			
 			wp_register_script( 'theme_plugins', THEME_DIR . 'assets/js/plugins.js', array( 'jquery' ), THEME_VERSION, true );
 

Spacing +13 added lines, -13 removed lines

@@ -35,15 +35,15 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_scope( $view_name = null ) {
+	public static function get_scope($view_name = null) {
 		$scope = self::get_common_scope();
 
-		if ( is_string( $view_name ) ) {
-			$scope = self::extend_scope( $scope, $view_name );
+		if (is_string($view_name)) {
+			$scope = self::extend_scope($scope, $view_name);
 		} else {
 			$request = Hierarchy::get_current_request();
-			$file = Hierarchy::get_available_file( 'scope', $request );
-			$scope = self::extend_scope( $scope, $file );
+			$file = Hierarchy::get_available_file('scope', $request);
+			$scope = self::extend_scope($scope, $file);
 		}
 
 		return $scope;
@@ -57,8 +57,8 @@ 
 	 *
 	 * @return array
 	 */
-	public static function extend_scope( $scope, $view_name ) {
-		return array_merge( $scope, self::require_scope( $view_name ) );
+	public static function extend_scope($scope, $view_name) {
+		return array_merge($scope, self::require_scope($view_name));
 	}
 
 	/**
@@ -67,8 +67,8 @@ 
 	 * @return array
 	 */
 	public static function get_common_scope() {
-		if ( is_null( self::$common ) ) {
-			self::$common = self::require_scope( 'common' );
+		if (is_null(self::$common)) {
+			self::$common = self::require_scope('common');
 		}
 
 		return self::$common;
@@ -81,16 +81,16 @@ 
 	 *
 	 * @return array
 	 */
-	public static function require_scope( $filename ) {
+	public static function require_scope($filename) {
 		$_return = array();
 
-		$file = Hierarchy::get_file_path( 'scope', $filename );
+		$file = Hierarchy::get_file_path('scope', $filename);
 
-		if ( file_exists( $file ) ) {
+		if (file_exists($file)) {
 			require $file;
 		}
 
-		if ( isset( $data ) ) {
+		if (isset($data)) {
 			$_return = $data;
 		}
 

app/classes/basis.php

Braces +2 added lines, -1 removed lines

@@ -28,7 +28,8 @@
 
 					$this->$key = $value;
 
-				} else if ( ! empty( $key ) && ! method_exists( $this, $key ) ) {
+				}
+				else if ( ! empty( $key ) && ! method_exists( $this, $key ) ) {
 
 					$this->$key = $value;
 

Spacing +8 added lines, -8 removed lines

@@ -19,21 +19,21 @@
 	 *
 	 * @return void
 	 */
-	protected function import( $data ) {
-		if ( is_object( $data ) ) {
-			$data = get_object_vars( $data );
+	protected function import($data) {
+		if (is_object($data)) {
+			$data = get_object_vars($data);
 		}
 
-		if ( is_array( $data ) ) {
+		if (is_array($data)) {
 			// In case if we import WP_User object.
-			if ( isset( $data['data'] ) ) {
+			if (isset($data['data'])) {
 				$data = $data['data'];
 			}
 
-			foreach ( $data as $key => $value ) {
-				if ( ! empty( $key ) ) {
+			foreach ($data as $key => $value) {
+				if (!empty($key)) {
 					$this->$key = $value;
-				} else if ( ! empty( $key ) && ! method_exists( $this, $key ) ) {
+				} else if (!empty($key) && !method_exists($this, $key)) {
 					$this->$key = $value;
 				}
 			}

app/classes/helper.php

Doc Comments +1 added lines, -1 removed lines

@@ -209,7 +209,7 @@
 	 *
 	 * @param array $array Array to be converted.
 	 *
-	 * @return object
+	 * @return \stdClass
 	 */
 	public static function array_to_object( $array ) {
 		$obj = new \stdClass;

Spacing +86 added lines, -86 removed lines

@@ -22,41 +22,41 @@ 
 	 *
 	 * @return string Trimmed text.
 	 */
-	public static function trim_words( $text, $num_words = 55, $more = null, $allowed_tags = 'p a span b i br blockquote' ) {
-		if ( null === $more ) {
-			$more = __( '…' );
+	public static function trim_words($text, $num_words = 55, $more = null, $allowed_tags = 'p a span b i br blockquote') {
+		if (null === $more) {
+			$more = __('…');
 		}
 
 		$original_text = $text;
 		$allowed_tag_string = '';
 
-		foreach ( explode( ' ', $allowed_tags ) as $tag ) {
-			$allowed_tag_string .= '<' . $tag . '>';
+		foreach (explode(' ', $allowed_tags) as $tag) {
+			$allowed_tag_string .= '<'.$tag.'>';
 		}
 
-		$text = strip_tags( $text, $allowed_tag_string );
+		$text = strip_tags($text, $allowed_tag_string);
 
-		if ( 'characters' === _x( 'words', 'word count: words or characters?' ) && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) {
-			$text = trim( preg_replace( "/[\n\r\t ]+/", ' ', $text ), ' ' );
-			preg_match_all( '/./u', $text, $words_array );
-			$words_array = array_slice( $words_array[0], 0, $num_words + 1 );
+		if ('characters' === _x('words', 'word count: words or characters?') && preg_match('/^utf\-?8$/i', get_option('blog_charset'))) {
+			$text = trim(preg_replace("/[\n\r\t ]+/", ' ', $text), ' ');
+			preg_match_all('/./u', $text, $words_array);
+			$words_array = array_slice($words_array[0], 0, $num_words + 1);
 			$sep = '';
 		} else {
-			$words_array = preg_split( "/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY );
+			$words_array = preg_split("/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY);
 			$sep = ' ';
 		}
 
-		if ( count( $words_array ) > $num_words ) {
-			array_pop( $words_array );
-			$text = implode( $sep, $words_array );
-			$text = $text . $more;
+		if (count($words_array) > $num_words) {
+			array_pop($words_array);
+			$text = implode($sep, $words_array);
+			$text = $text.$more;
 		} else {
-			$text = implode( $sep, $words_array );
+			$text = implode($sep, $words_array);
 		}
 
-		$text = self::close_tags( $text );
+		$text = self::close_tags($text);
 
-		return apply_filters( 'wp_trim_words', $text, $num_words, $more, $original_text );
+		return apply_filters('wp_trim_words', $text, $num_words, $more, $original_text);
 	}
 
 	/**
@@ -66,36 +66,36 @@ 
 	 *
 	 * @return string
 	 */
-	public static function close_tags( $html ) {
+	public static function close_tags($html) {
 		// Put all opened tags into an array.
-		preg_match_all( '#<([a-z]+)(?: .*)?(?<![/|/ ])>#iU', $html, $result );
+		preg_match_all('#<([a-z]+)(?: .*)?(?<![/|/ ])>#iU', $html, $result);
 
 		$openedtags = $result[1];
 
 		// Put all closed tags into an array.
-		preg_match_all( '#</([a-z]+)>#iU', $html, $result );
+		preg_match_all('#</([a-z]+)>#iU', $html, $result);
 
 		$closedtags = $result[1];
-		$len_opened = count( $openedtags );
+		$len_opened = count($openedtags);
 
 		// All tags are closed.
-		if ( count( $closedtags ) === $len_opened ) {
+		if (count($closedtags) === $len_opened) {
 			return $html;
 		}
 
-		$openedtags = array_reverse( $openedtags );
+		$openedtags = array_reverse($openedtags);
 
 		// Close tags.
-		for ( $i = 0; $i < $len_opened; $i++ ) {
-			if ( ! in_array( $openedtags[ $i ], $closedtags, true ) ) {
-				$html .= '</' . $openedtags[ $i ] . '>';
+		for ($i = 0; $i < $len_opened; $i++) {
+			if (!in_array($openedtags[$i], $closedtags, true)) {
+				$html .= '</'.$openedtags[$i].'>';
 			} else {
-				unset( $closedtags[ array_search( $openedtags[ $i ], $closedtags ) ] );
+				unset($closedtags[array_search($openedtags[$i], $closedtags)]);
 			}
 		}
 
-		$html = str_replace( array( '</br>', '</hr>', '</wbr>' ), '', $html );
-		$html = str_replace( array( '<br>', '<hr>', '<wbr>' ), array( '<br />', '<hr />', '<wbr />' ), $html );
+		$html = str_replace(array('</br>', '</hr>', '</wbr>'), '', $html);
+		$html = str_replace(array('<br>', '<hr>', '<wbr>'), array('<br />', '<hr />', '<wbr />'), $html);
 
 		return $html;
 	}
@@ -107,7 +107,7 @@ 
 	 *
 	 * @return array
 	 */
-	public static function paginate_links( $args = '' ) {
+	public static function paginate_links($args = '') {
 		$defaults = array(
 			'base' => '%_%', // Example http://example.com/all_posts.php%_% : %_% is replaced by format (below).
 			'format' => '?page=%#%', // Example ?page=%#% : %#% is replaced by the page number.
@@ -115,44 +115,44 @@ 
 			'current' => 0,
 			'show_all' => false,
 			'prev_next' => true,
-			'prev_text' => __( '&laquo; Previous' ),
-			'next_text' => __( 'Next &raquo;' ),
+			'prev_text' => __('&laquo; Previous'),
+			'next_text' => __('Next &raquo;'),
 			'end_size' => 1,
 			'mid_size' => 2,
 			'type' => 'array',
 			'add_args' => false, // Array of query args to add.
 			'add_fragment' => '',
 		);
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		// Who knows what else people pass in $args.
-		$args['total'] = intval( (int) $args['total'] );
-		if ( $args['total'] < 2 ) {
+		$args['total'] = intval((int) $args['total']);
+		if ($args['total'] < 2) {
 			return array();
 		}
 		$args['current'] = (int) $args['current'];
 		$args['end_size'] = 0 < (int) $args['end_size'] ? (int) $args['end_size'] : 1; // Out of bounds?  Make it the default.
 		$args['mid_size'] = 0 <= (int) $args['mid_size'] ? (int) $args['mid_size'] : 2;
-		$args['add_args'] = is_array( $args['add_args'] ) ? $args['add_args'] : false;
+		$args['add_args'] = is_array($args['add_args']) ? $args['add_args'] : false;
 		$page_links = array();
 		$dots = false;
-		if ( $args['prev_next'] && $args['current'] && 1 < $args['current'] ) {
-			$link = str_replace( '%_%', 2 === absint( $args['current'] ) ? '' : $args['format'], $args['base'] );
-			$link = str_replace( '%#%', $args['current'] - 1, $link );
-			if ( $args['add_args'] ) {
-				$link = add_query_arg( $args['add_args'], $link );
+		if ($args['prev_next'] && $args['current'] && 1 < $args['current']) {
+			$link = str_replace('%_%', 2 === absint($args['current']) ? '' : $args['format'], $args['base']);
+			$link = str_replace('%#%', $args['current'] - 1, $link);
+			if ($args['add_args']) {
+				$link = add_query_arg($args['add_args'], $link);
 			}
 			$link .= $args['add_fragment'];
-			$link = untrailingslashit( $link );
+			$link = untrailingslashit($link);
 			$page_links[] = array(
 				'class' => 'prev page-numbers',
-				'link' => esc_url( apply_filters( 'paginate_links', $link ) ),
+				'link' => esc_url(apply_filters('paginate_links', $link)),
 				'title' => $args['prev_text'],
 			);
 		}
-		for ( $n = 1; $n <= $args['total']; $n++ ) {
-			$n_display = number_format_i18n( $n );
-			if ( absint( $args['current'] ) === $n ) {
+		for ($n = 1; $n <= $args['total']; $n++) {
+			$n_display = number_format_i18n($n);
+			if (absint($args['current']) === $n) {
 				$page_links[] = array(
 					'class' => 'page-number page-numbers current',
 					'title' => $n_display,
@@ -162,42 +162,42 @@ 
 				);
 				$dots = true;
 			} else {
-				if ( $args['show_all'] || ( $n <= $args['end_size'] || ( $args['current'] && $n >= $args['current'] - $args['mid_size'] && $n <= $args['current'] + $args['mid_size'] ) || $n > $args['total'] - $args['end_size'] ) ) {
-					$link = str_replace( '%_%', 1 === absint( $n ) ? '' : $args['format'], $args['base'] );
-					$link = str_replace( '%#%', $n, $link );
-					$link = trailingslashit( $link ) . ltrim( $args['add_fragment'], '/' );
-					if ( $args['add_args'] ) {
-						$link = rtrim( add_query_arg( $args['add_args'], $link ), '/' );
+				if ($args['show_all'] || ($n <= $args['end_size'] || ($args['current'] && $n >= $args['current'] - $args['mid_size'] && $n <= $args['current'] + $args['mid_size']) || $n > $args['total'] - $args['end_size'])) {
+					$link = str_replace('%_%', 1 === absint($n) ? '' : $args['format'], $args['base']);
+					$link = str_replace('%#%', $n, $link);
+					$link = trailingslashit($link).ltrim($args['add_fragment'], '/');
+					if ($args['add_args']) {
+						$link = rtrim(add_query_arg($args['add_args'], $link), '/');
 					}
-					$link = str_replace( ' ', '+', $link );
-					$link = untrailingslashit( $link );
+					$link = str_replace(' ', '+', $link);
+					$link = untrailingslashit($link);
 					$page_links[] = array(
 						'class' => 'page-number page-numbers',
-						'link' => esc_url( apply_filters( 'paginate_links', $link ) ),
+						'link' => esc_url(apply_filters('paginate_links', $link)),
 						'title' => $n_display,
 						'name' => $n_display,
-						'current' => absint( $args['current'] ) === $n,
+						'current' => absint($args['current']) === $n,
 					);
 					$dots = true;
-				} elseif ( $dots && ! $args['show_all'] ) {
+				} elseif ($dots && !$args['show_all']) {
 					$page_links[] = array(
 						'class' => 'dots',
-						'title' => __( '&hellip;' ),
+						'title' => __('&hellip;'),
 					);
 					$dots = false;
 				}
 			}
 		}
-		if ( $args['prev_next'] && $args['current'] && ( $args['current'] < $args['total'] || -1 === intval( $args['total'] ) ) ) {
-			$link = str_replace( '%_%', $args['format'], $args['base'] );
-			$link = str_replace( '%#%', $args['current'] + 1, $link );
-			if ( $args['add_args'] ) {
-				$link = add_query_arg( $args['add_args'], $link );
+		if ($args['prev_next'] && $args['current'] && ($args['current'] < $args['total'] || -1 === intval($args['total']))) {
+			$link = str_replace('%_%', $args['format'], $args['base']);
+			$link = str_replace('%#%', $args['current'] + 1, $link);
+			if ($args['add_args']) {
+				$link = add_query_arg($args['add_args'], $link);
 			}
-			$link = untrailingslashit( trailingslashit( $link ) . $args['add_fragment'] );
+			$link = untrailingslashit(trailingslashit($link).$args['add_fragment']);
 			$page_links[] = array(
 				'class' => 'next page-numbers',
-				'link' => esc_url( apply_filters( 'paginate_links', $link ) ),
+				'link' => esc_url(apply_filters('paginate_links', $link)),
 				'title' => $args['next_text'],
 			);
 		}
@@ -211,13 +211,13 @@ 
 	 *
 	 * @return object
 	 */
-	public static function array_to_object( $array ) {
+	public static function array_to_object($array) {
 		$obj = new \stdClass;
 
-		foreach ( $array as $k => $v ) {
-			if ( strlen( $k ) ) {
-				if ( is_array( $v ) ) {
-					$obj->{$k} = self::array_to_object( $v ); // Recursion.
+		foreach ($array as $k => $v) {
+			if (strlen($k)) {
+				if (is_array($v)) {
+					$obj->{$k} = self::array_to_object($v); // Recursion.
 				} else {
 					$obj->{$k} = $v;
 				}
@@ -236,26 +236,26 @@ 
 		$textdomain = Classy::textdomain();
 	    $archives_title = '';
 
-	    if ( is_category() ) {
-	        $archives_title = single_cat_title( '', false );
-	    } else if ( is_tag() ) {
-	        $archives_title = 'Tag: ' . single_tag_title( '', false );
-	    } else if ( is_author() ) {
-	        if ( have_posts() ) {
+	    if (is_category()) {
+	        $archives_title = single_cat_title('', false);
+	    } else if (is_tag()) {
+	        $archives_title = 'Tag: '.single_tag_title('', false);
+	    } else if (is_author()) {
+	        if (have_posts()) {
 	            the_post();
-	            $archives_title = 'Author: ' . get_the_author();
+	            $archives_title = 'Author: '.get_the_author();
 	        }
 
 	        rewind_posts();
-	    } else if ( is_search() ) {
-	        $archives_title = sprintf( __( 'Search Results for: %s', $textdomain ), '<span>' . get_search_query() . '</span>' );
-	    } else if ( is_archive() ) {
-	        if ( is_day() ) {
+	    } else if (is_search()) {
+	        $archives_title = sprintf(__('Search Results for: %s', $textdomain), '<span>'.get_search_query().'</span>');
+	    } else if (is_archive()) {
+	        if (is_day()) {
 	            $archives_title = get_the_date();
-	        } elseif ( is_month() ) {
-	            $archives_title = get_the_date( _x( 'F Y', 'monthly archives date format', $textdomain ) );
-	        } elseif ( is_year() ) {
-	            $archives_title = get_the_date( _x( 'Y', 'yearly archives date format', $textdomain ) );
+	        } elseif (is_month()) {
+	            $archives_title = get_the_date(_x('F Y', 'monthly archives date format', $textdomain));
+	        } elseif (is_year()) {
+	            $archives_title = get_the_date(_x('Y', 'yearly archives date format', $textdomain));
 	        } else {
 	            $archives_title = 'Archives';
 	        }

Indentation +21 added lines, -21 removed lines

@@ -236,29 +236,29 @@
 		$textdomain = Classy::textdomain();
 		$archives_title = 'Archives';
 
-	    if ( is_category() ) {
-	        $archives_title = single_cat_title( '', false );
-	    } else if ( is_tag() ) {
-	        $archives_title = 'Tag: ' . single_tag_title( '', false );
-	    } else if ( is_author() ) {
-	        if ( have_posts() ) {
-	            the_post();
-	            $archives_title = 'Author: ' . get_the_author();
-	        }
+		if ( is_category() ) {
+			$archives_title = single_cat_title( '', false );
+		} else if ( is_tag() ) {
+			$archives_title = 'Tag: ' . single_tag_title( '', false );
+		} else if ( is_author() ) {
+			if ( have_posts() ) {
+				the_post();
+				$archives_title = 'Author: ' . get_the_author();
+			}
 
-	        rewind_posts();
-	    } else if ( is_search() ) {
-	        $archives_title = sprintf( __( 'Search Results for: %s', $textdomain ), '<span>' . get_search_query() . '</span>' );
-	    } else if ( is_archive() ) {
-	        if ( is_day() ) {
-	            $archives_title = get_the_date();
-	        } elseif ( is_month() ) {
-	            $archives_title = get_the_date( _x( 'F Y', 'monthly archives date format', $textdomain ) );
-	        } elseif ( is_year() ) {
-	            $archives_title = get_the_date( _x( 'Y', 'yearly archives date format', $textdomain ) );
-	        }
+			rewind_posts();
+		} else if ( is_search() ) {
+			$archives_title = sprintf( __( 'Search Results for: %s', $textdomain ), '<span>' . get_search_query() . '</span>' );
+		} else if ( is_archive() ) {
+			if ( is_day() ) {
+				$archives_title = get_the_date();
+			} elseif ( is_month() ) {
+				$archives_title = get_the_date( _x( 'F Y', 'monthly archives date format', $textdomain ) );
+			} elseif ( is_year() ) {
+				$archives_title = get_the_date( _x( 'Y', 'yearly archives date format', $textdomain ) );
+			}
 		}
 
-	    return $archives_title;
+		return $archives_title;
 	}
 }

Braces +24 added lines, -12 removed lines

@@ -41,7 +41,8 @@ 
 			preg_match_all( '/./u', $text, $words_array );
 			$words_array = array_slice( $words_array[0], 0, $num_words + 1 );
 			$sep = '';
-		} else {
+		}
+		else {
 			$words_array = preg_split( "/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY );
 			$sep = ' ';
 		}
@@ -50,7 +51,8 @@ 
 			array_pop( $words_array );
 			$text = implode( $sep, $words_array );
 			$text = $text . $more;
-		} else {
+		}
+		else {
 			$text = implode( $sep, $words_array );
 		}
 
@@ -89,7 +91,8 @@ 
 		for ( $i = 0; $i < $len_opened; $i++ ) {
 			if ( ! in_array( $openedtags[ $i ], $closedtags, true ) ) {
 				$html .= '</' . $openedtags[ $i ] . '>';
-			} else {
+			}
+			else {
 				unset( $closedtags[ array_search( $openedtags[ $i ], $closedtags ) ] );
 			}
 		}
@@ -161,7 +164,8 @@ 
 					'current' => true,
 				);
 				$dots = true;
-			} else {
+			}
+			else {
 				if ( $args['show_all'] || ( $n <= $args['end_size'] || ( $args['current'] && $n >= $args['current'] - $args['mid_size'] && $n <= $args['current'] + $args['mid_size'] ) || $n > $args['total'] - $args['end_size'] ) ) {
 					$link = str_replace( '%_%', 1 === absint( $n ) ? '' : $args['format'], $args['base'] );
 					$link = str_replace( '%#%', $n, $link );
@@ -179,7 +183,8 @@ 
 						'current' => absint( $args['current'] ) === $n,
 					);
 					$dots = true;
-				} elseif ( $dots && ! $args['show_all'] ) {
+				}
+				elseif ( $dots && ! $args['show_all'] ) {
 					$page_links[] = array(
 						'class' => 'dots',
 						'title' => __( '&hellip;' ),
@@ -218,7 +223,8 @@ 
 			if ( strlen( $k ) ) {
 				if ( is_array( $v ) ) {
 					$obj->{$k} = self::array_to_object( $v ); // Recursion.
-				} else {
+				}
+				else {
 					$obj->{$k} = $v;
 				}
 			}
@@ -238,23 +244,29 @@ 
 
 	    if ( is_category() ) {
 	        $archives_title = single_cat_title( '', false );
-	    } else if ( is_tag() ) {
+	    }
+	    else if ( is_tag() ) {
 	        $archives_title = 'Tag: ' . single_tag_title( '', false );
-	    } else if ( is_author() ) {
+	    }
+	    else if ( is_author() ) {
 	        if ( have_posts() ) {
 	            the_post();
 	            $archives_title = 'Author: ' . get_the_author();
 	        }
 
 	        rewind_posts();
-	    } else if ( is_search() ) {
+	    }
+	    else if ( is_search() ) {
 	        $archives_title = sprintf( __( 'Search Results for: %s', $textdomain ), '<span>' . get_search_query() . '</span>' );
-	    } else if ( is_archive() ) {
+	    }
+	    else if ( is_archive() ) {
 	        if ( is_day() ) {
 	            $archives_title = get_the_date();
-	        } elseif ( is_month() ) {
+	        }
+	        elseif ( is_month() ) {
 	            $archives_title = get_the_date( _x( 'F Y', 'monthly archives date format', $textdomain ) );
-	        } elseif ( is_year() ) {
+	        }
+	        elseif ( is_year() ) {
 	            $archives_title = get_the_date( _x( 'Y', 'yearly archives date format', $textdomain ) );
 	        }
 		}

app/classes/models/image.php

Spacing +6 added lines, -6 removed lines

@@ -26,11 +26,11 @@ 
 	 *
 	 * @param int $pid Image attachment ID.
 	 */
-	public function __construct( $pid = null ) {
+	public function __construct($pid = null) {
 		$this->ID = 0;
 
 		// Checks if image with this id exists.
-		if ( null !== $pid && wp_get_attachment_image_src( $pid ) ) {
+		if (null !== $pid && wp_get_attachment_image_src($pid)) {
 			$this->ID = $pid;
 		}
 	}
@@ -42,7 +42,7 @@ 
 	 */
 	public static function get_default_image() {
 		// You can put here any url.
-		return CLASSY_THEME_DIR . '/assets/noimage.png';
+		return CLASSY_THEME_DIR.'/assets/noimage.png';
 	}
 
 	/**
@@ -52,9 +52,9 @@ 
 	 *
 	 * @return string
 	 */
-	public function src( $size = 'medium' ) {
-		if ( $this->ID ) {
-			$thumb = wp_get_attachment_image_src( $this->ID, $size );
+	public function src($size = 'medium') {
+		if ($this->ID) {
+			$thumb = wp_get_attachment_image_src($this->ID, $size);
 
 			return $thumb[0];
 		}

app/classes/query_helper.php

Spacing +12 added lines, -12 removed lines

@@ -19,18 +19,18 @@ 
 	 *
 	 * @return \WP_Query
 	 */
-	public static function find_query( $args = false ) {
+	public static function find_query($args = false) {
 		$default_args = array();
 
-		if ( ! $args ) {
+		if (!$args) {
 			return self::get_current_query();
 		}
 
-		if ( is_array( $args ) ) {
-			return new \WP_Query( array_merge( $default_args, $args ) );
+		if (is_array($args)) {
+			return new \WP_Query(array_merge($default_args, $args));
 		}
 
-		return new \WP_Query( $default_args );
+		return new \WP_Query($default_args);
 	}
 
 	/**
@@ -40,8 +40,8 @@ 
 	 */
 	public static function get_current_query() {
 		global $wp_query;
-		$query =& $wp_query;
-		$query = self::handle_maybe_custom_posts_page( $query );
+		$query = & $wp_query;
+		$query = self::handle_maybe_custom_posts_page($query);
 
 		return $query;
 	}
@@ -53,13 +53,13 @@ 
 	 *
 	 * @return \WP_Query
 	 */
-	private static function handle_maybe_custom_posts_page( $query ) {
-		if ( $custom_posts_page = get_option( 'page_for_posts' ) ) {
+	private static function handle_maybe_custom_posts_page($query) {
+		if ($custom_posts_page = get_option('page_for_posts')) {
 			if (
-				isset( $query->query['p'] ) &&
-				absint( $query->query['p'] ) === absint( $custom_posts_page )
+				isset($query->query['p']) &&
+				absint($query->query['p']) === absint($custom_posts_page)
 			) {
-				return new \WP_Query( array( 'post_type' => 'post' ) );
+				return new \WP_Query(array('post_type' => 'post'));
 			}
 		}
 

app/classes/config.php

Spacing +60 added lines, -60 removed lines

@@ -43,25 +43,25 @@ 
 	 * @return array
 	 */
 	public static function get_vars() {
-		if ( is_null( self::$vars ) ) {
+		if (is_null(self::$vars)) {
 			// Check for a theme config.
-			$config_file = CLASSY_THEME_FRAMEWORK_PATH . 'config.php';
+			$config_file = CLASSY_THEME_FRAMEWORK_PATH.'config.php';
 
-			if ( ! file_exists( $config_file ) ) {
-				wp_die( sprintf(
+			if (!file_exists($config_file)) {
+				wp_die(sprintf(
 					'There is no config file in %s custom/config.php',
-					esc_html( CLASSY_THEME )
-				) );
+					esc_html(CLASSY_THEME)
+				));
 			}
 
-			require_once( CLASSY_THEME_FRAMEWORK_PATH . 'config.php' );
+			require_once(CLASSY_THEME_FRAMEWORK_PATH.'config.php');
 			$vars = self::get_allowed_variables();
 
-			foreach ( $vars as $var ) {
-				if ( isset( $$var ) ) {
-					self::$vars[ $var ] = $$var;
+			foreach ($vars as $var) {
+				if (isset($$var)) {
+					self::$vars[$var] = $$var;
 
-					unset( $$var ); // We don't require it anymore.
+					unset($$var); // We don't require it anymore.
 				}
 			}
 		}
@@ -76,23 +76,23 @@ 
 		$vars = self::get_vars();
 
 		// Init Post Types.
-		if ( isset( $vars['post_types'] ) ) {
-			self::init_post_types( $vars['post_types'] );
+		if (isset($vars['post_types'])) {
+			self::init_post_types($vars['post_types']);
 		}
 
 		// Init Taxonomies.
-		if ( isset( $vars['taxonomies'] ) ) {
-			self::init_taxonomies( $vars['taxonomies'] );
+		if (isset($vars['taxonomies'])) {
+			self::init_taxonomies($vars['taxonomies']);
 		}
 
 		// Init Post Formats.
-		if ( isset( $vars['post_formats'] ) ) {
-			self::init_post_formats( $vars['post_formats'] );
+		if (isset($vars['post_formats'])) {
+			self::init_post_formats($vars['post_formats']);
 		}
 
 		// Init Sidebars.
-		if ( isset( $vars['sidebars'] ) ) {
-			self::init_sidebars( $vars['sidebars'] );
+		if (isset($vars['sidebars'])) {
+			self::init_sidebars($vars['sidebars']);
 		}
 	}
 
@@ -101,9 +101,9 @@ 
 	 *
 	 * @param array $post_types Custom post types to be registered.
 	 */
-	private static function init_post_types( $post_types ) {
-		if ( is_array( $post_types ) ) {
-			foreach ( $post_types as $type => $options ) {
+	private static function init_post_types($post_types) {
+		if (is_array($post_types)) {
+			foreach ($post_types as $type => $options) {
 				self::add_post_type(
 					$type,
 					$options['config'],
@@ -122,25 +122,25 @@ 
 	 * @param string $singular Optional. Default singular name.
 	 * @param string $multiple Optional. Default multiple name.
 	 */
-	private static function add_post_type( $name, $config, $singular = 'Entry', $multiple = 'Entries' ) {
+	private static function add_post_type($name, $config, $singular = 'Entry', $multiple = 'Entries') {
 		$domain = Classy::textdomain();
 
-		if ( ! isset( $config['labels'] ) ) {
+		if (!isset($config['labels'])) {
 			$config['labels'] = array(
-				'name' => __( $multiple, $domain ),
-				'singular_name' => __( $singular, $domain ),
-				'not_found' => __( 'No ' . $multiple . ' Found', $domain ),
-				'not_found_in_trash' => __( 'No ' . $multiple . ' found in Trash', $domain ),
-				'edit_item' => __( 'Edit ', $singular, $domain ),
-				'search_items' => __( 'Search ' . $multiple, $domain ),
-				'view_item' => __( 'View ', $singular, $domain ),
-				'new_item' => __( 'New ' . $singular, $domain ),
-				'add_new' => __( 'Add New', $domain ),
-				'add_new_item' => __( 'Add New ' . $singular, $domain ),
+				'name' => __($multiple, $domain),
+				'singular_name' => __($singular, $domain),
+				'not_found' => __('No '.$multiple.' Found', $domain),
+				'not_found_in_trash' => __('No '.$multiple.' found in Trash', $domain),
+				'edit_item' => __('Edit ', $singular, $domain),
+				'search_items' => __('Search '.$multiple, $domain),
+				'view_item' => __('View ', $singular, $domain),
+				'new_item' => __('New '.$singular, $domain),
+				'add_new' => __('Add New', $domain),
+				'add_new_item' => __('Add New '.$singular, $domain),
 			);
 		}
 
-		register_post_type( $name, $config );
+		register_post_type($name, $config);
 	}
 
 	/**
@@ -148,9 +148,9 @@ 
 	 *
 	 * @param array $taxonomies Taxonomies to be registered.
 	 */
-	private static function init_taxonomies( $taxonomies ) {
-		if ( is_array( $taxonomies ) ) {
-			foreach ( $taxonomies as $type => $options ) {
+	private static function init_taxonomies($taxonomies) {
+		if (is_array($taxonomies)) {
+			foreach ($taxonomies as $type => $options) {
 				self::add_taxonomy(
 					$type,
 					$options['for'],
@@ -171,26 +171,26 @@ 
 	 * @param string $singular    Optional. Default singular name.
 	 * @param string $multiple 	  Optional. Default multiple name.
 	 */
-	private static function add_taxonomy( $name, $object_type, $config, $singular = 'Entry', $multiple = 'Entries' ) {
+	private static function add_taxonomy($name, $object_type, $config, $singular = 'Entry', $multiple = 'Entries') {
 		$domain = Classy::textdomain();
 
-		if ( ! isset( $config['labels'] ) ) {
+		if (!isset($config['labels'])) {
 			$config['labels'] = array(
-				'name' => __( $multiple, $domain ),
-				'singular_name' => __( $singular, $domain ),
-				'search_items' => __( 'Search ' . $multiple, $domain ),
-				'all_items' => __( 'All ' . $multiple, $domain ),
-				'parent_item' => __( 'Parent ' . $singular, $domain ),
-				'parent_item_colon' => __( 'Parent ' . $singular . ':', $domain ),
-				'edit_item' => __( 'Edit ' . $singular, $domain ),
-				'update_item' => __( 'Update ' . $singular, $domain ),
-				'add_new_item' => __( 'Add New ' . $singular, $domain ),
-				'new_item_name' => __( 'New ' . $singular . ' Name', $domain ),
-				'menu_name' => __( $singular, $domain ),
+				'name' => __($multiple, $domain),
+				'singular_name' => __($singular, $domain),
+				'search_items' => __('Search '.$multiple, $domain),
+				'all_items' => __('All '.$multiple, $domain),
+				'parent_item' => __('Parent '.$singular, $domain),
+				'parent_item_colon' => __('Parent '.$singular.':', $domain),
+				'edit_item' => __('Edit '.$singular, $domain),
+				'update_item' => __('Update '.$singular, $domain),
+				'add_new_item' => __('Add New '.$singular, $domain),
+				'new_item_name' => __('New '.$singular.' Name', $domain),
+				'menu_name' => __($singular, $domain),
 			);
 		}
 
-		register_taxonomy( $name, $object_type, $config );
+		register_taxonomy($name, $object_type, $config);
 	}
 
 	/**
@@ -198,9 +198,9 @@ 
 	 *
 	 * @param array $post_formats Array with available post formats.
 	 */
-	private static function init_post_formats( $post_formats ) {
-		if ( is_array( $post_formats ) ) {
-			add_theme_support( 'post-formats', $post_formats );
+	private static function init_post_formats($post_formats) {
+		if (is_array($post_formats)) {
+			add_theme_support('post-formats', $post_formats);
 		}
 	}
 
@@ -209,16 +209,16 @@ 
 	 *
 	 * @param array $sidebars Sidebars to be registered.
 	 */
-	private static function init_sidebars( $sidebars ) {
+	private static function init_sidebars($sidebars) {
 		$domain = Classy::textdomain();
 
-		if ( is_array( $sidebars ) ) {
-			foreach ( $sidebars as $id => $title ) {
+		if (is_array($sidebars)) {
+			foreach ($sidebars as $id => $title) {
 				register_sidebar(
 					array(
 						'id' => $id,
-						'name' => __( $title, $domain ),
-						'description' => __( $title, $domain ),
+						'name' => __($title, $domain),
+						'description' => __($title, $domain),
 						'before_widget' => '<div id="%1$s" class="widget %2$s"><div class="widget-inner">',
 						'after_widget' => '</div></div>',
 						'before_title' => '<h3>',

app/classes/menu_item.php

Spacing +12 added lines, -12 removed lines

@@ -52,9 +52,9 @@ 
 	 *
 	 * @param \WP_Post $item WP_Post object.
 	 */
-	public function __construct( $item ) {
-		if ( is_a( $item, '\WP_Post' ) ) {
-			$this->import( $item );
+	public function __construct($item) {
+		if (is_a($item, '\WP_Post')) {
+			$this->import($item);
 			$this->filter_classes();
 		}
 	}
@@ -101,7 +101,7 @@ 
 	 * @return string
 	 */
 	public function get_classes() {
-		return implode( ' ', $this->classes );
+		return implode(' ', $this->classes);
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 	 *
 	 * @param string $class_name CSS class name.
 	 */
-	public function add_class( $class_name ) {
+	public function add_class($class_name) {
 		$this->classes[] = $class_name;
 	}
 
@@ -118,16 +118,16 @@ 
 	 *
 	 * @param Menu_Item $item Menu_Item object.
 	 */
-	public function add_child( $item ) {
-		if ( ! $this->has_child ) {
-			$this->add_class( 'menu-item-has-children' );
+	public function add_child($item) {
+		if (!$this->has_child) {
+			$this->add_class('menu-item-has-children');
 			$this->has_child = true;
 		}
 
 		$this->children[] = $item;
 		$item->level = $this->level + 1;
 
-		if ( $item->children ) {
+		if ($item->children) {
 			$this->update_child_levels();
 		}
 	}
@@ -136,7 +136,7 @@ 
 	 * Applies filters for item classes.
 	 */
 	protected function filter_classes() {
-		$this->classes = apply_filters( 'nav_menu_css_class', $this->classes, $this );
+		$this->classes = apply_filters('nav_menu_css_class', $this->classes, $this);
 	}
 
 	/**
@@ -145,8 +145,8 @@ 
 	 * @return boolean
 	 */
 	protected function update_child_levels() {
-		if ( is_array( $this->children ) ) {
-			foreach ( $this->children as $child ) {
+		if (is_array($this->children)) {
+			foreach ($this->children as $child) {
 				$child->level = $this->level + 1;
 				$child->update_child_levels();
 			}

app/classes/comment.php

Spacing +52 added lines, -52 removed lines

@@ -101,9 +101,9 @@ 
 	 *
 	 * @param \WP_Comment $item WP_Comment object.
 	 */
-	public function __construct( $item ) {
-		if ( is_a( $item, '\WP_Comment' ) ) {
-			$this->import( $item );
+	public function __construct($item) {
+		if (is_a($item, '\WP_Comment')) {
+			$this->import($item);
 		}
 	}
 
@@ -113,18 +113,18 @@ 
 	 * @return \Classy\Models\User
 	 */
 	public function author() {
-		if ( ! $this->user_id ) {
+		if (!$this->user_id) {
 
-			$author = new Models\User( 0 );
+			$author = new Models\User(0);
 
-			if ( isset( $this->comment_author ) && $this->comment_author ) {
+			if (isset($this->comment_author) && $this->comment_author) {
 				$author->name = $this->comment_author;
 			}
 
 			return $author;
 		}
 
-		return new Models\User( $this->user_id );
+		return new Models\User($this->user_id);
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 	 * @return string
 	 */
 	public function content() {
-		return apply_filters( 'get_comment_text ', $this->comment_content );
+		return apply_filters('get_comment_text ', $this->comment_content);
 	}
 
 	/**
@@ -152,11 +152,11 @@ 
 	 *
 	 * @return string
 	 */
-	public function date( $date_format = '' ) {
-		$df = $date_format ? $date_format : get_option( 'date_format' );
-		$the_date = (string) mysql2date( $df, $this->comment_date );
+	public function date($date_format = '') {
+		$df = $date_format ? $date_format : get_option('date_format');
+		$the_date = (string) mysql2date($df, $this->comment_date);
 
-		return apply_filters( 'get_comment_date ', $the_date, $df );
+		return apply_filters('get_comment_date ', $the_date, $df);
 	}
 
 	/**
@@ -176,25 +176,25 @@ 
 	 *
 	 * @return string
 	 */
-	public function avatar( $size = 92, $default = '' ) {
-		if ( ! get_option( 'show_avatars' ) ) {
+	public function avatar($size = 92, $default = '') {
+		if (!get_option('show_avatars')) {
 			return false;
 		}
 
-		if ( ! is_numeric( $size ) ) { $size = '92'; }
+		if (!is_numeric($size)) { $size = '92'; }
 
 		$email = $this->get_avatar_email();
 		$email_hash = '';
 
-		if ( ! empty( $email ) ) {
-			$email_hash = md5( strtolower( trim( $email ) ) );
+		if (!empty($email)) {
+			$email_hash = md5(strtolower(trim($email)));
 		}
 
-		$host = $this->get_avatar_host( $email_hash );
-		$default = $this->get_default_avatar( $default, $email, $size, $host );
+		$host = $this->get_avatar_host($email_hash);
+		$default = $this->get_default_avatar($default, $email, $size, $host);
 
-		if ( ! empty( $email ) ) {
-			$avatar = $this->get_avatar_url( $default, $host, $email_hash, $size );
+		if (!empty($email)) {
+			$avatar = $this->get_avatar_url($default, $host, $email_hash, $size);
 		} else {
 			$avatar = $default;
 		}
@@ -209,9 +209,9 @@ 
 	 */
 	protected function get_avatar_email() {
 		$id = (int) $this->user_id;
-		$user = get_userdata( $id );
+		$user = get_userdata($id);
 
-		if ( $user ) {
+		if ($user) {
 			$email = $user->user_email;
 		} else {
 			$email = $this->comment_author_email;
@@ -229,31 +229,31 @@ 
 	 * @param  string $host
 	 * @return string
 	 */
-	protected function get_default_avatar( $default, $email, $size, $host ) {
-		if ( '/' === substr( $default, 0, 1 ) ) {
-			$default = home_url() . $default;
+	protected function get_default_avatar($default, $email, $size, $host) {
+		if ('/' === substr($default, 0, 1)) {
+			$default = home_url().$default;
 		}
 
-		if ( empty( $default ) ) {
-			$avatar_default = get_option( 'avatar_default' );
-			if ( empty( $avatar_default ) ) {
+		if (empty($default)) {
+			$avatar_default = get_option('avatar_default');
+			if (empty($avatar_default)) {
 				$default = 'mystery';
 			} else {
 				$default = $avatar_default;
 			}
 		}
 
-		if ( 'mystery' === $default ) {
-			$default = $host . '/avatar/ad516503a11cd5ca435acc9bb6523536?s=' . $size;
+		if ('mystery' === $default) {
+			$default = $host.'/avatar/ad516503a11cd5ca435acc9bb6523536?s='.$size;
 			// ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
-		} else if ( 'blank' === $default ) {
-			$default = $email ? 'blank' : includes_url( 'images/blank.gif' );
-		} else if ( ! empty( $email ) && 'gravatar_default' === $default ) {
+		} else if ('blank' === $default) {
+			$default = $email ? 'blank' : includes_url('images/blank.gif');
+		} else if (!empty($email) && 'gravatar_default' === $default) {
 			$default = '';
-		} else if ( 'gravatar_default' === $default ) {
-			$default = $host . '/avatar/?s=' . $size;
-		} else if ( empty( $email ) && ! strstr( $default, 'http://' ) ) {
-			$default = $host . '/avatar/?d=' . $default . '&s=' . $size;
+		} else if ('gravatar_default' === $default) {
+			$default = $host.'/avatar/?s='.$size;
+		} else if (empty($email) && !strstr($default, 'http://')) {
+			$default = $host.'/avatar/?d='.$default.'&s='.$size;
 		}
 
 		return $default;
@@ -265,13 +265,13 @@ 
 	 * @param  string $email_hash
 	 * @return string
 	 */
-	protected function get_avatar_host( $email_hash ) {
+	protected function get_avatar_host($email_hash) {
 
-		if ( is_ssl() ) {
+		if (is_ssl()) {
 			$host = 'https://secure.gravatar.com';
 		} else {
-			if ( ! empty( $email_hash ) ) {
-				$host = sprintf( 'http://%d.gravatar.com', (hexdec( $email_hash[0] ) % 2) );
+			if (!empty($email_hash)) {
+				$host = sprintf('http://%d.gravatar.com', (hexdec($email_hash[0]) % 2));
 			} else {
 				$host = 'http://0.gravatar.com';
 			}
@@ -289,15 +289,15 @@ 
 	 * @param  int $size
 	 * @return string
 	 */
-	protected function get_avatar_url( $default, $host, $email_hash, $size ) {
-		$_return = $host . '/avatar/' . $email_hash . '?s=' . $size . '&d=' . urlencode( $default );
-		$rating = get_option( 'avatar_rating' );
+	protected function get_avatar_url($default, $host, $email_hash, $size) {
+		$_return = $host.'/avatar/'.$email_hash.'?s='.$size.'&d='.urlencode($default);
+		$rating = get_option('avatar_rating');
 
-		if ( ! empty( $rating ) ) {
-			$_return .= '&r=' . $rating;
+		if (!empty($rating)) {
+			$_return .= '&r='.$rating;
 		}
 
-		return str_replace( '&', '&', esc_url( $_return ) );
+		return str_replace('&', '&', esc_url($_return));
 	}
 
 	/**
@@ -305,11 +305,11 @@ 
 	 *
 	 * @param Comment $comment
 	 */
-	public function add_child( $comment ) {
+	public function add_child($comment) {
 		$this->children[] = $comment;
 		$item->level = $this->level + 1;
 
-		if ( $item->children ) {
+		if ($item->children) {
 			$this->update_child_levels();
 		}
 	}
@@ -320,8 +320,8 @@ 
 	 * @return boolean
 	 */
 	protected function update_child_levels() {
-		if ( is_array( $this->children ) ) {
-			foreach ( $this->children as $child ) {
+		if (is_array($this->children)) {
+			foreach ($this->children as $child) {
 				$child->level = $this->level + 1;
 				$child->update_child_levels();
 			}

Braces +18 added lines, -9 removed lines

@@ -195,7 +195,8 @@ 
 
 		if ( ! empty( $email ) ) {
 			$avatar = $this->get_avatar_url( $default, $host, $email_hash, $size );
-		} else {
+		}
+		else {
 			$avatar = $default;
 		}
 
@@ -213,7 +214,8 @@ 
 
 		if ( $user ) {
 			$email = $user->user_email;
-		} else {
+		}
+		else {
 			$email = $this->comment_author_email;
 		}
 
@@ -238,7 +240,8 @@ 
 			$avatar_default = get_option( 'avatar_default' );
 			if ( empty( $avatar_default ) ) {
 				$default = 'mystery';
-			} else {
+			}
+			else {
 				$default = $avatar_default;
 			}
 		}
@@ -246,13 +249,17 @@ 
 		if ( 'mystery' === $default ) {
 			$default = $host . '/avatar/ad516503a11cd5ca435acc9bb6523536?s=' . $size;
 			// ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
-		} else if ( 'blank' === $default ) {
+		}
+		else if ( 'blank' === $default ) {
 			$default = $email ? 'blank' : includes_url( 'images/blank.gif' );
-		} else if ( ! empty( $email ) && 'gravatar_default' === $default ) {
+		}
+		else if ( ! empty( $email ) && 'gravatar_default' === $default ) {
 			$default = '';
-		} else if ( 'gravatar_default' === $default ) {
+		}
+		else if ( 'gravatar_default' === $default ) {
 			$default = $host . '/avatar/?s=' . $size;
-		} else if ( empty( $email ) && ! strstr( $default, 'http://' ) ) {
+		}
+		else if ( empty( $email ) && ! strstr( $default, 'http://' ) ) {
 			$default = $host . '/avatar/?d=' . $default . '&s=' . $size;
 		}
 
@@ -269,10 +276,12 @@ 
 
 		if ( is_ssl() ) {
 			$host = 'https://secure.gravatar.com';
-		} else {
+		}
+		else {
 			if ( ! empty( $email_hash ) ) {
 				$host = sprintf( 'http://%d.gravatar.com', (hexdec( $email_hash[0] ) % 2) );
-			} else {
+			}
+			else {
 				$host = 'http://0.gravatar.com';
 			}
 		}