Merge branch 'master' into replace

includes/FormFactory/ManageWikiFormFactoryBuilder.php

@@ -836,10 +836,10 @@ public static function submissionHandler(
 				throw new InvalidArgumentException( "{$module} not recognised" );
 		}
 
-		if ( $mwReturn->changes ) {
+		if ( $mwReturn->hasChanges() ) {
 			$mwReturn->commit();
 
-			if ( $module != 'permissions' ) {
+			if ( $module !== 'permissions' ) {
 				$mwReturn->logParams['4::wiki'] = $dbName;
 			}
 
@@ -854,7 +854,7 @@ public static function submissionHandler(
 			return [ [ 'managewiki-changes-none' => null ] ];
 		}
 
-		if ( $mwReturn->errors ?? [] && $module == 'permissions' ) {
+		if ( $mwReturn->errors ?? [] && $module === 'permissions' ) {
 			return $mwReturn->errors;
 		}
 

includes/Helpers/ManageWikiExtensions.php

@@ -132,6 +132,10 @@ public function overwriteAll( array $extensions ) {
 		}
 	}
 
+	public function hasChanges(): bool {
+		return (bool)$this->changes;
+	}
+
 	/**
 	 * Commits all changes made to extension lists to the database
 	 */

includes/Helpers/ManageWikiNamespaces.php

@@ -167,6 +167,10 @@ public function remove( int $id, int $newNamespace, bool $maintainPrefix = false
 		$this->deleteNamespaces[] = $id;
 	}
 
+	public function hasChanges(): bool {
+		return (bool)$this->changes;
+	}
+
 	/**
 	 * Commits all changes to database. Also files a job to move pages into or out of namespace
 	 * @param bool $runNamespaceMigrationJob|true

includes/Helpers/ManageWikiPermissions.php

@@ -142,6 +142,10 @@ public function remove( string $group ) {
 		$this->deleteGroups[] = $group;
 	}
 
+	public function hasChanges(): bool {
+		return (bool)$this->changes;
+	}
+
 	/**
 	 * Commits all changes to database
 	 */

includes/Helpers/ManageWikiSettings.php

@@ -139,6 +139,10 @@ public function overwriteAll( array $settings, bool $remove = true ) {
 		}
 	}
 
+	public function hasChanges(): bool {
+		return (bool)$this->changes;
+	}
+
 	/**
 	 * Commits all changes to the database
 	 */

includes/Hooks.php

@@ -67,13 +67,13 @@ public static function onCreateWikiDataFactoryBuilder( string $wiki, IReadableDa
 
 		// Don't need to manipulate this much
 		if ( ManageWiki::checkSetup( 'settings' ) ) {
-			$cacheArray['settings'] = json_decode( $setObject->s_settings, true );
+			$cacheArray['settings'] = json_decode( $setObject->s_settings ?? '[]', true );
 		}
 
 		// Let's create an array of variables so we can easily loop these to enable
 		if ( ManageWiki::checkSetup( 'extensions' ) ) {
 			$manageWikiExtensions = self::getConfig( 'ManageWikiExtensions' );
-			foreach ( json_decode( $setObject->s_extensions, true ) as $ext ) {
+			foreach ( json_decode( $setObject->s_extensions ?? '[]', true ) as $ext ) {
 				$cacheArray['extensions'][] = $manageWikiExtensions[$ext]['var'] ??
 					$manageWikiExtensions[$ext]['name'];
 			}