Fix phpdoc inconsistencies, simplify no-op sprintf.

TysonAndre · TysonAndre · commit c9ddd68ea63c · 2017-10-21T13:27:13.000-07:00
(detected by static analysis)
diff --git a/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php b/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php
@@ -85,7 +85,7 @@ public function hasMarkedPlace($subject, $placeName, $name = null)
      * Returns marked places.
      *
      * @param object $subject        A subject
-     * @param string $placesNameOnly If true, returns only places name. If false returns the raw representation
+     * @param bool   $placesNameOnly If true, returns only places name. If false returns the raw representation
      * @param string $name           A workflow name
      *
      * @return string[]|int[]
diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
@@ -219,7 +219,7 @@ private function getControllerError($callable)
         }
 
         if (2 !== count($callable)) {
-            return sprintf('Invalid format for controller, expected array(controller, method) or controller::method.');
+            return 'Invalid format for controller, expected array(controller, method) or controller::method.';
         }
 
         list($controller, $method) = $callable;
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -108,7 +108,7 @@ public function normalize($object, $format = null, array $context = array())
      *
      * @return string[]
      */
-    protected function getAttributes($object, $format = null, array $context)
+    protected function getAttributes($object, $format, array $context)
     {
         $class = get_class($object);
         $key = $class.'-'.$context['cache_key'];

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function hasMarkedPlace($subject, $placeName, $name = null)`
`85`	`85`	`* Returns marked places.`
`86`	`86`	`*`
`87`	`87`	`* @param object $subject A subject`
`88`		`- * @param string $placesNameOnly If true, returns only places name. If false returns the raw representation`
	`88`	`+ * @param bool $placesNameOnly If true, returns only places name. If false returns the raw representation`
`89`	`89`	`* @param string $name A workflow name`
`90`	`90`	`*`
`91`	`91`	`* @return string[]\|int[]`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ private function getControllerError($callable)`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`if (2 !== count($callable)) {`
`222`		`- return sprintf('Invalid format for controller, expected array(controller, method) or controller::method.');`
	`222`	`+ return 'Invalid format for controller, expected array(controller, method) or controller::method.';`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`list($controller, $method) = $callable;`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public function normalize($object, $format = null, array $context = array())`
`108`	`108`	`*`
`109`	`109`	`* @return string[]`
`110`	`110`	`*/`
`111`		`- protected function getAttributes($object, $format = null, array $context)`
	`111`	`+ protected function getAttributes($object, $format, array $context)`
`112`	`112`	`{`
`113`	`113`	`$class = get_class($object);`
`114`	`114`	`$key = $class.'-'.$context['cache_key'];`