Merge pull request #6566 from kenjis/refactor-view-filter-round

refactor: make $precision int in View Filter round
codeigniter4 · Sep 23, 2022 · 7959a37 · 7959a37
2 parents ca4fde6 + eafb028
commit 7959a37
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/system/View/Filters.php b/system/View/Filters.php
@@ -208,15 +208,18 @@ public static function prose(string $value): string
      *  - ceil      always rounds up
      *  - floor     always rounds down
      *
-     * @param int|string $precision
+     * @param int|string $precision precision or type
      *
      * @return float|string
      */
     public static function round(string $value, $precision = 2, string $type = 'common')
     {
+        // In case that $precision is a type like `{ value1|round(ceil) }`
         if (! is_numeric($precision)) {
             $type      = $precision;
             $precision = 2;
+        } else {
+            $precision = (int) $precision;
         }
 
         switch ($type) {

diff --git a/tests/system/View/ParserFilterTest.php b/tests/system/View/ParserFilterTest.php
@@ -270,13 +270,15 @@ public function testRound()
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
         $data = [
-            'value1' => 5.55,
+            'value1' => 5.555,
         ];
 
-        $template = '{ value1|round(1) } { value1|round(1, common) } { value1|round(ceil) } { value1|round(floor) } { value1|round(unknown) }';
+        $template = '{ value1|round(1) } / { value1|round(1, common) }'
+            . ' / { value1|round(ceil) } / { value1|round(floor) }'
+            . ' / { value1|round(unknown) }';
 
         $parser->setData($data);
-        $this->assertSame('5.6 5.6 6 5 5.55', $parser->renderString($template));
+        $this->assertSame('5.6 / 5.6 / 6 / 5 / 5.555', $parser->renderString($template));
     }
 
     public function testStripTags()