Use the ?: shortcut from PHP 5.3 where it makes sense

Change-Id: Ieff70f23b19f0be3670c4ed3e2a5c30ef3792d7f

diff --git a/languages/Language.php b/languages/Language.php
index 1c2e4f1..ef9137d 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1421,7 +1421,7 @@ class Language {
                                case 'g':
                                        $usedHour = true;
                                        $h = substr( $ts, 8, 2 );
-                                       $num = $h % 12 ? $h % 12 : 12;
+                                       $num = $h % 12 ?: 12;
                                        break;
                                case 'G':
                                        $usedHour = true;
@@ -1430,7 +1430,7 @@ class Language {
                                case 'h':
                                        $usedHour = true;
                                        $h = substr( $ts, 8, 2 );
-                                       $num = sprintf( '%02d', $h % 12 ? $h % 12 : 12 );
+                                       $num = sprintf( '%02d', $h % 12 ?: 12 );
                                        break;
                                case 'H':
                                        $usedHour = true;

diff --git a/maintenance/includes/BackupDumper.php b/maintenance/includes/BackupDumper.php
index 4c2b64c..31fe33f 100644 (file)
--- a/maintenance/includes/BackupDumper.php
+++ b/maintenance/includes/BackupDumper.php
@@ -358,9 +358,7 @@ abstract class BackupDumper extends Maintenance {
        function backupServer() {
                global $wgDBserver;
 
-               return $this->server
-                       ? $this->server
-                       : $wgDBserver;
+               return $this->server ?: $wgDBserver;
        }
 
        function reportPage() {

diff --git a/maintenance/parse.php b/maintenance/parse.php
index f01d8f5..43bbca1 100644 (file)
--- a/maintenance/parse.php
+++ b/maintenance/parse.php
@@ -117,9 +117,7 @@ class CLIParser extends Maintenance {
         * @return Title
         */
        protected function getTitle() {
-               $title = $this->getOption( 'title' )
-                       ? $this->getOption( 'title' )
-                       : 'CLIParser';
+               $title = $this->getOption( 'title' ) ?: 'CLIParser';
 
                return Title::newFromText( $title );
        }