Rarst / meadow

php/class-type-template-hierarchy.php

Spacing +14 added lines, -14 removed lines

@@ -33,19 +33,19 @@ 
 
 	public function enable() {
 
-		add_filter( 'template_include', array( $this, 'template_include' ), 9 );
+		add_filter('template_include', array($this, 'template_include'), 9);
 
-		foreach ( $this->template_types as $type ) {
-			add_filter( "{$type}_template_hierarchy", array( $this, 'template_hierarchy' ) );
+		foreach ($this->template_types as $type) {
+			add_filter("{$type}_template_hierarchy", array($this, 'template_hierarchy'));
 		}
 	}
 
 	public function disable() {
 
-		remove_filter( 'template_include', array( $this, 'template_include' ), 9 );
+		remove_filter('template_include', array($this, 'template_include'), 9);
 
-		foreach ( $this->template_types as $type ) {
-			remove_filter( "{$type}_template_hierarchy", array( $this, 'template_hierarchy' ) );
+		foreach ($this->template_types as $type) {
+			remove_filter("{$type}_template_hierarchy", array($this, 'template_hierarchy'));
 		}
 	}
 
@@ -54,21 +54,21 @@ 
 	 *
 	 * @return string[] Array of templates, prepended with Twig versions.
 	 */
-	public function template_hierarchy( $templates ) {
+	public function template_hierarchy($templates) {
 
-		$this->type = substr( current_filter(), 0, - 19 ); // Trim '_template_hierarchy' from end.
+		$this->type = substr(current_filter(), 0, - 19); // Trim '_template_hierarchy' from end.
 
 		$twig_templates = [];
 
-		foreach ( $templates as $php_template ) {
+		foreach ($templates as $php_template) {
 
-			if ( '.php' === substr( $php_template, strlen( $php_template ) - 4 ) ) {
+			if ('.php' === substr($php_template, strlen($php_template) - 4)) {
 
-				$twig_templates[] = substr( $php_template, 0, - 4 ) . '.twig';
+				$twig_templates[] = substr($php_template, 0, - 4) . '.twig';
 			}
 		}
 
-		return array_merge( $twig_templates, $templates );
+		return array_merge($twig_templates, $templates);
 	}
 
 	/**
@@ -76,8 +76,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function template_include( $template ) {
+	public function template_include($template) {
 
-		return apply_filters( 'meadow_query_template', $template, $this->type );
+		return apply_filters('meadow_query_template', $template, $this->type);
 	}
 }

php/class-template-hierarchy.php

Spacing +41 added lines, -41 removed lines

@@ -34,39 +34,39 @@ 
 
 	public function enable() {
 
-		add_action( 'template_redirect', array( $this, 'template_redirect' ) );
+		add_action('template_redirect', array($this, 'template_redirect'));
 
-		foreach ( $this->template_types as $type ) {
-			add_filter( "{$type}_template", array( $this, 'query_template' ) );
+		foreach ($this->template_types as $type) {
+			add_filter("{$type}_template", array($this, 'query_template'));
 		}
 	}
 
 	public function disable() {
 
-		remove_action( 'template_redirect', array( $this, 'template_redirect' ) );
+		remove_action('template_redirect', array($this, 'template_redirect'));
 
-		foreach ( $this->template_types as $type ) {
-			remove_filter( "{$type}_template", array( $this, 'query_template' ) );
+		foreach ($this->template_types as $type) {
+			remove_filter("{$type}_template", array($this, 'query_template'));
 		}
 
-		if ( ! empty($this->mime_type) ) {
-			remove_filter( "{$this->mime_type[0]}_template", array( $this, 'query_template' ) );
-			remove_filter( "{$this->mime_type[1]}_template", array( $this, 'query_template' ) );
-			remove_filter( "{$this->mime_type[0]}{$this->mime_type[1]}_template", array( $this, 'query_template' ) );
+		if ( ! empty($this->mime_type)) {
+			remove_filter("{$this->mime_type[0]}_template", array($this, 'query_template'));
+			remove_filter("{$this->mime_type[1]}_template", array($this, 'query_template'));
+			remove_filter("{$this->mime_type[0]}{$this->mime_type[1]}_template", array($this, 'query_template'));
 		}
 	}
 
 	public function template_redirect() {
 
-		if ( is_attachment() ) {
+		if (is_attachment()) {
 			global $posts;
 
-			if ( ! empty( $posts ) && isset( $posts[0]->post_mime_type ) )
-				$this->mime_type = explode( '/', $posts[0]->post_mime_type );
+			if ( ! empty($posts) && isset($posts[0]->post_mime_type))
+				$this->mime_type = explode('/', $posts[0]->post_mime_type);
 
-			add_filter( "{$this->mime_type[0]}_template", array( $this, 'query_template' ) );
-			add_filter( "{$this->mime_type[1]}_template", array( $this, 'query_template' ) );
-			add_filter( "{$this->mime_type[0]}{$this->mime_type[1]}_template", array( $this, 'query_template' ) );
+			add_filter("{$this->mime_type[0]}_template", array($this, 'query_template'));
+			add_filter("{$this->mime_type[1]}_template", array($this, 'query_template'));
+			add_filter("{$this->mime_type[0]}{$this->mime_type[1]}_template", array($this, 'query_template'));
 		}
 	}
 
@@ -75,21 +75,21 @@ 
 	 *
 	 * @return string
 	 */
-	public function query_template( $fallback ) {
+	public function query_template($fallback) {
 
-		$type      = substr( current_filter(), 0, - 9 ); // trim '_template' from end
+		$type      = substr(current_filter(), 0, - 9); // trim '_template' from end
 		$templates = array();
 
-		switch ( $type ) {
+		switch ($type) {
 			case 'embed':
 
 				$object = get_queried_object();
 
-				if ( ! empty( $object->post_type ) ) {
+				if ( ! empty($object->post_type)) {
 
-					$post_format = get_post_format( $object );
+					$post_format = get_post_format($object);
 
-					if ( $post_format ) {
+					if ($post_format) {
 						$templates[] = "embed-{$object->post_type}-{$post_format}.twig";
 					}
 
@@ -103,7 +103,7 @@ 
 			case 'taxonomy':
 				$term = get_queried_object();
 
-				if ( $term ) {
+				if ($term) {
 					$taxonomy    = $term->taxonomy;
 					$templates[] = "taxonomy-{$taxonomy}-{$term->slug}.twig";
 					$templates[] = "taxonomy-{$taxonomy}.twig";
@@ -113,17 +113,17 @@ 
 				break;
 
 			case 'frontpage':
-				$templates = array( 'front-page.twig' );
+				$templates = array('front-page.twig');
 				break;
 
 			case 'home':
-				$templates = array( 'home.twig', 'index.twig' );
+				$templates = array('home.twig', 'index.twig');
 				break;
 
 			case 'single':
 				$object = get_queried_object();
 
-				if ( $object )
+				if ($object)
 					$templates[] = "single-{$object->post_type}.twig";
 
 				$templates[] = 'single.twig';
@@ -132,9 +132,9 @@ 
 			case 'page':
 				$page_id  = get_queried_object_id();
 //				$template = get_page_template_slug();
-				$pagename = get_query_var( 'pagename' );
+				$pagename = get_query_var('pagename');
 
-				if ( ! $pagename && $page_id ) {
+				if ( ! $pagename && $page_id) {
 					// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
 					$post     = get_queried_object();
 					$pagename = $post->post_name;
@@ -144,10 +144,10 @@ 
 //				if ( $template && 0 === validate_file( $template ) )
 //					$templates[] = $template;
 
-				if ( $pagename )
+				if ($pagename)
 					$templates[] = "page-{$pagename}.twig";
 
-				if ( $page_id )
+				if ($page_id)
 					$templates[] = "page-{$page_id}.twig";
 
 				$templates[] = 'page.twig';
@@ -157,7 +157,7 @@ 
 			case 'tag':
 				$term = get_queried_object();
 
-				if ( $term ) {
+				if ($term) {
 					$templates[] = "{$type}-{$term->slug}.twig";
 					$templates[] = "{$type}-{$term->term_id}.twig";
 				}
@@ -168,7 +168,7 @@ 
 			case 'author':
 				$author = get_queried_object();
 
-				if ( $author ) {
+				if ($author) {
 					$templates[] = "author-{$author->user_nicename}.twig";
 					$templates[] = "author-{$author->ID}.twig";
 				}
@@ -177,10 +177,10 @@ 
 				break;
 
 			case 'archive':
-				$post_types = array_filter( (array) get_query_var( 'post_type' ) );
+				$post_types = array_filter((array) get_query_var('post_type'));
 
-				if ( count( $post_types ) == 1 ) {
-					$post_type   = reset( $post_types );
+				if (count($post_types) == 1) {
+					$post_type   = reset($post_types);
 					$templates[] = "archive-{$post_type}.twig";
 				}
 
@@ -188,16 +188,16 @@ 
 				break;
 
 			default:
-				$templates = array( "{$type}.twig" );
+				$templates = array("{$type}.twig");
 		}
 
-		$template = $this->locate_template( $templates );
+		$template = $this->locate_template($templates);
 
-		if ( empty( $template ) ) {
+		if (empty($template)) {
 			$template = $fallback;
 		}
 
-		return apply_filters( 'meadow_query_template', $template, $type );
+		return apply_filters('meadow_query_template', $template, $type);
 	}
 
 	/**
@@ -207,8 +207,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function locate_template( $templates ) {
+	public function locate_template($templates) {
 
-		return locate_template( $templates );
+		return locate_template($templates);
 	}
 }

php/class-core.php

Spacing +40 added lines, -40 removed lines

@@ -11,14 +11,14 @@ 
 	/**
 	 * @param array $values
 	 */
-	public function __construct( $values = array() ) {
+	public function __construct($values = array()) {
 
 		global $wp_version;
 
 		$defaults['twig.options']     = array();
 		$defaults['twig.directories'] = array();
 
-		$defaults['twig.loader'] = function ( $meadow ) {
+		$defaults['twig.loader'] = function($meadow) {
 
 			// this needs to be lazy or theme switchers and alike explode it
 
@@ -27,12 +27,12 @@ 
 			$calculated_dirs = array(
 				$stylesheet_dir,
 				$template_dir,
-				plugin_dir_path( __DIR__ ) . 'twig',
+				plugin_dir_path(__DIR__) . 'twig',
 			);
 
 			// enables explicit inheritance from parent theme in child
-			if ( $stylesheet_dir !== $template_dir ) {
-				$calculated_dirs[] = dirname( $template_dir );
+			if ($stylesheet_dir !== $template_dir) {
+				$calculated_dirs[] = dirname($template_dir);
 			}
 
 			$directories = array_unique(
@@ -42,44 +42,44 @@ 
 				)
 			);
 
-			return new \Twig_Loader_Filesystem( $directories );
+			return new \Twig_Loader_Filesystem($directories);
 		};
 
-		$defaults['twig.undefined_function'] = array( __CLASS__, 'undefined_function' );
-		$defaults['twig.undefined_filter']   = array( __CLASS__, 'undefined_filter' );
+		$defaults['twig.undefined_function'] = array(__CLASS__, 'undefined_function');
+		$defaults['twig.undefined_filter']   = array(__CLASS__, 'undefined_filter');
 
-		$defaults['twig.environment'] = function ( $meadow ) {
-			$environment      = new \Twig_Environment( $meadow['twig.loader'], $meadow['twig.options'] );
+		$defaults['twig.environment'] = function($meadow) {
+			$environment      = new \Twig_Environment($meadow['twig.loader'], $meadow['twig.options']);
 			$meadow_extension = new Extension();
-			$environment->addExtension( $meadow_extension );
-			$environment->registerUndefinedFunctionCallback( $meadow['twig.undefined_function'] );
-			$environment->registerUndefinedFilterCallback( $meadow['twig.undefined_filter'] );
+			$environment->addExtension($meadow_extension);
+			$environment->registerUndefinedFunctionCallback($meadow['twig.undefined_function']);
+			$environment->registerUndefinedFilterCallback($meadow['twig.undefined_filter']);
 
-			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+			if (defined('WP_DEBUG') && WP_DEBUG) {
 				$debug_extension = new \Twig_Extension_Debug();
-				$environment->addExtension( $debug_extension );
+				$environment->addExtension($debug_extension);
 				$environment->enableDebug();
 			}
 
 			return $environment;
 		};
 
-		if ( version_compare( rtrim( $wp_version, '-src' ), '4.7', '>=' ) ) {
+		if (version_compare(rtrim($wp_version, '-src'), '4.7', '>=')) {
 
-			$defaults['hierarchy'] = function () {
+			$defaults['hierarchy'] = function() {
 				return new Type_Template_Hierarchy();
 			};
 		} else {
 
-			trigger_error( 'Pre–WP 4.7 implementation of Meadow hierarchy is deprecated and will be removed in 1.0.', E_USER_DEPRECATED );
+			trigger_error('Pre–WP 4.7 implementation of Meadow hierarchy is deprecated and will be removed in 1.0.', E_USER_DEPRECATED);
 
-			$defaults['hierarchy'] = function () {
+			$defaults['hierarchy'] = function() {
 				return new Template_Hierarchy();
 			};
 		}
 
 
-		parent::__construct( array_merge( $defaults, $values ) );
+		parent::__construct(array_merge($defaults, $values));
 	}
 
 	/**
@@ -89,20 +89,20 @@ 
 	 *
 	 * @return bool|\Twig_SimpleFunction
 	 */
-	static function undefined_function( $function_name ) {
+	static function undefined_function($function_name) {
 
-		if ( function_exists( $function_name ) ) {
+		if (function_exists($function_name)) {
 			return new \Twig_SimpleFunction(
 				$function_name,
-				function () use ( $function_name ) {
+				function() use ($function_name) {
 
 					ob_start();
-					$return = call_user_func_array( $function_name, func_get_args() );
+					$return = call_user_func_array($function_name, func_get_args());
 					$echo   = ob_get_clean();
 
-					return empty( $echo ) ? $return : $echo;
+					return empty($echo) ? $return : $echo;
 				},
-				array( 'is_safe' => array( 'all' ) )
+				array('is_safe' => array('all'))
 			);
 		}
 
@@ -116,15 +116,15 @@ 
 	 *
 	 * @return bool|\Twig_SimpleFilter
 	 */
-	static function undefined_filter( $filter_name ) {
+	static function undefined_filter($filter_name) {
 
 		return new \Twig_SimpleFilter(
 			$filter_name,
-			function () use ( $filter_name ) {
+			function() use ($filter_name) {
 
-				return apply_filters( $filter_name, func_get_arg( 0 ) );
+				return apply_filters($filter_name, func_get_arg(0));
 			},
-			array( 'is_safe' => array( 'all' ) )
+			array('is_safe' => array('all'))
 		);
 	}
 
@@ -133,8 +133,8 @@ 
 		/** @var Template_Hierarchy $hierarchy */
 		$hierarchy = $this['hierarchy'];
 		$hierarchy->enable();
-		add_filter( 'template_include', array( $this, 'template_include' ) );
-		add_filter( 'get_search_form', array( $this, 'get_search_form' ), 9 );
+		add_filter('template_include', array($this, 'template_include'));
+		add_filter('get_search_form', array($this, 'get_search_form'), 9);
 	}
 
 	public function disable() {
@@ -142,8 +142,8 @@ 
 		/** @var Template_Hierarchy $hierarchy */
 		$hierarchy = $this['hierarchy'];
 		$hierarchy->disable();
-		remove_filter( 'template_include', array( $this, 'template_include' ) );
-		remove_filter( 'get_search_form', array( $this, 'get_search_form' ), 9 );
+		remove_filter('template_include', array($this, 'template_include'));
+		remove_filter('get_search_form', array($this, 'get_search_form'), 9);
 	}
 
 	/**
@@ -151,13 +151,13 @@ 
 	 *
 	 * @return string|bool
 	 */
-	public function template_include( $template ) {
+	public function template_include($template) {
 
-		if ( '.twig' === substr( $template, - 5 ) ) {
+		if ('.twig' === substr($template, - 5)) {
 			/** @var \Twig_Environment $twig */
 			$twig = $this['twig.environment'];
 
-			echo $twig->render( basename( $template ), apply_filters( 'meadow_context', array() ) );
+			echo $twig->render(basename($template), apply_filters('meadow_context', array()));
 
 			return false;
 		}
@@ -170,14 +170,14 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_search_form( $form ) {
+	public function get_search_form($form) {
 
 		// because first time it's action
-		if ( ! empty( $form ) ) {
+		if ( ! empty($form)) {
 			/** @var \Twig_Environment $twig */
 			$twig = $this['twig.environment'];
 
-			return $twig->render( 'searchform.twig', array() );
+			return $twig->render('searchform.twig', array());
 		}
 
 		return $form;