Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 808dcc8

Browse files
xabbuhxabbuh
committed
rename boolean and integer to bool and int
1 parent 62f0dbf commit 808dcc8

13 files changed

+37
-37
lines changed

‎src/Symfony/Component/Routing/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ CHANGELOG
44
3.2.0
55
-----
66

7-
* Added support for `boolean`, `integer`, `float`, `string`, `list` and `map` defaults.
7+
* Added support for `bool`, `int`, `float`, `string`, `list` and `map` defaults in XML configurations.
88

99
2.8.0
1010
-----

‎src/Symfony/Component/Routing/Loader/XmlFileLoader.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,9 @@ private function parseDefaultsConfig(\DOMElement $element, $path)
261261
return $this->parseDefaultNode($child, $path);
262262
}
263263

264-
// If the default element doesn't contain a nested "boolean", "integer",
265-
// "float", "string", "list" or "map" element, the element contents will
266-
// be treated as the string value of the associated default option.
264+
// If the default element doesn't contain a nested "bool", "int", "float",
265+
// "string", "list", or "map" element, the element contents will be treated
266+
// as the string value of the associated default option.
267267
return trim($element->textContent);
268268
}
269269

@@ -284,9 +284,9 @@ private function parseDefaultNode(\DOMElement $node, $path)
284284
}
285285

286286
switch ($node->localName) {
287-
case 'boolean':
287+
case 'bool':
288288
return 'true' === trim($node->nodeValue) || '1' === trim($node->nodeValue);
289-
case 'integer':
289+
case 'int':
290290
return (int) trim($node->nodeValue);
291291
case 'float':
292292
return (float) trim($node->nodeValue);
@@ -325,7 +325,7 @@ private function parseDefaultNode(\DOMElement $node, $path)
325325

326326
return $map;
327327
default:
328-
throw new \InvalidArgumentException(sprintf('Unknown tag "%s" used in file "%s". Expected "boolean", "integer", "float", "string", "list" or "map".', $node->localName, $path));
328+
throw new \InvalidArgumentException(sprintf('Unknown tag "%s" used in file "%s". Expected "bool", "int", "float", "string", "list", or "map".', $node->localName, $path));
329329
}
330330
}
331331

‎src/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656

5757
<xsd:complexType name="default" mixed="true">
5858
<xsd:choice minOccurs="0" maxOccurs="1">
59-
<xsd:element name="boolean" type="xsd:boolean" />
60-
<xsd:element name="integer" type="xsd:integer" />
59+
<xsd:element name="bool" type="xsd:boolean" />
60+
<xsd:element name="int" type="xsd:integer" />
6161
<xsd:element name="float" type="xsd:float" />
6262
<xsd:element name="string" type="xsd:string" />
6363
<xsd:element name="list" type="list" />
@@ -76,8 +76,8 @@
7676

7777
<xsd:complexType name="list">
7878
<xsd:choice minOccurs="0" maxOccurs="unbounded">
79-
<xsd:element name="boolean" nillable="true" type="xsd:boolean" />
80-
<xsd:element name="integer" nillable="true" type="xsd:integer" />
79+
<xsd:element name="bool" nillable="true" type="xsd:boolean" />
80+
<xsd:element name="int" nillable="true" type="xsd:integer" />
8181
<xsd:element name="float" nillable="true" type="xsd:float" />
8282
<xsd:element name="string" nillable="true" type="xsd:string" />
8383
<xsd:element name="list" nillable="true" type="list" />
@@ -87,24 +87,24 @@
8787

8888
<xsd:complexType name="map">
8989
<xsd:choice minOccurs="0" maxOccurs="unbounded">
90-
<xsd:element name="boolean" nillable="true" type="map-boolean-entry" />
91-
<xsd:element name="integer" nillable="true" type="map-integer-entry" />
90+
<xsd:element name="bool" nillable="true" type="map-bool-entry" />
91+
<xsd:element name="int" nillable="true" type="map-int-entry" />
9292
<xsd:element name="float" nillable="true" type="map-float-entry" />
9393
<xsd:element name="string" nillable="true" type="map-string-entry" />
9494
<xsd:element name="list" nillable="true" type="map-list-entry" />
9595
<xsd:element name="map" nillable="true" type="map-map-entry" />
9696
</xsd:choice>
9797
</xsd:complexType>
9898

99-
<xsd:complexType name="map-boolean-entry">
99+
<xsd:complexType name="map-bool-entry">
100100
<xsd:simpleContent>
101101
<xsd:extension base="xsd:boolean">
102102
<xsd:attribute name="key" type="xsd:string" use="required" />
103103
</xsd:extension>
104104
</xsd:simpleContent>
105105
</xsd:complexType>
106106

107-
<xsd:complexType name="map-integer-entry">
107+
<xsd:complexType name="map-int-entry">
108108
<xsd:simpleContent>
109109
<xsd:extension base="xsd:integer">
110110
<xsd:attribute name="key" type="xsd:string" use="required" />

‎src/Symfony/Component/Routing/Tests/Fixtures/list_defaults.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</default>
1111
<default key="values">
1212
<list>
13-
<boolean>true</boolean>
14-
<integer>1</integer>
13+
<bool>true</bool>
14+
<int>1</int>
1515
<float>3.5</float>
1616
<string>foo</string>
1717
</list>

‎src/Symfony/Component/Routing/Tests/Fixtures/list_in_list_defaults.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<default key="values">
1212
<list>
1313
<list>
14-
<boolean>true</boolean>
15-
<integer>1</integer>
14+
<bool>true</bool>
15+
<int>1</int>
1616
<float>3.5</float>
1717
<string>foo</string>
1818
</list>

‎src/Symfony/Component/Routing/Tests/Fixtures/list_in_map_defaults.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<default key="values">
1212
<map>
1313
<list key="list">
14-
<boolean>true</boolean>
15-
<integer>1</integer>
14+
<bool>true</bool>
15+
<int>1</int>
1616
<float>3.5</float>
1717
<string>foo</string>
1818
</list>

‎src/Symfony/Component/Routing/Tests/Fixtures/list_null_values.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</default>
1111
<default key="list">
1212
<list>
13-
<boolean xsi:nil="true" />
14-
<integer xsi:nil="true" />
13+
<bool xsi:nil="true" />
14+
<int xsi:nil="true" />
1515
<float xsi:nil="1" />
1616
<string xsi:nil="true" />
1717
<list xsi:nil="true" />

‎src/Symfony/Component/Routing/Tests/Fixtures/map_defaults.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</default>
1111
<default key="values">
1212
<map>
13-
<boolean key="public">true</boolean>
14-
<integer key="page">1</integer>
13+
<bool key="public">true</bool>
14+
<int key="page">1</int>
1515
<float key="price">3.5</float>
1616
<string key="title">foo</string>
1717
</map>

‎src/Symfony/Component/Routing/Tests/Fixtures/map_in_list_defaults.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<default key="values">
1212
<list>
1313
<map>
14-
<boolean key="public">true</boolean>
15-
<integer key="page">1</integer>
14+
<bool key="public">true</bool>
15+
<int key="page">1</int>
1616
<float key="price">3.5</float>
1717
<string key="title">foo</string>
1818
</map>

‎src/Symfony/Component/Routing/Tests/Fixtures/map_in_map_defaults.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<default key="values">
1212
<map>
1313
<map key="map">
14-
<boolean key="public">true</boolean>
15-
<integer key="page">1</integer>
14+
<bool key="public">true</bool>
15+
<int key="page">1</int>
1616
<float key="price">3.5</float>
1717
<string key="title">foo</string>
1818
</map>

‎src/Symfony/Component/Routing/Tests/Fixtures/map_null_values.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</default>
1111
<default key="map">
1212
<map>
13-
<boolean key="boolean" xsi:nil="true" />
14-
<integer key="integer" xsi:nil="true" />
13+
<bool key="boolean" xsi:nil="true" />
14+
<int key="integer" xsi:nil="true" />
1515
<float key="float" xsi:nil="true" />
1616
<string key="string" xsi:nil="1" />
1717
<list key="list" xsi:nil="true" />

‎src/Symfony/Component/Routing/Tests/Fixtures/namespaceprefix.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<r2:requirement xmlns:r2="http://symfony.com/schema/routing" key="_locale">en|fr|de</r2:requirement>
1111
<r:option key="compiler_class">RouteCompiler</r:option>
1212
<r:default key="page">
13-
<r3:integer xmlns:r3="http://symfony.com/schema/routing">1</r3:integer>
13+
<r3:int xmlns:r3="http://symfony.com/schema/routing">1</r3:int>
1414
</r:default>
1515
</r:route>
1616
</r:routes>

‎src/Symfony/Component/Routing/Tests/Fixtures/scalar_defaults.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@
1010
</default>
1111
<default key="slug" xsi:nil="true" />
1212
<default key="published">
13-
<boolean>true</boolean>
13+
<bool>true</bool>
1414
</default>
1515
<default key="page">
16-
<integer>1</integer>
16+
<int>1</int>
1717
</default>
1818
<default key="price">
1919
<float>3.5</float>
2020
</default>
2121
<default key="archived">
22-
<boolean>false</boolean>
22+
<bool>false</bool>
2323
</default>
2424
<default key="free">
25-
<boolean>1</boolean>
25+
<bool>1</bool>
2626
</default>
2727
<default key="locked">
28-
<boolean>0</boolean>
28+
<bool>0</bool>
2929
</default>
3030
<default key="foo" xsi:nil="true" />
3131
<default key="bar" xsi:nil="1" />

0 commit comments

Comments
 (0)