Fix #44: NumericHelper::toOrdinal throws an error for numbers with fractional part

Author: vjik

.github/workflows/static.yml

@@ -46,5 +46,5 @@ jobs:
  - name: Install dependencies with composer
  run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader
 
- - name: Static analysis with phan
- run: vendor/bin/phan --no-progress-bar --output-mode checkstyle | cs2pr --graceful-warnings --colorize
+ - name: Static analysis with psalm
+ run: vendor/bin/psalm --shepherd --stats --output-format=checkstyle | cs2pr --graceful-warnings --colorize

.gitignore

@@ -29,7 +29,3 @@ phpunit.phar
 /phpunit.xml
 # phpunit cache
 .phpunit.result.cache
-
-# Phan
-analysis.txt
-

.phan/config.php

@@ -1,4 +1,8 @@
-# Yii String Change Log
+# Yii Strings Change Log
+
+## 1.0.2 under development
+
+- Bug #44: `NumericHelper::toOrdinal` throws an error for numbers with fractional part (vjik)
 
 ## 1.0.1 October 12, 2020
 

CHANGELOG.md

@@ -21,9 +21,9 @@
  "ext-mbstring": "*"
  },
  "require-dev": {
- "infection/infection": "^0.17.0",
- "phan/phan": "^3.0",
- "phpunit/phpunit": "^9.3"
+ "infection/infection": "^0.16.6 || ^0.17.7",
+ "phpunit/phpunit": "^9.4",
+ "vimeo/psalm": "^3.17"
  },
  "autoload": {
  "psr-4": {

composer.json

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<psalm
+ errorLevel="6"
+ resolveFromConfigFile="true"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="https://getpsalm.org/schema/config"
+ xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+ <projectFiles>
+ <directory name="src" />
+ <ignoreFiles>
+ <directory name="vendor" />
+ </ignoreFiles>
+ </projectFiles>
+</psalm>

psalm.xml

@@ -22,7 +22,7 @@ public static function toOrdinal($value): string
  }
 
  if (fmod((float)$value, 1) !== 0.00) {
- return $value;
+ return (string)$value;
  }
 
  if (\in_array($value % 100, [11, 12, 13], true)) {

src/NumericHelper.php

@@ -23,6 +23,7 @@ public function testToOrdinal(): void
  $this->assertEquals('25th', NumericHelper::toOrdinal(25));
  $this->assertEquals('111th', NumericHelper::toOrdinal(111));
  $this->assertEquals('113th', NumericHelper::toOrdinal(113));
+ $this->assertEquals('2.01', NumericHelper::toOrdinal(2.01));
 
  $this->assertEquals('42nd', NumericHelper::toOrdinal('42'));
  $this->assertEquals('3.1415926', NumericHelper::toOrdinal('3.1415926'));