Move strict_check() into HookedCallback

php/WP_Mock/Hook.php

@@ -20,37 +20,6 @@ public function __construct( $name ) {
 		$this->name = $name;
 	}
 
-	protected function callback_to_string( $callback ) {
-		if ( ! is_string( $callback ) ) {
-			if ( $callback instanceof \Closure ) {
-				$callback = 'Closure';
-			} elseif ( is_object( $callback ) ) {
-				$callback = get_class( $callback ) . '::__invoke';
-			} else {
-				$class  = $callback[0];
-				$method = $callback[1];
-				if ( ! is_string( $class ) ) {
-					$class = get_class( $class );
-				}
-				$callback = "{$class}::$method";
-			}
-		}
-
-		return $callback;
-	}
-
-	protected function strict_check( $callback ) {
-		if ( \WP_Mock::strictMode() ) {
-			throw new \PHPUnit_Framework_ExpectationFailedException(
-				sprintf(
-					'Unexpected use of add action for action %s with callback %s',
-					$this->name,
-					$this->callback_to_string( $callback )
-				)
-			);
-		}
-	}
-
 	protected function safe_offset( $value ) {
 		if ( is_null( $value ) ) {
 			return 'null';

php/WP_Mock/HookedCallback.php

@@ -32,6 +32,54 @@ protected function safe_offset( $value ) {
 		return parent::safe_offset( $value );
 	}
 
+	/**
+	 * Converts a callable to a string
+	 *
+	 * Closures get returned as 'Closure', objects (those with an __invoke() method get turned into <Class>::__invoke,
+	 * and arrays get turned into <Class>::<method>
+	 *
+	 * @param callable $callback
+	 *
+	 * @return string
+	 */
+	protected function callback_to_string( $callback ) {
+		if ( ! is_string( $callback ) ) {
+			if ( $callback instanceof \Closure ) {
+				$callback = 'Closure';
+			} elseif ( is_object( $callback ) ) {
+				$callback = get_class( $callback ) . '::__invoke';
+			} else {
+				$class  = $callback[0];
+				$method = $callback[1];
+				if ( ! is_string( $class ) ) {
+					$class = get_class( $class );
+				}
+				$callback = "{$class}::$method";
+			}
+		}
+
+		return $callback;
+	}
+
+	/**
+	 * Throw an exception if strict mode is on
+	 *
+	 * @throws \PHPUnit_Framework_ExpectationFailedException
+	 *
+	 * @param callable $callback
+	 */
+	protected function strict_check( $callback ) {
+		if ( \WP_Mock::strictMode() ) {
+			throw new \PHPUnit_Framework_ExpectationFailedException(
+				sprintf(
+					'Unexpected use of add action for action %s with callback %s',
+					$this->name,
+					$this->callback_to_string( $callback )
+				)
+			);
+		}
+	}
+
 }
 
 class HookedCallbackResponder {