Merge pull request #3376 from PHPOffice/AdvancedValueBinder-Localisation

Advanced value binder localisation and Improvements

Author: MarkBaker

CHANGELOG.md

@@ -19,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 - Improved handling for @ in Number Format Masks [PR #3344](https://github.com/PHPOffice/PhpSpreadsheet/pull/3344)
 - Improved support for locale settings and currency codes when matching formatted strings to numerics in the Calculation Engine [PR #3373](https://github.com/PHPOffice/PhpSpreadsheet/pull/3373) and [PR #3374](https://github.com/PHPOffice/PhpSpreadsheet/pull/3374) 
-- Improved support for locale settings and currency identification in the Advanced Value Binder [PR #3375](https://github.com/PHPOffice/PhpSpreadsheet/pull/3375)
+- Improved support for locale settings and matching in the Advanced Value Binder [PR #3376](https://github.com/PHPOffice/PhpSpreadsheet/pull/3376)
 
 ### Deprecated
 

src/PhpSpreadsheet/Cell/AdvancedValueBinder.php

@@ -34,11 +34,11 @@ public function bindValue(Cell $cell, $value = null)
         // Style logic - strings
         if ($dataType === DataType::TYPE_STRING && !$value instanceof RichText) {
             //    Test for booleans using locale-setting
-            if ($value == Calculation::getTRUE()) {
+            if (StringHelper::strToUpper($value) === Calculation::getTRUE()) {
                 $cell->setValueExplicit(true, DataType::TYPE_BOOL);
 
                 return true;
-            } elseif ($value == Calculation::getFALSE()) {
+            } elseif (StringHelper::strToUpper($value) === Calculation::getFALSE()) {
                 $cell->setValueExplicit(false, DataType::TYPE_BOOL);
 
                 return true;

tests/PhpSpreadsheetTests/Cell/AdvancedValueBinderTest.php

@@ -5,6 +5,7 @@
 use PhpOffice\PhpSpreadsheet\Cell\AdvancedValueBinder;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\IValueBinder;
+use PhpOffice\PhpSpreadsheet\Settings;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PHPUnit\Framework\TestCase;
@@ -35,6 +36,7 @@ class AdvancedValueBinderTest extends TestCase
 
     protected function setUp(): void
     {
+        Settings::setLocale('en_US');
         $this->currencyCode = StringHelper::getCurrencyCode();
         $this->decimalSeparator = StringHelper::getDecimalSeparator();
         $this->thousandsSeparator = StringHelper::getThousandsSeparator();
@@ -72,6 +74,27 @@ public function testBoolean(): void
         $sheet->getCell('A2')->setValue(false);
         self::assertFalse($sheet->getCell('A2')->getValue());
 
+        $sheet->getCell('A3')->setValue('true');
+        self::assertTrue($sheet->getCell('A3')->getValue());
+
+        $sheet->getCell('A4')->setValue('false');
+        self::assertFalse($sheet->getCell('A4')->getValue());
+
+        $spreadsheet->disconnectWorksheets();
+    }
+
+    public function testBooleanLocale(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        Settings::setLocale('nl_NL');
+
+        $sheet->getCell('A1')->setValue('Waar');
+        self::assertTrue($sheet->getCell('A1')->getValue());
+
+        $sheet->getCell('A2')->setValue('OnWaar');
+        self::assertFalse($sheet->getCell('A2')->getValue());
+
         $spreadsheet->disconnectWorksheets();
     }
 
@@ -111,6 +134,8 @@ public function currencyProvider(): array
             ['€2,020.22', 2020.22, ',', '.', '€'],
             ['$10.11', 10.11, ',', '.', '€'],
             ['€2,020.20', 2020.2, ',', '.', '$'],
+            ['-2,020.20€', -2020.2, ',', '.', '$'],
+            ['- 2,020.20 € ', -2020.2, ',', '.', '$'],
         ];
     }
 
@@ -136,6 +161,7 @@ public function fractionProvider(): array
         return [
             ['1/5', 0.2],
             ['-1/5', -0.2],
+            ['- 1/5', -0.2],
             ['12/5', 2.4],
             ['2/100', 0.02],
             ['15/12', 1.25],
@@ -145,6 +171,7 @@ public function fractionProvider(): array
             ['1 4/20', 1.2],
             ['1 16/20', 1.8],
             ['12 20/100', 12.2],
+            ['-1 4/20', -1.2],
         ];
     }
 
@@ -172,6 +199,9 @@ public function percentageProvider(): array
             ['-12%', -0.12],
             ['120%', 1.2],
             ['12.5%', 0.125],
+            ['-12.5%', -0.125],
+            ['12,345%', 123.45],
+            ['12,345.67%', 123.4567],
         ];
     }