WIP

composer.json

@@ -29,9 +29,8 @@
         "symfony/console": "~3.0|~4.0"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^1.0",
-        "phpunit/phpunit": "^6.5",
-        "squizlabs/php_codesniffer": "^3.2"
+        "doctrine/coding-standard": "dev-reference-global-fn-const-in-use-only",
+        "phpunit/phpunit": "^6.5"
     },
     "autoload": {
         "psr-4": { "Doctrine\\ORM\\": "lib/Doctrine/ORM" }

lib/Doctrine/ORM/AbstractQuery.php

@@ -10,6 +10,17 @@
 use Doctrine\ORM\Cache\QueryCacheKey;
 use Doctrine\DBAL\Cache\QueryCacheProfile;
 use Doctrine\ORM\Utility\StaticClassNameConverter;
+use function is_array;
+use function is_scalar;
+use function reset;
+use function is_object;
+use function array_map;
+use function count;
+use function array_shift;
+use function is_numeric;
+use function ksort;
+use function sha1;
+use function serialize;
 
 /**
  * Base contract for ORM queries. Base class for Query and NativeQuery.

lib/Doctrine/ORM/Cache/CacheException.php

@@ -5,6 +5,7 @@
 namespace Doctrine\ORM\Cache;
 
 use Doctrine\ORM\ORMException;
+use function sprintf;
 
 /**
  * Exception for cache.

lib/Doctrine/ORM/Cache/CollectionCacheKey.php

@@ -4,6 +4,10 @@
 declare(strict_types=1);
 
 namespace Doctrine\ORM\Cache;
+use function ksort;
+use function str_replace;
+use function strtolower;
+use function implode;
 
 /**
  * Defines entity collection roles to be stored in the cache region.

lib/Doctrine/ORM/Cache/DefaultCache.php

@@ -12,6 +12,8 @@
 use Doctrine\ORM\Mapping\ToManyAssociationMetadata;
 use Doctrine\ORM\ORMInvalidArgumentException;
 use Doctrine\ORM\Utility\StaticClassNameConverter;
+use function is_array;
+use function is_object;
 
 /**
  * Provides an API for querying/managing the second level cache regions.

lib/Doctrine/ORM/Cache/DefaultCacheFactory.php

@@ -26,6 +26,8 @@
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Persisters\Collection\CollectionPersister;
 use Doctrine\ORM\Persisters\Entity\EntityPersister;
+use function sprintf;
+use const DIRECTORY_SEPARATOR;
 
 /**
  * @since   2.5

lib/Doctrine/ORM/Cache/DefaultEntityHydrator.php

@@ -13,6 +13,7 @@
 use Doctrine\ORM\Mapping\ToOneAssociationMetadata;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Utility\StaticClassNameConverter;
+use function array_merge;
 
 /**
  * Default hydrator cache for entities

lib/Doctrine/ORM/Cache/DefaultQueryCache.php

@@ -14,6 +14,13 @@
 use Doctrine\ORM\Cache;
 use Doctrine\ORM\Query;
 use ProxyManager\Proxy\GhostObjectInterface;
+use function reset;
+use function array_map;
+use function is_array;
+use function count;
+use function key;
+use function array_unshift;
+use function array_shift;
 
 /**
  * Default query cache implementation.

lib/Doctrine/ORM/Cache/EntityCacheEntry.php

@@ -6,6 +6,7 @@
 namespace Doctrine\ORM\Cache;
 
 use Doctrine\ORM\EntityManagerInterface;
+use function array_map;
 
 /**
  * Entity cache entry

lib/Doctrine/ORM/Cache/EntityCacheKey.php

@@ -4,6 +4,10 @@
 declare(strict_types=1);
 
 namespace Doctrine\ORM\Cache;
+use function ksort;
+use function str_replace;
+use function strtolower;
+use function implode;
 
 /**
  * Defines entity classes roles to be stored in the cache region.

lib/Doctrine/ORM/Cache/Lock.php

@@ -4,6 +4,8 @@
 declare(strict_types=1);
 
 namespace Doctrine\ORM\Cache;
+use function time;
+use function uniqid;
 
 /**
  * Cache Lock

lib/Doctrine/ORM/Cache/Logging/StatisticsCacheLogger.php

@@ -8,6 +8,7 @@
 use Doctrine\ORM\Cache\CollectionCacheKey;
 use Doctrine\ORM\Cache\EntityCacheKey;
 use Doctrine\ORM\Cache\QueryCacheKey;
+use function array_sum;
 
 /**
  * Provide basic second level cache statistics.

lib/Doctrine/ORM/Cache/Persister/Collection/AbstractCollectionPersister.php

@@ -17,6 +17,8 @@
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\Persisters\Collection\CollectionPersister;
 use Doctrine\ORM\Utility\StaticClassNameConverter;
+use function array_values;
+use function count;
 
 /**
  * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
@@ -166,7 +168,7 @@ public function storeCollectionCache(CollectionCacheKey $key, $elements)
         // Only preserve ordering if association configured it
         if (! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
             // Elements may be an array or a Collection
-            $elements = \array_values($elements instanceof Collection ? $elements->getValues() : $elements);
+            $elements = array_values($elements instanceof Collection ? $elements->getValues() : $elements);
         }
 
         $entry = $this->hydrator->buildCacheEntry($this->targetEntity, $key, $elements);

lib/Doctrine/ORM/Cache/Persister/Collection/NonStrictReadWriteCachedCollectionPersister.php

@@ -8,6 +8,7 @@
 use Doctrine\ORM\Cache\CollectionCacheKey;
 use Doctrine\ORM\Mapping\ToManyAssociationMetadata;
 use Doctrine\ORM\PersistentCollection;
+use function spl_object_id;
 
 /**
  * @author Fabio B. Silva <fabio.bat.silva@gmail.com>

lib/Doctrine/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersister.php

@@ -11,6 +11,7 @@
 use Doctrine\ORM\Mapping\AssociationMetadata;
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\Persisters\Collection\CollectionPersister;
+use function spl_object_id;
 
 /**
  * @author Fabio B. Silva <fabio.bat.silva@gmail.com>

lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php

@@ -23,6 +23,8 @@
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\Persisters\Entity\EntityPersister;
 use Doctrine\ORM\Utility\StaticClassNameConverter;
+use function sha1;
+use function serialize;
 
 /**
  * @author Fabio B. Silva <fabio.bat.silva@gmail.com>

lib/Doctrine/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersister.php

@@ -6,6 +6,7 @@
 namespace Doctrine\ORM\Cache\Persister\Entity;
 
 use Doctrine\ORM\Cache\EntityCacheKey;
+use function get_class;
 
 /**
  * Specific non-strict read/write cached entity persister

lib/Doctrine/ORM/Cache/QueryCacheEntry.php

@@ -4,6 +4,7 @@
 declare(strict_types=1);
 
 namespace Doctrine\ORM\Cache;
+use function microtime;
 
 /**
  * Query cache entry

lib/Doctrine/ORM/Cache/Region/DefaultMultiGetRegion.php

@@ -7,6 +7,7 @@
 
 use Doctrine\Common\Cache\MultiGetCache;
 use Doctrine\ORM\Cache\CollectionCacheEntry;
+use function count;
 
 /**
  * A cache region that enables the retrieval of multiple elements with one call

lib/Doctrine/ORM/Cache/Region/DefaultRegion.php

@@ -12,6 +12,8 @@
 use Doctrine\ORM\Cache\CollectionCacheEntry;
 use Doctrine\ORM\Cache\Lock;
 use Doctrine\ORM\Cache\Region;
+use function sprintf;
+use function get_class;
 
 /**
  * The simplest cache region compatible with all doctrine-cache drivers.

lib/Doctrine/ORM/Cache/Region/FileLockRegion.php

@@ -11,6 +11,22 @@
 use Doctrine\ORM\Cache\CacheKey;
 use Doctrine\ORM\Cache\CacheEntry;
 use Doctrine\ORM\Cache\ConcurrentRegion;
+use function is_dir;
+use function mkdir;
+use function sprintf;
+use function is_writable;
+use function is_file;
+use function unlink;
+use function time;
+use const DIRECTORY_SEPARATOR;
+use function file_get_contents;
+use function fileatime;
+use function array_filter;
+use function array_map;
+use function glob;
+use function file_put_contents;
+use const LOCK_EX;
+use function chmod;
 
 /**
  * Very naive concurrent region, based on file locks.

lib/Doctrine/ORM/Cache/TimestampCacheEntry.php

@@ -4,6 +4,7 @@
 declare(strict_types=1);
 
 namespace Doctrine\ORM\Cache;
+use function microtime;
 
 /**
  * Timestamp cache entry

lib/Doctrine/ORM/Cache/TimestampQueryCacheValidator.php

@@ -4,6 +4,7 @@
 declare(strict_types=1);
 
 namespace Doctrine\ORM\Cache;
+use function microtime;
 
 /**
  * @since   2.5

lib/Doctrine/ORM/Configuration.php

@@ -28,6 +28,8 @@
 use ProxyManager\FileLocator\FileLocator;
 use ProxyManager\GeneratorStrategy\EvaluatingGeneratorStrategy;
 use ProxyManager\GeneratorStrategy\FileWriterGeneratorStrategy;
+use function trim;
+use function strtolower;
 
 /**
  * Configuration container for all configuration options of Doctrine.
@@ -408,7 +410,7 @@ public function ensureProductionSettings() : void
      */
     public function addCustomStringFunction(string $functionName, $classNameOrFactory) : void
     {
-        $this->customStringFunctions[\strtolower($functionName)] = $classNameOrFactory;
+        $this->customStringFunctions[strtolower($functionName)] = $classNameOrFactory;
     }
 
     /**
@@ -418,7 +420,7 @@ public function addCustomStringFunction(string $functionName, $classNameOrFactor
      */
     public function getCustomStringFunction(string $functionName)
     {
-        return $this->customStringFunctions[\strtolower($functionName)] ?? null;
+        return $this->customStringFunctions[strtolower($functionName)] ?? null;
     }
 
     /**
@@ -449,7 +451,7 @@ public function setCustomStringFunctions(array $functions) : void
      */
     public function addCustomNumericFunction(string $functionName, $classNameOrFactory) : void
     {
-        $this->customNumericFunctions[\strtolower($functionName)] = $classNameOrFactory;
+        $this->customNumericFunctions[strtolower($functionName)] = $classNameOrFactory;
     }
 
     /**
@@ -459,7 +461,7 @@ public function addCustomNumericFunction(string $functionName, $classNameOrFacto
      */
     public function getCustomNumericFunction(string $functionName)
     {
-        return $this->customNumericFunctions[\strtolower($functionName)] ?? null;
+        return $this->customNumericFunctions[strtolower($functionName)] ?? null;
     }
 
     /**
@@ -490,7 +492,7 @@ public function setCustomNumericFunctions(array $functions) : void
      */
     public function addCustomDatetimeFunction(string $functionName, $classNameOrFactory)
     {
-        $this->customDatetimeFunctions[\strtolower($functionName)] = $classNameOrFactory;
+        $this->customDatetimeFunctions[strtolower($functionName)] = $classNameOrFactory;
     }
 
     /**
@@ -500,7 +502,7 @@ public function addCustomDatetimeFunction(string $functionName, $classNameOrFact
      */
     public function getCustomDatetimeFunction(string $functionName)
     {
-        return $this->customDatetimeFunctions[\strtolower($functionName)] ?? null;
+        return $this->customDatetimeFunctions[strtolower($functionName)] ?? null;
     }
 
     /**

lib/Doctrine/ORM/Configuration/MetadataConfiguration.php

@@ -10,6 +10,9 @@
 use Doctrine\ORM\Mapping\Factory\ClassMetadataResolver;
 use Doctrine\ORM\Mapping\Factory\DefaultNamingStrategy;
 use Doctrine\ORM\Mapping\Factory\NamingStrategy;
+use function ltrim;
+use function rtrim;
+use const DIRECTORY_SEPARATOR;
 
 /**
  * Configuration container for class metadata options of Doctrine.

lib/Doctrine/ORM/EntityManager.php

@@ -13,6 +13,13 @@
 use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\ORM\Utility\IdentifierFlattener;
 use Doctrine\ORM\Utility\StaticClassNameConverter;
+use function ltrim;
+use function is_array;
+use function is_object;
+use function array_keys;
+use function sprintf;
+use function get_class;
+use function gettype;
 
 /**
  * The EntityManager is the central access point to ORM functionality.

lib/Doctrine/ORM/EntityNotFoundException.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 namespace Doctrine\ORM;
+use function implode;
 
 /**
  * Exception thrown when a Proxy fails to retrieve an Entity result.

lib/Doctrine/ORM/EntityRepository.php

@@ -9,6 +9,11 @@
 use Doctrine\Common\Persistence\ObjectRepository;
 use Doctrine\Common\Collections\Selectable;
 use Doctrine\Common\Collections\Criteria;
+use function str_replace;
+use function strpos;
+use function substr;
+use function lcfirst;
+use function array_slice;
 
 /**
  * An EntityRepository serves as a repository for entities with generic as well as

lib/Doctrine/ORM/Event/OnClearEventArgs.php

@@ -5,6 +5,7 @@
 namespace Doctrine\ORM\Event;
 
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\Common\EventArgs;
 
 /**
  * Provides event arguments for the onClear event.
@@ -15,7 +16,7 @@
  * @author      Roman Borschel <roman@code-factory.de>
  * @author      Benjamin Eberlei <kontakt@beberlei.de>
  */
-class OnClearEventArgs extends \Doctrine\Common\EventArgs
+class OnClearEventArgs extends EventArgs
 {
     /**
      * @var EntityManagerInterface

lib/Doctrine/ORM/Event/PreUpdateEventArgs.php

@@ -5,6 +5,8 @@
 namespace Doctrine\ORM\Event;
 
 use Doctrine\ORM\EntityManagerInterface;
+use function sprintf;
+use function get_class;
 
 /**
  * Class that holds event arguments for a preInsert/preUpdate event.

lib/Doctrine/ORM/Internal/CommitOrderCalculator.php

@@ -4,6 +4,7 @@
 declare(strict_types=1);
 
 namespace Doctrine\ORM\Internal;
+use function array_reverse;
 
 /**
  * CommitOrderCalculator implements topological sorting, which is an ordering

lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php

@@ -7,6 +7,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Events;
 use PDO;
+use function array_merge;
 
 /**
  * Base class for all hydrators. A hydrator is a class that provides some form
@@ -379,7 +380,7 @@ protected function hydrateColumnInfo($key)
                 // the current discriminator value must be saved in order to disambiguate fields hydration,
                 // should there be field name collisions
                 if ($classMetadata->getParent() && isset($this->rsm->discriminatorColumns[$ownerMap])) {
-                    return $this->cache[$key] = \array_merge(
+                    return $this->cache[$key] = array_merge(
                         $columnInfo,
                         [
                             'discriminatorColumn' => $this->rsm->discriminatorColumns[$ownerMap],