Merge pull request chapter-three#16 from m4olivei/14-zero-should-be-supported-unit

minnur · web-flow · commit 1312ecffde94 · 2017-02-14T11:47:52.000-08:00
Issue chapter-three#14 support an integer value of 0 as a supported unit.
diff --git a/src/Document/Base.php b/src/Document/Base.php
@@ -103,7 +103,7 @@ protected static function isSupportedUnit($value) {
       'cw',
       'pt',
     );
-    $re = '/^[1-9][0-9]*(' . implode('|', $units) . ')?$/';
+    $re = '/^(0|[1-9][0-9]*)(' . implode('|', $units) . ')?$/';
     return preg_match($re, $value);
   }
 
diff --git a/tests/Document/BaseTest.php b/tests/Document/BaseTest.php
@@ -110,7 +110,7 @@ public function testSetters() {
     }
     foreach (array(
         // Integers.
-        1, 10, 515,
+        0, 1, 10, 515,
         // With unit.
         '1vh', '10vw', '515vmin', '1vmax', '1gut', '1cw', '1pt',
       ) as $value

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ protected static function isSupportedUnit($value) {`
`103`	`103`	`'cw',`
`104`	`104`	`'pt',`
`105`	`105`	`);`
`106`		`- $re = '/^[1-9][0-9]*(' . implode('\|', $units) . ')?$/';`
	`106`	`+ $re = '/^(0\|[1-9][0-9]*)(' . implode('\|', $units) . ')?$/';`
`107`	`107`	`return preg_match($re, $value);`
`108`	`108`	`}`
`109`	`109`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public function testSetters() {`
`110`	`110`	`}`
`111`	`111`	`foreach (array(`
`112`	`112`	`// Integers.`
`113`		`- 1, 10, 515,`
	`113`	`+ 0, 1, 10, 515,`
`114`	`114`	`// With unit.`
`115`	`115`	`'1vh', '10vw', '515vmin', '1vmax', '1gut', '1cw', '1pt',`
`116`	`116`	`) as $value`