theme2
-
+ %kernel.root_dir%/Fixtures/translations
+
[event_dispatcher] Registered listeners for event event1
-+-------+-------------------+
-| Order | Callable |
-+-------+-------------------+
-| #1 | global_function() |
-| #2 | \Closure() |
-+-------+-------------------+
++-------+-------------------+----------+
+| Order | Callable | Priority |
++-------+-------------------+----------+
+| #1 | global_function() | 255 |
+| #2 | \Closure() | -1 |
++-------+-------------------+----------+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.xml
index 4806f1f1280c7..bc03189af7b80 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.xml
@@ -1,5 +1,5 @@
-
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.json
index 56fc7a4f1e546..30772d9a4a212 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.json
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.json
@@ -2,16 +2,19 @@
"event1": [
{
"type": "function",
- "name": "global_function"
+ "name": "global_function",
+ "priority": 255
},
{
- "type": "closure"
+ "type": "closure",
+ "priority": -1
}
],
"event2": [
{
"type": "object",
- "name": "Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\CallableClass"
+ "name": "Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\CallableClass",
+ "priority": 0
}
]
}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.md
index ad4b79e3117fa..eb809789d5f17 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.md
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.md
@@ -6,10 +6,12 @@
- Type: `function`
- Name: `global_function`
+- Priority: `255`
### Listener 2
- Type: `closure`
+- Priority: `-1`
## event2
@@ -17,3 +19,4 @@
- Type: `object`
- Name: `Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass`
+- Priority: `0`
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt
index 95a5b4648e939..88e5dc9c89692 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt
@@ -1,16 +1,16 @@
[event_dispatcher] Registered listeners by event
[Event] event1
-+-------+-------------------+
-| Order | Callable |
-+-------+-------------------+
-| #1 | global_function() |
-| #2 | \Closure() |
-+-------+-------------------+
++-------+-------------------+----------+
+| Order | Callable | Priority |
++-------+-------------------+----------+
+| #1 | global_function() | 255 |
+| #2 | \Closure() | -1 |
++-------+-------------------+----------+
[Event] event2
-+-------+-----------------------------------------------------------------------------------+
-| Order | Callable |
-+-------+-----------------------------------------------------------------------------------+
-| #1 | Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::__invoke() |
-+-------+-----------------------------------------------------------------------------------+
++-------+-----------------------------------------------------------------------------------+----------+
+| Order | Callable | Priority |
++-------+-----------------------------------------------------------------------------------+----------+
+| #1 | Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::__invoke() | 0 |
++-------+-----------------------------------------------------------------------------------+----------+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.xml
index 3e4b20d823798..d7443f9743666 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.xml
@@ -1,10 +1,10 @@
-
-
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index d56a84ed1d5fb..b33c9d25afe87 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -17,36 +17,36 @@
],
"require": {
"php": ">=5.3.9",
- "symfony/asset": "~2.7",
+ "symfony/asset": "~2.7|~3.0.0",
"symfony/dependency-injection" : "~2.6,>=2.6.2",
"symfony/config" : "~2.4",
- "symfony/event-dispatcher": "~2.5",
- "symfony/http-foundation": "~2.4.9|~2.5,>=2.5.4",
- "symfony/http-kernel": "~2.7",
- "symfony/filesystem": "~2.3",
- "symfony/routing": "~2.6,>2.6.4",
- "symfony/security-core": "~2.6",
- "symfony/security-csrf": "~2.6",
- "symfony/stopwatch": "~2.3",
- "symfony/templating": "~2.1",
- "symfony/translation": "~2.7",
+ "symfony/event-dispatcher": "~2.5|~3.0.0",
+ "symfony/http-foundation": "~2.4.9|~2.5,>=2.5.4|~3.0.0",
+ "symfony/http-kernel": "~2.7|~3.0.0",
+ "symfony/filesystem": "~2.3|~3.0.0",
+ "symfony/routing": "~2.6,>2.6.4|~3.0.0",
+ "symfony/security-core": "~2.6|~3.0.0",
+ "symfony/security-csrf": "~2.6|~3.0.0",
+ "symfony/stopwatch": "~2.3|~3.0.0",
+ "symfony/templating": "~2.1|~3.0.0",
+ "symfony/translation": "~2.7|~3.0.0",
"doctrine/annotations": "~1.0"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
- "symfony/browser-kit": "~2.4",
- "symfony/console": "~2.7",
- "symfony/css-selector": "~2.0,>=2.0.5",
- "symfony/dom-crawler": "~2.0,>=2.0.5",
- "symfony/finder": "~2.0,>=2.0.5",
- "symfony/intl": "~2.3",
- "symfony/security": "~2.6",
- "symfony/form": "~2.7",
- "symfony/class-loader": "~2.1",
- "symfony/expression-language": "~2.6",
- "symfony/process": "~2.0,>=2.0.5",
- "symfony/validator": "~2.5",
- "symfony/yaml": "~2.0,>=2.0.5"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/browser-kit": "~2.4|~3.0.0",
+ "symfony/console": "~2.7|~3.0.0",
+ "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
+ "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
+ "symfony/finder": "~2.0,>=2.0.5|~3.0.0",
+ "symfony/intl": "~2.3|~3.0.0",
+ "symfony/security": "~2.6|~3.0.0",
+ "symfony/form": "~2.8|~3.0.0",
+ "symfony/class-loader": "~2.1|~3.0.0",
+ "symfony/expression-language": "~2.6|~3.0.0",
+ "symfony/process": "~2.0,>=2.0.5|~3.0.0",
+ "symfony/validator": "~2.5|~3.0.0",
+ "symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
},
"suggest": {
"symfony/console": "For using the console commands",
@@ -62,7 +62,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
index 55c251a40be69..a25b06094b8ce 100644
--- a/src/Symfony/Bundle/SecurityBundle/composer.json
+++ b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -17,25 +17,25 @@
],
"require": {
"php": ">=5.3.9",
- "symfony/security": "~2.7",
- "symfony/http-kernel": "~2.2"
+ "symfony/security": "~2.7|~3.0.0",
+ "symfony/http-kernel": "~2.2|~3.0.0"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
- "symfony/browser-kit": "~2.4",
- "symfony/console": "~2.7",
- "symfony/css-selector": "~2.0,>=2.0.5",
- "symfony/dependency-injection": "~2.6,>=2.6.6",
- "symfony/dom-crawler": "~2.0,>=2.0.5",
- "symfony/form": "~2.7",
- "symfony/framework-bundle": "~2.7",
- "symfony/http-foundation": "~2.3",
- "symfony/twig-bundle": "~2.7",
- "symfony/twig-bridge": "~2.7",
- "symfony/process": "~2.0,>=2.0.5",
- "symfony/validator": "~2.5",
- "symfony/yaml": "~2.0,>=2.0.5",
- "symfony/expression-language": "~2.6",
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/browser-kit": "~2.4|~3.0.0",
+ "symfony/console": "~2.7|~3.0.0",
+ "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
+ "symfony/dependency-injection": "~2.6,>=2.6.6|~3.0.0",
+ "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
+ "symfony/form": "~2.7|~3.0.0",
+ "symfony/framework-bundle": "~2.7|~3.0.0",
+ "symfony/http-foundation": "~2.3|~3.0.0",
+ "symfony/twig-bundle": "~2.7|~3.0.0",
+ "symfony/twig-bridge": "~2.7|~3.0.0",
+ "symfony/process": "~2.0,>=2.0.5|~3.0.0",
+ "symfony/validator": "~2.5|~3.0.0",
+ "symfony/yaml": "~2.0,>=2.0.5|~3.0.0",
+ "symfony/expression-language": "~2.6|~3.0.0",
"doctrine/doctrine-bundle": "~1.2",
"twig/twig": "~1.12",
"ircmaxell/password-compat": "~1.0"
@@ -46,7 +46,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
index 61c85d33e3ed0..da7f1fd603665 100644
--- a/src/Symfony/Bundle/TwigBundle/composer.json
+++ b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -17,20 +17,20 @@
],
"require": {
"php": ">=5.3.9",
- "symfony/asset": "~2.7",
- "symfony/twig-bridge": "~2.7",
- "symfony/http-foundation": "~2.5",
+ "symfony/asset": "~2.7|~3.0.0",
+ "symfony/twig-bridge": "~2.7|~3.0.0",
+ "symfony/http-foundation": "~2.5|~3.0.0",
"symfony/http-kernel": "~2.7"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
- "symfony/stopwatch": "~2.2",
- "symfony/dependency-injection": "~2.6,>=2.6.6",
- "symfony/expression-language": "~2.4",
- "symfony/config": "~2.2",
- "symfony/routing": "~2.1",
- "symfony/templating": "~2.1",
- "symfony/framework-bundle": "~2.7"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/stopwatch": "~2.2|~3.0.0",
+ "symfony/dependency-injection": "~2.6,>=2.6.6|~3.0.0",
+ "symfony/expression-language": "~2.4|~3.0.0",
+ "symfony/config": "~2.2|~3.0.0",
+ "symfony/routing": "~2.1|~3.0.0",
+ "symfony/templating": "~2.1|~3.0.0",
+ "symfony/framework-bundle": "~2.7|~3.0.0"
},
"autoload": {
"psr-4": { "Symfony\\Bundle\\TwigBundle\\": "" }
@@ -38,7 +38,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
index 32a63b4b4ca57..b27d783ded3c3 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
@@ -87,20 +87,30 @@
{% if collector.logs %}
-
+
+
+ #
+ Priority
+ Channel
+ Message and context
+
+
{% set log_loop_index = 0 %}
{% for log in collector.logs %}
{% set is_deprecation = log.context.level is defined and log.context.type is defined and (constant('E_DEPRECATED') == log.context.type or constant('E_USER_DEPRECATED') == log.context.type) %}
{% if priority == '-100' ? is_deprecation : log.priority >= priority %}
{% set log_loop_index = log_loop_index + 1 %}
-
- {{ logger.display_message(loop.index, log, is_deprecation) }}
-
+
+ {{ log_loop_index }}
+ {{ is_deprecation ? 'DEPRECATION' : log.priorityName }}
+ {{ log.channel is defined ? log.channel }}
+ {{ logger.display_message(loop.index, log, is_deprecation) }}
+
{% endif %}
{% else %}
- No logs available for this priority. No logs available for {{ priority }} priority.
{% else %}
No logs available.
@@ -114,7 +124,7 @@
{% set stack = log.context.stack|default([]) %}
{% set id = 'sf-call-stack-' ~ log_index %}
- DEPRECATED - {{ log.message }}
+ {{ log.message }}
{% if stack %}
@@ -144,7 +154,7 @@
{% endif %}
{% endfor %}
{% else %}
- {{ log.priorityName }} - {{ log.message }}
+ {{ log.message }}
{% if log.context is defined and log.context is not empty %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
index 4972a0f75bf88..4d84a6931ccea 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
@@ -179,7 +179,7 @@ pre, code {
width: 250px;
margin-left: -100%;
}
-#collector-content table td {
+table td {
background-color: white;
}
h1 {
@@ -273,15 +273,15 @@ ul.alt li {
ul.alt li.even {
background: #f1f7e2;
}
-ul.alt li.error {
+ul.alt li.error, tr.error td {
background-color: #f66;
margin-bottom: 1px;
}
-ul.alt li.warning {
+ul.alt li.warning, tr.warning td {
background-color: #ffcc00;
margin-bottom: 1px;
}
-ul.alt li.scream, ul.alt li.scream strong {
+ul.alt li.scream, ul.alt li.scream strong, tr.scream td, tr.scream strong {
color: gray;
}
ul.sf-call-stack li {
diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json
index d4a2316d7230c..6c71f5da83840 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/composer.json
+++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json
@@ -17,16 +17,16 @@
],
"require": {
"php": ">=5.3.9",
- "symfony/http-kernel": "~2.4",
- "symfony/routing": "~2.2",
- "symfony/twig-bridge": "~2.7"
+ "symfony/http-kernel": "~2.4|~3.0.0",
+ "symfony/routing": "~2.2|~3.0.0",
+ "symfony/twig-bridge": "~2.7|~3.0.0"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
- "symfony/config": "~2.2",
- "symfony/console": "~2.3",
- "symfony/dependency-injection": "~2.2",
- "symfony/stopwatch": "~2.2"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/config": "~2.2|~3.0.0",
+ "symfony/console": "~2.3|~3.0.0",
+ "symfony/dependency-injection": "~2.2|~3.0.0",
+ "symfony/stopwatch": "~2.2|~3.0.0"
},
"autoload": {
"psr-4": { "Symfony\\Bundle\\WebProfilerBundle\\": "" }
@@ -34,7 +34,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Asset/composer.json b/src/Symfony/Component/Asset/composer.json
index 88da5124794d4..5bc99e0a7a5c7 100644
--- a/src/Symfony/Component/Asset/composer.json
+++ b/src/Symfony/Component/Asset/composer.json
@@ -22,7 +22,7 @@
"symfony/http-foundation": ""
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
"symfony/http-foundation": "~2.4"
},
"autoload": {
@@ -31,7 +31,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/BrowserKit/composer.json b/src/Symfony/Component/BrowserKit/composer.json
index 0cb629c085424..5146b781a5164 100644
--- a/src/Symfony/Component/BrowserKit/composer.json
+++ b/src/Symfony/Component/BrowserKit/composer.json
@@ -17,12 +17,12 @@
],
"require": {
"php": ">=5.3.9",
- "symfony/dom-crawler": "~2.0,>=2.0.5"
+ "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
- "symfony/process": "~2.0,>=2.0.5",
- "symfony/css-selector": "~2.0,>=2.0.5"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/process": "~2.0,>=2.0.5|~3.0.0",
+ "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0"
},
"suggest": {
"symfony/process": ""
@@ -33,7 +33,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/ClassLoader/composer.json b/src/Symfony/Component/ClassLoader/composer.json
index 6d011b5082554..51f6358161b0a 100644
--- a/src/Symfony/Component/ClassLoader/composer.json
+++ b/src/Symfony/Component/ClassLoader/composer.json
@@ -20,15 +20,15 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
- "symfony/finder": "~2.0,>=2.0.5"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/finder": "~2.0,>=2.0.5|~3.0.0"
},
"autoload": {
"psr-4": { "Symfony\\Component\\ClassLoader\\": "" }
},
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Config/composer.json b/src/Symfony/Component/Config/composer.json
index a14d93572f5ed..b3ba2a29fccf3 100644
--- a/src/Symfony/Component/Config/composer.json
+++ b/src/Symfony/Component/Config/composer.json
@@ -17,10 +17,10 @@
],
"require": {
"php": ">=5.3.9",
- "symfony/filesystem": "~2.3"
+ "symfony/filesystem": "~2.3|~3.0.0"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Config\\": "" }
@@ -28,7 +28,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index 02e207eac775c..0b968809938d3 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -284,6 +284,13 @@ public function setCode($code)
throw new \InvalidArgumentException('Invalid callable provided to Command::setCode.');
}
+ if (PHP_VERSION_ID >= 50400 && $code instanceof \Closure) {
+ $r = new \ReflectionFunction($code);
+ if (null === $r->getClosureThis()) {
+ $code = \Closure::bind($code, $this);
+ }
+ }
+
$this->code = $code;
return $this;
diff --git a/src/Symfony/Component/Console/Tests/Command/CommandTest.php b/src/Symfony/Component/Console/Tests/Command/CommandTest.php
index 08761163eb2d8..42b2944ba77bb 100644
--- a/src/Symfony/Component/Console/Tests/Command/CommandTest.php
+++ b/src/Symfony/Component/Console/Tests/Command/CommandTest.php
@@ -293,6 +293,33 @@ public function testSetCode()
$this->assertEquals('interact called'.PHP_EOL.'from the code...'.PHP_EOL, $tester->getDisplay());
}
+ public function getSetCodeBindToClosureTests()
+ {
+ return array(
+ array(true, 'not bound to the command'),
+ array(false, 'bound to the command'),
+ );
+ }
+
+ /** @dataProvider getSetCodeBindToClosureTests */
+ public function testSetCodeBindToClosure($previouslyBound, $expected)
+ {
+ if (PHP_VERSION_ID < 50400) {
+ $this->markTestSkipped('Test skipped, for PHP 5.4+ only.');
+ }
+
+ $code = createClosure();
+ if ($previouslyBound) {
+ $code = $code->bindTo($this);
+ }
+
+ $command = new \TestCommand();
+ $command->setCode($code);
+ $tester = new CommandTester($command);
+ $tester->execute(array());
+ $this->assertEquals('interact called'.PHP_EOL.$expected.PHP_EOL, $tester->getDisplay());
+ }
+
public function testSetCodeWithNonClosureCallable()
{
$command = new \TestCommand();
@@ -346,3 +373,13 @@ public function testLegacyAsXml()
$this->assertXmlStringEqualsXmlFile(self::$fixturesPath.'/command_asxml.txt', $command->asXml(), '->asXml() returns an XML representation of the command');
}
}
+
+// In order to get an unbound closure, we should create it outside a class
+// scope.
+function createClosure()
+{
+ return function(InputInterface $input, OutputInterface $output)
+ {
+ $output->writeln($this instanceof Command ? 'bound to the command' : 'not bound to the command');
+ };
+}
diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json
index 16b7b81245275..706e5e5df7826 100644
--- a/src/Symfony/Component/Console/composer.json
+++ b/src/Symfony/Component/Console/composer.json
@@ -19,9 +19,9 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
- "symfony/event-dispatcher": "~2.1",
- "symfony/process": "~2.1",
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/event-dispatcher": "~2.1|~3.0.0",
+ "symfony/process": "~2.1|~3.0.0",
"psr/log": "~1.0"
},
"suggest": {
@@ -35,7 +35,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/CssSelector/composer.json b/src/Symfony/Component/CssSelector/composer.json
index c7aebf7098550..e6d85af5ffbdc 100644
--- a/src/Symfony/Component/CssSelector/composer.json
+++ b/src/Symfony/Component/CssSelector/composer.json
@@ -23,7 +23,7 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0"
},
"autoload": {
"psr-4": { "Symfony\\Component\\CssSelector\\": "" }
@@ -31,7 +31,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Debug/composer.json b/src/Symfony/Component/Debug/composer.json
index 3b1568831177e..17c56460cb703 100644
--- a/src/Symfony/Component/Debug/composer.json
+++ b/src/Symfony/Component/Debug/composer.json
@@ -23,10 +23,10 @@
"symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
- "symfony/class-loader": "~2.2",
- "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2",
- "symfony/http-foundation": "~2.1"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/class-loader": "~2.2|~3.0.0",
+ "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2|~3.0.0",
+ "symfony/http-foundation": "~2.1|~3.0.0"
},
"suggest": {
"symfony/http-foundation": "",
@@ -38,7 +38,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json
index bbfed43d45899..1f5d174d7dabd 100644
--- a/src/Symfony/Component/DependencyInjection/composer.json
+++ b/src/Symfony/Component/DependencyInjection/composer.json
@@ -19,10 +19,10 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
- "symfony/yaml": "~2.1",
- "symfony/config": "~2.2",
- "symfony/expression-language": "~2.6"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/yaml": "~2.1|~3.0.0",
+ "symfony/config": "~2.2|~3.0.0",
+ "symfony/expression-language": "~2.6|~3.0.0"
},
"conflict": {
"symfony/expression-language": "<2.6"
@@ -38,7 +38,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/DomCrawler/composer.json b/src/Symfony/Component/DomCrawler/composer.json
index f3dc8c9bd429f..4b3b5f2df3e29 100644
--- a/src/Symfony/Component/DomCrawler/composer.json
+++ b/src/Symfony/Component/DomCrawler/composer.json
@@ -19,8 +19,8 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
- "symfony/css-selector": "~2.3"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/css-selector": "~2.3|~3.0.0"
},
"suggest": {
"symfony/css-selector": ""
@@ -31,7 +31,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php b/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php
index 76f0e387762a3..e71da1fb67163 100644
--- a/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php
+++ b/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php
@@ -118,7 +118,7 @@ public function hasListeners($eventName = null)
/**
* @see EventDispatcherInterface::getListeners()
*/
- public function getListeners($eventName = null)
+ public function getListeners($eventName = null, $withPriorities = false)
{
if (null === $eventName) {
foreach ($this->listenerIds as $serviceEventName => $args) {
@@ -128,7 +128,7 @@ public function getListeners($eventName = null)
$this->lazyLoad($eventName);
}
- return parent::getListeners($eventName);
+ return parent::getListeners($eventName, $withPriorities);
}
/**
diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
index 7653ccfb7175f..0106f74f3a302 100644
--- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
+++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
@@ -94,9 +94,9 @@ public function removeSubscriber(EventSubscriberInterface $subscriber)
/**
* {@inheritdoc}
*/
- public function getListeners($eventName = null)
+ public function getListeners($eventName = null, $withPriorities = false)
{
- return $this->dispatcher->getListeners($eventName);
+ return $this->dispatcher->getListeners($eventName, $withPriorities);
}
/**
diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcher.php b/src/Symfony/Component/EventDispatcher/EventDispatcher.php
index 46c11100b3416..e3d587939f985 100644
--- a/src/Symfony/Component/EventDispatcher/EventDispatcher.php
+++ b/src/Symfony/Component/EventDispatcher/EventDispatcher.php
@@ -58,8 +58,12 @@ public function dispatch($eventName, Event $event = null)
/**
* @see EventDispatcherInterface::getListeners()
*/
- public function getListeners($eventName = null)
+ public function getListeners($eventName = null, $withPriorities = false)
{
+ if (true === $withPriorities) {
+ return $eventName ? $this->listeners[$eventName] : array_filter($this->listeners);
+ }
+
if (null !== $eventName) {
if (!isset($this->sorted[$eventName])) {
$this->sortListeners($eventName);
diff --git a/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php
index 7ef9ece75718f..f979304e9cee2 100644
--- a/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php
+++ b/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php
@@ -78,9 +78,9 @@ public function removeSubscriber(EventSubscriberInterface $subscriber)
/**
* {@inheritdoc}
*/
- public function getListeners($eventName = null)
+ public function getListeners($eventName = null, $withPriorities = false)
{
- return $this->dispatcher->getListeners($eventName);
+ return $this->dispatcher->getListeners($eventName, $withPriorities);
}
/**
diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json
index d705862916250..b3d3f6e3fee82 100644
--- a/src/Symfony/Component/EventDispatcher/composer.json
+++ b/src/Symfony/Component/EventDispatcher/composer.json
@@ -19,11 +19,11 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
- "symfony/dependency-injection": "~2.6",
- "symfony/expression-language": "~2.6",
- "symfony/config": "~2.0,>=2.0.5",
- "symfony/stopwatch": "~2.3",
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/dependency-injection": "~2.6|~3.0.0",
+ "symfony/expression-language": "~2.6|~3.0.0",
+ "symfony/config": "~2.0,>=2.0.5|~3.0.0",
+ "symfony/stopwatch": "~2.3|~3.0.0",
"psr/log": "~1.0"
},
"suggest": {
@@ -36,7 +36,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/ExpressionLanguage/composer.json b/src/Symfony/Component/ExpressionLanguage/composer.json
index 1eff04fa88947..125014fdbf0f9 100644
--- a/src/Symfony/Component/ExpressionLanguage/composer.json
+++ b/src/Symfony/Component/ExpressionLanguage/composer.json
@@ -19,7 +19,7 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0"
},
"autoload": {
"psr-4": { "Symfony\\Component\\ExpressionLanguage\\": "" }
@@ -27,7 +27,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Filesystem/composer.json b/src/Symfony/Component/Filesystem/composer.json
index 820d9f1bac675..2321690f97635 100644
--- a/src/Symfony/Component/Filesystem/composer.json
+++ b/src/Symfony/Component/Filesystem/composer.json
@@ -19,7 +19,7 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Filesystem\\": "" }
@@ -27,7 +27,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Finder/composer.json b/src/Symfony/Component/Finder/composer.json
index 8135e158ad261..b9e363d21c0f9 100644
--- a/src/Symfony/Component/Finder/composer.json
+++ b/src/Symfony/Component/Finder/composer.json
@@ -19,7 +19,7 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Finder\\": "" }
@@ -27,7 +27,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
index b1387bb2e6396..a4c8aa1912b5f 100644
--- a/src/Symfony/Component/Form/CHANGELOG.md
+++ b/src/Symfony/Component/Form/CHANGELOG.md
@@ -1,6 +1,11 @@
CHANGELOG
=========
+2.8.0
+-----
+
+ * deprecated option "read_only" in favor of "attr['readonly']"
+
2.7.0
-----
diff --git a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php
index 231994258e8d6..bc63e4c35075b 100644
--- a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php
+++ b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php
@@ -52,6 +52,7 @@ protected function loadTypes()
new Type\CollectionType(),
new Type\CountryType(),
new Type\DateType(),
+ new Type\DateIntervalType(),
new Type\DateTimeType(),
new Type\EmailType(),
new Type\HiddenType(),
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php
new file mode 100644
index 0000000000000..e372944e19ade
--- /dev/null
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php
@@ -0,0 +1,167 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Extension\Core\DataTransformer;
+
+use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\Form\Exception\TransformationFailedException;
+
+/**
+ * Transforms between a normalized date interval and an interval string/array.
+ *
+ * @author Steffen Roßkamp
+ */
+class DateIntervalToArrayTransformer implements DataTransformerInterface
+{
+ private $fields;
+ private $availableFields = array(
+ 'years' => 'y',
+ 'months' => 'm',
+ 'days' => 'd',
+ 'hours' => 'h',
+ 'minutes' => 'i',
+ 'seconds' => 's',
+ 'invert' => 'r',
+ );
+
+ /**
+ * Constructor.
+ *
+ * @param array $fields The date fields
+ * @param bool $pad Whether to use padding
+ */
+ public function __construct(array $fields = null, $pad = false)
+ {
+ if (null === $fields) {
+ $fields = array('years', 'months', 'days', 'hours', 'minutes', 'seconds', 'invert');
+ }
+ $this->fields = $fields;
+ $this->pad = (bool) $pad;
+ }
+
+ /**
+ * Transforms a normalized date interval into an interval array.
+ *
+ * @param \DateInterval $dateInterval Normalized date interval.
+ * @return array Interval array.
+ * @throws TransformationFailedException If the given value is not a \DateInterval instance.
+ */
+ public function transform($dateInterval)
+ {
+ if (null === $dateInterval) {
+ return array_intersect_key(
+ array(
+ 'years' => '',
+ 'months' => '',
+ 'weeks' => '',
+ 'days' => '',
+ 'hours' => '',
+ 'minutes' => '',
+ 'seconds' => '',
+ 'invert' => false,
+ ),
+ array_flip($this->fields)
+ );
+ }
+ if (!$dateInterval instanceof \DateInterval) {
+ throw new TransformationFailedException('Expected a \DateInterval.');
+ }
+ $result = array();
+ foreach ($this->availableFields as $field => $char) {
+ $result[$field] = $dateInterval->format('%'.($this->pad ? strtoupper($char) : $char));
+ }
+ if (in_array('weeks', $this->fields, true)) {
+ $result['weeks'] = 0;
+ if (isset($result['days']) && (int) $result['days'] >= 7) {
+ $result['weeks'] = (string) floor($result['days'] / 7);
+ $result['days'] = (string) ($result['days'] % 7);
+ }
+ }
+ $result['invert'] = '-' === $result['invert'];
+ $result = array_intersect_key($result, array_flip($this->fields));
+
+ return $result;
+ }
+
+ /**
+ * Transforms an interval array into a normalized date interval.
+ *
+ * @param array $value Interval array
+ * @return \DateInterval Normalized date interval
+ * @throws TransformationFailedException If the given value is not an array or
+ * if the value could not be transformed.
+ */
+ public function reverseTransform($value)
+ {
+ if (null === $value) {
+ return;
+ }
+ if (!is_array($value)) {
+ throw new TransformationFailedException('Expected an array.');
+ }
+ if ('' === implode('', $value)) {
+ return;
+ }
+ $emptyFields = array();
+ foreach ($this->fields as $field) {
+ if (!isset($value[$field])) {
+ $emptyFields[] = $field;
+ }
+ }
+ if (count($emptyFields) > 0) {
+ throw new TransformationFailedException(
+ sprintf(
+ 'The fields "%s" should not be empty',
+ implode('", "', $emptyFields)
+ )
+ );
+ }
+ if (isset($value['invert']) && !is_bool($value['invert'])) {
+ throw new TransformationFailedException('The value of "invert" must be boolean');
+ }
+ foreach ($this->availableFields as $field => $char) {
+ if ($field !== 'invert' && isset($value[$field]) && !ctype_digit((string) $value[$field])) {
+ throw new TransformationFailedException(sprintf('This amount of "%s" is invalid', $field));
+ }
+ }
+ try {
+ if (!empty($value['weeks'])) {
+ $interval = sprintf(
+ 'P%sY%sM%sWT%sH%sM%sS',
+ empty($value['years']) ? '0' : $value['years'],
+ empty($value['months']) ? '0' : $value['months'],
+ empty($value['weeks']) ? '0' : $value['weeks'],
+ empty($value['hours']) ? '0' : $value['hours'],
+ empty($value['minutes']) ? '0' : $value['minutes'],
+ empty($value['seconds']) ? '0' : $value['seconds']
+ );
+ } else {
+ $interval = sprintf(
+ 'P%sY%sM%sDT%sH%sM%sS',
+ empty($value['years']) ? '0' : $value['years'],
+ empty($value['months']) ? '0' : $value['months'],
+ empty($value['days']) ? '0' : $value['days'],
+ empty($value['hours']) ? '0' : $value['hours'],
+ empty($value['minutes']) ? '0' : $value['minutes'],
+ empty($value['seconds']) ? '0' : $value['seconds']
+ );
+ }
+ $dateInterval = new \DateInterval($interval);
+ if (!empty($value['invert'])) {
+ $dateInterval->invert = $value['invert'] ? 1 : 0;
+ }
+ } catch (\Exception $e) {
+ throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
+ }
+
+ return $dateInterval;
+ }
+}
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToStringTransformer.php
new file mode 100644
index 0000000000000..9ef82154f25f8
--- /dev/null
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToStringTransformer.php
@@ -0,0 +1,121 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Extension\Core\DataTransformer;
+
+use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\Form\Exception\TransformationFailedException;
+
+/**
+ * Transforms between a date string and a DateInterval object
+ *
+ * @author Steffen Roßkamp
+ */
+class DateIntervalToStringTransformer implements DataTransformerInterface
+{
+ /**
+ * Format used for generating strings
+ *
+ * @var string
+ */
+ private $format;
+
+ /**
+ * Whether to parse by as a signed interval
+ *
+ * @var bool
+ */
+ private $parseSigned;
+
+ /**
+ * Transforms a \DateInterval instance to a string
+ *
+ * @see \DateInterval::format() for supported formats
+ * @param string $format The date format
+ * @param bool $parseSigned Whether to parse as a signed interval
+ */
+ public function __construct($format = 'P%yY%mM%dDT%hH%iM%sS', $parseSigned = false)
+ {
+ $this->format = $format;
+ $this->parseSigned = $parseSigned;
+ }
+
+ /**
+ * Transforms a DateInterval object into a date string with the configured format
+ * and timezone
+ *
+ * @param \DateInterval $value A DateInterval object
+ * @return string An ISO 8601 or relative date string like date interval presentation
+ * @throws TransformationFailedException If the given value is not a \DateInterval instance.
+ */
+ public function transform($value)
+ {
+ if (null === $value) {
+ return '';
+ }
+ if (!$value instanceof \DateInterval) {
+ throw new TransformationFailedException('Expected a \DateInterval.');
+ }
+
+ return $value->format($this->format);
+ }
+
+ /**
+ * Transforms a date string in the configured into a DateInterval object.
+ *
+ * @param string $value An ISO 8601 or date string like date interval presentation
+ * @return \DateInterval An instance of \DateInterval
+ * @throws TransformationFailedException If the given value is not a string or
+ * if the date interval could not be parsed.
+ */
+ public function reverseTransform($value)
+ {
+ if (empty($value)) {
+ return;
+ }
+ if (!is_string($value)) {
+ throw new TransformationFailedException('Expected a string.');
+ }
+ try {
+ if ($this->isISO8601($value)) {
+ $valuePattern = '/^'.preg_replace('/%([yYmMdDhHiIsSwW])(\w)/', '(?P<$1>\d+)$2', $this->format).'$/';
+ if (!preg_match($valuePattern, $value)) {
+ throw new TransformationFailedException(
+ sprintf('Value "%s" contains intervals not accepted by format "%s".', $value, $this->format)
+ );
+ }
+ $dateInterval = new \DateInterval($value);
+ } else {
+ throw new TransformationFailedException('Non ISO 8601 date strings are not supported yet');
+ }
+ } catch (TransformationFailedException $e) {
+ throw $e;
+ } catch (\Exception $e) {
+ throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
+ }
+
+ return $dateInterval;
+ }
+
+ /**
+ * Checks if a string is a valid ISO 8601 duration string.
+ *
+ * @param string $string A string
+ * @return int
+ */
+ private function isISO8601($string)
+ {
+ return preg_match(
+ '/^P(?=\w*(?:\d|%\w))(?:\d+Y|%[yY]Y)?(?:\d+M|%[mM]M)?(?:(?:\d+D|%[dD]D)|(?:\d+W|%[wW]W))?(?:T(?:\d+H|[hH]H)?(?:\d+M|[iI]M)?(?:\d+S|[sS]S)?)?$/',
+ $string
+ );
+ }
+}
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
new file mode 100644
index 0000000000000..d8bcca436367d
--- /dev/null
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
@@ -0,0 +1,266 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Extension\Core\Type;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Exception\InvalidConfigurationException;
+use Symfony\Component\Form\Extension\Core\DataTransformer\DateIntervalToArrayTransformer;
+use Symfony\Component\Form\Extension\Core\DataTransformer\DateIntervalToStringTransformer;
+use Symfony\Component\Form\Extension\Core\DataTransformer\IntegerToLocalizedStringTransformer;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\Form\ReversedTransformer;
+use Symfony\Component\OptionsResolver\Options;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * @author Steffen Roßkamp
+ */
+class DateIntervalType extends AbstractType
+{
+ private $timeParts = array(
+ 'years',
+ 'months',
+ 'weeks',
+ 'days',
+ 'hours',
+ 'minutes',
+ 'seconds',
+ );
+
+ /**
+ * {@inheritdoc}
+ */
+ public function buildForm(FormBuilderInterface $builder, array $options)
+ {
+ if (!$options['with_years'] && !$options['with_months'] && !$options['with_weeks'] && !$options['with_days'] && !$options['with_hours'] && !$options['with_minutes'] && !$options['with_seconds']) {
+ throw new InvalidConfigurationException('You must enable at least one interval field.');
+ }
+ if ($options['with_invert'] && 'single_text' === $options['widget']) {
+ throw new InvalidConfigurationException('The single_text widget does not support invertible intervals.');
+ }
+ if ($options['with_weeks'] && $options['with_days']) {
+ throw new InvalidConfigurationException('You can not enable weeks and days fields together.');
+ }
+ $format = 'P';
+ $parts = array();
+ if ($options['with_years']) {
+ $format .= '%yY';
+ $parts[] = 'years';
+ }
+ if ($options['with_months']) {
+ $format .= '%mM';
+ $parts[] = 'months';
+ }
+ if ($options['with_weeks']) {
+ $format .= '%wW';
+ $parts[] = 'weeks';
+ }
+ if ($options['with_days']) {
+ $format .= '%dD';
+ $parts[] = 'days';
+ }
+ if ($options['with_hours'] || $options['with_minutes'] || $options['with_seconds']) {
+ $format .= 'T';
+ }
+ if ($options['with_hours']) {
+ $format .= '%hH';
+ $parts[] = 'hours';
+ }
+ if ($options['with_minutes']) {
+ $format .= '%iM';
+ $parts[] = 'minutes';
+ }
+ if ($options['with_seconds']) {
+ $format .= '%sS';
+ $parts[] = 'seconds';
+ }
+ if ($options['with_invert']) {
+ $parts[] = 'invert';
+ }
+ if ('single_text' === $options['widget']) {
+ $builder->addViewTransformer(new DateIntervalToStringTransformer($format));
+ } else {
+ $childOptions = array();
+ foreach ($this->timeParts as $part) {
+ if ($options['with_'.$part]) {
+ $childOptions[$part] = array();
+ $childOptions[$part]['error_bubbling'] = true;
+ if ('choice' === $options['widget']) {
+ $childOptions[$part]['choices'] = $options[$part];
+ $childOptions[$part]['placeholder'] = $options['placeholder'][$part];
+ }
+ }
+ }
+ $invertOptions = array(
+ 'error_bubbling' => true,
+ );
+ // Append generic carry-along options
+ foreach (array('required', 'translation_domain') as $passOpt) {
+ foreach ($this->timeParts as $part) {
+ if ($options['with_'.$part]) {
+ $childOptions[$part][$passOpt] = $options[$passOpt];
+ }
+ }
+ if ($options['with_invert']) {
+ $invertOptions[$passOpt] = $options[$passOpt];
+ }
+ }
+ foreach ($this->timeParts as $part) {
+ if ($options['with_'.$part]) {
+ $childForm = $builder->create($part, $options['widget'], $childOptions[$part]);
+ if ('integer' === $options['widget']) {
+ $childForm->addModelTransformer(
+ new ReversedTransformer(
+ new IntegerToLocalizedStringTransformer()
+ )
+ );
+ }
+ $builder->add($childForm);
+ }
+ }
+ if ($options['with_invert']) {
+ $builder->add('invert', 'checkbox', $invertOptions);
+ }
+ $builder->addViewTransformer(new DateIntervalToArrayTransformer($parts, 'text' === $options['widget']));
+ }
+ if ('string' === $options['input']) {
+ $builder->addModelTransformer(
+ new ReversedTransformer(
+ new DateIntervalToStringTransformer($format)
+ )
+ );
+ } elseif ('array' === $options['input']) {
+ $builder->addModelTransformer(
+ new ReversedTransformer(
+ new DateIntervalToArrayTransformer($parts)
+ )
+ );
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function buildView(FormView $view, FormInterface $form, array $options)
+ {
+ $vars = array(
+ 'widget' => $options['widget'],
+ 'with_invert' => $options['with_invert'],
+ );
+ foreach ($this->timeParts as $part) {
+ $vars['with_'.$part] = $options['with_'.$part];
+ }
+ $view->vars = array_replace($view->vars, $vars);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function configureOptions(OptionsResolver $resolver)
+ {
+ $timeParts = $this->timeParts;
+ $compound = function (Options $options) {
+ return $options['widget'] !== 'single_text';
+ };
+ $emptyValue = $placeholderDefault = function (Options $options) {
+ return $options['required'] ? null : '';
+ };
+ $placeholder = function (Options $options) {
+ return $options['empty_value'];
+ };
+ $placeholderNormalizer = function (Options $options, $placeholder) use ($placeholderDefault, $timeParts) {
+ if (is_array($placeholder)) {
+ $default = $placeholderDefault($options);
+
+ return array_merge(array_fill_keys($timeParts, $default), $placeholder);
+ }
+
+ return array_fill_keys($timeParts, $placeholder);
+ };
+ $resolver->setDefaults(
+ array(
+ 'with_years' => true,
+ 'with_months' => true,
+ 'with_days' => true,
+ 'with_weeks' => false,
+ 'with_hours' => false,
+ 'with_minutes' => false,
+ 'with_seconds' => false,
+ 'with_invert' => false,
+ 'years' => range(0, 100),
+ 'months' => range(0, 12),
+ 'weeks' => range(0, 52),
+ 'days' => range(0, 31),
+ 'hours' => range(0, 24),
+ 'minutes' => range(0, 60),
+ 'seconds' => range(0, 60),
+ 'widget' => 'choice',
+ 'input' => 'dateinterval',
+ 'empty_value' => $emptyValue, // deprecated
+ 'placeholder' => $placeholder,
+ 'by_reference' => true,
+ 'error_bubbling' => false,
+ // If initialized with a \DateInterval object, FormType initializes
+ // this option to "\DateInterval". Since the internal, normalized
+ // representation is not \DateInterval, but an array, we need to unset
+ // this option.
+ 'data_class' => null,
+ 'compound' => $compound,
+ )
+ );
+ $resolver->setNormalizers(
+ array(
+ 'empty_value' => $placeholderNormalizer,
+ 'placeholder' => $placeholderNormalizer,
+ )
+ );
+ $resolver->setAllowedValues(
+ array(
+ 'input' => array(
+ 'dateinterval',
+ 'string',
+ 'array',
+ ),
+ 'widget' => array(
+ 'single_text',
+ 'text',
+ 'integer',
+ 'choice',
+ ),
+ // Don't clone \DateInterval classes, as i.e. format()
+ // does not work after that
+ 'by_reference' => true,
+ )
+ );
+ $resolver->setAllowedTypes(
+ array(
+ 'years' => 'array',
+ 'months' => 'array',
+ 'weeks' => 'array',
+ 'days' => 'array',
+ 'hours' => 'array',
+ 'minutes' => 'array',
+ 'seconds' => 'array',
+ )
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getName()
+ {
+ return 'dateinterval';
+ }
+}
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
index 19c94967ab219..cbd69a9aec56c 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -71,7 +71,6 @@ public function buildView(FormView $view, FormInterface $form, array $options)
parent::buildView($view, $form, $options);
$name = $form->getName();
- $readOnly = $options['read_only'];
if ($view->parent) {
if ('' === $name) {
@@ -79,13 +78,13 @@ public function buildView(FormView $view, FormInterface $form, array $options)
}
// Complex fields are read-only if they themselves or their parents are.
- if (!$readOnly) {
- $readOnly = $view->parent->vars['read_only'];
+ if (!isset($view->vars['attr']['readonly']) && isset($view->parent->vars['attr']['readonly']) && false !== $view->parent->vars['attr']['readonly']) {
+ $view->vars['attr']['readonly'] = true;
}
}
$view->vars = array_replace($view->vars, array(
- 'read_only' => $readOnly,
+ 'read_only' => isset($view->vars['attr']['readonly']) && false !== $view->vars['attr']['readonly'], // deprecated
'errors' => $form->getErrors(),
'valid' => $form->isSubmitted() ? $form->isValid() : true,
'value' => $form->getViewData(),
@@ -185,12 +184,31 @@ public function configureOptions(OptionsResolver $resolver)
return $attributes;
};
+ // BC for "read_only" option
+ $attrNormalizer = function (Options $options, array $attr) {
+ if (!isset($attr['readonly']) && $options['read_only']) {
+ $attr['readonly'] = true;
+ }
+
+ return $attr;
+ };
+
+ $readOnlyNormalizer = function (Options $options, $readOnly) {
+ if (null !== $readOnly) {
+ trigger_error('The form option "read_only" is deprecated since version 2.8 and will be removed in 3.0. Use "attr[\'readonly\']" instead.', E_USER_DEPRECATED);
+
+ return $readOnly;
+ }
+
+ return false;
+ };
+
$resolver->setDefaults(array(
'data_class' => $dataClass,
'empty_data' => $emptyData,
'trim' => true,
'required' => true,
- 'read_only' => false,
+ 'read_only' => null, // deprecated
'max_length' => null,
'pattern' => null,
'property_path' => null,
@@ -209,6 +227,9 @@ public function configureOptions(OptionsResolver $resolver)
'post_max_size_message' => 'The uploaded file was too large. Please try to upload a smaller file.',
));
+ $resolver->setNormalizer('attr', $attrNormalizer);
+ $resolver->setNormalizer('read_only', $readOnlyNormalizer);
+
$resolver->setAllowedTypes('label_attr', 'array');
}
diff --git a/src/Symfony/Component/Form/README.md b/src/Symfony/Component/Form/README.md
index 47bcf55214721..efd6db95d885b 100644
--- a/src/Symfony/Component/Form/README.md
+++ b/src/Symfony/Component/Form/README.md
@@ -14,7 +14,7 @@ https://github.com/fabpot/Silex/blob/master/src/Silex/Provider/FormServiceProvid
Documentation:
-https://symfony.com/doc/2.7/book/forms.html
+https://symfony.com/doc/2.8/book/forms.html
Resources
---------
diff --git a/src/Symfony/Component/Form/Test/TypeTestCase.php b/src/Symfony/Component/Form/Test/TypeTestCase.php
index 87797757ff3de..eb1abe41dc3b6 100644
--- a/src/Symfony/Component/Form/Test/TypeTestCase.php
+++ b/src/Symfony/Component/Form/Test/TypeTestCase.php
@@ -38,4 +38,9 @@ public static function assertDateTimeEquals(\DateTime $expected, \DateTime $actu
{
self::assertEquals($expected->format('c'), $actual->format('c'));
}
+
+ public static function assertDateIntervalEquals(\DateInterval $expected, \DateInterval $actual)
+ {
+ self::assertEquals($expected->format('%RP%yY%mM%dDT%hH%iM%sS'), $actual->format('%RP%yY%mM%dDT%hH%iM%sS'));
+ }
}
diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php
index 41c52748704d9..41cb515c60865 100644
--- a/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php
@@ -1342,7 +1342,10 @@ public function testHidden()
);
}
- public function testReadOnly()
+ /**
+ * @group legacy
+ */
+ public function testLegacyReadOnly()
{
$form = $this->factory->createNamed('name', 'text', null, array(
'read_only' => true,
@@ -1907,14 +1910,13 @@ public function testWidgetAttributes()
$form = $this->factory->createNamed('text', 'text', 'value', array(
'required' => true,
'disabled' => true,
- 'read_only' => true,
- 'attr' => array('maxlength' => 10, 'pattern' => '\d+', 'class' => 'foobar', 'data-foo' => 'bar'),
+ 'attr' => array('readonly' => true, 'maxlength' => 10, 'pattern' => '\d+', 'class' => 'foobar', 'data-foo' => 'bar'),
));
$html = $this->renderWidget($form->createView());
// compare plain HTML to check the whitespace
- $this->assertSame('
+ */
+class DateIntervalToArrayTransformerTest extends DateIntervalTestCase
+{
+ public function testTransform()
+ {
+ $transformer = new DateIntervalToArrayTransformer();
+ $input = new \DateInterval('P1Y2M3DT4H5M6S');
+ $output = array(
+ 'years' => '1',
+ 'months' => '2',
+ 'days' => '3',
+ 'hours' => '4',
+ 'minutes' => '5',
+ 'seconds' => '6',
+ 'invert' => false,
+ );
+ $this->assertSame($output, $transformer->transform($input));
+ }
+
+ public function testTransformEmpty()
+ {
+ $transformer = new DateIntervalToArrayTransformer();
+ $output = array(
+ 'years' => '',
+ 'months' => '',
+ 'days' => '',
+ 'hours' => '',
+ 'minutes' => '',
+ 'seconds' => '',
+ 'invert' => false,
+ );
+ $this->assertSame($output, $transformer->transform(null));
+ }
+
+ public function testTransformEmptyWithFields()
+ {
+ $transformer = new DateIntervalToArrayTransformer(array('years', 'weeks', 'minutes', 'seconds'));
+ $output = array(
+ 'years' => '',
+ 'weeks' => '',
+ 'minutes' => '',
+ 'seconds' => '',
+ );
+ $this->assertSame($output, $transformer->transform(null));
+ }
+
+ public function testTransformWithFields()
+ {
+ $transformer = new DateIntervalToArrayTransformer(array('years', 'minutes', 'seconds'));
+ $input = new \DateInterval('P1Y2M3DT4H5M6S');
+ $output = array(
+ 'years' => '1',
+ 'minutes' => '5',
+ 'seconds' => '6',
+ );
+ $this->assertSame($output, $transformer->transform($input));
+ }
+
+ public function testTransformWithWeek()
+ {
+ $transformer = new DateIntervalToArrayTransformer(array('weeks', 'minutes', 'seconds'));
+ $input = new \DateInterval('P1Y2M3WT4H5M6S');
+ $output = array(
+ 'weeks' => '3',
+ 'minutes' => '5',
+ 'seconds' => '6',
+ );
+ $input = $transformer->transform($input);
+ ksort($input);
+ ksort($output);
+ $this->assertSame($output, $input);
+ }
+
+ public function testTransformDaysToWeeks()
+ {
+ $transformer = new DateIntervalToArrayTransformer(array('weeks', 'minutes', 'seconds'));
+ $input = new \DateInterval('P1Y2M23DT4H5M6S');
+ $output = array(
+ 'weeks' => '3',
+ 'minutes' => '5',
+ 'seconds' => '6',
+ );
+ $input = $transformer->transform($input);
+ ksort($input);
+ ksort($output);
+ $this->assertSame($output, $input);
+ }
+
+ public function testTransformDaysNotOverflowingToWeeks()
+ {
+ $transformer = new DateIntervalToArrayTransformer(array('days', 'minutes', 'seconds'));
+ $input = new \DateInterval('P1Y2M23DT4H5M6S');
+ $output = array(
+ 'days' => '23',
+ 'minutes' => '5',
+ 'seconds' => '6',
+ );
+ $this->assertSame($output, $transformer->transform($input));
+ }
+
+ public function testTransformWithInvert()
+ {
+ $transformer = new DateIntervalToArrayTransformer(array('years', 'invert'));
+ $input = new \DateInterval('P1Y');
+ $input->invert = 1;
+ $output = array(
+ 'years' => '1',
+ 'invert' => true,
+ );
+ $this->assertSame($output, $transformer->transform($input));
+ }
+
+ public function testTransformWithPadding()
+ {
+ $transformer = new DateIntervalToArrayTransformer(null, true);
+ $input = new \DateInterval('P1Y2M3DT4H5M6S');
+ $output = array(
+ 'years' => '01',
+ 'months' => '02',
+ 'days' => '03',
+ 'hours' => '04',
+ 'minutes' => '05',
+ 'seconds' => '06',
+ 'invert' => false,
+ );
+ $this->assertSame($output, $transformer->transform($input));
+ }
+
+ public function testTransformWithFieldsAndPadding()
+ {
+ $transformer = new DateIntervalToArrayTransformer(array('years', 'minutes', 'seconds'), true);
+ $input = new \DateInterval('P1Y2M3DT4H5M6S');
+ $output = array(
+ 'years' => '01',
+ 'minutes' => '05',
+ 'seconds' => '06',
+ );
+ $this->assertSame($output, $transformer->transform($input));
+ }
+
+ public function testReverseTransformRequiresDateTime()
+ {
+ $transformer = new DateIntervalToArrayTransformer();
+ $this->assertNull($transformer->reverseTransform(null));
+ $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException', 'Expected an array.');
+ $transformer->reverseTransform('12345');
+ }
+
+ public function testReverseTransformWithUnsetFields()
+ {
+ $transformer = new DateIntervalToArrayTransformer();
+ $input = array('years' => '1');
+ $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
+ $transformer->reverseTransform($input);
+ }
+
+ public function testReverseTransformWithEmptyFields()
+ {
+ $transformer = new DateIntervalToArrayTransformer(array('years', 'minutes', 'seconds'));
+ $input = array(
+ 'years' => '1',
+ 'minutes' => '',
+ 'seconds' => '6',
+ );
+ $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException', 'This amount of "minutes" is invalid');
+ $transformer->reverseTransform($input);
+ }
+
+ public function testReverseTransformWithWrongInvertType()
+ {
+ $transformer = new DateIntervalToArrayTransformer(array('invert'));
+ $input = array(
+ 'invert' => '1',
+ );
+ $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException', 'The value of "invert" must be boolean');
+ $transformer->reverseTransform($input);
+ }
+
+ public function testReverseTransform()
+ {
+ $transformer = new DateIntervalToArrayTransformer();
+ $input = array(
+ 'years' => '1',
+ 'months' => '2',
+ 'days' => '3',
+ 'hours' => '4',
+ 'minutes' => '5',
+ 'seconds' => '6',
+ 'invert' => false,
+ );
+ $output = new \DateInterval('P01Y02M03DT04H05M06S');
+ $this->assertDateIntervalEquals($output, $transformer->reverseTransform($input));
+ }
+
+ public function testReverseTransformWithWeek()
+ {
+ $transformer = new DateIntervalToArrayTransformer(
+ array('years', 'months', 'weeks', 'hours', 'minutes', 'seconds')
+ );
+ $input = array(
+ 'years' => '1',
+ 'months' => '2',
+ 'weeks' => '3',
+ 'hours' => '4',
+ 'minutes' => '5',
+ 'seconds' => '6',
+ );
+ $output = new \DateInterval('P1Y2M21DT4H5M6S');
+ $this->assertDateIntervalEquals($output, $transformer->reverseTransform($input));
+ }
+
+ public function testReverseTransformWithFields()
+ {
+ $transformer = new DateIntervalToArrayTransformer(array('years', 'minutes', 'seconds'));
+ $input = array(
+ 'years' => '1',
+ 'minutes' => '5',
+ 'seconds' => '6',
+ );
+ $output = new \DateInterval('P1Y0M0DT0H5M6S');
+ $this->assertDateIntervalEquals($output, $transformer->reverseTransform($input));
+ }
+
+ public function testBothTransformsWithWeek()
+ {
+ $transformer = new DateIntervalToArrayTransformer(
+ array('years', 'months', 'weeks', 'hours', 'minutes', 'seconds')
+ );
+ $interval = new \DateInterval('P1Y2M21DT4H5M6S');
+ $array = array(
+ 'years' => '1',
+ 'months' => '2',
+ 'weeks' => '3',
+ 'hours' => '4',
+ 'minutes' => '5',
+ 'seconds' => '6',
+ );
+ $input = $transformer->transform($interval);
+ ksort($input);
+ ksort($array);
+ $this->assertSame($array, $input);
+ $interval = new \DateInterval('P1Y2M0DT4H5M6S');
+ $input['weeks'] = '0';
+ $this->assertDateIntervalEquals($interval, $transformer->reverseTransform($input));
+ }
+}
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateIntervalToStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateIntervalToStringTransformerTest.php
new file mode 100644
index 0000000000000..aa83d2829fffd
--- /dev/null
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateIntervalToStringTransformerTest.php
@@ -0,0 +1,113 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
+
+use Symfony\Component\Form\Extension\Core\DataTransformer\DateIntervalToStringTransformer;
+
+/**
+ * @author Steffen Roßkamp
+ * @package AST\CoreBundle\Tests\Form\DataTransformer
+ */
+class DateIntervalToStringTransformerTest extends DateIntervalTestCase
+{
+ public function dataProviderISO()
+ {
+ $data = array(
+ array('P%YY%MM%DDT%HH%IM%SS', 'P00Y00M00DT00H00M00S', 'PT0S'),
+ array('P%yY%mM%dDT%hH%iM%sS', 'P0Y0M0DT0H0M0S', 'PT0S'),
+ array('P%yY%mM%dDT%hH%iM%sS', 'P10Y2M3DT16H5M6S', 'P10Y2M3DT16H5M6S'),
+ array('P%yY%mM%dDT%hH%iM', 'P10Y2M3DT16H5M', 'P10Y2M3DT16H5M'),
+ array('P%yY%mM%dDT%hH', 'P10Y2M3DT16H', 'P10Y2M3DT16H'),
+ array('P%yY%mM%dD', 'P10Y2M3D', 'P10Y2M3DT0H'),
+ );
+
+ return $data;
+ }
+
+ public function dataProviderDate()
+ {
+ $data = array(
+ array('%y years %m months %d days %h hours %i minutes %s seconds', '10 years 2 months 3 days 16 hours 5 minutes 6 seconds', 'P10Y2M3DT16H5M6S'),
+ array('%y years %m months %d days %h hours %i minutes', '10 years 2 months 3 days 16 hours 5 minutes', 'P10Y2M3DT16H5M'),
+ array('%y years %m months %d days %h hours', '10 years 2 months 3 days 16 hours', 'P10Y2M3DT16H'),
+ array('%y years %m months %d days', '10 years 2 months 3 days', 'P10Y2M3D'),
+ array('%y years %m months', '10 years 2 months', 'P10Y2M'),
+ array('%y year', '1 year', 'P1Y'),
+ );
+
+ return $data;
+ }
+
+ /**
+ * @dataProvider dataProviderISO
+ */
+ public function testTransform($format, $output, $input)
+ {
+ $transformer = new DateIntervalToStringTransformer($format);
+ $input = new \DateInterval($input);
+ $this->assertEquals($output, $transformer->transform($input));
+ }
+
+ public function testTransformEmpty()
+ {
+ $transformer = new DateIntervalToStringTransformer();
+ $this->assertSame('', $transformer->transform(null));
+ }
+
+ public function testTransformExpectsDateTime()
+ {
+ $transformer = new DateIntervalToStringTransformer();
+ $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
+ $transformer->transform('1234');
+ }
+
+ /**
+ * @dataProvider dataProviderISO
+ */
+ public function testReverseTransform($format, $input, $output)
+ {
+ $reverseTransformer = new DateIntervalToStringTransformer($format, true);
+ $interval = new \DateInterval($output);
+ $this->assertDateIntervalEquals($interval, $reverseTransformer->reverseTransform($input));
+ }
+
+ /**
+ * @dataProvider dataProviderDate
+ */
+ public function testReverseTransformDateString($format, $input, $output)
+ {
+ $reverseTransformer = new DateIntervalToStringTransformer($format, true);
+ $interval = new \DateInterval($output);
+ $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
+ $this->assertDateIntervalEquals($interval, $reverseTransformer->reverseTransform($input));
+ }
+
+ public function testReverseTransformEmpty()
+ {
+ $reverseTransformer = new DateIntervalToStringTransformer();
+ $this->assertNull($reverseTransformer->reverseTransform(''));
+ }
+
+ public function testReverseTransformExpectsString()
+ {
+ $reverseTransformer = new DateIntervalToStringTransformer();
+ $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
+ $reverseTransformer->reverseTransform(1234);
+ }
+
+ public function testReverseTransformExpectsValidIntervalString()
+ {
+ $reverseTransformer = new DateIntervalToStringTransformer();
+ $this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
+ $reverseTransformer->reverseTransform('10Y');
+ }
+}
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php
new file mode 100644
index 0000000000000..c6a3e18c8537b
--- /dev/null
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php
@@ -0,0 +1,314 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Tests\Extension\Core\Type;
+
+use Symfony\Component\Form\FormError;
+use Symfony\Component\Form\Test\TypeTestCase as TestCase;
+
+class DateIntervalTypeTest extends TestCase
+{
+ public function testSubmitDateInterval()
+ {
+ $form = $this->factory->create('dateinterval', null, array(
+ 'input' => 'dateinterval',
+ ));
+ $form->submit(array(
+ 'years' => '7',
+ 'months' => '6',
+ 'days' => '5',
+ ));
+ $dateInterval = new \DateInterval('P7Y6M5D');
+ $this->assertDateIntervalEquals($dateInterval, $form->getData());
+ }
+
+ public function testSubmitString()
+ {
+ $form = $this->factory->create('dateinterval', null, array(
+ 'input' => 'string',
+ ));
+ $form->submit(array(
+ 'years' => '7',
+ 'months' => '6',
+ 'days' => '5',
+ ));
+ $this->assertEquals('P7Y6M5D', $form->getData());
+ }
+
+ public function testSubmitArray()
+ {
+ $form = $this->factory->create('dateinterval', null, array(
+ 'input' => 'array',
+ ));
+ $form->submit(array(
+ 'years' => '7',
+ 'months' => '6',
+ 'days' => '5',
+ ));
+ $this->assertEquals(array('years' => '7', 'months' => '6', 'days' => '5'), $form->getData());
+ }
+
+ public function testSubmitWithoutMonths()
+ {
+ $form = $this->factory->create('dateinterval', null, array(
+ 'input' => 'dateinterval',
+ 'with_months' => false,
+ ));
+ $form->setData(new \DateInterval('P7Y5D'));
+ $input = array(
+ 'years' => '7',
+ 'months' => '6',
+ 'days' => '5',
+ );
+ $form->submit($input);
+ $this->assertDateIntervalEquals(new \DateInterval('P7Y5D'), $form->getData());
+ }
+
+ public function testSubmitWithTime()
+ {
+ $form = $this->factory->create('dateinterval', null, array(
+ 'input' => 'dateinterval',
+ 'with_hours' => true,
+ 'with_minutes' => true,
+ 'with_seconds' => true,
+ ));
+ $form->setData(new \DateInterval('P7Y6M5DT4H3M2S'));
+ $input = array(
+ 'years' => '7',
+ 'months' => '6',
+ 'days' => '5',
+ 'hours' => '4',
+ 'minutes' => '3',
+ 'seconds' => '2',
+ );
+ $form->submit($input);
+ $this->assertDateIntervalEquals(new \DateInterval('P7Y6M5DT4H3M2S'), $form->getData());
+ }
+
+ public function testSubmitWithWeeks()
+ {
+ $form = $this->factory->create('dateinterval', null, array(
+ 'input' => 'dateinterval',
+ 'with_years' => false,
+ 'with_months' => false,
+ 'with_weeks' => true,
+ 'with_days' => false,
+ ));
+ $form->setData(new \DateInterval('P0Y'));
+ $input = array(
+ 'weeks' => '30',
+ );
+ $form->submit($input);
+ $this->assertDateIntervalEquals(new \DateInterval('P30W'), $form->getData());
+ }
+
+ public function testSubmitWithInvert()
+ {
+ $form = $this->factory->create('dateinterval', null, array(
+ 'input' => 'dateinterval',
+ 'with_invert' => true,
+ ));
+ $input = array(
+ 'years' => '7',
+ 'months' => '6',
+ 'days' => '5',
+ 'invert' => true,
+ );
+ $form->submit($input);
+ $interval = new \DateInterval('P7Y6M5D');
+ $interval->invert = 1;
+ $this->assertDateIntervalEquals($interval, $form->getData());
+ }
+
+ public function testSubmitStringSingleText()
+ {
+ $form = $this->factory->create('dateinterval', null, array(
+ 'input' => 'string',
+ 'widget' => 'single_text',
+ ));
+ $form->submit('P7Y6M5D');
+ $this->assertEquals('P7Y6M5D', $form->getData());
+ $this->assertEquals('P7Y6M5D', $form->getViewData());
+ }
+
+ public function testSubmitStringSingleTextWithSeconds()
+ {
+ $form = $this->factory->create('dateinterval', null, array(
+ 'input' => 'string',
+ 'widget' => 'single_text',
+ 'with_hours' => true,
+ 'with_minutes' => true,
+ 'with_seconds' => true,
+ ));
+ $form->submit('P7Y6M5DT4H3M2S');
+ $this->assertEquals('P7Y6M5DT4H3M2S', $form->getData());
+ $this->assertEquals('P7Y6M5DT4H3M2S', $form->getViewData());
+ }
+
+ public function testSubmitArrayInteger()
+ {
+ $form = $this->factory->create('dateinterval', null, array(
+ 'widget' => 'integer',
+ 'with_invert' => 'integer',
+ ));
+ $input = array(
+ 'years' => '7',
+ 'months' => '6',
+ 'days' => '5',
+ 'invert' => true,
+ );
+ $form->submit($input);
+ $this->assertSame('7', $form['years']->getData());
+ $this->assertSame('7', $form['years']->getViewData());
+ }
+
+ public function testInitializeWithDateInterval()
+ {
+ // Throws an exception if "data_class" option is not explicitly set
+ // to null in the type
+ $this->factory->create('dateinterval', new \DateInterval('P0Y'));
+ }
+
+ public function testPassDefaultPlaceholderToViewIfNotRequired()
+ {
+ $form = $this->factory->create('dateinterval', null, array(
+ 'required' => false,
+ 'with_seconds' => true,
+ ));
+ $view = $form->createView();
+ $this->assertSame('', $view['years']->vars['placeholder']);
+ $this->assertSame('', $view['months']->vars['placeholder']);
+ $this->assertSame('', $view['days']->vars['placeholder']);
+ $this->assertSame('', $view['seconds']->vars['placeholder']);
+ }
+
+ public function testPassNoPlaceholderToViewIfRequired()
+ {
+ $form = $this->factory->create('dateinterval', null, array(
+ 'required' => true,
+ 'with_seconds' => true,
+ ));
+ $view = $form->createView();
+ $this->assertNull($view['years']->vars['placeholder']);
+ $this->assertNull($view['months']->vars['placeholder']);
+ $this->assertNull($view['days']->vars['placeholder']);
+ $this->assertNull($view['seconds']->vars['placeholder']);
+ }
+
+ public function testPassPlaceholderAsString()
+ {
+ $form = $this->factory->create('dateinterval', null, array(
+ 'placeholder' => 'Empty',
+ 'with_seconds' => true,
+ ));
+ $view = $form->createView();
+ $this->assertSame('Empty', $view['years']->vars['placeholder']);
+ $this->assertSame('Empty', $view['months']->vars['placeholder']);
+ $this->assertSame('Empty', $view['days']->vars['placeholder']);
+ $this->assertSame('Empty', $view['seconds']->vars['placeholder']);
+ }
+
+ public function testPassEmptyValueBC()
+ {
+ $form = $this->factory->create('dateinterval', null, array(
+ 'empty_value' => 'Empty',
+ 'with_seconds' => true,
+ ));
+ $view = $form->createView();
+ $this->assertSame('Empty', $view['years']->vars['placeholder']);
+ $this->assertSame('Empty', $view['months']->vars['placeholder']);
+ $this->assertSame('Empty', $view['days']->vars['placeholder']);
+ $this->assertSame('Empty', $view['seconds']->vars['placeholder']);
+ $this->assertSame('Empty', $view['years']->vars['empty_value']);
+ $this->assertSame('Empty', $view['months']->vars['empty_value']);
+ $this->assertSame('Empty', $view['days']->vars['empty_value']);
+ $this->assertSame('Empty', $view['seconds']->vars['empty_value']);
+ }
+
+ public function testPassPlaceholderAsArray()
+ {
+ $form = $this->factory->create('dateinterval', null, array(
+ 'placeholder' => array(
+ 'years' => 'Empty years',
+ 'months' => 'Empty months',
+ 'days' => 'Empty days',
+ 'hours' => 'Empty hours',
+ 'minutes' => 'Empty minutes',
+ 'seconds' => 'Empty seconds',
+ ),
+ 'with_hours' => true,
+ 'with_minutes' => true,
+ 'with_seconds' => true,
+ ));
+ $view = $form->createView();
+ $this->assertSame('Empty years', $view['years']->vars['placeholder']);
+ $this->assertSame('Empty months', $view['months']->vars['placeholder']);
+ $this->assertSame('Empty days', $view['days']->vars['placeholder']);
+ $this->assertSame('Empty hours', $view['hours']->vars['placeholder']);
+ $this->assertSame('Empty minutes', $view['minutes']->vars['placeholder']);
+ $this->assertSame('Empty seconds', $view['seconds']->vars['placeholder']);
+ }
+
+ public function testPassPlaceholderAsPartialArrayAddEmptyIfNotRequired()
+ {
+ $form = $this->factory->create('dateinterval', null, array(
+ 'required' => false,
+ 'placeholder' => array(
+ 'years' => 'Empty years',
+ 'days' => 'Empty days',
+ 'hours' => 'Empty hours',
+ 'seconds' => 'Empty seconds',
+ ),
+ 'with_hours' => true,
+ 'with_minutes' => true,
+ 'with_seconds' => true,
+ ));
+ $view = $form->createView();
+ $this->assertSame('Empty years', $view['years']->vars['placeholder']);
+ $this->assertSame('', $view['months']->vars['placeholder']);
+ $this->assertSame('Empty days', $view['days']->vars['placeholder']);
+ $this->assertSame('Empty hours', $view['hours']->vars['placeholder']);
+ $this->assertSame('', $view['minutes']->vars['placeholder']);
+ $this->assertSame('Empty seconds', $view['seconds']->vars['placeholder']);
+ }
+
+ public function testPassPlaceholderAsPartialArrayAddNullIfRequired()
+ {
+ $form = $this->factory->create('dateinterval', null, array(
+ 'required' => true,
+ 'placeholder' => array(
+ 'years' => 'Empty years',
+ 'days' => 'Empty days',
+ 'hours' => 'Empty hours',
+ 'seconds' => 'Empty seconds',
+ ),
+ 'with_hours' => true,
+ 'with_minutes' => true,
+ 'with_seconds' => true,
+ ));
+ $view = $form->createView();
+ $this->assertSame('Empty years', $view['years']->vars['placeholder']);
+ $this->assertNull($view['months']->vars['placeholder']);
+ $this->assertSame('Empty days', $view['days']->vars['placeholder']);
+ $this->assertSame('Empty hours', $view['hours']->vars['placeholder']);
+ $this->assertNull($view['minutes']->vars['placeholder']);
+ $this->assertSame('Empty seconds', $view['seconds']->vars['placeholder']);
+ }
+
+ public function testDateTypeChoiceErrorsBubbleUp()
+ {
+ $error = new FormError('Invalid!');
+ $form = $this->factory->create('dateinterval', null);
+ $form['years']->addError($error);
+ $this->assertSame(array(), iterator_to_array($form['years']->getErrors()));
+ $this->assertSame(array($error), iterator_to_array($form->getErrors()));
+ }
+}
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
index 2b4b255b0daab..0ebb554a6ac84 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
@@ -99,7 +99,10 @@ public function testSubmittedDataIsNotTrimmedBeforeTransformingIfNoTrimming()
$this->assertEquals('reverse[ a ]', $form->getData());
}
- public function testNonReadOnlyFormWithReadOnlyParentIsReadOnly()
+ /**
+ * @group legacy
+ */
+ public function testLegacyNonReadOnlyFormWithReadOnlyParentIsReadOnly()
{
$view = $this->factory->createNamedBuilder('parent', 'form', null, array('read_only' => true))
->add('child', 'form')
@@ -109,7 +112,20 @@ public function testNonReadOnlyFormWithReadOnlyParentIsReadOnly()
$this->assertTrue($view['child']->vars['read_only']);
}
- public function testReadOnlyFormWithNonReadOnlyParentIsReadOnly()
+ public function testNonReadOnlyFormWithReadOnlyParentIsReadOnly()
+ {
+ $view = $this->factory->createNamedBuilder('parent', 'form', null, array('attr' => array('readonly' => true)))
+ ->add('child', 'form')
+ ->getForm()
+ ->createView();
+
+ $this->assertTrue($view['child']->vars['attr']['readonly']);
+ }
+
+ /**
+ * @group legacy
+ */
+ public function testLegacyReadOnlyFormWithNonReadOnlyParentIsReadOnly()
{
$view = $this->factory->createNamedBuilder('parent', 'form')
->add('child', 'form', array('read_only' => true))
@@ -119,7 +135,20 @@ public function testReadOnlyFormWithNonReadOnlyParentIsReadOnly()
$this->assertTrue($view['child']->vars['read_only']);
}
- public function testNonReadOnlyFormWithNonReadOnlyParentIsNotReadOnly()
+ public function testReadOnlyFormWithNonReadOnlyParentIsReadOnly()
+ {
+ $view = $this->factory->createNamedBuilder('parent', 'form')
+ ->add('child', 'form', array('attr' => array('readonly' => true)))
+ ->getForm()
+ ->createView();
+
+ $this->assertTrue($view['child']->vars['attr']['readonly']);
+ }
+
+ /**
+ * @group legacy
+ */
+ public function testLegacyNonReadOnlyFormWithNonReadOnlyParentIsNotReadOnly()
{
$view = $this->factory->createNamedBuilder('parent', 'form')
->add('child', 'form')
@@ -129,6 +158,16 @@ public function testNonReadOnlyFormWithNonReadOnlyParentIsNotReadOnly()
$this->assertFalse($view['child']->vars['read_only']);
}
+ public function testNonReadOnlyFormWithNonReadOnlyParentIsNotReadOnly()
+ {
+ $view = $this->factory->createNamedBuilder('parent', 'form')
+ ->add('child', 'form')
+ ->getForm()
+ ->createView();
+
+ $this->assertArrayNotHasKey('readonly', $view['child']->vars['attr']);
+ }
+
public function testPassMaxLengthToView()
{
$form = $this->factory->create('form', null, array('attr' => array('maxlength' => 10)));
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
index 21c6af679971e..5cd6feceae554 100644
--- a/src/Symfony/Component/Form/composer.json
+++ b/src/Symfony/Component/Form/composer.json
@@ -17,19 +17,19 @@
],
"require": {
"php": ">=5.3.9",
- "symfony/event-dispatcher": "~2.1",
- "symfony/intl": "~2.3",
+ "symfony/event-dispatcher": "~2.1|~3.0.0",
+ "symfony/intl": "~2.3|~3.0.0",
"symfony/options-resolver": "~2.6",
- "symfony/property-access": "~2.3"
+ "symfony/property-access": "~2.3|~3.0.0"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
"doctrine/collections": "~1.0",
- "symfony/validator": "~2.6,>=2.6.8",
- "symfony/http-foundation": "~2.2",
- "symfony/http-kernel": "~2.4",
- "symfony/security-csrf": "~2.4",
- "symfony/translation": "~2.0,>=2.0.5"
+ "symfony/validator": "~2.6,>=2.6.8|~3.0.0",
+ "symfony/http-foundation": "~2.2|~3.0.0",
+ "symfony/http-kernel": "~2.4|~3.0.0",
+ "symfony/security-csrf": "~2.4|~3.0.0",
+ "symfony/translation": "~2.0,>=2.0.5|~3.0.0"
},
"conflict": {
"symfony/doctrine-bridge": "<2.7",
@@ -48,7 +48,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json
index 80f4436aca5a2..5670c17f8725d 100644
--- a/src/Symfony/Component/HttpFoundation/composer.json
+++ b/src/Symfony/Component/HttpFoundation/composer.json
@@ -19,8 +19,8 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
- "symfony/expression-language": "~2.4"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/expression-language": "~2.4|~3.0.0"
},
"autoload": {
"psr-4": { "Symfony\\Component\\HttpFoundation\\": "" },
@@ -29,7 +29,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 27beac75f7546..0df4f67f0bd0e 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -60,10 +60,10 @@ abstract class Kernel implements KernelInterface, TerminableInterface
protected $startTime;
protected $loadClassCache;
- const VERSION = '2.7.0-DEV';
- const VERSION_ID = '20700';
+ const VERSION = '2.8.0-DEV';
+ const VERSION_ID = '20800';
const MAJOR_VERSION = '2';
- const MINOR_VERSION = '7';
+ const MINOR_VERSION = '8';
const RELEASE_VERSION = '0';
const EXTRA_VERSION = 'DEV';
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
index 9c1cc0b61cf0e..9c80d80e0c1ea 100644
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@@ -17,28 +17,28 @@
],
"require": {
"php": ">=5.3.9",
- "symfony/event-dispatcher": "~2.5.9|~2.6,>=2.6.2",
- "symfony/http-foundation": "~2.5,>=2.5.4",
+ "symfony/event-dispatcher": "~2.5.9|~2.6,>=2.6.2|~3.0.0",
+ "symfony/http-foundation": "~2.5,>=2.5.4|~3.0.0",
"symfony/debug": "~2.6,>=2.6.2",
"psr/log": "~1.0"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
- "symfony/browser-kit": "~2.3",
- "symfony/class-loader": "~2.1",
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/browser-kit": "~2.3|~3.0.0",
+ "symfony/class-loader": "~2.1|~3.0.0",
"symfony/config": "~2.7",
- "symfony/console": "~2.3",
- "symfony/css-selector": "~2.0,>=2.0.5",
- "symfony/dependency-injection": "~2.2",
- "symfony/dom-crawler": "~2.0,>=2.0.5",
- "symfony/expression-language": "~2.4",
- "symfony/finder": "~2.0,>=2.0.5",
- "symfony/process": "~2.0,>=2.0.5",
- "symfony/routing": "~2.2",
- "symfony/stopwatch": "~2.3",
- "symfony/templating": "~2.2",
- "symfony/translation": "~2.0,>=2.0.5",
- "symfony/var-dumper": "~2.6"
+ "symfony/console": "~2.3|~3.0.0",
+ "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
+ "symfony/dependency-injection": "~2.2|~3.0.0",
+ "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
+ "symfony/expression-language": "~2.4|~3.0.0",
+ "symfony/finder": "~2.0,>=2.0.5|~3.0.0",
+ "symfony/process": "~2.0,>=2.0.5|~3.0.0",
+ "symfony/routing": "~2.2|~3.0.0",
+ "symfony/stopwatch": "~2.3|~3.0.0",
+ "symfony/templating": "~2.2|~3.0.0",
+ "symfony/translation": "~2.0,>=2.0.5|~3.0.0",
+ "symfony/var-dumper": "~2.6|~3.0.0"
},
"conflict": {
"symfony/config": "<2.7"
@@ -58,7 +58,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Intl/README.md b/src/Symfony/Component/Intl/README.md
index 11bc73130c673..7d8d9eb871a66 100644
--- a/src/Symfony/Component/Intl/README.md
+++ b/src/Symfony/Component/Intl/README.md
@@ -22,4 +22,4 @@ You can run the unit tests with the following command:
$ phpunit
[0]: http://www.php.net/manual/en/intl.setup.php
-[1]: https://symfony.com/doc/2.7/components/intl.html
+[1]: https://symfony.com/doc/2.8/components/intl.html
diff --git a/src/Symfony/Component/Intl/composer.json b/src/Symfony/Component/Intl/composer.json
index 2702a314a4dda..142956485c688 100644
--- a/src/Symfony/Component/Intl/composer.json
+++ b/src/Symfony/Component/Intl/composer.json
@@ -27,8 +27,8 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
- "symfony/filesystem": "~2.1"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/filesystem": "~2.1|~3.0.0"
},
"suggest": {
"ext-intl": "to use the component with locales other than \"en\""
@@ -41,7 +41,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Locale/composer.json b/src/Symfony/Component/Locale/composer.json
index 6aafb8cd0dd2f..d3f9466bc8720 100644
--- a/src/Symfony/Component/Locale/composer.json
+++ b/src/Symfony/Component/Locale/composer.json
@@ -17,10 +17,10 @@
],
"require": {
"php": ">=5.3.9",
- "symfony/intl": "~2.3"
+ "symfony/intl": "~2.3|~3.0.0"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Locale\\": "" }
@@ -28,7 +28,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/OptionsResolver/composer.json b/src/Symfony/Component/OptionsResolver/composer.json
index 3460fae0e2429..312d895dc1788 100644
--- a/src/Symfony/Component/OptionsResolver/composer.json
+++ b/src/Symfony/Component/OptionsResolver/composer.json
@@ -19,7 +19,7 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0"
},
"autoload": {
"psr-4": { "Symfony\\Component\\OptionsResolver\\": "" }
@@ -27,7 +27,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Process/composer.json b/src/Symfony/Component/Process/composer.json
index d0cae4d8e0494..52ae4cf37824a 100644
--- a/src/Symfony/Component/Process/composer.json
+++ b/src/Symfony/Component/Process/composer.json
@@ -19,7 +19,7 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Process\\": "" }
@@ -27,7 +27,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/PropertyAccess/composer.json b/src/Symfony/Component/PropertyAccess/composer.json
index 5058e867a477c..c2f136ef0f62b 100644
--- a/src/Symfony/Component/PropertyAccess/composer.json
+++ b/src/Symfony/Component/PropertyAccess/composer.json
@@ -19,7 +19,7 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0"
},
"autoload": {
"psr-4": { "Symfony\\Component\\PropertyAccess\\": "" }
@@ -27,7 +27,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json
index 31b63ae64aacc..b7d4c0aa2bdb8 100644
--- a/src/Symfony/Component/Routing/composer.json
+++ b/src/Symfony/Component/Routing/composer.json
@@ -19,11 +19,11 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
- "symfony/config": "~2.7",
- "symfony/http-foundation": "~2.3",
- "symfony/yaml": "~2.0,>=2.0.5",
- "symfony/expression-language": "~2.4",
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/config": "~2.7|~3.0.0",
+ "symfony/http-foundation": "~2.3|~3.0.0",
+ "symfony/yaml": "~2.0,>=2.0.5|~3.0.0",
+ "symfony/expression-language": "~2.4|~3.0.0",
"doctrine/annotations": "~1.0",
"doctrine/common": "~2.2",
"psr/log": "~1.0"
@@ -43,7 +43,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Security/Acl/README.md b/src/Symfony/Component/Security/Acl/README.md
index bff22093aa7bc..458820e812ebe 100644
--- a/src/Symfony/Component/Security/Acl/README.md
+++ b/src/Symfony/Component/Security/Acl/README.md
@@ -11,7 +11,7 @@ Resources
Documentation:
-https://symfony.com/doc/2.7/book/security.html
+https://symfony.com/doc/2.8/book/security.html
Tests
-----
diff --git a/src/Symfony/Component/Security/Acl/composer.json b/src/Symfony/Component/Security/Acl/composer.json
index 917c061d1bff6..b2ac560af9ad3 100644
--- a/src/Symfony/Component/Security/Acl/composer.json
+++ b/src/Symfony/Component/Security/Acl/composer.json
@@ -17,10 +17,10 @@
],
"require": {
"php": ">=5.3.9",
- "symfony/security-core": "~2.4"
+ "symfony/security-core": "~2.4|~3.0.0"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
"doctrine/common": "~2.2",
"doctrine/dbal": "~2.2",
"psr/log": "~1.0"
@@ -36,7 +36,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Security/Core/README.md b/src/Symfony/Component/Security/Core/README.md
index b0d17494974e6..f1da5b183ae7d 100644
--- a/src/Symfony/Component/Security/Core/README.md
+++ b/src/Symfony/Component/Security/Core/README.md
@@ -11,7 +11,7 @@ Resources
Documentation:
-https://symfony.com/doc/2.7/book/security.html
+https://symfony.com/doc/2.8/book/security.html
Tests
-----
diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json
index 38054df6bd96f..4d2405317c89f 100644
--- a/src/Symfony/Component/Security/Core/composer.json
+++ b/src/Symfony/Component/Security/Core/composer.json
@@ -19,12 +19,12 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
- "symfony/event-dispatcher": "~2.1",
- "symfony/expression-language": "~2.6",
- "symfony/http-foundation": "~2.4",
- "symfony/translation": "~2.0,>=2.0.5",
- "symfony/validator": "~2.5,>=2.5.5",
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/event-dispatcher": "~2.1|~3.0.0",
+ "symfony/expression-language": "~2.6|~3.0.0",
+ "symfony/http-foundation": "~2.4|~3.0.0",
+ "symfony/translation": "~2.0,>=2.0.5|~3.0.0",
+ "symfony/validator": "~2.5,>=2.5.5|~3.0.0",
"psr/log": "~1.0",
"ircmaxell/password-compat": "1.0.*"
},
@@ -41,7 +41,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Security/Csrf/README.md b/src/Symfony/Component/Security/Csrf/README.md
index 3ae550b4cc0a4..10f4784507d76 100644
--- a/src/Symfony/Component/Security/Csrf/README.md
+++ b/src/Symfony/Component/Security/Csrf/README.md
@@ -9,7 +9,7 @@ Resources
Documentation:
-https://symfony.com/doc/2.7/book/security.html
+https://symfony.com/doc/2.8/book/security.html
Tests
-----
diff --git a/src/Symfony/Component/Security/Csrf/composer.json b/src/Symfony/Component/Security/Csrf/composer.json
index a0de39dade3ee..20fd2ffebd42e 100644
--- a/src/Symfony/Component/Security/Csrf/composer.json
+++ b/src/Symfony/Component/Security/Csrf/composer.json
@@ -17,11 +17,11 @@
],
"require": {
"php": ">=5.3.9",
- "symfony/security-core": "~2.4"
+ "symfony/security-core": "~2.4|~3.0.0"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
- "symfony/http-foundation": "~2.1"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/http-foundation": "~2.1|~3.0.0"
},
"suggest": {
"symfony/http-foundation": "For using the class SessionTokenStorage."
@@ -32,7 +32,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Security/Http/README.md b/src/Symfony/Component/Security/Http/README.md
index 7619bfcb9c9d1..11f6f72a9c707 100644
--- a/src/Symfony/Component/Security/Http/README.md
+++ b/src/Symfony/Component/Security/Http/README.md
@@ -11,7 +11,7 @@ Resources
Documentation:
-https://symfony.com/doc/2.7/book/security.html
+https://symfony.com/doc/2.8/book/security.html
Tests
-----
diff --git a/src/Symfony/Component/Security/Http/composer.json b/src/Symfony/Component/Security/Http/composer.json
index 7b08d002b4fbb..1c49504895395 100644
--- a/src/Symfony/Component/Security/Http/composer.json
+++ b/src/Symfony/Component/Security/Http/composer.json
@@ -17,15 +17,15 @@
],
"require": {
"php": ">=5.3.9",
- "symfony/security-core": "~2.6",
- "symfony/event-dispatcher": "~2.1",
- "symfony/http-foundation": "~2.4",
- "symfony/http-kernel": "~2.4"
+ "symfony/security-core": "~2.6|~3.0.0",
+ "symfony/event-dispatcher": "~2.1|~3.0.0",
+ "symfony/http-foundation": "~2.4|~3.0.0",
+ "symfony/http-kernel": "~2.4|~3.0.0"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
- "symfony/routing": "~2.2",
- "symfony/security-csrf": "~2.4",
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/routing": "~2.2|~3.0.0",
+ "symfony/security-csrf": "~2.4|~3.0.0",
"psr/log": "~1.0"
},
"suggest": {
@@ -38,7 +38,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Security/README.md b/src/Symfony/Component/Security/README.md
index c41b673f796fa..d85cd9636f489 100644
--- a/src/Symfony/Component/Security/README.md
+++ b/src/Symfony/Component/Security/README.md
@@ -11,7 +11,7 @@ Resources
Documentation:
-https://symfony.com/doc/2.7/book/security.html
+https://symfony.com/doc/2.8/book/security.html
Tests
-----
diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json
index aeea64af365d0..75abcf82e0647 100644
--- a/src/Symfony/Component/Security/composer.json
+++ b/src/Symfony/Component/Security/composer.json
@@ -17,9 +17,9 @@
],
"require": {
"php": ">=5.3.9",
- "symfony/event-dispatcher": "~2.2",
- "symfony/http-foundation": "~2.1",
- "symfony/http-kernel": "~2.4"
+ "symfony/event-dispatcher": "~2.2|~3.0.0",
+ "symfony/http-foundation": "~2.1|~3.0.0",
+ "symfony/http-kernel": "~2.4|~3.0.0"
},
"replace": {
"symfony/security-acl": "self.version",
@@ -28,16 +28,16 @@
"symfony/security-http": "self.version"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
- "symfony/intl": "~2.3",
- "symfony/routing": "~2.2",
- "symfony/translation": "~2.0,>=2.0.5",
- "symfony/validator": "~2.5,>=2.5.5",
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/intl": "~2.3|~3.0.0",
+ "symfony/routing": "~2.2|~3.0.0",
+ "symfony/translation": "~2.0,>=2.0.5|~3.0.0",
+ "symfony/validator": "~2.5,>=2.5.5|~3.0.0",
"doctrine/common": "~2.2",
"doctrine/dbal": "~2.2",
"psr/log": "~1.0",
"ircmaxell/password-compat": "~1.0",
- "symfony/expression-language": "~2.6"
+ "symfony/expression-language": "~2.6|~3.0.0"
},
"suggest": {
"symfony/class-loader": "For using the ACL generateSql script",
@@ -54,7 +54,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json
index 0f28b518b8ac7..4ed7c2d7c1e9b 100644
--- a/src/Symfony/Component/Serializer/composer.json
+++ b/src/Symfony/Component/Serializer/composer.json
@@ -19,10 +19,10 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
- "symfony/yaml": "~2.0",
- "symfony/config": "~2.2",
- "symfony/property-access": "~2.3",
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/yaml": "~2.0|~3.0.0",
+ "symfony/config": "~2.2|~3.0.0",
+ "symfony/property-access": "~2.3|~3.0.0",
"doctrine/annotations": "~1.0",
"doctrine/cache": "~1.0"
},
@@ -39,7 +39,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Stopwatch/composer.json b/src/Symfony/Component/Stopwatch/composer.json
index d165e4e52c3cf..e001a17128445 100644
--- a/src/Symfony/Component/Stopwatch/composer.json
+++ b/src/Symfony/Component/Stopwatch/composer.json
@@ -19,7 +19,7 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Stopwatch\\": "" }
@@ -27,7 +27,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Templating/composer.json b/src/Symfony/Component/Templating/composer.json
index 608d6d2cc7694..0e50a6d95aacb 100644
--- a/src/Symfony/Component/Templating/composer.json
+++ b/src/Symfony/Component/Templating/composer.json
@@ -19,7 +19,7 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
"psr/log": "~1.0"
},
"suggest": {
@@ -31,7 +31,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Translation/CHANGELOG.md b/src/Symfony/Component/Translation/CHANGELOG.md
index 157752ca77180..8b2661e9ba437 100644
--- a/src/Symfony/Component/Translation/CHANGELOG.md
+++ b/src/Symfony/Component/Translation/CHANGELOG.md
@@ -1,6 +1,12 @@
CHANGELOG
=========
+2.8.0
+-----
+
+ * deprecated Translator::getMessages(), use TranslatorBagInterface::getCatalogue() instead.
+ * added options 'as_tree', 'inline' to YamlFileDumper
+
2.7.0
-----
diff --git a/src/Symfony/Component/Translation/Dumper/FileDumper.php b/src/Symfony/Component/Translation/Dumper/FileDumper.php
index f2f17d64fde16..7620526f08e53 100644
--- a/src/Symfony/Component/Translation/Dumper/FileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/FileDumper.php
@@ -82,10 +82,26 @@ public function dump(MessageCatalogue $messages, $options = array())
}
}
// save file
- file_put_contents($fullpath, $this->format($messages, $domain));
+ file_put_contents($fullpath, $this->formatCatalogue($messages, $domain, $options));
}
}
+ /**
+ * Transforms a domain of a message catalogue to its string representation.
+ *
+ * Override this function in child class if $options is used for message formatting.
+ *
+ * @param MessageCatalogue $messages
+ * @param string $domain
+ * @param array $options
+ *
+ * @return string representation
+ */
+ protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
+ {
+ return $this->format($messages, $domain);
+ }
+
/**
* Transforms a domain of a message catalogue to its string representation.
*
diff --git a/src/Symfony/Component/Translation/Dumper/YamlFileDumper.php b/src/Symfony/Component/Translation/Dumper/YamlFileDumper.php
index 870fb9838042d..e27f8b376dbed 100644
--- a/src/Symfony/Component/Translation/Dumper/YamlFileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/YamlFileDumper.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Translation\Dumper;
use Symfony\Component\Translation\MessageCatalogue;
+use Symfony\Component\Translation\Util\ArrayConverter;
use Symfony\Component\Yaml\Yaml;
/**
@@ -24,13 +25,31 @@ class YamlFileDumper extends FileDumper
/**
* {@inheritdoc}
*/
- protected function format(MessageCatalogue $messages, $domain)
+ protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
{
if (!class_exists('Symfony\Component\Yaml\Yaml')) {
throw new \LogicException('Dumping translations in the YAML format requires the Symfony Yaml component.');
}
- return Yaml::dump($messages->all($domain));
+ $data = $messages->all($domain);
+
+ if (isset($options['as_tree']) && $options['as_tree']) {
+ $data = ArrayConverter::expandToTree($data);
+ }
+
+ if (isset($options['inline']) && ($inline = (int) $options['inline']) > 0) {
+ return Yaml::dump($data, $inline);
+ }
+
+ return Yaml::dump($data);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function format(MessageCatalogue $messages, $domain)
+ {
+ return $this->formatCatalogue($messages, $domain);
}
/**
diff --git a/src/Symfony/Component/Translation/Loader/CsvFileLoader.php b/src/Symfony/Component/Translation/Loader/CsvFileLoader.php
index fc927601d900e..b6f0966371df1 100644
--- a/src/Symfony/Component/Translation/Loader/CsvFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/CsvFileLoader.php
@@ -11,9 +11,7 @@
namespace Symfony\Component\Translation\Loader;
-use Symfony\Component\Translation\Exception\InvalidResourceException;
use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\FileResource;
/**
* CsvFileLoader loads translations from CSV files.
@@ -22,7 +20,7 @@
*
* @api
*/
-class CsvFileLoader extends ArrayLoader
+class CsvFileLoader extends FileLoader
{
private $delimiter = ';';
private $enclosure = '"';
@@ -30,19 +28,9 @@ class CsvFileLoader extends ArrayLoader
/**
* {@inheritdoc}
- *
- * @api
*/
- public function load($resource, $locale, $domain = 'messages')
+ protected function loadResource($resource)
{
- if (!stream_is_local($resource)) {
- throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
- }
-
- if (!file_exists($resource)) {
- throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
- }
-
$messages = array();
try {
@@ -70,13 +58,7 @@ public function load($resource, $locale, $domain = 'messages')
}
}
- $catalogue = parent::load($messages, $locale, $domain);
-
- if (class_exists('Symfony\Component\Config\Resource\FileResource')) {
- $catalogue->addResource(new FileResource($resource));
- }
-
- return $catalogue;
+ return $messages;
}
/**
diff --git a/src/Symfony/Component/Translation/Loader/FileLoader.php b/src/Symfony/Component/Translation/Loader/FileLoader.php
new file mode 100644
index 0000000000000..a7f24f41a6535
--- /dev/null
+++ b/src/Symfony/Component/Translation/Loader/FileLoader.php
@@ -0,0 +1,65 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Translation\Loader;
+
+use Symfony\Component\Translation\Exception\InvalidResourceException;
+use Symfony\Component\Translation\Exception\NotFoundResourceException;
+use Symfony\Component\Config\Resource\FileResource;
+
+/**
+ * @author Abdellatif Ait boudad
+ */
+abstract class FileLoader extends ArrayLoader
+{
+ /**
+ * {@inheritdoc}
+ */
+ public function load($resource, $locale, $domain = 'messages')
+ {
+ if (!stream_is_local($resource)) {
+ throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
+ }
+
+ if (!file_exists($resource)) {
+ throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
+ }
+
+ $messages = $this->loadResource($resource);
+
+ // empty resource
+ if (null === $messages) {
+ $messages = array();
+ }
+
+ // not an array
+ if (!is_array($messages)) {
+ throw new InvalidResourceException(sprintf('Unable to load file "%s".', $resource));
+ }
+
+ $catalogue = parent::load($messages, $locale, $domain);
+
+ if (class_exists('Symfony\Component\Config\Resource\FileResource')) {
+ $catalogue->addResource(new FileResource($resource));
+ }
+
+ return $catalogue;
+ }
+
+ /*
+ * @param string $resource
+ *
+ * @return array
+ *
+ * @throws InvalidResourceException If stream content has an invalid format.
+ */
+ abstract protected function loadResource($resource);
+}
diff --git a/src/Symfony/Component/Translation/Loader/IniFileLoader.php b/src/Symfony/Component/Translation/Loader/IniFileLoader.php
index 1b3a7b19118ff..11d9b272e0a39 100644
--- a/src/Symfony/Component/Translation/Loader/IniFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/IniFileLoader.php
@@ -11,38 +11,18 @@
namespace Symfony\Component\Translation\Loader;
-use Symfony\Component\Translation\Exception\InvalidResourceException;
-use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\FileResource;
-
/**
* IniFileLoader loads translations from an ini file.
*
* @author stealth35
*/
-class IniFileLoader extends ArrayLoader
+class IniFileLoader extends FileLoader
{
/**
* {@inheritdoc}
*/
- public function load($resource, $locale, $domain = 'messages')
+ protected function loadResource($resource)
{
- if (!stream_is_local($resource)) {
- throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
- }
-
- if (!file_exists($resource)) {
- throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
- }
-
- $messages = parse_ini_file($resource, true);
-
- $catalogue = parent::load($messages, $locale, $domain);
-
- if (class_exists('Symfony\Component\Config\Resource\FileResource')) {
- $catalogue->addResource(new FileResource($resource));
- }
-
- return $catalogue;
+ return parse_ini_file($resource, true);
}
}
diff --git a/src/Symfony/Component/Translation/Loader/JsonFileLoader.php b/src/Symfony/Component/Translation/Loader/JsonFileLoader.php
index 8327c63b57f10..bd59659cf43a1 100644
--- a/src/Symfony/Component/Translation/Loader/JsonFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/JsonFileLoader.php
@@ -12,43 +12,26 @@
namespace Symfony\Component\Translation\Loader;
use Symfony\Component\Translation\Exception\InvalidResourceException;
-use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\FileResource;
/**
* JsonFileLoader loads translations from an json file.
*
* @author singles
*/
-class JsonFileLoader extends ArrayLoader implements LoaderInterface
+class JsonFileLoader extends FileLoader
{
/**
* {@inheritdoc}
*/
- public function load($resource, $locale, $domain = 'messages')
+ protected function loadResource($resource)
{
- if (!stream_is_local($resource)) {
- throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
- }
-
- if (!file_exists($resource)) {
- throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
- }
-
$messages = json_decode(file_get_contents($resource), true);
if (0 < $errorCode = json_last_error()) {
throw new InvalidResourceException(sprintf('Error parsing JSON - %s', $this->getJSONErrorMessage($errorCode)));
}
- if (null === $messages) {
- $messages = array();
- }
-
- $catalogue = parent::load($messages, $locale, $domain);
- $catalogue->addResource(new FileResource($resource));
-
- return $catalogue;
+ return $messages;
}
/**
diff --git a/src/Symfony/Component/Translation/Loader/MoFileLoader.php b/src/Symfony/Component/Translation/Loader/MoFileLoader.php
index 746fd52904347..c27a88e3d275e 100644
--- a/src/Symfony/Component/Translation/Loader/MoFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/MoFileLoader.php
@@ -12,13 +12,11 @@
namespace Symfony\Component\Translation\Loader;
use Symfony\Component\Translation\Exception\InvalidResourceException;
-use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\FileResource;
/**
* @copyright Copyright (c) 2010, Union of RAD http://union-of-rad.org (http://lithify.me/)
*/
-class MoFileLoader extends ArrayLoader
+class MoFileLoader extends FileLoader
{
/**
* Magic used for validating the format of a MO file as well as
@@ -43,48 +41,13 @@ class MoFileLoader extends ArrayLoader
*/
const MO_HEADER_SIZE = 28;
- public function load($resource, $locale, $domain = 'messages')
- {
- if (!stream_is_local($resource)) {
- throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
- }
-
- if (!file_exists($resource)) {
- throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
- }
-
- $messages = $this->parse($resource);
-
- // empty file
- if (null === $messages) {
- $messages = array();
- }
-
- // not an array
- if (!is_array($messages)) {
- throw new InvalidResourceException(sprintf('The file "%s" must contain a valid mo file.', $resource));
- }
-
- $catalogue = parent::load($messages, $locale, $domain);
-
- if (class_exists('Symfony\Component\Config\Resource\FileResource')) {
- $catalogue->addResource(new FileResource($resource));
- }
-
- return $catalogue;
- }
-
/**
* Parses machine object (MO) format, independent of the machine's endian it
* was created on. Both 32bit and 64bit systems are supported.
*
- * @param resource $resource
- *
- * @return array
- *
- * @throws InvalidResourceException If stream content has an invalid format.
+ * {@inheritdoc}
*/
- private function parse($resource)
+ protected function loadResource($resource)
{
$stream = fopen($resource, 'r');
diff --git a/src/Symfony/Component/Translation/Loader/PhpFileLoader.php b/src/Symfony/Component/Translation/Loader/PhpFileLoader.php
index 9ce2e7d2fa0de..88f4cdb113a08 100644
--- a/src/Symfony/Component/Translation/Loader/PhpFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/PhpFileLoader.php
@@ -11,10 +11,6 @@
namespace Symfony\Component\Translation\Loader;
-use Symfony\Component\Translation\Exception\InvalidResourceException;
-use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\FileResource;
-
/**
* PhpFileLoader loads translations from PHP files returning an array of translations.
*
@@ -22,31 +18,13 @@
*
* @api
*/
-class PhpFileLoader extends ArrayLoader
+class PhpFileLoader extends FileLoader
{
/**
* {@inheritdoc}
- *
- * @api
*/
- public function load($resource, $locale, $domain = 'messages')
+ protected function loadResource($resource)
{
- if (!stream_is_local($resource)) {
- throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
- }
-
- if (!file_exists($resource)) {
- throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
- }
-
- $messages = require $resource;
-
- $catalogue = parent::load($messages, $locale, $domain);
-
- if (class_exists('Symfony\Component\Config\Resource\FileResource')) {
- $catalogue->addResource(new FileResource($resource));
- }
-
- return $catalogue;
+ return require $resource;
}
}
diff --git a/src/Symfony/Component/Translation/Loader/PoFileLoader.php b/src/Symfony/Component/Translation/Loader/PoFileLoader.php
index b5d12e9821643..84664d65a0acc 100644
--- a/src/Symfony/Component/Translation/Loader/PoFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/PoFileLoader.php
@@ -11,47 +11,12 @@
namespace Symfony\Component\Translation\Loader;
-use Symfony\Component\Translation\Exception\InvalidResourceException;
-use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\FileResource;
-
/**
* @copyright Copyright (c) 2010, Union of RAD http://union-of-rad.org (http://lithify.me/)
* @copyright Copyright (c) 2012, Clemens Tolboom
*/
-class PoFileLoader extends ArrayLoader
+class PoFileLoader extends FileLoader
{
- public function load($resource, $locale, $domain = 'messages')
- {
- if (!stream_is_local($resource)) {
- throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
- }
-
- if (!file_exists($resource)) {
- throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
- }
-
- $messages = $this->parse($resource);
-
- // empty file
- if (null === $messages) {
- $messages = array();
- }
-
- // not an array
- if (!is_array($messages)) {
- throw new InvalidResourceException(sprintf('The file "%s" must contain a valid po file.', $resource));
- }
-
- $catalogue = parent::load($messages, $locale, $domain);
-
- if (class_exists('Symfony\Component\Config\Resource\FileResource')) {
- $catalogue->addResource(new FileResource($resource));
- }
-
- return $catalogue;
- }
-
/**
* Parses portable object (PO) format.
*
@@ -93,11 +58,9 @@ public function load($resource, $locale, $domain = 'messages')
*
* Items with an empty id are ignored.
*
- * @param resource $resource
- *
- * @return array
+ * {@inheritdoc}
*/
- private function parse($resource)
+ protected function loadResource($resource)
{
$stream = fopen($resource, 'r');
diff --git a/src/Symfony/Component/Translation/Loader/YamlFileLoader.php b/src/Symfony/Component/Translation/Loader/YamlFileLoader.php
index fb0946cc577f5..1abe8cc302c26 100644
--- a/src/Symfony/Component/Translation/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/YamlFileLoader.php
@@ -12,8 +12,6 @@
namespace Symfony\Component\Translation\Loader;
use Symfony\Component\Translation\Exception\InvalidResourceException;
-use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\FileResource;
use Symfony\Component\Yaml\Parser as YamlParser;
use Symfony\Component\Yaml\Exception\ParseException;
@@ -24,30 +22,20 @@
*
* @api
*/
-class YamlFileLoader extends ArrayLoader
+class YamlFileLoader extends FileLoader
{
private $yamlParser;
/**
* {@inheritdoc}
- *
- * @api
*/
- public function load($resource, $locale, $domain = 'messages')
+ protected function loadResource($resource)
{
- if (!stream_is_local($resource)) {
- throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
- }
-
- if (!file_exists($resource)) {
- throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
- }
-
- if (!class_exists('Symfony\Component\Yaml\Parser')) {
- throw new \LogicException('Loading translations from the YAML format requires the Symfony Yaml component.');
- }
-
if (null === $this->yamlParser) {
+ if (!class_exists('Symfony\Component\Yaml\Parser')) {
+ throw new \LogicException('Loading translations from the YAML format requires the Symfony Yaml component.');
+ }
+
$this->yamlParser = new YamlParser();
}
@@ -57,22 +45,6 @@ public function load($resource, $locale, $domain = 'messages')
throw new InvalidResourceException(sprintf('Error parsing YAML, invalid file "%s"', $resource), 0, $e);
}
- // empty file
- if (null === $messages) {
- $messages = array();
- }
-
- // not an array
- if (!is_array($messages)) {
- throw new InvalidResourceException(sprintf('The file "%s" must contain a YAML array.', $resource));
- }
-
- $catalogue = parent::load($messages, $locale, $domain);
-
- if (class_exists('Symfony\Component\Config\Resource\FileResource')) {
- $catalogue->addResource(new FileResource($resource));
- }
-
- return $catalogue;
+ return $messages;
}
}
diff --git a/src/Symfony/Component/Translation/README.md b/src/Symfony/Component/Translation/README.md
index 2b008629578c3..fc6901a8ac33a 100644
--- a/src/Symfony/Component/Translation/README.md
+++ b/src/Symfony/Component/Translation/README.md
@@ -28,7 +28,7 @@ https://github.com/fabpot/Silex/blob/master/src/Silex/Provider/TranslationServic
Documentation:
-https://symfony.com/doc/2.7/book/translation.html
+https://symfony.com/doc/2.8/book/translation.html
You can run the unit tests with the following command:
diff --git a/src/Symfony/Component/Translation/Tests/Dumper/YamlFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/YamlFileDumperTest.php
index 3c68ade753114..161925cd23bf4 100644
--- a/src/Symfony/Component/Translation/Tests/Dumper/YamlFileDumperTest.php
+++ b/src/Symfony/Component/Translation/Tests/Dumper/YamlFileDumperTest.php
@@ -16,16 +16,38 @@
class YamlFileDumperTest extends \PHPUnit_Framework_TestCase
{
- public function testDump()
+ public function testTreeDump()
{
$catalogue = new MessageCatalogue('en');
- $catalogue->add(array('foo' => 'bar'));
+ $catalogue->add(
+ array(
+ 'foo.bar1' => 'value1',
+ 'foo.bar2' => 'value2',
+ ));
+
+ $tempDir = sys_get_temp_dir();
+ $dumper = new YamlFileDumper();
+ $dumper->dump($catalogue, array('path' => $tempDir, 'as_tree' => true, 'inline' => 999));
+
+ $this->assertEquals(file_get_contents(__DIR__.'/../fixtures/messages.yml'), file_get_contents($tempDir.'/messages.en.yml'));
+
+ unlink($tempDir.'/messages.en.yml');
+ }
+
+ public function testLinearDump()
+ {
+ $catalogue = new MessageCatalogue('en');
+ $catalogue->add(
+ array(
+ 'foo.bar1' => 'value1',
+ 'foo.bar2' => 'value2',
+ ));
$tempDir = sys_get_temp_dir();
$dumper = new YamlFileDumper();
$dumper->dump($catalogue, array('path' => $tempDir));
- $this->assertEquals(file_get_contents(__DIR__.'/../fixtures/resources.yml'), file_get_contents($tempDir.'/messages.en.yml'));
+ $this->assertEquals(file_get_contents(__DIR__.'/../fixtures/messages_linear.yml'), file_get_contents($tempDir.'/messages.en.yml'));
unlink($tempDir.'/messages.en.yml');
}
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorTest.php b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
index 3ee9be019dd25..ec06e50b0d62b 100644
--- a/src/Symfony/Component/Translation/Tests/TranslatorTest.php
+++ b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
@@ -497,9 +497,10 @@ public function testTransChoiceFallbackWithNoTranslation()
}
/**
+ * @group legacy
* @dataProvider dataProviderGetMessages
*/
- public function testGetMessages($resources, $locale, $expected)
+ public function testLegacyGetMessages($resources, $locale, $expected)
{
$locales = array_keys($resources);
$_locale = !is_null($locale) ? $locale : reset($locales);
diff --git a/src/Symfony/Component/Translation/Tests/Util/ArrayConverterTest.php b/src/Symfony/Component/Translation/Tests/Util/ArrayConverterTest.php
new file mode 100644
index 0000000000000..9eea275be6b90
--- /dev/null
+++ b/src/Symfony/Component/Translation/Tests/Util/ArrayConverterTest.php
@@ -0,0 +1,73 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Translation\Tests\Util;
+
+use Symfony\Component\Translation\Util\ArrayConverter;
+
+class ArrayConverterTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @dataProvider messsagesData
+ */
+ public function testDump($input, $expectedOutput)
+ {
+ $this->assertEquals($expectedOutput, ArrayConverter::expandToTree($input));
+ }
+
+ public function messsagesData()
+ {
+ return array(
+ array(
+ // input
+ array(
+ 'foo1' => 'bar',
+ 'foo.bar' => 'value',
+ ),
+ // expected output
+ array(
+ 'foo1' => 'bar',
+ 'foo' => array('bar' => 'value'),
+ ),
+ ),
+ array(
+ // input
+ array(
+ 'foo.bar' => 'value1',
+ 'foo.bar.test' => 'value2',
+ ),
+ // expected output
+ array(
+ 'foo' => array(
+ 'bar' => 'value1',
+ 'bar.test' => 'value2',
+ ),
+ ),
+ ),
+ array(
+ // input
+ array(
+ 'foo.level2.level3.level4' => 'value1',
+ 'foo.level2' => 'value2',
+ 'foo.bar' => 'value3',
+ ),
+ // expected output
+ array(
+ 'foo' => array(
+ 'level2' => 'value2',
+ 'level2.level3.level4' => 'value1',
+ 'bar' => 'value3',
+ ),
+ ),
+ ),
+ );
+ }
+}
diff --git a/src/Symfony/Component/Translation/Tests/fixtures/messages.yml b/src/Symfony/Component/Translation/Tests/fixtures/messages.yml
new file mode 100644
index 0000000000000..d4f82d78106a9
--- /dev/null
+++ b/src/Symfony/Component/Translation/Tests/fixtures/messages.yml
@@ -0,0 +1,3 @@
+foo:
+ bar1: value1
+ bar2: value2
diff --git a/src/Symfony/Component/Translation/Tests/fixtures/messages_linear.yml b/src/Symfony/Component/Translation/Tests/fixtures/messages_linear.yml
new file mode 100644
index 0000000000000..6c1687d0a3698
--- /dev/null
+++ b/src/Symfony/Component/Translation/Tests/fixtures/messages_linear.yml
@@ -0,0 +1,2 @@
+foo.bar1: value1
+foo.bar2: value2
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
index ec315066f7b04..d1e552db74ccc 100644
--- a/src/Symfony/Component/Translation/Translator.php
+++ b/src/Symfony/Component/Translation/Translator.php
@@ -289,9 +289,13 @@ protected function getLoaders()
* @param string|null $locale Locale of translations, by default is current locale
*
* @return array[array] indexed by catalog
+ *
+ * @deprecated since version 2.8, to be removed in 3.0. Use TranslatorBagInterface::getCatalogue() method instead.
*/
public function getMessages($locale = null)
{
+ trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use TranslatorBagInterface::getCatalogue() method instead.', E_USER_DEPRECATED);
+
$catalogue = $this->getCatalogue($locale);
$messages = $catalogue->all();
while ($catalogue = $catalogue->getFallbackCatalogue()) {
diff --git a/src/Symfony/Component/Translation/Util/ArrayConverter.php b/src/Symfony/Component/Translation/Util/ArrayConverter.php
new file mode 100644
index 0000000000000..60a55e9d3709c
--- /dev/null
+++ b/src/Symfony/Component/Translation/Util/ArrayConverter.php
@@ -0,0 +1,99 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Translation\Util;
+
+/**
+ * ArrayConverter generates tree like structure from a message catalogue.
+ * e.g. this
+ * 'foo.bar1' => 'test1',
+ * 'foo.bar2' => 'test2'
+ * converts to follows:
+ * foo:
+ * bar1: test1
+ * bar2: test2.
+ *
+ * @author Gennady Telegin
+ */
+class ArrayConverter
+{
+ /**
+ * Converts linear messages array to tree-like array.
+ * For example this rray('foo.bar' => 'value') will be converted to array('foo' => array('bar' => 'value')).
+ *
+ * @param array $messages Linear messages array
+ *
+ * @return array Tree-like messages array
+ */
+ public static function expandToTree(array $messages)
+ {
+ $tree = array();
+
+ foreach ($messages as $id => $value) {
+ $referenceToElement = &self::getElementByPath($tree, explode('.', $id));
+
+ $referenceToElement = $value;
+
+ unset($referenceToElement);
+ }
+
+ return $tree;
+ }
+
+ private static function &getElementByPath(array &$tree, array $parts)
+ {
+ $elem = &$tree;
+ $parentOfElem = null;
+
+ foreach ($parts as $i => $part) {
+ if (isset($elem[$part]) && is_string($elem[$part])) {
+ /* Process next case:
+ * 'foo': 'test1',
+ * 'foo.bar': 'test2'
+ *
+ * $tree['foo'] was string before we found array {bar: test2}.
+ * Treat new element as string too, e.g. add $tree['foo.bar'] = 'test2';
+ */
+ $elem = &$elem[ implode('.', array_slice($parts, $i)) ];
+ break;
+ }
+ $parentOfElem = &$elem;
+ $elem = &$elem[$part];
+ }
+
+ if (is_array($elem) && count($elem) > 0 && $parentOfElem) {
+ /* Process next case:
+ * 'foo.bar': 'test1'
+ * 'foo': 'test2'
+ *
+ * $tree['foo'] was array = {bar: 'test1'} before we found string constant `foo`.
+ * Cancel treating $tree['foo'] as array and cancel back it expansion,
+ * e.g. make it $tree['foo.bar'] = 'test1' again.
+ */
+ self::cancelExpand($parentOfElem, $part, $elem);
+ }
+
+ return $elem;
+ }
+
+ private static function cancelExpand(array &$tree, $prefix, array $node)
+ {
+ $prefix .= '.';
+
+ foreach ($node as $id => $value) {
+ if (is_string($value)) {
+ $tree[$prefix.$id] = $value;
+ } else {
+ self::cancelExpand($tree, $prefix.$id, $value);
+ }
+ }
+ }
+}
diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json
index 6f1053e66caf0..e428dd04f3e15 100644
--- a/src/Symfony/Component/Translation/composer.json
+++ b/src/Symfony/Component/Translation/composer.json
@@ -19,10 +19,10 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
"symfony/config": "~2.7",
- "symfony/intl": "~2.3",
- "symfony/yaml": "~2.2",
+ "symfony/intl": "~2.3|~3.0.0",
+ "symfony/yaml": "~2.2|~3.0.0",
"psr/log": "~1.0"
},
"conflict": {
@@ -39,7 +39,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Validator/README.md b/src/Symfony/Component/Validator/README.md
index 9014ec67240ee..c29a26121d8f7 100644
--- a/src/Symfony/Component/Validator/README.md
+++ b/src/Symfony/Component/Validator/README.md
@@ -113,7 +113,7 @@ https://github.com/fabpot/Silex/blob/master/src/Silex/Provider/ValidatorServiceP
Documentation:
-https://symfony.com/doc/2.7/book/validation.html
+https://symfony.com/doc/2.8/book/validation.html
JSR-303 Specification:
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
index b89fe1b134515..1e0bebe146a14 100644
--- a/src/Symfony/Component/Validator/composer.json
+++ b/src/Symfony/Component/Validator/composer.json
@@ -17,16 +17,16 @@
],
"require": {
"php": ">=5.3.9",
- "symfony/translation": "~2.4"
+ "symfony/translation": "~2.4|~3.0.0"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7",
- "symfony/http-foundation": "~2.1",
- "symfony/intl": "~2.3",
- "symfony/yaml": "~2.0,>=2.0.5",
- "symfony/config": "~2.2",
- "symfony/property-access": "~2.3",
- "symfony/expression-language": "~2.4",
+ "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/http-foundation": "~2.1|~3.0.0",
+ "symfony/intl": "~2.3|~3.0.0",
+ "symfony/yaml": "~2.0,>=2.0.5|~3.0.0",
+ "symfony/config": "~2.2|~3.0.0",
+ "symfony/property-access": "~2.3|~3.0.0",
+ "symfony/expression-language": "~2.4|~3.0.0",
"doctrine/annotations": "~1.0",
"doctrine/cache": "~1.0",
"egulias/email-validator": "~1.2,>=1.2.1"
@@ -48,7 +48,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/VarDumper/Caster/CutArrayStub.php b/src/Symfony/Component/VarDumper/Caster/CutArrayStub.php
new file mode 100644
index 0000000000000..f2a803053a6c0
--- /dev/null
+++ b/src/Symfony/Component/VarDumper/Caster/CutArrayStub.php
@@ -0,0 +1,30 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+/**
+ * Represents a cut array.
+ *
+ * @author Nicolas Grekas
+ */
+class CutArrayStub extends CutStub
+{
+ public $preservedSubset;
+
+ public function __construct(array $value, array $preservedKeys)
+ {
+ parent::__construct($value);
+
+ $this->preservedSubset = array_intersect_key($value, array_flip($preservedKeys));
+ $this->cut -= count($this->preservedSubset);
+ }
+}
diff --git a/src/Symfony/Component/VarDumper/Caster/SplCaster.php b/src/Symfony/Component/VarDumper/Caster/SplCaster.php
index 79e8bb80b9afc..f4b1f47cf78ee 100644
--- a/src/Symfony/Component/VarDumper/Caster/SplCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/SplCaster.php
@@ -20,6 +20,13 @@
*/
class SplCaster
{
+ private static $splFileObjectFlags = array(
+ \SplFileObject::DROP_NEW_LINE => 'DROP_NEW_LINE',
+ \SplFileObject::READ_AHEAD => 'READ_AHEAD',
+ \SplFileObject::SKIP_EMPTY => 'SKIP_EMPTY',
+ \SplFileObject::READ_CSV => 'READ_CSV',
+ );
+
public static function castArrayObject(\ArrayObject $c, array $a, Stub $stub, $isNested)
{
$prefix = Caster::PREFIX_VIRTUAL;
@@ -72,6 +79,93 @@ public static function castDoublyLinkedList(\SplDoublyLinkedList $c, array $a, S
return $a;
}
+ public static function castFileInfo(\SplFileInfo $c, array $a, Stub $stub, $isNested)
+ {
+ static $map = array(
+ 'path' => 'getPath',
+ 'filename' => 'getFilename',
+ 'basename' => 'getBasename',
+ 'pathname' => 'getPathname',
+ 'extension' => 'getExtension',
+ 'realPath' => 'getRealPath',
+ 'aTime' => 'getATime',
+ 'mTime' => 'getMTime',
+ 'cTime' => 'getCTime',
+ 'inode' => 'getInode',
+ 'size' => 'getSize',
+ 'perms' => 'getPerms',
+ 'owner' => 'getOwner',
+ 'group' => 'getGroup',
+ 'type' => 'getType',
+ 'writable' => 'isWritable',
+ 'readable' => 'isReadable',
+ 'executable' => 'isExecutable',
+ 'file' => 'isFile',
+ 'dir' => 'isDir',
+ 'link' => 'isLink',
+ 'linkTarget' => 'getLinkTarget',
+ );
+
+ $prefix = Caster::PREFIX_VIRTUAL;
+
+ foreach ($map as $key => $accessor) {
+ try {
+ $a[$prefix.$key] = $c->$accessor();
+ } catch (\Exception $e) {
+ }
+ }
+
+ if (isset($a[$prefix.'perms'])) {
+ $a[$prefix.'perms'] = new ConstStub(sprintf('0%o', $a[$prefix.'perms']), $a[$prefix.'perms']);
+ }
+
+ static $mapDate = array('aTime', 'mTime', 'cTime');
+ foreach ($mapDate as $key) {
+ if (isset($a[$prefix.$key])) {
+ $a[$prefix.$key] = new ConstStub(date('Y-m-d H:i:s', $a[$prefix.$key]), $a[$prefix.$key]);
+ }
+ }
+
+ return $a;
+ }
+
+ public static function castFileObject(\SplFileObject $c, array $a, Stub $stub, $isNested)
+ {
+ static $map = array(
+ 'csvControl' => 'getCsvControl',
+ 'flags' => 'getFlags',
+ 'maxLineLen' => 'getMaxLineLen',
+ 'fstat' => 'fstat',
+ 'eof' => 'eof',
+ 'key' => 'key',
+ );
+
+ $prefix = Caster::PREFIX_VIRTUAL;
+
+ foreach ($map as $key => $accessor) {
+ try {
+ $a[$prefix.$key] = $c->$accessor();
+ } catch (\Exception $e) {
+ }
+ }
+
+ if (isset($a[$prefix.'flags'])) {
+ $flagsArray = array();
+ foreach (self::$splFileObjectFlags as $value => $name) {
+ if ($a[$prefix.'flags'] & $value) {
+ $flagsArray[] = $name;
+ }
+ }
+ $a[$prefix.'flags'] = new ConstStub(implode('|', $flagsArray), $a[$prefix.'flags']);
+ }
+
+ if (isset($a[$prefix.'fstat'])) {
+ $a[$prefix.'fstat'] = new CutArrayStub($a[$prefix.'fstat'], array('dev', 'ino', 'nlink', 'rdev', 'blksize', 'blocks'));
+ }
+
+ return $a;
+ }
+
public static function castFixedArray(\SplFixedArray $c, array $a, Stub $stub, $isNested)
{
$a += array(
diff --git a/src/Symfony/Component/VarDumper/Caster/StubCaster.php b/src/Symfony/Component/VarDumper/Caster/StubCaster.php
index ab0f52e55ae9d..542f8a19f4afb 100644
--- a/src/Symfony/Component/VarDumper/Caster/StubCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/StubCaster.php
@@ -33,6 +33,11 @@ public static function castStub(Stub $c, array $a, Stub $stub, $isNested)
}
}
+ public static function castCutArray(CutArrayStub $c, array $a, Stub $stub, $isNested)
+ {
+ return $isNested ? $c->preservedSubset : $a;
+ }
+
public static function cutInternals($obj, array $a, Stub $stub, $isNested)
{
if ($isNested) {
diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
index e4f7a7c0538b7..180b1b373efa8 100644
--- a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
+++ b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
@@ -23,6 +23,7 @@ abstract class AbstractCloner implements ClonerInterface
{
public static $defaultCasters = array(
'Symfony\Component\VarDumper\Caster\CutStub' => 'Symfony\Component\VarDumper\Caster\StubCaster::castStub',
+ 'Symfony\Component\VarDumper\Caster\CutArrayStub' => 'Symfony\Component\VarDumper\Caster\StubCaster::castCutArray',
'Symfony\Component\VarDumper\Caster\ConstStub' => 'Symfony\Component\VarDumper\Caster\StubCaster::castStub',
'Closure' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castClosure',
@@ -78,6 +79,8 @@ abstract class AbstractCloner implements ClonerInterface
'ArrayObject' => 'Symfony\Component\VarDumper\Caster\SplCaster::castArrayObject',
'SplDoublyLinkedList' => 'Symfony\Component\VarDumper\Caster\SplCaster::castDoublyLinkedList',
+ 'SplFileInfo' => 'Symfony\Component\VarDumper\Caster\SplCaster::castFileInfo',
+ 'SplFileObject' => 'Symfony\Component\VarDumper\Caster\SplCaster::castFileObject',
'SplFixedArray' => 'Symfony\Component\VarDumper\Caster\SplCaster::castFixedArray',
'SplHeap' => 'Symfony\Component\VarDumper\Caster\SplCaster::castHeap',
'SplObjectStorage' => 'Symfony\Component\VarDumper\Caster\SplCaster::castObjectStorage',
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php
index be4947278d5aa..fe3c65042fd93 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php
@@ -11,8 +11,6 @@
namespace Symfony\Component\VarDumper\Tests\Caster;
-use Symfony\Component\VarDumper\Cloner\VarCloner;
-use Symfony\Component\VarDumper\Dumper\CliDumper;
use Symfony\Component\VarDumper\Test\VarDumperTestCase;
/**
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
new file mode 100644
index 0000000000000..121428ccfedef
--- /dev/null
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
@@ -0,0 +1,124 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use Symfony\Component\VarDumper\Test\VarDumperTestCase;
+
+/**
+ * @author Grégoire Pineau
+ */
+class SplCasterTest extends VarDumperTestCase
+{
+ public function getCastFileInfoTests()
+ {
+ return array(
+ array(__FILE__, <<<'EOTXT'
+SplFileInfo {
+ path: "%s/Tests/Caster"
+ filename: "SplCasterTest.php"
+ basename: "SplCasterTest.php"
+ pathname: "%s/Tests/Caster/SplCasterTest.php"
+ extension: "php"
+ realPath: "%s/Tests/Caster/SplCasterTest.php"
+ aTime: %s-%s-%d %d:%d:%d
+ mTime: %s-%s-%d %d:%d:%d
+ cTime: %s-%s-%d %d:%d:%d
+ inode: %d
+ size: %d
+ perms: 0%d
+ owner: %d
+ group: %d
+ type: "file"
+ writable: true
+ readable: true
+ executable: false
+ file: true
+ dir: false
+ link: false
+}
+EOTXT
+ ),
+ array('https://google.com/about', <<<'EOTXT'
+SplFileInfo {
+ path: "https://google.com"
+ filename: "about"
+ basename: "about"
+ pathname: "https://google.com/about"
+ extension: ""
+ realPath: false
+ writable: false
+ readable: false
+ executable: false
+ file: false
+ dir: false
+ link: false
+}
+EOTXT
+ ),
+ );
+ }
+
+ /** @dataProvider getCastFileInfoTests */
+ public function testCastFileInfo($file, $dump)
+ {
+ $this->assertDumpMatchesFormat($dump, new \SplFileInfo($file));
+ }
+
+ public function testCastFileObject()
+ {
+ $var = new \SplFileObject(__FILE__);
+ $var->setFlags(\SplFileObject::DROP_NEW_LINE | \SplFileObject::SKIP_EMPTY);
+ $dump = <<<'EOTXT'
+SplFileObject {
+ path: "%s/Tests/Caster"
+ filename: "SplCasterTest.php"
+ basename: "SplCasterTest.php"
+ pathname: "%s/Tests/Caster/SplCasterTest.php"
+ extension: "php"
+ realPath: "%s/Tests/Caster/SplCasterTest.php"
+ aTime: %s-%s-%d %d:%d:%d
+ mTime: %s-%s-%d %d:%d:%d
+ cTime: %s-%s-%d %d:%d:%d
+ inode: %d
+ size: %d
+ perms: 0%d
+ owner: %d
+ group: %d
+ type: "file"
+ writable: true
+ readable: true
+ executable: false
+ file: true
+ dir: false
+ link: false
+ csvControl: array:2 [
+ 0 => ","
+ 1 => """
+ ]
+ flags: DROP_NEW_LINE|SKIP_EMPTY
+ maxLineLen: 0
+ fstat: array:26 [
+ "dev" => %d
+ "ino" => %d
+ "nlink" => %d
+ "rdev" => 0
+ "blksize" => %d
+ "blocks" => %d
+ …20
+ ]
+ eof: false
+ key: 0
+}
+EOTXT;
+ $this->assertDumpMatchesFormat($dump, $var);
+ }
+}
diff --git a/src/Symfony/Component/VarDumper/composer.json b/src/Symfony/Component/VarDumper/composer.json
index 5fec14fb23fb0..50b06fdcd27ee 100644
--- a/src/Symfony/Component/VarDumper/composer.json
+++ b/src/Symfony/Component/VarDumper/composer.json
@@ -19,7 +19,7 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0"
},
"suggest": {
"ext-symfony_debug": ""
@@ -31,7 +31,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}
diff --git a/src/Symfony/Component/Yaml/composer.json b/src/Symfony/Component/Yaml/composer.json
index b07b439c96ec4..177608a79fec4 100644
--- a/src/Symfony/Component/Yaml/composer.json
+++ b/src/Symfony/Component/Yaml/composer.json
@@ -19,7 +19,7 @@
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "symfony/phpunit-bridge": "~2.7|~3.0.0"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Yaml\\": "" }
@@ -27,7 +27,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
}
}