linkeddata: Remove unnecessary arguments and shrink if...else

if...else that returns bool can be shrinked down to a single return
statement like in this case.

Change-Id: Ic50fac1825cbdbcc052dcd470e896a9344c8e418

diff --git a/includes/linkeddata/PageDataRequestHandler.php b/includes/linkeddata/PageDataRequestHandler.php
index 61efba0..93aa89f 100644 (file)
--- a/includes/linkeddata/PageDataRequestHandler.php
+++ b/includes/linkeddata/PageDataRequestHandler.php
@@ -43,11 +43,7 @@ class PageDataRequestHandler {
         */
        public function canHandleRequest( $subPage, WebRequest $request ) {
                if ( $subPage === '' || $subPage === null ) {
         */
        public function canHandleRequest( $subPage, WebRequest $request ) {
                if ( $subPage === '' || $subPage === null ) {

-                       if ( $request->getText( 'target', '' ) === '' ) {
-                               return false;
-                       } else {
-                               return true;
-                       }
+                       return $request->getText( 'target' ) !== '';

                }
 
                $parts = explode( '/', $subPage, 2 );
                }
 
                $parts = explode( '/', $subPage, 2 );


@@ -90,7 +86,7 @@ class PageDataRequestHandler {
                if ( $subPage !== '' ) {
                        $title = $parts[1];
                } else {
                if ( $subPage !== '' ) {
                        $title = $parts[1];
                } else {

-                       $title = $request->getText( 'target', '' );
+                       $title = $request->getText( 'target' );

                }
 
                $revision = $request->getInt( 'oldid', $revision );
                }
 
                $revision = $request->getInt( 'oldid', $revision );


@@ -145,7 +141,7 @@ class PageDataRequestHandler {
                }
 
                $negotiator = new HttpAcceptNegotiator( $mimeTypes );
                }
 
                $negotiator = new HttpAcceptNegotiator( $mimeTypes );

-               $format = $negotiator->getBestSupportedKey( $accept, null );
+               $format = $negotiator->getBestSupportedKey( $accept );

 
                if ( $format === null ) {
                        $format = isset( $accept['text/html'] ) ? 'text/html' : null;
 
                if ( $format === null ) {
                        $format = isset( $accept['text/html'] ) ? 'text/html' : null;