Harden empty oEmbed provider configuration

Author: dereuromark

src/Provider/ProviderConfig.php

@@ -89,6 +89,8 @@ public static function fromArray(array $data): self {
 		if (($iframePlayer === null || $iframePlayer === '') && ($oEmbed === null || $oEmbed === '')) {
 			throw ProviderConfigException::missingField('iframe-player or oembed', $data);
 		}
+		$iframePlayer = $iframePlayer === '' ? null : $iframePlayer;
+		$oEmbed = $oEmbed === '' ? null : $oEmbed;
 		if ($iframePlayer !== null && !is_string($iframePlayer)) {
 			throw ProviderConfigException::invalidField('iframe-player', $data['iframe-player'], 'string', $data);
 		}
@@ -187,10 +189,10 @@ public function toArray(): array {
 		if ($this->slug !== null) {
 			$array['slug'] = $this->slug;
 		}
-		if ($this->iframePlayer !== null) {
+		if ($this->hasIframeSupport()) {
 			$array['iframe-player'] = $this->iframePlayer;
 		}
-		if ($this->oEmbed !== null) {
+		if ($this->hasOEmbedSupport()) {
 			$array['oembed'] = $this->oEmbed;
 		}
 		if ($this->imageSrc !== null) {
@@ -234,7 +236,7 @@ public function getUrlMatchPatterns(): array {
 	 * @return bool
 	 */
 	public function hasIframeSupport(): bool {
-		return $this->iframePlayer !== null;
+		return $this->iframePlayer !== null && $this->iframePlayer !== '';
 	}
 
 	/**
@@ -243,7 +245,7 @@ public function hasIframeSupport(): bool {
 	 * @return bool
 	 */
 	public function hasOEmbedSupport(): bool {
-		return $this->oEmbed !== null;
+		return $this->oEmbed !== null && $this->oEmbed !== '';
 	}
 
 	/**

tests/MediaEmbedTest.php

@@ -604,6 +604,16 @@ public function testOEmbedHtmlSupportsCustomOEmbedOnlyProvider(): void {
 		$this->assertSame($html, $MediaEmbed->oEmbedHtml($Object));
 	}
 
+	public function testOEmbedHtmlReturnsNullWithoutHtml(): void {
+		$httpClient = $this->createStub(HttpClientInterface::class);
+		$httpClient->method('get')->willReturn('{"type":"link","version":"1.0"}');
+		$MediaEmbed = new MediaEmbed(httpClient: $httpClient);
+		$Object = $MediaEmbed->parseUrl('https://vimeo.com/99585787');
+		$this->assertInstanceOf(MediaObject::class, $Object);
+
+		$this->assertNull($MediaEmbed->oEmbedHtml($Object));
+	}
+
 	public function testOEmbedReturnsNullWithoutRegisteredEndpoint(): void {
 		$MediaEmbed = new MediaEmbed();
 		$Object = $MediaEmbed->parseUrl('https://my.matterport.com/show/?m=Zh14WDtkjdC');

tests/Provider/ProviderConfigTest.php

@@ -146,6 +146,35 @@ public function testFromArrayAllowsOEmbedOnlyProvider(): void {
 		$this->assertSame('https://rich.example.com/oembed', $config->toArray()['oembed']);
 	}
 
+	public function testFromArrayNormalizesUnusedEmptyRendererToNull(): void {
+		$config = ProviderConfig::fromArray([
+			'name' => 'IframeProvider',
+			'website' => 'https://iframe.example.com',
+			'url-match' => 'iframe\\.example\\.com/([0-9]+)',
+			'embed-width' => 640,
+			'embed-height' => 360,
+			'iframe-player' => 'https://iframe.example.com/embed/$2',
+			'oembed' => '',
+		]);
+
+		$this->assertNull($config->oEmbed);
+		$this->assertArrayNotHasKey('oembed', $config->toArray());
+	}
+
+	public function testFromArrayRejectsNonStringOEmbedEndpoint(): void {
+		$this->expectException(ProviderConfigException::class);
+		$this->expectExceptionMessage('Provider configuration field "oembed" has invalid value. Expected string.');
+
+		ProviderConfig::fromArray([
+			'name' => 'InvalidProvider',
+			'website' => 'https://invalid.example.com',
+			'url-match' => 'invalid\\.example\\.com/([0-9]+)',
+			'embed-width' => 640,
+			'embed-height' => 360,
+			'oembed' => [],
+		]);
+	}
+
 	public function testFromArrayPreservesExtraProviderMetadata(): void {
 		$data = [
 			'name' => 'ExtraProvider',
@@ -347,6 +376,20 @@ public function testHasOEmbedSupport(): void {
 		);
 
 		$this->assertTrue($config->hasOEmbedSupport());
+
+		$empty = new ProviderConfig(
+			name: 'Empty',
+			website: 'https://empty.example.com',
+			urlMatch: 'pattern',
+			embedWidth: 640,
+			embedHeight: 360,
+			iframePlayer: '',
+			oEmbed: '',
+		);
+		$this->assertFalse($empty->hasIframeSupport());
+		$this->assertFalse($empty->hasOEmbedSupport());
+		$this->assertArrayNotHasKey('iframe-player', $empty->toArray());
+		$this->assertArrayNotHasKey('oembed', $empty->toArray());
 	}
 
 	public function testHasThumbnailSupport(): void {