Skip to content

Commit 803253e

Browse files
committed
Merge branch '3.0'
* 3.0: [DependencyInjection] fix dumped YAML snytax Remove InputOption::VALUE_REQUIRED mode from $default parameter description as InputOption::setDefault() throws an exception only when called in InputOption::VALUE_NONE mode. In practice the $default value could still be accessed in InputOption::VALUE_REQUIRED mode in case InputOption was never set but accessed from InputDefinition::getOption() method [Yaml] always restore the error handler in tests [FrameworkBundle] fix YAML syntax fix YAML syntax in functional tests config [HttpFoundation] [Session] Removed unnecessary PHP version check as minimum requirement is now 5.5.9 [Form] Fixed violation mapping if multiple forms are using the same (or part of the same) property path fix FQCN in tests added by #17694 Fix locale and written standard inconsistencies for Norwegian translations [Form] [Validator] Fix locale inconsistencies in Norwegian translations [TwigBridge] Symfony 3.1 forward compatibility fixed CS [DependencyInjection] fixed exceptions thrown by get method of ContainerBuilder [Yaml] properly parse lists in object maps [FrameworkBundle] Remove unused private method. [Form] remove useless code in ResizeFormListener [Config] Fix EnumNodeDefinition to allow building enum nodes with one element [Form] remove deprecated empty_value_in_choices fix choice_value option in EntityType and add some tests
2 parents ccc7053 + ef10c5f commit 803253e

File tree

3 files changed

+4
-15
lines changed

3 files changed

+4
-15
lines changed

Console/Descriptor/TextDescriptor.php

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -411,17 +411,6 @@ private function formatRouterConfig(array $config)
411411
return trim($configAsString);
412412
}
413413

414-
/**
415-
* @param string $section
416-
* @param string $message
417-
*
418-
* @return string
419-
*/
420-
private function formatSection($section, $message)
421-
{
422-
return sprintf('<info>[%s]</info> %s', $section, $message);
423-
}
424-
425414
/**
426415
* @param callable $callable
427416
*

Tests/DependencyInjection/Fixtures/yml/assets.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
framework:
22
assets:
33
version: SomeVersionScheme
4-
version_format: %%s?version=%%s
4+
version_format: '%%s?version=%%s'
55
base_urls: http://cdn.example.com
66
packages:
77
images_path:
@@ -11,7 +11,7 @@ framework:
1111
base_urls: ["http://images1.example.com", "http://images2.example.com"]
1212
foo:
1313
version: 1.0.0
14-
version_format: %%s-%%s
14+
version_format: '%%s-%%s'
1515
bar:
1616
base_urls: ["https://bar2.example.com"]
1717
bar_version_strategy:

Tests/DependencyInjection/Fixtures/yml/full.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ framework:
1313
only_exceptions: true
1414
enabled: false
1515
router:
16-
resource: %kernel.root_dir%/config/routing.xml
16+
resource: '%kernel.root_dir%/config/routing.xml'
1717
type: xml
1818
session:
1919
storage_id: session.storage.native
@@ -48,7 +48,7 @@ framework:
4848
annotations:
4949
cache: file
5050
debug: true
51-
file_cache_dir: %kernel.cache_dir%/annotations
51+
file_cache_dir: '%kernel.cache_dir%/annotations'
5252
serializer:
5353
enabled: true
5454
enable_annotations: true

0 commit comments

Comments
 (0)