Merge pull request #62 from Yoast/JRF/duplicate-code-maintainability

InvalidOperatorType Exception: improve documentation, duplicate code and unit test

src/Whip_VersionRequirement.php

@@ -140,8 +140,9 @@ private function validateParameters( $component, $version, $operator ) {
 			throw new Whip_InvalidType( 'Operator', $operator, 'string' );
 		}
 
-		if ( ! in_array( $operator, array( '=', '==', '===', '<', '>', '<=', '>=' ), true ) ) {
-			throw new Whip_InvalidOperatorType( $operator );
+		$validOperators = array( '=', '==', '===', '<', '>', '<=', '>=' );
+		if ( ! in_array( $operator, $validOperators, true ) ) {
+			throw new Whip_InvalidOperatorType( $operator, $validOperators );
 		}
 	}
 }

src/exceptions/Whip_InvalidOperatorType.php

@@ -10,24 +10,18 @@
  */
 class Whip_InvalidOperatorType extends Exception {
 
-	/**
-	 * Valid comparison operators as strings.
-	 *
-	 * @var array
-	 */
-	private $validOperators = array( '=', '==', '===', '<', '>', '<=', '>=' );
-
 	/**
 	 * InvalidOperatorType constructor.
 	 *
-	 * @param string $value Invalid operator.
+	 * @param string $value          Invalid operator.
+	 * @param array  $validOperators Valid operators.
 	 */
-	public function __construct( $value ) {
+	public function __construct( $value, $validOperators = array( '=', '==', '===', '<', '>', '<=', '>=' ) ) {
 		parent::__construct(
 			sprintf(
 				'Invalid operator of %s used. Please use one of the following operators: %s',
 				$value,
-				implode( ', ', $this->validOperators )
+				implode( ', ', $validOperators )
 			)
 		);
 	}

tests/VersionRequirementTest.php

@@ -67,6 +67,7 @@ public function testOperatorMustBeString() {
 
 	/**
 	 * @expectedException Whip_InvalidOperatorType
+	 * @expectedExceptionMessage Invalid operator of -> used. Please use one of the following operators: =, ==, ===, <, >, <=, >=
 	 */
 	public function testOperatorMustBeValid() {
 		new Whip_VersionRequirement( 'php', '5.2', '->' );