minor #22498 [DI] Add missing check in PhpDumper (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 97747808b26a · 2017-04-25T11:08:04.000-04:00
This PR was merged into the 2.7 branch. Discussion ---------- [DI] Add missing check in PhpDumper | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 5cabf88 [DI] Add missing check in PhpDumper
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1331,9 +1331,12 @@ private function dumpValue($value, $interpolate = true)
             if (null !== $this->definitionVariables && $this->definitionVariables->contains($value)) {
                 return $this->dumpValue($this->definitionVariables->offsetGet($value), $interpolate);
             }
-            if (count($value->getMethodCalls()) > 0) {
+            if ($value->getMethodCalls()) {
                 throw new RuntimeException('Cannot dump definitions which have method calls.');
             }
+            if ($value->getProperties()) {
+                throw new RuntimeException('Cannot dump definitions which have properties.');
+            }
             if (null !== $value->getConfigurator()) {
                 throw new RuntimeException('Cannot dump definitions which have a configurator.');
             }

Original file line number	Diff line number	Diff line change
`@@ -1331,9 +1331,12 @@ private function dumpValue($value, $interpolate = true)`
`1331`	`1331`	`if (null !== $this->definitionVariables && $this->definitionVariables->contains($value)) {`
`1332`	`1332`	`return $this->dumpValue($this->definitionVariables->offsetGet($value), $interpolate);`
`1333`	`1333`	`}`
`1334`		`- if (count($value->getMethodCalls()) > 0) {`
	`1334`	`+ if ($value->getMethodCalls()) {`
`1335`	`1335`	`throw new RuntimeException('Cannot dump definitions which have method calls.');`
`1336`	`1336`	`}`
	`1337`	`+ if ($value->getProperties()) {`
	`1338`	`+ throw new RuntimeException('Cannot dump definitions which have properties.');`
	`1339`	`+ }`
`1337`	`1340`	`if (null !== $value->getConfigurator()) {`
`1338`	`1341`	`throw new RuntimeException('Cannot dump definitions which have a configurator.');`
`1339`	`1342`	`}`