Merge branch 'release/1.0.2' into v1

nystudio107 · May 14, 2018 · 847c7e2 · 847c7e2
2 parents 1129e2f + e6ac982
commit 847c7e2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Units Changelog
 
+## 1.0.2 - 2018-05-14
+### Changed
+- Handle cases where there is no `min` or `max` properly in the validator
+
 ## 1.0.1 - 2018-05-14
 ### Changed
 - Added null checks in the Field's `init()` method

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "nystudio107/craft-units",
     "description": "Units is a plugin that can convert between any units of measure, and comes with a Field for content authors to use",
     "type": "craft-plugin",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/validators/EmbeddedUnitsDataValidator.php b/src/validators/EmbeddedUnitsDataValidator.php
@@ -108,12 +108,20 @@ protected function normalizeMinMax(UnitsData $unitsData)
             'units' => $this->units
         ];
         // Normalize the min
-        $config['value'] = $this->min;
-        $baseUnit = new UnitsData($config);
-        $this->min = $baseUnit->toUnit($unitsData->units);
+        if (!empty($this->min)) {
+            $config['value'] = (float)$this->min;
+            $baseUnit = new UnitsData($config);
+            $this->min = $baseUnit->toUnit($unitsData->units);
+        } else {
+            $this->min = null;
+        }
         // Normalize the max
-        $config['value'] = $this->max;
-        $baseUnit = new UnitsData($config);
-        $this->max = $baseUnit->toUnit($unitsData->units);
+        if (!empty($this->max)) {
+            $config['value'] = (float)$this->max;
+            $baseUnit = new UnitsData($config);
+            $this->max = $baseUnit->toUnit($unitsData->units);
+        } else {
+            $this->max = null;
+        }
     }
 }