Merge "Collapse some unnecessary else conditions"

diff --combined includes/specialpage/SpecialPageFactory.php
index e136ce0,b9c2204..013ceb2
--- 1/includes/specialpage/SpecialPageFactory.php
--- 2/includes/specialpage/SpecialPageFactory.php
+++ b/includes/specialpage/SpecialPageFactory.php
@@@ -34,6 -34,7 +34,6 @@@ use RequestContext
  use SpecialPage;
  use Title;
  use User;
 -use Wikimedia\ObjectFactory;
  
  /**
   * Factory for handling the special page list and generating SpecialPage objects.
@@@ -400,6 -401,16 +400,6 @@@ class SpecialPageFactory 
                        } elseif ( is_string( $rec ) ) {
                                $className = $rec;
                                $page = new $className;
 -                      } elseif ( is_array( $rec ) ) {
 -                              $className = array_shift( $rec );
 -                              // @deprecated, officially since 1.18, unofficially since forever
 -                              wfDeprecated( "Array syntax for \$wgSpecialPages is deprecated ($className), " .
 -                                      "define a subclass of SpecialPage instead.", '1.18' );
 -                              $page = ObjectFactory::getObjectFromSpec( [
 -                                      'class' => $className,
 -                                      'args' => $rec,
 -                                      'closure_expansion' => false,
 -                              ] );
                        } elseif ( $rec instanceof SpecialPage ) {
                                $page = $rec; // XXX: we should deep clone here
                        } else {
@@@ -408,16 -419,14 +408,14 @@@
  
                        if ( $page instanceof SpecialPage ) {
                                return $page;
-                       } else {
-                               // It's not a classname, nor a callback, nor a legacy constructor array,
-                               // nor a special page object. Give up.
-                               wfLogWarning( "Cannot instantiate special page $realName: bad spec!" );
-                               return null;
                        }
  
-               } else {
-                       return null;
+                       // It's not a classname, nor a callback, nor a legacy constructor array,
+                       // nor a special page object. Give up.
+                       wfLogWarning( "Cannot instantiate special page $realName: bad spec!" );
                }
+ 
+               return null;
        }
  
        /**
@@@ -554,9 -563,9 +552,9 @@@
                                $context->getOutput()->redirect( $url );
  
                                return $title;
-                       } else {
-                               $context->setTitle( $page->getPageTitle( $par ) );
                        }
+ 
+                       $context->setTitle( $page->getPageTitle( $par ) );
                } elseif ( !$page->isIncludable() ) {
                        return false;
                }
@@@ -703,8 -712,8 +701,8 @@@
                list( $name, $subpage ) = $this->resolveAlias( $alias );
                if ( $name != null ) {
                        return SpecialPage::getTitleFor( $name, $subpage );
-               } else {
-                       return null;
                }
+ 
+               return null;
        }
  }