symfony · HeahDude · Apr 10, 2015 · Apr 10, 2015 · Apr 11, 2015 · Apr 15, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -50,5 +50,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,138 @@
+UPGRADE FROM 2.7 to 2.8
+=======================
+
+Form
+----
+
+ * The "cascade_validation" option was deprecated. Use the "constraints"
+   option together with the `Valid` constraint instead. Contrary to
+   "cascade_validation", "constraints" must be set on the respective child forms,
+   not the parent form.
+
+   Before:
+
+   ```php
+   $form = $this->createForm('form', $article, array('cascade_validation' => true))
+       ->add('author', new AuthorType())
+       ->getForm();
+   ```
+
+   After:
+
+   ```php
+   use Symfony\Component\Validator\Constraints\Valid;
+
+   $form = $this->createForm('form', $article)
+       ->add('author', new AuthorType(), array(
+           'constraints' => new Valid(),
+       ))
+       ->getForm();
+   ```
+
+   Alternatively, you can set the `Valid` constraint in the model itself:
+
+   ```php
+   use Symfony\Component\Validator\Constraints as Assert;
+
+   class Article
+   {
+       /**
+        * @Assert\Valid
+        */
+       private $author;
+   }
+   ```
+
+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);
+    }
+   ```
+
+DependencyInjection
+-------------------
+
+ * The concept of scopes were deprecated, the deprecated methods are:
+
+    - `Symfony\Component\DependencyInjection\ContainerBuilder::getScopes()`
+    - `Symfony\Component\DependencyInjection\ContainerBuilder::getScopeChildren()`
+    - `Symfony\Component\DependencyInjection\ContainerInterface::enterScope()`
+    - `Symfony\Component\DependencyInjection\ContainerInterface::leaveScope()`
+    - `Symfony\Component\DependencyInjection\ContainerInterface::addScope()`
+    - `Symfony\Component\DependencyInjection\ContainerInterface::hasScope()`
+    - `Symfony\Component\DependencyInjection\ContainerInterface::isScopeActive()`
+    - `Symfony\Component\DependencyInjection\Definition::setScope()`
+    - `Symfony\Component\DependencyInjection\Definition::getScope()`
+    - `Symfony\Component\DependencyInjection\Reference::isStrict()`
+
+  Also, the `$scope` and `$strict` parameters of `Symfony\Component\DependencyInjection\ContainerInterface::set()` and `Symfony\Component\DependencyInjection\Reference` respectively were deprecated.
+
+ * A new `shared` flag has been added to the service definition
+   in replacement of the `prototype` scope.
+
+   Before:
+
+   ```php
+   use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+   $container = new ContainerBuilder();
+   $container
+       ->register('foo', 'stdClass')
+       ->setScope(ContainerBuilder::SCOPE_PROTOTYPE)
+   ;
+   ```
+
+   ```yml
+   services:
+       foo:
+           class: stdClass
+           scope: prototype
+   ```
+
+   ```xml
+   <services>
+       <service id="foo" class="stdClass" scope="prototype" />
+   </services>
+   ```
+
+   After:
+
+   ```php
+   use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+   $container = new ContainerBuilder();
+   $container
+       ->register('foo', 'stdClass')
+       ->setShared(false)
+   ;
+   ```
+
+   ```yml
+   services:
+       foo:
+           class: stdClass
+           shared: false
+   ```
+
+   ```xml
+   <services>
+       <service id="foo" class="stdClass" shared="false" />
+   </services>
+   ```
diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
@@ -600,6 +600,86 @@ UPGRADE FROM 2.x to 3.0
 
  * The `Resources/` directory was moved to `Core/Resources/`
 
+ * The `key` settings of `anonymous` and `remember_me` are renamed to `secret`.
+
+   Before:
+
+   ```yaml
+   security:
+       # ...
+       firewalls:
+           default:
+               # ...
+               anonymous: { key: "%secret%" }
+               remember_me:
+                   key: "%secret%"
+   ```
+
+   ```xml
+   <!-- ... -->
+   <config>
+       <!-- ... -->
+
+       <firewall>
+           <!-- ... -->
+
+           <anonymous key="%secret%"/>
+           <remember-me key="%secret%"/>
+       </firewall>
+   </config>
+   ```
+
+   ```php
+   // ...
+   $container->loadFromExtension('security', array(
+       // ...
+       'firewalls' => array(
+           // ...
+           'anonymous' => array('key' => '%secret%'),
+           'remember_me' => array('key' => '%secret%'),
+       ),
+   ));
+   ```
+
+   After:
+
+   ```yaml
+   security:
+       # ...
+       firewalls:
+           default:
+               # ...
+               anonymous: { secret: "%secret%" }
+               remember_me:
+                   secret: "%secret%"
+   ```
+
+   ```xml
+   <!-- ... -->
+   <config>
+       <!-- ... -->
+
+       <firewall>
+           <!-- ... -->
+
+           <anonymous secret="%secret%"/>
+           <remember-me secret="%secret%"/>
+       </firewall>
+   </config>
+   ```
+
+   ```php
+   // ...
+   $container->loadFromExtension('security', array(
+       // ...
+       'firewalls' => array(
+           // ...
+           'anonymous' => array('secret' => '%secret%'),
+           'remember_me' => array('secret' => '%secret%'),
+       ),
+   ));
+  ```
+
 ### Translator
 
  * The `Translator::setFallbackLocale()` method has been removed in favor of

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,>=2.7.1",
-        "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,>=2.7.1|~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/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -68,9 +68,9 @@ public function getProxyFactoryCode(Definition $definition, $id)
     {
         $instantiation = 'return';
 
-        if (ContainerInterface::SCOPE_CONTAINER === $definition->getScope()) {
+        if ($definition->isShared() && ContainerInterface::SCOPE_CONTAINER === $definition->getScope(false)) {
             $instantiation .= " \$this->services['$id'] =";
-        } elseif (ContainerInterface::SCOPE_PROTOTYPE !== $scope = $definition->getScope()) {
+        } elseif ($definition->isShared() && ContainerInterface::SCOPE_PROTOTYPE !== $scope = $definition->getScope(false)) {
             $instantiation .= " \$this->services['$id'] = \$this->scopedServices['$scope']['$id'] =";
         }
 

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.8|~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/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
@@ -176,6 +176,11 @@
     {{ block('form_widget_simple') }}
 {%- endblock email_widget -%}
 
+{%- block range_widget -%}
+    {% set type = type|default('range') %}
+    {{- block('form_widget_simple') -}}
+{%- endblock range_widget %}
+
 {%- block button_widget -%}
     {%- if label is empty -%}
         {%- if label_format is not empty -%}
@@ -314,7 +319,6 @@
 
 {%- block widget_attributes -%}
     id="{{ id }}" name="{{ full_name }}"
-    {%- if read_only and attr.readonly is not defined %} readonly="readonly"{% endif -%}
     {%- if disabled %} disabled="disabled"{% endif -%}
     {%- if required %} required="required"{% endif -%}
     {%- for attrname, attrvalue in attr -%}