Skip to content

Commit 37fb92f

Browse files
briedisbriedis
committed
Rename classes to avoid PHP7 conflicts
1 parent 92e1419 commit 37fb92f

14 files changed

Lines changed: 55 additions & 55 deletions

‎src/Briedis/ApiBuilder/Items/BaseItem.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function __construct($name = '', $description = ''){
5959
public function getDisplayTypeName(){
6060
$type = static::TYPE;
6161

62-
if($this instanceof Structure){
62+
if($this instanceof StructureItem){
6363
$type = $this->structure->getStructureName();
6464
}
6565

src/Briedis/ApiBuilder/Items/Boolean.php renamed to src/Briedis/ApiBuilder/Items/BooleanItem.php

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 Boolean extends BaseItem{
7+
class BooleanItem extends BaseItem{
88
const TYPE = 'boolean';
99

1010
public function validateValue($value){

src/Briedis/ApiBuilder/Items/Decimal.php renamed to src/Briedis/ApiBuilder/Items/DecimalItem.php

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 Decimal extends BaseItem{
7+
class DecimalItem extends BaseItem{
88
const TYPE = 'float';
99

1010
public function validateValue($value){

src/Briedis/ApiBuilder/Items/Integer.php renamed to src/Briedis/ApiBuilder/Items/IntegerItem.php

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 Integer extends BaseItem{
7+
class IntegerItem extends BaseItem{
88
const TYPE = 'integer';
99

1010
public function validateValue($value){

src/Briedis/ApiBuilder/Items/Mixed.php renamed to src/Briedis/ApiBuilder/Items/MixedItem.php

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 Mixed extends BaseItem{
7+
class MixedItem extends BaseItem{
88
const TYPE = 'mixed';
99

1010
protected function validateValue($value){

src/Briedis/ApiBuilder/Items/String.php renamed to src/Briedis/ApiBuilder/Items/StringItem.php

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 String extends BaseItem{
7+
class StringItem extends BaseItem{
88
const TYPE = 'string';
99

1010
public function validateValue($value){

src/Briedis/ApiBuilder/Items/Structure.php renamed to src/Briedis/ApiBuilder/Items/StructureItem.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use Briedis\ApiBuilder\StructureBuilder;
88

9-
class Structure extends BaseItem{
9+
class StructureItem extends BaseItem{
1010
/** @var StructureBuilder */
1111
public $structure;
1212

src/Briedis/ApiBuilder/Items/Upload.php renamed to src/Briedis/ApiBuilder/Items/UploadItem.php

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 Upload extends BaseItem{
7+
class UploadItem extends BaseItem{
88
const TYPE = 'upload';
99

1010
public function validateValue($value){

‎src/Briedis/ApiBuilder/StructureBuilder.php‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55

66

77
use Briedis\ApiBuilder\Items\BaseItem;
8-
use Briedis\ApiBuilder\Items\Boolean;
9-
use Briedis\ApiBuilder\Items\Decimal;
10-
use Briedis\ApiBuilder\Items\Integer;
11-
use Briedis\ApiBuilder\Items\Mixed;
12-
use Briedis\ApiBuilder\Items\String;
13-
use Briedis\ApiBuilder\Items\Structure;
14-
use Briedis\ApiBuilder\Items\Upload;
8+
use Briedis\ApiBuilder\Items\BooleanItem;
9+
use Briedis\ApiBuilder\Items\DecimalItem;
10+
use Briedis\ApiBuilder\Items\IntegerItem;
11+
use Briedis\ApiBuilder\Items\MixedItem;
12+
use Briedis\ApiBuilder\Items\StringItem;
13+
use Briedis\ApiBuilder\Items\StructureItem;
14+
use Briedis\ApiBuilder\Items\UploadItem;
1515

1616
class StructureBuilder implements StructureInterface{
1717
/**
@@ -70,7 +70,7 @@ public function getItemByName($itemName){
7070
* @return StructureBuilder
7171
*/
7272
public function int($name, $description = ''){
73-
return $this->addItem(new Integer($name, $description));
73+
return $this->addItem(new IntegerItem($name, $description));
7474
}
7575

7676
/**
@@ -80,7 +80,7 @@ public function int($name, $description = ''){
8080
* @return StructureBuilder
8181
*/
8282
public function str($name, $description = ''){
83-
return $this->addItem(new String($name, $description));
83+
return $this->addItem(new StringItem($name, $description));
8484
}
8585

8686
/**
@@ -90,7 +90,7 @@ public function str($name, $description = ''){
9090
* @return StructureBuilder
9191
*/
9292
public function float($name, $description = ''){
93-
return $this->addItem(new Decimal($name, $description));
93+
return $this->addItem(new DecimalItem($name, $description));
9494
}
9595

9696
/**
@@ -100,7 +100,7 @@ public function float($name, $description = ''){
100100
* @return StructureBuilder
101101
*/
102102
public function bool($name, $description = ''){
103-
return $this->addItem(new Boolean($name, $description));
103+
return $this->addItem(new BooleanItem($name, $description));
104104
}
105105

106106
/**
@@ -110,7 +110,7 @@ public function bool($name, $description = ''){
110110
* @return StructureBuilder
111111
*/
112112
public function upload($name, $description = ''){
113-
return $this->addItem(new Upload($name, $description));
113+
return $this->addItem(new UploadItem($name, $description));
114114
}
115115

116116
/**
@@ -120,7 +120,7 @@ public function upload($name, $description = ''){
120120
* @return StructureBuilder
121121
*/
122122
public function mixed($name, $description = ''){
123-
return $this->addItem(new Mixed($name, $description));
123+
return $this->addItem(new MixedItem($name, $description));
124124
}
125125

126126
/**
@@ -131,7 +131,7 @@ public function mixed($name, $description = ''){
131131
* @return StructureBuilder
132132
*/
133133
public function struct($name, StructureInterface $structure, $description = ''){
134-
$item = new Structure($name, $description);
134+
$item = new StructureItem($name, $description);
135135
$item->structure = $structure->getStructure();
136136
return $this->addItem($item);
137137
}
@@ -151,7 +151,7 @@ public function optional(){
151151
* @return self
152152
*/
153153
public function values(array $values){
154-
if($this->lastItem instanceof Structure || $this->lastItem instanceof Boolean){
154+
if($this->lastItem instanceof StructureItem || $this->lastItem instanceof BooleanItem){
155155
throw new \InvalidArgumentException('Cannot mark this type as an enumerable');
156156
}
157157
$this->lastItem->isFixedValues = true;

‎src/Briedis/ApiBuilder/StructureValidator.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use Briedis\ApiBuilder\Exceptions\InvalidParameterTypeException;
88
use Briedis\ApiBuilder\Exceptions\InvalidStructureException;
99
use Briedis\ApiBuilder\Exceptions\UnexpectedParameterException;
10-
use Briedis\ApiBuilder\Items\Structure;
10+
use Briedis\ApiBuilder\Items\StructureItem;
1111

1212
class StructureValidator{
1313

@@ -82,7 +82,7 @@ public function validateParam($name, $value){
8282
throw new UnexpectedParameterException;
8383
}
8484

85-
if($item instanceof Structure){
85+
if($item instanceof StructureItem){
8686
// Recursive validation
8787
$validator = new self($item->structure, $this->parameterDepthStack);
8888
$validator->validate($value);

0 commit comments

Comments
 (0)