Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WikiPageFactory: use runtime exceptions for logic errors

Browse source 
Change-Id: If4857470e41a7a5e2968a9788b6368b71e55fadb
This commit is contained in:
Gergő Tisza 2020-07-27 17:29:36 +02:00
parent f871f7b93e
commit 5f3c0bf0d6
No known key found for this signature in database
GPG key ID: C34FEC97E6257F96
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
includes/page/WikiPageFactory.php
View file

@ -3,9 +3,9 @@
namespace MediaWiki\Page;
use DBAccessObjectUtils;
use InvalidArgumentException;
use MediaWiki\Linker\LinkTarget;
use MediaWiki\Page\Hook\WikiPageFactoryHook;
use MWException;
use Title;
use TitleFactory;
use WikiCategoryPage;
@ -48,15 +48,14 @@ class WikiPageFactory {
* @param Title $title
*
* @return WikiPage
* @throws MWException
*/
public function newFromTitle( Title $title ) {
$ns = $title->getNamespace();
if ( $ns == NS_MEDIA ) {
throw new MWException( "NS_MEDIA is a virtual namespace; use NS_FILE." );
throw new InvalidArgumentException( "NS_MEDIA is a virtual namespace; use NS_FILE." );
} elseif ( $ns < 0 ) {
throw new MWException( "Invalid or virtual namespace $ns given." );
throw new InvalidArgumentException( "Invalid or virtual namespace $ns given." );
}
$page = null;
@ -83,7 +82,6 @@ class WikiPageFactory {
*
* @param LinkTarget $title
*
* @throws MWException
* @return WikiPage
*/
public function newFromLinkTarget( LinkTarget $title ) {
@ -100,7 +98,6 @@ class WikiPageFactory {
* - "forupdate" or WikiPage::READ_LOCKING: from the master DB using SELECT FOR UPDATE
*
* @return WikiPage
* @throws MWException
*/
public function newFromRow( $row, $from = 'fromdb' ) {
$page = $this->newFromTitle( $this->titleFactory->newFromRow( $row ) );
@ -117,7 +114,6 @@ class WikiPageFactory {
* - "fromdbmaster" or WikiPage::READ_LATEST to select from the master database
*
* @return WikiPage|null Null when no page exists with that ID
* @throws MWException
*/
public function newFromID( $id, $from = 'fromdb' ) {
// page ids are never 0 or negative, see T63166