REF/ext - Simplify inline conditionals with Elvis

diff --git a/ext/authx/Civi/Authx/Backdrop.php b/ext/authx/Civi/Authx/Backdrop.php
index c2d248f18038f26293fc23ad38c70854cbe3e4c1..1252f92f963a0c1d88d287ac02d21e96d34f3743 100644 (file)
--- a/ext/authx/Civi/Authx/Backdrop.php
+++ b/ext/authx/Civi/Authx/Backdrop.php
@@ -19,7 +19,7 @@ class Backdrop implements AuthxInterface {
   public function checkPassword(string $username, string $password) {
     $uid = user_authenticate($username, $password);
     // Ensure strict nullness.
-    return $uid ? $uid : NULL;
+    return $uid ?: NULL;
   }
 
   /**

diff --git a/ext/authx/Civi/Authx/Drupal.php b/ext/authx/Civi/Authx/Drupal.php
index e9722cab205a70e0d1242ebbb3f7996fa52d8b7b..f43e5b14a8afcbcde7418698c1e561685660cd88 100644 (file)
--- a/ext/authx/Civi/Authx/Drupal.php
+++ b/ext/authx/Civi/Authx/Drupal.php
@@ -19,7 +19,7 @@ class Drupal implements AuthxInterface {
   public function checkPassword(string $username, string $password) {
     $uid = user_authenticate($username, $password);
     // Ensure strict nullness.
-    return $uid ? $uid : NULL;
+    return $uid ?: NULL;
   }
 
   /**

diff --git a/ext/authx/Civi/Authx/Drupal8.php b/ext/authx/Civi/Authx/Drupal8.php
index 54f8c122a697a99aff98e9d3651fc1ea8850352f..89ff2d8d07713ef375ed360af51b5e90bd863328 100644 (file)
--- a/ext/authx/Civi/Authx/Drupal8.php
+++ b/ext/authx/Civi/Authx/Drupal8.php
@@ -19,7 +19,7 @@ class Drupal8 implements AuthxInterface {
   public function checkPassword(string $username, string $password) {
     $uid = \Drupal::service('user.auth')->authenticate($username, $password);
     // Ensure strict nullness.
-    return $uid ? $uid : NULL;
+    return $uid ?: NULL;
   }
 
   /**

diff --git a/ext/flexmailer/src/FlexMailer.php b/ext/flexmailer/src/FlexMailer.php
index c46160a73801f4a981ab383d495752e8bb3d3921..844ee666598b1838bf85ebe311f799252169f3b5 100644 (file)
--- a/ext/flexmailer/src/FlexMailer.php
+++ b/ext/flexmailer/src/FlexMailer.php
@@ -133,7 +133,7 @@ class FlexMailer {
    */
   public function __construct($context = array(), EventDispatcherInterface $dispatcher = NULL) {
     $this->context = $context;
-    $this->dispatcher = $dispatcher ? $dispatcher : \Civi::service('dispatcher');
+    $this->dispatcher = $dispatcher ?: \Civi::service('dispatcher');
   }
 
   /**

diff --git a/ext/flexmailer/src/Validator.php b/ext/flexmailer/src/Validator.php
index 455d6f0538815c7d820bae2b9e013a6eb92aae6e..549d028e3c3c64ab6572a3252acdbe7cd0da5c04 100644 (file)
--- a/ext/flexmailer/src/Validator.php
+++ b/ext/flexmailer/src/Validator.php
@@ -54,7 +54,7 @@ class Validator {
    * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher
    */
   public function __construct(EventDispatcherInterface $dispatcher = NULL) {
-    $this->dispatcher = $dispatcher ? $dispatcher : \Civi::service('dispatcher');
+    $this->dispatcher = $dispatcher ?: \Civi::service('dispatcher');
   }
 
   /**

diff --git a/ext/legacycustomsearches/CRM/Contact/Form/Search/Custom.php b/ext/legacycustomsearches/CRM/Contact/Form/Search/Custom.php
index 2e5d19a28e65ec17c8073e7c80ce5dcec522462e..942cfea4aab4ee3bf270e2c3c010bb1f90b7917b 100644 (file)
--- a/ext/legacycustomsearches/CRM/Contact/Form/Search/Custom.php
+++ b/ext/legacycustomsearches/CRM/Contact/Form/Search/Custom.php
@@ -138,7 +138,7 @@ class CRM_Contact_Form_Search_Custom extends CRM_Contact_Form_Search {
       $fileName = $this->_customClass->templateFile();
     }
 
-    return $fileName ? $fileName : parent::getTemplateFileName();
+    return $fileName ?: parent::getTemplateFileName();
   }
 
   public function postProcess() {