anrw / classy

app/core/classes/Config.php

Spacing +60 added lines, -60 removed lines

@@ -45,25 +45,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 . '/custom/config.php';
+			$config_file = CLASSY_THEME_FRAMEWORK_PATH.'/custom/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( $config_file );
+			require_once($config_file);
 			$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.
 				}
 			}
 		}
@@ -78,23 +78,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']);
 		}
 	}
 
@@ -103,9 +103,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'],
@@ -124,25 +124,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);
 	}
 
 	/**
@@ -150,9 +150,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'],
@@ -173,26 +173,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);
 	}
 
 	/**
@@ -200,9 +200,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);
 		}
 	}
 
@@ -211,16 +211,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/core/classes/Classy.php

Spacing +71 added lines, -71 removed lines

@@ -32,7 +32,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if ( null === self::$single_instance ) {
+		if (null === self::$single_instance) {
 
 			self::$single_instance = new self();
 
@@ -60,7 +60,7 @@ 
 
 		$this->load_custom_includes();
 
-		add_filter( 'theme_page_templates', array( $this, 'filter_templates' ) );
+		add_filter('theme_page_templates', array($this, 'filter_templates'));
 	}
 
 	/**
@@ -74,20 +74,20 @@ 
 	 * Load template functions.
 	 */
 	private function load_template_function() {
-		require_once( CLASSY_THEME_FRAMEWORK_PATH . 'core/functions/template-functions.php' );
+		require_once(CLASSY_THEME_FRAMEWORK_PATH.'core/functions/template-functions.php');
 	}
 
 	/**
 	 * Loads custom files specified in custom/config.php.
 	 */
 	private function load_custom_includes() {
-		$include = self::get_config_var( 'include' );
+		$include = self::get_config_var('include');
 
-		if ( is_array( $include ) ) {
-			foreach ( $include as $file ) {
-				$files = (array) glob( CLASSY_THEME_FRAMEWORK_PATH . 'custom/' . $file );
-				foreach ( $files as $filename ) {
-					if ( is_readable( $filename ) ) {
+		if (is_array($include)) {
+			foreach ($include as $file) {
+				$files = (array) glob(CLASSY_THEME_FRAMEWORK_PATH.'custom/'.$file);
+				foreach ($files as $filename) {
+					if (is_readable($filename)) {
 						require_once $filename;
 					}
 				}
@@ -105,13 +105,13 @@ 
 
 		$theme = wp_get_theme();
 
-		define( 'CLASSY_THEME', $theme->template );
-		define( 'CLASSY_THEME_NAME', $theme->get( 'Name' ) );
-		define( 'CLASSY_THEME_PATH', get_template_directory() . '/' );
-		define( 'CLASSY_THEME_DIR', get_template_directory_uri() . '/' );
-		define( 'CLASSY_THEME_VERSION', $theme->get( 'Version' ) );
-		define( 'CLASSY_THEME_FRAMEWORK_PATH', CLASSY_THEME_PATH . 'app/' );
-		define( 'CLASSY_THEME_FRAMEWORK_DIR', CLASSY_THEME_DIR . 'app/' );
+		define('CLASSY_THEME', $theme->template);
+		define('CLASSY_THEME_NAME', $theme->get('Name'));
+		define('CLASSY_THEME_PATH', get_template_directory().'/');
+		define('CLASSY_THEME_DIR', get_template_directory_uri().'/');
+		define('CLASSY_THEME_VERSION', $theme->get('Version'));
+		define('CLASSY_THEME_FRAMEWORK_PATH', CLASSY_THEME_PATH.'app/');
+		define('CLASSY_THEME_FRAMEWORK_DIR', CLASSY_THEME_DIR.'app/');
 
 	}
 
@@ -129,11 +129,11 @@ 
 	 *
 	 * @return array
 	 */
-	public function filter_templates( $page_templates = array() ) {
+	public function filter_templates($page_templates = array()) {
 
 		$custom_templates = View::get_page_templates_list();
 
-		return array_merge( $page_templates, $custom_templates );
+		return array_merge($page_templates, $custom_templates);
 
 	}
 
@@ -144,11 +144,11 @@ 
 	 *
 	 * @return mixed|bool Return false if variable not found.
 	 */
-	public static function get_config_var( $name ) {
+	public static function get_config_var($name) {
 
 		$vars = Config::get_vars();
 
-		return ( isset( $vars[ $name ] ) ) ? $vars[ $name ] : false;
+		return (isset($vars[$name])) ? $vars[$name] : false;
 
 	}
 
@@ -159,7 +159,7 @@ 
 	 */
 	public static function textdomain() {
 
-		$textdomain = Classy::get_config_var( 'textdomain' );
+		$textdomain = Classy::get_config_var('textdomain');
 
 		return $textdomain ? $textdomain : CLASSY_THEME;
 
@@ -174,17 +174,17 @@ 
 	 * @param  array|null  $data Additional params.
 	 * @return void
 	 */
-	public static function render( $view = null, $data = null ) {
+	public static function render($view = null, $data = null) {
 
-		$views = CLASSY_THEME_PATH . View::$folder;
-		$cache = WP_CONTENT_DIR . '/viewcache';
+		$views = CLASSY_THEME_PATH.View::$folder;
+		$cache = WP_CONTENT_DIR.'/viewcache';
 		$common_scope = Scope::get_common_scope();
 
-		if ( null !== $view && is_string( $view ) ) {
+		if (null !== $view && is_string($view)) {
 
-			if ( $data && is_array( $data ) ) {
+			if ($data && is_array($data)) {
 
-				$scope = array_merge( $common_scope, $data );
+				$scope = array_merge($common_scope, $data);
 
 			} else {
 
@@ -199,11 +199,11 @@ 
 
 		}
 
-		$renderer = new BladeRenderer( $views, array( 'cache_path' => $cache ) );
+		$renderer = new BladeRenderer($views, array('cache_path' => $cache));
 
-		$html = $renderer->render( $view, $scope );
+		$html = $renderer->render($view, $scope);
 
-		echo self::maybe_minify( $html );
+		echo self::maybe_minify($html);
 
 	}
 
@@ -213,13 +213,13 @@ 
 	 * @param  string $html HTML string.
 	 * @return string
 	 */
-	private static function maybe_minify( $html ) {
+	private static function maybe_minify($html) {
 
-		$minify_html = self::get_config_var( 'minify_html' );
+		$minify_html = self::get_config_var('minify_html');
 
-		if ( true === $minify_html ) {
+		if (true === $minify_html) {
 
-			$html = self::minify_html( $html );
+			$html = self::minify_html($html);
 
 		}
 
@@ -233,13 +233,13 @@ 
 	 * @param  string $html HTML string.
 	 * @return string
 	 */
-	private static function minify_html( $html ) {
+	private static function minify_html($html) {
 
 		$search = array(
 			"/\n/s",
-			'/\>[^\S ]+/s',  // Strip whitespaces after tags, except space.
-			'/[^\S ]+\</s',  // Strip whitespaces before tags, except space.
-			'/(\s)+/s',       // Shorten multiple whitespace sequences.
+			'/\>[^\S ]+/s', // Strip whitespaces after tags, except space.
+			'/[^\S ]+\</s', // Strip whitespaces before tags, except space.
+			'/(\s)+/s', // Shorten multiple whitespace sequences.
 			'/<!--(.|\s)*?-->/',
 		);
 
@@ -251,7 +251,7 @@ 
 			'',
 		);
 
-		return preg_replace( $search, $replace, $html );
+		return preg_replace($search, $replace, $html);
 
 	}
 
@@ -276,27 +276,27 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_posts( $args = false, $return = '\Classy\Models\Post' ) {
+	public static function get_posts($args = false, $return = '\Classy\Models\Post') {
 
 		$_return = array();
 
-		$query = Query_Helper::find_query( $args );
+		$query = Query_Helper::find_query($args);
 
-		if ( isset( $query->posts ) ) {
+		if (isset($query->posts)) {
 
-			foreach ( $query->posts as $post ) {
+			foreach ($query->posts as $post) {
 
-				if ( 'id' === $return ) {
+				if ('id' === $return) {
 
 					$_return[] = $post->id;
 
-				} elseif ( 'object' === $return ) {
+				} elseif ('object' === $return) {
 
 					$_return[] = $post;
 
-				} elseif ( class_exists( $return ) ) {
+				} elseif (class_exists($return)) {
 
-					$_return[] = new $return( $post );
+					$_return[] = new $return($post);
 
 				}
 			}
@@ -314,11 +314,11 @@ 
 	 *
 	 * @return mixed
 	 */
-	public static function get_post( $args = false, $return_type = '\Classy\Models\Post' ) {
+	public static function get_post($args = false, $return_type = '\Classy\Models\Post') {
 
-		$posts = self::get_posts( $args, $return_type );
+		$posts = self::get_posts($args, $return_type);
 
-		if ( $post = reset( $posts ) ) {
+		if ($post = reset($posts)) {
 			return $post;
 		}
 
@@ -331,62 +331,62 @@ 
 	 *
 	 * @return array mixed
 	 */
-	public static function get_pagination( $prefs = array() ) {
+	public static function get_pagination($prefs = array()) {
 
 		global $wp_query;
 		global $paged;
 		global $wp_rewrite;
 
 		$args = array();
-		$args['total'] = ceil( $wp_query->found_posts / $wp_query->query_vars['posts_per_page'] );
+		$args['total'] = ceil($wp_query->found_posts / $wp_query->query_vars['posts_per_page']);
 
-		if ( $wp_rewrite->using_permalinks() ) {
+		if ($wp_rewrite->using_permalinks()) {
 
-			$url = explode( '?', get_pagenum_link( 0 ) );
+			$url = explode('?', get_pagenum_link(0));
 
-			if ( isset( $url[1] ) ) {
-				parse_str( $url[1], $query );
+			if (isset($url[1])) {
+				parse_str($url[1], $query);
 				$args['add_args'] = $query;
 			}
 
 			$args['format'] = 'page/%#%';
-			$args['base'] = trailingslashit( $url[0] ).'%_%';
+			$args['base'] = trailingslashit($url[0]).'%_%';
 
 		} else {
 			$big = 999999999;
-			$args['base'] = str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) );
+			$args['base'] = str_replace($big, '%#%', esc_url(get_pagenum_link($big)));
 		}
 
 		$args['type'] = 'array';
-		$args['current'] = max( 1, get_query_var( 'paged' ) );
-		$args['mid_size'] = max( 9 - $args['current'], 3 );
+		$args['current'] = max(1, get_query_var('paged'));
+		$args['mid_size'] = max(9 - $args['current'], 3);
 		$args['prev_next'] = false;
 
-		if ( is_int( $prefs ) ) {
+		if (is_int($prefs)) {
 			$args['mid_size'] = $prefs - 2;
 		} else {
-			$args = array_merge( $args, $prefs );
+			$args = array_merge($args, $prefs);
 		}
 
 		$data = array();
-		$data['pages'] = Helper::paginate_links( $args );
-		$next = get_next_posts_page_link( $args['total'] );
+		$data['pages'] = Helper::paginate_links($args);
+		$next = get_next_posts_page_link($args['total']);
 
-		if ( $next ) {
-			$data['next'] = array( 'link' => untrailingslashit( $next ), 'class' => 'page-numbers next' );
+		if ($next) {
+			$data['next'] = array('link' => untrailingslashit($next), 'class' => 'page-numbers next');
 		}
 
-		$prev = previous_posts( false );
+		$prev = previous_posts(false);
 
-		if ( $prev ) {
-			$data['prev'] = array( 'link' => untrailingslashit( $prev ), 'class' => 'page-numbers prev' );
+		if ($prev) {
+			$data['prev'] = array('link' => untrailingslashit($prev), 'class' => 'page-numbers prev');
 		}
 
-		if ( $paged < 2 ) {
+		if ($paged < 2) {
 			$data['prev'] = null;
 		}
 
-		return Helper::array_to_object( $data );
+		return Helper::array_to_object($data);
 
 	}
 }