Support shared site.contentType.php controller

src/Cms/App.php

@@ -464,29 +464,26 @@ public function controller(
 		$data = [];
 
 		// always use the site controller as defaults, if available
-		if ($controller = $this->controllerLookup('site')) {
-			$data = (array)$controller->call($this, $arguments);
+		$site   = $this->controllerLookup('site', $contentType);
+		$site ??= $this->controllerLookup('site');
+
+		if ($site !== null) {
+			$data = (array)$site->call($this, $arguments);
 		}
 
 		// try to find a specific representation controller
-		if ($controller = $this->controllerLookup($name, $contentType)) {
+		$controller   = $this->controllerLookup($name, $contentType);
+		// no luck for a specific representation controller?
+		// let's try the html controller instead
+		$controller ??= $this->controllerLookup($name);
+
+		if ($controller !== null) {
 			return [
 				...$data,
 				...(array)$controller->call($this, $arguments)
 			];
 		}
 
-		if ($contentType !== 'html') {
-			// no luck for a specific representation controller?
-			// let's try the html controller instead
-			if ($controller = $this->controllerLookup($name)) {
-				return [
-					...$data,
-					...(array)$controller->call($this, $arguments)
-				];
-			}
-		}
-
 		return $data;
 	}
 

tests/Cms/App/AppTest.php

@@ -1326,8 +1326,8 @@ public function testController()
 		]);
 
 		$this->assertSame([
-			'title' => 'Site',
-			'foo'   => 'bar'
+			'site' => 'html',
+			'test' => 'html'
 		], $app->controller('test'));
 	}
 
@@ -1342,17 +1342,20 @@ public function testControllerCallback()
 				'index' => '/dev/null'
 			],
 			'controllers' => [
-				'test' => fn () => ['foo' => 'bar']
+				'test' => fn () => ['homer' => 'simpson']
 
 			]
 		]);
 
 		Page::factory([
-			'slug' => 'test',
+			'slug'     => 'test',
 			'template' => 'test'
 		]);
 
-		$this->assertSame(['foo' => 'bar'], $app->controller('test'));
+		$this->assertSame(
+			['homer' => 'simpson'],
+			$app->controller('test')
+		);
 	}
 
 	/**
@@ -1369,22 +1372,21 @@ public function testControllerRepresentation()
 		]);
 
 		Page::factory([
-			'slug' => 'test',
+			'slug'     => 'test',
 			'template' => 'another'
 		]);
 
-		ob_start();
-		$app->controller('another.json', [], 'json');
-		$response = ob_get_clean();
-
-		$this->assertSame('{"foo":"bar"}', $response);
+		$this->assertSame([
+			'site'    => 'json',
+			'another' => 'json'
+		], $app->controller('another', contentType: 'json'));
 	}
 
 	/**
 	 * @covers ::controller
 	 * @covers ::controllerLookup
 	 */
-	public function testControllerHtmlRepresentation()
+	public function testControllerHtmlForMissingRepresentation()
 	{
 		$app = new App([
 			'roots' => [
@@ -1399,16 +1401,40 @@ public function testControllerHtmlRepresentation()
 		]);
 
 		$this->assertSame([
-			'title' => 'Site',
-			'foo'   => 'bar'
-		], $app->controller('test', [], 'json'));
+			'site' => 'json',
+			'test' => 'html'
+		], $app->controller('test', contentType: 'json'));
+	}
+
+	/**
+	 * @covers ::controller
+	 * @covers ::controllerLookup
+	 */
+	public function testControllerMissing()
+	{
+		$app = new App([
+			'roots' => [
+				'index' => '/dev/null',
+				'controllers' => static::FIXTURES . '/controllers'
+			]
+		]);
+
+		Page::factory([
+			'slug'     => 'test',
+			'template' => 'none'
+		]);
+
+		$this->assertSame(
+			['site' => 'html'],
+			$app->controller('none')
+		);
 	}
 
 	/**
 	 * @covers ::controller
 	 * @covers ::controllerLookup
 	 */
-	public function testControllerFallbackRepresentation()
+	public function testControllerMissingRepresentation()
 	{
 		$app = new App([
 			'roots' => [
@@ -1422,7 +1448,10 @@ public function testControllerFallbackRepresentation()
 			'template' => 'none'
 		]);
 
-		$this->assertSame(['title' => 'Site'], $app->controller('none', [], 'json'));
+		$this->assertSame(
+			['site' => 'json'],
+			$app->controller('none', contentType: 'json')
+		);
 	}
 
 	/**

tests/Cms/App/fixtures/controllers/another.json.php

@@ -1,3 +1,5 @@
 <?php
 
-echo json_encode(['foo' => 'bar']);
+return function () {
+	return ['another' => 'json'];
+};

tests/Cms/App/fixtures/controllers/site.json.php

@@ -0,0 +1,5 @@
+<?php
+
+return function () {
+	return ['site' => 'json'];
+};

tests/Cms/App/fixtures/controllers/site.php

@@ -1,5 +1,5 @@
 <?php
 
 return function () {
-	return ['title' => 'Site'];
+	return ['site' => 'html'];
 };

tests/Cms/App/fixtures/controllers/test.php

@@ -1,5 +1,5 @@
 <?php
 
 return function () {
-	return ['foo' => 'bar'];
+	return ['test' => 'html'];
 };