Merge branch 'master' of https://github.com/briannesbitt/Carbon into 3.x

� Conflicts: � tests/Carbon/LocalizationTest.php � tests/CarbonImmutable/LocalizationTest.php
kylekatarnls · May 17, 2020 · c93e4f6 · c93e4f6
2 parents 223d3ba + 06d48c6
commit c93e4f6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/readme.md b/readme.md
@@ -11,6 +11,8 @@
 An international PHP extension for DateTime. [http://carbon.nesbot.com](http://carbon.nesbot.com)
 
 ```php
+<?php
+
 use Carbon\Carbon;
 
 printf("Right now is %s", Carbon::now()->toDateTimeString());

diff --git a/src/Carbon/Traits/Localization.php b/src/Carbon/Traits/Localization.php
@@ -178,7 +178,8 @@ public static function getTranslationMessageWith($translator, string $key, strin
     {
         if (!($translator instanceof TranslatorBagInterface && $translator instanceof TranslatorInterface)) {
             throw new InvalidTypeException(
-                'Translator does not implement '.TranslatorInterface::class.' and '.TranslatorBagInterface::class.'.'
+                'Translator does not implement '.TranslatorInterface::class.' and '.TranslatorBagInterface::class.'. '.
+                (is_object($translator) ? get_class($translator) : gettype($translator)).' has been given.'
             );
         }
 

diff --git a/tests/Carbon/LocalizationTest.php b/tests/Carbon/LocalizationTest.php
@@ -734,7 +734,8 @@ public function testTranslationCustomWithCustomTranslator()
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage(
             'Translator does not implement Symfony\Contracts\Translation\TranslatorInterface '.
-            'and Symfony\Component\Translation\TranslatorBagInterface.'
+            'and Symfony\Component\Translation\TranslatorBagInterface. '.
+            'Symfony\Component\Translation\IdentityTranslator has been given.'
         );
 
         $date = Carbon::create(2018, 1, 1, 0, 0, 0);

diff --git a/tests/CarbonImmutable/LocalizationTest.php b/tests/CarbonImmutable/LocalizationTest.php
@@ -695,7 +695,8 @@ public function testTranslationCustomWithCustomTranslator()
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage(
             'Translator does not implement Symfony\Contracts\Translation\TranslatorInterface '.
-            'and Symfony\Component\Translation\TranslatorBagInterface.'
+            'and Symfony\Component\Translation\TranslatorBagInterface. '.
+            'Symfony\Component\Translation\IdentityTranslator has been given.'
         );
 
         $date = Carbon::create(2018, 1, 1, 0, 0, 0);