gbenoit79
diff --git a/‎src/Symfony/Component/Console/Application.php
Lines changed: 10 additions & 0 deletions b/‎src/Symfony/Component/Console/Application.php
Lines changed: 10 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Console/Tests/ApplicationTest.php
Lines changed: 15 additions & 2 deletions b/‎src/Symfony/Component/Console/Tests/ApplicationTest.php
Lines changed: 15 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Routing/RouteCollection.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Routing/RouteCollection.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/Symfony/Tests/Component/Console/Fixtures/application_renderexception4.txt
Lines changed: 9 additions & 0 deletions b/‎tests/Symfony/Tests/Component/Console/Fixtures/application_renderexception4.txt
Lines changed: 9 additions & 0 deletions
@@ -827,6 +827,11 @@ public function renderException($e, $output)
         }
     }
 
+    /**
+     * Tries to figure out the terminal width in which this application runs
+     *
+     * @return int|null
+     */
     protected function getTerminalWidth()
     {
         if (defined('PHP_WINDOWS_VERSION_BUILD') && $ansicon = getenv('ANSICON')) {
@@ -838,6 +843,11 @@ protected function getTerminalWidth()
         }
     }
 
+    /**
+     * Tries to figure out the terminal height in which this application runs
+     *
+     * @return int|null
+     */
     protected function getTerminalHeight()
     {
         if (defined('PHP_WINDOWS_VERSION_BUILD') && $ansicon = getenv('ANSICON')) {
 
@@ -285,8 +285,11 @@ public function testFindAlternativeNamespace()
 
     public function testSetCatchExceptions()
     {
-        $application = new Application();
+        $application = $this->getMock('Symfony\Component\Console\Application', array('getTerminalWidth'));
         $application->setAutoExit(false);
+        $application->expects($this->any())
+            ->method('getTerminalWidth')
+            ->will($this->returnValue(120));
         $tester = new ApplicationTester($application);
 
         $application->setCatchExceptions(true);
@@ -323,8 +326,11 @@ public function testAsXml()
 
     public function testRenderException()
     {
-        $application = new Application();
+        $application = $this->getMock('Symfony\Component\Console\Application', array('getTerminalWidth'));
         $application->setAutoExit(false);
+        $application->expects($this->any())
+            ->method('getTerminalWidth')
+            ->will($this->returnValue(120));
         $tester = new ApplicationTester($application);
 
         $tester->run(array('command' => 'foo'), array('decorated' => false));
@@ -348,6 +354,13 @@ public function testRenderException()
             ->will($this->returnValue(32));
         $tester = new ApplicationTester($application);
 
+        $application = $this->getMock('Symfony\Component\Console\Application', array('getTerminalWidth'));
+        $application->setAutoExit(false);
+        $application->expects($this->any())
+            ->method('getTerminalWidth')
+            ->will($this->returnValue(32));
+        $tester = new ApplicationTester($application);
+
         $tester->run(array('command' => 'foo'), array('decorated' => false));
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception4.txt', $this->normalizeLineBreaks($tester->getDisplay()), '->renderException() wraps messages when they are bigger than the terminal');
     }
 
@@ -95,7 +95,7 @@ public function getIterator()
     public function add($name, Route $route)
     {
         if (!preg_match('/^[a-z0-9A-Z_.]+$/', $name)) {
-            throw new \InvalidArgumentException(sprintf('Name "%s" contains non valid characters for a route name.', $name));
+            throw new \InvalidArgumentException(sprintf('The provided route name "%s" contains non valid characters. A route name must only contain digits (0-9), letters (a-z and A-Z), underscores (_) and dots (.).', $name));
         }
 
         $parent = $this;
 
@@ -0,0 +1,9 @@
+
+
+                               
+  [InvalidArgumentException]   
+  Command "foo" is not define  
+  d.                           
+                               
+
+
Original file line number	Diff line number	Diff line change
`@@ -827,6 +827,11 @@ public function renderException($e, $output)`
`827`	`827`	`}`
`828`	`828`	`}`
`829`	`829`
	`830`	`+ /**`
	`831`	`+ * Tries to figure out the terminal width in which this application runs`
	`832`	`+ *`
	`833`	`+ * @return int\|null`
	`834`	`+ */`
`830`	`835`	`protected function getTerminalWidth()`
`831`	`836`	`{`
`832`	`837`	`if (defined('PHP_WINDOWS_VERSION_BUILD') && $ansicon = getenv('ANSICON')) {`
`@@ -838,6 +843,11 @@ protected function getTerminalWidth()`
`838`	`843`	`}`
`839`	`844`	`}`
`840`	`845`
	`846`	`+ /**`
	`847`	`+ * Tries to figure out the terminal height in which this application runs`
	`848`	`+ *`
	`849`	`+ * @return int\|null`
	`850`	`+ */`
`841`	`851`	`protected function getTerminalHeight()`
`842`	`852`	`{`
`843`	`853`	`if (defined('PHP_WINDOWS_VERSION_BUILD') && $ansicon = getenv('ANSICON')) {`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function getIterator()`
`95`	`95`	`public function add($name, Route $route)`
`96`	`96`	`{`
`97`	`97`	`if (!preg_match('/^[a-z0-9A-Z_.]+$/', $name)) {`
`98`		`- throw new \InvalidArgumentException(sprintf('Name "%s" contains non valid characters for a route name.', $name));`
	`98`	`+ throw new \InvalidArgumentException(sprintf('The provided route name "%s" contains non valid characters. A route name must only contain digits (0-9), letters (a-z and A-Z), underscores (_) and dots (.).', $name));`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`$parent = $this;`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,9 @@ @@
++
++
++
 +  [InvalidArgumentException]
 +  Command "foo" is not define
 +  d.
++
++
++