Move classes to includes/

Change-Id: Iefaa21bf911fa7dcf11aedd38648bed945b905f9

.phpcs.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
 <ruleset>
 	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
-		<exclude name="Generic.Files.OneObjectStructurePerFile.MultipleFound" />
 		<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps" />
 		<exclude name="Squiz.Scope.MethodScope.Missing" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
-		<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
 		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
 	</rule>

extension.json

@@ -36,11 +36,11 @@
 		]
 	},
 	"AutoloadClasses": {
-		"ExtParserFunctions": "ParserFunctions_body.php",
-		"ExprParser": "Expr.php",
-		"ExprError": "Expr.php",
-		"Scribunto_LuaParserFunctionsLibrary": "ParserFunctions.library.php",
-		"ParserFunctionsHooks": "ParserFunctions.hooks.php"
+		"ExtParserFunctions": "includes/ExtParserFunctions.php",
+		"ExprParser": "includes/ExprParser.php",
+		"ExprError": "includes/ExprError.php",
+		"Scribunto_LuaParserFunctionsLibrary": "includes/Scribunto_LuaParserFunctionsLibrary.php",
+		"ParserFunctionsHooks": "includes/ParserFunctionsHooks.php"
 	},
 	"ParserTestFiles": [
 		"funcsParserTests.txt",

includes/ExprError.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+class ExprError extends Exception {
+	/**
+	 * @param string $msg
+	 * @param string $parameter
+	 */
+	public function __construct( $msg, $parameter = '' ) {
+		// Give grep a chance to find the usages:
+		// pfunc_expr_stack_exhausted, pfunc_expr_unexpected_number, pfunc_expr_preg_match_failure,
+		// pfunc_expr_unrecognised_word, pfunc_expr_unexpected_operator, pfunc_expr_missing_operand,
+		// pfunc_expr_unexpected_closing_bracket, pfunc_expr_unrecognised_punctuation,
+		// pfunc_expr_unclosed_bracket, pfunc_expr_division_by_zero, pfunc_expr_invalid_argument,
+		// pfunc_expr_invalid_argument_ln, pfunc_expr_unknown_error, pfunc_expr_not_a_number
+		$this->message = wfMessage( "pfunc_expr_$msg", $parameter )->inContentLanguage()->text();
+	}
+}

includes/ExprParser.php

@@ -1,11 +1,23 @@
 <?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
 
 use UtfNormal\Validator;
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-	die( 'This file is a MediaWiki extension, it is not a valid entry point' );
-}
-
 // Character classes
 define( 'EXPR_WHITE_CLASS', " \t\r\n" );
 define( 'EXPR_NUMBER_CLASS', '0123456789.' );
@@ -50,22 +62,6 @@ define( 'EXPR_PI', 36 );
 define( 'EXPR_FMOD', 37 );
 define( 'EXPR_SQRT', 38 );
 
-class ExprError extends Exception {
-	/**
-	 * @param string $msg
-	 * @param string $parameter
-	 */
-	public function __construct( $msg, $parameter = '' ) {
-		// Give grep a chance to find the usages:
-		// pfunc_expr_stack_exhausted, pfunc_expr_unexpected_number, pfunc_expr_preg_match_failure,
-		// pfunc_expr_unrecognised_word, pfunc_expr_unexpected_operator, pfunc_expr_missing_operand,
-		// pfunc_expr_unexpected_closing_bracket, pfunc_expr_unrecognised_punctuation,
-		// pfunc_expr_unclosed_bracket, pfunc_expr_division_by_zero, pfunc_expr_invalid_argument,
-		// pfunc_expr_invalid_argument_ln, pfunc_expr_unknown_error, pfunc_expr_not_a_number
-		$this->message = wfMessage( "pfunc_expr_$msg", $parameter )->inContentLanguage()->text();
-	}
-}
-
 class ExprParser {
 	public $maxStackSize = 100;