Resolve Merge Conflicts

Author: oleibman

src/PhpSpreadsheet/Cell/DefaultValueBinder.php

@@ -61,7 +61,15 @@ public static function dataTypeForValue(mixed $value): string
         if ($value instanceof RichText) {
             return DataType::TYPE_INLINE;
         }
-        if (is_string($value) && strlen($value) > 1 && $value[0] === '=') {
+        if ($value instanceof Stringable) {
+            $value = (string) $value;
+        }
+        if (!is_string($value)) {
+            $gettype = is_object($value) ? get_class($value) : gettype($value);
+
+            throw new SpreadsheetException("unusable type $gettype");
+        }
+        if (strlen($value) > 1 && $value[0] === '=') {
             $calculation = new Calculation();
             $calculation->disableBranchPruning();
 
@@ -93,11 +101,9 @@ public static function dataTypeForValue(mixed $value): string
 
             return DataType::TYPE_NUMERIC;
         }
-        if (is_string($value)) {
-            $errorCodes = DataType::getErrorCodes();
-            if (isset($errorCodes[$value])) {
-                return DataType::TYPE_ERROR;
-            }
+        $errorCodes = DataType::getErrorCodes();
+        if (isset($errorCodes[$value])) {
+            return DataType::TYPE_ERROR;
         }
 
         return DataType::TYPE_STRING;

tests/PhpSpreadsheetTests/Cell/DefaultValueBinderTest.php

@@ -108,4 +108,27 @@ public function testCanOverrideStaticMethodWithoutOverridingBindValue(): void
         self::assertTrue($binder::$called);
         $spreadsheet->disconnectWorksheets();
     }
+
+    public function testDataTypeForValueExceptions(): void
+    {
+        try {
+            self::assertSame('s', DefaultValueBinder::dataTypeForValue(new SpreadsheetException()));
+        } catch (SpreadsheetException $e) {
+            self::fail('Should not have failed for stringable');
+        }
+
+        try {
+            DefaultValueBinder::dataTypeForValue([]);
+            self::fail('Should have failed for array');
+        } catch (SpreadsheetException $e) {
+            self::assertStringContainsString('unusable type array', $e->getMessage());
+        }
+
+        try {
+            DefaultValueBinder::dataTypeForValue(new DateTime());
+            self::fail('Should have failed for DateTime');
+        } catch (SpreadsheetException $e) {
+            self::assertStringContainsString('unusable type DateTime', $e->getMessage());
+        }
+    }
 }