From 417ce7bebf113a570377a30b90dc0a3e9f117448 Mon Sep 17 00:00:00 2001
From: gerritbot <ladsgroup+gerritbot@gmail.com>
Date: Sat, 6 May 2023 21:19:29 +0000
Subject: [PATCH] Update moved class EditPage

See T321882. Moved in Ibefc44eb64aed

Bug: T321681
Change-Id: I5a66b76658c3eb19f2afe5b9a8ce4748767e6c2d
---
 extension.json     | 30 +++++++++++++++++++++++-------
 includes/Hooks.php |  2 +-
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/extension.json b/extension.json
index fb6de394..d3a9a098 100644
--- a/extension.json
+++ b/extension.json
@@ -10,7 +10,7 @@
 	"license-name": "GPL-2.0-or-later AND BSD-3-Clause",
 	"type": "editor",
 	"requires": {
-		"MediaWiki": ">= 1.35.0",
+		"MediaWiki": ">= 1.40.0",
 		"extensions": {
 			"WikiEditor": ">= 0.5.2"
 		}
@@ -39,7 +39,10 @@
 	},
 	"ResourceModules": {
 		"ext.codeEditor": {
-			"targets": [ "desktop", "mobile" ],
+			"targets": [
+				"desktop",
+				"mobile"
+			],
 			"scripts": "ext.codeEditor.js",
 			"dependencies": [
 				"jquery.codeEditor"
@@ -47,7 +50,10 @@
 			"group": "ext.wikiEditor"
 		},
 		"jquery.codeEditor": {
-			"targets": [ "desktop", "mobile" ],
+			"targets": [
+				"desktop",
+				"mobile"
+			],
 			"scripts": "jquery.codeEditor.js",
 			"styles": "jquery.codeEditor.less",
 			"dependencies": [
@@ -95,16 +101,23 @@
 				},
 				"pilcrow": {
 					"file": "images/pilcrow.svg",
-					"variants": [ "progressive" ]
+					"variants": [
+						"progressive"
+					]
 				},
 				"wrapping": {
 					"file": "images/wrapping.svg",
-					"variants": [ "progressive" ]
+					"variants": [
+						"progressive"
+					]
 				}
 			}
 		},
 		"ext.codeEditor.ace": {
-			"targets": [ "desktop", "mobile" ],
+			"targets": [
+				"desktop",
+				"mobile"
+			],
 			"group": "ext.codeEditor.ace",
 			"scripts": [
 				"ace/ace.js",
@@ -120,7 +133,10 @@
 			]
 		},
 		"ext.codeEditor.ace.modes": {
-			"targets": [ "desktop", "mobile" ],
+			"targets": [
+				"desktop",
+				"mobile"
+			],
 			"group": "ext.codeEditor.ace",
 			"scripts": [
 				"ace/mode-c_cpp.js",
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 28084a2f..cfe8d3aa 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Extension\CodeEditor;
 
-use EditPage;
 use ErrorPageError;
 use ExtensionRegistry;
+use MediaWiki\EditPage\EditPage;
 use MediaWiki\Hook\EditPage__showEditForm_initialHook;
 use MediaWiki\Hook\EditPage__showReadOnlyForm_initialHook;
 use MediaWiki\HookContainer\HookContainer;