NamespaceManager avoid reset of user settings, refs 2439 (#2444)

SemanticMediaWiki · May 6, 2017 · 8878300 · 8878300
1 parent 80950d1
commit 8878300
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 17 deletions.
diff --git a/src/NamespaceManager.php b/src/NamespaceManager.php
@@ -53,6 +53,7 @@ public function init() {
 		}
 
 		$this->addNamespaceSettings();
+		$this->addExtraNamespaceSettings();
 	}
 
 	/**
@@ -188,19 +189,6 @@ public static function initCustomNamespace( &$globalVars ) {
 
 	protected function addNamespaceSettings() {
 
-		// Support subpages only for talk pages by default
-		$this->globalVars['wgNamespacesWithSubpages'] = $this->globalVars['wgNamespacesWithSubpages'] + array(
-			SMW_NS_PROPERTY_TALK => true,
-			SMW_NS_TYPE_TALK => true,
-			SMW_NS_CONCEPT_TALK => true,
-		);
-
-		// not modified for Semantic MediaWiki
-		/* $this->globalVars['wgNamespacesToBeSearchedDefault'] = array(
-			NS_MAIN           => true,
-			);
-		*/
-
 		/**
 		 * Default settings for the SMW specific NS which can only
 		 * be defined after SMW_NS_PROPERTY is declared
@@ -226,6 +214,19 @@ protected function addNamespaceSettings() {
 			$smwNamespacesSettings,
 			$this->globalVars['smwgNamespacesWithSemanticLinks']
 		);
+	}
+
+	private function addExtraNamespaceSettings() {
+
+		/**
+		 * Indicating which namespaces allow sub-pages
+		 *
+		 * @see https://www.mediawiki.org/wiki/Manual:$wgNamespacesWithSubpages
+		 */
+		$this->globalVars['wgNamespacesWithSubpages'] = $this->globalVars['wgNamespacesWithSubpages'] + array(
+			SMW_NS_PROPERTY_TALK => true,
+			SMW_NS_CONCEPT_TALK => true,
+		);
 
 		/**
 		 * Allow custom namespaces to be acknowledged as containing useful content
@@ -242,8 +243,10 @@ protected function addNamespaceSettings() {
 		 *
 		 * @see https://www.mediawiki.org/wiki/Manual:$wgNamespacesToBeSearchedDefault
 		 */
-		$this->globalVars['wgNamespacesToBeSearchedDefault'][SMW_NS_PROPERTY] = true;
-		$this->globalVars['wgNamespacesToBeSearchedDefault'][SMW_NS_CONCEPT] = true;
+		$this->globalVars['wgNamespacesToBeSearchedDefault'] = $this->globalVars['wgNamespacesToBeSearchedDefault'] + array(
+			SMW_NS_PROPERTY => true,
+			SMW_NS_CONCEPT => true
+		);
 	}
 
 	protected function isDefinedConstant( $constant ) {

diff --git a/tests/phpunit/Integration/MediaWiki/MWNamespaceCanonicalNameMatchTest.php b/tests/phpunit/Integration/MediaWiki/MWNamespaceCanonicalNameMatchTest.php
@@ -41,6 +41,7 @@ public function testRunNamespaceManagerWithNoConstantsDefined() {
 			'wgExtraNamespaces'   => array(),
 			'wgNamespaceAliases'  => array(),
 			'wgContentNamespaces' => array(),
+			'wgNamespacesToBeSearchedDefault' => array(),
 			'wgLanguageCode'      => 'en'
 		);
 

diff --git a/tests/phpunit/Unit/NamespaceManagerTest.php b/tests/phpunit/Unit/NamespaceManagerTest.php
@@ -63,7 +63,7 @@ public function testCanConstruct() {
 		);
 	}
 
-	public function testExecutionWithIncompleteConfiguration() {
+	public function testInitOnIncompleteConfiguration() {
 
 		$test = $this->default + array(
 			'wgExtraNamespaces'  => '',
@@ -169,7 +169,7 @@ public function testNamespacesInitWithEmptySettings() {
 		);
 	}
 
-	public function testNamespacesInitToKeepPreInitSettings() {
+	public function testInitToKeepPreInitSettings() {
 
 		$this->testEnvironment->addConfiguration(
 			'smwgHistoricTypeNamespace',
@@ -201,6 +201,36 @@ public function testNamespacesInitToKeepPreInitSettings() {
 		);
 	}
 
+	public function testInitWithoutOverridingUserSettingsOnExtraNamespaceSettings() {
+
+		$test = array(
+			'wgNamespacesWithSubpages' => array(
+				SMW_NS_PROPERTY => false
+			),
+			'wgNamespacesToBeSearchedDefault' => array(
+				SMW_NS_PROPERTY => false
+			),
+			'wgContentNamespaces' => array(
+				SMW_NS_PROPERTY => false
+			)
+		) + $this->default;
+
+		$instance = new NamespaceManager( $test, $this->extraneousLanguage );
+		$instance->init();
+
+		$this->assertFalse(
+			$test['wgNamespacesWithSubpages'][SMW_NS_PROPERTY]
+		);
+
+		$this->assertFalse(
+			$test['wgNamespacesToBeSearchedDefault'][SMW_NS_PROPERTY]
+		);
+
+		$this->assertFalse(
+			$test['wgContentNamespaces'][SMW_NS_PROPERTY]
+		);
+	}
+
 	public function testInitCanonicalNamespacesWithForcedNsReset() {
 
 		$namespaces = array(