Normalize hook names

- Find hooks in a case insensitive way
- If hook is unrecognized, at least capitalize it,
  remove spaces and remove invalid characters.

includes/Hooks.php

@@ -6,13 +6,22 @@
  * Read hook data and parse it for processing twig templates
  */
 class Hooks {
+	protected $data;
+	protected $templating;
+	protected $lookupMap = [];
+
 	public function __construct( $templating = null ) {
 		$filename = dirname( __DIR__ ) . '/templates/_hooks/data/hooks.json';
 		$this->data = json_decode( file_get_contents( $filename ), true );
 		$this->templating = $templating;
 		if ( !$this->templating ) {
 			$this->templating = new Templating();
 		}
+
+		// Create a search map (lowercase => proper case) for searches
+		foreach ( array_keys( $this->data ) as $hookName ) {
+			$this->lookupMap[ strtolower( $hookName ) ] = $hookName;
+		}
 	}
 
 	public function getHookNames() {
@@ -35,7 +44,7 @@ public function getHooksMethods( $hookNames = [] ) {
 	}
 
 	public function getHookContent( $hookName ) {
- 		$hookName = ucfirst( $hookName );
+		$hookName = $this->normalizeHookName( $hookName );
 		$data = $this->getHookData( $hookName );
 		if ( !$data ) {
 			$data = [
@@ -106,12 +115,33 @@ public static function createFunctionNameFromHookName( $hookName ) {
 		return 'on' . $className;
 	}
 
-	public function getHookData( $hookName = null ) {
+	public function getHookData( $hookName = '' ) {
+		$hookName = $this->normalizeHookName( $hookName );
+
 		$data = null;
 		if ( $hookName !== null ) {
 			$data = Generator::getObjectProp( $this->data, [ $hookName ] );
 		}
 
 		return $data;
 	}
+
+	/**
+	 * Normalize the given hook name:
+	 * - If the name is found in the system, normalize it
+	 * to use the proper capitalization.
+	 * - If it is not found, return it as-is
+	 *
+	 * @param string $hookName Given hook name
+	 * @return string Normalized hook name
+	 */
+	public function normalizeHookName( $hookName = '' ) {
+		$foundHookName = Generator::getObjectProp( $this->lookupMap, [ strtolower( $hookName ) ] );
+
+		if ( !$foundHookName ) {
+			$hookName = ucfirst( preg_replace( '/[^A-Za-z0-9\-]/', '', $hookName ) );
+		}
+		// Unrecognized hooks should at least be capitalized
+		return $foundHookName ? $foundHookName : ucfirst( $hookName );
+	}
 }

tests/HooksTest.php

@@ -75,4 +75,23 @@ public function testGetHookContent() {
 			);
 		}
 	}
+	public function testNormalizeHookName() {
+		$cases = [
+			'articledelete' => 'ArticleDelete',
+			'adDNeWaCcOuNt' => 'AddNewAccount',
+			'editpage::importformdata' => 'EditPage::importFormData',
+			'fooBarBaz' => 'FooBarBaz', // Not found; capitalize
+			'f%oo B*&a%rB!a|z123  ' => 'FooBarBaz123', // Not found; clean up and capitalize
+		];
+
+		$hooks = new Hooks();
+		foreach ( $cases as $lookup => $expected ) {
+			$this->assertEquals(
+				$expected,
+				$hooks->normalizeHookName( $lookup ),
+				"Normalizing: $lookup => $expected"
+			);
+		}
+
+	}
 }