Merge pull request #120 from cerbero90/feature/php-8

Support PHP 8
mettle · Apr 30, 2021 · 325aeaf · 325aeaf
2 parents 6adb8f6 + 8fe0607
commit 325aeaf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
     "license": "MIT",
     "authors": [],
     "require": {
-        "php": "^7.3",
+        "php": "^7.3 || ^8.0",
         "ext-json": "*",
         "aws/aws-sdk-php-laravel": "^3.6",
         "doctrine/dbal": "^3.0",

diff --git a/src/Services/Content/MergeContentService.php b/src/Services/Content/MergeContentService.php
@@ -93,7 +93,7 @@ protected function mergeAutomationContent(Message $message): string
 
     protected function mergeContent(?string $customContent, string $templateContent): string
     {
-        return str_ireplace(['{{content}}', '{{ content }}'], $customContent, $templateContent);
+        return str_ireplace(['{{content}}', '{{ content }}'], $customContent ?: '', $templateContent);
     }
 
     protected function mergeTags(string $content, Message $message): string

diff --git a/tests/Feature/Content/MergeContentTest.php b/tests/Feature/Content/MergeContentTest.php
@@ -40,7 +40,7 @@ public function campaign_content_can_be_merged()
     public function it_can_handle_a_null_value_for_campaign_content()
     {
         $content = null;
-        $message = $this->generateCampaignMessage(null, '<p>Hello this is some {{content}}</p>');
+        $message = $this->generateCampaignMessage($content, '<p>Hello this is some {{content}}</p>');
 
         $mergedContent = $this->mergeContent($message);