PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/Cell.php

Spacing +1 added lines, -1 removed lines

@@ -437,7 +437,7 @@
                     return in_array(strtolower($cellValue), explode(',', strtolower(trim($formula1, '"'))), true);
 
                 } else if (strpos($formula1, ':') > 0) {            // values list cells
-                    $match_formula = '=MATCH('.$this->getCoordinate().','.$formula1.',0)';
+                    $match_formula = '=MATCH(' . $this->getCoordinate() . ',' . $formula1 . ',0)';
 
                     try {
                         $result = Calculation::getInstance(

Braces +6 added lines, -4 removed lines

@@ -423,15 +423,17 @@
         $cellValue = $this->getValue();
         $cellValidation = $this->getDataValidation();
 
-        if (!$cellValidation->getAllowBlank() && (is_null($cellValue) || $cellValue == ""))
-            return false;
+        if (!$cellValidation->getAllowBlank() && (is_null($cellValue) || $cellValue == "")) {
+                    return false;
+        }
 
         // TODO: write check on all cases
         switch ($cellValidation->getType()) {
             case Cell\DataValidation::TYPE_LIST:
                 $formula1 = $cellValidation->getFormula1();
-                if (empty($formula1))
-                    break;
+                if (empty($formula1)) {
+                                    break;
+                }
 
                 if ($formula1[0] == '"') {                          // inline values list
                     return in_array(strtolower($cellValue), explode(',', strtolower(trim($formula1, '"'))), true);

tests/PhpSpreadsheetTests/CellTest.php

Spacing +3 added lines, -3 removed lines

@@ -332,7 +332,7 @@ 
         $testCell = $sheet->getCell('A1');
 
         $validation = $testCell->getDataValidation();
-        $validation->setType( \PhpOffice\PhpSpreadsheet\Cell\DataValidation::TYPE_LIST );
+        $validation->setType(\PhpOffice\PhpSpreadsheet\Cell\DataValidation::TYPE_LIST);
 
         // blank value
         $testCell->setValue("");
@@ -352,11 +352,11 @@ 
         $sheet->getCell('B1')->setValue(5);
         $sheet->getCell('B2')->setValue(6);
         $sheet->getCell('B3')->setValue(7);
-        $testCell = $sheet->getCell('A1');      // redefine $testCell, because it has broken coordinates after using other cells
+        $testCell = $sheet->getCell('A1'); // redefine $testCell, because it has broken coordinates after using other cells
         $validation->setFormula1('B1:B3');
         $testCell->setValue("10");
         self::assertEquals(false, $testCell->hasValidValue(), "cell value ('10') is not allowed");
-        $testCell = $sheet->getCell('A1');      // redefine $testCell, because it has broken coordinates after using other cells
+        $testCell = $sheet->getCell('A1'); // redefine $testCell, because it has broken coordinates after using other cells
         $testCell->setValue("5");
         self::assertEquals(true, $testCell->hasValidValue(), "cell value ('5') has to be allowed");
     }