Refactor handling for template parts and custom templates

WordPress · Mar 18, 2021 · 255e734 · 255e734
1 parent 3b97eff
commit 255e734
Showing 1 changed file with 22 additions and 27 deletions.
diff --git a/lib/class-wp-theme-json.php b/lib/class-wp-theme-json.php
@@ -1052,22 +1052,19 @@ public function get_settings() {
 	 * @return array
 	 */
 	public function get_custom_templates() {
+		$custom_templates = array();
 		if ( ! isset( $this->theme_json['customTemplates'] ) ) {
-			return array();
-		} else {
-			return array_reduce(
-				$this->theme_json['customTemplates'],
-				function( $accumulator, $item ) {
-					if ( isset( $item['name'] ) ) {
-						$name = $item['name'];
-						unset( $item['name'] );
-						$accumulator[ $name ] = $item;
-					}
-					return $accumulator;
-				},
-				array()
-			);
+			return $custom_templates;
+		}
+
+		foreach ( $this->theme_json['customTemplates'] as $item ) {
+			if ( isset( $item['name'] ) ) {
+				$custom_templates[ $item['name'] ] = array(
+					'title' => isset( $item['title'] ) ? $item['title'] : '',
+				);
+			}
 		}
+		return $custom_templates;
 	}
 
 	/**
@@ -1076,21 +1073,19 @@ function( $accumulator, $item ) {
 	 * @return array
 	 */
 	public function get_template_parts() {
+		$template_parts = array();
 		if ( ! isset( $this->theme_json['templateParts'] ) ) {
-			return array();
+			return $template_parts;
 		}
-		return array_reduce(
-			$this->theme_json['templateParts'],
-			function( $accumulator, $item ) {
-				if ( isset( $item['name'] ) ) {
-					$name = $item['name'];
-					unset( $item['name'] );
-					$accumulator[ $name ] = $item;
-				}
-				return $accumulator;
-			},
-			array()
-		);
+
+		foreach ( $this->theme_json['templateParts'] as $item ) {
+			if ( isset( $item['name'] ) ) {
+				$template_parts[ $item['name'] ] = array(
+					'area' => isset( $item['area'] ) ? $item['area'] : '',
+				);
+			}
+		}
+		return $template_parts;
 	}
 
 	/**