Mwjames has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/73956


Change subject: (Bug 51435) SMW\NamespaceExaminer return false instead of an 
Exception
......................................................................

(Bug 51435) SMW\NamespaceExaminer return false instead of an Exception

Change-Id: I06811f59731ac6e6772d43a64207c4fcb6b1dc8f
---
M includes/NamespaceExaminer.php
M tests/phpunit/includes/NamespaceExaminerTest.php
2 files changed, 5 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMediaWiki 
refs/changes/56/73956/1

diff --git a/includes/NamespaceExaminer.php b/includes/NamespaceExaminer.php
index bd64f61..0a4c044 100644
--- a/includes/NamespaceExaminer.php
+++ b/includes/NamespaceExaminer.php
@@ -119,7 +119,8 @@
                }
 
                if ( !in_array( $namespace, MWNamespace::getValidNamespaces() ) 
) {
-                       throw new InvalidNamespaceException( "{$namespace} is 
not a valid namespace" );
+                       // Bug 51435
+                       return false;
                }
 
                return $this->isEnabled( $namespace );
diff --git a/tests/phpunit/includes/NamespaceExaminerTest.php 
b/tests/phpunit/includes/NamespaceExaminerTest.php
index c116fd2..20add1a 100644
--- a/tests/phpunit/includes/NamespaceExaminerTest.php
+++ b/tests/phpunit/includes/NamespaceExaminerTest.php
@@ -104,13 +104,13 @@
        /**
         * @test NamespaceExaminer::isSemanticEnabled
         *
+        * Bug 51435; return false instead of an Exception
+        *
         * @since 1.9
         */
        public function testNoValidNamespaceException() {
-               $this->setExpectedException( '\SMW\InvalidNamespaceException' );
-
                $instance = $this->getInstance( array( NS_MAIN => true ) );
-               $this->assertTrue( $instance->isSemanticEnabled( 99991001 ) );
+               $this->assertFalse( $instance->isSemanticEnabled( 99991001 ) );
        }
 
        /**

-- 
To view, visit https://gerrit.wikimedia.org/r/73956
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I06811f59731ac6e6772d43a64207c4fcb6b1dc8f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Mwjames <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to