CRM/Utils - Refactor unnecessary uses of CRM_Utils_Array::value

diff --git a/CRM/Utils/Date.php b/CRM/Utils/Date.php
index 2434fb33e06c5400e66ccb50c24cb2a5e641f965..8fcf8690726e01f046b588b3246309e445e2f745 100644 (file)
--- a/CRM/Utils/Date.php
+++ b/CRM/Utils/Date.php
@@ -280,16 +280,16 @@ class CRM_Utils_Date {
    * @return int
    */
   public static function unixTime($string) {
-    if (empty($string)) {
+    if (!$string) {
       return 0;
     }
     $parsedDate = date_parse($string);
-    return mktime(CRM_Utils_Array::value('hour', $parsedDate),
-      CRM_Utils_Array::value('minute', $parsedDate),
+    return mktime($parsedDate['hour'],
+       $parsedDate['minute'],
       59,
-      CRM_Utils_Array::value('month', $parsedDate),
-      CRM_Utils_Array::value('day', $parsedDate),
-      CRM_Utils_Array::value('year', $parsedDate)
+       $parsedDate['month'],
+       $parsedDate['day'],
+       $parsedDate['year']
     );
   }
 

diff --git a/CRM/Utils/System.php b/CRM/Utils/System.php
index 03c260f8cce2fe1ac96ce5fc39ddf71a98cae00a..f3359d58a0b28568095dcf308357b9590e3016c4 100644 (file)
--- a/CRM/Utils/System.php
+++ b/CRM/Utils/System.php
@@ -452,12 +452,12 @@ class CRM_Utils_System {
 
     return self::url(
       $p,
-      CRM_Utils_Array::value('q', $params),
-      CRM_Utils_Array::value('a', $params, FALSE),
-      CRM_Utils_Array::value('f', $params),
-      CRM_Utils_Array::value('h', $params, TRUE),
-      CRM_Utils_Array::value('fe', $params, FALSE),
-      CRM_Utils_Array::value('fb', $params, FALSE)
+      $params['q'] ?? NULL,
+      $params['a'] ?? FALSE,
+      $params['f'] ?? NULL,
+      $params['h'] ?? TRUE,
+      $params['fe'] ?? FALSE,
+      $params['fb'] ?? FALSE
     );
   }
 

diff --git a/CRM/Utils/System/Joomla.php b/CRM/Utils/System/Joomla.php
index b7f92257fc680445a3b65313bfe67c66257d39fe..d61d3f4a325862544cd51bb4946ddfa5e84c3d4e 100644 (file)
--- a/CRM/Utils/System/Joomla.php
+++ b/CRM/Utils/System/Joomla.php
@@ -136,8 +136,8 @@ class CRM_Utils_System_Joomla extends CRM_Utils_System_Base {
   public function checkUserNameEmailExists(&$params, &$errors, $emailName = 'email') {
     $config = CRM_Core_Config::singleton();
 
-    $name = CRM_Utils_Array::value('name', $params);
-    $email = CRM_Utils_Array::value('mail', $params);
+    $name = $params['name'] ?? NULL;
+    $email = $params['mail'] ?? NULL;
     //don't allow the special characters and min. username length is two
     //regex \\ to match a single backslash would become '/\\\\/'
     $isNotValid = (bool) preg_match('/[\<|\>|\"|\'|\%|\;|\(|\)|\&|\\\\|\/]/im', $name);

diff --git a/CRM/Utils/Wrapper.php b/CRM/Utils/Wrapper.php
index 5efe9a89b66bff148c9c7345d620305bdb76dcf3..3638f75533c61254a7893d3d9efbb98aec702f5f 100644 (file)
--- a/CRM/Utils/Wrapper.php
+++ b/CRM/Utils/Wrapper.php
@@ -75,7 +75,7 @@ class CRM_Utils_Wrapper {
           $sessionVar = $params['sessionVar'] ?? NULL;
           $type = $params['type'] ?? NULL;
           $default = $params['default'] ?? NULL;
-          $abort = CRM_Utils_Array::value('abort', $params, FALSE);
+          $abort = $params['abort'] ?? FALSE;
 
           $value = NULL;
           $value = CRM_Utils_Request::retrieve(