From ee3b1d861b95ce915562ff689a37628c80f6b115 Mon Sep 17 00:00:00 2001
From: Camilo Rodriguez <camilo@compucorp.co.uk>
Date: Wed, 9 Aug 2017 14:46:01 +0000
Subject: [PATCH] CRM-20858: Fix Style Warnings for Upper Case Constants

---
 CRM/Dedupe/Merger.php                   | 4 ++--
 tests/phpunit/CRM/Dedupe/MergerTest.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index f8b1dcf1a8..c227be0cca 100755
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -576,10 +576,10 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
     $dbResult->fetch();
 
     if ($dbResult->count > 0) {
-      return true;
+      return TRUE;
     }
 
-    return false;
+    return FALSE;
   }
 
   /**
diff --git a/tests/phpunit/CRM/Dedupe/MergerTest.php b/tests/phpunit/CRM/Dedupe/MergerTest.php
index 2638e28537..4db2dbd9e5 100755
--- a/tests/phpunit/CRM/Dedupe/MergerTest.php
+++ b/tests/phpunit/CRM/Dedupe/MergerTest.php
@@ -523,7 +523,7 @@ class CRM_Dedupe_MergerTest extends CiviUnitTestCase {
 
     /*** USE-CASE 1: DO NOT OVERWRITE CUSTOM FIELD VALUE **/
     $this->mergeContacts($originalContactID, $duplicateContactID1, array(
-        "move_{$customFieldName}" => null,
+        "move_{$customFieldName}" => NULL,
     ));
     $this->assertCustomFieldValue($originalContactID, 'abc', $customFieldName);
 
@@ -562,7 +562,7 @@ class CRM_Dedupe_MergerTest extends CiviUnitTestCase {
     $this->assertCustomFieldValue($duplicateContactID, 'abc', "custom_{$customField1['id']}");
 
     $this->mergeContacts($originalContactID, $duplicateContactID, array(
-      "move_custom_{$customField1['id']}" => null,
+      "move_custom_{$customField1['id']}" => NULL,
     ));
     $this->assertCustomFieldValue($originalContactID, '', "custom_{$customField1['id']}");
 
@@ -599,7 +599,7 @@ class CRM_Dedupe_MergerTest extends CiviUnitTestCase {
 
     // Perform merge
     $this->mergeContacts($originalContactID, $duplicateContactID, array(
-      "move_custom_{$customField1['id']}" => null,
+      "move_custom_{$customField1['id']}" => NULL,
       "move_custom_{$customField2['id']}" => 'def',
     ));
     $this->assertCustomFieldValue($originalContactID, '', "custom_{$customField1['id']}");
-- 
2.25.1