symfony · MisatoTremor · Apr 10, 2015 · Apr 10, 2015 · Apr 11, 2015 · Apr 15, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -51,5 +51,5 @@ install:
 script:
     - if [ "$deps" = "no" ]; then echo "$components" | parallel --gnu --keep-order 'echo -e "\\nRunning {} tests"; phpunit --exclude-group tty,benchmark,intl-data {} || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
     - if [ "$deps" = "no" ]; then echo -e "\\nRunning tests requiring tty"; phpunit --group tty || (echo -e "\\e[41mKO\\e[0m tty group" && $(exit 1)); fi;
-    - if [ "$deps" = "high" ]; then echo "$components" | parallel --gnu --keep-order -j10% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
+    - if [ "$deps" = "high" ]; then echo "$components" | parallel --gnu --keep-order -j10% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source update; phpunit --exclude-group tty,benchmark,intl-data,legacy || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
     - if [ "$deps" = "low" ]; then echo "$components" | parallel --gnu --keep-order -j10% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
diff --git a/UPGRADE-2.8.md b/UPGRADE-2.8.md
@@ -0,0 +1,24 @@
+UPGRADE FROM 2.7 to 2.8
+=======================
+
+Translator
+----------
+ * The `getMessages()` method of the `Symfony\Component\Translation\Translator` was deprecated and will be removed in
+   Symfony 3.0. You should use the `getCatalogue()` method of the `Symfony\Component\Translation\TranslatorBagInterface`.
+
+   Before:
+
+   ```php
+   $messages = $translator->getMessages();
+   ```
+
+   After:
+
+   ```php
+    $catalogue = $translator->getCatalogue($locale);
+    $messages = $catalogue->all();
+
+    while ($catalogue = $catalogue->getFallbackCatalogue()) {
+        $messages = array_replace_recursive($catalogue->all(), $messages);
+    }
+   ```
diff --git a/composer.json b/composer.json
@@ -97,7 +97,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "2.7-dev"
+            "dev-master": "2.8-dev"
         }
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -20,16 +20,16 @@
         "doctrine/common": "~2.3"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "~2.7",
-        "symfony/stopwatch": "~2.2",
-        "symfony/dependency-injection": "~2.2",
-        "symfony/form": "~2.7",
-        "symfony/http-kernel": "~2.2",
-        "symfony/property-access": "~2.3",
-        "symfony/security": "~2.2",
-        "symfony/expression-language": "~2.2",
-        "symfony/validator": "~2.5,>=2.5.5",
-        "symfony/translation": "~2.0,>=2.0.5",
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
+        "symfony/stopwatch": "~2.2|~3.0.0",
+        "symfony/dependency-injection": "~2.2|~3.0.0",
+        "symfony/form": "~2.7|~3.0.0",
+        "symfony/http-kernel": "~2.2|~3.0.0",
+        "symfony/property-access": "~2.3|~3.0.0",
+        "symfony/security": "~2.2|~3.0.0",
+        "symfony/expression-language": "~2.2|~3.0.0",
+        "symfony/validator": "~2.5,>=2.5.5|~3.0.0",
+        "symfony/translation": "~2.0,>=2.0.5|~3.0.0",
         "doctrine/data-fixtures": "1.0.*",
         "doctrine/dbal": "~2.2",
         "doctrine/orm": "~2.2,>=2.2.3"
@@ -47,7 +47,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "2.7-dev"
+            "dev-master": "2.8-dev"
         }
     }
 }
diff --git a/src/Symfony/Bridge/Monolog/Handler/DebugHandler.php b/src/Symfony/Bridge/Monolog/Handler/DebugHandler.php
@@ -35,6 +35,7 @@ public function getLogs()
                 'priority' => $record['level'],
                 'priorityName' => $record['level_name'],
                 'context' => $record['context'],
+                'channel' => isset($record['channel']) ? $record['channel'] : '',
             );
         }
 

diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json
@@ -20,10 +20,10 @@
         "monolog/monolog": "~1.11"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "~2.7",
-        "symfony/http-kernel": "~2.4",
-        "symfony/console": "~2.4",
-        "symfony/event-dispatcher": "~2.2"
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
+        "symfony/http-kernel": "~2.4|~3.0.0",
+        "symfony/console": "~2.4|~3.0.0",
+        "symfony/event-dispatcher": "~2.2|~3.0.0"
     },
     "suggest": {
         "symfony/http-kernel": "For using the debugging handlers together with the response life cycle of the HTTP kernel.",
@@ -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/Bridge/PhpUnit/composer.json b/src/Symfony/Bridge/PhpUnit/composer.json
@@ -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/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json
@@ -17,20 +17,20 @@
     ],
     "require": {
         "php": ">=5.3.9",
-        "symfony/dependency-injection": "~2.3",
+        "symfony/dependency-injection": "~2.3|~3.0.0",
         "ocramius/proxy-manager": "~0.4|~1.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "~2.7",
-        "symfony/config": "~2.3"
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
+        "symfony/config": "~2.3|~3.0.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Bridge\\ProxyManager\\": "" }
     },
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "2.7-dev"
+            "dev-master": "2.8-dev"
         }
     }
 }
diff --git a/src/Symfony/Bridge/Swiftmailer/composer.json b/src/Symfony/Bridge/Swiftmailer/composer.json
@@ -20,7 +20,7 @@
         "swiftmailer/swiftmailer": ">=4.2.0,<6.0-dev"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "~2.7"
+        "symfony/phpunit-bridge": "~2.7|~3.0.0"
     },
     "suggest": {
         "symfony/http-kernel": ""
@@ -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/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
@@ -87,6 +87,25 @@
     {% endif %}
 {%- endblock time_widget %}
 
+{% block dateinterval_widget %}
+    {% if widget == 'single_text' %}
+	{{- block('form_widget_simple') -}}
+    {% else %}
+	{% set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) %}
+	<div {{ block('widget_container_attributes') }}>
+	    {{ form_errors(form) }}
+	    {% if with_years %}{{ form_widget(form.years) }}{% endif %}
+	    {% if with_months %}{{ form_widget(form.months) }}{% endif %}
+	    {% if with_weeks %}{{ form_widget(form.weeks) }}{% endif %}
+	    {% if with_days %}{{ form_widget(form.days) }}{% endif %}
+	    {% if with_hours %}{{ form_widget(form.hours) }}{% endif %}
+	    {% if with_minutes %}{{ form_widget(form.minutes) }}{% endif %}
+	    {% if with_seconds %}{{ form_widget(form.seconds) }}{% endif %}
+	    {% if with_invert %}{{ form_widget(form.invert) }}{% endif %}
+	</div>
+    {% endif %}
+{% endblock dateinterval_widget %}
+
 {% block choice_widget_collapsed -%}
     {% set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) %}
     {{- parent() -}}

diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
@@ -131,6 +131,24 @@
     {%- endif -%}
 {%- endblock time_widget -%}
 
+{% block dateinterval_widget %}
+    {% if widget == 'single_text' %}
+	{{- block('form_widget_simple') -}}
+    {% else %}
+	<div {{ block('widget_container_attributes') }}>
+	    {{ form_errors(form) }}
+	    {% if with_years %}{{ form_widget(form.years) }}{% endif %}
+	    {% if with_months %}{{ form_widget(form.months) }}{% endif %}
+	    {% if with_weeks %}{{ form_widget(form.weeks) }}{% endif %}
+	    {% if with_days %}{{ form_widget(form.days) }}{% endif %}
+	    {% if with_hours %}{{ form_widget(form.hours) }}{% endif %}
+	    {% if with_minutes %}{{ form_widget(form.minutes) }}{% endif %}
+	    {% if with_seconds %}{{ form_widget(form.seconds) }}{% endif %}
+	    {% if with_invert %}{{ form_widget(form.invert) }}{% endif %}
+	</div>
+    {% endif %}
+{% endblock dateinterval_widget %}
+
 {%- block number_widget -%}
     {# type="number" doesn't work with floats #}
     {%- set type = type|default('text') -%}
@@ -314,7 +332,6 @@
 
 {%- block widget_attributes -%}
     id="{{ id }}" name="{{ full_name }}"
-    {%- if read_only %} readonly="readonly"{% endif -%}
     {%- if disabled %} disabled="disabled"{% endif -%}
     {%- if required %} required="required"{% endif -%}
     {%- for attrname, attrvalue in attr -%}

diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -20,21 +20,21 @@
         "twig/twig": "~1.18"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "~2.7",
-        "symfony/asset": "~2.7",
-        "symfony/finder": "~2.3",
-        "symfony/form": "~2.7",
-        "symfony/http-kernel": "~2.3",
-        "symfony/intl": "~2.3",
-        "symfony/routing": "~2.2",
-        "symfony/templating": "~2.1",
-        "symfony/translation": "~2.7",
-        "symfony/yaml": "~2.0,>=2.0.5",
-        "symfony/security": "~2.6",
-        "symfony/stopwatch": "~2.2",
-        "symfony/console": "~2.7",
-        "symfony/var-dumper": "~2.6",
-        "symfony/expression-language": "~2.4"
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
+        "symfony/asset": "~2.7|~3.0.0",
+        "symfony/finder": "~2.3|~3.0.0",
+        "symfony/form": "~2.8|~3.0.0",
+        "symfony/http-kernel": "~2.3|~3.0.0",
+        "symfony/intl": "~2.3|~3.0.0",
+        "symfony/routing": "~2.2|~3.0.0",
+        "symfony/templating": "~2.1|~3.0.0",
+        "symfony/translation": "~2.7|~3.0.0",
+        "symfony/yaml": "~2.0,>=2.0.5|~3.0.0",
+        "symfony/security": "~2.6|~3.0.0",
+        "symfony/stopwatch": "~2.2|~3.0.0",
+        "symfony/console": "~2.7|~3.0.0",
+        "symfony/var-dumper": "~2.6|~3.0.0",
+        "symfony/expression-language": "~2.4|~3.0.0"
     },
     "suggest": {
         "symfony/finder": "",
@@ -56,7 +56,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "2.7-dev"
+            "dev-master": "2.8-dev"
         }
     }
 }
diff --git a/src/Symfony/Bundle/DebugBundle/composer.json b/src/Symfony/Bundle/DebugBundle/composer.json
@@ -17,15 +17,15 @@
     ],
     "require": {
         "php": ">=5.3.9",
-        "symfony/http-kernel": "~2.6",
-        "symfony/twig-bridge": "~2.6",
-        "symfony/var-dumper": "~2.6"
+        "symfony/http-kernel": "~2.6|~3.0.0",
+        "symfony/twig-bridge": "~2.6|~3.0.0",
+        "symfony/var-dumper": "~2.6|~3.0.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "~2.7",
-        "symfony/config": "~2.3",
-        "symfony/dependency-injection": "~2.3",
-        "symfony/web-profiler-bundle": "~2.3"
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
+        "symfony/config": "~2.3|~3.0.0",
+        "symfony/dependency-injection": "~2.3|~3.0.0",
+        "symfony/web-profiler-bundle": "~2.3|~3.0.0"
     },
     "suggest": {
         "symfony/config": "For service container configuration",
@@ -37,7 +37,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "2.7-dev"
+            "dev-master": "2.8-dev"
         }
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
@@ -44,7 +44,8 @@ protected function configure()
     {
         $this
             ->setDefinition(array(
-                new InputArgument('address', InputArgument::OPTIONAL, 'Address:port', '127.0.0.1:8000'),
+                new InputArgument('address', InputArgument::OPTIONAL, 'Address:port', '127.0.0.1'),
+                new InputOption('port', 'p', InputOption::VALUE_REQUIRED, 'Address port number', '8000'),
                 new InputOption('docroot', 'd', InputOption::VALUE_REQUIRED, 'Document root', null),
                 new InputOption('router', 'r', InputOption::VALUE_REQUIRED, 'Path to custom router script'),
             ))
@@ -99,9 +100,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $address = $input->getArgument('address');
 
         if (false === strpos($address, ':')) {
-            $output->writeln('The address has to be of the form <comment>bind-address:port</comment>.');
-
-            return 1;
+            $address = $address.':'.$input->getOption('port');
         }
 
         if ($this->isOtherServerProcessRunning($address)) {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ServerStartCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ServerStartCommand.php
@@ -33,7 +33,8 @@ protected function configure()
     {
         $this
             ->setDefinition(array(
-                new InputArgument('address', InputArgument::OPTIONAL, 'Address:port', '127.0.0.1:8000'),
+                new InputArgument('address', InputArgument::OPTIONAL, 'Address:port', '127.0.0.1'),
+                new InputOption('port', 'p', InputOption::VALUE_REQUIRED, 'Address port number', '8000'),
                 new InputOption('docroot', 'd', InputOption::VALUE_REQUIRED, 'Document root', null),
                 new InputOption('router', 'r', InputOption::VALUE_REQUIRED, 'Path to custom router script'),
             ))
@@ -106,9 +107,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $address = $input->getArgument('address');
 
         if (false === strpos($address, ':')) {
-            $output->writeln('The address has to be of the form <comment>bind-address:port</comment>.');
-
-            return 1;
+            $address = $address.':'.$input->getOption('port');
         }
 
         if ($this->isOtherServerProcessRunning($address)) {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ServerStopCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ServerStopCommand.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputOption;
 
 /**
  * Stops a background process running PHP's built-in web server.
@@ -29,7 +30,8 @@ protected function configure()
     {
         $this
             ->setDefinition(array(
-                new InputArgument('address', InputArgument::OPTIONAL, 'Address:port', '127.0.0.1:8000'),
+                new InputArgument('address', InputArgument::OPTIONAL, 'Address:port', '127.0.0.1'),
+                new InputOption('port', 'p', InputOption::VALUE_REQUIRED, 'Address port number', '8000'),
             ))
             ->setName('server:stop')
             ->setDescription('Stops PHP\'s built-in web server that was started with the server:start command')
@@ -53,6 +55,10 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $address = $input->getArgument('address');
+        if (false === strpos($address, ':')) {
+            $address = $address.':'.$input->getOption('port');
+        }
+
         $lockFile = $this->getLockFile($address);
 
         if (!file_exists($lockFile)) {