Merge pull request #13 from alleyinteractive/fix/inner-validators

Reduce use of inner validators

Author: dlh01

CHANGELOG.md

@@ -6,6 +6,12 @@ This library adheres to [Semantic Versioning](https://semver.org/) and [Keep a C
 
 Nothing yet.
 
+## 3.1.0
+
+### Changed
+
+* Reduce uses of validators within validators.
+
 ## 3.0.0
 
 ### Changed

src/alley/wp/validator/class-block-name.php

@@ -16,6 +16,7 @@
 use Laminas\Validator\InArray;
 use Laminas\Validator\ValidatorInterface;
 use Traversable;
+use WP_Block;
 use WP_Block_Parser_Block;
 
 /**
@@ -74,20 +75,6 @@ final class Block_Name extends Block_Validator {
 	 */
 	protected ?string $current_block_name = '';
 
-	/**
-	 * Validates the input block name based on how many names are valid.
-	 *
-	 * @var ValidatorInterface
-	 */
-	private ValidatorInterface $current_validator;
-
-	/**
-	 * Message template to use based on how many names are valid.
-	 *
-	 * @var string
-	 */
-	private string $current_message;
-
 	/**
 	 * Set up.
 	 *
@@ -107,14 +94,6 @@ public function __construct( $options = null ) {
 			'%block_name%',
 		);
 
-		$this->current_validator = new Comparison(
-			[
-				'operator' => '===',
-				'compared' => $this->options['name'],
-			]
-		);
-		$this->current_message   = self::NOT_NAMED;
-
 		parent::__construct( $options );
 	}
 
@@ -124,8 +103,16 @@ public function __construct( $options = null ) {
 	 * @param WP_Block_Parser_Block $block The block to test.
 	 */
 	protected function test_block( WP_Block_Parser_Block $block ): void {
-		if ( ! $this->current_validator->isValid( $block->blockName ) ) {
-			$this->error( $this->current_message );
+		$allowed = $this->options['name'];
+		$message = self::NAME_NOT_IN;
+
+		if ( ! \is_array( $allowed ) ) {
+			$allowed = [ $allowed ];
+			$message = self::NOT_NAMED;
+		}
+
+		if ( ! \in_array( $block->blockName, $allowed, true ) ) {
+			$this->error( $message );
 		}
 	}
 
@@ -147,13 +134,5 @@ protected function setValue( $value ) {
 	 */
 	protected function setName( $name ) {
 		$this->options['name'] = $name;
-
-		$this->current_validator = new InArray(
-			[
-				'haystack' => \is_array( $this->options['name'] ) ? $this->options['name'] : [ $this->options['name'] ],
-				'strict'   => InArray::COMPARE_STRICT,
-			]
-		);
-		$this->current_message   = \is_array( $this->options['name'] ) && \count( $this->options['name'] ) > 1 ? self::NAME_NOT_IN : self::NOT_NAMED;
 	}
 }

src/alley/wp/validator/class-block-offset.php

@@ -69,20 +69,6 @@ final class Block_Offset extends Block_Validator {
 	 */
 	private array $final_blocks = [];
 
-	/**
-	 * Validates whether blocks are empty.
-	 *
-	 * @var ValidatorInterface
-	 */
-	private ValidatorInterface $nonempty_validator;
-
-	/**
-	 * Validates whether blocks are iterable.
-	 *
-	 * @var ValidatorInterface
-	 */
-	private ValidatorInterface $iterable_validator;
-
 	/**
 	 * Set up.
 	 *
@@ -95,13 +81,6 @@ public function __construct( $options = null ) {
 			'%offset%'
 		);
 
-		$this->nonempty_validator = new Nonempty_Block();
-		$this->iterable_validator = new Type(
-			[
-				'type' => 'iterable',
-			],
-		);
-
 		parent::__construct( $options );
 	}
 
@@ -117,7 +96,7 @@ public function setOptions( $options = [] ) {
 		$this->final_blocks = $this->options['blocks'];
 
 		if ( $this->options['skip_empty_blocks'] ) {
-			$this->final_blocks = array_filter( $this->final_blocks, [ $this->nonempty_validator, 'isValid' ] );
+			$this->final_blocks = array_filter( $this->final_blocks, [ new Nonempty_Block(), 'isValid' ] );
 		}
 
 		return $this;
@@ -157,10 +136,8 @@ protected function test_block( WP_Block_Parser_Block $block ): void {
 	 * @param array[]|WP_Block[]|WP_Block_Parser_Block[] $blocks Blocks.
 	 */
 	protected function setBlocks( $blocks ) {
-		$valid = $this->iterable_validator->isValid( $blocks );
-
-		if ( ! $valid ) {
-			throw new InvalidArgumentException( $this->iterable_validator->getMessages()[0] );
+		if ( ! is_iterable( $blocks ) ) {
+			throw new InvalidArgumentException( 'Blocks must be iterable.' );
 		}
 
 		if ( ! $blocks instanceof \Traversable ) {

src/alley/wp/validator/class-nonempty-block.php

@@ -38,13 +38,6 @@ final class Nonempty_Block extends Block_Validator {
 		self::EMPTY_BLOCK => '',
 	];
 
-	/**
-	 * Validates the input block.
-	 *
-	 * @var ValidatorInterface
-	 */
-	private ValidatorInterface $nonempty_tests;
-
 	/**
 	 * Set up.
 	 *
@@ -53,25 +46,6 @@ final class Nonempty_Block extends Block_Validator {
 	public function __construct( $options = null ) {
 		$this->messageTemplates[ self::EMPTY_BLOCK ] = __( 'Block is empty.', 'alley' );
 
-		$this->nonempty_tests = new AnyValidator(
-			[
-				new Not(
-					new Block_Name(
-						[
-							'name' => null,
-						],
-					),
-					__( 'Block name is null.', 'alley' ),
-				),
-				new Block_InnerHTML(
-					[
-						'operator' => 'REGEX',
-						'content'  => '#\S#',
-					],
-				),
-			],
-		);
-
 		parent::__construct( $options );
 	}
 
@@ -81,7 +55,7 @@ public function __construct( $options = null ) {
 	 * @param WP_Block_Parser_Block $block The block to test.
 	 */
 	protected function test_block( WP_Block_Parser_Block $block ): void {
-		if ( ! $this->nonempty_tests->isValid( $block ) ) {
+		if ( null === $block->blockName && preg_match( '#\S#', $block->innerHTML ) === 0 ) {
 			$this->error( self::EMPTY_BLOCK );
 		}
 	}