Skip to content

Commit 92e1419

Browse files
committed
Rename class Float to Decimal to avoid PHP7 conflict
1 parent 930df6c commit 92e1419

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
namespace Briedis\ApiBuilder\Items;
55

66

7-
class Float extends BaseItem{
7+
class Decimal extends BaseItem{
88
const TYPE = 'float';
99

1010
public function validateValue($value){

src/Briedis/ApiBuilder/StructureBuilder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use Briedis\ApiBuilder\Items\BaseItem;
88
use Briedis\ApiBuilder\Items\Boolean;
9-
use Briedis\ApiBuilder\Items\Float;
9+
use Briedis\ApiBuilder\Items\Decimal;
1010
use Briedis\ApiBuilder\Items\Integer;
1111
use Briedis\ApiBuilder\Items\Mixed;
1212
use Briedis\ApiBuilder\Items\String;
@@ -90,7 +90,7 @@ public function str($name, $description = ''){
9090
* @return StructureBuilder
9191
*/
9292
public function float($name, $description = ''){
93-
return $this->addItem(new Float($name, $description));
93+
return $this->addItem(new Decimal($name, $description));
9494
}
9595

9696
/**

tests/MultiDepthValidatorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
use Briedis\ApiBuilder\Exceptions\InvalidStructureException;
5-
use Briedis\ApiBuilder\Items\Float;
5+
use Briedis\ApiBuilder\Items\Decimal;
66
use Briedis\ApiBuilder\StructureBuilder as SB;
77
use Briedis\ApiBuilder\StructureValidator;
88

@@ -64,7 +64,7 @@ public function testInvalidStructure(){
6464
} catch(InvalidStructureException $e){
6565
$caught = true;
6666
$fields = $e->getBadFields();
67-
$this->assertInstanceOf(get_class(new Float), $fields['s11.decimal'], 'Correct field is missing');
67+
$this->assertInstanceOf(get_class(new Decimal), $fields['s11.decimal'], 'Correct field is missing');
6868
$this->assertEquals(1, count($fields), 'Bad parameter count matches');
6969
}
7070

tests/SingleDepthValidatorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
use Briedis\ApiBuilder\Exceptions\InvalidStructureException;
5-
use Briedis\ApiBuilder\Items\Float;
5+
use Briedis\ApiBuilder\Items\Decimal;
66
use Briedis\ApiBuilder\Items\Integer;
77
use Briedis\ApiBuilder\StructureBuilder;
88
use Briedis\ApiBuilder\StructureValidator;
@@ -73,7 +73,7 @@ public function testInvalidParam(){
7373
$fields = $e->getBadFields();
7474

7575
$this->assertInstanceOf(get_class(new Integer), $fields['id'], 'Correct field is invalid');
76-
$this->assertInstanceOf(get_class(new Float), $fields['decimal'], 'Correct field is invalid');
76+
$this->assertInstanceOf(get_class(new Decimal), $fields['decimal'], 'Correct field is invalid');
7777
$this->assertEquals(2, count($fields), 'Bad parameter count matches');
7878
}
7979

tests/TypeTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
use Briedis\ApiBuilder\Items\BaseItem;
44
use Briedis\ApiBuilder\Items\Boolean;
5-
use Briedis\ApiBuilder\Items\Float;
5+
use Briedis\ApiBuilder\Items\Decimal;
66
use Briedis\ApiBuilder\Items\Integer;
77
use Briedis\ApiBuilder\Items\Mixed;
88
use Briedis\ApiBuilder\Items\String;
@@ -58,7 +58,7 @@ public function testIsFloat(){
5858
'-1223',
5959
1.234,
6060
1e2,
61-
], new Float);
61+
], new Decimal);
6262
}
6363

6464
public function testIsNotFloat(){
@@ -72,7 +72,7 @@ public function testIsNotFloat(){
7272
'0xf4c3b00c',
7373
'0b10100111001',
7474
'0777',
75-
], new Float);
75+
], new Decimal);
7676
}
7777

7878
public function testIsString(){

0 commit comments

Comments
 (0)