Cleanup: old php versions compat cleanup

.travis.yml

@@ -1,19 +1,18 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
   - 7.1
-  - hhvm
+  - nightly
 
 before_script:
-  - ./.travis.install.sh
-  - if [ $TRAVIS_PHP_VERSION = '5.6' ]; then PHPUNIT_FLAGS="--coverage-clover coverage.clover"; else PHPUNIT_FLAGS=""; fi
+  - composer self-update
+  - composer update
 
 script:
-  - ./vendor/bin/phpunit $PHPUNIT_FLAGS;
-  - ./vendor/bin/phpcs --standard=PSR2 ./src/ ./tests/;
-  - php -n ./vendor/bin/athletic -p ./tests/DoctrineTest/InstantiatorPerformance/ -f GroupedFormatter;
+  - ./vendor/bin/phpunit --coverage-clover coverage.clover
+  - ./vendor/bin/phpcs --standard=PSR2 ./src/ ./tests/
+  - php -n ./vendor/bin/athletic -p ./tests/DoctrineTest/InstantiatorPerformance/ -f GroupedFormatter
 
 after_script:
-  - if [ $TRAVIS_PHP_VERSION = '5.6' ]; then wget https://scrutinizer-ci.com/ocular.phar; php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover

README.md

@@ -27,7 +27,7 @@ itself:
 ```php
 $instantiator = new \Doctrine\Instantiator\Instantiator();
 
-$instance = $instantiator->instantiate(My\ClassName\Here::class);
+$instance = $instantiator->instantiate(\My\ClassName\Here::class);
 ```
 
 ## Contributing

composer.json

@@ -16,13 +16,13 @@
         }
     ],
     "require": {
-        "php": ">=5.3,<8.0-DEV"
+        "php": "^7.1"
     },
     "require-dev": {
         "ext-phar":                  "*",
         "ext-pdo":                   "*",
-        "phpunit/phpunit":           "~4.0",
-        "squizlabs/php_codesniffer": "~2.0",
+        "phpunit/phpunit":           "^6.2.3",
+        "squizlabs/php_codesniffer": "^3.0.2",
         "athletic/athletic":         "~0.1.8"
     },
     "autoload": {
@@ -39,7 +39,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "1.1.x-dev"
         }
     }
 }

src/Doctrine/Instantiator/Exception/InvalidArgumentException.php

@@ -29,12 +29,7 @@
  */
 class InvalidArgumentException extends BaseInvalidArgumentException implements ExceptionInterface
 {
-    /**
-     * @param string $className
-     *
-     * @return self
-     */
-    public static function fromNonExistingClass($className)
+    public static function fromNonExistingClass(string $className) : self
     {
         if (interface_exists($className)) {
             return new self(sprintf('The provided type "%s" is an interface, and can not be instantiated', $className));
@@ -47,12 +42,7 @@ public static function fromNonExistingClass($className)
         return new self(sprintf('The provided class "%s" does not exist', $className));
     }
 
-    /**
-     * @param ReflectionClass $reflectionClass
-     *
-     * @return self
-     */
-    public static function fromAbstractClass(ReflectionClass $reflectionClass)
+    public static function fromAbstractClass(ReflectionClass $reflectionClass) : self
     {
         return new self(sprintf(
             'The provided class "%s" is abstract, and can not be instantiated',

src/Doctrine/Instantiator/Exception/UnexpectedValueException.php

@@ -30,14 +30,10 @@
  */
 class UnexpectedValueException extends BaseUnexpectedValueException implements ExceptionInterface
 {
-    /**
-     * @param ReflectionClass $reflectionClass
-     * @param Exception       $exception
-     *
-     * @return self
-     */
-    public static function fromSerializationTriggeredException(ReflectionClass $reflectionClass, Exception $exception)
-    {
+    public static function fromSerializationTriggeredException(
+        ReflectionClass $reflectionClass,
+        Exception $exception
+    ) : self {
         return new self(
             sprintf(
                 'An exception was raised while trying to instantiate an instance of "%s" via un-serialization',
@@ -48,22 +44,13 @@ public static function fromSerializationTriggeredException(ReflectionClass $refl
         );
     }
 
-    /**
-     * @param ReflectionClass $reflectionClass
-     * @param string          $errorString
-     * @param int             $errorCode
-     * @param string          $errorFile
-     * @param int             $errorLine
-     *
-     * @return UnexpectedValueException
-     */
     public static function fromUncleanUnSerialization(
         ReflectionClass $reflectionClass,
-        $errorString,
-        $errorCode,
-        $errorFile,
-        $errorLine
-    ) {
+        string $errorString,
+        int $errorCode,
+        string $errorFile,
+        int $errorLine
+    ) : self {
         return new self(
             sprintf(
                 'Could not produce an instance of "%s" via un-serialization, since an error was triggered '

src/Doctrine/Instantiator/Instantiator.php

@@ -19,7 +19,6 @@
 
 namespace Doctrine\Instantiator;
 
-use Closure;
 use Doctrine\Instantiator\Exception\InvalidArgumentException;
 use Doctrine\Instantiator\Exception\UnexpectedValueException;
 use Exception;
@@ -41,14 +40,14 @@ final class Instantiator implements InstantiatorInterface
     const SERIALIZATION_FORMAT_AVOID_UNSERIALIZER = 'O';
 
     /**
-     * @var \Closure[] of {@see \Closure} instances used to instantiate specific classes
+     * @var \callable[] used to instantiate specific classes, indexed by class name
      */
-    private static $cachedInstantiators = array();
+    private static $cachedInstantiators = [];
 
     /**
-     * @var object[] of objects that can directly be cloned
+     * @var object[] of objects that can directly be cloned, indexed by class name
      */
-    private static $cachedCloneables = array();
+    private static $cachedCloneables = [];
 
     /**
      * {@inheritDoc}
@@ -71,11 +70,9 @@ public function instantiate($className)
     /**
      * Builds the requested object and caches it in static properties for performance
      *
-     * @param string $className
-     *
      * @return object
      */
-    private function buildAndCacheFromFactory($className)
+    private function buildAndCacheFromFactory(string $className)
     {
         $factory  = self::$cachedInstantiators[$className] = $this->buildFactory($className);
         $instance = $factory();
@@ -88,26 +85,24 @@ private function buildAndCacheFromFactory($className)
     }
 
     /**
-     * Builds a {@see \Closure} capable of instantiating the given $className without
+     * Builds a callable capable of instantiating the given $className without
      * invoking its constructor.
      *
-     * @param string $className
-     *
-     * @return Closure
+     * @throws InvalidArgumentException
+     * @throws UnexpectedValueException
+     * @throws \ReflectionException
      */
-    private function buildFactory($className)
+    private function buildFactory(string $className) : callable
     {
         $reflectionClass = $this->getReflectionClass($className);
 
         if ($this->isInstantiableViaReflection($reflectionClass)) {
-            return function () use ($reflectionClass) {
-                return $reflectionClass->newInstanceWithoutConstructor();
-            };
+            return [$reflectionClass, 'newInstanceWithoutConstructor'];
         }
 
         $serializedString = sprintf(
             '%s:%d:"%s":0:{}',
-            $this->getSerializationFormat($reflectionClass),
+            self::SERIALIZATION_FORMAT_AVOID_UNSERIALIZER,
             strlen($className),
             $className
         );
@@ -125,8 +120,9 @@ private function buildFactory($className)
      * @return ReflectionClass
      *
      * @throws InvalidArgumentException
+     * @throws \ReflectionException
      */
-    private function getReflectionClass($className)
+    private function getReflectionClass($className) : ReflectionClass
     {
         if (! class_exists($className)) {
             throw InvalidArgumentException::fromNonExistingClass($className);
@@ -149,9 +145,9 @@ private function getReflectionClass($className)
      *
      * @return void
      */
-    private function checkIfUnSerializationIsSupported(ReflectionClass $reflectionClass, $serializedString)
+    private function checkIfUnSerializationIsSupported(ReflectionClass $reflectionClass, $serializedString) : void
     {
-        set_error_handler(function ($code, $message, $file, $line) use ($reflectionClass, & $error) {
+        set_error_handler(function ($code, $message, $file, $line) use ($reflectionClass, & $error) : void {
             $error = UnexpectedValueException::fromUncleanUnSerialization(
                 $reflectionClass,
                 $message,
@@ -178,7 +174,7 @@ private function checkIfUnSerializationIsSupported(ReflectionClass $reflectionCl
      *
      * @return void
      */
-    private function attemptInstantiationViaUnSerialization(ReflectionClass $reflectionClass, $serializedString)
+    private function attemptInstantiationViaUnSerialization(ReflectionClass $reflectionClass, $serializedString) : void
     {
         try {
             unserialize($serializedString);
@@ -189,28 +185,15 @@ private function attemptInstantiationViaUnSerialization(ReflectionClass $reflect
         }
     }
 
-    /**
-     * @param ReflectionClass $reflectionClass
-     *
-     * @return bool
-     */
-    private function isInstantiableViaReflection(ReflectionClass $reflectionClass)
+    private function isInstantiableViaReflection(ReflectionClass $reflectionClass) : bool
     {
-        if (\PHP_VERSION_ID >= 50600) {
-            return ! ($this->hasInternalAncestors($reflectionClass) && $reflectionClass->isFinal());
-        }
-
-        return \PHP_VERSION_ID >= 50400 && ! $this->hasInternalAncestors($reflectionClass);
+        return ! ($this->hasInternalAncestors($reflectionClass) && $reflectionClass->isFinal());
     }
 
     /**
      * Verifies whether the given class is to be considered internal
-     *
-     * @param ReflectionClass $reflectionClass
-     *
-     * @return bool
      */
-    private function hasInternalAncestors(ReflectionClass $reflectionClass)
+    private function hasInternalAncestors(ReflectionClass $reflectionClass) : bool
     {
         do {
             if ($reflectionClass->isInternal()) {
@@ -221,53 +204,13 @@ private function hasInternalAncestors(ReflectionClass $reflectionClass)
         return false;
     }
 
-    /**
-     * Verifies if the given PHP version implements the `Serializable` interface serialization
-     * with an incompatible serialization format. If that's the case, use serialization marker
-     * "C" instead of "O".
-     *
-     * @link http://news.php.net/php.internals/74654
-     *
-     * @param ReflectionClass $reflectionClass
-     *
-     * @return string the serialization format marker, either self::SERIALIZATION_FORMAT_USE_UNSERIALIZER
-     *                or self::SERIALIZATION_FORMAT_AVOID_UNSERIALIZER
-     */
-    private function getSerializationFormat(ReflectionClass $reflectionClass)
-    {
-        if ($this->isPhpVersionWithBrokenSerializationFormat()
-            && $reflectionClass->implementsInterface('Serializable')
-        ) {
-            return self::SERIALIZATION_FORMAT_USE_UNSERIALIZER;
-        }
-
-        return self::SERIALIZATION_FORMAT_AVOID_UNSERIALIZER;
-    }
-
-    /**
-     * Checks whether the current PHP runtime uses an incompatible serialization format
-     *
-     * @return bool
-     */
-    private function isPhpVersionWithBrokenSerializationFormat()
-    {
-        return PHP_VERSION_ID === 50429 || PHP_VERSION_ID === 50513;
-    }
-
     /**
      * Checks if a class is cloneable
      *
-     * @param ReflectionClass $reflection
-     *
-     * @return bool
+     * Classes implementing `__clone` cannot be safely cloned, as that may cause side-effects.
      */
-    private function isSafeToClone(ReflectionClass $reflection)
+    private function isSafeToClone(ReflectionClass $reflection) : bool
     {
-        if (method_exists($reflection, 'isCloneable') && ! $reflection->isCloneable()) {
-            return false;
-        }
-
-        // not cloneable if it implements `__clone`, as we want to avoid calling it
-        return ! $reflection->hasMethod('__clone');
+        return $reflection->isCloneable() && ! $reflection->hasMethod('__clone');
     }
 }