Rebased against master

phansys · phansys · commit b07d5a74fcb4 · 2018-02-06T15:50:09.000-03:00
diff --git a/src/Symfony/Component/Validator/Constraints/Locale.php b/src/Symfony/Component/Validator/Constraints/Locale.php
@@ -28,18 +28,5 @@ class Locale extends Constraint
     );
 
     public $message = 'This value is not a valid locale.';
-
     public $canonicalize = false;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($options = null)
-    {
-        if (isset($options['canonicalize'])) {
-            $this->canonicalize = $options['canonicalize'];
-        }
-
-        parent::__construct($options);
-    }
 }
diff --git a/src/Symfony/Component/Validator/Constraints/LocaleValidator.php b/src/Symfony/Component/Validator/Constraints/LocaleValidator.php
@@ -54,12 +54,4 @@ public function validate($value, Constraint $constraint)
                 ->addViolation();
         }
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDefaultOption()
-    {
-        return 'canonicalize';
-    }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LocaleValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LocaleValidatorTest.php
@@ -94,7 +94,7 @@ public function getInvalidLocales()
     /**
      * @dataProvider getUncanonicalizedLocales
      */
-    public function testInvalidLocalesWithoutCanonicalization($locale)
+    public function testInvalidLocalesWithoutCanonicalization(string $locale)
     {
         $constraint = new Locale(array(
             'message' => 'myMessage',
@@ -111,7 +111,7 @@ public function testInvalidLocalesWithoutCanonicalization($locale)
     /**
      * @dataProvider getUncanonicalizedLocales
      */
-    public function testValidLocalesWithCanonicalization($locale)
+    public function testValidLocalesWithCanonicalization(string $locale)
     {
         $constraint = new Locale(array(
             'message' => 'myMessage',
@@ -123,7 +123,7 @@ public function testValidLocalesWithCanonicalization($locale)
         $this->assertNoViolation();
     }
 
-    public function getUncanonicalizedLocales()
+    public function getUncanonicalizedLocales(): iterable
     {
         return array(
             array('en-US'),

Original file line number	Diff line number	Diff line change
`@@ -54,12 +54,4 @@ public function validate($value, Constraint $constraint)`
`54`	`54`	`->addViolation();`
`55`	`55`	`}`
`56`	`56`	`}`
`57`		`-`
`58`		`- /**`
`59`		`- * {@inheritdoc}`
`60`		`- */`
`61`		`- public function getDefaultOption()`
`62`		`- {`
`63`		`- return 'canonicalize';`
`64`		`- }`
`65`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public function getInvalidLocales()`
`94`	`94`	`/**`
`95`	`95`	`* @dataProvider getUncanonicalizedLocales`
`96`	`96`	`*/`
`97`		`- public function testInvalidLocalesWithoutCanonicalization($locale)`
	`97`	`+ public function testInvalidLocalesWithoutCanonicalization(string $locale)`
`98`	`98`	`{`
`99`	`99`	`$constraint = new Locale(array(`
`100`	`100`	`'message' => 'myMessage',`
`@@ -111,7 +111,7 @@ public function testInvalidLocalesWithoutCanonicalization($locale)`
`111`	`111`	`/**`
`112`	`112`	`* @dataProvider getUncanonicalizedLocales`
`113`	`113`	`*/`
`114`		`- public function testValidLocalesWithCanonicalization($locale)`
	`114`	`+ public function testValidLocalesWithCanonicalization(string $locale)`
`115`	`115`	`{`
`116`	`116`	`$constraint = new Locale(array(`
`117`	`117`	`'message' => 'myMessage',`
`@@ -123,7 +123,7 @@ public function testValidLocalesWithCanonicalization($locale)`
`123`	`123`	`$this->assertNoViolation();`
`124`	`124`	`}`
`125`	`125`
`126`		`- public function getUncanonicalizedLocales()`
	`126`	`+ public function getUncanonicalizedLocales(): iterable`
`127`	`127`	`{`
`128`	`128`	`return array(`
`129`	`129`	`array('en-US'),`