minor #21416 [DependencyInjection] clarify exception when no args are configured (xabbuh)

fabpot · fabpot · commit a35986f657ae · 2017-01-26T07:56:09.000-08:00
This PR was merged into the 2.7 branch. Discussion ---------- [DependencyInjection] clarify exception when no args are configured | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #21412 | License | MIT | Doc PR | Commits ------- 428814b clarify exception when no args are configured
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -302,6 +302,10 @@ public function addArgument($argument)
      */
     public function replaceArgument($index, $argument)
     {
+        if (0 === count($this->arguments)) {
+            throw new OutOfBoundsException('Cannot replace arguments if none have been configured yet.');
+        }
+
         if ($index < 0 || $index > count($this->arguments) - 1) {
             throw new OutOfBoundsException(sprintf('The index "%d" is not in the range [0, %d].', $index, count($this->arguments) - 1));
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php b/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
@@ -232,6 +232,7 @@ public function testGetArgumentShouldCheckBounds()
 
     /**
      * @expectedException \OutOfBoundsException
+     * @expectedExceptionMessage The index "1" is not in the range [0, 0].
      */
     public function testReplaceArgumentShouldCheckBounds()
     {
@@ -241,6 +242,16 @@ public function testReplaceArgumentShouldCheckBounds()
         $def->replaceArgument(1, 'bar');
     }
 
+    /**
+     * @expectedException \OutOfBoundsException
+     * @expectedExceptionMessage Cannot replace arguments if none have been configured yet.
+     */
+    public function testReplaceArgumentWithoutExistingArgumentsShouldCheckBounds()
+    {
+        $def = new Definition('stdClass');
+        $def->replaceArgument(0, 'bar');
+    }
+
     public function testSetGetProperties()
     {
         $def = new Definition('stdClass');

Original file line number	Diff line number	Diff line change
`@@ -302,6 +302,10 @@ public function addArgument($argument)`
`302`	`302`	`*/`
`303`	`303`	`public function replaceArgument($index, $argument)`
`304`	`304`	`{`
	`305`	`+ if (0 === count($this->arguments)) {`
	`306`	`+ throw new OutOfBoundsException('Cannot replace arguments if none have been configured yet.');`
	`307`	`+ }`
	`308`	`+`
`305`	`309`	`if ($index < 0 \|\| $index > count($this->arguments) - 1) {`
`306`	`310`	`throw new OutOfBoundsException(sprintf('The index "%d" is not in the range [0, %d].', $index, count($this->arguments) - 1));`
`307`	`311`	`}`