Fix regular expressions in resource loader definitions

Author: adrianheine

README.md

@@ -8,6 +8,7 @@
 	datatype attribute when creating a Property.
 * Let Property.getDataType return the data type's string identifier instead of
 	a DataType instance.
+* Fix regular expressions in resource loader definitions
 
 ### 0.1 (2014-06-18)
 

resources.mw.php

@@ -14,7 +14,13 @@
 return call_user_func( function() {
 	global $wgResourceModules;
 
-	preg_match( '+^(.*?)' . DIRECTORY_SEPARATOR . '(vendor|extensions)' . DIRECTORY_SEPARATOR . '(.*)$+', __DIR__, $remoteExtPathParts );
+	preg_match(
+		'+^(.*?)' . preg_quote( DIRECTORY_SEPARATOR ) . '(vendor|extensions)' .
+			preg_quote( DIRECTORY_SEPARATOR ) . '(.*)$+',
+		__DIR__,
+		$remoteExtPathParts
+	);
+
 	$moduleTemplate = array(
 		'localBasePath' => __DIR__,
 		'remoteExtPath' => '../' . $remoteExtPathParts[2] . DIRECTORY_SEPARATOR . $remoteExtPathParts[3],

resources.test.mw.php

@@ -3,7 +3,13 @@
 global $wgHooks;
 
 $wgHooks['ResourceLoaderTestModules'][] = function( array &$testModules, \ResourceLoader &$resourceLoader ) {
-	preg_match( '+^(.*?)' . DIRECTORY_SEPARATOR . '(vendor|extensions)' . DIRECTORY_SEPARATOR . '(.*)$+', __DIR__, $remoteExtPathParts );
+	preg_match(
+		'+^(.*?)' . preg_quote( DIRECTORY_SEPARATOR ) . '(vendor|extensions)' .
+			preg_quote( DIRECTORY_SEPARATOR ) . '(.*)$+',
+		__DIR__,
+		$remoteExtPathParts
+	);
+
 	$moduleTemplate = array(
 		'localBasePath' => __DIR__,
 		'remoteExtPath' => '../' . $remoteExtPathParts[2] . DIRECTORY_SEPARATOR . $remoteExtPathParts[3],