Merge branch '2.8' into 3.2

* 2.8:
  Update to PHPUnit namespaces
  Minor typo fix messsagesData -> messagesData
  remove translation data collector when not usable

Author: nicolas-grekas

Tests/OptionsResolverTest.php

@@ -11,11 +11,13 @@
 
 namespace Symfony\Component\OptionsResolver\Tests;
 
+use PHPUnit\Framework\Assert;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-class OptionsResolverTest extends \PHPUnit_Framework_TestCase
+class OptionsResolverTest extends TestCase
 {
     /**
      * @var OptionsResolver
@@ -134,7 +136,7 @@ public function testSetLazyClosure()
     public function testClosureWithoutTypeHintNotInvoked()
     {
         $closure = function ($options) {
-            \PHPUnit_Framework_Assert::fail('Should not be called');
+            Assert::fail('Should not be called');
         };
 
         $this->resolver->setDefault('foo', $closure);
@@ -145,7 +147,7 @@ public function testClosureWithoutTypeHintNotInvoked()
     public function testClosureWithoutParametersNotInvoked()
     {
         $closure = function () {
-            \PHPUnit_Framework_Assert::fail('Should not be called');
+            Assert::fail('Should not be called');
         };
 
         $this->resolver->setDefault('foo', $closure);
@@ -160,7 +162,7 @@ public function testAccessPreviousDefaultValue()
 
         // defined by subclass
         $this->resolver->setDefault('foo', function (Options $options, $previousValue) {
-            \PHPUnit_Framework_Assert::assertEquals('bar', $previousValue);
+            Assert::assertEquals('bar', $previousValue);
 
             return 'lazy';
         });
@@ -177,7 +179,7 @@ public function testAccessPreviousLazyDefaultValue()
 
         // defined by subclass
         $this->resolver->setDefault('foo', function (Options $options, $previousValue) {
-            \PHPUnit_Framework_Assert::assertEquals('bar', $previousValue);
+            Assert::assertEquals('bar', $previousValue);
 
             return 'lazy';
         });
@@ -189,7 +191,7 @@ public function testPreviousValueIsNotEvaluatedIfNoSecondArgument()
     {
         // defined by superclass
         $this->resolver->setDefault('foo', function () {
-            \PHPUnit_Framework_Assert::fail('Should not be called');
+            Assert::fail('Should not be called');
         });
 
         // defined by subclass, no $previousValue argument defined!
@@ -203,7 +205,7 @@ public function testPreviousValueIsNotEvaluatedIfNoSecondArgument()
     public function testOverwrittenLazyOptionNotEvaluated()
     {
         $this->resolver->setDefault('foo', function (Options $options) {
-            \PHPUnit_Framework_Assert::fail('Should not be called');
+            Assert::fail('Should not be called');
         });
 
         $this->resolver->setDefault('foo', 'bar');
@@ -216,13 +218,13 @@ public function testInvokeEachLazyOptionOnlyOnce()
         $calls = 0;
 
         $this->resolver->setDefault('lazy1', function (Options $options) use (&$calls) {
-            \PHPUnit_Framework_Assert::assertSame(1, ++$calls);
+            Assert::assertSame(1, ++$calls);
 
             $options['lazy2'];
         });
 
         $this->resolver->setDefault('lazy2', function (Options $options) use (&$calls) {
-            \PHPUnit_Framework_Assert::assertSame(2, ++$calls);
+            Assert::assertSame(2, ++$calls);
         });
 
         $this->resolver->resolve();
@@ -996,7 +998,7 @@ public function testValidateTypeBeforeNormalization()
         $this->resolver->setAllowedTypes('foo', 'int');
 
         $this->resolver->setNormalizer('foo', function () {
-            \PHPUnit_Framework_Assert::fail('Should not be called.');
+            Assert::fail('Should not be called.');
         });
 
         $this->resolver->resolve();
@@ -1012,7 +1014,7 @@ public function testValidateValueBeforeNormalization()
         $this->resolver->setAllowedValues('foo', 'baz');
 
         $this->resolver->setNormalizer('foo', function () {
-            \PHPUnit_Framework_Assert::fail('Should not be called.');
+            Assert::fail('Should not be called.');
         });
 
         $this->resolver->resolve();
@@ -1024,8 +1026,8 @@ public function testNormalizerCanAccessOtherOptions()
         $this->resolver->setDefault('norm', 'baz');
 
         $this->resolver->setNormalizer('norm', function (Options $options) {
-            /* @var \PHPUnit_Framework_TestCase $test */
-            \PHPUnit_Framework_Assert::assertSame('bar', $options['default']);
+            /* @var TestCase $test */
+            Assert::assertSame('bar', $options['default']);
 
             return 'normalized';
         });
@@ -1044,8 +1046,8 @@ public function testNormalizerCanAccessLazyOptions()
         $this->resolver->setDefault('norm', 'baz');
 
         $this->resolver->setNormalizer('norm', function (Options $options) {
-            /* @var \PHPUnit_Framework_TestCase $test */
-            \PHPUnit_Framework_Assert::assertEquals('bar', $options['lazy']);
+            /* @var TestCase $test */
+            Assert::assertEquals('bar', $options['lazy']);
 
             return 'normalized';
         });
@@ -1151,12 +1153,12 @@ public function testInvokeEachNormalizerOnlyOnce()
         $this->resolver->setDefault('norm2', 'baz');
 
         $this->resolver->setNormalizer('norm1', function ($options) use (&$calls) {
-            \PHPUnit_Framework_Assert::assertSame(1, ++$calls);
+            Assert::assertSame(1, ++$calls);
 
             $options['norm2'];
         });
         $this->resolver->setNormalizer('norm2', function () use (&$calls) {
-            \PHPUnit_Framework_Assert::assertSame(2, ++$calls);
+            Assert::assertSame(2, ++$calls);
         });
 
         $this->resolver->resolve();
@@ -1169,7 +1171,7 @@ public function testNormalizerNotCalledForUnsetOptions()
         $this->resolver->setDefined('norm');
 
         $this->resolver->setNormalizer('norm', function () {
-            \PHPUnit_Framework_Assert::fail('Should not be called.');
+            Assert::fail('Should not be called.');
         });
 
         $this->assertEmpty($this->resolver->resolve());
@@ -1410,17 +1412,17 @@ public function testArrayAccess()
         });
 
         $this->resolver->setDefault('lazy2', function (Options $options) {
-            \PHPUnit_Framework_Assert::assertTrue(isset($options['default1']));
-            \PHPUnit_Framework_Assert::assertTrue(isset($options['default2']));
-            \PHPUnit_Framework_Assert::assertTrue(isset($options['required']));
-            \PHPUnit_Framework_Assert::assertTrue(isset($options['lazy1']));
-            \PHPUnit_Framework_Assert::assertTrue(isset($options['lazy2']));
-            \PHPUnit_Framework_Assert::assertFalse(isset($options['defined']));
-
-            \PHPUnit_Framework_Assert::assertSame(0, $options['default1']);
-            \PHPUnit_Framework_Assert::assertSame(42, $options['default2']);
-            \PHPUnit_Framework_Assert::assertSame('value', $options['required']);
-            \PHPUnit_Framework_Assert::assertSame('lazy', $options['lazy1']);
+            Assert::assertTrue(isset($options['default1']));
+            Assert::assertTrue(isset($options['default2']));
+            Assert::assertTrue(isset($options['required']));
+            Assert::assertTrue(isset($options['lazy1']));
+            Assert::assertTrue(isset($options['lazy2']));
+            Assert::assertFalse(isset($options['defined']));
+
+            Assert::assertSame(0, $options['default1']);
+            Assert::assertSame(42, $options['default2']);
+            Assert::assertSame('value', $options['required']);
+            Assert::assertSame('lazy', $options['lazy1']);
 
             // Obviously $options['lazy'] and $options['defined'] cannot be
             // accessed
@@ -1525,7 +1527,7 @@ public function testCount()
         $this->resolver->setDefault('lazy1', function () {});
 
         $this->resolver->setDefault('lazy2', function (Options $options) {
-            \PHPUnit_Framework_Assert::assertCount(4, $options);
+            Assert::assertCount(4, $options);
         });
 
         $this->assertCount(4, $this->resolver->resolve(array('required' => 'value')));