Refactoring of the Cleaner API

src/Exceptions/CallableNotResolvableException.php

@@ -0,0 +1,11 @@
+<?php
+declare(strict_types=1);
+
+namespace ItalyStrap\Cleaner\Exceptions;
+
+use InvalidArgumentException;
+
+class CallableNotResolvableException extends InvalidArgumentException
+{
+
+}

src/Exceptions/IncorrectRuleTypeException.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ItalyStrap\Cleaner\Exceptions;
+
+use InvalidArgumentException;
+
+class IncorrectRuleTypeException extends InvalidArgumentException
+{
+
+}

src/Exceptions/NoRuleWasProvidedException.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ItalyStrap\Cleaner\Exceptions;
+
+use InvalidArgumentException;
+
+class NoRuleWasProvidedException extends InvalidArgumentException
+{
+
+}

src/Rules_Trait.php

@@ -40,7 +40,7 @@ public function addRules( $rules ): self {
 		}
 
 		if ( ! \is_array( $rules ) ) {
-			throw new \InvalidArgumentException( 'Incorrect $rules type, only strings and arrays are accepted', 0 );
+			throw new Exceptions\IncorrectRuleTypeException( 'Incorrect $rules type, only strings and arrays are accepted', 0 );
 		}
 
 		$this->rules = \array_merge( $this->rules, $rules );

src/Sanitization.php

@@ -27,7 +27,7 @@ class Sanitization implements Sanitizable_Interface {
 	public function sanitize( $data = '' ) {
 
 		if ( ! $this->count() ) {
-			throw new \RuntimeException( 'No rule was provided, use ::addRules( $rules )', 0 );
+			throw new Exceptions\NoRuleWasProvidedException( 'No rule was provided, use ::addRules( $rules )', 0 );
 		}
 
 		foreach ( $this->getRules() as $rule ) {
@@ -72,7 +72,7 @@ public function sanitize( $data = '' ) {
 	private function do_filter( $rule, $data ) {
 
 		if ( ! \is_callable( $rule ) ) {
-			throw new \InvalidArgumentException( 'Could not resolve a callable', 0 );
+			throw new Exceptions\CallableNotResolvableException( 'Could not resolve a callable', 0 );
 		}
 
 		return \call_user_func( $rule, $data );

src/Validation.php

@@ -20,6 +20,8 @@ class Validation implements Validable_Interface {
 	/**
 	 * Validate the give value
 	 *
+	 * @todo Build a message error in case validation fail in ajax requests
+	 *
 	 * @todo Aggiungere rule required
 	 *       Prendere spunto da questo articolo
 	 *       https://tommcfarlin.com/validation-and-sanitization-wordpress-settings-api
@@ -36,7 +38,7 @@ class Validation implements Validable_Interface {
 	public function validate( $data = '' ): bool {
 
 		if ( ! $this->count() ) {
-			throw new \RuntimeException( 'No rule was provided, use ::addRules( $rules )', 0 );
+			throw new Exceptions\NoRuleWasProvidedException( 'No rule was provided, use ::addRules( $rules )', 0 );
 		}
 
 		foreach ( $this->getRules() as $rule ) {

tests/unit/SanitizationTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use ItalyStrap\Cleaner\IncorrectRuleTypeException;
 use ItalyStrap\Cleaner\Sanitization;
 
 class SanitizationTest extends \Codeception\Test\Unit
@@ -22,27 +23,26 @@ public function testThrownRuntimeExceptionIfNoRulesAreProvided()
     {
 		$sut = new Sanitization();
 
-		$this->expectException( '\RuntimeException' );
+		$this->expectException( '\ItalyStrap\Cleaner\Exceptions\NoRuleWasProvidedException' );
 		$sut->sanitize( 'Value' );
     }
 
-    // tests
-    public function testThrownInvalidArgumentExceptionIfCallbackIsNotExiting()
+	// tests
+    public function testThrownInvalidArgumentExceptionIfIncorrectRuleType()
     {
 		$sut = new Sanitization();
-		$this->expectException( '\InvalidArgumentException' );
+		$this->expectException( '\ItalyStrap\Cleaner\Exceptions\IncorrectRuleTypeException' );
 
-		$sut->addRules('callbackNotExisting');
-		$sut->sanitize( 'Value' );
+		$sut->addRules( 1 );
     }
 
     // tests
-    public function testThrownInvalidArgumentExceptionIfCouldNotResolveCallable()
+    public function testThrownInvalidArgumentExceptionIfCallbackIsNotExiting()
     {
 		$sut = new Sanitization();
-		$this->expectException( '\InvalidArgumentException' );
+		$this->expectException( '\ItalyStrap\Cleaner\Exceptions\CallableNotResolvableException' );
 
-		$sut->addRules( 1 );
+		$sut->addRules('callbackNotExisting');
 		$sut->sanitize( 'Value' );
     }