Minor tweaks

yceruto · yceruto · commit 532b6bdda7ed · 2018-10-05T15:08:16.000-04:00
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -360,12 +360,12 @@ public function getDefinedOptions()
      * Instead of passing the message, you may also pass a closure with the
      * following signature:
      *
-     *     function (Options $options, $value) {
+     *     function (Options $options, $value): string {
      *         // ...
      *     }
      *
      * The closure receives the value as argument and should return a string.
-     * Returns an empty string to ignore the option deprecation.
+     * Return an empty string to ignore the option deprecation.
      *
      * The closure is invoked when {@link resolve()} is called. The parameter
      * passed to the closure is the value of the option after validating it
@@ -869,7 +869,7 @@ public function offsetGet($option)
                 $this->calling[$option] = true;
                 try {
                     if (!\is_string($deprecationMessage = $deprecationMessage($this, $value))) {
-                        throw new InvalidOptionsException(sprintf('Invalid type for deprecation message, expected string but got "%s", returns an empty string to ignore.', \gettype($deprecationMessage)));
+                        throw new InvalidOptionsException(sprintf('Invalid type for deprecation message, expected string but got "%s", return an empty string to ignore.', \gettype($deprecationMessage)));
                     }
                 } finally {
                     unset($this->calling[$option]);
diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
@@ -486,7 +486,7 @@ public function testSetDeprecatedFailsIfInvalidDeprecationMessageType()
 
     /**
      * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Invalid type for deprecation message, expected string but got "boolean", returns an empty string to ignore.
+     * @expectedExceptionMessage Invalid type for deprecation message, expected string but got "boolean", return an empty string to ignore.
      */
     public function testLazyDeprecationFailsIfInvalidDeprecationMessageType()
     {

Original file line number	Diff line number	Diff line change
`@@ -360,12 +360,12 @@ public function getDefinedOptions()`
`360`	`360`	`* Instead of passing the message, you may also pass a closure with the`
`361`	`361`	`* following signature:`
`362`	`362`	`*`
`363`		`- * function (Options $options, $value) {`
	`363`	`+ * function (Options $options, $value): string {`
`364`	`364`	`* // ...`
`365`	`365`	`* }`
`366`	`366`	`*`
`367`	`367`	`* The closure receives the value as argument and should return a string.`
`368`		`- * Returns an empty string to ignore the option deprecation.`
	`368`	`+ * Return an empty string to ignore the option deprecation.`
`369`	`369`	`*`
`370`	`370`	`* The closure is invoked when {@link resolve()} is called. The parameter`
`371`	`371`	`* passed to the closure is the value of the option after validating it`
`@@ -869,7 +869,7 @@ public function offsetGet($option)`
`869`	`869`	`$this->calling[$option] = true;`
`870`	`870`	`try {`
`871`	`871`	`if (!\is_string($deprecationMessage = $deprecationMessage($this, $value))) {`
`872`		`- throw new InvalidOptionsException(sprintf('Invalid type for deprecation message, expected string but got "%s", returns an empty string to ignore.', \gettype($deprecationMessage)));`
	`872`	`+ throw new InvalidOptionsException(sprintf('Invalid type for deprecation message, expected string but got "%s", return an empty string to ignore.', \gettype($deprecationMessage)));`
`873`	`873`	`}`
`874`	`874`	`} finally {`
`875`	`875`	`unset($this->calling[$option]);`
Original file line number	Diff line number	Diff line change
`@@ -486,7 +486,7 @@ public function testSetDeprecatedFailsIfInvalidDeprecationMessageType()`
`486`	`486`
`487`	`487`	`/**`
`488`	`488`	`* @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidArgumentException`
`489`		`- * @expectedExceptionMessage Invalid type for deprecation message, expected string but got "boolean", returns an empty string to ignore.`
	`489`	`+ * @expectedExceptionMessage Invalid type for deprecation message, expected string but got "boolean", return an empty string to ignore.`
`490`	`490`	`*/`
`491`	`491`	`public function testLazyDeprecationFailsIfInvalidDeprecationMessageType()`
`492`	`492`	`{`