Merge pull request #47 from alleyinteractive/hotfix/illuminte

Remove optional() from the plugin

Author: srtfisher

CHANGELOG.md

@@ -4,9 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v1.2.1
+
+- Fix `optional()` references previously supplied by `illuminate/support`.
+
 ## v1.2.0
 
-Dependency update, deprecation notice.
+- Remove illuminate/support dependency.
+- Dependency update, deprecation notice.
 
 ## v1.1.1
 

inc/blocks/core/class-audio.php

@@ -29,7 +29,7 @@ public function render(): void {
 		}
 
 		// Attributes from the audio element for loop/controls/autoplay/etc.
-		foreach ( optional( $audio )->getAttributes() ?? [] as $attr => $value ) {
+		foreach ( $audio?->getAttributes() ?? [] as $attr => $value ) {
 			$this->attrs[ $attr ] = $value ?? true;
 		}
 

inc/blocks/core/class-button.php

@@ -27,7 +27,7 @@ public function render(): void {
 			$this->attrs[ $attr ] = $value;
 		}
 
-		foreach ( optional( $link )->getAttributes() ?? [] as $attr => $value ) {
+		foreach ( $link?->getAttributes() ?? [] as $attr => $value ) {
 			$this->attrs['linkAttributes'][ $attr ] = $value;
 		}
 
@@ -36,7 +36,7 @@ public function render(): void {
 		$this->attrs['link'] = $this->attrs['linkAttributes']['href'] ?? '';
 		unset( $this->attrs['linkAttributes']['href'] );
 
-		$this->attrs['content'] = optional( $link )->innerHtml() ?? '';
+		$this->attrs['content'] = $link?->innerHtml() ?? '';
 
 		$this->render_component( $this->attrs );
 	}

inc/blocks/core/class-gallery.php

@@ -27,7 +27,7 @@ public function render(): void {
 		}
 
 		$this->attrs['items']   = $this->attrs['ids'];
-		$this->attrs['caption'] = optional( $root->find( '.blocks-gallery-caption', 0 ) )->innerHtml() ?? '';
+		$this->attrs['caption'] = $root->find( '.blocks-gallery-caption', 0 )?->innerHtml() ?? '';
 
 		$this->render_component( $this->attrs );
 	}

inc/blocks/core/class-image.php

@@ -43,7 +43,7 @@ public function render(): void {
 	 * @return string
 	 */
 	private function get_link( string $fallback = '' ): string {
-		$maybe_url = optional( $this->dom_parser->find( 'a', 0 ) )->getAttribute( 'href' );
+		$maybe_url = $this->dom_parser->find( 'a', 0 )?->getAttribute( 'href' );
 		return $maybe_url ?? $fallback;
 	}
 
@@ -53,7 +53,7 @@ private function get_link( string $fallback = '' ): string {
 	 * @return string
 	 */
 	private function get_caption(): string {
-		$caption = optional( $this->dom_parser->find( 'figcaption', 0 ) )->innerHtml() ?? '';
+		$caption = $this->dom_parser->find( 'figcaption', 0 )?->innerHtml() ?? '';
 		return $caption;
 	}
 }

inc/blocks/core/class-quote.php

@@ -26,8 +26,8 @@ public function render(): void {
 			$this->attrs[ $attr ] = $value;
 		}
 
-		$this->attrs['citation'] = optional( $root->find( 'cite', 0 ) )->innerHtml() ?? '';
-		$this->attrs['content']  = optional( $root->find( 'p', 0 ) )->innerHtml() ?? '';
+		$this->attrs['citation'] = $root->find( 'cite', 0 )?->innerHtml() ?? '';
+		$this->attrs['content']  = $root->find( 'p', 0 )?->innerHtml() ?? '';
 
 		$this->render_component( $this->attrs );
 	}

inc/blocks/core/class-table.php

@@ -31,7 +31,7 @@ public function render(): void {
 		$this->attrs['header']   = $this->extract_header();
 		$this->attrs['footer']   = $this->extract_footer();
 		$this->attrs['body']     = $this->extract_body();
-		$this->attrs['citation'] = optional( $this->root->find( 'figcaption', 0 ) )->innerHtml() ?? '';
+		$this->attrs['citation'] = $this->root->find( 'figcaption', 0 )?->innerHtml() ?? '';
 
 		$this->render_component( $this->attrs );
 	}

inc/blocks/core/class-video.php

@@ -29,7 +29,7 @@ public function render(): void {
 		}
 
 		// Attributes from the Video element for loop/controls/autoplay/etc.
-		foreach ( optional( $video )->getAttributes() ?? [] as $attr => $value ) {
+		foreach ( $video?->getAttributes() ?? [] as $attr => $value ) {
 			$this->attrs[ $attr ] = $value ?? true;
 		}
 

wp-component-library.php

@@ -11,7 +11,7 @@
  * Plugin Name: WP Component Library
  * Plugin URI: https://github.com/alleyinteractive/wp-component-library
  * Description: Component library functionality for your WordPress theme.
- * Version: 1.1.0
+ * Version: 1.2.1
  * Author: Alley
  */