minor #22757 [Security][Serializer][DI] Add new arguments typehints in preparation for 4.0 (ogizanagi)

nicolas-grekas · nicolas-grekas · commit 7368d78c5573 · 2017-05-21T10:47:05.000+02:00
This PR was merged into the 3.3 branch. Discussion ---------- [Security][Serializer][DI] Add new arguments typehints in preparation for 4.0 | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony/symfony#22743 (review) | License | MIT | Doc PR | N/A See symfony/symfony#22743 (review) discussion for the motivations. Commits ------- b973b30 [Security][Serializer][DI] Add new arguments typehints in preparation for 4.0
diff --git a/Compiler/Compiler.php b/Compiler/Compiler.php
@@ -77,15 +77,15 @@ public function getLoggingFormatter()
      * @param string                $type     The type of the pass
      * @param int                   $priority Used to sort the passes
      */
-    public function addPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION/*, $priority = 0*/)
+    public function addPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION/*, int $priority = 0*/)
     {
         if (func_num_args() >= 3) {
             $priority = func_get_arg(2);
         } else {
             if (__CLASS__ !== get_class($this)) {
                 $r = new \ReflectionMethod($this, __FUNCTION__);
                 if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
-                    @trigger_error(sprintf('Method %s() will have a third `$priority = 0` argument in version 4.0. Not defining it is deprecated since 3.2.', __METHOD__), E_USER_DEPRECATED);
+                    @trigger_error(sprintf('Method %s() will have a third `int $priority = 0` argument in version 4.0. Not defining it is deprecated since 3.2.', __METHOD__), E_USER_DEPRECATED);
                 }
             }
 
diff --git a/Compiler/PassConfig.php b/Compiler/PassConfig.php
@@ -108,15 +108,15 @@ public function getPasses()
      *
      * @throws InvalidArgumentException when a pass type doesn't exist
      */
-    public function addPass(CompilerPassInterface $pass, $type = self::TYPE_BEFORE_OPTIMIZATION/*, $priority = 0*/)
+    public function addPass(CompilerPassInterface $pass, $type = self::TYPE_BEFORE_OPTIMIZATION/*, int $priority = 0*/)
     {
         if (func_num_args() >= 3) {
             $priority = func_get_arg(2);
         } else {
             if (__CLASS__ !== get_class($this)) {
                 $r = new \ReflectionMethod($this, __FUNCTION__);
                 if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
-                    @trigger_error(sprintf('Method %s() will have a third `$priority = 0` argument in version 4.0. Not defining it is deprecated since 3.2.', __METHOD__), E_USER_DEPRECATED);
+                    @trigger_error(sprintf('Method %s() will have a third `int $priority = 0` argument in version 4.0. Not defining it is deprecated since 3.2.', __METHOD__), E_USER_DEPRECATED);
                 }
             }
 
diff --git a/Compiler/ServiceReferenceGraph.php b/Compiler/ServiceReferenceGraph.php
@@ -86,15 +86,15 @@ public function clear()
      * @param string $reference
      * @param bool   $lazy
      */
-    public function connect($sourceId, $sourceValue, $destId, $destValue = null, $reference = null/*, $lazy = false*/)
+    public function connect($sourceId, $sourceValue, $destId, $destValue = null, $reference = null/*, bool $lazy = false*/)
     {
         if (func_num_args() >= 6) {
             $lazy = func_get_arg(5);
         } else {
             if (__CLASS__ !== get_class($this)) {
                 $r = new \ReflectionMethod($this, __FUNCTION__);
                 if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
-                    @trigger_error(sprintf('Method %s() will have a 6th `$lazy = false` argument in version 4.0. Not defining it is deprecated since 3.3.', __METHOD__), E_USER_DEPRECATED);
+                    @trigger_error(sprintf('Method %s() will have a 6th `bool $lazy = false` argument in version 4.0. Not defining it is deprecated since 3.3.', __METHOD__), E_USER_DEPRECATED);
                 }
             }
             $lazy = false;
diff --git a/ContainerBuilder.php b/ContainerBuilder.php
@@ -448,15 +448,15 @@ public function loadFromExtension($extension, array $values = array())
      *
      * @return $this
      */
-    public function addCompilerPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION/*, $priority = 0*/)
+    public function addCompilerPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION/*, int $priority = 0*/)
     {
         if (func_num_args() >= 3) {
             $priority = func_get_arg(2);
         } else {
             if (__CLASS__ !== get_class($this)) {
                 $r = new \ReflectionMethod($this, __FUNCTION__);
                 if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
-                    @trigger_error(sprintf('Method %s() will have a third `$priority = 0` argument in version 4.0. Not defining it is deprecated since 3.2.', __METHOD__), E_USER_DEPRECATED);
+                    @trigger_error(sprintf('Method %s() will have a third `int $priority = 0` argument in version 4.0. Not defining it is deprecated since 3.2.', __METHOD__), E_USER_DEPRECATED);
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -77,15 +77,15 @@ public function getLoggingFormatter()`
`77`	`77`	`* @param string $type The type of the pass`
`78`	`78`	`* @param int $priority Used to sort the passes`
`79`	`79`	`*/`
`80`		`- public function addPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION/, $priority = 0/)`
	`80`	`+ public function addPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION/, int $priority = 0/)`
`81`	`81`	`{`
`82`	`82`	`if (func_num_args() >= 3) {`
`83`	`83`	`$priority = func_get_arg(2);`
`84`	`84`	`} else {`
`85`	`85`	`if (__CLASS__ !== get_class($this)) {`
`86`	`86`	`$r = new \ReflectionMethod($this, __FUNCTION__);`
`87`	`87`	`if (__CLASS__ !== $r->getDeclaringClass()->getName()) {`
`88`		- @trigger_error(sprintf('Method %s() will have a third `$priority = 0` argument in version 4.0. Not defining it is deprecated since 3.2.', __METHOD__), E_USER_DEPRECATED);
	`88`	+ @trigger_error(sprintf('Method %s() will have a third `int $priority = 0` argument in version 4.0. Not defining it is deprecated since 3.2.', __METHOD__), E_USER_DEPRECATED);
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -108,15 +108,15 @@ public function getPasses()`
`108`	`108`	`*`
`109`	`109`	`* @throws InvalidArgumentException when a pass type doesn't exist`
`110`	`110`	`*/`
`111`		`- public function addPass(CompilerPassInterface $pass, $type = self::TYPE_BEFORE_OPTIMIZATION/, $priority = 0/)`
	`111`	`+ public function addPass(CompilerPassInterface $pass, $type = self::TYPE_BEFORE_OPTIMIZATION/, int $priority = 0/)`
`112`	`112`	`{`
`113`	`113`	`if (func_num_args() >= 3) {`
`114`	`114`	`$priority = func_get_arg(2);`
`115`	`115`	`} else {`
`116`	`116`	`if (__CLASS__ !== get_class($this)) {`
`117`	`117`	`$r = new \ReflectionMethod($this, __FUNCTION__);`
`118`	`118`	`if (__CLASS__ !== $r->getDeclaringClass()->getName()) {`
`119`		- @trigger_error(sprintf('Method %s() will have a third `$priority = 0` argument in version 4.0. Not defining it is deprecated since 3.2.', __METHOD__), E_USER_DEPRECATED);
	`119`	+ @trigger_error(sprintf('Method %s() will have a third `int $priority = 0` argument in version 4.0. Not defining it is deprecated since 3.2.', __METHOD__), E_USER_DEPRECATED);
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`
Original file line number	Diff line number	Diff line change
`@@ -86,15 +86,15 @@ public function clear()`
`86`	`86`	`* @param string $reference`
`87`	`87`	`* @param bool $lazy`
`88`	`88`	`*/`
`89`		`- public function connect($sourceId, $sourceValue, $destId, $destValue = null, $reference = null/, $lazy = false/)`
	`89`	`+ public function connect($sourceId, $sourceValue, $destId, $destValue = null, $reference = null/, bool $lazy = false/)`
`90`	`90`	`{`
`91`	`91`	`if (func_num_args() >= 6) {`
`92`	`92`	`$lazy = func_get_arg(5);`
`93`	`93`	`} else {`
`94`	`94`	`if (__CLASS__ !== get_class($this)) {`
`95`	`95`	`$r = new \ReflectionMethod($this, __FUNCTION__);`
`96`	`96`	`if (__CLASS__ !== $r->getDeclaringClass()->getName()) {`
`97`		- @trigger_error(sprintf('Method %s() will have a 6th `$lazy = false` argument in version 4.0. Not defining it is deprecated since 3.3.', __METHOD__), E_USER_DEPRECATED);
	`97`	+ @trigger_error(sprintf('Method %s() will have a 6th `bool $lazy = false` argument in version 4.0. Not defining it is deprecated since 3.3.', __METHOD__), E_USER_DEPRECATED);
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`	`$lazy = false;`
Original file line number	Diff line number	Diff line change
`@@ -448,15 +448,15 @@ public function loadFromExtension($extension, array $values = array())`
`448`	`448`	`*`
`449`	`449`	`* @return $this`
`450`	`450`	`*/`
`451`		`- public function addCompilerPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION/, $priority = 0/)`
	`451`	`+ public function addCompilerPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION/, int $priority = 0/)`
`452`	`452`	`{`
`453`	`453`	`if (func_num_args() >= 3) {`
`454`	`454`	`$priority = func_get_arg(2);`
`455`	`455`	`} else {`
`456`	`456`	`if (__CLASS__ !== get_class($this)) {`
`457`	`457`	`$r = new \ReflectionMethod($this, __FUNCTION__);`
`458`	`458`	`if (__CLASS__ !== $r->getDeclaringClass()->getName()) {`
`459`		- @trigger_error(sprintf('Method %s() will have a third `$priority = 0` argument in version 4.0. Not defining it is deprecated since 3.2.', __METHOD__), E_USER_DEPRECATED);
	`459`	+ @trigger_error(sprintf('Method %s() will have a third `int $priority = 0` argument in version 4.0. Not defining it is deprecated since 3.2.', __METHOD__), E_USER_DEPRECATED);
`460`	`460`	`}`
`461`	`461`	`}`
`462`	`462`