From a32b1b16ef2703bfbffbd66e866064ac31b51133 Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Sun, 14 Apr 2019 03:40:03 +0100
Subject: [PATCH] Split HTMLFormElement.php into class per file

Change-Id: Ia8a35056fa6df5b81cda3e5bfcaac91d0b898d51
---
 .phpcs.xml                                    |  1 -
 autoload.php                                  |  4 +--
 .../htmlform/HTMLFormActionFieldLayout.php    | 16 ++++++++++
 includes/htmlform/HTMLFormElement.php         | 30 -------------------
 includes/htmlform/HTMLFormFieldLayout.php     | 16 ++++++++++
 5 files changed, 34 insertions(+), 33 deletions(-)
 create mode 100644 includes/htmlform/HTMLFormActionFieldLayout.php
 create mode 100644 includes/htmlform/HTMLFormFieldLayout.php

diff --git a/.phpcs.xml b/.phpcs.xml
index 7037ea7fdc..52e23cb663 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -207,7 +207,6 @@
 		<exclude-pattern>*/includes/api/ApiErrorFormatter\.php</exclude-pattern>
 		<exclude-pattern>*/includes/compat/XMPReader\.php</exclude-pattern>
 		<exclude-pattern>*/includes/diff/DairikiDiff\.php</exclude-pattern>
-		<exclude-pattern>*/includes/htmlform/HTMLFormElement\.php</exclude-pattern>
 		<exclude-pattern>*/includes/libs/filebackend/FileBackendStore\.php</exclude-pattern>
 		<exclude-pattern>*/includes/libs/filebackend/FSFileBackend\.php</exclude-pattern>
 		<exclude-pattern>*/includes/libs/filebackend/SwiftFileBackend\.php</exclude-pattern>
diff --git a/autoload.php b/autoload.php
index be4a1de25c..d9e126822a 100644
--- a/autoload.php
+++ b/autoload.php
@@ -589,11 +589,11 @@ $wgAutoloadLocalClasses = [
 	'HTMLFileCache' => __DIR__ . '/includes/cache/HTMLFileCache.php',
 	'HTMLFloatField' => __DIR__ . '/includes/htmlform/fields/HTMLFloatField.php',
 	'HTMLForm' => __DIR__ . '/includes/htmlform/HTMLForm.php',
-	'HTMLFormActionFieldLayout' => __DIR__ . '/includes/htmlform/HTMLFormElement.php',
+	'HTMLFormActionFieldLayout' => __DIR__ . '/includes/htmlform/HTMLFormActionFieldLayout.php',
 	'HTMLFormElement' => __DIR__ . '/includes/htmlform/HTMLFormElement.php',
 	'HTMLFormField' => __DIR__ . '/includes/htmlform/HTMLFormField.php',
 	'HTMLFormFieldCloner' => __DIR__ . '/includes/htmlform/fields/HTMLFormFieldCloner.php',
-	'HTMLFormFieldLayout' => __DIR__ . '/includes/htmlform/HTMLFormElement.php',
+	'HTMLFormFieldLayout' => __DIR__ . '/includes/htmlform/HTMLFormFieldLayout.php',
 	'HTMLFormFieldRequiredOptionsException' => __DIR__ . '/includes/htmlform/HTMLFormFieldRequiredOptionsException.php',
 	'HTMLFormFieldWithButton' => __DIR__ . '/includes/htmlform/fields/HTMLFormFieldWithButton.php',
 	'HTMLHiddenField' => __DIR__ . '/includes/htmlform/fields/HTMLHiddenField.php',
diff --git a/includes/htmlform/HTMLFormActionFieldLayout.php b/includes/htmlform/HTMLFormActionFieldLayout.php
new file mode 100644
index 0000000000..2c082245be
--- /dev/null
+++ b/includes/htmlform/HTMLFormActionFieldLayout.php
@@ -0,0 +1,16 @@
+<?php
+
+class HTMLFormActionFieldLayout extends OOUI\ActionFieldLayout {
+	use HTMLFormElement;
+
+	public function __construct( $fieldWidget, $buttonWidget = false, array $config = [] ) {
+		parent::__construct( $fieldWidget, $buttonWidget, $config );
+
+		// Traits
+		$this->initializeHTMLFormElement( $config );
+	}
+
+	protected function getJavaScriptClassName() {
+		return 'mw.htmlform.ActionFieldLayout';
+	}
+}
diff --git a/includes/htmlform/HTMLFormElement.php b/includes/htmlform/HTMLFormElement.php
index fbef2651f6..b77c17e964 100644
--- a/includes/htmlform/HTMLFormElement.php
+++ b/includes/htmlform/HTMLFormElement.php
@@ -33,33 +33,3 @@ trait HTMLFormElement {
 		} );
 	}
 }
-
-class HTMLFormFieldLayout extends OOUI\FieldLayout {
-	use HTMLFormElement;
-
-	public function __construct( $fieldWidget, array $config = [] ) {
-		parent::__construct( $fieldWidget, $config );
-
-		// Traits
-		$this->initializeHTMLFormElement( $config );
-	}
-
-	protected function getJavaScriptClassName() {
-		return 'mw.htmlform.FieldLayout';
-	}
-}
-
-class HTMLFormActionFieldLayout extends OOUI\ActionFieldLayout {
-	use HTMLFormElement;
-
-	public function __construct( $fieldWidget, $buttonWidget = false, array $config = [] ) {
-		parent::__construct( $fieldWidget, $buttonWidget, $config );
-
-		// Traits
-		$this->initializeHTMLFormElement( $config );
-	}
-
-	protected function getJavaScriptClassName() {
-		return 'mw.htmlform.ActionFieldLayout';
-	}
-}
diff --git a/includes/htmlform/HTMLFormFieldLayout.php b/includes/htmlform/HTMLFormFieldLayout.php
new file mode 100644
index 0000000000..ce93db266b
--- /dev/null
+++ b/includes/htmlform/HTMLFormFieldLayout.php
@@ -0,0 +1,16 @@
+<?php
+
+class HTMLFormFieldLayout extends OOUI\FieldLayout {
+	use HTMLFormElement;
+
+	public function __construct( $fieldWidget, array $config = [] ) {
+		parent::__construct( $fieldWidget, $config );
+
+		// Traits
+		$this->initializeHTMLFormElement( $config );
+	}
+
+	protected function getJavaScriptClassName() {
+		return 'mw.htmlform.FieldLayout';
+	}
+}
-- 
2.20.1