[DependencyInjection] fixed ? position in some exception messages (refs symfony#7861)

Author: fabpot

src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php

@@ -57,11 +57,10 @@ public function updateRepr()
         if ($this->alternatives) {
             if (1 == count($this->alternatives)) {
                 $this->message .= ' Did you mean this: "';
-            } elseif (1 < count($this->alternatives)) {
+            } else {
                 $this->message .= ' Did you mean one of these: "';
             }
-            $this->message .= implode('", "', $this->alternatives);
-            $this->message .= '" ?';
+            $this->message .= implode('", "', $this->alternatives).'"?';
         }
     }
 

src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php

@@ -32,11 +32,10 @@ public function __construct($id, $sourceId = null, \Exception $previous = null,
         if ($alternatives) {
             if (1 == count($alternatives)) {
                 $msg .= ' Did you mean this: "';
-            } elseif (1 < count($alternatives)) {
+            } else {
                 $msg .= ' Did you mean one of these: "';
             }
-            $msg .= implode('", "', $alternatives);
-            $msg .= '" ?';
+            $msg .= implode('", "', $alternatives).'"?';
         }
 
         parent::__construct($msg, 0, $previous);

src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php

@@ -179,15 +179,15 @@ public function testGetThrowServiceNotFoundException()
             $this->fail('->get() throws an Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException if the key does not exist');
         } catch (\Exception $e) {
             $this->assertInstanceOf('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException', $e, '->get() throws an Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException if the key does not exist');
-            $this->assertEquals('You have requested a non-existent service "foo1". Did you mean this: "foo" ?', $e->getMessage(), '->get() throws an Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException with some advices');
+            $this->assertEquals('You have requested a non-existent service "foo1". Did you mean this: "foo"?', $e->getMessage(), '->get() throws an Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException with some advices');
         }
 
         try {
             $sc->get('bag');
             $this->fail('->get() throws an Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException if the key does not exist');
         } catch (\Exception $e) {
             $this->assertInstanceOf('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException', $e, '->get() throws an Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException if the key does not exist');
-            $this->assertEquals('You have requested a non-existent service "bag". Did you mean one of these: "bar", "baz" ?', $e->getMessage(), '->get() throws an Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException with some advices');
+            $this->assertEquals('You have requested a non-existent service "bag". Did you mean one of these: "bar", "baz"?', $e->getMessage(), '->get() throws an Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException with some advices');
         }
     }
 

src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php

@@ -97,15 +97,15 @@ public function testGetThrowParameterNotFoundException()
             $this->fail('->get() throws an Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException if the key does not exist');
         } catch (\Exception $e) {
             $this->assertInstanceOf('Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException', $e, '->get() throws an Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException if the key does not exist');
-            $this->assertEquals('You have requested a non-existent parameter "foo1". Did you mean this: "foo" ?', $e->getMessage(), '->get() throws an Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException with some advices');
+            $this->assertEquals('You have requested a non-existent parameter "foo1". Did you mean this: "foo"?', $e->getMessage(), '->get() throws an Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException with some advices');
         }
 
         try {
             $bag->get('bag');
             $this->fail('->get() throws an Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException if the key does not exist');
         } catch (\Exception $e) {
             $this->assertInstanceOf('Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException', $e, '->get() throws an Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException if the key does not exist');
-            $this->assertEquals('You have requested a non-existent parameter "bag". Did you mean one of these: "bar", "baz" ?', $e->getMessage(), '->get() throws an Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException with some advices');
+            $this->assertEquals('You have requested a non-existent parameter "bag". Did you mean one of these: "bar", "baz"?', $e->getMessage(), '->get() throws an Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException with some advices');
         }
 
         try {