Test against REL1_40 (#423)

* Test against REL1_40 * Update ManageWikiInstaller.php * Update ManageWikiFormFactoryBuilder.php * Update ManageWikiFormFactory.php
miraheze · Sep 17, 2023 · dacd00d · dacd00d
1 parent 0155021
commit dacd00d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/mediawiki-tests.yml b/.github/workflows/mediawiki-tests.yml
@@ -12,13 +12,20 @@ jobs:
     strategy:
       matrix:
         include:
-          # Latest MediaWiki stable - PHP 7.4 
+          # Latest Old MediaWiki stable - PHP 7.4 
           - mw: 'REL1_39'
             php: 7.4
             php-docker: 74
             composer-test: true
             experimental: false
 
+          # Latest MediaWiki stable - PHP 7.4 
+          - mw: 'REL1_40'
+            php: 7.4
+            php-docker: 74
+            composer-test: true
+            experimental: false
+
           # Latest MediaWiki master - PHP 7.4
           - mw: 'master'
             php: 7.4

diff --git a/includes/FormFactory/ManageWikiFormFactory.php b/includes/FormFactory/ManageWikiFormFactory.php
@@ -10,8 +10,8 @@
 use Miraheze\CreateWiki\RemoteWiki;
 use Miraheze\ManageWiki\Helpers\ManageWikiOOUIForm;
 use Miraheze\ManageWiki\ManageWiki;
-use MWException;
 use OutputPage;
+use UnexpectedValueException;
 use Wikimedia\Rdbms\DBConnRef;
 
 class ManageWikiFormFactory {
@@ -87,7 +87,7 @@ protected function submitForm(
 		$out = $context->getOutput();
 
 		if ( !$ceMW ) {
-			throw new MWException( "User '{$context->getUser()->getName()}' without 'managewiki' right tried to change wiki {$module}!" );
+			throw new UnexpectedValueException( "User '{$context->getUser()->getName()}' without 'managewiki' right tried to change wiki {$module}!" );
 		}
 
 		$form->getButtons();

diff --git a/includes/FormFactory/ManageWikiFormFactoryBuilder.php b/includes/FormFactory/ManageWikiFormFactoryBuilder.php
@@ -7,6 +7,7 @@
 use ExtensionRegistry;
 use HTMLForm;
 use IContextSource;
+use InvalidArgumentException;
 use Linker;
 use ManualLogEntry;
 use MediaWiki\MediaWikiServices;
@@ -18,7 +19,6 @@
 use Miraheze\ManageWiki\Helpers\ManageWikiSettings;
 use Miraheze\ManageWiki\Helpers\ManageWikiTypes;
 use Miraheze\ManageWiki\ManageWiki;
-use MWException;
 use SpecialPage;
 use User;
 use UserGroupMembership;
@@ -52,7 +52,7 @@ public static function buildDescriptor(
 				$formDescriptor = self::buildDescriptorPermissions( $dbName, $ceMW, $special, $config );
 				break;
 			default:
-				throw new MWException( "{$module} not recognised" );
+				throw new InvalidArgumentException( "{$module} not recognised" );
 		}
 
 		return $formDescriptor;
@@ -821,7 +821,7 @@ public static function submissionHandler(
 				$mwReturn = self::submissionPermissions( $formData, $dbName, $special, $config );
 				break;
 			default:
-				throw new MWException( "{$module} not recognised" );
+				throw new InvalidArgumentException( "{$module} not recognised" );
 		}
 
 		if ( $mwReturn->changes ) {

diff --git a/includes/Helpers/ManageWikiInstaller.php b/includes/Helpers/ManageWikiInstaller.php
@@ -6,7 +6,7 @@
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Shell\Shell;
 use Miraheze\ManageWiki\Jobs\MWScriptJob;
-use MWException;
+use RuntimeException;
 use Title;
 
 class ManageWikiInstaller {
@@ -137,7 +137,7 @@ private static function namespaces( string $dbname, array $data, bool $install )
 
 	private static function mwscript( string $dbname, array $data ) {
 		if ( Shell::isDisabled() ) {
-			throw new MWException( 'Shell is disabled.' );
+			throw new RuntimeException( 'Shell is disabled.' );
 		}
 
 		foreach ( $data as $script => $options ) {