From 2a54a8a7e649f8e25e5920a38a423549a407ba73 Mon Sep 17 00:00:00 2001
From: Jamie Snape <jamie.snape@kitware.com>
Date: Tue, 8 Dec 2015 11:30:41 -0500
Subject: [PATCH] Applied fixes from StyleCI

---
 core/controllers/components/DownloadBitstreamComponent.php | 6 +++---
 core/controllers/components/MimeTypeComponent.php          | 1 -
 library/KWUtils.php                                        | 4 ++--
 modules/oai/library/oai/oaidp-util.php                     | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/controllers/components/DownloadBitstreamComponent.php b/core/controllers/components/DownloadBitstreamComponent.php
index a04f2b36f..6af87614a 100644
--- a/core/controllers/components/DownloadBitstreamComponent.php
+++ b/core/controllers/components/DownloadBitstreamComponent.php
@@ -165,10 +165,10 @@ function env($key)
 {
     if ($key == 'HTTPS') {
         if (isset($_SERVER['HTTPS'])) {
-            return (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off');
+            return !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off';
         }
 
-        return (strpos(env('SCRIPT_URI'), 'https://') === 0);
+        return strpos(env('SCRIPT_URI'), 'https://') === 0;
     }
 
     if ($key == 'SCRIPT_NAME') {
@@ -217,7 +217,7 @@ function env($key)
             return str_replace(env('DOCUMENT_ROOT'), '', env('SCRIPT_FILENAME'));
             break;
         case 'CGI_MODE':
-            return (PHP_SAPI === 'cgi');
+            return PHP_SAPI === 'cgi';
             break;
         case 'HTTP_BASE':
             $host = env('HTTP_HOST');
diff --git a/core/controllers/components/MimeTypeComponent.php b/core/controllers/components/MimeTypeComponent.php
index b6d377aa1..41208311a 100644
--- a/core/controllers/components/MimeTypeComponent.php
+++ b/core/controllers/components/MimeTypeComponent.php
@@ -72,7 +72,6 @@ private function privFindType($filename)
         // return mime type for extension
         if (isset($mimeTypes[$filename])) {
             return $mimeTypes[$filename];
-
         }
 
         // If the extension was not found, return octet-stream.
diff --git a/library/KWUtils.php b/library/KWUtils.php
index a23aff372..0e5b9e767 100644
--- a/library/KWUtils.php
+++ b/library/KWUtils.php
@@ -84,7 +84,7 @@ public static function createSubDirectories($baseDirectory, $subDirectories, $mo
      */
     public static function isWindows()
     {
-        return (strtolower(substr(PHP_OS, 0, 3)) == 'win');
+        return strtolower(substr(PHP_OS, 0, 3)) == 'win';
     }
 
     /**
@@ -162,7 +162,7 @@ public static function exec($command, &$output = null, $chdir = '', &$return_val
      */
     public static function isLinux()
     {
-        return (strtolower(substr(PHP_OS, 0, 5)) == 'linux');
+        return strtolower(substr(PHP_OS, 0, 5)) == 'linux';
     }
 
     /**
diff --git a/modules/oai/library/oai/oaidp-util.php b/modules/oai/library/oai/oaidp-util.php
index 838c0086b..b44fda162 100644
--- a/modules/oai/library/oai/oaidp-util.php
+++ b/modules/oai/library/oai/oaidp-util.php
@@ -22,7 +22,7 @@ function get_token()
 {
     list($usec, $sec) = explode(' ', microtime());
 
-    return ((int) ($usec * 1000) + (int) ($sec * 1000));
+    return (int) ($usec * 1000) + (int) ($sec * 1000);
 }
 
 function oai_error($code, $argument = '', $value = '')
@@ -429,7 +429,7 @@ function php_is_at_least($version)
 
 function is_valid_uri($url)
 {
-    return ((bool) preg_match("'^[^:]+:(?://)?(?:[a-z_0-9-]+[\.]{1})*(?:[a-z_0-9-]+\.)[a-z]{2,3}.*$'i", $url));
+    return (bool) preg_match("'^[^:]+:(?://)?(?:[a-z_0-9-]+[\.]{1})*(?:[a-z_0-9-]+\.)[a-z]{2,3}.*$'i", $url);
 }
 
 function metadataHeader($prefix)