Merge branch '2.7' into 2.8

* 2.7: (70 commits) [travis] Use container-based infrastructure [HttpKernel] use ConfigCache::getPath() method when it exists [PropertyAccess] Fix setting public property on a class having a magic getter [Routing] Display file which contain deprecated option ContainerInterface: unused exception dropped bumped Symfony version to 2.6.8 updated VERSION for 2.6.7 updated CHANGELOG for 2.6.7 bumped Symfony version to 2.3.29 updated VERSION for 2.3.28 update CONTRIBUTORS for 2.3.28 updated CHANGELOG for 2.3.28 [Debug] Fixed ClassNotFoundFatalErrorHandlerTest [SecurityBundle] use access decision constants in config [SecurityBundle] use session auth constants in config PhpDoc fix in AbstractRememberMeServices [Filesystem] Simplified an if statement [SecurityBundle] Use Enum Nodes Instead Of Scalar [Debug 2.3] Fix test for PHP7 [HttpKernel] Check if "symfony/proxy-manager-bridge" package is installed ... Conflicts: src/Symfony/Bundle/DebugBundle/composer.json src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php src/Symfony/Component/Form/README.md src/Symfony/Component/Intl/README.md src/Symfony/Component/Security/README.md src/Symfony/Component/Translation/Loader/CsvFileLoader.php src/Symfony/Component/Translation/Loader/IniFileLoader.php src/Symfony/Component/Translation/Loader/MoFileLoader.php src/Symfony/Component/Translation/Loader/PhpFileLoader.php src/Symfony/Component/Translation/Loader/PoFileLoader.php src/Symfony/Component/Translation/Loader/YamlFileLoader.php src/Symfony/Component/Translation/README.md src/Symfony/Component/Translation/Translator.php src/Symfony/Component/Validator/README.md
symfony · wouterj · Apr 10, 2015 · Apr 10, 2015 · Apr 11, 2015 · Apr 15, 2015
commit bb8b0769cbaa6f0eb75787ca293b3becaa1d5af8
diff --git a/src/Symfony/Bundle/DebugBundle/composer.json b/src/Symfony/Bundle/DebugBundle/composer.json
@@ -24,7 +24,8 @@
     "require-dev": {
         "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/config": "~2.3|~3.0.0",
-        "symfony/dependency-injection": "~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",

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
@@ -100,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)) {
@@ -115,15 +113,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $output->writeln('<error>Running PHP built-in server in production environment is NOT recommended!</error>');
         }
 
-        $address = $input->getArgument('address');
-        if (false === strpos($address, ':')) {
-            $address = $address.':'.$input->getOption('port');
-        }
-
         $output->writeln(sprintf("Server running on <info>http://%s</info>\n", $address));
         $output->writeln('Quit the server with CONTROL-C.');
 
-        if (null === $builder = $this->createPhpProcessBuilder($input, $output, $env, $address)) {
+        if (null === $builder = $this->createPhpProcessBuilder($output, $address, $input->getOption('router'), $env)) {
             return 1;
         }
 
@@ -150,7 +143,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         return $process->getExitCode();
     }
 
-    private function createPhpProcessBuilder(InputInterface $input, OutputInterface $output, $env, $address)
+    private function createPhpProcessBuilder(OutputInterface $output, $address, $router, $env)
     {
         $router = $router ?: $this
             ->getContainer()

diff --git 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:
 
-http://symfony.com/doc/2.8/book/forms.html
+https://symfony.com/doc/2.8/book/forms.html
 
 Resources
 ---------

diff --git 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]: http://symfony.com/doc/2.8/components/intl.html
+[1]: https://symfony.com/doc/2.8/components/intl.html
diff --git a/src/Symfony/Component/Security/README.md b/src/Symfony/Component/Security/README.md
@@ -11,7 +11,7 @@ Resources
 
 Documentation:
 
-http://symfony.com/doc/2.8/book/security.html
+https://symfony.com/doc/2.8/book/security.html
 
 Tests
 -----

diff --git a/src/Symfony/Component/Translation/CHANGELOG.md b/src/Symfony/Component/Translation/CHANGELOG.md
@@ -3,7 +3,8 @@ CHANGELOG
 
 2.8.0
 -----
- * deprecated Translator::getMessages(), rely on the TranslatorBagInterface::getCatalogue() method instead.
+
+ * deprecated Translator::getMessages(), use TranslatorBagInterface::getCatalogue() instead.
 
 2.7.0
 -----

diff --git a/src/Symfony/Component/Translation/Loader/FileLoader.php b/src/Symfony/Component/Translation/Loader/FileLoader.php
@@ -46,7 +46,10 @@ public function load($resource, $locale, $domain = 'messages')
         }
 
         $catalogue = parent::load($messages, $locale, $domain);
-        $catalogue->addResource(new FileResource($resource));
+
+        if (class_exists('Symfony\Component\Config\Resource\FileResource')) {
+            $catalogue->addResource(new FileResource($resource));
+        }
 
         return $catalogue;
     }

diff --git a/src/Symfony/Component/Translation/Loader/YamlFileLoader.php b/src/Symfony/Component/Translation/Loader/YamlFileLoader.php
@@ -32,6 +32,10 @@ class YamlFileLoader extends FileLoader
     protected function loadResource($resource)
     {
         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();
         }
 

diff --git 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:
 
-http://symfony.com/doc/2.8/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/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -289,13 +289,15 @@ 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. Rely on the TranslatorBagInterface::getCatalogue() method instead', E_USER_DEPRECATED);
+        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);
 
-        $catalogues = array();
-        $catalogues[] = $catalogue = $this->getCatalogue($locale);
+        $catalogue = $this->getCatalogue($locale);
+        $messages = $catalogue->all();
         while ($catalogue = $catalogue->getFallbackCatalogue()) {
             $messages = array_replace_recursive($catalogue->all(), $messages);
         }

diff --git 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:
 
-http://symfony.com/doc/2.8/book/validation.html
+https://symfony.com/doc/2.8/book/validation.html
 
 JSR-303 Specification:
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ Resources @@
     Documentation:
-    http://symfony.com/doc/2.8/book/security.html
+    https://symfony.com/doc/2.8/book/security.html
     Tests
     -----
@@ Expand Down @@