Merge pull request #39 from WordPress/fix/correct-namespace-check-for…

…-hooks Correctly enable dashes in regexes in validateNamespace
WordPress · Sep 29, 2017 · 74212b9 · 74212b9
2 parents cc83cde + 3b19868
commit 74212b9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/packages/hooks/src/test/index.test.js b/packages/hooks/src/test/index.test.js
@@ -150,6 +150,11 @@ test( 'cannot add filters with namespaces missing a functionDescription', () =>
 	);
 } );
 
+test( 'Can add filters with dashes in namespaces', () => {
+	addFilter( 'hook_name', 'my_name/with-dashes/action', () => null );
+	expect( console.error ).toHaveBeenCalledTimes( 0 );
+} );
+
 test( 'Can add filters with capitals in namespaces', () => {
 	addFilter( 'hook_name', 'my_name/OhNo/action', () => null );
 	expect( console.error ).toHaveBeenCalledTimes( 0 );

diff --git a/packages/hooks/src/validateNamespace.js b/packages/hooks/src/validateNamespace.js
@@ -13,12 +13,12 @@ function validateNamespace( namespace ) {
 		return false;
 	}
 
-	if ( ! /^[a-zA-Z][a-zA-Z0-9_.-/]*$/.test( namespace ) ) {
+	if ( ! /^[a-zA-Z][a-zA-Z0-9_.\-/]*$/.test( namespace ) ) {
 		console.error( 'The namespace can only contain numbers, letters, dashes, periods and underscores, plus the forward slash dividing slug and description in the namespace.' );
 		return false;
 	}
 
-	if ( ! /^[a-zA-Z][a-zA-Z0-9_.-]*\/[a-zA-Z][a-zA-Z0-9_.-]*\/[a-zA-Z][a-zA-Z0-9_.-]*$/.test( namespace ) ) {
+	if ( ! /^[a-zA-Z][a-zA-Z0-9_.\-]*\/[a-zA-Z][a-zA-Z0-9_.\-]*\/[a-zA-Z][a-zA-Z0-9_.\-]*$/.test( namespace ) ) {
 		console.error( 'The namespace must take the form `vendor/plugin/function`.' );
 		return false;
 	}