Skip to content

Commit 575ce2b

Browse files
Jean-BeruJean-Beru
committed
rename
1 parent bf820d0 commit 575ce2b

File tree

14 files changed

+36
-36
lines changed

14 files changed

+36
-36
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,7 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode, callable $e
931931
->fixXmlConfig('fallback')
932932
->fixXmlConfig('path')
933933
->fixXmlConfig('provider')
934-
->fixXmlConfig('default_parameter')
934+
->fixXmlConfig('global')
935935
->children()
936936
->arrayNode('fallbacks')
937937
->info('Defaults to the value of "default_locale".')
@@ -986,8 +986,8 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode, callable $e
986986
->end()
987987
->defaultValue([])
988988
->end()
989-
->arrayNode('default_parameters')
990-
->info('Default parameters.')
989+
->arrayNode('globals')
990+
->info('Global parameters.')
991991
->example(['app_version' => 3.14])
992992
->defaultValue([])
993993
->normalizeKeys(false)

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1568,13 +1568,13 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
15681568
}
15691569
}
15701570

1571-
if ([] !== $config['default_parameters']) {
1571+
if ([] !== $config['globals']) {
15721572
$container
15731573
->register('translator.default_parameters', DefaultParametersTranslator::class)
15741574
->setDecoratedService('translator', null, -1) // Lower priority than "translator.data_collector"
15751575
->setArguments([
15761576
new Reference('translator.default_parameters.inner'),
1577-
$config['default_parameters'],
1577+
$config['globals'],
15781578
]);
15791579
}
15801580

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,15 +231,15 @@
231231
<xsd:element name="path" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
232232
<xsd:element name="pseudo-localization" type="pseudo_localization" minOccurs="0" maxOccurs="1" />
233233
<xsd:element name="provider" type="translation_provider" minOccurs="0" maxOccurs="unbounded" />
234-
<xsd:element name="default-parameter" type="translation_default_parameter" minOccurs="0" maxOccurs="unbounded" />
234+
<xsd:element name="global" type="translation_global" minOccurs="0" maxOccurs="unbounded" />
235235
</xsd:sequence>
236236
<xsd:attribute name="enabled" type="xsd:boolean" />
237237
<xsd:attribute name="fallback" type="xsd:string" />
238238
<xsd:attribute name="logging" type="xsd:boolean" />
239239
<xsd:attribute name="formatter" type="xsd:string" />
240240
<xsd:attribute name="cache-dir" type="xsd:string" />
241241
<xsd:attribute name="default-path" type="xsd:string" />
242-
<xsd:attribute name="default-parameter" type="xsd:string" />
242+
<xsd:attribute name="global" type="xsd:string" />
243243
</xsd:complexType>
244244

245245
<xsd:complexType name="pseudo_localization">
@@ -262,7 +262,7 @@
262262
<xsd:attribute name="dsn" type="xsd:string" />
263263
</xsd:complexType>
264264

265-
<xsd:complexType name="translation_default_parameter" mixed="true">
265+
<xsd:complexType name="translation_global" mixed="true">
266266
<xsd:attribute name="name" type="xsd:string" use="required" />
267267
<xsd:attribute name="value" type="xsd:string" />
268268
</xsd:complexType>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ protected static function getBundleDefaultConfig()
668668
'localizable_html_attributes' => [],
669669
],
670670
'providers' => [],
671-
'default_parameters' => [],
671+
'globals' => [],
672672
],
673673
'validation' => [
674674
'enabled' => !class_exists(FullStack::class),

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/translator_default_parameters.php renamed to src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/translator_globals.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
'handle_all_throwables' => true,
77
'php_errors' => ['log' => true],
88
'translator' => [
9-
'default_parameters' => [
9+
'globals' => [
1010
'%%app_name%%' => 'My application',
1111
'{app_version}' => '1.2.3',
1212
],

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/translator_without_default_parameters.php renamed to src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/translator_without_globals.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
'http_method_override' => false,
66
'handle_all_throwables' => true,
77
'php_errors' => ['log' => true],
8-
'translator' => ['default_parameters' => []],
8+
'translator' => ['globals' => []],
99
]);

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/translator_default_parameters.xml renamed to src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/translator_globals.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<framework:annotations enabled="false" />
1111
<framework:php-errors log="true" />
1212
<framework:translator enabled="true">
13-
<framework:default-parameter name="%%app_name%%" value="My application" />
14-
<framework:default-parameter name="{app_version}" value="1.2.3" />
13+
<framework:global name="%%app_name%%" value="My application" />
14+
<framework:global name="{app_version}" value="1.2.3" />
1515
</framework:translator>
1616
</framework:config>
1717
</container>

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/translator_without_default_parameters.xml renamed to src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/translator_without_globals.xml

File renamed without changes.

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/translator_default_parameters.yml renamed to src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/translator_globals.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ framework:
55
php_errors:
66
log: true
77
translator:
8-
default_parameters:
8+
globals:
99
'%%app_name%%': 'My application'
1010
'{app_version}': '1.2.3'

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/translator_without_default_parameters.yml renamed to src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/translator_without_globals.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ framework:
55
php_errors:
66
log: true
77
translator:
8-
default_parameters: []
8+
globals: []

0 commit comments

Comments
 (0)