Merge branch '2.1'

* 2.1: (28 commits) Delete use of CreationExeption [Form] Fixed error message in PropertyPath to not advice to use a non-existing feature [Form] Fixed creation of multiple money fields with different currencies [Form] Fixed setting the "data" option to an object in "choice" and "entity" type Fixed Serbian plural translations. Fixed IPv6 Check in RequestMatcher Fix typo change what I think is a typo [Console] Fix error when mode is not in PATH [WebProfilerBundle] fixed macro usage (to be forward compatible with Twig 2.x) Change monolog require-dev to use the branch alias instead of dev-master [FrameworkBundle] partially reverted previous merge [2.1] Added missing error return codes in commands Made the router lazy when setting the context [WebProfilerBundle] fixed typos Fix incorrect variable in FileProfilerStorage UnitTest fix UnitTest fix added a unit test fixed symfony#5384 ...

Author: fabpot

UPGRADE-2.1.md

@@ -576,7 +576,7 @@
 
  * Custom styling of individual rows of a collection form has been removed for
  performance reasons. Instead, all rows now have the same block name, where
- the word "entry" replaces the previous occurence of the row index.
+ the word "entry" replaces the previous occurrence of the row index.
 
  Before:
 

composer.json

@@ -59,7 +59,7 @@
  "doctrine/orm": ">=2.2.3,<2.4-dev",
  "doctrine/data-fixtures": "1.0.*",
  "propel/propel1": "dev-master",
- "monolog/monolog": "dev-master"
+ "monolog/monolog": "1.*"
  },
  "autoload": {
  "psr-0": { "Symfony\\": "src/" },

src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php

@@ -84,6 +84,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
  if (!$matches) {
  $output->writeln('<fg=red>None of the routes matches</>');
+
+ return 1;
  }
  }
 }

src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php

@@ -82,7 +82,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
  if ($input->getOption('force') !== true && $input->getOption('dump-messages') !== true) {
  $output->writeln('<info>You must choose one of --force or --dump-messages</info>');
 
- return;
+ return 1;
  }
 
  // check format
@@ -92,7 +92,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
  $output->writeln('<error>Wrong output format</error>');
  $output->writeln('Supported formats are '.implode(', ', $supportedFormats).'.');
 
- return;
+ return 1;
  }
 
  // get bundle directory

src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php

@@ -62,7 +62,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
  } catch (SchemaException $e) {
  $output->writeln("Aborting: " . $e->getMessage());
 
- return;
+ return 1;
  }
 
  foreach ($schema->toSql($connection->getDatabasePlatform()) as $sql) {

src/Symfony/Bundle/TwigBundle/Command/LintCommand.php

@@ -70,7 +70,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
  $template .= fread(STDIN, 1024);
  }
 
- return $twig->parse($twig->tokenize($template));
+ return $this->validateTemplate($twig, $output, $template);
  }
 
  if (0 !== strpos($filename, '@') && !is_readable($filename)) {
@@ -87,26 +87,39 @@ protected function execute(InputInterface $input, OutputInterface $output)
  $files = Finder::create()->files()->in($dir)->name('*.twig');
  }
 
- $error = false;
+ $errors = 0;
  foreach ($files as $file) {
- try {
- $twig->parse($twig->tokenize(file_get_contents($file), (string) $file));
- $output->writeln(sprintf("<info>OK</info> in %s", $file));
- } catch (\Twig_Error $e) {
- $this->renderException($output, $file, $e);
- $error = true;
- }
+ $errors += $this->validateTemplate($twig, $output, file_get_contents($file), $file);
+ }
+
+ return $errors > 0 ? 1 : 0;
+ }
+
+ protected function validateTemplate(\Twig_Environment $twig, OutputInterface $output, $template, $file = null)
+ {
+ try {
+ $twig->parse($twig->tokenize($template, $file ? (string) $file : null));
+ $output->writeln('<info>OK</info>'.($file ? sprintf(' in %s', $file) : ''));
+ } catch (\Twig_Error $e) {
+ $this->renderException($output, $template, $e, $file);
+
+ return 1;
  }
 
- return $error ? 1 : 0;
+ return 0;
  }
 
- protected function renderException(OutputInterface $output, $file, \Twig_Error $exception)
+ protected function renderException(OutputInterface $output, $template, \Twig_Error $exception, $file = null)
  {
  $line = $exception->getTemplateLine();
- $lines = $this->getContext($file, $line);
+ $lines = $this->getContext($template, $line);
+
+ if ($file) {
+ $output->writeln(sprintf("<error>KO</error> in %s (line %s)", $file, $line));
+ } else {
+ $output->writeln(sprintf("<error>KO</error> (line %s)", $line));
+ }
 
- $output->writeln(sprintf("<error>KO</error> in %s (line %s)", $file, $line));
  foreach ($lines as $no => $code) {
  $output->writeln(sprintf(
  "%s %-6s %s",
@@ -120,10 +133,9 @@ protected function renderException(OutputInterface $output, $file, \Twig_Error $
  }
  }
 
- protected function getContext($file, $line, $context = 3)
+ protected function getContext($template, $line, $context = 3)
  {
- $fileContent = file_get_contents($file);
- $lines = explode("\n", $fileContent);
+ $lines = explode("\n", $template);
 
  $position = max(0, $line - $context);
  $max = min(count($lines), $line - 1 + $context);

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig

@@ -15,7 +15,7 @@
  {% else %}
  <h2>Events</h2>
  <p>
- <em>No events have been recorded. Are you sure that debugging is enabled in the kernel ?</em>
+ <em>No events have been recorded. Are you sure that debugging is enabled in the kernel?</em>
  </p>
  {% endif %}
 {% endblock %}

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig

@@ -1,5 +1,7 @@
 {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
+{% from _self import display_timeline, dump_events, dump_request_data %}
+
 {% if colors is not defined %}
  {% set colors = {
  'default': '#aacd4e',
@@ -41,7 +43,7 @@
  {{ block('panelContent') }}
  {% else %}
  <p>
- <em>No timing events have been recorded. Are you sure that debugging is enabled in the kernel ?</em>
+ <em>No timing events have been recorded. Are you sure that debugging is enabled in the kernel?</em>
  </p>
  {% endif %}
 {% endblock %}
@@ -77,7 +79,7 @@
 
  {% set max = collector.events.__section__.endtime %}
 
- {{ _self.display_timeline('timeline_' ~ token, collector.events, colors) }}
+ {{ display_timeline('timeline_' ~ token, collector.events, colors) }}
 
  {% if profile.children|length %}
  {% for child in profile.children %}
@@ -87,7 +89,7 @@
  <small> - {{ events.__section__.totaltime }} ms</small>
  </h3>
 
- {{ _self.display_timeline('timeline_' ~ child.token, events, colors) }}
+ {{ display_timeline('timeline_' ~ child.token, events, colors) }}
  {% endfor %}
  {% endif %}
 
@@ -388,12 +390,12 @@
  var requests_data = {
  "max": {{ "%F"|format(collector.events.__section__.endtime) }},
  "requests": [
-{{ _self.dump_request_data(token, profile, collector.events, collector.events.__section__.origin) }}
+{{ dump_request_data(token, profile, collector.events, collector.events.__section__.origin) }}
 
 {% if profile.children|length %}
  ,
 {% for child in profile.children %}
-{{ _self.dump_request_data(child.token, child, child.getcollector('time').events, collector.events.__section__.origin) }}{{ loop.last ? '' : ',' }}
+{{ dump_request_data(child.token, child, child.getcollector('time').events, collector.events.__section__.origin) }}{{ loop.last ? '' : ',' }}
 {% endfor %}
 {% endif %}
  ]
@@ -436,7 +438,7 @@
  "id": "{{ token }}",
  "left": {{ "%F"|format(events.__section__.origin - origin) }},
  "events": [
-{{ _self.dump_events(events) }}
+{{ dump_events(events) }}
  ]
  }
 {% endmacro %}

src/Symfony/Component/Console/Application.php

@@ -546,7 +546,10 @@ public function find($name)
  // name
  $commands = array();
  foreach ($this->commands as $command) {
- if ($this->extractNamespace($command->getName()) == $namespace) {
+ $extractedNamespace = $this->extractNamespace($command->getName());
+ if ($extractedNamespace === $namespace
+ || !empty($namespace) && 0 === strpos($extractedNamespace, $namespace)
+ ) {
  $commands[] = $command->getName();
  }
  }
@@ -566,7 +569,10 @@ public function find($name)
  $aliases = array();
  foreach ($this->commands as $command) {
  foreach ($command->getAliases() as $alias) {
- if ($this->extractNamespace($alias) == $namespace) {
+ $extractedNamespace = $this->extractNamespace($alias);
+ if ($extractedNamespace === $namespace
+ || !empty($namespace) && 0 === strpos($extractedNamespace, $namespace)
+ ) {
  $aliases[] = $alias;
  }
  }
@@ -849,8 +855,7 @@ protected function getTerminalWidth()
  return preg_replace('{^(\d+)x.*$}', '$1', $ansicon);
  }
 
- exec('mode CON', $execData);
- if (preg_match('{columns:\s*(\d+)}i', $execData[4], $matches)) {
+ if (preg_match('{columns:\s*(\d+)}i', $this->getConsoleMode(), $matches)) {
  return $matches[1];
  }
  }
@@ -872,8 +877,7 @@ protected function getTerminalHeight()
  return preg_replace('{^\d+x\d+ \(\d+x(\d+)\)$}', '$1', trim($ansicon));
  }
 
- exec('mode CON', $execData);
- if (preg_match('{lines:\s*(\d+)}i', $execData[3], $matches)) {
+ if (preg_match('{lines:\s*(\d+)}i', $this->getConsoleMode(), $matches)) {
  return $matches[1];
  }
  }
@@ -962,6 +966,29 @@ private function getSttyColumns()
  }
  }
 
+ /**
+ * Runs and parses mode CON if it's available, suppressing any error output
+ *
+ * @return string
+ */
+ private function getConsoleMode()
+ {
+ if (!function_exists('proc_open')) {
+ return;
+ }
+
+ $descriptorspec = array(1 => array('pipe', 'w'), 2 => array('pipe', 'w'));
+ $process = proc_open('mode CON', $descriptorspec, $pipes, null, null, array('suppress_errors' => true));
+ if (is_resource($process)) {
+ $info = stream_get_contents($pipes[1]);
+ fclose($pipes[1]);
+ fclose($pipes[2]);
+ proc_close($process);
+
+ return $info;
+ }
+ }
+
  /**
  * Sorts commands in alphabetical order.
  *

src/Symfony/Component/Console/Tests/ApplicationTest.php

@@ -33,6 +33,7 @@ public static function setUpBeforeClass()
  require_once self::$fixturesPath.'/Foo1Command.php';
  require_once self::$fixturesPath.'/Foo2Command.php';
  require_once self::$fixturesPath.'/Foo3Command.php';
+ require_once self::$fixturesPath.'/Foo4Command.php';
  }
 
  protected function normalizeLineBreaks($text)
@@ -262,6 +263,19 @@ public function testFindAlternativeExceptionMessage()
  $this->assertInstanceOf('\InvalidArgumentException', $e, '->find() throws an \InvalidArgumentException if command does not exist, with alternatives');
  $this->assertRegExp('/Did you mean one of these/', $e->getMessage(), '->find() throws an \InvalidArgumentException if command does not exist, with alternatives');
  }
+
+ $application->add(new \Foo3Command());
+ $application->add(new \Foo4Command());
+
+ // Subnamespace + plural
+ try {
+ $a = $application->find('foo3:');
+ $this->fail('->find() should throw an \InvalidArgumentException if a command is ambiguous because of a subnamespace, with alternatives');
+ } catch (\Exception $e) {
+ $this->assertInstanceOf('\InvalidArgumentException', $e);
+ $this->assertRegExp('/foo3:bar/', $e->getMessage());
+ $this->assertRegExp('/foo3:bar:toh/', $e->getMessage());
+ }
  }
 
  public function testFindAlternativeCommands()
@@ -620,4 +634,4 @@ protected function getDefaultHelperSet()
  {
  return new HelperSet(array(new FormatterHelper()));
  }
-}
+}