symfony · fabpot · Nov 9, 2017 · Nov 9, 2017
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BaseDateTimeTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BaseDateTimeTransformer.php
@@ -13,7 +13,6 @@
 
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\InvalidArgumentException;
-use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
 abstract class BaseDateTimeTransformer implements DataTransformerInterface
 {
@@ -33,19 +32,10 @@ abstract class BaseDateTimeTransformer implements DataTransformerInterface
      * @param string $inputTimezone  The name of the input timezone
      * @param string $outputTimezone The name of the output timezone
      *
-     * @throws UnexpectedTypeException  if a timezone is not a string
      * @throws InvalidArgumentException if a timezone is not valid
      */
     public function __construct(string $inputTimezone = null, string $outputTimezone = null)
     {
-        if (null !== $inputTimezone && !is_string($inputTimezone)) {
-            throw new UnexpectedTypeException($inputTimezone, 'string');
-        }
-
-        if (null !== $outputTimezone && !is_string($outputTimezone)) {
-            throw new UnexpectedTypeException($outputTimezone, 'string');
-        }
-
         $this->inputTimezone = $inputTimezone ?: date_default_timezone_get();
         $this->outputTimezone = $outputTimezone ?: date_default_timezone_get();
 

diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Form\Extension\Core\DataTransformer;
 
 use Symfony\Component\Form\Exception\TransformationFailedException;
-use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
 /**
  * Transforms between a normalized time and a localized time string/array.
@@ -31,8 +30,6 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer
      * @param string $outputTimezone The output timezone
      * @param array  $fields         The date fields
      * @param bool   $pad            Whether to use padding
-     *
-     * @throws UnexpectedTypeException if a timezone is not a string
      */
     public function __construct(string $inputTimezone = null, string $outputTimezone = null, array $fields = null, bool $pad = false)
     {

diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Form\Extension\Core\DataTransformer;
 
 use Symfony\Component\Form\Exception\TransformationFailedException;
-use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
 /**
  * Transforms between a date string and a DateTime object.
@@ -48,8 +47,6 @@ class DateTimeToStringTransformer extends BaseDateTimeTransformer
      * @param string $inputTimezone  The name of the input timezone
      * @param string $outputTimezone The name of the output timezone
      * @param string $format         The date format
-     *
-     * @throws UnexpectedTypeException if a timezone is not a string
      */
     public function __construct(string $inputTimezone = null, string $outputTimezone = null, string $format = 'Y-m-d H:i:s')
     {

diff --git a/...nt/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php b/...nt/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
@@ -306,22 +306,6 @@ public function testReverseTransformWrapsIntlErrors()
         $transformer->reverseTransform('12345');
     }
 
-    /**
-     * @expectedException \TypeError
-     */
-    public function testValidateDateFormatOption()
-    {
-        new DateTimeToLocalizedStringTransformer(null, null, 'foobar');
-    }
-
-    /**
-     * @expectedException \TypeError
-     */
-    public function testValidateTimeFormatOption()
-    {
-        new DateTimeToLocalizedStringTransformer(null, null, null, 'foobar');
-    }
-
     /**
      * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
      */

diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/ReturnTyped.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/ReturnTyped.php
diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestClassTypeErrorInsideCall.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestClassTypeErrorInsideCall.php
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
@@ -15,14 +15,12 @@
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\PropertyAccess\Exception\NoSuchIndexException;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
-use Symfony\Component\PropertyAccess\Tests\Fixtures\ReturnTyped;
 use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClass;
 use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClassMagicCall;
 use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClassMagicGet;
 use Symfony\Component\PropertyAccess\Tests\Fixtures\Ticket5775Object;
 use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClassSetValue;
 use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClassIsWritable;
-use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClassTypeErrorInsideCall;
 use Symfony\Component\PropertyAccess\Tests\Fixtures\TypeHinted;
 
 class PropertyAccessorTest extends TestCase
@@ -634,24 +632,4 @@ public function setFoo($foo)
 
         return $obj;
     }
-
-    /**
-     * @expectedException \TypeError
-     */
-    public function testThrowTypeErrorInsideSetterCall()
-    {
-        $object = new TestClassTypeErrorInsideCall();
-
-        $this->propertyAccessor->setValue($object, 'property', 'foo');
-    }
-
-    /**
-     * @expectedException \TypeError
-     */
-    public function testDoNotDiscardReturnTypeError()
-    {
-        $object = new ReturnTyped();
-
-        $this->propertyAccessor->setValue($object, 'foos', array(new \DateTime()));
-    }
 }
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememberMeTokenTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememberMeTokenTest.php
@@ -29,18 +29,6 @@ public function testConstructor()
         $this->assertTrue($token->isAuthenticated());
     }
 
-    /**
-     * @expectedException \TypeError
-     */
-    public function testConstructorSecretCannotBeNull()
-    {
-        new RememberMeToken(
-            $this->getUser(),
-            null,
-            null
-        );
-    }
-
     /**
      * @expectedException \InvalidArgumentException
      */

diff --git a/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php b/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php
@@ -154,14 +154,6 @@ public function testStartTime()
         $this->assertEquals(0, $event->getStartTime(), null, self::DELTA);
     }
 
-    /**
-     * @expectedException \TypeError
-     */
-    public function testInvalidOriginThrowsAnException()
-    {
-        new StopwatchEvent('abc');
-    }
-
     public function testHumanRepresentation()
     {
         $event = new StopwatchEvent(microtime(true) * 1000);