Merge pull request #393 from doctrine/cleanup/drop-unsupported-php-ve…

…rsions Cleanup - drop unsupported php versions
doctrine · Dec 4, 2015 · cba39f2 · cba39f2
2 parents fe7126c + 71b41ac
commit cba39f2
Show file tree

Hide file tree

Showing 48 changed files with 454 additions and 423 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,9 +7,6 @@ cache:
     - $HOME/.composer/cache
 
 php:
-  - 5.3.3
-  - 5.3
-  - 5.4
   - 5.5
   - 5.6
   - 7.0

diff --git a/composer.json b/composer.json
@@ -13,15 +13,15 @@
         {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
     ],
     "require": {
-        "php": ">=5.3.2",
+        "php": "~5.5|~7.0",
         "doctrine/inflector": "1.*",
         "doctrine/cache": "1.*",
         "doctrine/collections": "1.*",
         "doctrine/lexer": "1.*",
         "doctrine/annotations": "1.*"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.7"
+        "phpunit/phpunit": "~4.8|~5.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/lib/Doctrine/Common/ClassLoader.php b/lib/Doctrine/Common/ClassLoader.php
@@ -153,7 +153,7 @@ public function getFileExtension()
      */
     public function register()
     {
-        spl_autoload_register(array($this, 'loadClass'));
+        spl_autoload_register([$this, 'loadClass']);
     }
 
     /**
@@ -163,7 +163,7 @@ public function register()
      */
     public function unregister()
     {
-        spl_autoload_unregister(array($this, 'loadClass'));
+        spl_autoload_unregister([$this, 'loadClass']);
     }
 
     /**
@@ -275,6 +275,6 @@ private static function typeExists($type, $autoload = false)
     {
         return class_exists($type, $autoload)
             || interface_exists($type, $autoload)
-            || (function_exists('trait_exists') && trait_exists($type, $autoload));
+            || trait_exists($type, $autoload);
     }
 }
diff --git a/lib/Doctrine/Common/EventManager.php b/lib/Doctrine/Common/EventManager.php
@@ -38,7 +38,7 @@ class EventManager
      *
      * @var array
      */
-    private $_listeners = array();
+    private $_listeners = [];
 
     /**
      * Dispatches an event to all registered listeners.

diff --git a/lib/Doctrine/Common/Persistence/AbstractManagerRegistry.php b/lib/Doctrine/Common/Persistence/AbstractManagerRegistry.php
@@ -141,7 +141,7 @@ public function getConnectionNames()
      */
     public function getConnections()
     {
-        $connections = array();
+        $connections = [];
         foreach ($this->connections as $name => $id) {
             $connections[$name] = $this->getService($id);
         }
@@ -226,7 +226,7 @@ public function getManagerNames()
      */
     public function getManagers()
     {
-        $dms = array();
+        $dms = [];
         foreach ($this->managers as $name => $id) {
             $dms[$name] = $this->getService($id);
         }

diff --git a/lib/Doctrine/Common/Persistence/Mapping/AbstractClassMetadataFactory.php b/lib/Doctrine/Common/Persistence/Mapping/AbstractClassMetadataFactory.php
@@ -53,7 +53,7 @@ abstract class AbstractClassMetadataFactory implements ClassMetadataFactory
     /**
      * @var ClassMetadata[]
      */
-    private $loadedMetadata = array();
+    private $loadedMetadata = [];
 
     /**
      * @var bool
@@ -110,7 +110,7 @@ public function getAllMetadata()
         }
 
         $driver = $this->getDriver();
-        $metadata = array();
+        $metadata = [];
         foreach ($driver->getAllClassNames() as $className) {
             $metadata[] = $this->getMetadataFor($className);
         }
@@ -277,7 +277,7 @@ public function setMetadataFor($className, $class)
     protected function getParentClasses($name)
     {
         // Collect parent classes, ignoring transient (not-mapped) classes.
-        $parentClasses = array();
+        $parentClasses = [];
         foreach (array_reverse($this->getReflectionService()->getParentClasses($name)) as $parentClass) {
             if ( ! $this->getDriver()->isTransient($parentClass)) {
                 $parentClasses[] = $parentClass;
@@ -306,15 +306,15 @@ protected function loadMetadata($name)
             $this->initialize();
         }
 
-        $loaded = array();
+        $loaded = [];
 
         $parentClasses = $this->getParentClasses($name);
         $parentClasses[] = $name;
 
         // Move down the hierarchy of parent classes, starting from the topmost class
         $parent = null;
         $rootEntityFound = false;
-        $visited = array();
+        $visited = [];
         $reflService = $this->getReflectionService();
         foreach ($parentClasses as $className) {
             if (isset($this->loadedMetadata[$className])) {

diff --git a/lib/Doctrine/Common/Persistence/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/Common/Persistence/Mapping/Driver/AnnotationDriver.php
@@ -45,14 +45,14 @@ abstract class AnnotationDriver implements MappingDriver
      *
      * @var array
      */
-    protected $paths = array();
+    protected $paths = [];
 
     /**
      * The paths excluded from path where to look for mapping files.
      *
      * @var array
      */
-    protected $excludePaths = array();
+    protected $excludePaths = [];
 
     /**
      * The file extension of mapping documents.
@@ -73,7 +73,7 @@ abstract class AnnotationDriver implements MappingDriver
      *
      * @var array
      */
-    protected $entityAnnotationClasses = array();
+    protected $entityAnnotationClasses = [];
 
     /**
      * Initializes a new AnnotationDriver that uses the given AnnotationReader for reading
@@ -200,8 +200,8 @@ public function getAllClassNames()
             throw MappingException::pathRequired();
         }
 
-        $classes = array();
-        $includedFiles = array();
+        $classes = [];
+        $includedFiles = [];
 
         foreach ($this->paths as $path) {
             if ( ! is_dir($path)) {

diff --git a/lib/Doctrine/Common/Persistence/Mapping/Driver/DefaultFileLocator.php b/lib/Doctrine/Common/Persistence/Mapping/Driver/DefaultFileLocator.php
@@ -37,7 +37,7 @@ class DefaultFileLocator implements FileLocator
      *
      * @var array
      */
-    protected $paths = array();
+    protected $paths = [];
 
     /**
      * The file extension of mapping documents.
@@ -125,7 +125,7 @@ public function findMappingFile($className)
      */
     public function getAllClassNames($globalBasename)
     {
-        $classes = array();
+        $classes = [];
 
         if ($this->paths) {
             foreach ($this->paths as $path) {

diff --git a/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php b/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php
@@ -145,11 +145,14 @@ public function getAllClassNames()
             $this->initialize();
         }
 
-        $classNames = (array)$this->locator->getAllClassNames($this->globalBasename);
-        if ($this->classCache) {
-            $classNames = array_merge(array_keys($this->classCache), $classNames);
+        if (! $this->classCache) {
+            return (array) $this->locator->getAllClassNames($this->globalBasename);
         }
-        return $classNames;
+
+        return array_merge(
+            array_keys($this->classCache),
+            (array) $this->locator->getAllClassNames($this->globalBasename)
+        );
     }
 
     /**
@@ -175,7 +178,7 @@ abstract protected function loadMappingFile($file);
      */
     protected function initialize()
     {
-        $this->classCache = array();
+        $this->classCache = [];
         if (null !== $this->globalBasename) {
             foreach ($this->locator->getPaths() as $path) {
                 $file = $path.'/'.$this->globalBasename.$this->locator->getFileExtension();

diff --git a/lib/Doctrine/Common/Persistence/Mapping/Driver/MappingDriverChain.php b/lib/Doctrine/Common/Persistence/Mapping/Driver/MappingDriverChain.php
@@ -39,12 +39,12 @@ class MappingDriverChain implements MappingDriver
      *
      * @var MappingDriver|null
      */
-    private $defaultDriver = null;
+    private $defaultDriver;
 
     /**
      * @var array
      */
-    private $drivers = array();
+    private $drivers = [];
 
     /**
      * Gets the default driver.
@@ -117,8 +117,8 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)
      */
     public function getAllClassNames()
     {
-        $classNames = array();
-        $driverClasses = array();
+        $classNames = [];
+        $driverClasses = [];
 
         /* @var $driver MappingDriver */
         foreach ($this->drivers AS $namespace => $driver) {

diff --git a/lib/Doctrine/Common/Persistence/Mapping/Driver/PHPDriver.php b/lib/Doctrine/Common/Persistence/Mapping/Driver/PHPDriver.php
@@ -44,8 +44,7 @@ class PHPDriver extends FileDriver
      */
     public function __construct($locator, $fileExtension = null)
     {
-        $fileExtension = ".php";
-        parent::__construct($locator, $fileExtension);
+        parent::__construct($locator, '.php');
     }
 
     /**
@@ -54,6 +53,7 @@ public function __construct($locator, $fileExtension = null)
     public function loadMetadataForClass($className, ClassMetadata $metadata)
     {
         $this->metadata = $metadata;
+
         $this->loadMappingFile($this->locator->findMappingFile($className));
     }
 
@@ -65,6 +65,6 @@ protected function loadMappingFile($file)
         $metadata = $this->metadata;
         include $file;
 
-        return array($metadata->getName() => $metadata);
+        return [$metadata->getName() => $metadata];
     }
 }
diff --git a/lib/Doctrine/Common/Persistence/Mapping/Driver/StaticPHPDriver.php b/lib/Doctrine/Common/Persistence/Mapping/Driver/StaticPHPDriver.php
@@ -40,7 +40,7 @@ class StaticPHPDriver implements MappingDriver
      *
      * @var array
      */
-    private $paths = array();
+    private $paths = [];
 
     /**
      * Map of all class names.
@@ -93,8 +93,8 @@ public function getAllClassNames()
             throw MappingException::pathRequired();
         }
 
-        $classes = array();
-        $includedFiles = array();
+        $classes = [];
+        $includedFiles = [];
 
         foreach ($this->paths as $path) {
             if (!is_dir($path)) {

diff --git a/lib/Doctrine/Common/Persistence/Mapping/Driver/SymfonyFileLocator.php b/lib/Doctrine/Common/Persistence/Mapping/Driver/SymfonyFileLocator.php
@@ -37,14 +37,14 @@ class SymfonyFileLocator implements FileLocator
      *
      * @var array
      */
-    protected $paths = array();
+    protected $paths = [];
 
     /**
      * A map of mapping directory path to namespace prefix used to expand class shortnames.
      *
      * @var array
      */
-    protected $prefixes = array();
+    protected $prefixes = [];
 
     /**
      * File extension that is searched for.
@@ -164,7 +164,7 @@ public function fileExists($className)
      */
     public function getAllClassNames($globalBasename = null)
     {
-        $classes = array();
+        $classes = [];
 
         if ($this->paths) {
             foreach ((array) $this->paths as $path) {

diff --git a/lib/Doctrine/Common/Persistence/Mapping/StaticReflectionService.php b/lib/Doctrine/Common/Persistence/Mapping/StaticReflectionService.php
@@ -31,7 +31,7 @@ class StaticReflectionService implements ReflectionService
      */
     public function getParentClasses($class)
     {
-        return array();
+        return [];
     }
 
     /**

diff --git a/lib/Doctrine/Common/Persistence/PersistentObject.php b/lib/Doctrine/Common/Persistence/PersistentObject.php
@@ -198,7 +198,7 @@ private function add($field, $args)
                 throw new \InvalidArgumentException("Expected persistent object of type '".$targetClass."'");
             }
             if (!($this->$field instanceof Collection)) {
-                $this->$field = new ArrayCollection($this->$field ?: array());
+                $this->$field = new ArrayCollection($this->$field ?: []);
             }
             $this->$field->add($args[0]);
             $this->completeOwningSide($field, $targetClass, $args[0]);

diff --git a/lib/Doctrine/Common/Proxy/AbstractProxyFactory.php b/lib/Doctrine/Common/Proxy/AbstractProxyFactory.php
@@ -87,7 +87,7 @@ abstract class AbstractProxyFactory
     /**
      * @var \Doctrine\Common\Proxy\ProxyDefinition[]
      */
-    private $definitions = array();
+    private $definitions = [];
 
     /**
      * @param \Doctrine\Common\Proxy\ProxyGenerator                     $proxyGenerator