Solve format filter conflict cause in f9be3b1, reported by @nojimage,…

… at #87
cakephp · Jul 3, 2018 · ec2771e · ec2771e
1 parent 95977a9
commit ec2771e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -248,7 +248,7 @@ We can write in a view
 * `toReadableSize` maps to [`Cake\I18n\Number::toReadableSize`](https://book.cakephp.org/3.0/en/core-libraries/number.html#Cake\\I18n\\Number::toReadableSize)
 * `fromReadableSize` maps to [`Cake\I18n\Number::fromReadableSize`](https://book.cakephp.org/3.0/en/core-libraries/number.html#Cake\\I18n\\Number::fromReadableSize)
 * `toPercentage` maps to [`Cake\I18n\Number::toPercentage`](https://book.cakephp.org/3.0/en/core-libraries/number.html#Cake\\I18n\\Number::toPercentage)
-* `format` maps to [`Cake\I18n\Number::format`](https://book.cakephp.org/3.0/en/core-libraries/number.html#Cake\\I18n\\Number::format)
+* `number_format` maps to [`Cake\I18n\Number::format`](https://book.cakephp.org/3.0/en/core-libraries/number.html#Cake\\I18n\\Number::format)
 * `formatDelta` maps to [`Cake\I18n\Number::formatDelta`](https://book.cakephp.org/3.0/en/core-libraries/number.html#Cake\\I18n\\Number::formatDelta)
 * `currency` maps to [`Cake\I18n\Number::currency`](https://book.cakephp.org/3.0/en/core-libraries/number.html#Cake\\I18n\\Number::currency)
 * `substr` maps to [`substr`](http://php.net/substr)

diff --git a/src/Lib/Twig/Extension/Number.php b/src/Lib/Twig/Extension/Number.php
@@ -28,7 +28,7 @@ public function getFilters()
             new \Twig_SimpleFilter('toReadableSize', 'Cake\I18n\Number::toReadableSize'),
             new \Twig_SimpleFilter('fromReadableSize', 'Cake\I18n\Number::fromReadableSize'),
             new \Twig_SimpleFilter('toPercentage', 'Cake\I18n\Number::toPercentage'),
-            new \Twig_SimpleFilter('format', 'Cake\I18n\Number::format'),
+            new \Twig_SimpleFilter('number_format', 'Cake\I18n\Number::format'),
             new \Twig_SimpleFilter('formatDelta', 'Cake\I18n\Number::formatDelta'),
             new \Twig_SimpleFilter('currency', 'Cake\I18n\Number::currency'),
         ];