From 74c8a08828e275d2d1cb081b9133928be7173556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= <lcobucci@gmail.com>
Date: Wed, 7 Dec 2016 23:33:41 +0100
Subject: [PATCH] Use short-array syntax on "tests" directory

---
 .../EventListener/CacheMetadataListener.php   |   6 +-
 .../Doctrine/Tests/Mocks/CacheRegionMock.php  |  22 +-
 .../Tests/Mocks/ConcurrentRegionMock.php      |  26 +-
 tests/Doctrine/Tests/Mocks/ConnectionMock.php |  14 +-
 tests/Doctrine/Tests/Mocks/DriverMock.php     |   2 +-
 .../Tests/Mocks/EntityManagerMock.php         |   2 +-
 .../Tests/Mocks/EntityPersisterMock.php       |  18 +-
 .../Tests/Mocks/HydratorMockStatement.php     |   2 +-
 .../Tests/Mocks/MetadataDriverMock.php        |   2 +-
 tests/Doctrine/Tests/Mocks/TaskMock.php       |   2 +-
 .../Tests/Mocks/TimestampRegionMock.php       |   2 +-
 tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php |   2 +-
 .../Doctrine/Tests/Models/CMS/CmsAddress.php  | 114 ++--
 tests/Doctrine/Tests/Models/CMS/CmsUser.php   | 220 ++++---
 .../Tests/Models/Company/CompanyContract.php  |  24 +-
 .../Models/Company/CompanyFixContract.php     |   8 +-
 .../Models/Company/CompanyFlexContract.php    |  12 +-
 .../Company/CompanyFlexUltraContract.php      |  10 +-
 .../Tests/Models/Company/CompanyPerson.php    |  45 +-
 .../DDC1476EntityWithDefaultFieldType.php     |  12 +-
 .../Tests/Models/DDC3346/DDC3346Author.php    |   2 +-
 .../Tests/Models/DDC3579/DDC3579Admin.php     |   5 +-
 .../Tests/Models/DDC3579/DDC3579User.php      |  18 +-
 .../Models/DDC869/DDC869ChequePayment.php     |   6 +-
 .../Models/DDC869/DDC869CreditCardPayment.php |   6 +-
 .../Tests/Models/DDC869/DDC869Payment.php     |  12 +-
 .../Tests/Models/DDC889/DDC889Class.php       |   6 +-
 .../Tests/Models/DDC889/DDC889SuperClass.php  |   6 +-
 .../Tests/Models/DDC964/DDC964Admin.php       |  34 +-
 .../Tests/Models/DDC964/DDC964Guest.php       |  13 +-
 .../Tests/Models/DDC964/DDC964User.php        |  48 +-
 .../Doctrine/Tests/Models/GeoNames/Admin1.php |   2 +-
 .../Tests/Models/Routing/RoutingRoute.php     |   4 +-
 .../Tests/ORM/Cache/AbstractRegionTest.php    |  16 +-
 .../Doctrine/Tests/ORM/Cache/CacheKeyTest.php |  30 +-
 .../Tests/ORM/Cache/CacheLoggerChainTest.php  |   8 +-
 .../ORM/Cache/DefaultCacheFactoryTest.php     |  34 +-
 .../Tests/ORM/Cache/DefaultCacheTest.php      |  62 +-
 .../Cache/DefaultCollectionHydratorTest.php   |  20 +-
 .../ORM/Cache/DefaultEntityHydratorTest.php   |  60 +-
 .../Tests/ORM/Cache/DefaultQueryCacheTest.php | 166 ++---
 .../Tests/ORM/Cache/DefaultRegionTest.php     |  10 +-
 .../Tests/ORM/Cache/FileLockRegionTest.php    |  18 +-
 .../Tests/ORM/Cache/MultiGetRegionTest.php    |   6 +-
 .../AbstractCollectionPersisterTest.php       |  24 +-
 ...ReadWriteCachedCollectionPersisterTest.php |  44 +-
 .../Entity/AbstractEntityPersisterTest.php    | 102 +--
 ...rictReadWriteCachedEntityPersisterTest.php |  20 +-
 .../ReadWriteCachedEntityPersisterTest.php    |  36 +-
 .../ORM/Cache/StatisticsCacheLoggerTest.php   |  10 +-
 .../Tests/ORM/CommitOrderCalculatorTest.php   |   4 +-
 .../Doctrine/Tests/ORM/ConfigurationTest.php  |  14 +-
 .../Decorator/EntityManagerDecoratorTest.php  |  16 +-
 .../Doctrine/Tests/ORM/EntityManagerTest.php  |  30 +-
 .../Tests/ORM/EntityNotFoundExceptionTest.php |   4 +-
 .../AbstractManyToManyAssociationTestCase.php |   3 +-
 .../Functional/AdvancedAssociationTest.php    |   6 +-
 .../ORM/Functional/BasicFunctionalTest.php    |   6 +-
 .../ORM/Functional/CascadeRemoveOrderTest.php |  14 +-
 .../Functional/ClassTableInheritanceTest.php  |   6 +-
 .../Functional/ClassTableInheritanceTest2.php |   6 +-
 .../Functional/CompositePrimaryKeyTest.php    |  17 +-
 ...ompositePrimaryKeyWithAssociationsTest.php |   8 +-
 .../ORM/Functional/DatabaseDriverTest.php     |  54 +-
 .../ORM/Functional/DatabaseDriverTestCase.php |   6 +-
 .../ORM/Functional/DefaultValuesTest.php      |   6 +-
 .../ORM/Functional/EntityListenersTest.php    |  22 +-
 .../EntityRepositoryCriteriaTest.php          |   2 +-
 .../ORM/Functional/EntityRepositoryTest.php   |  86 +--
 .../Functional/ExtraLazyCollectionTest.php    |   4 +-
 .../Tests/ORM/Functional/IdentityMapTest.php  |  10 +-
 .../JoinedTableCompositeKeyTest.php           |   2 +-
 .../ORM/Functional/LifecycleCallbackTest.php  |  18 +-
 .../Functional/Locking/GearmanLockTest.php    |  27 +-
 .../Functional/Locking/LockAgentWorker.php    |   8 +-
 .../Tests/ORM/Functional/Locking/LockTest.php |   2 +-
 .../ORM/Functional/Locking/OptimisticTest.php |  15 +-
 .../ManyToManyBasicAssociationTest.php        |   2 +-
 .../Functional/MergeCompositeToOneKeyTest.php |   6 +-
 .../Tests/ORM/Functional/MergeProxiesTest.php |   6 +-
 .../Functional/MergeSharedEntitiesTest.php    |   6 +-
 .../Tests/ORM/Functional/NativeQueryTest.php  |  17 +-
 .../Tests/ORM/Functional/NewOperatorTest.php  |  16 +-
 .../Tests/ORM/Functional/NotifyPolicyTest.php |   8 +-
 .../OneToManyBidirectionalAssociationTest.php |   2 +-
 ...neToManySelfReferentialAssociationTest.php |   3 +-
 ...OneToManyUnidirectionalAssociationTest.php |   4 +-
 .../OneToOneBidirectionalAssociationTest.php  |   3 +-
 .../Functional/OneToOneEagerLoadingTest.php   |   6 +-
 ...OneToOneSelfReferentialAssociationTest.php |   9 +-
 .../OneToOneUnidirectionalAssociationTest.php |   2 +-
 .../ORM/Functional/OrderedCollectionTest.php  |   4 +-
 ...edJoinedTableInheritanceCollectionTest.php |   6 +-
 .../Tests/ORM/Functional/PaginationTest.php   |  35 +-
 .../PersistentCollectionCriteriaTest.php      |   4 +-
 .../Functional/PersistentCollectionTest.php   |   6 +-
 .../ORM/Functional/PersistentObjectTest.php   |   6 +-
 .../ORM/Functional/PostLoadEventTest.php      |  26 +-
 .../Functional/ProxiesLikeEntitiesTest.php    |  15 +-
 .../Tests/ORM/Functional/QueryCacheTest.php   |   6 +-
 .../Tests/ORM/Functional/QueryTest.php        |  39 +-
 .../Tests/ORM/Functional/ReadOnlyTest.php     |   6 +-
 .../ORM/Functional/ReferenceProxyTest.php     |   4 +-
 .../Tests/ORM/Functional/SQLFilterTest.php    |  32 +-
 .../SchemaTool/CompanySchemaTest.php          |   6 +-
 .../ORM/Functional/SchemaTool/DBAL483Test.php |   4 +-
 .../ORM/Functional/SchemaTool/DDC214Test.php  |  12 +-
 .../SchemaTool/MySqlSchemaToolTest.php        |  16 +-
 .../SchemaTool/PostgreSqlSchemaToolTest.php   |  22 +-
 .../ORM/Functional/SchemaValidatorTest.php    |   6 +-
 .../SecondLevelCacheAbstractTest.php          |  22 +-
 ...econdLevelCacheCompositePrimaryKeyTest.php |  14 +-
 ...ompositePrimaryKeyWithAssociationsTest.php |   4 +-
 .../SecondLevelCacheConcurrentTest.php        |   6 +-
 .../SecondLevelCacheQueryCacheTest.php        |   8 +-
 .../SecondLevelCacheRepositoryTest.php        |  10 +-
 .../ORM/Functional/SecondLevelCacheTest.php   |  30 +-
 .../SequenceEmulatedIdentityStrategyTest.php  |   2 +-
 .../ORM/Functional/SequenceGeneratorTest.php  |   6 +-
 .../SingleTableCompositeKeyTest.php           |   2 +-
 .../Functional/SingleTableInheritanceTest.php |  12 +-
 .../StandardEntityPersisterTest.php           |   4 +-
 .../ORM/Functional/Ticket/DDC1080Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1113Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1151Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1163Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC117Test.php      |  20 +-
 .../ORM/Functional/Ticket/DDC1181Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1193Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1209Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1225Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1228Test.php     |   8 +-
 .../ORM/Functional/Ticket/DDC1238Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1250Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1300Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1335Test.php     |  14 +-
 .../ORM/Functional/Ticket/DDC1360Test.php     |  11 +-
 .../ORM/Functional/Ticket/DDC1383Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1392Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1400Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1404Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC142Test.php      |  12 +-
 .../ORM/Functional/Ticket/DDC1430Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1436Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC144Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC1452Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1454Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1458Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1461Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1509Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1514Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1515Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1526Test.php     |   8 +-
 .../ORM/Functional/Ticket/DDC1548Test.php     |   8 +-
 .../ORM/Functional/Ticket/DDC1595Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1654Test.php     |   8 +-
 .../ORM/Functional/Ticket/DDC1655Test.php     |  12 +-
 .../ORM/Functional/Ticket/DDC1690Test.php     |   8 +-
 .../ORM/Functional/Ticket/DDC1707Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1719Test.php     |  12 +-
 .../ORM/Functional/Ticket/DDC1787Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC1843Test.php     |   8 +-
 .../ORM/Functional/Ticket/DDC1884Test.php     |   4 +-
 .../ORM/Functional/Ticket/DDC1885Test.php     |  12 +-
 .../ORM/Functional/Ticket/DDC1918Test.php     |   2 +-
 .../ORM/Functional/Ticket/DDC1925Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC192Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC1998Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC199Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC2012Test.php     |  32 +-
 .../ORM/Functional/Ticket/DDC2074Test.php     |   2 +-
 .../ORM/Functional/Ticket/DDC2084Test.php     |   8 +-
 .../ORM/Functional/Ticket/DDC2090Test.php     |  18 +-
 .../ORM/Functional/Ticket/DDC2106Test.php     |   8 +-
 .../ORM/Functional/Ticket/DDC211Test.php      |   8 +-
 .../ORM/Functional/Ticket/DDC2138Test.php     |   8 +-
 .../ORM/Functional/Ticket/DDC2175Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC2182Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC2214Test.php     |   8 +-
 .../ORM/Functional/Ticket/DDC2230Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC2231Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC2252Test.php     |  14 +-
 .../ORM/Functional/Ticket/DDC2256Test.php     |   9 +-
 .../ORM/Functional/Ticket/DDC2306Test.php     |   8 +-
 .../ORM/Functional/Ticket/DDC2346Test.php     |   8 +-
 .../ORM/Functional/Ticket/DDC2350Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC2359Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC237Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC2387Test.php     |   8 +-
 .../ORM/Functional/Ticket/DDC2415Test.php     |  26 +-
 .../ORM/Functional/Ticket/DDC2494Test.php     |  18 +-
 .../ORM/Functional/Ticket/DDC2575Test.php     |  16 +-
 .../ORM/Functional/Ticket/DDC2579Test.php     |  10 +-
 .../ORM/Functional/Ticket/DDC258Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC2660Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC2692Test.php     |  10 +-
 .../ORM/Functional/Ticket/DDC2759Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC2775Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC279Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC2825Test.php     |  12 +-
 .../ORM/Functional/Ticket/DDC2862Test.php     |  22 +-
 .../ORM/Functional/Ticket/DDC2895Test.php     |  16 +-
 .../ORM/Functional/Ticket/DDC2931Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC2984Test.php     |  18 +-
 .../ORM/Functional/Ticket/DDC2996Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC3033Test.php     |  16 +-
 .../ORM/Functional/Ticket/DDC3042Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC3068Test.php     |  12 +-
 .../ORM/Functional/Ticket/DDC309Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC3123Test.php     |   4 +-
 .../ORM/Functional/Ticket/DDC3170Test.php     |   4 +-
 .../ORM/Functional/Ticket/DDC3192Test.php     |  10 +-
 .../ORM/Functional/Ticket/DDC3223Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC3300Test.php     |  10 +-
 .../ORM/Functional/Ticket/DDC3330Test.php     |  22 +-
 .../ORM/Functional/Ticket/DDC3346Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC345Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC353Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC3597Test.php     |   6 +-
 .../ORM/Functional/Ticket/DDC3644Test.php     |  16 +-
 .../ORM/Functional/Ticket/DDC3711Test.php     |   4 +-
 .../ORM/Functional/Ticket/DDC371Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC3785Test.php     |  14 +-
 .../ORM/Functional/Ticket/DDC381Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC422Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC425Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC440Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC444Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC448Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC493Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC501Test.php      |   4 +-
 .../ORM/Functional/Ticket/DDC512Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC513Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC522Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC531Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC588Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC599Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC618Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC633Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC656Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC698Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC719Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC729Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC735Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC736Test.php      |   5 +-
 .../ORM/Functional/Ticket/DDC742Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC767Test.php      |   2 +-
 .../ORM/Functional/Ticket/DDC809Test.php      |  38 +-
 .../ORM/Functional/Ticket/DDC832Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC837Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC881Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC949Test.php      |   8 +-
 .../ORM/Functional/Ticket/DDC960Test.php      |   6 +-
 .../ORM/Functional/Ticket/DDC992Test.php      |   8 +-
 .../ORM/Functional/Ticket/GH5762Test.php      |   8 +-
 .../ORM/Functional/Ticket/Ticket2481Test.php  |   6 +-
 .../Tests/ORM/Functional/Ticket/Ticket69.php  |   6 +-
 .../Tests/ORM/Functional/TypeTest.php         |   5 +-
 .../ORM/Functional/UUIDGeneratorTest.php      |   6 +-
 .../Functional/UnitOfWorkLifecycleTest.php    |   4 +-
 .../ManyToManyCompositeIdForeignKeyTest.php   |  10 +-
 .../ManyToManyCompositeIdTest.php             |   8 +-
 .../OneToManyCompositeIdForeignKeyTest.php    |   8 +-
 .../OneToManyCompositeIdTest.php              |   6 +-
 .../OneToOneCompositeIdForeignKeyTest.php     |   8 +-
 .../OneToOneCompositeIdTest.php               |   6 +-
 .../Tests/ORM/Functional/ValueObjectsTest.php |  44 +-
 .../ORM/Functional/VersionedOneToOneTest.php  |   8 +-
 .../Tests/ORM/Hydration/ArrayHydratorTest.php | 300 ++++-----
 .../ORM/Hydration/ObjectHydratorTest.php      | 582 +++++++++---------
 .../ORM/Hydration/ResultSetMappingTest.php    | 105 ++--
 .../ORM/Hydration/ScalarHydratorTest.php      |  28 +-
 .../Hydration/SimpleObjectHydratorTest.php    |  32 +-
 .../Hydration/SingleScalarHydratorTest.php    |  56 +-
 .../Tests/ORM/Id/AssignedGeneratorTest.php    |   4 +-
 .../Internal/HydrationCompleteHandlerTest.php |  18 +-
 .../Tests/ORM/LazyCriteriaCollectionTest.php  |  14 +-
 .../ORM/Mapping/AbstractMappingDriverTest.php | 318 +++++-----
 .../ORM/Mapping/AnnotationDriverTest.php      |   8 +-
 .../ORM/Mapping/AnsiQuoteStrategyTest.php     |  60 +-
 .../Mapping/BasicInheritanceMappingTest.php   |   6 +-
 .../ORM/Mapping/ClassMetadataBuilderTest.php  | 348 ++++++-----
 .../ORM/Mapping/ClassMetadataFactoryTest.php  |  55 +-
 .../Mapping/ClassMetadataLoadEventTest.php    |   4 +-
 .../Tests/ORM/Mapping/ClassMetadataTest.php   | 484 +++++++++------
 .../Tests/ORM/Mapping/NamingStrategyTest.php  | 191 +++---
 .../Tests/ORM/Mapping/QuoteStrategyTest.php   |  91 +--
 .../ReflectionEmbeddedPropertyTest.php        |  28 +-
 .../Mapping/Symfony/AbstractDriverTest.php    |  26 +-
 .../ORM/Mapping/Symfony/XmlDriverTest.php     |   2 +-
 .../ORM/Mapping/Symfony/YamlDriverTest.php    |   2 +-
 .../ORM/Mapping/XmlMappingDriverTest.php      |  20 +-
 .../ORM/Mapping/YamlMappingDriverTest.php     |   2 +-
 .../Doctrine.Tests.Models.CMS.CmsAddress.php  | 114 ++--
 .../php/Doctrine.Tests.Models.CMS.CmsUser.php | 220 ++++---
 .../php/Doctrine.Tests.Models.Cache.City.php  |  56 +-
 ...e.Tests.Models.Company.CompanyContract.php |  26 +-
 ...ests.Models.Company.CompanyFixContract.php |   6 +-
 ...sts.Models.Company.CompanyFlexContract.php |  12 +-
 ...odels.Company.CompanyFlexUltraContract.php |   8 +-
 ...ine.Tests.Models.Company.CompanyPerson.php |  45 +-
 ...1476.DDC1476EntityWithDefaultFieldType.php |  14 +-
 ....Models.DDC2825.ExplicitSchemaAndTable.php |  12 +-
 ...dels.DDC2825.SchemaAndTableInTableName.php |  12 +-
 ...rine.Tests.Models.DDC3579.DDC3579Admin.php |   5 +-
 ...trine.Tests.Models.DDC3579.DDC3579User.php |  18 +-
 ...ests.Models.DDC869.DDC869ChequePayment.php |   6 +-
 ....Models.DDC869.DDC869CreditCardPayment.php |   6 +-
 ...rine.Tests.Models.DDC869.DDC869Payment.php |  14 +-
 ...ctrine.Tests.Models.DDC889.DDC889Class.php |   8 +-
 ...e.Tests.Models.DDC889.DDC889SuperClass.php |   8 +-
 ...ctrine.Tests.Models.DDC964.DDC964Admin.php |  32 +-
 ...ctrine.Tests.Models.DDC964.DDC964Guest.php |  11 +-
 ...octrine.Tests.Models.DDC964.DDC964User.php |  48 +-
 .../php/Doctrine.Tests.ORM.Mapping.Animal.php |  20 +-
 .../Doctrine.Tests.ORM.Mapping.Comment.php    |  18 +-
 ...ctrine.Tests.ORM.Mapping.DDC1170Entity.php |  14 +-
 ...octrine.Tests.ORM.Mapping.DDC807Entity.php |  14 +-
 .../php/Doctrine.Tests.ORM.Mapping.PHPSLC.php |  12 +-
 .../php/Doctrine.Tests.ORM.Mapping.User.php   | 122 ++--
 .../Tests/ORM/Performance/DDC2602Test.php     |  16 +-
 .../Performance/HydrationPerformanceTest.php  | 128 ++--
 .../Performance/PersisterPerformanceTest.php  |   2 +-
 .../ORM/Performance/ProxyPerformanceTest.php  |  14 +-
 .../ORM/Performance/SecondLevelCacheTest.php  |   8 +-
 .../Performance/UnitOfWorkPerformanceTest.php |   2 +-
 ...tyPersisterCompositeTypeParametersTest.php |  14 +-
 ...sicEntityPersisterCompositeTypeSqlTest.php |   8 +-
 .../BasicEntityPersisterTypeValueSqlTest.php  |  20 +-
 .../JoinedSubclassPersisterTest.php           |   2 +-
 .../Tests/ORM/Proxy/ProxyFactoryTest.php      |  16 +-
 .../ORM/Query/CustomTreeWalkersJoinTest.php   |  14 +-
 .../Tests/ORM/Query/CustomTreeWalkersTest.php |  42 +-
 tests/Doctrine/Tests/ORM/Query/ExprTest.php   |  40 +-
 .../ORM/Query/LanguageRecognitionTest.php     |  66 +-
 tests/Doctrine/Tests/ORM/Query/LexerTest.php  |  70 +--
 .../ORM/Query/ParameterTypeInfererTest.php    |  24 +-
 .../Tests/ORM/Query/ParserResultTest.php      |   8 +-
 tests/Doctrine/Tests/ORM/Query/ParserTest.php |  33 +-
 .../ORM/Query/QueryExpressionVisitorTest.php  |  38 +-
 tests/Doctrine/Tests/ORM/Query/QueryTest.php  |  12 +-
 .../ORM/Query/SelectSqlGenerationTest.php     |  64 +-
 .../Tests/ORM/Query/SqlWalkerTest.php         |  12 +-
 tests/Doctrine/Tests/ORM/QueryBuilderTest.php |  34 +-
 .../DefaultRepositoryFactoryTest.php          |   8 +-
 .../ClearCacheCollectionRegionCommandTest.php |  30 +-
 .../ClearCacheEntityRegionCommandTest.php     |  30 +-
 .../ClearCacheQueryRegionCommandTest.php      |  30 +-
 .../ConvertDoctrine1SchemaCommandTest.php     |   2 +-
 .../GenerateRepositoriesCommandTest.php       |  22 +-
 .../Tools/Console/Command/InfoCommandTest.php |  12 +-
 .../Command/MappingDescribeCommandTest.php    |  24 +-
 .../Console/Command/RunDqlCommandTest.php     |  18 +-
 .../ORM/Tools/ConvertDoctrine1SchemaTest.php  |   2 +-
 .../Tests/ORM/Tools/EntityGeneratorTest.php   | 228 ++++---
 .../Tools/EntityRepositoryGeneratorTest.php   |  16 +-
 .../AbstractClassMetadataExporterTest.php     |  15 +-
 .../Export/XmlClassMetadataExporterTest.php   |  22 +-
 .../Doctrine.Tests.ORM.Tools.Export.User.php  | 112 ++--
 .../ORM/Tools/Pagination/CountWalkerTest.php  |  18 +-
 .../Pagination/LimitSubqueryWalkerTest.php    |  42 +-
 .../Tools/Pagination/WhereInWalkerTest.php    |  26 +-
 .../Tools/ResolveTargetEntityListenerTest.php |  14 +-
 .../Tests/ORM/Tools/SchemaToolTest.php        |  28 +-
 .../Tests/ORM/Tools/SchemaValidatorTest.php   |  67 +-
 tests/Doctrine/Tests/ORM/Tools/SetupTest.php  |  12 +-
 tests/Doctrine/Tests/ORM/UnitOfWorkTest.php   |  10 +-
 .../ORM/Utility/IdentifierFlattenerTest.php   |   6 +-
 .../Doctrine/Tests/OrmFunctionalTestCase.php  | 170 ++---
 tests/Doctrine/Tests/OrmTestCase.php          |  13 +-
 tests/Doctrine/Tests/TestUtil.php             |  12 +-
 371 files changed, 4924 insertions(+), 3869 deletions(-)

diff --git a/tests/Doctrine/Tests/EventListener/CacheMetadataListener.php b/tests/Doctrine/Tests/EventListener/CacheMetadataListener.php
index f27e38c47..e8cc6b23a 100644
--- a/tests/Doctrine/Tests/EventListener/CacheMetadataListener.php
+++ b/tests/Doctrine/Tests/EventListener/CacheMetadataListener.php
@@ -17,7 +17,7 @@ class CacheMetadataListener
      *
      * @var array
      */
-    protected $enabledItems = array();
+    protected $enabledItems = [];
 
     /**
      * @param \Doctrine\Common\Persistence\Event\LoadClassMetadataEventArgs $event
@@ -63,9 +63,9 @@ class CacheMetadataListener
             return; // Already handled in the past
         }
 
-        $cache = array(
+        $cache = [
             'usage' => ClassMetadata::CACHE_USAGE_NONSTRICT_READ_WRITE
-        );
+        ];
 
         if ($metadata->isVersioned) {
             return;
diff --git a/tests/Doctrine/Tests/Mocks/CacheRegionMock.php b/tests/Doctrine/Tests/Mocks/CacheRegionMock.php
index 519e72494..c99303907 100644
--- a/tests/Doctrine/Tests/Mocks/CacheRegionMock.php
+++ b/tests/Doctrine/Tests/Mocks/CacheRegionMock.php
@@ -13,8 +13,8 @@ use Doctrine\ORM\Cache\Region;
  */
 class CacheRegionMock implements Region
 {
-    public $calls   = array();
-    public $returns = array();
+    public $calls   = [];
+    public $returns = [];
     public $name;
 
     /**
@@ -50,7 +50,7 @@ class CacheRegionMock implements Region
      */
     public function getName()
     {
-        $this->calls[__FUNCTION__][] = array();
+        $this->calls[__FUNCTION__][] = [];
 
         return $this->name;
     }
@@ -60,7 +60,7 @@ class CacheRegionMock implements Region
      */
     public function contains(CacheKey $key)
     {
-        $this->calls[__FUNCTION__][] = array('key' => $key);
+        $this->calls[__FUNCTION__][] = ['key' => $key];
 
         return $this->getReturn(__FUNCTION__, false);
     }
@@ -70,7 +70,7 @@ class CacheRegionMock implements Region
      */
     public function evict(CacheKey $key)
     {
-        $this->calls[__FUNCTION__][] = array('key' => $key);
+        $this->calls[__FUNCTION__][] = ['key' => $key];
 
         return $this->getReturn(__FUNCTION__, true);
     }
@@ -80,7 +80,7 @@ class CacheRegionMock implements Region
      */
     public function evictAll()
     {
-        $this->calls[__FUNCTION__][] = array();
+        $this->calls[__FUNCTION__][] = [];
 
         return $this->getReturn(__FUNCTION__, true);
     }
@@ -90,7 +90,7 @@ class CacheRegionMock implements Region
      */
     public function get(CacheKey $key)
     {
-        $this->calls[__FUNCTION__][] = array('key' => $key);
+        $this->calls[__FUNCTION__][] = ['key' => $key];
 
         return $this->getReturn(__FUNCTION__, null);
     }
@@ -100,7 +100,7 @@ class CacheRegionMock implements Region
      */
     public function getMultiple(CollectionCacheEntry $collection)
     {
-        $this->calls[__FUNCTION__][] = array('collection' => $collection);
+        $this->calls[__FUNCTION__][] = ['collection' => $collection];
 
         return $this->getReturn(__FUNCTION__, null);
     }
@@ -110,7 +110,7 @@ class CacheRegionMock implements Region
      */
     public function put(CacheKey $key, CacheEntry $entry, Lock $lock = null)
     {
-        $this->calls[__FUNCTION__][] = array('key' => $key, 'entry' => $entry);
+        $this->calls[__FUNCTION__][] = ['key' => $key, 'entry' => $entry];
 
         return $this->getReturn(__FUNCTION__, true);
     }
@@ -120,7 +120,7 @@ class CacheRegionMock implements Region
      */
     public function clear()
     {
-        $this->calls   = array();
-        $this->returns = array();
+        $this->calls   = [];
+        $this->returns = [];
     }
 }
diff --git a/tests/Doctrine/Tests/Mocks/ConcurrentRegionMock.php b/tests/Doctrine/Tests/Mocks/ConcurrentRegionMock.php
index 49ed32985..0f939999d 100644
--- a/tests/Doctrine/Tests/Mocks/ConcurrentRegionMock.php
+++ b/tests/Doctrine/Tests/Mocks/ConcurrentRegionMock.php
@@ -17,12 +17,12 @@ use Doctrine\ORM\Cache\Lock;
  */
 class ConcurrentRegionMock implements ConcurrentRegion
 {
-    public $calls       = array();
-    public $exceptions  = array();
-    public $locks       = array();
+    public $calls       = [];
+    public $exceptions  = [];
+    public $locks       = [];
 
     /**
-     * @var \Doctrine\ORM\Cache\Region 
+     * @var \Doctrine\ORM\Cache\Region
      */
     private $region;
 
@@ -80,7 +80,7 @@ class ConcurrentRegionMock implements ConcurrentRegion
      */
     public function contains(CacheKey $key)
     {
-        $this->calls[__FUNCTION__][] = array('key' => $key);
+        $this->calls[__FUNCTION__][] = ['key' => $key];
 
         if (isset($this->locks[$key->hash])) {
             return false;
@@ -96,7 +96,7 @@ class ConcurrentRegionMock implements ConcurrentRegion
      */
     public function evict(CacheKey $key)
     {
-        $this->calls[__FUNCTION__][] = array('key' => $key);
+        $this->calls[__FUNCTION__][] = ['key' => $key];
 
         $this->throwException(__FUNCTION__);
 
@@ -108,7 +108,7 @@ class ConcurrentRegionMock implements ConcurrentRegion
      */
     public function evictAll()
     {
-        $this->calls[__FUNCTION__][] = array();
+        $this->calls[__FUNCTION__][] = [];
 
         $this->throwException(__FUNCTION__);
 
@@ -120,7 +120,7 @@ class ConcurrentRegionMock implements ConcurrentRegion
      */
     public function get(CacheKey $key)
     {
-        $this->calls[__FUNCTION__][] = array('key' => $key);
+        $this->calls[__FUNCTION__][] = ['key' => $key];
 
         $this->throwException(__FUNCTION__);
 
@@ -136,7 +136,7 @@ class ConcurrentRegionMock implements ConcurrentRegion
      */
     public function getMultiple(CollectionCacheEntry $collection)
     {
-        $this->calls[__FUNCTION__][] = array('collection' => $collection);
+        $this->calls[__FUNCTION__][] = ['collection' => $collection];
 
         $this->throwException(__FUNCTION__);
 
@@ -148,7 +148,7 @@ class ConcurrentRegionMock implements ConcurrentRegion
      */
     public function getName()
     {
-        $this->calls[__FUNCTION__][] = array();
+        $this->calls[__FUNCTION__][] = [];
 
         $this->throwException(__FUNCTION__);
 
@@ -160,7 +160,7 @@ class ConcurrentRegionMock implements ConcurrentRegion
      */
     public function put(CacheKey $key, CacheEntry $entry, Lock $lock = null)
     {
-        $this->calls[__FUNCTION__][] = array('key' => $key, 'entry' => $entry);
+        $this->calls[__FUNCTION__][] = ['key' => $key, 'entry' => $entry];
 
         $this->throwException(__FUNCTION__);
 
@@ -181,7 +181,7 @@ class ConcurrentRegionMock implements ConcurrentRegion
      */
     public function lock(CacheKey $key)
     {
-        $this->calls[__FUNCTION__][] = array('key' => $key);
+        $this->calls[__FUNCTION__][] = ['key' => $key];
 
         $this->throwException(__FUNCTION__);
 
@@ -197,7 +197,7 @@ class ConcurrentRegionMock implements ConcurrentRegion
      */
     public function unlock(CacheKey $key, Lock $lock)
     {
-        $this->calls[__FUNCTION__][] = array('key' => $key, 'lock' => $lock);
+        $this->calls[__FUNCTION__][] = ['key' => $key, 'lock' => $lock];
 
         $this->throwException(__FUNCTION__);
 
diff --git a/tests/Doctrine/Tests/Mocks/ConnectionMock.php b/tests/Doctrine/Tests/Mocks/ConnectionMock.php
index 49ca3e4ea..5a28ffa5a 100644
--- a/tests/Doctrine/Tests/Mocks/ConnectionMock.php
+++ b/tests/Doctrine/Tests/Mocks/ConnectionMock.php
@@ -26,12 +26,12 @@ class ConnectionMock extends Connection
     /**
      * @var array
      */
-    private $_inserts = array();
+    private $_inserts = [];
 
     /**
      * @var array
      */
-    private $_executeUpdates = array();
+    private $_executeUpdates = [];
 
     /**
      * @param array                              $params
@@ -60,7 +60,7 @@ class ConnectionMock extends Connection
     /**
      * {@inheritdoc}
      */
-    public function insert($tableName, array $data, array $types = array())
+    public function insert($tableName, array $data, array $types = [])
     {
         $this->_inserts[$tableName][] = $data;
     }
@@ -68,9 +68,9 @@ class ConnectionMock extends Connection
     /**
      * {@inheritdoc}
      */
-    public function executeUpdate($query, array $params = array(), array $types = array())
+    public function executeUpdate($query, array $params = [], array $types = [])
     {
-        $this->_executeUpdates[] = array('query' => $query, 'params' => $params, 'types' => $types);
+        $this->_executeUpdates[] = ['query' => $query, 'params' => $params, 'types' => $types];
     }
 
     /**
@@ -84,7 +84,7 @@ class ConnectionMock extends Connection
     /**
      * {@inheritdoc}
      */
-    public function fetchColumn($statement, array $params = array(), $colnum = 0, array $types = array())
+    public function fetchColumn($statement, array $params = [], $colnum = 0, array $types = [])
     {
         return $this->_fetchOneResult;
     }
@@ -153,7 +153,7 @@ class ConnectionMock extends Connection
      */
     public function reset()
     {
-        $this->_inserts = array();
+        $this->_inserts = [];
         $this->_lastInsertId = 0;
     }
 }
diff --git a/tests/Doctrine/Tests/Mocks/DriverMock.php b/tests/Doctrine/Tests/Mocks/DriverMock.php
index 15a37c17d..c805f0bf9 100644
--- a/tests/Doctrine/Tests/Mocks/DriverMock.php
+++ b/tests/Doctrine/Tests/Mocks/DriverMock.php
@@ -25,7 +25,7 @@ class DriverMock implements Driver
     /**
      * {@inheritdoc}
      */
-    public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
+    public function connect(array $params, $username = null, $password = null, array $driverOptions = [])
     {
         return new DriverConnectionMock();
     }
diff --git a/tests/Doctrine/Tests/Mocks/EntityManagerMock.php b/tests/Doctrine/Tests/Mocks/EntityManagerMock.php
index 6f98e3c50..f7af70227 100644
--- a/tests/Doctrine/Tests/Mocks/EntityManagerMock.php
+++ b/tests/Doctrine/Tests/Mocks/EntityManagerMock.php
@@ -72,7 +72,7 @@ class EntityManagerMock extends EntityManager
             $config = new Configuration();
             $config->setProxyDir(__DIR__ . '/../Proxies');
             $config->setProxyNamespace('Doctrine\Tests\Proxies');
-            $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(array(), true));
+            $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver([], true));
         }
         if (null === $eventManager) {
             $eventManager = new EventManager();
diff --git a/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php b/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php
index 6130f58f3..63be3397e 100644
--- a/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php
+++ b/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php
@@ -14,17 +14,17 @@ class EntityPersisterMock extends BasicEntityPersister
     /**
      * @var array
      */
-    private $inserts = array();
+    private $inserts = [];
 
     /**
      * @var array
      */
-    private $updates = array();
+    private $updates = [];
 
     /**
      * @var array
      */
-    private $deletes = array();
+    private $deletes = [];
 
     /**
      * @var int
@@ -39,7 +39,7 @@ class EntityPersisterMock extends BasicEntityPersister
     /**
      * @var array
      */
-    private $postInsertIds = array();
+    private $postInsertIds = [];
 
     /**
      * @var bool
@@ -57,10 +57,10 @@ class EntityPersisterMock extends BasicEntityPersister
         if ( ! is_null($this->mockIdGeneratorType) && $this->mockIdGeneratorType == ClassMetadata::GENERATOR_TYPE_IDENTITY
                 || $this->class->isIdGeneratorIdentity()) {
             $id = $this->identityColumnValueCounter++;
-            $this->postInsertIds[] = array(
+            $this->postInsertIds[] = [
                 'generatedId' => $id,
                 'entity' => $entity,
-            );
+            ];
             return $id;
         }
         return null;
@@ -139,9 +139,9 @@ class EntityPersisterMock extends BasicEntityPersister
     {
         $this->existsCalled = false;
         $this->identityColumnValueCounter = 0;
-        $this->inserts = array();
-        $this->updates = array();
-        $this->deletes = array();
+        $this->inserts = [];
+        $this->updates = [];
+        $this->deletes = [];
     }
 
     /**
diff --git a/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php b/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php
index 7afec2c60..ca0df22fe 100644
--- a/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php
+++ b/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php
@@ -108,7 +108,7 @@ class HydratorMockStatement implements \IteratorAggregate, Statement
     /**
      * {@inheritdoc}
      */
-    public function execute($params = array())
+    public function execute($params = [])
     {
     }
 
diff --git a/tests/Doctrine/Tests/Mocks/MetadataDriverMock.php b/tests/Doctrine/Tests/Mocks/MetadataDriverMock.php
index b691ec02c..f14c256b1 100644
--- a/tests/Doctrine/Tests/Mocks/MetadataDriverMock.php
+++ b/tests/Doctrine/Tests/Mocks/MetadataDriverMock.php
@@ -30,6 +30,6 @@ class MetadataDriverMock implements MappingDriver
      */
     public function getAllClassNames()
     {
-        return array();
+        return [];
     }
 }
diff --git a/tests/Doctrine/Tests/Mocks/TaskMock.php b/tests/Doctrine/Tests/Mocks/TaskMock.php
index f097abc03..f6ce095ad 100644
--- a/tests/Doctrine/Tests/Mocks/TaskMock.php
+++ b/tests/Doctrine/Tests/Mocks/TaskMock.php
@@ -17,7 +17,7 @@ class TaskMock extends \Doctrine\Common\Cli\Tasks\AbstractTask
      *
      * @var array (TaskMock)
      */
-    static public $instances = array();
+    static public $instances = [];
 
     /**
      * @var int
diff --git a/tests/Doctrine/Tests/Mocks/TimestampRegionMock.php b/tests/Doctrine/Tests/Mocks/TimestampRegionMock.php
index b55c7c5e3..3f088a4e4 100644
--- a/tests/Doctrine/Tests/Mocks/TimestampRegionMock.php
+++ b/tests/Doctrine/Tests/Mocks/TimestampRegionMock.php
@@ -14,6 +14,6 @@ class TimestampRegionMock extends CacheRegionMock implements TimestampRegion
 {
     public function update(CacheKey $key)
     {
-        $this->calls[__FUNCTION__][] = array('key' => $key);
+        $this->calls[__FUNCTION__][] = ['key' => $key];
     }
 }
diff --git a/tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php b/tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php
index 3d7361e7f..f11f71523 100644
--- a/tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php
+++ b/tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php
@@ -12,7 +12,7 @@ class UnitOfWorkMock extends UnitOfWork
     /**
      * @var array
      */
-    private $_mockDataChangeSets = array();
+    private $_mockDataChangeSets = [];
 
     /**
      * @var array|null
diff --git a/tests/Doctrine/Tests/Models/CMS/CmsAddress.php b/tests/Doctrine/Tests/Models/CMS/CmsAddress.php
index aaf4956d3..c89686643 100644
--- a/tests/Doctrine/Tests/Models/CMS/CmsAddress.php
+++ b/tests/Doctrine/Tests/Models/CMS/CmsAddress.php
@@ -124,91 +124,115 @@ class CmsAddress
 
     public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata)
     {
-        $metadata->setPrimaryTable(array(
+        $metadata->setPrimaryTable(
+            [
            'name' => 'company_person',
-        ));
+            ]
+        );
 
-        $metadata->mapField(array (
+        $metadata->mapField(
+            [
             'id'        => true,
             'fieldName' => 'id',
             'type'      => 'integer',
-        ));
+            ]
+        );
 
-        $metadata->mapField(array (
+        $metadata->mapField(
+            [
             'fieldName' => 'zip',
             'length'    => 50,
-        ));
+            ]
+        );
 
-        $metadata->mapField(array (
+        $metadata->mapField(
+            [
             'fieldName' => 'city',
             'length'    => 50,
-        ));
+            ]
+        );
 
-        $metadata->mapOneToOne(array(
+        $metadata->mapOneToOne(
+            [
             'fieldName'     => 'user',
             'targetEntity'  => 'CmsUser',
-            'joinColumns'   => array(array('referencedColumnName' => 'id'))
-        ));
+            'joinColumns'   => [['referencedColumnName' => 'id']]
+            ]
+        );
 
-        $metadata->addNamedNativeQuery(array (
+        $metadata->addNamedNativeQuery(
+            [
             'name'              => 'find-all',
             'query'             => 'SELECT id, country, city FROM cms_addresses',
             'resultSetMapping'  => 'mapping-find-all',
-        ));
+            ]
+        );
 
-        $metadata->addNamedNativeQuery(array (
+        $metadata->addNamedNativeQuery(
+            [
             'name'              => 'find-by-id',
             'query'             => 'SELECT * FROM cms_addresses WHERE id = ?',
             'resultClass'       => 'Doctrine\\Tests\\Models\\CMS\\CmsAddress',
-        ));
+            ]
+        );
 
-        $metadata->addNamedNativeQuery(array (
+        $metadata->addNamedNativeQuery(
+            [
             'name'              => 'count',
             'query'             => 'SELECT COUNT(*) AS count FROM cms_addresses',
             'resultSetMapping'  => 'mapping-count',
-        ));
+            ]
+        );
 
-        $metadata->addSqlResultSetMapping(array (
+        $metadata->addSqlResultSetMapping(
+            [
             'name'      => 'mapping-find-all',
-            'columns'   => array(),
-            'entities'  => array ( array (
-                'fields' => array (
-                  array (
+            'columns'   => [],
+            'entities'  => [
+                [
+                'fields' => [
+                  [
                     'name'      => 'id',
                     'column'    => 'id',
-                  ),
-                  array (
+                  ],
+                  [
                     'name'      => 'city',
                     'column'    => 'city',
-                  ),
-                  array (
+                  ],
+                  [
                     'name'      => 'country',
                     'column'    => 'country',
-                  ),
-                ),
+                  ],
+                ],
                 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsAddress',
-              ),
-            ),
-        ));
+                ],
+            ],
+            ]
+        );
 
-        $metadata->addSqlResultSetMapping(array (
+        $metadata->addSqlResultSetMapping(
+            [
             'name'      => 'mapping-without-fields',
-            'columns'   => array(),
-            'entities'  => array(array (
+            'columns'   => [],
+            'entities'  => [
+                [
                 'entityClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsAddress',
-                'fields' => array()
-              )
-            )
-        ));
+                'fields' => []
+                ]
+            ]
+            ]
+        );
 
-        $metadata->addSqlResultSetMapping(array (
+        $metadata->addSqlResultSetMapping(
+            [
             'name' => 'mapping-count',
-            'columns' =>array (
-                array (
+            'columns' => [
+                [
                     'name' => 'count',
-                ),
-            )
-        ));
+                ],
+            ]
+            ]
+        );
 
         $metadata->addEntityListener(\Doctrine\ORM\Events::postPersist, 'CmsAddressListener', 'postPersist');
         $metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CmsAddressListener', 'prePersist');
@@ -222,4 +246,4 @@ class CmsAddress
         $metadata->addEntityListener(\Doctrine\ORM\Events::preFlush, 'CmsAddressListener', 'preFlush');
         $metadata->addEntityListener(\Doctrine\ORM\Events::postLoad, 'CmsAddressListener', 'postLoad');
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/Models/CMS/CmsUser.php b/tests/Doctrine/Tests/Models/CMS/CmsUser.php
index 10042efb5..de23216f7 100644
--- a/tests/Doctrine/Tests/Models/CMS/CmsUser.php
+++ b/tests/Doctrine/Tests/Models/CMS/CmsUser.php
@@ -271,188 +271,214 @@ class CmsUser
 
     public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata)
     {
-        $metadata->setPrimaryTable(array(
+        $metadata->setPrimaryTable(
+            [
            'name' => 'cms_users',
-        ));
+            ]
+        );
 
-        $metadata->addNamedNativeQuery(array (
+        $metadata->addNamedNativeQuery(
+            [
             'name'              => 'fetchIdAndUsernameWithResultClass',
             'query'             => 'SELECT id, username FROM cms_users WHERE username = ?',
             'resultClass'       => 'Doctrine\\Tests\\Models\\CMS\\CmsUser',
-        ));
+            ]
+        );
 
-        $metadata->addNamedNativeQuery(array (
+        $metadata->addNamedNativeQuery(
+            [
             'name'              => 'fetchAllColumns',
             'query'             => 'SELECT * FROM cms_users WHERE username = ?',
             'resultClass'       => 'Doctrine\\Tests\\Models\\CMS\\CmsUser',
-        ));
+            ]
+        );
 
-        $metadata->addNamedNativeQuery(array (
+        $metadata->addNamedNativeQuery(
+            [
             'name'              => 'fetchJoinedAddress',
             'query'             => 'SELECT u.id, u.name, u.status, a.id AS a_id, a.country, a.zip, a.city FROM cms_users u INNER JOIN cms_addresses a ON u.id = a.user_id WHERE u.username = ?',
             'resultSetMapping'  => 'mappingJoinedAddress',
-        ));
+            ]
+        );
 
-        $metadata->addNamedNativeQuery(array (
+        $metadata->addNamedNativeQuery(
+            [
             'name'              => 'fetchJoinedPhonenumber',
             'query'             => 'SELECT id, name, status, phonenumber AS number FROM cms_users INNER JOIN cms_phonenumbers ON id = user_id WHERE username = ?',
             'resultSetMapping'  => 'mappingJoinedPhonenumber',
-        ));
+            ]
+        );
 
-        $metadata->addNamedNativeQuery(array (
+        $metadata->addNamedNativeQuery(
+            [
             'name'              => 'fetchUserPhonenumberCount',
             'query'             => 'SELECT id, name, status, COUNT(phonenumber) AS numphones FROM cms_users INNER JOIN cms_phonenumbers ON id = user_id WHERE username IN (?) GROUP BY id, name, status, username ORDER BY username',
             'resultSetMapping'  => 'mappingUserPhonenumberCount',
-        ));
+            ]
+        );
 
-        $metadata->addNamedNativeQuery(array (
+        $metadata->addNamedNativeQuery(
+            [
             "name"              => "fetchMultipleJoinsEntityResults",
             "resultSetMapping"  => "mappingMultipleJoinsEntityResults",
             "query"             => "SELECT u.id AS u_id, u.name AS u_name, u.status AS u_status, a.id AS a_id, a.zip AS a_zip, a.country AS a_country, COUNT(p.phonenumber) AS numphones FROM cms_users u INNER JOIN cms_addresses a ON u.id = a.user_id INNER JOIN cms_phonenumbers p ON u.id = p.user_id GROUP BY u.id, u.name, u.status, u.username, a.id, a.zip, a.country ORDER BY u.username"
-        ));
+            ]
+        );
 
-        $metadata->addSqlResultSetMapping(array (
+        $metadata->addSqlResultSetMapping(
+            [
             'name'      => 'mappingJoinedAddress',
-            'columns'   => array(),
-            'entities'  => array(array (
-                'fields'=> array (
-                  array (
+            'columns'   => [],
+            'entities'  => [
+                [
+                'fields'=> [
+                  [
                     'name'      => 'id',
                     'column'    => 'id',
-                  ),
-                  array (
+                  ],
+                  [
                     'name'      => 'name',
                     'column'    => 'name',
-                  ),
-                  array (
+                  ],
+                  [
                     'name'      => 'status',
                     'column'    => 'status',
-                  ),
-                  array (
+                  ],
+                  [
                     'name'      => 'address.zip',
                     'column'    => 'zip',
-                  ),
-                  array (
+                  ],
+                  [
                     'name'      => 'address.city',
                     'column'    => 'city',
-                  ),
-                  array (
+                  ],
+                  [
                     'name'      => 'address.country',
                     'column'    => 'country',
-                  ),
-                  array (
+                  ],
+                  [
                     'name'      => 'address.id',
                     'column'    => 'a_id',
-                  ),
-                ),
+                  ],
+                ],
                 'entityClass'           => 'Doctrine\Tests\Models\CMS\CmsUser',
                 'discriminatorColumn'   => null
-              ),
-            ),
-        ));
+                ],
+            ],
+            ]
+        );
 
-        $metadata->addSqlResultSetMapping(array (
+        $metadata->addSqlResultSetMapping(
+            [
             'name'      => 'mappingJoinedPhonenumber',
-            'columns'   => array(),
-            'entities'  => array(array(
-                'fields'=> array (
-                  array (
+            'columns'   => [],
+            'entities'  => [
+                [
+                'fields'=> [
+                  [
                     'name'      => 'id',
                     'column'    => 'id',
-                  ),
-                  array (
+                  ],
+                  [
                     'name'      => 'name',
                     'column'    => 'name',
-                  ),
-                  array (
+                  ],
+                  [
                     'name'      => 'status',
                     'column'    => 'status',
-                  ),
-                  array (
+                  ],
+                  [
                     'name'      => 'phonenumbers.phonenumber',
                     'column'    => 'number',
-                  ),
-                ),
+                  ],
+                ],
                 'entityClass'   => 'Doctrine\\Tests\\Models\\CMS\\CmsUser',
                 'discriminatorColumn'   => null
-              ),
-            ),
-        ));
+                ],
+            ],
+            ]
+        );
 
-        $metadata->addSqlResultSetMapping(array (
+        $metadata->addSqlResultSetMapping(
+            [
             'name'      => 'mappingUserPhonenumberCount',
-            'columns'   => array(),
-            'entities'  => array (
-              array(
-                'fields' => array (
-                  array (
+            'columns'   => [],
+            'entities'  => [
+              [
+                'fields' => [
+                  [
                     'name'      => 'id',
                     'column'    => 'id',
-                  ),
-                  array (
+                  ],
+                  [
                     'name'      => 'name',
                     'column'    => 'name',
-                  ),
-                  array (
+                  ],
+                  [
                     'name'      => 'status',
                     'column'    => 'status',
-                  )
-                ),
+                  ]
+                ],
                 'entityClass'   => 'Doctrine\Tests\Models\CMS\CmsUser',
                 'discriminatorColumn'   => null
-              )
-            ),
-            'columns' => array (
-                  array (
+              ]
+            ],
+            'columns' => [
+                  [
                     'name' => 'numphones',
-                  )
-            )
-        ));
+                  ]
+            ]
+            ]
+        );
 
-        $metadata->addSqlResultSetMapping(array(
+        $metadata->addSqlResultSetMapping(
+            [
             'name'      => 'mappingMultipleJoinsEntityResults',
-            'entities'  => array(array(
-                    'fields' => array(
-                        array(
+            'entities'  => [
+                [
+                    'fields' => [
+                        [
                             'name'      => 'id',
                             'column'    => 'u_id',
-                        ),
-                        array(
+                        ],
+                        [
                             'name'      => 'name',
                             'column'    => 'u_name',
-                        ),
-                        array(
+                        ],
+                        [
                             'name'      => 'status',
                             'column'    => 'u_status',
-                        )
-                    ),
+                        ]
+                    ],
                     'entityClass'           => 'Doctrine\Tests\Models\CMS\CmsUser',
                     'discriminatorColumn'   => null,
-                ),
-                array(
-                    'fields' => array(
-                        array(
+                ],
+                [
+                    'fields' => [
+                        [
                             'name'      => 'id',
                             'column'    => 'a_id',
-                        ),
-                        array(
+                        ],
+                        [
                             'name'      => 'zip',
                             'column'    => 'a_zip',
-                        ),
-                        array(
+                        ],
+                        [
                             'name'      => 'country',
                             'column'    => 'a_country',
-                        ),
-                    ),
+                        ],
+                    ],
                     'entityClass'           => 'Doctrine\Tests\Models\CMS\CmsAddress',
                     'discriminatorColumn'   => null,
-                ),
-            ),
-            'columns' => array(array(
+                ],
+            ],
+            'columns' => [
+                [
                     'name' => 'numphones',
-                )
-            )
-        ));
+                ]
+            ]
+            ]
+        );
 
     }
 }
diff --git a/tests/Doctrine/Tests/Models/Company/CompanyContract.php b/tests/Doctrine/Tests/Models/Company/CompanyContract.php
index 139098274..15e691ba0 100644
--- a/tests/Doctrine/Tests/Models/Company/CompanyContract.php
+++ b/tests/Doctrine/Tests/Models/Company/CompanyContract.php
@@ -134,28 +134,36 @@ abstract class CompanyContract
     {
         $metadata->setInheritanceType(\Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_JOINED);
         $metadata->setTableName( 'company_contracts');
-        $metadata->setDiscriminatorColumn(array(
+        $metadata->setDiscriminatorColumn(
+            [
             'name' => 'discr',
             'type' => 'string',
-        ));
+            ]
+        );
 
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
             'id'        => true,
             'name'      => 'id',
             'fieldName' => 'id',
-        ));
+            ]
+        );
 
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
             'type'      => 'boolean',
             'name'      => 'completed',
             'fieldName' => 'completed',
-        ));
+            ]
+        );
 
-        $metadata->setDiscriminatorMap(array(
+        $metadata->setDiscriminatorMap(
+            [
             "fix"       => "CompanyFixContract",
             "flexible"  => "CompanyFlexContract",
             "flexultra" => "CompanyFlexUltraContract"
-        ));
+            ]
+        );
 
         $metadata->addEntityListener(\Doctrine\ORM\Events::postPersist, 'CompanyContractListener', 'postPersistHandler');
         $metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CompanyContractListener', 'prePersistHandler');
diff --git a/tests/Doctrine/Tests/Models/Company/CompanyFixContract.php b/tests/Doctrine/Tests/Models/Company/CompanyFixContract.php
index 87f3ce952..8fe94e258 100644
--- a/tests/Doctrine/Tests/Models/Company/CompanyFixContract.php
+++ b/tests/Doctrine/Tests/Models/Company/CompanyFixContract.php
@@ -30,10 +30,12 @@ class CompanyFixContract extends CompanyContract
 
     static public function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata)
     {
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
             'type'      => 'integer',
             'name'      => 'fixPrice',
             'fieldName' => 'fixPrice',
-        ));
+            ]
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/Models/Company/CompanyFlexContract.php b/tests/Doctrine/Tests/Models/Company/CompanyFlexContract.php
index 86e6b330c..978e8d5e6 100644
--- a/tests/Doctrine/Tests/Models/Company/CompanyFlexContract.php
+++ b/tests/Doctrine/Tests/Models/Company/CompanyFlexContract.php
@@ -110,16 +110,20 @@ class CompanyFlexContract extends CompanyContract
 
     static public function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata)
     {
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
             'type'      => 'integer',
             'name'      => 'hoursWorked',
             'fieldName' => 'hoursWorked',
-        ));
+            ]
+        );
 
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
             'type'      => 'integer',
             'name'      => 'pricePerHour',
             'fieldName' => 'pricePerHour',
-        ));
+            ]
+        );
     }
 }
diff --git a/tests/Doctrine/Tests/Models/Company/CompanyFlexUltraContract.php b/tests/Doctrine/Tests/Models/Company/CompanyFlexUltraContract.php
index 85126bd0e..47313d032 100644
--- a/tests/Doctrine/Tests/Models/Company/CompanyFlexUltraContract.php
+++ b/tests/Doctrine/Tests/Models/Company/CompanyFlexUltraContract.php
@@ -31,11 +31,13 @@ class CompanyFlexUltraContract extends CompanyFlexContract
 
     static public function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata)
     {
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
             'type'      => 'integer',
             'name'      => 'maxPrice',
             'fieldName' => 'maxPrice',
-        ));
+            ]
+        );
         $metadata->addEntityListener(\Doctrine\ORM\Events::postPersist, 'CompanyContractListener', 'postPersistHandler');
         $metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CompanyContractListener', 'prePersistHandler');
 
@@ -47,8 +49,8 @@ class CompanyFlexUltraContract extends CompanyFlexContract
 
         $metadata->addEntityListener(\Doctrine\ORM\Events::preFlush, 'CompanyContractListener', 'preFlushHandler');
         $metadata->addEntityListener(\Doctrine\ORM\Events::postLoad, 'CompanyContractListener', 'postLoadHandler');
-        
+
         $metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CompanyFlexUltraContractListener', 'prePersistHandler1');
         $metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CompanyFlexUltraContractListener', 'prePersistHandler2');
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/Models/Company/CompanyPerson.php b/tests/Doctrine/Tests/Models/Company/CompanyPerson.php
index 4636fa4e3..529c0e109 100644
--- a/tests/Doctrine/Tests/Models/Company/CompanyPerson.php
+++ b/tests/Doctrine/Tests/Models/Company/CompanyPerson.php
@@ -120,41 +120,50 @@ class CompanyPerson
     public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata)
     {
 
-        $metadata->setPrimaryTable(array(
+        $metadata->setPrimaryTable(
+            [
            'name' => 'company_person',
-        ));
+            ]
+        );
 
-        $metadata->addNamedNativeQuery(array (
+        $metadata->addNamedNativeQuery(
+            [
             'name'              => 'fetchAllWithResultClass',
             'query'             => 'SELECT id, name, discr FROM company_persons ORDER BY name',
             'resultClass'       => 'Doctrine\\Tests\\Models\\Company\\CompanyPerson',
-        ));
+            ]
+        );
 
-        $metadata->addNamedNativeQuery(array (
+        $metadata->addNamedNativeQuery(
+            [
             'name'              => 'fetchAllWithSqlResultSetMapping',
             'query'             => 'SELECT id, name, discr AS discriminator FROM company_persons ORDER BY name',
             'resultSetMapping'  => 'mappingFetchAll',
-        ));
+            ]
+        );
 
-        $metadata->addSqlResultSetMapping(array (
+        $metadata->addSqlResultSetMapping(
+            [
             'name'      => 'mappingFetchAll',
-            'columns'   => array(),
-            'entities'  => array ( array (
-                'fields' => array (
-                  array (
+            'columns'   => [],
+            'entities'  => [
+                [
+                'fields' => [
+                  [
                     'name'      => 'id',
                     'column'    => 'id',
-                  ),
-                  array (
+                  ],
+                  [
                     'name'      => 'name',
                     'column'    => 'name',
-                  ),
-                ),
+                  ],
+                ],
                 'entityClass' => 'Doctrine\Tests\Models\Company\CompanyPerson',
                 'discriminatorColumn' => 'discriminator',
-              ),
-            ),
-        ));
+                ],
+            ],
+            ]
+        );
     }
 }
 
diff --git a/tests/Doctrine/Tests/Models/DDC1476/DDC1476EntityWithDefaultFieldType.php b/tests/Doctrine/Tests/Models/DDC1476/DDC1476EntityWithDefaultFieldType.php
index 4f94dad13..b543b0fe5 100644
--- a/tests/Doctrine/Tests/Models/DDC1476/DDC1476EntityWithDefaultFieldType.php
+++ b/tests/Doctrine/Tests/Models/DDC1476/DDC1476EntityWithDefaultFieldType.php
@@ -44,13 +44,17 @@ class DDC1476EntityWithDefaultFieldType
 
     public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata)
     {
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
            'id'         => true,
            'fieldName'  => 'id',
-        ));
-        $metadata->mapField(array(
+            ]
+        );
+        $metadata->mapField(
+            [
            'fieldName'  => 'name',
-        ));
+            ]
+        );
 
         $metadata->setIdGeneratorType(\Doctrine\ORM\Mapping\ClassMetadataInfo::GENERATOR_TYPE_NONE);
     }
diff --git a/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php b/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php
index 5229ee280..e284532c0 100644
--- a/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php
+++ b/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php
@@ -24,5 +24,5 @@ class DDC3346Author
     /**
      * @OneToMany(targetEntity="DDC3346Article", mappedBy="user", fetch="EAGER", cascade={"detach"})
      */
-    public $articles = array();
+    public $articles = [];
 }
diff --git a/tests/Doctrine/Tests/Models/DDC3579/DDC3579Admin.php b/tests/Doctrine/Tests/Models/DDC3579/DDC3579Admin.php
index effedc3c4..85383994c 100644
--- a/tests/Doctrine/Tests/Models/DDC3579/DDC3579Admin.php
+++ b/tests/Doctrine/Tests/Models/DDC3579/DDC3579Admin.php
@@ -15,8 +15,9 @@ class DDC3579Admin extends DDC3579User
 {
     public static function loadMetadata($metadata)
     {
-        $metadata->setAssociationOverride('groups', array(
+        $metadata->setAssociationOverride('groups', [
             'inversedBy' => 'admins'
-        ));
+        ]
+        );
     }
 }
diff --git a/tests/Doctrine/Tests/Models/DDC3579/DDC3579User.php b/tests/Doctrine/Tests/Models/DDC3579/DDC3579User.php
index 7a7ea5de6..8b6193cdc 100644
--- a/tests/Doctrine/Tests/Models/DDC3579/DDC3579User.php
+++ b/tests/Doctrine/Tests/Models/DDC3579/DDC3579User.php
@@ -81,27 +81,33 @@ class DDC3579User
 
     public static function loadMetadata($metadata)
     {
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
            'id'         => true,
            'fieldName'  => 'id',
            'type'       => 'integer',
            'columnName' => 'user_id',
            'length'     => 150,
-        ));
+            ]
+        );
 
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
             'fieldName' => 'name',
             'type'      => 'string',
             'columnName'=> 'user_name',
             'nullable'  => true,
             'unique'    => false,
             'length'    => 250,
-        ));
+            ]
+        );
 
-        $metadata->mapManyToMany(array(
+        $metadata->mapManyToMany(
+            [
            'fieldName'      => 'groups',
            'targetEntity'   => 'DDC3579Group'
-        ));
+            ]
+        );
 
         $metadata->setIdGeneratorType(\Doctrine\ORM\Mapping\ClassMetadataInfo::GENERATOR_TYPE_AUTO);
     }
diff --git a/tests/Doctrine/Tests/Models/DDC869/DDC869ChequePayment.php b/tests/Doctrine/Tests/Models/DDC869/DDC869ChequePayment.php
index 00e5da017..4690e068a 100644
--- a/tests/Doctrine/Tests/Models/DDC869/DDC869ChequePayment.php
+++ b/tests/Doctrine/Tests/Models/DDC869/DDC869ChequePayment.php
@@ -13,10 +13,12 @@ class DDC869ChequePayment extends DDC869Payment
 
     public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata)
     {
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
            'fieldName'  => 'serialNumber',
            'type'       => 'string',
-        ));
+            ]
+        );
     }
 
 }
diff --git a/tests/Doctrine/Tests/Models/DDC869/DDC869CreditCardPayment.php b/tests/Doctrine/Tests/Models/DDC869/DDC869CreditCardPayment.php
index 4c1f8c306..6f314e318 100644
--- a/tests/Doctrine/Tests/Models/DDC869/DDC869CreditCardPayment.php
+++ b/tests/Doctrine/Tests/Models/DDC869/DDC869CreditCardPayment.php
@@ -13,10 +13,12 @@ class DDC869CreditCardPayment extends DDC869Payment
 
     public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata)
     {
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
            'fieldName'  => 'creditCardNumber',
            'type'       => 'string',
-        ));
+            ]
+        );
     }
 
 }
diff --git a/tests/Doctrine/Tests/Models/DDC869/DDC869Payment.php b/tests/Doctrine/Tests/Models/DDC869/DDC869Payment.php
index ea052d12e..f689a82ea 100644
--- a/tests/Doctrine/Tests/Models/DDC869/DDC869Payment.php
+++ b/tests/Doctrine/Tests/Models/DDC869/DDC869Payment.php
@@ -21,16 +21,20 @@ class DDC869Payment
 
     public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata)
     {
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
            'id'         => true,
            'fieldName'  => 'id',
            'type'       => 'integer',
            'columnName' => 'id',
-        ));
-        $metadata->mapField(array(
+            ]
+        );
+        $metadata->mapField(
+            [
            'fieldName'  => 'value',
            'type'       => 'float',
-        ));
+            ]
+        );
         $metadata->isMappedSuperclass = true;
         $metadata->setCustomRepositoryClass("Doctrine\Tests\Models\DDC869\DDC869PaymentRepository");
         $metadata->setIdGeneratorType(\Doctrine\ORM\Mapping\ClassMetadataInfo::GENERATOR_TYPE_AUTO);
diff --git a/tests/Doctrine/Tests/Models/DDC889/DDC889Class.php b/tests/Doctrine/Tests/Models/DDC889/DDC889Class.php
index 8bba1274c..089261a83 100644
--- a/tests/Doctrine/Tests/Models/DDC889/DDC889Class.php
+++ b/tests/Doctrine/Tests/Models/DDC889/DDC889Class.php
@@ -15,12 +15,14 @@ class DDC889Class extends DDC889SuperClass
 
     public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata)
     {
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
            'id'         => true,
            'fieldName'  => 'id',
            'type'       => 'integer',
            'columnName' => 'id',
-        ));
+            ]
+        );
 
         $metadata->setIdGeneratorType(\Doctrine\ORM\Mapping\ClassMetadataInfo::GENERATOR_TYPE_AUTO);
     }
diff --git a/tests/Doctrine/Tests/Models/DDC889/DDC889SuperClass.php b/tests/Doctrine/Tests/Models/DDC889/DDC889SuperClass.php
index 42fd93386..8408a9ad7 100644
--- a/tests/Doctrine/Tests/Models/DDC889/DDC889SuperClass.php
+++ b/tests/Doctrine/Tests/Models/DDC889/DDC889SuperClass.php
@@ -13,9 +13,11 @@ class DDC889SuperClass
 
     public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata)
     {
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
            'fieldName'  => 'name',
-        ));
+            ]
+        );
 
         $metadata->isMappedSuperclass = true;
         $metadata->setIdGeneratorType(\Doctrine\ORM\Mapping\ClassMetadataInfo::GENERATOR_TYPE_NONE);
diff --git a/tests/Doctrine/Tests/Models/DDC964/DDC964Admin.php b/tests/Doctrine/Tests/Models/DDC964/DDC964Admin.php
index 110326b2c..29ea4dd4e 100644
--- a/tests/Doctrine/Tests/Models/DDC964/DDC964Admin.php
+++ b/tests/Doctrine/Tests/Models/DDC964/DDC964Admin.php
@@ -23,23 +23,31 @@ class DDC964Admin extends DDC964User
 {
     public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata)
     {
-        $metadata->setAssociationOverride('address',array(
-            'joinColumns'=>array(array(
+        $metadata->setAssociationOverride('address',
+            [
+            'joinColumns'=> [
+                [
                 'name' => 'adminaddress_id',
                 'referencedColumnName' => 'id',
-            ))
-        ));
+                ]
+            ]
+            ]
+        );
 
-        $metadata->setAssociationOverride('groups',array(
-            'joinTable' => array(
+        $metadata->setAssociationOverride('groups',
+            [
+            'joinTable' => [
                 'name'      => 'ddc964_users_admingroups',
-                'joinColumns' => array(array(
+                'joinColumns' => [
+                    [
                     'name' => 'adminuser_id',
-                )),
-                'inverseJoinColumns' =>array (array (
+                    ]
+                ],
+                'inverseJoinColumns' => [[
                     'name'      => 'admingroup_id',
-                ))
-            )
-        ));
+                ]]
+            ]
+            ]
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/Models/DDC964/DDC964Guest.php b/tests/Doctrine/Tests/Models/DDC964/DDC964Guest.php
index cb64d15fa..23486b0fd 100644
--- a/tests/Doctrine/Tests/Models/DDC964/DDC964Guest.php
+++ b/tests/Doctrine/Tests/Models/DDC964/DDC964Guest.php
@@ -26,17 +26,20 @@ class DDC964Guest extends DDC964User
 {
     public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata)
     {
-        $metadata->setAttributeOverride('id', array(
+        $metadata->setAttributeOverride('id', [
             'columnName'    => 'guest_id',
             'type'          => 'integer',
             'length'        => 140,
-        ));
+        ]
+        );
 
-        $metadata->setAttributeOverride('name',array(
+        $metadata->setAttributeOverride('name',
+            [
             'columnName'    => 'guest_name',
             'nullable'      => false,
             'unique'        => true,
             'length'        => 240,
-        ));
+            ]
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/Models/DDC964/DDC964User.php b/tests/Doctrine/Tests/Models/DDC964/DDC964User.php
index f1bfdae39..a9f15c8c9 100644
--- a/tests/Doctrine/Tests/Models/DDC964/DDC964User.php
+++ b/tests/Doctrine/Tests/Models/DDC964/DDC964User.php
@@ -109,47 +109,59 @@ class DDC964User
 
     public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata)
     {
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
            'id'         => true,
            'fieldName'  => 'id',
            'type'       => 'integer',
            'columnName' => 'user_id',
            'length'     => 150,
-        ));
-        $metadata->mapField(array(
+            ]
+        );
+        $metadata->mapField(
+            [
             'fieldName' => 'name',
             'type'      => 'string',
             'columnName'=> 'user_name',
             'nullable'  => true,
             'unique'    => false,
             'length'    => 250,
-        ));
+            ]
+        );
 
-        $metadata->mapManyToOne(array(
+        $metadata->mapManyToOne(
+            [
            'fieldName'      => 'address',
            'targetEntity'   => 'DDC964Address',
-           'cascade'        => array('persist','merge'),
-           'joinColumn'     => array('name'=>'address_id', 'referencedColumnMame'=>'id'),
-        ));
+           'cascade'        => ['persist','merge'],
+           'joinColumn'     => ['name'=>'address_id', 'referencedColumnMame'=>'id'],
+            ]
+        );
 
-        $metadata->mapManyToMany(array(
+        $metadata->mapManyToMany(
+            [
            'fieldName'      => 'groups',
            'targetEntity'   => 'DDC964Group',
            'inversedBy'     => 'users',
-           'cascade'        => array('persist','merge','detach'),
-           'joinTable'      => array(
+           'cascade'        => ['persist','merge','detach'],
+           'joinTable'      => [
                 'name'          => 'ddc964_users_groups',
-                'joinColumns'   => array(array(
+                'joinColumns'   => [
+                    [
                     'name'=>'user_id',
                     'referencedColumnName'=>'id',
-                )),
-                'inverseJoinColumns'=>array(array(
+                    ]
+                ],
+                'inverseJoinColumns'=> [
+                    [
                     'name'=>'group_id',
                     'referencedColumnName'=>'id',
-                ))
-           )
-        ));
+                    ]
+                ]
+           ]
+            ]
+        );
 
         $metadata->setIdGeneratorType(\Doctrine\ORM\Mapping\ClassMetadataInfo::GENERATOR_TYPE_AUTO);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/Models/GeoNames/Admin1.php b/tests/Doctrine/Tests/Models/GeoNames/Admin1.php
index 15a0147ed..11b9d8e85 100644
--- a/tests/Doctrine/Tests/Models/GeoNames/Admin1.php
+++ b/tests/Doctrine/Tests/Models/GeoNames/Admin1.php
@@ -28,7 +28,7 @@ class Admin1
      * @OneToMany(targetEntity="Admin1AlternateName", mappedBy="admin1")
      * @Cache
      */
-    public $names = array();
+    public $names = [];
 
     /**
      * @Column(type="string", length=255);
diff --git a/tests/Doctrine/Tests/Models/Routing/RoutingRoute.php b/tests/Doctrine/Tests/Models/Routing/RoutingRoute.php
index 9e5d5d02e..7354e56ca 100644
--- a/tests/Doctrine/Tests/Models/Routing/RoutingRoute.php
+++ b/tests/Doctrine/Tests/Models/Routing/RoutingRoute.php
@@ -30,10 +30,10 @@ class RoutingRoute
      * @OneToMany(targetEntity="RoutingRouteBooking", mappedBy="route")
      * @OrderBy({"passengerName" = "ASC"})
      */
-    public $bookings = array();
+    public $bookings = [];
 
     public function __construct()
     {
         $this->legs = new ArrayCollection();
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Cache/AbstractRegionTest.php b/tests/Doctrine/Tests/ORM/Cache/AbstractRegionTest.php
index ca01b069d..665978f01 100644
--- a/tests/Doctrine/Tests/ORM/Cache/AbstractRegionTest.php
+++ b/tests/Doctrine/Tests/ORM/Cache/AbstractRegionTest.php
@@ -37,10 +37,10 @@ abstract class AbstractRegionTest extends OrmFunctionalTestCase
 
     static public function dataProviderCacheValues()
     {
-        return array(
-            array(new CacheKeyMock('key.1'), new CacheEntryMock(array('id'=>1, 'name' => 'bar'))),
-            array(new CacheKeyMock('key.2'), new CacheEntryMock(array('id'=>2, 'name' => 'foo'))),
-        );
+        return [
+            [new CacheKeyMock('key.1'), new CacheEntryMock(['id'=>1, 'name' => 'bar'])],
+            [new CacheKeyMock('key.2'), new CacheEntryMock(['id'=>2, 'name' => 'foo'])],
+        ];
     }
 
     /**
@@ -57,7 +57,7 @@ abstract class AbstractRegionTest extends OrmFunctionalTestCase
         $actual = $this->region->get($key);
 
         $this->assertEquals($value, $actual);
-        
+
         $this->region->evict($key);
 
         $this->assertFalse($this->region->contains($key));
@@ -71,8 +71,8 @@ abstract class AbstractRegionTest extends OrmFunctionalTestCase
         $this->assertFalse($this->region->contains($key1));
         $this->assertFalse($this->region->contains($key2));
 
-        $this->region->put($key1, new CacheEntryMock(array('value' => 'foo')));
-        $this->region->put($key2, new CacheEntryMock(array('value' => 'bar')));
+        $this->region->put($key1, new CacheEntryMock(['value' => 'foo']));
+        $this->region->put($key2, new CacheEntryMock(['value' => 'bar']));
 
         $this->assertTrue($this->region->contains($key1));
         $this->assertTrue($this->region->contains($key2));
@@ -82,4 +82,4 @@ abstract class AbstractRegionTest extends OrmFunctionalTestCase
         $this->assertFalse($this->region->contains($key1));
         $this->assertFalse($this->region->contains($key2));
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Cache/CacheKeyTest.php b/tests/Doctrine/Tests/ORM/Cache/CacheKeyTest.php
index 39c28af1e..63c86d7f1 100644
--- a/tests/Doctrine/Tests/ORM/Cache/CacheKeyTest.php
+++ b/tests/Doctrine/Tests/ORM/Cache/CacheKeyTest.php
@@ -13,57 +13,57 @@ class CacheKeyTest extends DoctrineTestCase
 {
     public function testEntityCacheKeyIdentifierCollision()
     {
-        $key1 = new EntityCacheKey('Foo', array('id'=>1));
-        $key2 = new EntityCacheKey('Bar', array('id'=>1));
+        $key1 = new EntityCacheKey('Foo', ['id'=>1]);
+        $key2 = new EntityCacheKey('Bar', ['id'=>1]);
 
         $this->assertNotEquals($key1->hash, $key2->hash);
     }
 
     public function testEntityCacheKeyIdentifierType()
     {
-        $key1 = new EntityCacheKey('Foo', array('id'=>1));
-        $key2 = new EntityCacheKey('Foo', array('id'=>'1'));
+        $key1 = new EntityCacheKey('Foo', ['id'=>1]);
+        $key2 = new EntityCacheKey('Foo', ['id'=>'1']);
 
         $this->assertEquals($key1->hash, $key2->hash);
     }
 
     public function testEntityCacheKeyIdentifierOrder()
     {
-        $key1 = new EntityCacheKey('Foo', array('foo_bar'=>1, 'bar_foo'=> 2));
-        $key2 = new EntityCacheKey('Foo', array('bar_foo'=>2, 'foo_bar'=> 1));
+        $key1 = new EntityCacheKey('Foo', ['foo_bar'=>1, 'bar_foo'=> 2]);
+        $key2 = new EntityCacheKey('Foo', ['bar_foo'=>2, 'foo_bar'=> 1]);
 
         $this->assertEquals($key1->hash, $key2->hash);
     }
 
     public function testCollectionCacheKeyIdentifierType()
     {
-        $key1 = new CollectionCacheKey('Foo', 'assoc', array('id'=>1));
-        $key2 = new CollectionCacheKey('Foo', 'assoc', array('id'=>'1'));
+        $key1 = new CollectionCacheKey('Foo', 'assoc', ['id'=>1]);
+        $key2 = new CollectionCacheKey('Foo', 'assoc', ['id'=>'1']);
 
         $this->assertEquals($key1->hash, $key2->hash);
     }
 
     public function testCollectionCacheKeyIdentifierOrder()
     {
-        $key1 = new CollectionCacheKey('Foo', 'assoc', array('foo_bar'=>1, 'bar_foo'=> 2));
-        $key2 = new CollectionCacheKey('Foo', 'assoc', array('bar_foo'=>2, 'foo_bar'=> 1));
+        $key1 = new CollectionCacheKey('Foo', 'assoc', ['foo_bar'=>1, 'bar_foo'=> 2]);
+        $key2 = new CollectionCacheKey('Foo', 'assoc', ['bar_foo'=>2, 'foo_bar'=> 1]);
 
         $this->assertEquals($key1->hash, $key2->hash);
     }
 
     public function testCollectionCacheKeyIdentifierCollision()
     {
-        $key1 = new CollectionCacheKey('Foo', 'assoc', array('id'=>1));
-        $key2 = new CollectionCacheKey('Bar', 'assoc', array('id'=>1));
+        $key1 = new CollectionCacheKey('Foo', 'assoc', ['id'=>1]);
+        $key2 = new CollectionCacheKey('Bar', 'assoc', ['id'=>1]);
 
         $this->assertNotEquals($key1->hash, $key2->hash);
     }
 
     public function testCollectionCacheKeyAssociationCollision()
     {
-        $key1 = new CollectionCacheKey('Foo', 'assoc1', array('id'=>1));
-        $key2 = new CollectionCacheKey('Foo', 'assoc2', array('id'=>1));
+        $key1 = new CollectionCacheKey('Foo', 'assoc1', ['id'=>1]);
+        $key2 = new CollectionCacheKey('Foo', 'assoc2', ['id'=>1]);
 
         $this->assertNotEquals($key1->hash, $key2->hash);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Cache/CacheLoggerChainTest.php b/tests/Doctrine/Tests/ORM/Cache/CacheLoggerChainTest.php
index 0af90cb07..625b05867 100644
--- a/tests/Doctrine/Tests/ORM/Cache/CacheLoggerChainTest.php
+++ b/tests/Doctrine/Tests/ORM/Cache/CacheLoggerChainTest.php
@@ -42,13 +42,13 @@ class CacheLoggerChainTest extends DoctrineTestCase
         $this->logger->setLogger('mock', $this->mock);
 
         $this->assertSame($this->mock, $this->logger->getLogger('mock'));
-        $this->assertEquals(array('mock' => $this->mock), $this->logger->getLoggers());
+        $this->assertEquals(['mock' => $this->mock], $this->logger->getLoggers());
     }
 
     public function testEntityCacheChain()
     {
         $name = 'my_entity_region';
-        $key  = new EntityCacheKey(State::CLASSNAME, array('id' => 1));
+        $key  = new EntityCacheKey(State::CLASSNAME, ['id' => 1]);
 
         $this->logger->setLogger('mock', $this->mock);
 
@@ -72,7 +72,7 @@ class CacheLoggerChainTest extends DoctrineTestCase
     public function testCollectionCacheChain()
     {
         $name = 'my_collection_region';
-        $key  = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id' => 1));
+        $key  = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id' => 1]);
 
         $this->logger->setLogger('mock', $this->mock);
 
@@ -116,4 +116,4 @@ class CacheLoggerChainTest extends DoctrineTestCase
         $this->logger->queryCachePut($name, $key);
         $this->logger->queryCacheMiss($name, $key);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Cache/DefaultCacheFactoryTest.php b/tests/Doctrine/Tests/ORM/Cache/DefaultCacheFactoryTest.php
index 40c997d42..a948676d7 100644
--- a/tests/Doctrine/Tests/ORM/Cache/DefaultCacheFactoryTest.php
+++ b/tests/Doctrine/Tests/ORM/Cache/DefaultCacheFactoryTest.php
@@ -40,9 +40,9 @@ class DefaultCacheFactoryTest extends OrmTestCase
 
         $this->em               = $this->_getTestEntityManager();
         $this->regionsConfig    = new RegionsConfiguration;
-        $arguments              = array($this->regionsConfig, $this->getSharedSecondLevelCacheDriverImpl());
+        $arguments              = [$this->regionsConfig, $this->getSharedSecondLevelCacheDriverImpl()];
         $this->factory          = $this->getMockBuilder(DefaultCacheFactory::class)
-                                       ->setMethods(array('getRegion'))
+                                       ->setMethods(['getRegion'])
                                        ->setConstructorArgs($arguments)
                                        ->getMock();
     }
@@ -261,24 +261,30 @@ class DefaultCacheFactoryTest extends OrmTestCase
     {
         $factory = new DefaultCacheFactory($this->regionsConfig, $this->getSharedSecondLevelCacheDriverImpl());
 
-        $factory->getRegion(array(
+        $factory->getRegion(
+            [
             'usage'   => ClassMetadata::CACHE_USAGE_READ_WRITE,
             'region'  => 'foo'
-        ));
+            ]
+        );
     }
 
     public function testBuildsNewNamespacedCacheInstancePerRegionInstance()
     {
         $factory = new DefaultCacheFactory($this->regionsConfig, $this->getSharedSecondLevelCacheDriverImpl());
 
-        $fooRegion = $factory->getRegion(array(
+        $fooRegion = $factory->getRegion(
+            [
             'region' => 'foo',
             'usage'  => ClassMetadata::CACHE_USAGE_READ_ONLY,
-        ));
-        $barRegion = $factory->getRegion(array(
+            ]
+        );
+        $barRegion = $factory->getRegion(
+            [
             'region' => 'bar',
             'usage'  => ClassMetadata::CACHE_USAGE_READ_ONLY,
-        ));
+            ]
+        );
 
         $this->assertSame('foo', $fooRegion->getCache()->getNamespace());
         $this->assertSame('bar', $barRegion->getCache()->getNamespace());
@@ -293,10 +299,12 @@ class DefaultCacheFactoryTest extends OrmTestCase
 
         $this->assertInstanceOf(
             'Doctrine\ORM\Cache\Region\DefaultRegion',
-            $factory->getRegion(array(
+            $factory->getRegion(
+                [
                 'region' => 'bar',
                 'usage'  => ClassMetadata::CACHE_USAGE_READ_ONLY,
-            ))
+                ]
+            )
         );
     }
 
@@ -309,10 +317,12 @@ class DefaultCacheFactoryTest extends OrmTestCase
 
         $this->assertInstanceOf(
             'Doctrine\ORM\Cache\Region\DefaultMultiGetRegion',
-            $factory->getRegion(array(
+            $factory->getRegion(
+                [
                 'region' => 'bar',
                 'usage'  => ClassMetadata::CACHE_USAGE_READ_ONLY,
-            ))
+                ]
+            )
         );
     }
 
diff --git a/tests/Doctrine/Tests/ORM/Cache/DefaultCacheTest.php b/tests/Doctrine/Tests/ORM/Cache/DefaultCacheTest.php
index c33d0839b..866153fbb 100644
--- a/tests/Doctrine/Tests/ORM/Cache/DefaultCacheTest.php
+++ b/tests/Doctrine/Tests/ORM/Cache/DefaultCacheTest.php
@@ -72,7 +72,7 @@ class DefaultCacheTest extends OrmTestCase
     {
         $this->assertInstanceOf('Doctrine\ORM\Cache', $this->cache);
     }
-    
+
     public function testGetEntityCacheRegionAccess()
     {
         $this->assertInstanceOf('Doctrine\ORM\Cache\Region', $this->cache->getEntityCacheRegion(State::CLASSNAME));
@@ -87,9 +87,9 @@ class DefaultCacheTest extends OrmTestCase
 
     public function testContainsEntity()
     {
-        $identifier = array('id'=>1);
+        $identifier = ['id'=>1];
         $className  = Country::CLASSNAME;
-        $cacheEntry = array_merge($identifier, array('name' => 'Brazil'));
+        $cacheEntry = array_merge($identifier, ['name' => 'Brazil']);
 
         $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, 1));
 
@@ -101,9 +101,9 @@ class DefaultCacheTest extends OrmTestCase
 
     public function testEvictEntity()
     {
-        $identifier = array('id'=>1);
+        $identifier = ['id'=>1];
         $className  = Country::CLASSNAME;
-        $cacheEntry = array_merge($identifier, array('name' => 'Brazil'));
+        $cacheEntry = array_merge($identifier, ['name' => 'Brazil']);
 
         $this->putEntityCacheEntry($className, $identifier, $cacheEntry);
 
@@ -117,9 +117,9 @@ class DefaultCacheTest extends OrmTestCase
 
     public function testEvictEntityRegion()
     {
-        $identifier = array('id'=>1);
+        $identifier = ['id'=>1];
         $className  = Country::CLASSNAME;
-        $cacheEntry = array_merge($identifier, array('name' => 'Brazil'));
+        $cacheEntry = array_merge($identifier, ['name' => 'Brazil']);
 
         $this->putEntityCacheEntry($className, $identifier, $cacheEntry);
 
@@ -133,9 +133,9 @@ class DefaultCacheTest extends OrmTestCase
 
     public function testEvictEntityRegions()
     {
-        $identifier = array('id'=>1);
+        $identifier = ['id'=>1];
         $className  = Country::CLASSNAME;
-        $cacheEntry = array_merge($identifier, array('name' => 'Brazil'));
+        $cacheEntry = array_merge($identifier, ['name' => 'Brazil']);
 
         $this->putEntityCacheEntry($className, $identifier, $cacheEntry);
 
@@ -148,13 +148,13 @@ class DefaultCacheTest extends OrmTestCase
 
     public function testContainsCollection()
     {
-        $ownerId        = array('id'=>1);
+        $ownerId        = ['id'=>1];
         $className      = State::CLASSNAME;
         $association    = 'cities';
-        $cacheEntry     = array(
-            array('id' => 11),
-            array('id' => 12),
-        );
+        $cacheEntry     = [
+            ['id' => 11],
+            ['id' => 12],
+        ];
 
         $this->assertFalse($this->cache->containsCollection(State::CLASSNAME, $association, 1));
 
@@ -166,13 +166,13 @@ class DefaultCacheTest extends OrmTestCase
 
     public function testEvictCollection()
     {
-        $ownerId        = array('id'=>1);
+        $ownerId        = ['id'=>1];
         $className      = State::CLASSNAME;
         $association    = 'cities';
-        $cacheEntry     = array(
-            array('id' => 11),
-            array('id' => 12),
-        );
+        $cacheEntry     = [
+            ['id' => 11],
+            ['id' => 12],
+        ];
 
         $this->putCollectionCacheEntry($className, $association, $ownerId, $cacheEntry);
 
@@ -186,13 +186,13 @@ class DefaultCacheTest extends OrmTestCase
 
     public function testEvictCollectionRegion()
     {
-        $ownerId        = array('id'=>1);
+        $ownerId        = ['id'=>1];
         $className      = State::CLASSNAME;
         $association    = 'cities';
-        $cacheEntry     = array(
-            array('id' => 11),
-            array('id' => 12),
-        );
+        $cacheEntry     = [
+            ['id' => 11],
+            ['id' => 12],
+        ];
 
         $this->putCollectionCacheEntry($className, $association, $ownerId, $cacheEntry);
 
@@ -206,13 +206,13 @@ class DefaultCacheTest extends OrmTestCase
 
     public function testEvictCollectionRegions()
     {
-        $ownerId        = array('id'=>1);
+        $ownerId        = ['id'=>1];
         $className      = State::CLASSNAME;
         $association    = 'cities';
-        $cacheEntry     = array(
-            array('id' => 11),
-            array('id' => 12),
-        );
+        $cacheEntry     = [
+            ['id' => 11],
+            ['id' => 12],
+        ];
 
         $this->putCollectionCacheEntry($className, $association, $ownerId, $cacheEntry);
 
@@ -257,7 +257,7 @@ class DefaultCacheTest extends OrmTestCase
         $method->setAccessible(true);
         $property->setValue($entity, $identifier);
 
-        $this->assertEquals(array('id'=>$identifier), $method->invoke($this->cache, $metadata, $identifier));
+        $this->assertEquals(['id'=>$identifier], $method->invoke($this->cache, $metadata, $identifier));
     }
 
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Cache/DefaultCollectionHydratorTest.php b/tests/Doctrine/Tests/ORM/Cache/DefaultCollectionHydratorTest.php
index ed0456e39..e3c4d785b 100644
--- a/tests/Doctrine/Tests/ORM/Cache/DefaultCollectionHydratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Cache/DefaultCollectionHydratorTest.php
@@ -41,17 +41,21 @@ class DefaultCollectionHydratorTest extends OrmFunctionalTestCase
     public function testLoadCacheCollection()
     {
         $targetRegion   = $this->_em->getCache()->getEntityCacheRegion(City::CLASSNAME);
-        $entry          = new CollectionCacheEntry(array(
-            new EntityCacheKey(City::CLASSNAME, array('id'=>31)),
-            new EntityCacheKey(City::CLASSNAME, array('id'=>32)),
-        ));
+        $entry          = new CollectionCacheEntry(
+            [
+            new EntityCacheKey(City::CLASSNAME, ['id'=>31]),
+            new EntityCacheKey(City::CLASSNAME, ['id'=>32]),
+            ]
+        );
 
-        $targetRegion->put(new EntityCacheKey(City::CLASSNAME, array('id'=>31)), new EntityCacheEntry(City::CLASSNAME, array('id'=>31, 'name'=>'Foo')));
-        $targetRegion->put(new EntityCacheKey(City::CLASSNAME, array('id'=>32)), new EntityCacheEntry(City::CLASSNAME, array('id'=>32, 'name'=>'Bar')));
+        $targetRegion->put(new EntityCacheKey(City::CLASSNAME, ['id'=>31]), new EntityCacheEntry(City::CLASSNAME, ['id'=>31, 'name'=>'Foo']
+        ));
+        $targetRegion->put(new EntityCacheKey(City::CLASSNAME, ['id'=>32]), new EntityCacheEntry(City::CLASSNAME, ['id'=>32, 'name'=>'Bar']
+        ));
 
         $sourceClass    = $this->_em->getClassMetadata(State::CLASSNAME);
         $targetClass    = $this->_em->getClassMetadata(City::CLASSNAME);
-        $key            = new CollectionCacheKey($sourceClass->name, 'cities', array('id'=>21));
+        $key            = new CollectionCacheKey($sourceClass->name, 'cities', ['id'=>21]);
         $collection     = new PersistentCollection($this->_em, $targetClass, new ArrayCollection());
         $list           = $this->structure->loadCacheEntry($sourceClass, $key, $entry, $collection);
 
@@ -75,4 +79,4 @@ class DefaultCollectionHydratorTest extends OrmFunctionalTestCase
         $this->assertEquals(UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($collection[1]));
     }
 
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Cache/DefaultEntityHydratorTest.php b/tests/Doctrine/Tests/ORM/Cache/DefaultEntityHydratorTest.php
index 73878ee46..e7fdb617b 100644
--- a/tests/Doctrine/Tests/ORM/Cache/DefaultEntityHydratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Cache/DefaultEntityHydratorTest.php
@@ -43,8 +43,8 @@ class DefaultEntityHydratorTest extends OrmTestCase
     public function testCreateEntity()
     {
         $metadata = $this->em->getClassMetadata(Country::CLASSNAME);
-        $key      = new EntityCacheKey($metadata->name, array('id'=>1));
-        $entry    = new EntityCacheEntry($metadata->name, array('id'=>1, 'name'=>'Foo'));
+        $key      = new EntityCacheKey($metadata->name, ['id'=>1]);
+        $entry    = new EntityCacheEntry($metadata->name, ['id'=>1, 'name'=>'Foo']);
         $entity   = $this->structure->loadCacheEntry($metadata, $key, $entry);
 
         $this->assertInstanceOf($metadata->name, $entity);
@@ -57,8 +57,8 @@ class DefaultEntityHydratorTest extends OrmTestCase
     public function testLoadProxy()
     {
         $metadata = $this->em->getClassMetadata(Country::CLASSNAME);
-        $key      = new EntityCacheKey($metadata->name, array('id'=>1));
-        $entry    = new EntityCacheEntry($metadata->name, array('id'=>1, 'name'=>'Foo'));
+        $key      = new EntityCacheKey($metadata->name, ['id'=>1]);
+        $entry    = new EntityCacheEntry($metadata->name, ['id'=>1, 'name'=>'Foo']);
         $proxy    = $this->em->getReference($metadata->name, $key->identifier);
         $entity   = $this->structure->loadCacheEntry($metadata, $key, $entry, $proxy);
 
@@ -74,9 +74,9 @@ class DefaultEntityHydratorTest extends OrmTestCase
     {
         $entity   = new Country('Foo');
         $uow      = $this->em->getUnitOfWork();
-        $data     = array('id'=>1, 'name'=>'Foo');
+        $data     = ['id'=>1, 'name'=>'Foo'];
         $metadata = $this->em->getClassMetadata(Country::CLASSNAME);
-        $key      = new EntityCacheKey($metadata->name, array('id'=>1));
+        $key      = new EntityCacheKey($metadata->name, ['id'=>1]);
 
         $entity->setId(1);
         $uow->registerManaged($entity, $key->identifier, $data);
@@ -88,10 +88,11 @@ class DefaultEntityHydratorTest extends OrmTestCase
 
         $this->assertArrayHasKey('id', $cache->data);
         $this->assertArrayHasKey('name', $cache->data);
-        $this->assertEquals(array(
+        $this->assertEquals(
+            [
             'id'   => 1,
             'name' => 'Foo',
-        ), $cache->data);
+            ], $cache->data);
     }
 
     public function testBuildCacheEntryAssociation()
@@ -99,16 +100,16 @@ class DefaultEntityHydratorTest extends OrmTestCase
         $country        = new Country('Foo');
         $state          = new State('Bat', $country);
         $uow            = $this->em->getUnitOfWork();
-        $countryData    = array('id'=>11, 'name'=>'Foo');
-        $stateData      = array('id'=>12, 'name'=>'Bar', 'country' => $country);
+        $countryData    = ['id'=>11, 'name'=>'Foo'];
+        $stateData      = ['id'=>12, 'name'=>'Bar', 'country' => $country];
         $metadata       = $this->em->getClassMetadata(State::CLASSNAME);
-        $key            = new EntityCacheKey($metadata->name, array('id'=>11));
+        $key            = new EntityCacheKey($metadata->name, ['id'=>11]);
 
         $country->setId(11);
         $state->setId(12);
 
-        $uow->registerManaged($country, array('id'=>11), $countryData);
-        $uow->registerManaged($state, array('id'=>12), $stateData);
+        $uow->registerManaged($country, ['id'=>11], $countryData);
+        $uow->registerManaged($state, ['id'=>12], $stateData);
 
         $cache = $this->structure->buildCacheEntry($metadata, $key, $state);
 
@@ -118,11 +119,12 @@ class DefaultEntityHydratorTest extends OrmTestCase
         $this->assertArrayHasKey('id', $cache->data);
         $this->assertArrayHasKey('name', $cache->data);
         $this->assertArrayHasKey('country', $cache->data);
-        $this->assertEquals(array(
+        $this->assertEquals(
+            [
             'id'        => 12,
             'name'      => 'Bar',
-            'country'   => new AssociationCacheEntry(Country::CLASSNAME, array('id' => 11)),
-        ), $cache->data);
+            'country'   => new AssociationCacheEntry(Country::CLASSNAME, ['id' => 11]),
+            ], $cache->data);
     }
 
     public function testBuildCacheEntryNonInitializedAssocProxy()
@@ -130,13 +132,13 @@ class DefaultEntityHydratorTest extends OrmTestCase
         $proxy          = $this->em->getReference(Country::CLASSNAME, 11);
         $entity         = new State('Bat', $proxy);
         $uow            = $this->em->getUnitOfWork();
-        $entityData     = array('id'=>12, 'name'=>'Bar', 'country' => $proxy);
+        $entityData     = ['id'=>12, 'name'=>'Bar', 'country' => $proxy];
         $metadata       = $this->em->getClassMetadata(State::CLASSNAME);
-        $key            = new EntityCacheKey($metadata->name, array('id'=>11));
+        $key            = new EntityCacheKey($metadata->name, ['id'=>11]);
 
         $entity->setId(12);
 
-        $uow->registerManaged($entity, array('id'=>12), $entityData);
+        $uow->registerManaged($entity, ['id'=>12], $entityData);
 
         $cache = $this->structure->buildCacheEntry($metadata, $key, $entity);
 
@@ -146,11 +148,12 @@ class DefaultEntityHydratorTest extends OrmTestCase
         $this->assertArrayHasKey('id', $cache->data);
         $this->assertArrayHasKey('name', $cache->data);
         $this->assertArrayHasKey('country', $cache->data);
-        $this->assertEquals(array(
+        $this->assertEquals(
+            [
             'id'        => 12,
             'name'      => 'Bar',
-            'country'   => new AssociationCacheEntry(Country::CLASSNAME, array('id' => 11)),
-        ), $cache->data);
+            'country'   => new AssociationCacheEntry(Country::CLASSNAME, ['id' => 11]),
+            ], $cache->data);
     }
 
     public function testCacheEntryWithWrongIdentifierType()
@@ -158,13 +161,13 @@ class DefaultEntityHydratorTest extends OrmTestCase
         $proxy          = $this->em->getReference(Country::CLASSNAME, 11);
         $entity         = new State('Bat', $proxy);
         $uow            = $this->em->getUnitOfWork();
-        $entityData     = array('id'=> 12, 'name'=>'Bar', 'country' => $proxy);
+        $entityData     = ['id'=> 12, 'name'=>'Bar', 'country' => $proxy];
         $metadata       = $this->em->getClassMetadata(State::CLASSNAME);
-        $key            = new EntityCacheKey($metadata->name, array('id'=>'12'));
+        $key            = new EntityCacheKey($metadata->name, ['id'=>'12']);
 
         $entity->setId(12);
 
-        $uow->registerManaged($entity, array('id'=>12), $entityData);
+        $uow->registerManaged($entity, ['id'=>12], $entityData);
 
         $cache = $this->structure->buildCacheEntry($metadata, $key, $entity);
 
@@ -175,11 +178,12 @@ class DefaultEntityHydratorTest extends OrmTestCase
         $this->assertArrayHasKey('name', $cache->data);
         $this->assertArrayHasKey('country', $cache->data);
         $this->assertSame($entity->getId(), $cache->data['id']);
-        $this->assertEquals(array(
+        $this->assertEquals(
+            [
             'id'        => 12,
             'name'      => 'Bar',
-            'country'   => new AssociationCacheEntry(Country::CLASSNAME, array('id' => 11)),
-        ), $cache->data);
+            'country'   => new AssociationCacheEntry(Country::CLASSNAME, ['id' => 11]),
+            ], $cache->data);
     }
 
 }
diff --git a/tests/Doctrine/Tests/ORM/Cache/DefaultQueryCacheTest.php b/tests/Doctrine/Tests/ORM/Cache/DefaultQueryCacheTest.php
index 8fa09bac6..f9b11bee8 100644
--- a/tests/Doctrine/Tests/ORM/Cache/DefaultQueryCacheTest.php
+++ b/tests/Doctrine/Tests/ORM/Cache/DefaultQueryCacheTest.php
@@ -79,7 +79,7 @@ class DefaultQueryCacheTest extends OrmTestCase
 
     public function testPutBasicQueryResult()
     {
-        $result   = array();
+        $result   = [];
         $key      = new QueryCacheKey('query.key1', 0);
         $rsm      = new ResultSetMappingBuilder($this->em);
         $metadata = $this->em->getClassMetadata(Country::CLASSNAME);
@@ -92,7 +92,7 @@ class DefaultQueryCacheTest extends OrmTestCase
             $result[]   = $entity;
 
             $metadata->setFieldValue($entity, 'id', $i);
-            $this->em->getUnitOfWork()->registerManaged($entity, array('id' => $i), array('name' => $name));
+            $this->em->getUnitOfWork()->registerManaged($entity, ['id' => $i], ['name' => $name]);
         }
 
         $this->assertTrue($this->queryCache->put($key, $rsm, $result));
@@ -114,7 +114,7 @@ class DefaultQueryCacheTest extends OrmTestCase
 
     public function testPutToOneAssociationQueryResult()
     {
-        $result     = array();
+        $result     = [];
         $uow        = $this->em->getUnitOfWork();
         $key        = new QueryCacheKey('query.key1', 0);
         $rsm        = new ResultSetMappingBuilder($this->em);
@@ -122,7 +122,8 @@ class DefaultQueryCacheTest extends OrmTestCase
         $stateClass = $this->em->getClassMetadata(State::CLASSNAME);
 
         $rsm->addRootEntityFromClassMetadata(City::CLASSNAME, 'c');
-        $rsm->addJoinedEntityFromClassMetadata(State::CLASSNAME, 's', 'c', 'state', array('id'=>'state_id', 'name'=>'state_name'));
+        $rsm->addJoinedEntityFromClassMetadata(State::CLASSNAME, 's', 'c', 'state', ['id'=>'state_id', 'name'=>'state_name']
+        );
 
         for ($i = 0; $i < 4; $i++) {
             $state    = new State("State $i");
@@ -132,8 +133,8 @@ class DefaultQueryCacheTest extends OrmTestCase
             $cityClass->setFieldValue($city, 'id', $i);
             $stateClass->setFieldValue($state, 'id', $i*2);
 
-            $uow->registerManaged($state, array('id' => $state->getId()), array('name' => $city->getName()));
-            $uow->registerManaged($city, array('id' => $city->getId()), array('name' => $city->getName(), 'state' => $state));
+            $uow->registerManaged($state, ['id' => $state->getId()], ['name' => $city->getName()]);
+            $uow->registerManaged($city, ['id' => $city->getId()], ['name' => $city->getName(), 'state' => $state]);
         }
 
         $this->assertTrue($this->queryCache->put($key, $rsm, $result));
@@ -153,7 +154,7 @@ class DefaultQueryCacheTest extends OrmTestCase
 
     public function testPutToOneAssociation2LevelsQueryResult()
     {
-        $result     = array();
+        $result     = [];
         $uow        = $this->em->getUnitOfWork();
         $key        = new QueryCacheKey('query.key1', 0);
         $rsm        = new ResultSetMappingBuilder($this->em);
@@ -162,8 +163,10 @@ class DefaultQueryCacheTest extends OrmTestCase
         $countryClass = $this->em->getClassMetadata(Country::CLASSNAME);
 
         $rsm->addRootEntityFromClassMetadata(City::CLASSNAME, 'c');
-        $rsm->addJoinedEntityFromClassMetadata(State::CLASSNAME, 's', 'c', 'state', array('id'=>'state_id', 'name'=>'state_name'));
-        $rsm->addJoinedEntityFromClassMetadata(Country::CLASSNAME, 'co', 's', 'country', array('id'=>'country_id', 'name'=>'country_name'));
+        $rsm->addJoinedEntityFromClassMetadata(State::CLASSNAME, 's', 'c', 'state', ['id'=>'state_id', 'name'=>'state_name']
+        );
+        $rsm->addJoinedEntityFromClassMetadata(Country::CLASSNAME, 'co', 's', 'country', ['id'=>'country_id', 'name'=>'country_name']
+        );
 
         for ($i = 0; $i < 4; $i++) {
             $country  = new Country("Country $i");
@@ -176,9 +179,10 @@ class DefaultQueryCacheTest extends OrmTestCase
             $stateClass->setFieldValue($state, 'id', $i*2);
             $countryClass->setFieldValue($country, 'id', $i*3);
 
-            $uow->registerManaged($country, array('id' => $country->getId()), array('name' => $country->getName()));
-            $uow->registerManaged($state, array('id' => $state->getId()), array('name' => $state->getName(), 'country' => $country));
-            $uow->registerManaged($city, array('id' => $city->getId()), array('name' => $city->getName(), 'state' => $state));
+            $uow->registerManaged($country, ['id' => $country->getId()], ['name' => $country->getName()]);
+            $uow->registerManaged($state, ['id' => $state->getId()], ['name' => $state->getName(), 'country' => $country]
+            );
+            $uow->registerManaged($city, ['id' => $city->getId()], ['name' => $city->getName(), 'state' => $state]);
         }
 
         $this->assertTrue($this->queryCache->put($key, $rsm, $result));
@@ -202,14 +206,15 @@ class DefaultQueryCacheTest extends OrmTestCase
 
     public function testPutToOneAssociationNullQueryResult()
     {
-        $result     = array();
+        $result     = [];
         $uow        = $this->em->getUnitOfWork();
         $key        = new QueryCacheKey('query.key1', 0);
         $rsm        = new ResultSetMappingBuilder($this->em);
         $cityClass  = $this->em->getClassMetadata(City::CLASSNAME);
 
         $rsm->addRootEntityFromClassMetadata(City::CLASSNAME, 'c');
-        $rsm->addJoinedEntityFromClassMetadata(State::CLASSNAME, 's', 'c', 'state', array('id'=>'state_id', 'name'=>'state_name'));
+        $rsm->addJoinedEntityFromClassMetadata(State::CLASSNAME, 's', 'c', 'state', ['id'=>'state_id', 'name'=>'state_name']
+        );
 
         for ($i = 0; $i < 4; $i++) {
             $city     = new City("City $i", null);
@@ -217,7 +222,7 @@ class DefaultQueryCacheTest extends OrmTestCase
 
             $cityClass->setFieldValue($city, 'id', $i);
 
-            $uow->registerManaged($city, array('id' => $city->getId()), array('name' => $city->getName(), 'state' => null));
+            $uow->registerManaged($city, ['id' => $city->getId()], ['name' => $city->getName(), 'state' => null]);
         }
 
         $this->assertTrue($this->queryCache->put($key, $rsm, $result));
@@ -233,7 +238,7 @@ class DefaultQueryCacheTest extends OrmTestCase
 
     public function testPutToManyAssociationQueryResult()
     {
-        $result     = array();
+        $result     = [];
         $uow        = $this->em->getUnitOfWork();
         $key        = new QueryCacheKey('query.key1', 0);
         $rsm        = new ResultSetMappingBuilder($this->em);
@@ -241,7 +246,7 @@ class DefaultQueryCacheTest extends OrmTestCase
         $stateClass = $this->em->getClassMetadata(State::CLASSNAME);
 
         $rsm->addRootEntityFromClassMetadata(State::CLASSNAME, 's');
-        $rsm->addJoinedEntityFromClassMetadata(City::CLASSNAME, 'c', 's', 'cities', array('id'=>'c_id', 'name'=>'c_name'));
+        $rsm->addJoinedEntityFromClassMetadata(City::CLASSNAME, 'c', 's', 'cities', ['id'=>'c_id', 'name'=>'c_name']);
 
         for ($i = 0; $i < 4; $i++) {
             $state    = new State("State $i");
@@ -256,9 +261,12 @@ class DefaultQueryCacheTest extends OrmTestCase
             $state->addCity($city1);
             $state->addCity($city2);
 
-            $uow->registerManaged($city1, array('id' => $city1->getId()), array('name' => $city1->getName(), 'state' => $state));
-            $uow->registerManaged($city2, array('id' => $city2->getId()), array('name' => $city2->getName(), 'state' => $state));
-            $uow->registerManaged($state, array('id' => $state->getId()), array('name' => $state->getName(), 'cities' => $state->getCities()));
+            $uow->registerManaged($city1, ['id' => $city1->getId()], ['name' => $city1->getName(), 'state' => $state]
+            );
+            $uow->registerManaged($city2, ['id' => $city2->getId()], ['name' => $city2->getName(), 'state' => $state]
+            );
+            $uow->registerManaged($state, ['id' => $state->getId()], ['name' => $state->getName(), 'cities' => $state->getCities()]
+            );
         }
 
         $this->assertTrue($this->queryCache->put($key, $rsm, $result));
@@ -270,16 +278,18 @@ class DefaultQueryCacheTest extends OrmTestCase
     {
         $rsm   = new ResultSetMappingBuilder($this->em);
         $key   = new QueryCacheKey('query.key1', 0);
-        $entry = new QueryCacheEntry(array(
-            array('identifier' => array('id' => 1)),
-            array('identifier' => array('id' => 2))
-        ));
-
-        $data = array(
-            array('id'=>1, 'name' => 'Foo'),
-            array('id'=>2, 'name' => 'Bar')
+        $entry = new QueryCacheEntry(
+            [
+            ['identifier' => ['id' => 1]],
+            ['identifier' => ['id' => 2]]
+            ]
         );
 
+        $data = [
+            ['id'=>1, 'name' => 'Foo'],
+            ['id'=>2, 'name' => 'Bar']
+        ];
+
         $this->region->addReturn('get', $entry);
         $this->region->addReturn('get', new EntityCacheEntry(Country::CLASSNAME, $data[0]));
         $this->region->addReturn('get', new EntityCacheEntry(Country::CLASSNAME, $data[1]));
@@ -299,7 +309,7 @@ class DefaultQueryCacheTest extends OrmTestCase
 
     public function testCancelPutResultIfEntityPutFails()
     {
-        $result   = array();
+        $result   = [];
         $key      = new QueryCacheKey('query.key1', 0);
         $rsm      = new ResultSetMappingBuilder($this->em);
         $metadata = $this->em->getClassMetadata(Country::CLASSNAME);
@@ -312,7 +322,7 @@ class DefaultQueryCacheTest extends OrmTestCase
             $result[]   = $entity;
 
             $metadata->setFieldValue($entity, 'id', $i);
-            $this->em->getUnitOfWork()->registerManaged($entity, array('id' => $i), array('name' => $name));
+            $this->em->getUnitOfWork()->registerManaged($entity, ['id' => $i], ['name' => $name]);
         }
 
         $this->region->addReturn('put', false);
@@ -324,7 +334,7 @@ class DefaultQueryCacheTest extends OrmTestCase
 
     public function testCancelPutResultIfAssociationEntityPutFails()
     {
-        $result     = array();
+        $result     = [];
         $uow        = $this->em->getUnitOfWork();
         $key        = new QueryCacheKey('query.key1', 0);
         $rsm        = new ResultSetMappingBuilder($this->em);
@@ -332,7 +342,8 @@ class DefaultQueryCacheTest extends OrmTestCase
         $stateClass = $this->em->getClassMetadata(State::CLASSNAME);
 
         $rsm->addRootEntityFromClassMetadata(City::CLASSNAME, 'c');
-        $rsm->addJoinedEntityFromClassMetadata(State::CLASSNAME, 's', 'c', 'state', array('id'=>'state_id', 'name'=>'state_name'));
+        $rsm->addJoinedEntityFromClassMetadata(State::CLASSNAME, 's', 'c', 'state', ['id'=>'state_id', 'name'=>'state_name']
+        );
 
         $state    = new State("State 1");
         $city     = new City("City 2", $state);
@@ -341,8 +352,8 @@ class DefaultQueryCacheTest extends OrmTestCase
         $cityClass->setFieldValue($city, 'id', 1);
         $stateClass->setFieldValue($state, 'id', 11);
 
-        $uow->registerManaged($state, array('id' => $state->getId()), array('name' => $city->getName()));
-        $uow->registerManaged($city, array('id' => $city->getId()), array('name' => $city->getName(), 'state' => $state));
+        $uow->registerManaged($state, ['id' => $state->getId()], ['name' => $city->getName()]);
+        $uow->registerManaged($city, ['id' => $city->getId()], ['name' => $city->getName(), 'state' => $state]);
 
         $this->region->addReturn('put', true);  // put root entity
         $this->region->addReturn('put', false); // association fails
@@ -352,7 +363,7 @@ class DefaultQueryCacheTest extends OrmTestCase
 
     public function testCancelPutToManyAssociationQueryResult()
     {
-        $result     = array();
+        $result     = [];
         $uow        = $this->em->getUnitOfWork();
         $key        = new QueryCacheKey('query.key1', 0);
         $rsm        = new ResultSetMappingBuilder($this->em);
@@ -360,7 +371,7 @@ class DefaultQueryCacheTest extends OrmTestCase
         $stateClass = $this->em->getClassMetadata(State::CLASSNAME);
 
         $rsm->addRootEntityFromClassMetadata(State::CLASSNAME, 's');
-        $rsm->addJoinedEntityFromClassMetadata(City::CLASSNAME, 'c', 's', 'cities', array('id'=>'c_id', 'name'=>'c_name'));
+        $rsm->addJoinedEntityFromClassMetadata(City::CLASSNAME, 'c', 's', 'cities', ['id'=>'c_id', 'name'=>'c_name']);
 
         $state    = new State("State");
         $city1    = new City("City 1", $state);
@@ -374,9 +385,10 @@ class DefaultQueryCacheTest extends OrmTestCase
         $state->addCity($city1);
         $state->addCity($city2);
 
-        $uow->registerManaged($city1, array('id' => $city1->getId()), array('name' => $city1->getName(), 'state' => $state));
-        $uow->registerManaged($city2, array('id' => $city2->getId()), array('name' => $city2->getName(), 'state' => $state));
-        $uow->registerManaged($state, array('id' => $state->getId()), array('name' => $state->getName(), 'cities' => $state->getCities()));
+        $uow->registerManaged($city1, ['id' => $city1->getId()], ['name' => $city1->getName(), 'state' => $state]);
+        $uow->registerManaged($city2, ['id' => $city2->getId()], ['name' => $city2->getName(), 'state' => $state]);
+        $uow->registerManaged($state, ['id' => $state->getId()], ['name' => $state->getName(), 'cities' => $state->getCities()]
+        );
 
         $this->region->addReturn('put', true);  // put root entity
         $this->region->addReturn('put', false); // collection association fails
@@ -390,10 +402,12 @@ class DefaultQueryCacheTest extends OrmTestCase
     {
         $rsm   = new ResultSetMappingBuilder($this->em);
         $key   = new QueryCacheKey('query.key1', 0, Cache::MODE_PUT);
-        $entry = new QueryCacheEntry(array(
-            array('identifier' => array('id' => 1)),
-            array('identifier' => array('id' => 2))
-        ));
+        $entry = new QueryCacheEntry(
+            [
+            ['identifier' => ['id' => 1]],
+            ['identifier' => ['id' => 2]]
+            ]
+        );
 
         $rsm->addRootEntityFromClassMetadata(Country::CLASSNAME, 'c');
 
@@ -404,7 +418,7 @@ class DefaultQueryCacheTest extends OrmTestCase
 
     public function testIgnoreCacheNonPutMode()
     {
-        $result   = array();
+        $result   = [];
         $rsm      = new ResultSetMappingBuilder($this->em);
         $metadata = $this->em->getClassMetadata(Country::CLASSNAME);
         $key      = new QueryCacheKey('query.key1', 0, Cache::MODE_GET);
@@ -417,7 +431,7 @@ class DefaultQueryCacheTest extends OrmTestCase
             $result[]   = $entity;
 
             $metadata->setFieldValue($entity, 'id', $i);
-            $this->em->getUnitOfWork()->registerManaged($entity, array('id' => $i), array('name' => $name));
+            $this->em->getUnitOfWork()->registerManaged($entity, ['id' => $i], ['name' => $name]);
         }
 
         $this->assertFalse($this->queryCache->put($key, $rsm, $result));
@@ -427,14 +441,16 @@ class DefaultQueryCacheTest extends OrmTestCase
     {
         $rsm   = new ResultSetMappingBuilder($this->em);
         $key   = new QueryCacheKey('query.key1', 50);
-        $entry = new QueryCacheEntry(array(
-            array('identifier' => array('id' => 1)),
-            array('identifier' => array('id' => 2))
-        ));
-        $entities = array(
-            array('id'=>1, 'name' => 'Foo'),
-            array('id'=>2, 'name' => 'Bar')
+        $entry = new QueryCacheEntry(
+            [
+            ['identifier' => ['id' => 1]],
+            ['identifier' => ['id' => 2]]
+            ]
         );
+        $entities = [
+            ['id'=>1, 'name' => 'Foo'],
+            ['id'=>2, 'name' => 'Bar']
+        ];
 
         $entry->time = microtime(true) - 100;
 
@@ -451,16 +467,18 @@ class DefaultQueryCacheTest extends OrmTestCase
     {
         $rsm   = new ResultSetMappingBuilder($this->em);
         $key   = new QueryCacheKey('query.key1', 0);
-        $entry = new \ArrayObject(array(
-            array('identifier' => array('id' => 1)),
-            array('identifier' => array('id' => 2))
-        ));
-
-        $data = array(
-            array('id'=>1, 'name' => 'Foo'),
-            array('id'=>2, 'name' => 'Bar')
+        $entry = new \ArrayObject(
+            [
+            ['identifier' => ['id' => 1]],
+            ['identifier' => ['id' => 2]]
+            ]
         );
 
+        $data = [
+            ['id'=>1, 'name' => 'Foo'],
+            ['id'=>2, 'name' => 'Bar']
+        ];
+
         $this->region->addReturn('get', $entry);
         $this->region->addReturn('get', new EntityCacheEntry(Country::CLASSNAME, $data[0]));
         $this->region->addReturn('get', new EntityCacheEntry(Country::CLASSNAME, $data[1]));
@@ -474,10 +492,12 @@ class DefaultQueryCacheTest extends OrmTestCase
     {
         $rsm   = new ResultSetMappingBuilder($this->em);
         $key   = new QueryCacheKey('query.key1', 0);
-        $entry = new QueryCacheEntry(array(
-            array('identifier' => array('id' => 1)),
-            array('identifier' => array('id' => 2))
-        ));
+        $entry = new QueryCacheEntry(
+            [
+            ['identifier' => ['id' => 1]],
+            ['identifier' => ['id' => 2]]
+            ]
+        );
 
         $this->region->addReturn('get', $entry);
         $this->region->addReturn('get', null);
@@ -508,14 +528,16 @@ class DefaultQueryCacheTest extends OrmTestCase
         $wurzburg->addAttraction(new Restaurant('Fischers Fritz', $wurzburg));
 
         $rsm->addRootEntityFromClassMetadata(State::CLASSNAME, 's');
-        $rsm->addJoinedEntityFromClassMetadata(City::CLASSNAME, 'c', 's', 'cities', array(
+        $rsm->addJoinedEntityFromClassMetadata(City::CLASSNAME, 'c', 's', 'cities', [
             'id'   => 'c_id',
             'name' => 'c_name'
-        ));
-        $rsm->addJoinedEntityFromClassMetadata(Restaurant::CLASSNAME, 'a', 'c', 'attractions', array(
+        ]
+        );
+        $rsm->addJoinedEntityFromClassMetadata(Restaurant::CLASSNAME, 'a', 'c', 'attractions', [
             'id'   => 'a_id',
             'name' => 'a_name'
-        ));
+        ]
+        );
 
         $cities      = $reflection->invoke($this->queryCache, $rsm, 'c', $bavaria);
         $attractions = $reflection->invoke($this->queryCache, $rsm, 'a', $bavaria);
@@ -537,7 +559,7 @@ class DefaultQueryCacheTest extends OrmTestCase
      */
     public function testScalarResultException()
     {
-        $result   = array();
+        $result   = [];
         $key      = new QueryCacheKey('query.key1', 0);
         $rsm      = new ResultSetMappingBuilder($this->em);
 
@@ -552,7 +574,7 @@ class DefaultQueryCacheTest extends OrmTestCase
      */
     public function testSupportMultipleRootEntitiesException()
     {
-        $result   = array();
+        $result   = [];
         $key      = new QueryCacheKey('query.key1', 0);
         $rsm      = new ResultSetMappingBuilder($this->em);
 
@@ -568,7 +590,7 @@ class DefaultQueryCacheTest extends OrmTestCase
      */
     public function testNotCacheableEntityException()
     {
-        $result    = array();
+        $result    = [];
         $key       = new QueryCacheKey('query.key1', 0);
         $rsm       = new ResultSetMappingBuilder($this->em);
         $className = 'Doctrine\Tests\Models\Generic\BooleanModel';
@@ -583,7 +605,7 @@ class DefaultQueryCacheTest extends OrmTestCase
             $entity->booleanField   = $boolean;
             $result[]               = $entity;
 
-            $this->em->getUnitOfWork()->registerManaged($entity, array('id' => $i), array('booleanField' => $boolean));
+            $this->em->getUnitOfWork()->registerManaged($entity, ['id' => $i], ['booleanField' => $boolean]);
         }
 
         $this->assertFalse($this->queryCache->put($key, $rsm, $result));
diff --git a/tests/Doctrine/Tests/ORM/Cache/DefaultRegionTest.php b/tests/Doctrine/Tests/ORM/Cache/DefaultRegionTest.php
index 2bcc1fc21..5faed3c9e 100644
--- a/tests/Doctrine/Tests/ORM/Cache/DefaultRegionTest.php
+++ b/tests/Doctrine/Tests/ORM/Cache/DefaultRegionTest.php
@@ -33,7 +33,7 @@ class DefaultRegionTest extends AbstractRegionTest
         }
 
         $key     = new CacheKeyMock('key');
-        $entry   = new CacheEntryMock(array('value' => 'foo'));
+        $entry   = new CacheEntryMock(['value' => 'foo']);
         $region1 = new DefaultRegion('region1', new ApcCache());
         $region2 = new DefaultRegion('region2', new ApcCache());
 
@@ -79,10 +79,10 @@ class DefaultRegionTest extends AbstractRegionTest
     public function testGetMulti()
     {
         $key1 = new CacheKeyMock('key.1');
-        $value1 = new CacheEntryMock(array('id' => 1, 'name' => 'bar'));
+        $value1 = new CacheEntryMock(['id' => 1, 'name' => 'bar']);
 
         $key2 = new CacheKeyMock('key.2');
-        $value2 = new CacheEntryMock(array('id' => 2, 'name' => 'bar'));
+        $value2 = new CacheEntryMock(['id' => 2, 'name' => 'bar']);
 
         $this->assertFalse($this->region->contains($key1));
         $this->assertFalse($this->region->contains($key2));
@@ -93,9 +93,9 @@ class DefaultRegionTest extends AbstractRegionTest
         $this->assertTrue($this->region->contains($key1));
         $this->assertTrue($this->region->contains($key2));
 
-        $actual = $this->region->getMultiple(new CollectionCacheEntry(array($key1, $key2)));
+        $actual = $this->region->getMultiple(new CollectionCacheEntry([$key1, $key2]));
 
         $this->assertEquals($value1, $actual[0]);
         $this->assertEquals($value2, $actual[1]);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Cache/FileLockRegionTest.php b/tests/Doctrine/Tests/ORM/Cache/FileLockRegionTest.php
index 6fdef6fea..5bb771ce7 100644
--- a/tests/Doctrine/Tests/ORM/Cache/FileLockRegionTest.php
+++ b/tests/Doctrine/Tests/ORM/Cache/FileLockRegionTest.php
@@ -21,7 +21,7 @@ class FileLockRegionTest extends AbstractRegionTest
      * @var \Doctrine\ORM\Cache\ConcurrentRegion
      */
     protected $region;
-    
+
     /**
      * @var string
      */
@@ -67,7 +67,7 @@ class FileLockRegionTest extends AbstractRegionTest
     public function testLockAndUnlock()
     {
         $key    = new CacheKeyMock('key');
-        $entry  = new CacheEntryMock(array('foo' => 'bar'));
+        $entry  = new CacheEntryMock(['foo' => 'bar']);
         $file   = $this->getFileName($this->region, $key);
 
         $this->assertFalse($this->region->contains($key));
@@ -91,7 +91,7 @@ class FileLockRegionTest extends AbstractRegionTest
     public function testLockWithExistingLock()
     {
         $key    = new CacheKeyMock('key');
-        $entry  = new CacheEntryMock(array('foo' => 'bar'));
+        $entry  = new CacheEntryMock(['foo' => 'bar']);
         $file   = $this->getFileName($this->region, $key);
 
         $this->assertFalse($this->region->contains($key));
@@ -114,7 +114,7 @@ class FileLockRegionTest extends AbstractRegionTest
     public function testUnlockWithExistingLock()
     {
         $key    = new CacheKeyMock('key');
-        $entry  = new CacheEntryMock(array('foo' => 'bar'));
+        $entry  = new CacheEntryMock(['foo' => 'bar']);
         $file   = $this->getFileName($this->region, $key);
 
         $this->assertFalse($this->region->contains($key));
@@ -143,7 +143,7 @@ class FileLockRegionTest extends AbstractRegionTest
     public function testPutWithExistingLock()
     {
         $key    = new CacheKeyMock('key');
-        $entry  = new CacheEntryMock(array('foo' => 'bar'));
+        $entry  = new CacheEntryMock(['foo' => 'bar']);
         $file   = $this->getFileName($this->region, $key);
 
         $this->assertFalse($this->region->contains($key));
@@ -166,7 +166,7 @@ class FileLockRegionTest extends AbstractRegionTest
     public function testLockedEvict()
     {
         $key    = new CacheKeyMock('key');
-        $entry  = new CacheEntryMock(array('foo' => 'bar'));
+        $entry  = new CacheEntryMock(['foo' => 'bar']);
         $file   = $this->getFileName($this->region, $key);
 
         $this->assertFalse($this->region->contains($key));
@@ -186,11 +186,11 @@ class FileLockRegionTest extends AbstractRegionTest
     public function testLockedEvictAll()
     {
         $key1    = new CacheKeyMock('key1');
-        $entry1  = new CacheEntryMock(array('foo1' => 'bar1'));
+        $entry1  = new CacheEntryMock(['foo1' => 'bar1']);
         $file1   = $this->getFileName($this->region, $key1);
 
         $key2    = new CacheKeyMock('key2');
-        $entry2  = new CacheEntryMock(array('foo2' => 'bar2'));
+        $entry2  = new CacheEntryMock(['foo2' => 'bar2']);
         $file2   = $this->getFileName($this->region, $key2);
 
         $this->assertFalse($this->region->contains($key1));
@@ -222,7 +222,7 @@ class FileLockRegionTest extends AbstractRegionTest
     public function testLockLifetime()
     {
         $key    = new CacheKeyMock('key');
-        $entry  = new CacheEntryMock(array('foo' => 'bar'));
+        $entry  = new CacheEntryMock(['foo' => 'bar']);
         $file   = $this->getFileName($this->region, $key);
         $property = new \ReflectionProperty($this->region, 'lockLifetime');
 
diff --git a/tests/Doctrine/Tests/ORM/Cache/MultiGetRegionTest.php b/tests/Doctrine/Tests/ORM/Cache/MultiGetRegionTest.php
index 65d21b93f..0d98665d0 100644
--- a/tests/Doctrine/Tests/ORM/Cache/MultiGetRegionTest.php
+++ b/tests/Doctrine/Tests/ORM/Cache/MultiGetRegionTest.php
@@ -20,10 +20,10 @@ class MultiGetRegionTest extends AbstractRegionTest
     public function testGetMulti()
     {
         $key1 = new CacheKeyMock('key.1');
-        $value1 = new CacheEntryMock(array('id' => 1, 'name' => 'bar'));
+        $value1 = new CacheEntryMock(['id' => 1, 'name' => 'bar']);
 
         $key2 = new CacheKeyMock('key.2');
-        $value2 = new CacheEntryMock(array('id' => 2, 'name' => 'bar'));
+        $value2 = new CacheEntryMock(['id' => 2, 'name' => 'bar']);
 
         $this->assertFalse($this->region->contains($key1));
         $this->assertFalse($this->region->contains($key2));
@@ -34,7 +34,7 @@ class MultiGetRegionTest extends AbstractRegionTest
         $this->assertTrue($this->region->contains($key1));
         $this->assertTrue($this->region->contains($key2));
 
-        $actual = $this->region->getMultiple(new CollectionCacheEntry(array($key1, $key2)));
+        $actual = $this->region->getMultiple(new CollectionCacheEntry([$key1, $key2]));
 
         $this->assertEquals($value1, $actual[0]);
         $this->assertEquals($value2, $actual[1]);
diff --git a/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/AbstractCollectionPersisterTest.php b/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/AbstractCollectionPersisterTest.php
index adc8ec0ba..681b43f0b 100644
--- a/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/AbstractCollectionPersisterTest.php
+++ b/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/AbstractCollectionPersisterTest.php
@@ -35,7 +35,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase
     /**
      * @var array
      */
-    protected $regionMockMethods = array(
+    protected $regionMockMethods = [
         'getName',
         'contains',
         'get',
@@ -43,12 +43,12 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase
         'put',
         'evict',
         'evictAll'
-    );
+    ];
 
     /**
      * @var array
      */
-    protected $collectionPersisterMockMethods = array(
+    protected $collectionPersisterMockMethods = [
         'delete',
         'update',
         'count',
@@ -60,7 +60,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase
         'get',
         'getMultiple',
         'loadCriteria'
-    );
+    ];
 
     /**
      * @param \Doctrine\ORM\EntityManager                             $em
@@ -133,7 +133,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase
         $persister  = $this->createPersisterDefault();
         $collection = $this->createCollection($entity);
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $this->collectionPersister->expects($this->once())
             ->method('delete')
@@ -150,7 +150,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase
 
         $collection->setDirty(true);
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $this->collectionPersister->expects($this->once())
             ->method('update')
@@ -165,7 +165,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase
         $persister  = $this->createPersisterDefault();
         $collection = $this->createCollection($entity);
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $this->collectionPersister->expects($this->once())
             ->method('count')
@@ -182,7 +182,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase
         $collection = $this->createCollection($entity);
         $slice      = $this->createCollection($entity);
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $this->collectionPersister->expects($this->once())
             ->method('slice')
@@ -199,7 +199,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase
         $persister  = $this->createPersisterDefault();
         $collection = $this->createCollection($entity);
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $this->collectionPersister->expects($this->once())
             ->method('contains')
@@ -215,7 +215,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase
         $persister  = $this->createPersisterDefault();
         $collection = $this->createCollection($entity);
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $this->collectionPersister->expects($this->once())
             ->method('containsKey')
@@ -232,7 +232,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase
         $persister  = $this->createPersisterDefault();
         $collection = $this->createCollection($entity);
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $this->collectionPersister->expects($this->once())
             ->method('removeElement')
@@ -249,7 +249,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase
         $persister  = $this->createPersisterDefault();
         $collection = $this->createCollection($entity);
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $this->collectionPersister->expects($this->once())
             ->method('get')
diff --git a/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersisterTest.php b/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersisterTest.php
index b41d27ab1..1c1e12b6d 100644
--- a/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersisterTest.php
+++ b/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersisterTest.php
@@ -16,7 +16,7 @@ use Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister;
  */
 class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersisterTest
 {
-    protected $regionMockMethods = array(
+    protected $regionMockMethods = [
         'getName',
         'contains',
         'get',
@@ -26,7 +26,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister
         'evictAll',
         'lock',
         'unlock',
-    );
+    ];
 
     /**
      * {@inheritdoc}
@@ -52,14 +52,14 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister
         $lock       = Lock::createLockRead();
         $persister  = $this->createPersisterDefault();
         $collection = $this->createCollection($entity);
-        $key        = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>1));
+        $key        = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]);
 
         $this->region->expects($this->once())
             ->method('lock')
             ->with($this->equalTo($key))
             ->will($this->returnValue($lock));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->delete($collection);
     }
@@ -70,14 +70,14 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister
         $lock       = Lock::createLockRead();
         $persister  = $this->createPersisterDefault();
         $collection = $this->createCollection($entity);
-        $key        = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>1));
+        $key        = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]);
 
         $this->region->expects($this->once())
             ->method('lock')
             ->with($this->equalTo($key))
             ->will($this->returnValue($lock));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->update($collection);
     }
@@ -88,7 +88,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister
         $lock       = Lock::createLockRead();
         $persister  = $this->createPersisterDefault();
         $collection = $this->createCollection($entity);
-        $key        = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>1));
+        $key        = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]);
 
         $this->region->expects($this->once())
             ->method('lock')
@@ -100,7 +100,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister
             ->with($this->equalTo($key))
             ->will($this->returnValue($lock));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->update($collection);
         $persister->afterTransactionRolledBack();
@@ -112,7 +112,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister
         $lock       = Lock::createLockRead();
         $persister  = $this->createPersisterDefault();
         $collection = $this->createCollection($entity);
-        $key        = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>1));
+        $key        = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]);
 
         $this->region->expects($this->once())
             ->method('lock')
@@ -123,7 +123,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister
             ->method('evict')
             ->with($this->equalTo($key));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->delete($collection);
         $persister->afterTransactionRolledBack();
@@ -135,7 +135,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister
         $lock       = Lock::createLockRead();
         $persister  = $this->createPersisterDefault();
         $collection = $this->createCollection($entity);
-        $key        = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>1));
+        $key        = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]);
         $property   = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister', 'queuedCache');
 
         $property->setAccessible(true);
@@ -149,7 +149,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister
             ->method('evict')
             ->with($this->equalTo($key));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->delete($collection);
 
@@ -166,7 +166,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister
         $lock       = Lock::createLockRead();
         $persister  = $this->createPersisterDefault();
         $collection = $this->createCollection($entity);
-        $key        = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>1));
+        $key        = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]);
         $property   = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister', 'queuedCache');
 
         $property->setAccessible(true);
@@ -180,7 +180,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister
             ->method('evict')
             ->with($this->equalTo($key));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->update($collection);
 
@@ -197,7 +197,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister
         $lock       = Lock::createLockRead();
         $persister  = $this->createPersisterDefault();
         $collection = $this->createCollection($entity);
-        $key        = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>1));
+        $key        = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]);
         $property   = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister', 'queuedCache');
 
         $property->setAccessible(true);
@@ -211,7 +211,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister
             ->method('evict')
             ->with($this->equalTo($key));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->delete($collection);
 
@@ -228,7 +228,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister
         $lock       = Lock::createLockRead();
         $persister  = $this->createPersisterDefault();
         $collection = $this->createCollection($entity);
-        $key        = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>1));
+        $key        = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]);
         $property   = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister', 'queuedCache');
 
         $property->setAccessible(true);
@@ -242,7 +242,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister
             ->method('evict')
             ->with($this->equalTo($key));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->update($collection);
 
@@ -258,7 +258,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister
         $entity     = new State("Foo");
         $persister  = $this->createPersisterDefault();
         $collection = $this->createCollection($entity);
-        $key        = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>1));
+        $key        = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]);
         $property   = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister', 'queuedCache');
 
         $property->setAccessible(true);
@@ -272,7 +272,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister
             ->method('delete')
             ->with($this->equalTo($collection));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->delete($collection);
         $this->assertCount(0, $property->getValue($persister));
@@ -283,7 +283,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister
         $entity     = new State("Foo");
         $persister  = $this->createPersisterDefault();
         $collection = $this->createCollection($entity);
-        $key        = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>1));
+        $key        = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]);
         $property   = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister', 'queuedCache');
 
         $property->setAccessible(true);
@@ -297,7 +297,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister
             ->method('update')
             ->with($this->equalTo($collection));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->update($collection);
         $this->assertCount(0, $property->getValue($persister));
diff --git a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/AbstractEntityPersisterTest.php b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/AbstractEntityPersisterTest.php
index 83fd3ad85..7e4d83663 100644
--- a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/AbstractEntityPersisterTest.php
+++ b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/AbstractEntityPersisterTest.php
@@ -38,7 +38,7 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
     /**
      * @var array
      */
-    protected $regionMockMethods = array(
+    protected $regionMockMethods = [
         'getName',
         'contains',
         'get',
@@ -46,12 +46,12 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
         'put',
         'evict',
         'evictAll'
-    );
+    ];
 
     /**
      * @var array
      */
-    protected $entityPersisterMockMethods = array(
+    protected $entityPersisterMockMethods = [
         'getClassMetadata',
         'getResultSetMapping',
         'getInserts',
@@ -79,7 +79,7 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
         'lock',
         'getOneToManyCollection',
         'exists'
-    );
+    ];
 
     /**
      * @param \Doctrine\ORM\EntityManager                     $em
@@ -150,9 +150,9 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
 
         $this->entityPersister->expects($this->once())
             ->method('getInserts')
-            ->will($this->returnValue(array($entity)));
+            ->will($this->returnValue([$entity]));
 
-        $this->assertEquals(array($entity), $persister->getInserts());
+        $this->assertEquals([$entity], $persister->getInserts());
     }
 
     public function testInvokeGetSelectSQL()
@@ -161,10 +161,14 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
 
         $this->entityPersister->expects($this->once())
             ->method('getSelectSQL')
-            ->with($this->equalTo(array('name'=>'Foo')), $this->equalTo(array(0)), $this->equalTo(1), $this->equalTo(2), $this->equalTo(3), $this->equalTo(array(4)))
+            ->with($this->equalTo(['name'=>'Foo']), $this->equalTo([0]), $this->equalTo(1), $this->equalTo(2), $this->equalTo(3), $this->equalTo(
+                [4]
+            ))
             ->will($this->returnValue('SELECT * FROM foo WERE name = ?'));
 
-        $this->assertEquals('SELECT * FROM foo WERE name = ?', $persister->getSelectSQL(array('name'=>'Foo'), array(0), 1, 2, 3, array(4)));
+        $this->assertEquals('SELECT * FROM foo WERE name = ?', $persister->getSelectSQL(
+            ['name'=>'Foo'], [0], 1, 2, 3, [4]
+        ));
     }
 
     public function testInvokeGetInsertSQL()
@@ -184,10 +188,10 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
 
         $this->entityPersister->expects($this->once())
             ->method('expandParameters')
-            ->with($this->equalTo(array('name'=>'Foo')))
-            ->will($this->returnValue(array('name'=>'Foo')));
+            ->with($this->equalTo(['name'=>'Foo']))
+            ->will($this->returnValue(['name'=>'Foo']));
 
-        $this->assertEquals(array('name'=>'Foo'), $persister->expandParameters(array('name'=>'Foo')));
+        $this->assertEquals(['name'=>'Foo'], $persister->expandParameters(['name'=>'Foo']));
     }
 
     public function testInvokeExpandCriteriaParameters()
@@ -198,9 +202,9 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
         $this->entityPersister->expects($this->once())
             ->method('expandCriteriaParameters')
             ->with($this->equalTo($criteria))
-            ->will($this->returnValue(array('name'=>'Foo')));
+            ->will($this->returnValue(['name'=>'Foo']));
 
-        $this->assertEquals(array('name'=>'Foo'), $persister->expandCriteriaParameters($criteria));
+        $this->assertEquals(['name'=>'Foo'], $persister->expandCriteriaParameters($criteria));
     }
 
     public function testInvokeSelectConditionStatementSQL()
@@ -209,10 +213,10 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
 
         $this->entityPersister->expects($this->once())
             ->method('getSelectConditionStatementSQL')
-            ->with($this->equalTo('id'), $this->equalTo(1), $this->equalTo(array()), $this->equalTo('='))
+            ->with($this->equalTo('id'), $this->equalTo(1), $this->equalTo([]), $this->equalTo('='))
             ->will($this->returnValue('name = 1'));
 
-        $this->assertEquals('name = 1', $persister->getSelectConditionStatementSQL('id', 1, array(), '='));
+        $this->assertEquals('name = 1', $persister->getSelectConditionStatementSQL('id', 1, [], '='));
     }
 
     public function testInvokeExecuteInserts()
@@ -221,9 +225,9 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
 
         $this->entityPersister->expects($this->once())
             ->method('executeInserts')
-            ->will($this->returnValue(array('id' => 1)));
+            ->will($this->returnValue(['id' => 1]));
 
-        $this->assertEquals(array('id' => 1), $persister->executeInserts());
+        $this->assertEquals(['id' => 1], $persister->executeInserts());
     }
 
     public function testInvokeUpdate()
@@ -235,7 +239,7 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
             ->method('update')
             ->with($this->equalTo($entity));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $this->assertNull($persister->update($entity));
     }
@@ -249,7 +253,7 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
             ->method('delete')
             ->with($this->equalTo($entity));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $this->assertNull($persister->delete($entity));
     }
@@ -273,10 +277,14 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
 
         $this->entityPersister->expects($this->once())
             ->method('load')
-            ->with($this->equalTo(array('id' => 1)), $this->equalTo($entity), $this->equalTo(array(0)), $this->equalTo(array(1)), $this->equalTo(2), $this->equalTo(3), $this->equalTo(array(4)))
+            ->with($this->equalTo(['id' => 1]), $this->equalTo($entity), $this->equalTo([0]), $this->equalTo(
+                [1]
+            ), $this->equalTo(2), $this->equalTo(3), $this->equalTo(
+                [4]
+            ))
             ->will($this->returnValue($entity));
 
-        $this->assertEquals($entity, $persister->load(array('id' => 1), $entity, array(0), array(1), 2, 3, array(4)));
+        $this->assertEquals($entity, $persister->load(['id' => 1], $entity, [0], [1], 2, 3, [4]));
     }
 
     public function testInvokeLoadAll()
@@ -287,18 +295,18 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
 
         $rsm->addEntityResult(Country::CLASSNAME, 'c');
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $this->entityPersister->expects($this->once())
             ->method('loadAll')
-            ->with($this->equalTo(array('id' => 1)), $this->equalTo(array(0)), $this->equalTo(1), $this->equalTo(2))
-            ->will($this->returnValue(array($entity)));
+            ->with($this->equalTo(['id' => 1]), $this->equalTo([0]), $this->equalTo(1), $this->equalTo(2))
+            ->will($this->returnValue([$entity]));
 
         $this->entityPersister->expects($this->once())
             ->method('getResultSetMapping')
             ->will($this->returnValue($rsm));
 
-        $this->assertEquals(array($entity), $persister->loadAll(array('id' => 1), array(0), 1, 2));
+        $this->assertEquals([$entity], $persister->loadAll(['id' => 1], [0], 1, 2));
     }
 
     public function testInvokeLoadById()
@@ -308,10 +316,10 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
 
         $this->entityPersister->expects($this->once())
             ->method('loadById')
-            ->with($this->equalTo(array('id' => 1)), $this->equalTo($entity))
+            ->with($this->equalTo(['id' => 1]), $this->equalTo($entity))
             ->will($this->returnValue($entity));
 
-        $this->assertEquals($entity, $persister->loadById(array('id' => 1), $entity));
+        $this->assertEquals($entity, $persister->loadById(['id' => 1], $entity));
     }
 
     public function testInvokeLoadOneToOneEntity()
@@ -321,10 +329,10 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
 
         $this->entityPersister->expects($this->once())
             ->method('loadOneToOneEntity')
-            ->with($this->equalTo(array()), $this->equalTo('foo'), $this->equalTo(array('id' => 11)))
+            ->with($this->equalTo([]), $this->equalTo('foo'), $this->equalTo(['id' => 11]))
             ->will($this->returnValue($entity));
 
-        $this->assertEquals($entity, $persister->loadOneToOneEntity(array(), 'foo', array('id' => 11)));
+        $this->assertEquals($entity, $persister->loadOneToOneEntity([], 'foo', ['id' => 11]));
     }
 
     public function testInvokeRefresh()
@@ -334,10 +342,10 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
 
         $this->entityPersister->expects($this->once())
             ->method('refresh')
-            ->with($this->equalTo(array('id' => 1)), $this->equalTo($entity), $this->equalTo(0))
+            ->with($this->equalTo(['id' => 1]), $this->equalTo($entity), $this->equalTo(0))
             ->will($this->returnValue($entity));
 
-        $this->assertNull($persister->refresh(array('id' => 1), $entity), 0);
+        $this->assertNull($persister->refresh(['id' => 1], $entity), 0);
     }
 
     public function testInvokeLoadCriteria()
@@ -347,7 +355,7 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
         $entity    = new Country("Foo");
         $criteria  = new Criteria();
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
         $rsm->addEntityResult(Country::CLASSNAME, 'c');
 
         $this->entityPersister->expects($this->once())
@@ -357,9 +365,9 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
         $this->entityPersister->expects($this->once())
             ->method('loadCriteria')
             ->with($this->equalTo($criteria))
-            ->will($this->returnValue(array($entity)));
+            ->will($this->returnValue([$entity]));
 
-        $this->assertEquals(array($entity), $persister->loadCriteria($criteria));
+        $this->assertEquals([$entity], $persister->loadCriteria($criteria));
     }
 
     public function testInvokeGetManyToManyCollection()
@@ -369,10 +377,10 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
 
         $this->entityPersister->expects($this->once())
             ->method('getManyToManyCollection')
-            ->with($this->equalTo(array()), $this->equalTo('Foo'), $this->equalTo(1), $this->equalTo(2))
-            ->will($this->returnValue(array($entity)));
+            ->with($this->equalTo([]), $this->equalTo('Foo'), $this->equalTo(1), $this->equalTo(2))
+            ->will($this->returnValue([$entity]));
 
-        $this->assertEquals(array($entity), $persister->getManyToManyCollection(array(), 'Foo', 1 ,2));
+        $this->assertEquals([$entity], $persister->getManyToManyCollection([], 'Foo', 1 ,2));
     }
 
     public function testInvokeGetOneToManyCollection()
@@ -382,16 +390,16 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
 
         $this->entityPersister->expects($this->once())
             ->method('getOneToManyCollection')
-            ->with($this->equalTo(array()), $this->equalTo('Foo'), $this->equalTo(1), $this->equalTo(2))
-            ->will($this->returnValue(array($entity)));
+            ->with($this->equalTo([]), $this->equalTo('Foo'), $this->equalTo(1), $this->equalTo(2))
+            ->will($this->returnValue([$entity]));
 
-        $this->assertEquals(array($entity), $persister->getOneToManyCollection(array(), 'Foo', 1 ,2));
+        $this->assertEquals([$entity], $persister->getOneToManyCollection([], 'Foo', 1 ,2));
     }
 
     public function testInvokeLoadManyToManyCollection()
     {
         $mapping   = $this->em->getClassMetadata('Doctrine\Tests\Models\Cache\Country');
-        $assoc     = array('type' => 1);
+        $assoc     = ['type' => 1];
         $coll      = new PersistentCollection($this->em, $mapping, new ArrayCollection());
         $persister = $this->createPersisterDefault();
         $entity    = new Country("Foo");
@@ -399,15 +407,15 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
         $this->entityPersister->expects($this->once())
             ->method('loadManyToManyCollection')
             ->with($this->equalTo($assoc), $this->equalTo('Foo'), $coll)
-            ->will($this->returnValue(array($entity)));
+            ->will($this->returnValue([$entity]));
 
-        $this->assertEquals(array($entity), $persister->loadManyToManyCollection($assoc, 'Foo', $coll));
+        $this->assertEquals([$entity], $persister->loadManyToManyCollection($assoc, 'Foo', $coll));
     }
 
     public function testInvokeLoadOneToManyCollection()
     {
         $mapping   = $this->em->getClassMetadata('Doctrine\Tests\Models\Cache\Country');
-        $assoc     = array('type' => 1);
+        $assoc     = ['type' => 1];
         $coll      = new PersistentCollection($this->em, $mapping, new ArrayCollection());
         $persister = $this->createPersisterDefault();
         $entity    = new Country("Foo");
@@ -415,14 +423,14 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase
         $this->entityPersister->expects($this->once())
             ->method('loadOneToManyCollection')
             ->with($this->equalTo($assoc), $this->equalTo('Foo'), $coll)
-            ->will($this->returnValue(array($entity)));
+            ->will($this->returnValue([$entity]));
 
-        $this->assertEquals(array($entity), $persister->loadOneToManyCollection($assoc, 'Foo', $coll));
+        $this->assertEquals([$entity], $persister->loadOneToManyCollection($assoc, 'Foo', $coll));
     }
 
     public function testInvokeLock()
     {
-        $identifier = array('id' => 1);
+        $identifier = ['id' => 1];
         $persister  = $this->createPersisterDefault();
 
         $this->entityPersister->expects($this->once())
diff --git a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersisterTest.php b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersisterTest.php
index df1f6ac59..ad05020e6 100644
--- a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersisterTest.php
+++ b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersisterTest.php
@@ -32,7 +32,7 @@ class NonStrictReadWriteCachedEntityPersisterTest extends AbstractEntityPersiste
 
         $property->setAccessible(true);
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->update($entity);
         $persister->delete($entity);
@@ -48,8 +48,8 @@ class NonStrictReadWriteCachedEntityPersisterTest extends AbstractEntityPersiste
     {
         $entity    = new Country("Foo");
         $persister = $this->createPersisterDefault();
-        $key       = new EntityCacheKey(Country::CLASSNAME, array('id'=>1));
-        $entry     = new EntityCacheEntry(Country::CLASSNAME, array('id'=>1, 'name'=>'Foo'));
+        $key       = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]);
+        $entry     = new EntityCacheEntry(Country::CLASSNAME, ['id'=>1, 'name'=>'Foo']);
         $property  = new \ReflectionProperty($persister, 'queuedCache');
 
         $property->setAccessible(true);
@@ -64,12 +64,12 @@ class NonStrictReadWriteCachedEntityPersisterTest extends AbstractEntityPersiste
 
         $this->entityPersister->expects($this->once())
             ->method('getInserts')
-            ->will($this->returnValue(array($entity)));
+            ->will($this->returnValue([$entity]));
 
         $this->entityPersister->expects($this->once())
             ->method('executeInserts');
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->addInsert($entity);
         $persister->executeInserts();
@@ -85,8 +85,8 @@ class NonStrictReadWriteCachedEntityPersisterTest extends AbstractEntityPersiste
     {
         $entity    = new Country("Foo");
         $persister = $this->createPersisterDefault();
-        $key       = new EntityCacheKey(Country::CLASSNAME, array('id'=>1));
-        $entry     = new EntityCacheEntry(Country::CLASSNAME, array('id'=>1, 'name'=>'Foo'));
+        $key       = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]);
+        $entry     = new EntityCacheEntry(Country::CLASSNAME, ['id'=>1, 'name'=>'Foo']);
         $property  = new \ReflectionProperty($persister, 'queuedCache');
 
         $property->setAccessible(true);
@@ -99,7 +99,7 @@ class NonStrictReadWriteCachedEntityPersisterTest extends AbstractEntityPersiste
             ->method('update')
             ->with($this->equalTo($entity));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->update($entity);
 
@@ -114,7 +114,7 @@ class NonStrictReadWriteCachedEntityPersisterTest extends AbstractEntityPersiste
     {
         $entity    = new Country("Foo");
         $persister = $this->createPersisterDefault();
-        $key       = new EntityCacheKey(Country::CLASSNAME, array('id'=>1));
+        $key       = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]);
         $property  = new \ReflectionProperty($persister, 'queuedCache');
 
         $property->setAccessible(true);
@@ -127,7 +127,7 @@ class NonStrictReadWriteCachedEntityPersisterTest extends AbstractEntityPersiste
             ->method('delete')
             ->with($this->equalTo($entity));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->delete($entity);
 
diff --git a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersisterTest.php b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersisterTest.php
index dc9fef43a..d90fd678b 100644
--- a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersisterTest.php
+++ b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersisterTest.php
@@ -17,7 +17,7 @@ use Doctrine\ORM\Cache\Persister\Entity\ReadWriteCachedEntityPersister;
  */
 class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest
 {
-    protected $regionMockMethods = array(
+    protected $regionMockMethods = [
         'getName',
         'contains',
         'get',
@@ -27,7 +27,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest
         'evictAll',
         'lock',
         'unlock',
-    );
+    ];
 
     /**
      * {@inheritdoc}
@@ -52,14 +52,14 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest
         $entity    = new Country("Foo");
         $lock      = Lock::createLockRead();
         $persister = $this->createPersisterDefault();
-        $key       = new EntityCacheKey(Country::CLASSNAME, array('id'=>1));
+        $key       = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]);
 
         $this->region->expects($this->once())
             ->method('lock')
             ->with($this->equalTo($key))
             ->will($this->returnValue($lock));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->delete($entity);
     }
@@ -69,14 +69,14 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest
         $entity    = new Country("Foo");
         $lock      = Lock::createLockRead();
         $persister = $this->createPersisterDefault();
-        $key       = new EntityCacheKey(Country::CLASSNAME, array('id'=>1));
+        $key       = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]);
 
         $this->region->expects($this->once())
             ->method('lock')
             ->with($this->equalTo($key))
             ->will($this->returnValue($lock));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->update($entity);
     }
@@ -86,7 +86,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest
         $entity    = new Country("Foo");
         $lock      = Lock::createLockRead();
         $persister = $this->createPersisterDefault();
-        $key       = new EntityCacheKey(Country::CLASSNAME, array('id'=>1));
+        $key       = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]);
 
         $this->region->expects($this->once())
             ->method('lock')
@@ -98,7 +98,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest
             ->with($this->equalTo($key))
             ->will($this->returnValue($lock));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->update($entity);
         $persister->afterTransactionRolledBack();
@@ -109,7 +109,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest
         $entity    = new Country("Foo");
         $lock      = Lock::createLockRead();
         $persister = $this->createPersisterDefault();
-        $key       = new EntityCacheKey(Country::CLASSNAME, array('id'=>1));
+        $key       = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]);
 
         $this->region->expects($this->once())
             ->method('lock')
@@ -120,7 +120,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest
             ->method('evict')
             ->with($this->equalTo($key));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->delete($entity);
         $persister->afterTransactionRolledBack();
@@ -131,7 +131,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest
         $entity    = new Country("Foo");
         $lock      = Lock::createLockRead();
         $persister = $this->createPersisterDefault();
-        $key       = new EntityCacheKey(Country::CLASSNAME, array('id'=>1));
+        $key       = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]);
         $property  = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Entity\ReadWriteCachedEntityPersister', 'queuedCache');
 
         $property->setAccessible(true);
@@ -145,7 +145,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest
             ->method('evict')
             ->with($this->equalTo($key));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->update($entity);
         $persister->delete($entity);
@@ -162,7 +162,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest
         $entity    = new Country("Foo");
         $lock      = Lock::createLockRead();
         $persister = $this->createPersisterDefault();
-        $key       = new EntityCacheKey(Country::CLASSNAME, array('id'=>1));
+        $key       = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]);
         $property  = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Entity\ReadWriteCachedEntityPersister', 'queuedCache');
 
         $property->setAccessible(true);
@@ -176,7 +176,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest
             ->method('evict')
             ->with($this->equalTo($key));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->update($entity);
         $persister->delete($entity);
@@ -192,7 +192,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest
     {
         $entity    = new Country("Foo");
         $persister = $this->createPersisterDefault();
-        $key       = new EntityCacheKey(Country::CLASSNAME, array('id'=>1));
+        $key       = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]);
         $property  = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Entity\ReadWriteCachedEntityPersister', 'queuedCache');
 
         $property->setAccessible(true);
@@ -206,7 +206,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest
             ->method('delete')
             ->with($this->equalTo($entity));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->delete($entity);
         $this->assertCount(0, $property->getValue($persister));
@@ -216,7 +216,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest
     {
         $entity    = new Country("Foo");
         $persister = $this->createPersisterDefault();
-        $key       = new EntityCacheKey(Country::CLASSNAME, array('id'=>1));
+        $key       = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]);
         $property  = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Entity\ReadWriteCachedEntityPersister', 'queuedCache');
 
         $property->setAccessible(true);
@@ -230,7 +230,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest
             ->method('update')
             ->with($this->equalTo($entity));
 
-        $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo'));
+        $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']);
 
         $persister->update($entity);
         $this->assertCount(0, $property->getValue($persister));
diff --git a/tests/Doctrine/Tests/ORM/Cache/StatisticsCacheLoggerTest.php b/tests/Doctrine/Tests/ORM/Cache/StatisticsCacheLoggerTest.php
index 16c91729b..0d5a72237 100644
--- a/tests/Doctrine/Tests/ORM/Cache/StatisticsCacheLoggerTest.php
+++ b/tests/Doctrine/Tests/ORM/Cache/StatisticsCacheLoggerTest.php
@@ -29,7 +29,7 @@ class StatisticsCacheLoggerTest extends DoctrineTestCase
     public function testEntityCache()
     {
         $name = 'my_entity_region';
-        $key  = new EntityCacheKey(State::CLASSNAME, array('id' => 1));
+        $key  = new EntityCacheKey(State::CLASSNAME, ['id' => 1]);
 
         $this->logger->entityCacheHit($name, $key);
         $this->logger->entityCachePut($name, $key);
@@ -46,7 +46,7 @@ class StatisticsCacheLoggerTest extends DoctrineTestCase
     public function testCollectionCache()
     {
         $name = 'my_collection_region';
-        $key  = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id' => 1));
+        $key  = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id' => 1]);
 
         $this->logger->collectionCacheHit($name, $key);
         $this->logger->collectionCachePut($name, $key);
@@ -83,8 +83,8 @@ class StatisticsCacheLoggerTest extends DoctrineTestCase
         $entityRegion = 'my_entity_region';
         $queryRegion  = 'my_query_region';
 
-        $coolKey    = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id' => 1));
-        $entityKey  = new EntityCacheKey(State::CLASSNAME, array('id' => 1));
+        $coolKey    = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id' => 1]);
+        $entityKey  = new EntityCacheKey(State::CLASSNAME, ['id' => 1]);
         $queryKey   = new QueryCacheKey('my_query_hash');
 
         $this->logger->queryCacheHit($queryRegion, $queryKey);
@@ -131,4 +131,4 @@ class StatisticsCacheLoggerTest extends DoctrineTestCase
         $this->assertArrayHasKey($queryRegion, $hit);
         $this->assertArrayHasKey($entityRegion, $hit);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php b/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php
index 770ec7deb..dba00d524 100644
--- a/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php
+++ b/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php
@@ -44,7 +44,7 @@ class CommitOrderCalculatorTest extends OrmTestCase
         $sorted = $this->_calc->sort();
 
         // There is only 1 valid ordering for this constellation
-        $correctOrder = array($class5, $class1, $class2, $class3, $class4);
+        $correctOrder = [$class5, $class1, $class2, $class3, $class4];
 
         $this->assertSame($correctOrder, $sorted);
     }
@@ -63,7 +63,7 @@ class CommitOrderCalculatorTest extends OrmTestCase
         $sorted = $this->_calc->sort();
 
         // There is only 1 valid ordering for this constellation
-        $correctOrder = array($class2, $class1);
+        $correctOrder = [$class2, $class1];
 
         $this->assertSame($correctOrder, $sorted);
     }
diff --git a/tests/Doctrine/Tests/ORM/ConfigurationTest.php b/tests/Doctrine/Tests/ORM/ConfigurationTest.php
index 7d55652df..4988ac9b2 100644
--- a/tests/Doctrine/Tests/ORM/ConfigurationTest.php
+++ b/tests/Doctrine/Tests/ORM/ConfigurationTest.php
@@ -75,7 +75,7 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase
 
     public function testNewDefaultAnnotationDriver()
     {
-        $paths = array(__DIR__);
+        $paths = [__DIR__];
         $reflectionClass = new ReflectionClass(__NAMESPACE__ . '\ConfigurationTestAnnotationReaderChecker');
 
         $annotationDriver = $this->configuration->newDefaultAnnotationDriver($paths, false);
@@ -99,7 +99,7 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase
     {
         $this->configuration->addEntityNamespace('TestNamespace', __NAMESPACE__);
         $this->assertSame(__NAMESPACE__, $this->configuration->getEntityNamespace('TestNamespace'));
-        $namespaces = array('OtherNamespace' => __NAMESPACE__);
+        $namespaces = ['OtherNamespace' => __NAMESPACE__];
         $this->configuration->setEntityNamespaces($namespaces);
         $this->assertSame($namespaces, $this->configuration->getEntityNamespaces());
         $this->expectException(\Doctrine\ORM\ORMException::class);
@@ -259,7 +259,7 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase
         $this->configuration->addCustomStringFunction('FunctionName', __CLASS__);
         $this->assertSame(__CLASS__, $this->configuration->getCustomStringFunction('FunctionName'));
         $this->assertSame(null, $this->configuration->getCustomStringFunction('NonExistingFunction'));
-        $this->configuration->setCustomStringFunctions(array('OtherFunctionName' => __CLASS__));
+        $this->configuration->setCustomStringFunctions(['OtherFunctionName' => __CLASS__]);
         $this->assertSame(__CLASS__, $this->configuration->getCustomStringFunction('OtherFunctionName'));
         $this->expectException(\Doctrine\ORM\ORMException::class);
         $this->configuration->addCustomStringFunction('concat', __CLASS__);
@@ -270,7 +270,7 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase
         $this->configuration->addCustomNumericFunction('FunctionName', __CLASS__);
         $this->assertSame(__CLASS__, $this->configuration->getCustomNumericFunction('FunctionName'));
         $this->assertSame(null, $this->configuration->getCustomNumericFunction('NonExistingFunction'));
-        $this->configuration->setCustomNumericFunctions(array('OtherFunctionName' => __CLASS__));
+        $this->configuration->setCustomNumericFunctions(['OtherFunctionName' => __CLASS__]);
         $this->assertSame(__CLASS__, $this->configuration->getCustomNumericFunction('OtherFunctionName'));
         $this->expectException(\Doctrine\ORM\ORMException::class);
         $this->configuration->addCustomNumericFunction('abs', __CLASS__);
@@ -281,7 +281,7 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase
         $this->configuration->addCustomDatetimeFunction('FunctionName', __CLASS__);
         $this->assertSame(__CLASS__, $this->configuration->getCustomDatetimeFunction('FunctionName'));
         $this->assertSame(null, $this->configuration->getCustomDatetimeFunction('NonExistingFunction'));
-        $this->configuration->setCustomDatetimeFunctions(array('OtherFunctionName' => __CLASS__));
+        $this->configuration->setCustomDatetimeFunctions(['OtherFunctionName' => __CLASS__]);
         $this->assertSame(__CLASS__, $this->configuration->getCustomDatetimeFunction('OtherFunctionName'));
         $this->expectException(\Doctrine\ORM\ORMException::class);
         $this->configuration->addCustomDatetimeFunction('date_add', __CLASS__);
@@ -300,9 +300,9 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase
         $this->assertSame(__CLASS__, $this->configuration->getCustomHydrationMode('HydrationModeName'));
 
         $this->configuration->setCustomHydrationModes(
-            array(
+            [
                 'AnotherHydrationModeName' => __CLASS__
-            )
+            ]
         );
 
         $this->assertNull($this->configuration->getCustomHydrationMode('HydrationModeName'));
diff --git a/tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php b/tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php
index c52ce550c..933580af0 100644
--- a/tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php
@@ -14,7 +14,7 @@ class EntityManagerDecoratorTest extends \PHPUnit_Framework_TestCase
     {
         $this->wrapped = $this->createMock(EntityManagerInterface::class);
         $this->decorator = $this->getMockBuilder('Doctrine\ORM\Decorator\EntityManagerDecorator')
-            ->setConstructorArgs(array($this->wrapped))
+            ->setConstructorArgs([$this->wrapped])
             ->setMethods(null)
             ->getMock();
     }
@@ -23,7 +23,7 @@ class EntityManagerDecoratorTest extends \PHPUnit_Framework_TestCase
     {
         $class = new \ReflectionClass('Doctrine\ORM\EntityManager');
 
-        $methods = array();
+        $methods = [];
         foreach ($class->getMethods() as $method) {
             if ($method->isConstructor() || $method->isStatic() || !$method->isPublic()) {
                 continue;
@@ -31,17 +31,17 @@ class EntityManagerDecoratorTest extends \PHPUnit_Framework_TestCase
 
             /** Special case EntityManager::createNativeQuery() */
             if ($method->getName() === 'createNativeQuery') {
-                $methods[] = array($method->getName(), array('name', new ResultSetMapping()));
+                $methods[] = [$method->getName(), ['name', new ResultSetMapping()]];
                 continue;
             }
 
             if ($method->getNumberOfRequiredParameters() === 0) {
-                $methods[] = array($method->getName(), array());
+                $methods[] = [$method->getName(), []];
             } elseif ($method->getNumberOfRequiredParameters() > 0) {
-                $methods[] = array($method->getName(), array_fill(0, $method->getNumberOfRequiredParameters(), 'req') ?: array());
+                $methods[] = [$method->getName(), array_fill(0, $method->getNumberOfRequiredParameters(), 'req') ?: []];
             }
             if ($method->getNumberOfParameters() != $method->getNumberOfRequiredParameters()) {
-                $methods[] = array($method->getName(), array_fill(0, $method->getNumberOfParameters(), 'all') ?: array());
+                $methods[] = [$method->getName(), array_fill(0, $method->getNumberOfParameters(), 'all') ?: []];
             }
         }
 
@@ -58,8 +58,8 @@ class EntityManagerDecoratorTest extends \PHPUnit_Framework_TestCase
             ->method($method)
             ->will($this->returnValue('INNER VALUE FROM ' . $method));
 
-        call_user_func_array(array($stub, 'with'), $parameters);
+        call_user_func_array([$stub, 'with'], $parameters);
 
-        $this->assertSame('INNER VALUE FROM ' . $method, call_user_func_array(array($this->decorator, $method), $parameters));
+        $this->assertSame('INNER VALUE FROM ' . $method, call_user_func_array([$this->decorator, $method], $parameters));
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/EntityManagerTest.php b/tests/Doctrine/Tests/ORM/EntityManagerTest.php
index 954a3f2f0..43471b643 100644
--- a/tests/Doctrine/Tests/ORM/EntityManagerTest.php
+++ b/tests/Doctrine/Tests/ORM/EntityManagerTest.php
@@ -139,13 +139,13 @@ class EntityManagerTest extends OrmTestCase
 
     static public function dataMethodsAffectedByNoObjectArguments()
     {
-        return array(
-            array('persist'),
-            array('remove'),
-            array('merge'),
-            array('refresh'),
-            array('detach')
-        );
+        return [
+            ['persist'],
+            ['remove'],
+            ['merge'],
+            ['refresh'],
+            ['detach']
+        ];
     }
 
     /**
@@ -160,13 +160,13 @@ class EntityManagerTest extends OrmTestCase
 
     static public function dataAffectedByErrorIfClosedException()
     {
-        return array(
-            array('flush'),
-            array('persist'),
-            array('remove'),
-            array('merge'),
-            array('refresh'),
-        );
+        return [
+            ['flush'],
+            ['persist'],
+            ['remove'],
+            ['merge'],
+            ['refresh'],
+        ];
     }
 
     /**
@@ -196,7 +196,7 @@ class EntityManagerTest extends OrmTestCase
 
     public function testTransactionalAcceptsVariousCallables()
     {
-        $this->assertSame('callback', $this->_em->transactional(array($this, 'transactionalCallback')));
+        $this->assertSame('callback', $this->_em->transactional([$this, 'transactionalCallback']));
     }
 
     public function testTransactionalThrowsInvalidArgumentExceptionIfNonCallablePassed()
diff --git a/tests/Doctrine/Tests/ORM/EntityNotFoundExceptionTest.php b/tests/Doctrine/Tests/ORM/EntityNotFoundExceptionTest.php
index 7dce1b171..2da4d568f 100644
--- a/tests/Doctrine/Tests/ORM/EntityNotFoundExceptionTest.php
+++ b/tests/Doctrine/Tests/ORM/EntityNotFoundExceptionTest.php
@@ -16,7 +16,7 @@ class EntityNotFoundExceptionTest extends PHPUnit_Framework_TestCase
     {
         $exception = EntityNotFoundException::fromClassNameAndIdentifier(
             'foo',
-            array('foo' => 'bar')
+            ['foo' => 'bar']
         );
 
         $this->assertInstanceOf('Doctrine\ORM\EntityNotFoundException', $exception);
@@ -24,7 +24,7 @@ class EntityNotFoundExceptionTest extends PHPUnit_Framework_TestCase
 
         $exception = EntityNotFoundException::fromClassNameAndIdentifier(
             'foo',
-            array()
+            []
         );
 
         $this->assertInstanceOf('Doctrine\ORM\EntityNotFoundException', $exception);
diff --git a/tests/Doctrine/Tests/ORM/Functional/AbstractManyToManyAssociationTestCase.php b/tests/Doctrine/Tests/ORM/Functional/AbstractManyToManyAssociationTestCase.php
index 37f0fcd29..26445c141 100644
--- a/tests/Doctrine/Tests/ORM/Functional/AbstractManyToManyAssociationTestCase.php
+++ b/tests/Doctrine/Tests/ORM/Functional/AbstractManyToManyAssociationTestCase.php
@@ -31,7 +31,8 @@ class AbstractManyToManyAssociationTestCase extends OrmFunctionalTestCase
               FROM {$this->_table}
              WHERE {$this->_firstField} = ?
                AND {$this->_secondField} = ?
-        ", array($firstId, $secondId))->fetchAll());
+        ", [$firstId, $secondId]
+        )->fetchAll());
     }
 
     public function assertCollectionEquals(Collection $first, Collection $second)
diff --git a/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php
index 5546b285e..e54a23115 100644
--- a/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php
@@ -16,13 +16,15 @@ class AdvancedAssociationTest extends OrmFunctionalTestCase
     protected function setUp() {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Phrase'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\PhraseType'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Definition'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Lemma'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Type')
-            ));
+                ]
+            );
         } catch (\Exception $e) {
             // Swallow all exceptions. We do not test the schema tool here.
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php
index bee055f84..af62cb6d5 100644
--- a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php
@@ -127,7 +127,7 @@ class BasicFunctionalTest extends OrmFunctionalTestCase
 
         // Check that the foreign key has been set
         $userId = $this->_em->getConnection()->executeQuery(
-            "SELECT user_id FROM cms_addresses WHERE id=?", array($address->id)
+            "SELECT user_id FROM cms_addresses WHERE id=?", [$address->id]
         )->fetchColumn();
         $this->assertTrue(is_numeric($userId));
 
@@ -1075,11 +1075,11 @@ class BasicFunctionalTest extends OrmFunctionalTestCase
         $this->_em->persist($userB);
         $this->_em->persist($userC);
 
-        $this->_em->flush(array($userA, $userB, $userB));
+        $this->_em->flush([$userA, $userB, $userB]);
 
         $userC->name = 'changed name';
 
-        $this->_em->flush(array($userA, $userB));
+        $this->_em->flush([$userA, $userB]);
         $this->_em->refresh($userC);
 
         $this->assertTrue($userA->id > 0, 'user a has an id');
diff --git a/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php b/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php
index a2392a3e8..c552139af 100644
--- a/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php
@@ -14,20 +14,24 @@ class CascadeRemoveOrderTest extends OrmFunctionalTestCase
     {
         parent::setUp();
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\CascadeRemoveOrderEntityO'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\CascadeRemoveOrderEntityG'),
-        ));
+            ]
+        );
     }
 
     protected function tearDown()
     {
         parent::tearDown();
 
-        $this->_schemaTool->dropSchema(array(
+        $this->_schemaTool->dropSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\CascadeRemoveOrderEntityO'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\CascadeRemoveOrderEntityG'),
-        ));
+            ]
+        );
     }
 
     public function testSingle()
@@ -153,4 +157,4 @@ class CascadeRemoveOrderEntityG
     {
         return $this->id;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php
index 697f568ff..9d594e8c9 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php
@@ -72,7 +72,7 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase
 
         $this->_em->clear();
 
-        $guilherme = $this->_em->getRepository(get_class($employee))->findOneBy(array('name' => 'Guilherme Blanco'));
+        $guilherme = $this->_em->getRepository(get_class($employee))->findOneBy(['name' => 'Guilherme Blanco']);
         $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $guilherme);
         $this->assertEquals('Guilherme Blanco', $guilherme->getName());
 
@@ -389,12 +389,12 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase
         $this->_em->clear();
 
         $repos = $this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyManager');
-        $pmanager = $repos->findOneBy(array('spouse' => $person->getId()));
+        $pmanager = $repos->findOneBy(['spouse' => $person->getId()]);
 
         $this->assertEquals($manager->getId(), $pmanager->getId());
 
         $repos = $this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyPerson');
-        $pmanager = $repos->findOneBy(array('spouse' => $person->getId()));
+        $pmanager = $repos->findOneBy(['spouse' => $person->getId()]);
 
         $this->assertEquals($manager->getId(), $pmanager->getId());
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php
index 5682bffe1..b7988054d 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php
@@ -15,12 +15,14 @@ class ClassTableInheritanceTest2 extends OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\CTIParent'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\CTIChild'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\CTIRelated'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\CTIRelated2')
-            ));
+                ]
+            );
         } catch (\Exception $ignored) {
             // Swallow all exceptions. We do not test the schema tool here.
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php
index 1df74636c..a461fea19 100644
--- a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php
@@ -30,7 +30,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase
 
     public function putTripAroundEurope()
     {
-        $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', array('lat' => 100, 'long' => 200));
+        $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['lat' => 100, 'long' => 200]);
 
         $tour = new NavTour("Trip around Europe");
         $tour->addPointOfInterest($poi);
@@ -46,7 +46,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase
     {
         $this->putGermanysBrandenburderTor();
 
-        $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', array('lat' => 100, 'long' => 200));
+        $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['lat' => 100, 'long' => 200]);
 
         $this->assertInstanceOf('Doctrine\Tests\Models\Navigation\NavPointOfInterest', $poi);
         $this->assertEquals(100, $poi->getLat());
@@ -61,7 +61,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase
     {
         $this->putGermanysBrandenburderTor();
 
-        $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', array('lat' => 100, 'long' => 200));
+        $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['lat' => 100, 'long' => 200]);
         $photo = new NavPhotos($poi, "asdf");
         $this->_em->persist($photo);
         $this->_em->flush();
@@ -79,7 +79,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase
     {
         $this->putGermanysBrandenburderTor();
 
-        $poi    = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', array('lat' => 100, 'long' => 200));
+        $poi    = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['lat' => 100, 'long' => 200]);
         $photo  = new NavPhotos($poi, "asdf");
         $this->_em->persist($photo);
         $this->_em->flush();
@@ -140,7 +140,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase
         $this->expectException(ORMException::class);
         $this->expectExceptionMessage('The identifier long is missing for a query of Doctrine\Tests\Models\Navigation\NavPointOfInterest');
 
-        $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', array('key1' => 100));
+        $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['key1' => 100]);
     }
 
     public function testUnrecognizedIdentifierFieldsOnGetReference()
@@ -148,7 +148,8 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase
         $this->expectException(ORMException::class);
         $this->expectExceptionMessage("Unrecognized identifier fields: 'key1'");
 
-        $poi = $this->_em->getReference('Doctrine\Tests\Models\Navigation\NavPointOfInterest', array('lat' => 10, 'long' => 20, 'key1' => 100));
+        $poi = $this->_em->getReference('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['lat' => 10, 'long' => 20, 'key1' => 100]
+        );
     }
 
     /**
@@ -158,7 +159,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase
     {
         $this->putGermanysBrandenburderTor();
 
-        $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', array('lat' => 100, 'long' => 200));
+        $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['lat' => 100, 'long' => 200]);
         $poi->addVisitor(new NavUser("test1"));
         $poi->addVisitor(new NavUser("test2"));
 
@@ -169,7 +170,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase
         $this->_em->flush();
         $this->_em->clear();
 
-        $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', array('lat' => 100, 'long' => 200));
+        $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['lat' => 100, 'long' => 200]);
         $this->assertEquals(0, count($poi->getVisitors()));
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyWithAssociationsTest.php b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyWithAssociationsTest.php
index b735925e6..3b5427f05 100644
--- a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyWithAssociationsTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyWithAssociationsTest.php
@@ -44,13 +44,13 @@ class CompositePrimaryKeyWithAssociationsTest extends OrmFunctionalTestCase
         $admin1Repo      = $this->_em->getRepository('Doctrine\Tests\Models\GeoNames\Admin1');
         $admin1NamesRepo = $this->_em->getRepository('Doctrine\Tests\Models\GeoNames\Admin1AlternateName');
 
-        $admin1Rome = $admin1Repo->findOneBy(array('country' => 'IT', 'id' => 1));
+        $admin1Rome = $admin1Repo->findOneBy(['country' => 'IT', 'id' => 1]);
 
-        $names = $admin1NamesRepo->findBy(array('admin1' => $admin1Rome));
+        $names = $admin1NamesRepo->findBy(['admin1' => $admin1Rome]);
         $this->assertCount(2, $names);
 
-        $name1 = $admin1NamesRepo->findOneBy(array('admin1' => $admin1Rome, 'id' => 1));
-        $name2 = $admin1NamesRepo->findOneBy(array('admin1' => $admin1Rome, 'id' => 2));
+        $name1 = $admin1NamesRepo->findOneBy(['admin1' => $admin1Rome, 'id' => 1]);
+        $name2 = $admin1NamesRepo->findOneBy(['admin1' => $admin1Rome, 'id' => 2]);
 
         $this->assertEquals(1, $name1->id);
         $this->assertEquals("Roma", $name1->name);
diff --git a/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTest.php b/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTest.php
index 37149abfd..5d08039e5 100644
--- a/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTest.php
@@ -33,15 +33,15 @@ class DatabaseDriverTest extends DatabaseDriverTestCase
 
         $user = new Table("ddc2059_user");
         $user->addColumn('id', 'integer');
-        $user->setPrimaryKey(array('id'));
+        $user->setPrimaryKey(['id']);
         $project = new Table("ddc2059_project");
         $project->addColumn('id', 'integer');
         $project->addColumn('user_id', 'integer');
         $project->addColumn('user', 'string');
-        $project->setPrimaryKey(array('id'));
-        $project->addForeignKeyConstraint('ddc2059_user', array('user_id'), array('id'));
+        $project->setPrimaryKey(['id']);
+        $project->addForeignKeyConstraint('ddc2059_user', ['user_id'], ['id']);
 
-        $metadata = $this->convertToClassMetadata(array($project, $user), array());
+        $metadata = $this->convertToClassMetadata([$project, $user], []);
 
         $this->assertTrue(isset($metadata['Ddc2059Project']->fieldMappings['user']));
         $this->assertTrue(isset($metadata['Ddc2059Project']->associationMappings['user2']));
@@ -55,12 +55,12 @@ class DatabaseDriverTest extends DatabaseDriverTestCase
 
         $table = new Table("dbdriver_foo");
         $table->addColumn('id', 'integer');
-        $table->setPrimaryKey(array('id'));
-        $table->addColumn('bar', 'string', array('notnull' => false, 'length' => 200));
+        $table->setPrimaryKey(['id']);
+        $table->addColumn('bar', 'string', ['notnull' => false, 'length' => 200]);
 
         $this->_sm->dropAndCreateTable($table);
 
-        $metadatas = $this->extractClassMetadata(array("DbdriverFoo"));
+        $metadatas = $this->extractClassMetadata(["DbdriverFoo"]);
 
         $this->assertArrayHasKey('DbdriverFoo', $metadatas);
         $metadata = $metadatas['DbdriverFoo'];
@@ -86,19 +86,19 @@ class DatabaseDriverTest extends DatabaseDriverTestCase
 
         $tableB = new Table("dbdriver_bar");
         $tableB->addColumn('id', 'integer');
-        $tableB->setPrimaryKey(array('id'));
+        $tableB->setPrimaryKey(['id']);
 
         $this->_sm->dropAndCreateTable($tableB);
 
         $tableA = new Table("dbdriver_baz");
         $tableA->addColumn('id', 'integer');
-        $tableA->setPrimaryKey(array('id'));
+        $tableA->setPrimaryKey(['id']);
         $tableA->addColumn('bar_id', 'integer');
-        $tableA->addForeignKeyConstraint('dbdriver_bar', array('bar_id'), array('id'));
+        $tableA->addForeignKeyConstraint('dbdriver_bar', ['bar_id'], ['id']);
 
         $this->_sm->dropAndCreateTable($tableA);
 
-        $metadatas = $this->extractClassMetadata(array("DbdriverBar", "DbdriverBaz"));
+        $metadatas = $this->extractClassMetadata(["DbdriverBar", "DbdriverBaz"]);
 
         $this->assertArrayHasKey('DbdriverBaz', $metadatas);
         $bazMetadata = $metadatas['DbdriverBaz'];
@@ -118,7 +118,7 @@ class DatabaseDriverTest extends DatabaseDriverTestCase
             $this->markTestSkipped('Platform does not support foreign keys.');
         }
 
-        $metadatas = $this->extractClassMetadata(array("CmsUsers", "CmsGroups", "CmsTags"));
+        $metadatas = $this->extractClassMetadata(["CmsUsers", "CmsGroups", "CmsTags"]);
 
         $this->assertArrayHasKey('CmsUsers', $metadatas, 'CmsUsers entity was not detected.');
         $this->assertArrayHasKey('CmsGroups', $metadatas, 'CmsGroups entity was not detected.');
@@ -136,18 +136,18 @@ class DatabaseDriverTest extends DatabaseDriverTestCase
     {
         $tableB = new Table("dbdriver_bar");
         $tableB->addColumn('id', 'integer');
-        $tableB->setPrimaryKey(array('id'));
+        $tableB->setPrimaryKey(['id']);
 
         $tableA = new Table("dbdriver_baz");
         $tableA->addColumn('id', 'integer');
-        $tableA->setPrimaryKey(array('id'));
+        $tableA->setPrimaryKey(['id']);
 
         $tableMany = new Table("dbdriver_bar_baz");
         $tableMany->addColumn('bar_id', 'integer');
         $tableMany->addColumn('baz_id', 'integer');
-        $tableMany->addForeignKeyConstraint('dbdriver_bar', array('bar_id'), array('id'));
+        $tableMany->addForeignKeyConstraint('dbdriver_bar', ['bar_id'], ['id']);
 
-        $metadatas = $this->convertToClassMetadata(array($tableA, $tableB), array($tableMany));
+        $metadatas = $this->convertToClassMetadata([$tableA, $tableB], [$tableMany]);
 
         $this->assertEquals(0, count($metadatas['DbdriverBaz']->associationMappings), "no association mappings should be detected.");
     }
@@ -160,24 +160,24 @@ class DatabaseDriverTest extends DatabaseDriverTestCase
 
         $table = new Table("dbdriver_foo");
 
-        $table->addColumn('id', 'integer', array('unsigned' => true));
-        $table->setPrimaryKey(array('id'));
-        $table->addColumn('column_unsigned', 'integer', array('unsigned' => true));
-        $table->addColumn('column_comment', 'string', array('comment' => 'test_comment'));
-        $table->addColumn('column_default', 'string', array('default' => 'test_default'));
-        $table->addColumn('column_decimal', 'decimal', array('precision' => 4, 'scale' => 3));
+        $table->addColumn('id', 'integer', ['unsigned' => true]);
+        $table->setPrimaryKey(['id']);
+        $table->addColumn('column_unsigned', 'integer', ['unsigned' => true]);
+        $table->addColumn('column_comment', 'string', ['comment' => 'test_comment']);
+        $table->addColumn('column_default', 'string', ['default' => 'test_default']);
+        $table->addColumn('column_decimal', 'decimal', ['precision' => 4, 'scale' => 3]);
 
         $table->addColumn('column_index1', 'string');
         $table->addColumn('column_index2', 'string');
-        $table->addIndex(array('column_index1','column_index2'), 'index1');
+        $table->addIndex(['column_index1','column_index2'], 'index1');
 
         $table->addColumn('column_unique_index1', 'string');
         $table->addColumn('column_unique_index2', 'string');
-        $table->addUniqueIndex(array('column_unique_index1', 'column_unique_index2'), 'unique_index1');
+        $table->addUniqueIndex(['column_unique_index1', 'column_unique_index2'], 'unique_index1');
 
         $this->_sm->dropAndCreateTable($table);
 
-        $metadatas = $this->extractClassMetadata(array("DbdriverFoo"));
+        $metadatas = $this->extractClassMetadata(["DbdriverFoo"]);
 
         $this->assertArrayHasKey('DbdriverFoo', $metadatas);
 
@@ -208,13 +208,13 @@ class DatabaseDriverTest extends DatabaseDriverTestCase
 
         $this->assertTrue( ! empty($metadata->table['indexes']['index1']['columns']));
         $this->assertEquals(
-            array('column_index1','column_index2'),
+            ['column_index1','column_index2'],
             $metadata->table['indexes']['index1']['columns']
         );
 
         $this->assertTrue( ! empty($metadata->table['uniqueConstraints']['unique_index1']['columns']));
         $this->assertEquals(
-            array('column_unique_index1', 'column_unique_index2'),
+            ['column_unique_index1', 'column_unique_index2'],
             $metadata->table['uniqueConstraints']['unique_index1']['columns']
         );
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTestCase.php b/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTestCase.php
index 03902c40c..89d3cd358 100644
--- a/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTestCase.php
+++ b/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTestCase.php
@@ -11,13 +11,13 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo;
  */
 abstract class DatabaseDriverTestCase extends OrmFunctionalTestCase
 {
-    protected function convertToClassMetadata(array $entityTables, array $manyTables = array())
+    protected function convertToClassMetadata(array $entityTables, array $manyTables = [])
     {
         $sm = $this->_em->getConnection()->getSchemaManager();
         $driver = new DatabaseDriver($sm);
         $driver->setTables($entityTables, $manyTables);
 
-        $metadatas = array();
+        $metadatas = [];
         foreach ($driver->getAllClassNames() AS $className) {
             $class = new ClassMetadataInfo($className);
             $driver->loadMetadataForClass($className, $class);
@@ -34,7 +34,7 @@ abstract class DatabaseDriverTestCase extends OrmFunctionalTestCase
     protected function extractClassMetadata(array $classNames)
     {
         $classNames = array_map('strtolower', $classNames);
-        $metadatas = array();
+        $metadatas = [];
 
         $sm = $this->_em->getConnection()->getSchemaManager();
         $driver = new DatabaseDriver($sm);
diff --git a/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php b/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php
index e81bd7f8a..75c0a20e6 100644
--- a/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php
@@ -14,10 +14,12 @@ class DefaultValuesTest extends OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\DefaultValueUser'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\DefaultValueAddress')
-            ));
+                ]
+            );
         } catch (\Exception $e) {
             // Swallow all exceptions. We do not test the schema tool here.
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/EntityListenersTest.php b/tests/Doctrine/Tests/ORM/Functional/EntityListenersTest.php
index 89901be19..64bc31770 100644
--- a/tests/Doctrine/Tests/ORM/Functional/EntityListenersTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/EntityListenersTest.php
@@ -31,7 +31,7 @@ class EntityListenersTest extends OrmFunctionalTestCase
         $fix = new CompanyFixContract();
         $fix->setFixPrice(2000);
 
-        $this->listener->preFlushCalls  = array();
+        $this->listener->preFlushCalls  = [];
 
         $this->_em->persist($fix);
         $this->_em->flush();
@@ -55,12 +55,12 @@ class EntityListenersTest extends OrmFunctionalTestCase
     {
         $fix = new CompanyFixContract();
         $fix->setFixPrice(2000);
-        
+
         $this->_em->persist($fix);
         $this->_em->flush();
         $this->_em->clear();
 
-        $this->listener->postLoadCalls  = array();
+        $this->listener->postLoadCalls  = [];
 
         $dql = "SELECT f FROM Doctrine\Tests\Models\Company\CompanyFixContract f WHERE f.id = ?1";
         $fix = $this->_em->createQuery($dql)->setParameter(1, $fix->getId())->getSingleResult();
@@ -85,7 +85,7 @@ class EntityListenersTest extends OrmFunctionalTestCase
         $fix = new CompanyFixContract();
         $fix->setFixPrice(2000);
 
-        $this->listener->prePersistCalls  = array();
+        $this->listener->prePersistCalls  = [];
 
         $this->_em->persist($fix);
         $this->_em->flush();
@@ -110,7 +110,7 @@ class EntityListenersTest extends OrmFunctionalTestCase
         $fix = new CompanyFixContract();
         $fix->setFixPrice(2000);
 
-        $this->listener->postPersistCalls = array();
+        $this->listener->postPersistCalls = [];
 
         $this->_em->persist($fix);
         $this->_em->flush();
@@ -138,8 +138,8 @@ class EntityListenersTest extends OrmFunctionalTestCase
         $this->_em->persist($fix);
         $this->_em->flush();
 
-        $this->listener->preUpdateCalls = array();
-        
+        $this->listener->preUpdateCalls = [];
+
         $fix->setFixPrice(2000);
 
         $this->_em->persist($fix);
@@ -168,7 +168,7 @@ class EntityListenersTest extends OrmFunctionalTestCase
         $this->_em->persist($fix);
         $this->_em->flush();
 
-        $this->listener->postUpdateCalls = array();
+        $this->listener->postUpdateCalls = [];
 
         $fix->setFixPrice(2000);
 
@@ -198,7 +198,7 @@ class EntityListenersTest extends OrmFunctionalTestCase
         $this->_em->persist($fix);
         $this->_em->flush();
 
-        $this->listener->preRemoveCalls = array();
+        $this->listener->preRemoveCalls = [];
 
         $this->_em->remove($fix);
         $this->_em->flush();
@@ -226,7 +226,7 @@ class EntityListenersTest extends OrmFunctionalTestCase
         $this->_em->persist($fix);
         $this->_em->flush();
 
-        $this->listener->postRemoveCalls = array();
+        $this->listener->postRemoveCalls = [];
 
         $this->_em->remove($fix);
         $this->_em->flush();
@@ -245,4 +245,4 @@ class EntityListenersTest extends OrmFunctionalTestCase
             $this->listener->postRemoveCalls[0][1]
         );
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php
index 76e269a20..694ad66da 100644
--- a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php
@@ -23,7 +23,7 @@ class EntityRepositoryCriteriaTest extends OrmFunctionalTestCase
     public function tearDown()
     {
         if ($this->_em) {
-            $this->_em->getConfiguration()->setEntityNamespaces(array());
+            $this->_em->getConfiguration()->setEntityNamespaces([]);
         }
         parent::tearDown();
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php
index e0b96387a..2aa25b8c7 100644
--- a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php
@@ -28,7 +28,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
     public function tearDown()
     {
         if ($this->_em) {
-            $this->_em->getConfiguration()->setEntityNamespaces(array());
+            $this->_em->getConfiguration()->setEntityNamespaces([]);
         }
         parent::tearDown();
     }
@@ -92,7 +92,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
         $this->_em->flush();
         $this->_em->clear();
 
-        return array($user->id, $address->id);
+        return [$user->id, $address->id];
     }
 
     public function loadFixtureUserEmail()
@@ -136,7 +136,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
         $this->_em->flush();
         $this->_em->clear();
 
-        return array($user1, $user2, $user3);
+        return [$user1, $user2, $user3];
     }
 
     public function buildUser($name, $username, $status, $address)
@@ -183,7 +183,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
         $user1Id = $this->loadFixture();
         $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
 
-        $users = $repos->findBy(array('status' => 'dev'));
+        $users = $repos->findBy(['status' => 'dev']);
         $this->assertEquals(2, count($users));
         $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser',$users[0]);
         $this->assertEquals('Guilherme', $users[0]->name);
@@ -208,7 +208,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
         $this->_em->clear();
 
         $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress');
-        $addresses  = $repository->findBy(array('user' => array($user1->getId(), $user2->getId())));
+        $addresses  = $repository->findBy(['user' => [$user1->getId(), $user2->getId()]]);
 
         $this->assertEquals(2, count($addresses));
         $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress',$addresses[0]);
@@ -232,7 +232,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
         $this->_em->clear();
 
         $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress');
-        $addresses  = $repository->findBy(array('user' => array($user1, $user2)));
+        $addresses  = $repository->findBy(['user' => [$user1, $user2]]);
 
         $this->assertEquals(2, count($addresses));
         $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress',$addresses[0]);
@@ -277,13 +277,13 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
         $this->loadFixture();
         $repos = $this->_em->getRepository(CmsUser::class);
 
-        $userCount = $repos->count(array());
+        $userCount = $repos->count([]);
         $this->assertSame(4, $userCount);
 
-        $userCount = $repos->count(array('status' => 'dev'));
+        $userCount = $repos->count(['status' => 'dev']);
         $this->assertSame(2, $userCount);
 
-        $userCount = $repos->count(array('status' => 'nonexistent'));
+        $userCount = $repos->count(['status' => 'nonexistent']);
         $this->assertSame(0, $userCount);
     }
 
@@ -405,7 +405,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
         $this->expectException(ORMException::class);
         $this->expectExceptionMessage("You cannot search for the association field 'Doctrine\Tests\Models\CMS\CmsUser#address', because it is the inverse side of an association. Find methods only work on owning side associations.");
 
-        $user = $repos->findBy(array('address' => $addressId));
+        $user = $repos->findBy(['address' => $addressId]);
     }
 
     /**
@@ -415,7 +415,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
     {
         list($userId, $addressId) = $this->loadAssociatedFixture();
         $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress');
-        $address = $repos->findOneBy(array('user' => $userId));
+        $address = $repos->findOneBy(['user' => $userId]);
 
         $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $address);
         $this->assertEquals($addressId, $address->id);
@@ -429,8 +429,8 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
     	$this->loadFixture();
 
     	$repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
-    	$userAsc = $repos->findOneBy(array(), array("username" => "ASC"));
-    	$userDesc = $repos->findOneBy(array(), array("username" => "DESC"));
+    	$userAsc = $repos->findOneBy([], ["username" => "ASC"]);
+    	$userDesc = $repos->findOneBy([], ["username" => "DESC"]);
 
     	$this->assertNotSame($userAsc, $userDesc);
     }
@@ -442,7 +442,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
     {
         list($userId, $addressId) = $this->loadAssociatedFixture();
         $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress');
-        $addresses = $repos->findBy(array('user' => $userId));
+        $addresses = $repos->findBy(['user' => $userId]);
 
         $this->assertContainsOnly('Doctrine\Tests\Models\CMS\CmsAddress', $addresses);
         $this->assertEquals(1, count($addresses));
@@ -501,11 +501,11 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
     public function testIsNullCriteriaDoesNotGenerateAParameter()
     {
         $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
-        $users = $repos->findBy(array('status' => null, 'username' => 'romanb'));
+        $users = $repos->findBy(['status' => null, 'username' => 'romanb']);
 
         $params = $this->_sqlLoggerStack->queries[$this->_sqlLoggerStack->currentQuery]['params'];
         $this->assertEquals(1, count($params), "Should only execute with one parameter.");
-        $this->assertEquals(array('romanb'), $params);
+        $this->assertEquals(['romanb'], $params);
     }
 
     public function testIsNullCriteria()
@@ -514,7 +514,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
 
         $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
 
-        $users = $repos->findBy(array('status' => null));
+        $users = $repos->findBy(['status' => null]);
         $this->assertEquals(1, count($users));
     }
 
@@ -527,10 +527,10 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
 
         $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
 
-        $users1 = $repos->findBy(array(), null, 1, 0);
-        $users2 = $repos->findBy(array(), null, 1, 1);
+        $users1 = $repos->findBy([], null, 1, 0);
+        $users2 = $repos->findBy([], null, 1, 1);
 
-        $this->assertEquals(4, count($repos->findBy(array())));
+        $this->assertEquals(4, count($repos->findBy([])));
         $this->assertEquals(1, count($users1));
         $this->assertEquals(1, count($users2));
         $this->assertNotSame($users1[0], $users2[0]);
@@ -544,8 +544,8 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
         $this->loadFixture();
 
         $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
-        $usersAsc = $repos->findBy(array(), array("username" => "ASC"));
-        $usersDesc = $repos->findBy(array(), array("username" => "DESC"));
+        $usersAsc = $repos->findBy([], ["username" => "ASC"]);
+        $usersDesc = $repos->findBy([], ["username" => "DESC"]);
 
         $this->assertEquals(4, count($usersAsc), "Pre-condition: only four users in fixture");
         $this->assertEquals(4, count($usersDesc), "Pre-condition: only four users in fixture");
@@ -561,8 +561,8 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
         $this->loadFixtureUserEmail();
 
         $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
-        $resultAsc  = $repository->findBy(array(), array('email' => 'ASC'));
-        $resultDesc = $repository->findBy(array(), array('email' => 'DESC'));
+        $resultAsc  = $repository->findBy([], ['email' => 'ASC']);
+        $resultDesc = $repository->findBy([], ['email' => 'DESC']);
 
         $this->assertCount(3, $resultAsc);
         $this->assertCount(3, $resultDesc);
@@ -579,8 +579,8 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
         $this->loadFixture();
         $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
 
-        $usersAsc = $repos->findByStatus('dev', array('username' => "ASC"));
-        $usersDesc = $repos->findByStatus('dev', array('username' => "DESC"));
+        $usersAsc = $repos->findByStatus('dev', ['username' => "ASC"]);
+        $usersDesc = $repos->findByStatus('dev', ['username' => "DESC"]);
 
         $this->assertEquals(2, count($usersAsc));
         $this->assertEquals(2, count($usersDesc));
@@ -601,8 +601,8 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
         $this->loadFixture();
         $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
 
-        $users1 = $repos->findByStatus('dev', array(), 1, 0);
-        $users2 = $repos->findByStatus('dev', array(), 1, 1);
+        $users1 = $repos->findByStatus('dev', [], 1, 0);
+        $users2 = $repos->findByStatus('dev', [], 1, 1);
 
         $this->assertEquals(1, count($users1));
         $this->assertEquals(1, count($users2));
@@ -680,7 +680,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
     public function testInvalidOrderByAssociation()
     {
         $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser')
-            ->findBy(array('status' => 'test'), array('address' => 'ASC'));
+            ->findBy(['status' => 'test'], ['address' => 'ASC']);
     }
 
     /**
@@ -692,7 +692,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
         $this->expectExceptionMessage('Invalid order by orientation specified for Doctrine\Tests\Models\CMS\CmsUser#username');
 
         $repo = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
-        $repo->findBy(array('status' => 'test'), array('username' => 'INVALID'));
+        $repo->findBy(['status' => 'test'], ['username' => 'INVALID']);
     }
 
     /**
@@ -701,10 +701,10 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
     public function testFindByAssociationArray()
     {
         $repo = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsArticle');
-        $data = $repo->findBy(array('user' => array(1, 2, 3)));
+        $data = $repo->findBy(['user' => [1, 2, 3]]);
 
         $query = array_pop($this->_sqlLoggerStack->queries);
-        $this->assertEquals(array(1,2,3), $query['params'][0]);
+        $this->assertEquals([1,2,3], $query['params'][0]);
         $this->assertEquals(Connection::PARAM_INT_ARRAY, $query['types'][0]);
     }
 
@@ -760,7 +760,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
 
         $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
         $users = $repository->matching(new Criteria(
-            Criteria::expr()->in('username', array('beberlei', 'gblanco'))
+            Criteria::expr()->in('username', ['beberlei', 'gblanco'])
         ));
 
         $this->assertEquals(2, count($users));
@@ -775,7 +775,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
 
         $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
         $users = $repository->matching(new Criteria(
-            Criteria::expr()->notIn('username', array('beberlei', 'gblanco', 'asm89'))
+            Criteria::expr()->notIn('username', ['beberlei', 'gblanco', 'asm89'])
         ));
 
         $this->assertEquals(1, count($users));
@@ -874,7 +874,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
         $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $userId);
 
         $criteria = new Criteria(
-            Criteria::expr()->in('user', array($user))
+            Criteria::expr()->in('user', [$user])
         );
 
         $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress');
@@ -941,7 +941,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
         $rsm = $repository->createResultSetMappingBuilder('u');
 
         $this->assertInstanceOf('Doctrine\ORM\Query\ResultSetMappingBuilder', $rsm);
-        $this->assertEquals(array('u' => 'Doctrine\Tests\Models\CMS\CmsUser'), $rsm->aliasMap);
+        $this->assertEquals(['u' => 'Doctrine\Tests\Models\CMS\CmsUser'], $rsm->aliasMap);
     }
 
     /**
@@ -953,7 +953,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
         $this->expectExceptionMessage('Unrecognized field: ');
 
         $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
-        $repository->findBy(array('username = ?; DELETE FROM cms_users; SELECT 1 WHERE 1' => 'test'));
+        $repository->findBy(['username = ?; DELETE FROM cms_users; SELECT 1 WHERE 1' => 'test']);
     }
 
     /**
@@ -965,7 +965,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
         $this->expectExceptionMessage('Unrecognized field: ');
 
         $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
-        $repository->findOneBy(array('username = ?; DELETE FROM cms_users; SELECT 1 WHERE 1' => 'test'));
+        $repository->findOneBy(['username = ?; DELETE FROM cms_users; SELECT 1 WHERE 1' => 'test']);
     }
 
     /**
@@ -994,7 +994,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
         $this->expectExceptionMessage('Unrecognized identifier fields: ');
 
         $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
-        $repository->find(array('username = ?; DELETE FROM cms_users; SELECT 1 WHERE 1' => 'test', 'id' => 1));
+        $repository->find(['username = ?; DELETE FROM cms_users; SELECT 1 WHERE 1' => 'test', 'id' => 1]);
     }
 
     /**
@@ -1016,7 +1016,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
         $this->_em->persist($user2);
         $this->_em->flush();
 
-        $users = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser')->findBy(array('status' => array(null)));
+        $users = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser')->findBy(['status' => [null]]);
 
         $this->assertCount(1, $users);
         $this->assertSame($user1, reset($users));
@@ -1044,7 +1044,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
         $users = $this
             ->_em
             ->getRepository('Doctrine\Tests\Models\CMS\CmsUser')
-            ->findBy(array('status' => array('foo', null)));
+            ->findBy(['status' => ['foo', null]]);
 
         $this->assertCount(1, $users);
         $this->assertSame($user1, reset($users));
@@ -1072,12 +1072,12 @@ class EntityRepositoryTest extends OrmFunctionalTestCase
         $users = $this
             ->_em
             ->getRepository('Doctrine\Tests\Models\CMS\CmsUser')
-            ->findBy(array('status' => array('dbal maintainer', null)));
+            ->findBy(['status' => ['dbal maintainer', null]]);
 
         $this->assertCount(2, $users);
 
         foreach ($users as $user) {
-            $this->assertTrue(in_array($user, array($user1, $user2)));
+            $this->assertTrue(in_array($user, [$user1, $user2]));
         }
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php
index c8af5bd85..c0afab021 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php
@@ -1229,7 +1229,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase
         $this->_em->flush();
         $this->_em->clear();
 
-        return array($user->id, $tweet->id);
+        return [$user->id, $tweet->id];
     }
 
     /**
@@ -1250,6 +1250,6 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase
         $this->_em->flush();
         $this->_em->clear();
 
-        return array($user->id, $userList->id);
+        return [$user->id, $userList->id];
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Functional/IdentityMapTest.php b/tests/Doctrine/Tests/ORM/Functional/IdentityMapTest.php
index 94a11dab4..15929ae27 100644
--- a/tests/Doctrine/Tests/ORM/Functional/IdentityMapTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/IdentityMapTest.php
@@ -82,7 +82,7 @@ class IdentityMapTest extends OrmFunctionalTestCase
         $this->assertSame($user1, $address->user);
 
         //external update to CmsAddress
-        $this->_em->getConnection()->executeUpdate('update cms_addresses set user_id = ?', array($user2->getId()));
+        $this->_em->getConnection()->executeUpdate('update cms_addresses set user_id = ?', [$user2->getId()]);
 
         // But we want to have this external change!
         // Solution 1: refresh(), broken atm!
@@ -125,7 +125,7 @@ class IdentityMapTest extends OrmFunctionalTestCase
         $this->assertSame($user1, $address->user);
 
         //external update to CmsAddress
-        $this->_em->getConnection()->executeUpdate('update cms_addresses set user_id = ?', array($user2->getId()));
+        $this->_em->getConnection()->executeUpdate('update cms_addresses set user_id = ?', [$user2->getId()]);
 
         //select
         $q = $this->_em->createQuery('select a, u from Doctrine\Tests\Models\CMS\CmsAddress a join a.user u');
@@ -181,7 +181,8 @@ class IdentityMapTest extends OrmFunctionalTestCase
         $this->assertFalse($user->getPhonenumbers()->isDirty());
 
         //external update to CmsAddress
-        $this->_em->getConnection()->executeUpdate('insert into cms_phonenumbers (phonenumber, user_id) VALUES (?,?)', array(999, $user->getId()));
+        $this->_em->getConnection()->executeUpdate('insert into cms_phonenumbers (phonenumber, user_id) VALUES (?,?)', [999, $user->getId()]
+        );
 
         //select
         $q = $this->_em->createQuery('select u, p from Doctrine\Tests\Models\CMS\CmsUser u join u.phonenumbers p');
@@ -232,7 +233,8 @@ class IdentityMapTest extends OrmFunctionalTestCase
         $this->assertEquals(3, count($user->getPhonenumbers()));
 
         //external update to CmsAddress
-        $this->_em->getConnection()->executeUpdate('insert into cms_phonenumbers (phonenumber, user_id) VALUES (?,?)', array(999, $user->getId()));
+        $this->_em->getConnection()->executeUpdate('insert into cms_phonenumbers (phonenumber, user_id) VALUES (?,?)', [999, $user->getId()]
+        );
 
         //select
         $q = $this->_em->createQuery('select u, p from Doctrine\Tests\Models\CMS\CmsUser u join u.phonenumbers p');
diff --git a/tests/Doctrine/Tests/ORM/Functional/JoinedTableCompositeKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/JoinedTableCompositeKeyTest.php
index 8f6e0cc59..21f7cabde 100644
--- a/tests/Doctrine/Tests/ORM/Functional/JoinedTableCompositeKeyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/JoinedTableCompositeKeyTest.php
@@ -58,7 +58,7 @@ class JoinedTableCompositeKeyTest extends OrmFunctionalTestCase
     {
         return $this->_em->find(
             'Doctrine\Tests\Models\CompositeKeyInheritance\JoinedRootClass',
-            array('keyPart1' => 'part-1', 'keyPart2' => 'part-2')
+            ['keyPart1' => 'part-1', 'keyPart2' => 'part-2']
         );
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php b/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php
index 508645927..3a31f9c52 100644
--- a/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php
@@ -15,12 +15,14 @@ class LifecycleCallbackTest extends OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\LifecycleCallbackEventArgEntity'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\LifecycleCallbackTestEntity'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\LifecycleCallbackTestUser'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\LifecycleCallbackCascader'),
-            ));
+                ]
+            );
         } catch (\Exception $e) {
             // Swallow all exceptions. We do not test the schema tool here.
         }
@@ -270,13 +272,13 @@ DQL;
     public function testLifecycleCallbacksGetInherited()
     {
         $childMeta = $this->_em->getClassMetadata(__NAMESPACE__ . '\LifecycleCallbackChildEntity');
-        $this->assertEquals(array('prePersist' => array(0 => 'doStuff')), $childMeta->lifecycleCallbacks);
+        $this->assertEquals(['prePersist' => [0 => 'doStuff']], $childMeta->lifecycleCallbacks);
     }
 
     public function testLifecycleListener_ChangeUpdateChangeSet()
     {
         $listener = new LifecycleListenerPreUpdate;
-        $this->_em->getEventManager()->addEventListener(array('preUpdate'), $listener);
+        $this->_em->getEventManager()->addEventListener(['preUpdate'], $listener);
 
         $user = new LifecycleCallbackTestUser;
         $user->setName('Bob');
@@ -292,7 +294,7 @@ DQL;
         $this->_em->flush(); // preUpdate reverts Alice to Bob
         $this->_em->clear();
 
-        $this->_em->getEventManager()->removeEventListener(array('preUpdate'), $listener);
+        $this->_em->getEventManager()->removeEventListener(['preUpdate'], $listener);
 
         $bob = $this->_em->createQuery($dql)->getSingleResult();
 
@@ -315,7 +317,7 @@ DQL;
         $this->_em->flush();
 
         $this->_em->refresh($e);
-        
+
         $this->_em->remove($e);
         $this->_em->flush();
 
@@ -358,7 +360,7 @@ DQL;
             'Doctrine\ORM\Event\LifecycleEventArgs',
             $e->calls['postUpdateHandler']
         );
- 
+
         $this->assertInstanceOf(
             'Doctrine\ORM\Event\LifecycleEventArgs',
             $e->calls['preRemoveHandler']
@@ -517,7 +519,7 @@ class LifecycleCallbackEventArgEntity
     /** @Column() */
     public $value;
 
-    public $calls = array();
+    public $calls = [];
 
     /**
      * @PostPersist
diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php
index e69d3ee6a..b1ace3513 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php
@@ -23,11 +23,11 @@ class GearmanLockTest extends OrmFunctionalTestCase
 
         $this->useModelSet('cms');
         parent::setUp();
-        $this->tasks = array();
+        $this->tasks = [];
 
         $this->gearman = new \GearmanClient();
         $this->gearman->addServer();
-        $this->gearman->setCompleteCallback(array($this, "gearmanTaskCompleted"));
+        $this->gearman->setCompleteCallback([$this, "gearmanTaskCompleted"]);
 
         $article = new CmsArticle();
         $article->text = "my article";
@@ -78,7 +78,7 @@ class GearmanLockTest extends OrmFunctionalTestCase
 
     public function testDqlWithLock()
     {
-        $this->asyncDqlWithLock('SELECT a FROM Doctrine\Tests\Models\CMS\CmsArticle a', array(), LockMode::PESSIMISTIC_WRITE);
+        $this->asyncDqlWithLock('SELECT a FROM Doctrine\Tests\Models\CMS\CmsArticle a', [], LockMode::PESSIMISTIC_WRITE);
         $this->asyncFindWithLock('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId, LockMode::PESSIMISTIC_WRITE);
 
         $this->assertLockWorked();
@@ -140,37 +140,42 @@ class GearmanLockTest extends OrmFunctionalTestCase
 
     protected function asyncFindWithLock($entityName, $entityId, $lockMode)
     {
-        $this->startJob('findWithLock', array(
+        $this->startJob('findWithLock', [
             'entityName' => $entityName,
             'entityId' => $entityId,
             'lockMode' => $lockMode,
-        ));
+        ]
+        );
     }
 
     protected function asyncDqlWithLock($dql, $params, $lockMode)
     {
-        $this->startJob('dqlWithLock', array(
+        $this->startJob('dqlWithLock', [
             'dql' => $dql,
             'dqlParams' => $params,
             'lockMode' => $lockMode,
-        ));
+        ]
+        );
     }
 
     protected function asyncLock($entityName, $entityId, $lockMode)
     {
-        $this->startJob('lock', array(
+        $this->startJob('lock', [
             'entityName' => $entityName,
             'entityId' => $entityId,
             'lockMode' => $lockMode,
-        ));
+        ]
+        );
     }
 
     protected function startJob($fn, $fixture)
     {
-        $this->gearman->addTask($fn, serialize(array(
+        $this->gearman->addTask($fn, serialize(
+            [
             'conn' => $this->_em->getConnection()->getParams(),
             'fixture' => $fixture
-        )));
+            ]
+        ));
 
         $this->assertEquals(GEARMAN_SUCCESS, $this->gearman->returnCode());
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php b/tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php
index 0ca10460f..c3d226aa4 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php
@@ -17,9 +17,9 @@ class LockAgentWorker
 
         $worker = new \GearmanWorker();
         $worker->addServer();
-        $worker->addFunction("findWithLock", array($lockAgent, "findWithLock"));
-        $worker->addFunction("dqlWithLock", array($lockAgent, "dqlWithLock"));
-        $worker->addFunction('lock', array($lockAgent, 'lock'));
+        $worker->addFunction("findWithLock", [$lockAgent, "findWithLock"]);
+        $worker->addFunction("dqlWithLock", [$lockAgent, "dqlWithLock"]);
+        $worker->addFunction('lock', [$lockAgent, 'lock']);
 
         while($worker->work()) {
             if ($worker->returnCode() != GEARMAN_SUCCESS) {
@@ -98,7 +98,7 @@ class LockAgentWorker
         $config->setProxyNamespace('MyProject\Proxies');
         $config->setAutoGenerateProxyClasses(true);
 
-        $annotDriver = $config->newDefaultAnnotationDriver(array(__DIR__ . '/../../../Models/'), true);
+        $annotDriver = $config->newDefaultAnnotationDriver([__DIR__ . '/../../../Models/'], true);
         $config->setMetadataDriverImpl($annotDriver);
 
         $cache = new ArrayCache();
diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php
index 8ac9bfefc..e92b9476b 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php
@@ -19,7 +19,7 @@ class LockTest extends OrmFunctionalTestCase
     {
         $this->useModelSet('cms');
         parent::setUp();
-        $this->handles = array();
+        $this->handles = [];
     }
 
     /**
diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php
index e4cad5171..ff1502daa 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php
@@ -14,12 +14,14 @@ class OptimisticTest extends OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Locking\OptimisticJoinedParent'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Locking\OptimisticJoinedChild'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Locking\OptimisticStandard'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Locking\OptimisticTimestamp')
-            ));
+                ]
+            );
         } catch (\Exception $e) {
             // Swallow all exceptions. We do not test the schema tool here.
         }
@@ -55,7 +57,7 @@ class OptimisticTest extends OrmFunctionalTestCase
         // Manually update/increment the version so we can try and save the same
         // $test and make sure the exception is thrown saying the record was
         // changed or updated since you read it
-        $this->_conn->executeQuery('UPDATE optimistic_joined_parent SET version = ? WHERE id = ?', array(2, $test->id));
+        $this->_conn->executeQuery('UPDATE optimistic_joined_parent SET version = ? WHERE id = ?', [2, $test->id]);
 
         // Now lets change a property and try and save it again
         $test->whatever = 'ok';
@@ -95,7 +97,7 @@ class OptimisticTest extends OrmFunctionalTestCase
         // Manually update/increment the version so we can try and save the same
         // $test and make sure the exception is thrown saying the record was
         // changed or updated since you read it
-        $this->_conn->executeQuery('UPDATE optimistic_joined_parent SET version = ? WHERE id = ?', array(2, $test->id));
+        $this->_conn->executeQuery('UPDATE optimistic_joined_parent SET version = ? WHERE id = ?', [2, $test->id]);
 
         // Now lets change a property and try and save it again
         $test->name = 'WHATT???';
@@ -151,7 +153,7 @@ class OptimisticTest extends OrmFunctionalTestCase
         // Manually update/increment the version so we can try and save the same
         // $test and make sure the exception is thrown saying the record was
         // changed or updated since you read it
-        $this->_conn->executeQuery('UPDATE optimistic_standard SET version = ? WHERE id = ?', array(2, $test->id));
+        $this->_conn->executeQuery('UPDATE optimistic_standard SET version = ? WHERE id = ?', [2, $test->id]);
 
         // Now lets change a property and try and save it again
         $test->name = 'WHATT???';
@@ -210,7 +212,8 @@ class OptimisticTest extends OrmFunctionalTestCase
         // Manually increment the version datetime column
         $format = $this->_em->getConnection()->getDatabasePlatform()->getDateTimeFormatString();
 
-        $this->_conn->executeQuery('UPDATE optimistic_timestamp SET version = ? WHERE id = ?', array(date($format, strtotime($test->version->format($format)) + 3600), $test->id));
+        $this->_conn->executeQuery('UPDATE optimistic_timestamp SET version = ? WHERE id = ?', [date($format, strtotime($test->version->format($format)) + 3600), $test->id]
+        );
 
         // Try and update the record and it should throw an exception
         $caughtException = null;
diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php
index 2d051b688..b6d5957a2 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php
@@ -330,7 +330,7 @@ class ManyToManyBasicAssociationTest extends OrmFunctionalTestCase
 
         $user = $this->_em->find(get_class($user), $user->id);
 
-        $coll = new ArrayCollection(array($group1, $group2));
+        $coll = new ArrayCollection([$group1, $group2]);
         $user->groups = $coll;
         $this->_em->flush();
         $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $user->groups,
diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php
index 9b3b338a0..48263f3c4 100644
--- a/tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php
@@ -15,10 +15,12 @@ class MergeCompositeToOneKeyTest extends OrmFunctionalTestCase
     {
         parent::setUp();
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(Country::CLASSNAME),
             $this->_em->getClassMetadata(CompositeToOneKeyState::CLASSNAME),
-        ));
+            ]
+        );
     }
 
     /**
diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeProxiesTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeProxiesTest.php
index 42bf4187e..e32b0385c 100644
--- a/tests/Doctrine/Tests/ORM/Functional/MergeProxiesTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/MergeProxiesTest.php
@@ -239,7 +239,7 @@ class MergeProxiesTest extends OrmFunctionalTestCase
         $config->setProxyDir(realpath(__DIR__ . '/../../Proxies'));
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
         $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(
-            array(realpath(__DIR__ . '/../../Models/Cache')),
+            [realpath(__DIR__ . '/../../Models/Cache')],
             true
         ));
         $config->setSQLLogger($logger);
@@ -248,10 +248,10 @@ class MergeProxiesTest extends OrmFunctionalTestCase
         // multi-connection is not relevant for the purpose of checking locking here, but merely
         // to stub out DB-level access and intercept it
         $connection = DriverManager::getConnection(
-            array(
+            [
                 'driver' => 'pdo_sqlite',
                 'memory' => true
-            ),
+            ],
             $config
         );
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeSharedEntitiesTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeSharedEntitiesTest.php
index ffe64fcff..e77b39694 100644
--- a/tests/Doctrine/Tests/ORM/Functional/MergeSharedEntitiesTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/MergeSharedEntitiesTest.php
@@ -15,10 +15,12 @@ class MergeSharedEntitiesTest extends OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\MSEFile'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\MSEPicture'),
-            ));
+                ]
+            );
         } catch (ToolsException $ignored) {
         }
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php
index 320aa357a..9d9eb233d 100644
--- a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php
@@ -281,7 +281,8 @@ class NativeQueryTest extends OrmFunctionalTestCase
 
         $rsm = new ResultSetMappingBuilder($this->_em);
         $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsUser', 'u');
-        $rsm->addJoinedEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', 'a', 'u', 'address', array('id' => 'a_id'));
+        $rsm->addJoinedEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', 'a', 'u', 'address', ['id' => 'a_id']
+        );
 
         $query = $this->_em->createNativeQuery('SELECT u.*, a.*, a.id AS a_id FROM cms_users u INNER JOIN cms_addresses a ON u.id = a.user_id WHERE u.username = ?', $rsm);
         $query->setParameter(1, 'romanb');
@@ -349,7 +350,8 @@ class NativeQueryTest extends OrmFunctionalTestCase
     {
         $rsm = new ResultSetMappingBuilder($this->_em);
         $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsUser', 'u');
-        $rsm->addJoinedEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', 'a', 'un', 'address', array('id' => 'a_id'));
+        $rsm->addJoinedEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', 'a', 'un', 'address', ['id' => 'a_id']
+        );
 
         $query = $this->_em->createNativeQuery('SELECT u.*, a.*, a.id AS a_id FROM cms_users u INNER JOIN cms_addresses a ON u.id = a.user_id WHERE u.username = ?', $rsm);
         $query->setParameter(1, 'romanb');
@@ -558,7 +560,7 @@ class NativeQueryTest extends OrmFunctionalTestCase
         $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
 
         $result = $repository->createNativeNamedQuery('fetchUserPhonenumberCount')
-                        ->setParameter(1, array('test','FabioBatSilva'))->getResult();
+                        ->setParameter(1, ['test','FabioBatSilva'])->getResult();
 
         $this->assertEquals(2, count($result));
         $this->assertTrue(is_array($result[0]));
@@ -746,10 +748,11 @@ class NativeQueryTest extends OrmFunctionalTestCase
     public function testGenerateSelectClauseCustomRenames()
     {
         $rsm = new ResultSetMappingBuilder($this->_em);
-        $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsUser', 'u', array(
+        $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsUser', 'u', [
             'id' => 'id1',
             'username' => 'username2'
-        ));
+        ]
+        );
 
         $selectClause = $rsm->generateSelectClause();
 
@@ -764,7 +767,7 @@ class NativeQueryTest extends OrmFunctionalTestCase
         $rsm = new ResultSetMappingBuilder($this->_em);
         $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsUser', 'u');
 
-        $selectClause = $rsm->generateSelectClause(array('u' => 'u1'));
+        $selectClause = $rsm->generateSelectClause(['u' => 'u1']);
 
         $this->assertSQLEquals('u1.id AS id, u1.status AS status, u1.username AS username, u1.name AS name, u1.email_id AS email_id', $selectClause);
     }
@@ -804,7 +807,7 @@ class NativeQueryTest extends OrmFunctionalTestCase
         $rsm->addFieldResult('u', $this->platform->getSQLResultCasing('id'), 'id');
         $rsm->setDiscriminatorColumn('c', $this->platform->getSQLResultCasing('discr'));
 
-        $selectClause = $rsm->generateSelectClause(array('u' => 'u1', 'c' => 'c1'));
+        $selectClause = $rsm->generateSelectClause(['u' => 'u1', 'c' => 'c1']);
 
         $this->assertSQLEquals('u1.id as id, c1.discr as discr', $selectClause);
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php b/tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php
index 37067aec0..972412199 100644
--- a/tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php
@@ -18,7 +18,7 @@ class NewOperatorTest extends OrmFunctionalTestCase
      * @var array
      */
     private $fixtures;
-    
+
     protected function setUp()
     {
         $this->useModelSet('cms');
@@ -26,13 +26,13 @@ class NewOperatorTest extends OrmFunctionalTestCase
 
         $this->loadFixtures();
     }
-    
+
     public function provideDataForHydrationMode()
     {
-        return array(
-            array(Query::HYDRATE_ARRAY),
-            array(Query::HYDRATE_OBJECT),
-        );
+        return [
+            [Query::HYDRATE_ARRAY],
+            [Query::HYDRATE_OBJECT],
+        ];
     }
 
     private function loadFixtures()
@@ -93,7 +93,7 @@ class NewOperatorTest extends OrmFunctionalTestCase
         $this->_em->flush();
         $this->_em->clear();
 
-        $this->fixtures = array($u1, $u2, $u3);
+        $this->fixtures = [$u1, $u2, $u3];
     }
 
     /**
@@ -223,7 +223,7 @@ class NewOperatorTest extends OrmFunctionalTestCase
 
         $this->_em->getConfiguration()
             ->addEntityNamespace('cms', 'Doctrine\Tests\Models\CMS');
-        
+
         $query  = $this->_em->createQuery($dql);
         $result = $query->getResult();
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php b/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php
index ecebc28d9..a289ef9dd 100644
--- a/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php
@@ -18,10 +18,12 @@ class NotifyPolicyTest extends OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\NotifyUser'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\NotifyGroup')
-            ));
+                ]
+            );
         } catch (\Exception $e) {
             // Swallow all exceptions. We do not test the schema tool here.
         }
@@ -91,7 +93,7 @@ class NotifyPolicyTest extends OrmFunctionalTestCase
 }
 
 class NotifyBaseEntity implements NotifyPropertyChanged {
-    public $listeners = array();
+    public $listeners = [];
 
     public function addPropertyChangedListener(PropertyChangedListener $listener) {
         $this->listeners[] = $listener;
diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php
index 8327142fd..ddc7378f7 100644
--- a/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php
@@ -232,7 +232,7 @@ class OneToManyBidirectionalAssociationTest extends OrmFunctionalTestCase
     public function assertFeatureForeignKeyIs($value, ECommerceFeature $feature) {
         $foreignKey = $this->_em->getConnection()->executeQuery(
             'SELECT product_id FROM ecommerce_features WHERE id=?',
-            array($feature->getId())
+            [$feature->getId()]
         )->fetchColumn();
         $this->assertEquals($value, $foreignKey);
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php
index 3d6c688bd..f6b64b5eb 100644
--- a/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php
@@ -116,7 +116,8 @@ class OneToManySelfReferentialAssociationTest extends OrmFunctionalTestCase
     }
 
     public function assertForeignKeyIs($value, ECommerceCategory $child) {
-        $foreignKey = $this->_em->getConnection()->executeQuery('SELECT parent_id FROM ecommerce_categories WHERE id=?', array($child->getId()))->fetchColumn();
+        $foreignKey = $this->_em->getConnection()->executeQuery('SELECT parent_id FROM ecommerce_categories WHERE id=?', [$child->getId()]
+        )->fetchColumn();
         $this->assertEquals($value, $foreignKey);
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php
index e2c663118..c13a6fe99 100644
--- a/tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php
@@ -12,14 +12,14 @@ use Doctrine\Tests\OrmFunctionalTestCase;
  */
 class OneToManyUnidirectionalAssociationTest extends OrmFunctionalTestCase
 {
-    protected $locations = array();
+    protected $locations = [];
 
     public function setUp()
     {
         $this->useModelSet('routing');
         parent::setUp();
 
-        $locations = array("Berlin", "Bonn", "Brasilia", "Atlanta");
+        $locations = ["Berlin", "Bonn", "Brasilia", "Atlanta"];
 
         foreach ($locations AS $locationName) {
             $location = new RoutingLocation();
diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php
index 6d42e7634..d2880ee81 100644
--- a/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php
@@ -144,7 +144,8 @@ class OneToOneBidirectionalAssociationTest extends OrmFunctionalTestCase
     }
 
     public function assertCartForeignKeyIs($value) {
-        $foreignKey = $this->_em->getConnection()->executeQuery('SELECT customer_id FROM ecommerce_carts WHERE id=?', array($this->cart->getId()))->fetchColumn();
+        $foreignKey = $this->_em->getConnection()->executeQuery('SELECT customer_id FROM ecommerce_carts WHERE id=?', [$this->cart->getId()]
+        )->fetchColumn();
         $this->assertEquals($value, $foreignKey);
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php
index 522a009eb..8a9921002 100644
--- a/tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php
@@ -15,13 +15,15 @@ class OneToOneEagerLoadingTest extends OrmFunctionalTestCase
         parent::setUp();
         $schemaTool = new SchemaTool($this->_em);
         try {
-            $schemaTool->createSchema(array(
+            $schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Train'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\TrainDriver'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\TrainOwner'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Waggon'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\TrainOrder'),
-            ));
+                ]
+            );
         } catch(\Exception $e) {}
     }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php
index cad28d4c3..bc7897f6a 100644
--- a/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php
@@ -86,9 +86,11 @@ class OneToOneSelfReferentialAssociationTest extends OrmFunctionalTestCase
     public function testMultiSelfReference()
     {
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\MultiSelfReference')
-            ));
+                ]
+            );
         } catch (\Exception $e) {
             // Swallow all exceptions. We do not test the schema tool here.
         }
@@ -118,7 +120,8 @@ class OneToOneSelfReferentialAssociationTest extends OrmFunctionalTestCase
     }
 
     public function assertForeignKeyIs($value) {
-        $foreignKey = $this->_em->getConnection()->executeQuery('SELECT mentor_id FROM ecommerce_customers WHERE id=?', array($this->customer->getId()))->fetchColumn();
+        $foreignKey = $this->_em->getConnection()->executeQuery('SELECT mentor_id FROM ecommerce_customers WHERE id=?', [$this->customer->getId()]
+        )->fetchColumn();
         $this->assertEquals($value, $foreignKey);
     }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php
index 60b5b3656..2ffbfa443 100644
--- a/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php
@@ -101,7 +101,7 @@ class OneToOneUnidirectionalAssociationTest extends OrmFunctionalTestCase
     public function assertForeignKeyIs($value) {
         $foreignKey = $this->_em->getConnection()->executeQuery(
             'SELECT shipping_id FROM ecommerce_products WHERE id=?',
-            array($this->product->getId())
+            [$this->product->getId()]
         )->fetchColumn();
         $this->assertEquals($value, $foreignKey);
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php
index c4e5dca70..5d5c54e24 100644
--- a/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php
@@ -10,14 +10,14 @@ use Doctrine\Tests\OrmFunctionalTestCase;
 
 class OrderedCollectionTest extends OrmFunctionalTestCase
 {
-    protected $locations = array();
+    protected $locations = [];
 
     public function setUp()
     {
         $this->useModelSet('routing');
         parent::setUp();
 
-        $locations = array("Berlin", "Bonn", "Brasilia", "Atlanta");
+        $locations = ["Berlin", "Bonn", "Brasilia", "Atlanta"];
 
         foreach ($locations AS $locationName) {
             $location = new RoutingLocation();
diff --git a/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php
index b3d85340e..d71bfb0b4 100644
--- a/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php
@@ -16,11 +16,13 @@ class OrderedJoinedTableInheritanceCollectionTest extends OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\OJTIC_Pet'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\OJTIC_Cat'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\OJTIC_Dog'),
-            ));
+                ]
+            );
         } catch (\Exception $e) {
             // Swallow all exceptions. We do not test the schema tool here.
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/PaginationTest.php b/tests/Doctrine/Tests/ORM/Functional/PaginationTest.php
index 8afe9d332..dcf44ce45 100644
--- a/tests/Doctrine/Tests/ORM/Functional/PaginationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/PaginationTest.php
@@ -633,14 +633,15 @@ class PaginationTest extends OrmFunctionalTestCase
     {
         $dql = 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u';
         $query = $this->_em->createQuery($dql);
-        $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\Tests\ORM\Functional\CustomPaginationTestTreeWalker'));
+        $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\Tests\ORM\Functional\CustomPaginationTestTreeWalker']
+        );
 
         $paginator = new Paginator($query, true);
         $paginator->setUseOutputWalkers(false);
         $this->assertCount(1, $paginator->getIterator());
         $this->assertEquals(1, $paginator->count());
     }
-    
+
     public function testCountQueryStripsParametersInSelect()
     {
         $query = $this->_em->createQuery(
@@ -695,7 +696,7 @@ class PaginationTest extends OrmFunctionalTestCase
 
     public function populate()
     {
-        $groups = array();
+        $groups = [];
         for ($j = 0; $j < 3; $j++) {;
             $group = new CmsGroup();
             $group->name = "group$j";
@@ -762,28 +763,28 @@ class PaginationTest extends OrmFunctionalTestCase
 
     public function useOutputWalkers()
     {
-        return array(
-            array(true),
-            array(false),
-        );
+        return [
+            [true],
+            [false],
+        ];
     }
 
     public function fetchJoinCollection()
     {
-        return array(
-            array(true),
-            array(false),
-        );
+        return [
+            [true],
+            [false],
+        ];
     }
 
     public function useOutputWalkersAndFetchJoinCollection()
     {
-        return array(
-            array(true, false),
-            array(true, true),
-            array(false, false),
-            array(false, true),
-        );
+        return [
+            [true, false],
+            [true, true],
+            [false, false],
+            [false, true],
+        ];
     }
 }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php b/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php
index a730546d6..99a04d52b 100644
--- a/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php
@@ -24,7 +24,7 @@ class PersistentCollectionCriteriaTest extends OrmFunctionalTestCase
     public function tearDown()
     {
         if ($this->_em) {
-            $this->_em->getConfiguration()->setEntityNamespaces(array());
+            $this->_em->getConfiguration()->setEntityNamespaces([]);
         }
         parent::tearDown();
     }
@@ -75,7 +75,7 @@ class PersistentCollectionCriteriaTest extends OrmFunctionalTestCase
 
         $repository = $this->_em->getRepository('Doctrine\Tests\Models\Tweet\User');
 
-        $user   = $repository->findOneBy(array('name' => 'ngal'));
+        $user   = $repository->findOneBy(['name' => 'ngal']);
         $tweets = $user->tweets->matching(new Criteria());
 
         $this->assertInstanceOf('Doctrine\ORM\LazyCriteriaCollection', $tweets);
diff --git a/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionTest.php
index d3d22825b..3eac4263c 100644
--- a/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionTest.php
@@ -13,10 +13,12 @@ class PersistentCollectionTest extends OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\PersistentCollectionHolder'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\PersistentCollectionContent'),
-            ));
+                ]
+            );
         } catch (\Exception $e) {
 
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php b/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php
index 861b29225..459c0549c 100644
--- a/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php
@@ -17,9 +17,11 @@ class PersistentObjectTest extends OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\PersistentEntity'),
-            ));
+                ]
+            );
         } catch (\Exception $e) {
 
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php b/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php
index b6fb57964..0debc2ca6 100644
--- a/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php
@@ -46,7 +46,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase
 
         $eventManager = $this->_em->getEventManager();
 
-        $eventManager->addEventListener(array(Events::postLoad), $mockListener);
+        $eventManager->addEventListener([Events::postLoad], $mockListener);
 
         $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId);
     }
@@ -63,7 +63,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase
 
         $eventManager = $this->_em->getEventManager();
 
-        $eventManager->addEventListener(array(Events::postLoad), $mockListener);
+        $eventManager->addEventListener([Events::postLoad], $mockListener);
 
         $query = $this->_em->createQuery('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :id');
 
@@ -83,7 +83,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase
 
         $eventManager = $this->_em->getEventManager();
 
-        $eventManager->addEventListener(array(Events::postLoad), $mockListener);
+        $eventManager->addEventListener([Events::postLoad], $mockListener);
 
         $query = $this->_em->createQuery('SELECT u, e FROM Doctrine\Tests\Models\CMS\CmsUser u JOIN u.email e WHERE u.id = :id');
 
@@ -103,7 +103,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase
 
         $eventManager = $this->_em->getEventManager();
 
-        $eventManager->addEventListener(array(Events::postLoad), $mockListener);
+        $eventManager->addEventListener([Events::postLoad], $mockListener);
 
         $query = $this->_em->createQuery('SELECT u, p FROM Doctrine\Tests\Models\CMS\CmsUser u JOIN u.phonenumbers p WHERE u.id = :id');
 
@@ -123,12 +123,12 @@ class PostLoadEventTest extends OrmFunctionalTestCase
             ->method('postLoad')
             ->will($this->returnValue(true));
 
-        $eventManager->addEventListener(array(Events::postLoad), $mockListener);
+        $eventManager->addEventListener([Events::postLoad], $mockListener);
 
         $userProxy = $this->_em->getReference('Doctrine\Tests\Models\CMS\CmsUser', $this->userId);
 
         // Now deactivate original listener and attach new one
-        $eventManager->removeEventListener(array(Events::postLoad), $mockListener);
+        $eventManager->removeEventListener([Events::postLoad], $mockListener);
 
         $mockListener2 = $this->createMock(PostLoadListener::class);
 
@@ -137,7 +137,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase
             ->method('postLoad')
             ->will($this->returnValue(true));
 
-        $eventManager->addEventListener(array(Events::postLoad), $mockListener2);
+        $eventManager->addEventListener([Events::postLoad], $mockListener2);
 
         $userProxy->getName();
     }
@@ -155,7 +155,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase
             ->method('postLoad')
             ->will($this->returnValue(true));
 
-        $eventManager->addEventListener(array(Events::postLoad), $mockListener);
+        $eventManager->addEventListener([Events::postLoad], $mockListener);
 
         $query = $this->_em->createQuery('SELECT PARTIAL u.{id, name}, p FROM Doctrine\Tests\Models\CMS\CmsUser u JOIN u.phonenumbers p WHERE u.id = :id');
 
@@ -177,7 +177,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase
 
         $eventManager = $this->_em->getEventManager();
 
-        $eventManager->addEventListener(array(Events::postLoad), $mockListener);
+        $eventManager->addEventListener([Events::postLoad], $mockListener);
 
         $emailProxy = $user->getEmail();
 
@@ -198,7 +198,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase
 
         $eventManager = $this->_em->getEventManager();
 
-        $eventManager->addEventListener(array(Events::postLoad), $mockListener);
+        $eventManager->addEventListener([Events::postLoad], $mockListener);
 
         $phonenumbersCol = $user->getPhonenumbers();
 
@@ -211,7 +211,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase
     public function testAssociationsArePopulatedWhenEventIsFired()
     {
         $checkerListener = new PostLoadListenerCheckAssociationsArePopulated();
-        $this->_em->getEventManager()->addEventListener(array(Events::postLoad), $checkerListener);
+        $this->_em->getEventManager()->addEventListener([Events::postLoad], $checkerListener);
 
         $qb = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser')->createQueryBuilder('u');
         $qb->leftJoin('u.email', 'email');
@@ -229,7 +229,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase
     {
         $eventManager = $this->_em->getEventManager();
         $listener = new PostLoadListenerLoadEntityInEventHandler();
-        $eventManager->addEventListener(array(Events::postLoad), $listener);
+        $eventManager->addEventListener([Events::postLoad], $listener);
 
         $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId);
         $this->assertSame(1, $listener->countHandledEvents('Doctrine\Tests\Models\CMS\CmsUser'), 'Doctrine\Tests\Models\CMS\CmsUser should be handled once!');
@@ -303,7 +303,7 @@ class PostLoadListenerCheckAssociationsArePopulated
 
 class PostLoadListenerLoadEntityInEventHandler
 {
-    private $firedByClasses = array();
+    private $firedByClasses = [];
 
     public function postLoad(LifecycleEventArgs $event)
     {
diff --git a/tests/Doctrine/Tests/ORM/Functional/ProxiesLikeEntitiesTest.php b/tests/Doctrine/Tests/ORM/Functional/ProxiesLikeEntitiesTest.php
index 1528404df..7d9fbce9d 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ProxiesLikeEntitiesTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ProxiesLikeEntitiesTest.php
@@ -24,14 +24,16 @@ class ProxiesLikeEntitiesTest extends OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'),
                 $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber'),
                 $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsArticle'),
                 $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'),
                 $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsEmail'),
                 $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsGroup'),
-            ));
+                ]
+            );
         } catch (\Exception $e) {
         }
         $this->user = new CmsUser();
@@ -48,7 +50,7 @@ class ProxiesLikeEntitiesTest extends OrmFunctionalTestCase
     public function testPersistUpdate()
     {
         // Considering case (a)
-        $proxy = $this->_em->getProxyFactory()->getProxy('Doctrine\Tests\Models\CMS\CmsUser', array('id' => 123));
+        $proxy = $this->_em->getProxyFactory()->getProxy('Doctrine\Tests\Models\CMS\CmsUser', ['id' => 123]);
         $proxy->__isInitialized__ = true;
         $proxy->id = null;
         $proxy->username = 'ocra';
@@ -87,7 +89,8 @@ class ProxiesLikeEntitiesTest extends OrmFunctionalTestCase
      */
     public function testProxyAsDqlParameterPersist()
     {
-        $proxy = $this->_em->getProxyFactory()->getProxy('Doctrine\Tests\Models\CMS\CmsUser', array('id' => $this->user->getId()));
+        $proxy = $this->_em->getProxyFactory()->getProxy('Doctrine\Tests\Models\CMS\CmsUser', ['id' => $this->user->getId()]
+        );
         $proxy->id = $this->user->getId();
         $result = $this
             ->_em
@@ -117,7 +120,7 @@ class ProxiesLikeEntitiesTest extends OrmFunctionalTestCase
         $result = $this
             ->_em
             ->getRepository('Doctrine\Tests\Proxies\__CG__\Doctrine\Tests\Models\CMS\CmsUser')
-            ->findOneBy(array('username' => $this->user->username));
+            ->findOneBy(['username' => $this->user->username]);
         $this->assertSame($this->user->getId(), $result->getId());
         $this->_em->clear();
         $result = $this
@@ -133,4 +136,4 @@ class ProxiesLikeEntitiesTest extends OrmFunctionalTestCase
     {
         $this->_em->createQuery('DELETE FROM Doctrine\Tests\Models\CMS\CmsUser u')->execute();
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php
index bdfe766ce..6eec3609f 100644
--- a/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php
@@ -128,7 +128,7 @@ class QueryCacheTest extends OrmFunctionalTestCase
         $query = $this->_em->createQuery('select ux from Doctrine\Tests\Models\CMS\CmsUser ux');
 
         $sqlExecMock = $this->getMockBuilder(AbstractSqlExecutor::class)
-                            ->setMethods(array('execute'))
+                            ->setMethods(['execute'])
                             ->getMock();
 
         $sqlExecMock->expects($this->once())
@@ -136,14 +136,14 @@ class QueryCacheTest extends OrmFunctionalTestCase
                     ->will($this->returnValue( 10 ));
 
         $parserResultMock = $this->getMockBuilder(ParserResult::class)
-                                 ->setMethods(array('getSqlExecutor'))
+                                 ->setMethods(['getSqlExecutor'])
                                  ->getMock();
         $parserResultMock->expects($this->once())
                          ->method('getSqlExecutor')
                          ->will($this->returnValue($sqlExecMock));
 
         $cache = $this->getMockBuilder(CacheProvider::class)
-                      ->setMethods(array('doFetch', 'doContains', 'doSave', 'doDelete', 'doFlush', 'doGetStats'))
+                      ->setMethods(['doFetch', 'doContains', 'doSave', 'doDelete', 'doFlush', 'doGetStats'])
                       ->getMock();
 
         $cache->expects($this->at(0))->method('doFetch')->will($this->returnValue(1));
diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php
index f23409506..8d0ad2d8d 100644
--- a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php
@@ -174,8 +174,8 @@ class QueryTest extends OrmFunctionalTestCase
     public function testSetParametersBackwardsCompatible()
     {
         $q = $this->_em->createQuery('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name = ?1 AND u.status = ?2');
-        $q->setParameters(array(1 => 'jwage', 2 => 'active'));
-        
+        $q->setParameters([1 => 'jwage', 2 => 'active']);
+
         $users = $q->getResult();
     }
 
@@ -200,16 +200,17 @@ class QueryTest extends OrmFunctionalTestCase
         $articleId = $article1->id;
 
         $query = $this->_em->createQuery("select a from Doctrine\Tests\Models\CMS\CmsArticle a WHERE a.topic = ?1");
-        $articles = $query->iterate(new ArrayCollection(array(new Parameter(1, 'Doctrine 2'))), Query::HYDRATE_ARRAY);
+        $articles = $query->iterate(new ArrayCollection([new Parameter(1, 'Doctrine 2')]), Query::HYDRATE_ARRAY);
 
-        $found = array();
+        $found = [];
         foreach ($articles AS $article) {
             $found[] = $article;
         }
         $this->assertEquals(1, count($found));
-        $this->assertEquals(array(
-            array(array('id' => $articleId, 'topic' => 'Doctrine 2', 'text' => 'This is an introduction to Doctrine 2.', 'version' => 1))
-        ), $found);
+        $this->assertEquals(
+            [
+            [['id' => $articleId, 'topic' => 'Doctrine 2', 'text' => 'This is an introduction to Doctrine 2.', 'version' => 1]]
+            ], $found);
     }
 
     public function testIterateResult_IterativelyBuildUpUnitOfWork()
@@ -232,7 +233,7 @@ class QueryTest extends OrmFunctionalTestCase
         $articles = $query->iterate();
 
         $iteratedCount = 0;
-        $topics = array();
+        $topics = [];
         foreach($articles AS $row) {
             $article = $row[0];
             $topics[] = $article->topic;
@@ -244,7 +245,7 @@ class QueryTest extends OrmFunctionalTestCase
             $iteratedCount++;
         }
 
-        $this->assertEquals(array("Doctrine 2", "Symfony 2"), $topics);
+        $this->assertEquals(["Doctrine 2", "Symfony 2"], $topics);
         $this->assertEquals(2, $iteratedCount);
 
         $this->_em->flush();
@@ -271,7 +272,7 @@ class QueryTest extends OrmFunctionalTestCase
         $articles = $query->iterate();
 
         $iteratedCount = 0;
-        $topics = array();
+        $topics = [];
         foreach($articles AS $row) {
             $article  = $row[0];
             $topics[] = $article->topic;
@@ -281,7 +282,7 @@ class QueryTest extends OrmFunctionalTestCase
             $iteratedCount++;
         }
 
-        $this->assertEquals(array("Doctrine 2", "Symfony 2"), $topics);
+        $this->assertEquals(["Doctrine 2", "Symfony 2"], $topics);
         $this->assertEquals(2, $iteratedCount);
 
         $this->_em->flush();
@@ -394,7 +395,7 @@ class QueryTest extends OrmFunctionalTestCase
             $this->fail($e->getMessage());
         }
 
-        $this->_em->getConfiguration()->setEntityNamespaces(array());
+        $this->_em->getConfiguration()->setEntityNamespaces([]);
     }
 
     /**
@@ -502,7 +503,7 @@ class QueryTest extends OrmFunctionalTestCase
         $query = $this->_em->createQuery("select u from Doctrine\Tests\Models\CMS\CmsUser u");
 
         $this->expectException(NonUniqueResultException::class);
-        
+
         $fetchedUser = $query->getOneOrNullResult();
     }
 
@@ -545,10 +546,12 @@ class QueryTest extends OrmFunctionalTestCase
         $this->_em->clear();
 
         $query = $this->_em->createQuery("SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.status = :a AND u.id IN (:b)");
-        $query->setParameters(new ArrayCollection(array(
-            new Parameter('b', array($user1->id, $user2->id, $user3->id)),
+        $query->setParameters(new ArrayCollection(
+            [
+            new Parameter('b', [$user1->id, $user2->id, $user3->id]),
             new Parameter('a', 'developer')
-        )));
+            ]
+        ));
         $result = $query->getResult();
 
         $this->assertEquals(3, count($result));
@@ -578,7 +581,7 @@ class QueryTest extends OrmFunctionalTestCase
         $this->_em->clear();
 
         $query = $this->_em->createQuery("SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username IN (?0)");
-        $query->setParameter(0, array('beberlei', 'jwage'));
+        $query->setParameter(0, ['beberlei', 'jwage']);
 
         $users = $query->execute();
 
@@ -623,7 +626,7 @@ class QueryTest extends OrmFunctionalTestCase
         $this->_em->clear();
 
         $query = $this->_em->createQuery("SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u IN (?0) OR u.username = ?1");
-        $query->setParameter(0, array($userA, $userC));
+        $query->setParameter(0, [$userA, $userC]);
         $query->setParameter(1, 'beberlei');
 
         $users = $query->execute();
diff --git a/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php b/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php
index dd8a23ff3..9eacc7a9c 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php
@@ -15,9 +15,11 @@ class ReadOnlyTest extends OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\ReadOnlyEntity'),
-            ));
+                ]
+            );
         } catch(\Exception $e) {
         }
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php b/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php
index 4baeed9f1..b7116a3cd 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php
@@ -57,7 +57,7 @@ class ReferenceProxyTest extends OrmFunctionalTestCase
     {
         $id = $this->createProduct();
 
-        $productProxy = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct', array('id' => $id));
+        $productProxy = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct', ['id' => $id]);
         $this->assertEquals('Doctrine Cookbook', $productProxy->getName());
     }
 
@@ -189,7 +189,7 @@ class ReferenceProxyTest extends OrmFunctionalTestCase
         $this->assertEquals($id, $entity->getId());
         $this->assertFalse($entity->__isInitialized__, "Getting the identifier doesn't initialize the proxy when extending.");
     }
-    
+
     public function testDoNotInitializeProxyOnGettingTheIdentifierAndReturnTheRightType()
     {
         $product = new ECommerceProduct();
diff --git a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
index 5fccc0bdb..42db02906 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
@@ -92,7 +92,7 @@ class SQLFilterTest extends OrmFunctionalTestCase
         $em = $this->_getEntityManager();
 
         // No enabled filters
-        $this->assertEquals(array(), $em->getFilters()->getEnabledFilters());
+        $this->assertEquals([], $em->getFilters()->getEnabledFilters());
 
         $this->configureFilters($em);
         $filter = $em->getFilters()->enable("locale");
@@ -170,11 +170,11 @@ class SQLFilterTest extends OrmFunctionalTestCase
         // Check for a disabled filter
         $em->getFilters()->disable("locale");
         $this->assertFalse($em->getFilters()->isEnabled("locale"));
-        
+
         // Check a non-existing filter
-        $this->assertFalse($em->getFilters()->isEnabled("foo_filter"));        
+        $this->assertFalse($em->getFilters()->isEnabled("foo_filter"));
     }
-    
+
     protected function configureFilters($em)
     {
         // Add filters to the configuration of the EM
@@ -322,10 +322,10 @@ class SQLFilterTest extends OrmFunctionalTestCase
         $filter2->setParameter('foo', 'bar', DBALType::STRING);
         $filter2->setParameter('locale', 'en', DBALType::STRING);
 
-        $parameters = array(
-            'foo' => array('value' => 'bar', 'type' => DBALType::STRING),
-            'locale' => array('value' => 'en', 'type' => DBALType::STRING),
-        );
+        $parameters = [
+            'foo' => ['value' => 'bar', 'type' => DBALType::STRING],
+            'locale' => ['value' => 'en', 'type' => DBALType::STRING],
+        ];
 
         $this->assertEquals(serialize($parameters), ''.$filter);
         $this->assertEquals(''.$filter, ''.$filter2);
@@ -399,12 +399,16 @@ class SQLFilterTest extends OrmFunctionalTestCase
     {
         $this->loadFixtureData();
 
-        $this->assertCount(1, $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findBy(array('id' => $this->groupId2)));
+        $this->assertCount(1, $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findBy(
+            ['id' => $this->groupId2]
+        ));
 
         $this->useCMSGroupPrefixFilter();
         $this->_em->clear();
 
-        $this->assertCount(0, $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findBy(array('id' => $this->groupId2)));
+        $this->assertCount(0, $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findBy(
+            ['id' => $this->groupId2]
+        ));
     }
 
     public function testRepositoryFindByX()
@@ -423,12 +427,16 @@ class SQLFilterTest extends OrmFunctionalTestCase
     {
         $this->loadFixtureData();
 
-        $this->assertNotNull($this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findOneBy(array('id' => $this->groupId2)));
+        $this->assertNotNull($this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findOneBy(
+            ['id' => $this->groupId2]
+        ));
 
         $this->useCMSGroupPrefixFilter();
         $this->_em->clear();
 
-        $this->assertNull($this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findOneBy(array('id' => $this->groupId2)));
+        $this->assertNull($this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findOneBy(
+            ['id' => $this->groupId2]
+        ));
     }
 
     public function testRepositoryFindOneByX()
diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php
index 32c75d25d..66eee731a 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php
@@ -59,9 +59,11 @@ class CompanySchemaTest extends OrmFunctionalTestCase
             $this->markTestSkipped("Foreign Key test");
         }
 
-        $sql = $this->_schemaTool->getDropSchemaSQL(array(
+        $sql = $this->_schemaTool->getDropSchemaSQL(
+            [
             $this->_em->getClassMetadata('Doctrine\Tests\Models\Company\CompanyManager'),
-        ));
+            ]
+        );
         $this->assertEquals(4, count($sql));
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php
index 22debe962..54caeb34a 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php
@@ -23,9 +23,9 @@ class DBAL483Test extends OrmFunctionalTestCase
     {
         $class = $this->_em->getClassMetadata(__NAMESPACE__ . '\\DBAL483Default');
 
-        $this->schemaTool->createSchema(array($class));
+        $this->schemaTool->createSchema([$class]);
 
-        $updateSql = $this->schemaTool->getUpdateSchemaSql(array($class));
+        $updateSql = $this->schemaTool->getUpdateSchemaSql([$class]);
 
         $updateSql = array_filter($updateSql, function ($sql) {
             return strpos($sql, 'DBAL483') !== false;
diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php
index 4b4d0328d..3ca501ae0 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php
@@ -11,7 +11,7 @@ use Doctrine\Tests\OrmFunctionalTestCase;
  */
 class DDC214Test extends OrmFunctionalTestCase
 {
-    private $classes = array();
+    private $classes = [];
     private $schemaTool = null;
 
     public function setUp()
@@ -31,14 +31,14 @@ class DDC214Test extends OrmFunctionalTestCase
      */
     public function testCmsAddressModel()
     {
-        $this->classes = array(
+        $this->classes = [
             'Doctrine\Tests\Models\CMS\CmsUser',
             'Doctrine\Tests\Models\CMS\CmsPhonenumber',
             'Doctrine\Tests\Models\CMS\CmsAddress',
             'Doctrine\Tests\Models\CMS\CmsGroup',
             'Doctrine\Tests\Models\CMS\CmsArticle',
             'Doctrine\Tests\Models\CMS\CmsEmail',
-        );
+        ];
 
         $this->assertCreatedSchemaNeedsNoUpdates($this->classes);
     }
@@ -48,7 +48,7 @@ class DDC214Test extends OrmFunctionalTestCase
      */
     public function testCompanyModel()
     {
-        $this->classes = array(
+        $this->classes = [
             'Doctrine\Tests\Models\Company\CompanyPerson',
             'Doctrine\Tests\Models\Company\CompanyEmployee',
             'Doctrine\Tests\Models\Company\CompanyManager',
@@ -57,14 +57,14 @@ class DDC214Test extends OrmFunctionalTestCase
             'Doctrine\Tests\Models\Company\CompanyAuction',
             'Doctrine\Tests\Models\Company\CompanyRaffle',
             'Doctrine\Tests\Models\Company\CompanyCar'
-        );
+        ];
 
         $this->assertCreatedSchemaNeedsNoUpdates($this->classes);
     }
 
     public function assertCreatedSchemaNeedsNoUpdates($classes)
     {
-        $classMetadata = array();
+        $classMetadata = [];
         foreach ($classes AS $class) {
             $classMetadata[] = $this->_em->getClassMetadata($class);
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php
index a923c40fc..9df372c91 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php
@@ -16,14 +16,14 @@ class MySqlSchemaToolTest extends OrmFunctionalTestCase
 
     public function testGetCreateSchemaSql()
     {
-        $classes = array(
+        $classes = [
             $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsGroup'),
             $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'),
             $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsTag'),
             $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'),
             $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsEmail'),
             $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber'),
-        );
+        ];
 
         $tool = new SchemaTool($this->_em);
         $sql = $tool->getCreateSchemaSql($classes);
@@ -49,9 +49,9 @@ class MySqlSchemaToolTest extends OrmFunctionalTestCase
 
     public function testGetCreateSchemaSql2()
     {
-        $classes = array(
+        $classes = [
             $this->_em->getClassMetadata('Doctrine\Tests\Models\Generic\DecimalModel')
-        );
+        ];
 
         $tool = new SchemaTool($this->_em);
         $sql = $tool->getCreateSchemaSql($classes);
@@ -62,9 +62,9 @@ class MySqlSchemaToolTest extends OrmFunctionalTestCase
 
     public function testGetCreateSchemaSql3()
     {
-        $classes = array(
+        $classes = [
             $this->_em->getClassMetadata('Doctrine\Tests\Models\Generic\BooleanModel')
-        );
+        ];
 
         $tool = new SchemaTool($this->_em);
         $sql = $tool->getCreateSchemaSql($classes);
@@ -78,9 +78,9 @@ class MySqlSchemaToolTest extends OrmFunctionalTestCase
      */
     public function testGetCreateSchemaSql4()
     {
-        $classes = array(
+        $classes = [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\MysqlSchemaNamespacedEntity')
-        );
+        ];
 
         $tool = new SchemaTool($this->_em);
         $sql = $tool->getCreateSchemaSql($classes);
diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php
index f98fe4beb..f71bfe9ce 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php
@@ -25,11 +25,11 @@ class PostgreSqlSchemaToolTest extends OrmFunctionalTestCase
 
     public function testGetCreateSchemaSql()
     {
-        $classes = array(
+        $classes = [
             $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'),
             $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'),
             $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber'),
-        );
+        ];
 
         $tool = new SchemaTool($this->_em);
         $sql = $tool->getCreateSchemaSql($classes);
@@ -58,15 +58,15 @@ class PostgreSqlSchemaToolTest extends OrmFunctionalTestCase
         $this->assertEquals("ALTER TABLE cms_users_tags ADD CONSTRAINT FK_93F5A1ADBAD26311 FOREIGN KEY (tag_id) REFERENCES cms_tags (id) NOT DEFERRABLE INITIALLY IMMEDIATE", array_shift($sql));
         $this->assertEquals("ALTER TABLE cms_phonenumbers ADD CONSTRAINT FK_F21F790FA76ED395 FOREIGN KEY (user_id) REFERENCES cms_users (id) NOT DEFERRABLE INITIALLY IMMEDIATE", array_shift($sql));
 
-        $this->assertEquals(array(), $sql, "SQL Array should be empty now.");
+        $this->assertEquals([], $sql, "SQL Array should be empty now.");
         $this->assertEquals(22, $sqlCount, "Total of 22 queries should be executed");
     }
 
     public function testGetCreateSchemaSql2()
     {
-        $classes = array(
+        $classes = [
             $this->_em->getClassMetadata('Doctrine\Tests\Models\Generic\DecimalModel')
-        );
+        ];
 
         $tool = new SchemaTool($this->_em);
         $sql = $tool->getCreateSchemaSql($classes);
@@ -79,9 +79,9 @@ class PostgreSqlSchemaToolTest extends OrmFunctionalTestCase
 
     public function testGetCreateSchemaSql3()
     {
-        $classes = array(
+        $classes = [
             $this->_em->getClassMetadata('Doctrine\Tests\Models\Generic\BooleanModel')
-        );
+        ];
 
         $tool = new SchemaTool($this->_em);
         $sql = $tool->getCreateSchemaSql($classes);
@@ -93,11 +93,11 @@ class PostgreSqlSchemaToolTest extends OrmFunctionalTestCase
 
     public function testGetDropSchemaSql()
     {
-        $classes = array(
+        $classes = [
             $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'),
             $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'),
             $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber'),
-        );
+        ];
 
         $tool = new SchemaTool($this->_em);
         $sql = $tool->getDropSchemaSQL($classes);
@@ -119,10 +119,10 @@ class PostgreSqlSchemaToolTest extends OrmFunctionalTestCase
      */
     public function testUpdateSchemaWithPostgreSQLSchema()
     {
-        $classes = array(
+        $classes = [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1657Screen'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1657Avatar'),
-        );
+        ];
 
         $tool = new SchemaTool($this->_em);
         $tool->createSchema($classes);
diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php
index 06eb67a2e..d6f98af1f 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php
@@ -14,12 +14,12 @@ class SchemaValidatorTest extends OrmFunctionalTestCase
 {
     static public function dataValidateModelSets()
     {
-        $modelSets = array();
+        $modelSets = [];
         foreach (self::$_modelSets as $modelSet => $classes) {
             if ($modelSet == "customtype") {
                 continue;
             }
-            $modelSets[] = array($modelSet);
+            $modelSets[] = [$modelSet];
         }
         return $modelSets;
     }
@@ -31,7 +31,7 @@ class SchemaValidatorTest extends OrmFunctionalTestCase
     {
         $validator = new SchemaValidator($this->_em);
 
-        $classes = array();
+        $classes = [];
         foreach (self::$_modelSets[$modelSet] as $className) {
             $classes[] = $this->_em->getClassMetadata($className);
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheAbstractTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheAbstractTest.php
index 320bbbb2f..becf7edbb 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheAbstractTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheAbstractTest.php
@@ -27,16 +27,16 @@ use Doctrine\Tests\Models\Cache\AttractionLocationInfo;
  */
 abstract class SecondLevelCacheAbstractTest extends OrmFunctionalTestCase
 {
-    protected $people               = array();
-    protected $addresses            = array();
-    protected $countries            = array();
-    protected $states               = array();
-    protected $cities               = array();
-    protected $travels              = array();
-    protected $travelers            = array();
-    protected $attractions          = array();
-    protected $attractionsInfo      = array();
-    protected $travelersWithProfile = array();
+    protected $people               = [];
+    protected $addresses            = [];
+    protected $countries            = [];
+    protected $states               = [];
+    protected $cities               = [];
+    protected $travels              = [];
+    protected $travelers            = [];
+    protected $attractions          = [];
+    protected $attractionsInfo      = [];
+    protected $travelersWithProfile = [];
 
     /**
      * @var \Doctrine\ORM\Cache
@@ -280,4 +280,4 @@ abstract class SecondLevelCacheAbstractTest extends OrmFunctionalTestCase
         $this->cache->evictEntityRegions();
         $this->cache->evictCollectionRegions();
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyTest.php
index f5c105225..efa8f9f4d 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyTest.php
@@ -24,10 +24,10 @@ class SecondLevelCacheCompositePrimaryKeyTest extends SecondLevelCacheAbstractTe
         $leavingFrom    = $this->_em->find(City::CLASSNAME, $leavingFromId);
         $goingTo        = $this->_em->find(City::CLASSNAME, $goingToId);
         $flight         = new Flight($leavingFrom, $goingTo);
-        $id             = array(
+        $id             = [
             'leavingFrom'   => $leavingFromId,
             'goingTo'       => $goingToId,
-        );
+        ];
 
         $flight->setDeparture(new \DateTime('tomorrow'));
 
@@ -70,10 +70,10 @@ class SecondLevelCacheCompositePrimaryKeyTest extends SecondLevelCacheAbstractTe
         $leavingFrom    = $this->_em->find(City::CLASSNAME, $leavingFromId);
         $goingTo        = $this->_em->find(City::CLASSNAME, $goingToId);
         $flight         = new Flight($leavingFrom, $goingTo);
-        $id             = array(
+        $id             = [
             'leavingFrom'   => $leavingFromId,
             'goingTo'       => $goingToId,
-        );
+        ];
 
         $flight->setDeparture(new \DateTime('tomorrow'));
 
@@ -114,10 +114,10 @@ class SecondLevelCacheCompositePrimaryKeyTest extends SecondLevelCacheAbstractTe
         $leavingFrom    = $this->_em->find(City::CLASSNAME, $leavingFromId);
         $goingTo        = $this->_em->find(City::CLASSNAME, $goingToId);
         $flight         = new Flight($leavingFrom, $goingTo);
-        $id             = array(
+        $id             = [
             'leavingFrom'   => $leavingFromId,
             'goingTo'       => $goingToId,
-        );
+        ];
 
         $flight->setDeparture($now);
 
@@ -172,4 +172,4 @@ class SecondLevelCacheCompositePrimaryKeyTest extends SecondLevelCacheAbstractTe
         $this->assertEquals($leavingFrom->getId(), $leavingFromId);
         $this->assertEquals($queryCount, $this->getCurrentQueryCount());
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyWithAssociationsTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyWithAssociationsTest.php
index dc4f40db0..0fc7ae415 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyWithAssociationsTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyWithAssociationsTest.php
@@ -55,7 +55,7 @@ class SecondLevelCacheCompositePrimaryKeyWithAssociationsTest extends OrmFunctio
 
         $queries = $this->getCurrentQueryCount();
 
-        $admin1Rome = $admin1Repo->findOneBy(array('country' => 'IT', 'id' => 1));
+        $admin1Rome = $admin1Repo->findOneBy(['country' => 'IT', 'id' => 1]);
 
         $this->assertEquals("Italy", $admin1Rome->country->name);
         $this->assertEquals(2, count($admin1Rome->names));
@@ -65,7 +65,7 @@ class SecondLevelCacheCompositePrimaryKeyWithAssociationsTest extends OrmFunctio
 
         $queries = $this->getCurrentQueryCount();
 
-        $admin1Rome = $admin1Repo->findOneBy(array('country' => 'IT', 'id' => 1));
+        $admin1Rome = $admin1Repo->findOneBy(['country' => 'IT', 'id' => 1]);
 
         $this->assertEquals("Italy", $admin1Rome->country->name);
         $this->assertEquals(2, count($admin1Rome->names));
diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheConcurrentTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheConcurrentTest.php
index f4d8e6b76..ee5aa3fbd 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheConcurrentTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheConcurrentTest.php
@@ -58,7 +58,7 @@ class SecondLevelCacheConcurrentTest extends SecondLevelCacheAbstractTest
         $this->_em->clear();
 
         $countryId = $this->countries[0]->getId();
-        $cacheId   = new EntityCacheKey(Country::CLASSNAME, array('id'=>$countryId));
+        $cacheId   = new EntityCacheKey(Country::CLASSNAME, ['id'=>$countryId]);
         $region    = $this->_em->getCache()->getEntityCacheRegion(Country::CLASSNAME);
 
         $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $countryId));
@@ -97,7 +97,7 @@ class SecondLevelCacheConcurrentTest extends SecondLevelCacheAbstractTest
         $this->secondLevelCacheLogger->clearStats();
 
         $stateId   = $this->states[0]->getId();
-        $cacheId   = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>$stateId));
+        $cacheId   = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>$stateId]);
         $region    = $this->_em->getCache()->getCollectionCacheRegion(State::CLASSNAME, 'cities');
 
         $this->assertTrue($this->cache->containsCollection(State::CLASSNAME, 'cities', $stateId));
@@ -147,4 +147,4 @@ class CacheFactorySecondLevelCacheConcurrentTest extends DefaultCacheFactory
     {
         return new TimestampRegionMock();
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheQueryCacheTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheQueryCacheTest.php
index b34b0f825..51a93417b 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheQueryCacheTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheQueryCacheTest.php
@@ -191,10 +191,10 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest
         $countryName1   = $this->countries[0]->getName();
         $countryName2   = $this->countries[1]->getName();
 
-        $key1           = new EntityCacheKey(Country::CLASSNAME, array('id'=>$countryId1));
-        $key2           = new EntityCacheKey(Country::CLASSNAME, array('id'=>$countryId2));
-        $entry1         = new EntityCacheEntry(Country::CLASSNAME, array('id'=>$countryId1, 'name'=>'outdated'));
-        $entry2         = new EntityCacheEntry(Country::CLASSNAME, array('id'=>$countryId2, 'name'=>'outdated'));
+        $key1           = new EntityCacheKey(Country::CLASSNAME, ['id'=>$countryId1]);
+        $key2           = new EntityCacheKey(Country::CLASSNAME, ['id'=>$countryId2]);
+        $entry1         = new EntityCacheEntry(Country::CLASSNAME, ['id'=>$countryId1, 'name'=>'outdated']);
+        $entry2         = new EntityCacheEntry(Country::CLASSNAME, ['id'=>$countryId2, 'name'=>'outdated']);
 
         $region->put($key1, $entry1);
         $region->put($key2, $entry2);
diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheRepositoryTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheRepositoryTest.php
index 71f7d952f..8e37dd960 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheRepositoryTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheRepositoryTest.php
@@ -92,7 +92,7 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest
         $this->assertCount(2, $countries);
         $this->assertInstanceOf(Country::CLASSNAME, $countries[0]);
         $this->assertInstanceOf(Country::CLASSNAME, $countries[1]);
-        
+
         $country = new Country('foo');
 
         $this->_em->persist($country);
@@ -105,7 +105,7 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest
         $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount());
 
         $country = $repository->find($country->getId());
-        
+
         $this->_em->remove($country);
         $this->_em->flush();
         $this->_em->clear();
@@ -125,7 +125,7 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest
 
         $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId()));
 
-        $criteria   = array('name'=>$this->countries[0]->getName());
+        $criteria   = ['name'=>$this->countries[0]->getName()];
         $repository = $this->_em->getRepository(Country::CLASSNAME);
         $queryCount = $this->getCurrentQueryCount();
 
@@ -155,7 +155,7 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest
 
         $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId()));
 
-        $criteria   = array('name'=>$this->countries[0]->getName());
+        $criteria   = ['name'=>$this->countries[0]->getName()];
         $repository = $this->_em->getRepository(Country::CLASSNAME);
         $queryCount = $this->getCurrentQueryCount();
 
@@ -247,4 +247,4 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest
         $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $entities[0]->getCountry());
         $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $entities[1]->getCountry());
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheTest.php
index 56735840a..79044395a 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheTest.php
@@ -63,7 +63,7 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest
 
         $this->assertInstanceOf(Country::CLASSNAME, $c3);
         $this->assertInstanceOf(Country::CLASSNAME, $c4);
-        
+
         $this->assertEquals($c1->getId(), $c3->getId());
         $this->assertEquals($c1->getName(), $c3->getName());
 
@@ -195,9 +195,13 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest
 
     public function testPostFlushFailure()
     {
-        $listener = new ListenerSecondLevelCacheTest(array(Events::postFlush => function(){
+        $listener = new ListenerSecondLevelCacheTest(
+            [
+                Events::postFlush => function(){
             throw new \RuntimeException('post flush failure');
-        }));
+        }
+            ]
+        );
 
         $this->_em->getEventManager()
             ->addEventListener(Events::postFlush, $listener);
@@ -225,9 +229,13 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest
         $this->loadFixturesStates();
         $this->_em->clear();
 
-        $listener = new ListenerSecondLevelCacheTest(array(Events::postUpdate => function(){
+        $listener = new ListenerSecondLevelCacheTest(
+            [
+                Events::postUpdate => function(){
             throw new \RuntimeException('post update failure');
-        }));
+        }
+            ]
+        );
 
         $this->_em->getEventManager()
             ->addEventListener(Events::postUpdate, $listener);
@@ -237,7 +245,7 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest
         $stateId    = $this->states[0]->getId();
         $stateName  = $this->states[0]->getName();
         $state      = $this->_em->find(State::CLASSNAME, $stateId);
-        
+
         $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $stateId));
         $this->assertInstanceOf(State::CLASSNAME, $state);
         $this->assertEquals($stateName, $state->getName());
@@ -269,9 +277,13 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest
         $this->loadFixturesCountries();
         $this->_em->clear();
 
-        $listener = new ListenerSecondLevelCacheTest(array(Events::postRemove => function(){
+        $listener = new ListenerSecondLevelCacheTest(
+            [
+                Events::postRemove => function(){
             throw new \RuntimeException('post remove failure');
-        }));
+        }
+            ]
+        );
 
         $this->_em->getEventManager()
             ->addEventListener(Events::postRemove, $listener);
@@ -324,7 +336,7 @@ class ListenerSecondLevelCacheTest
 {
     public $callbacks;
 
-    public function __construct(array $callbacks = array())
+    public function __construct(array $callbacks = [])
     {
         $this->callbacks = $callbacks;
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php b/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php
index 02c891e75..812d56d31 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php
@@ -21,7 +21,7 @@ class SequenceEmulatedIdentityStrategyTest extends OrmFunctionalTestCase
         } else {
             try {
                 $this->_schemaTool->createSchema(
-                    array($this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\SequenceEmulatedIdentityEntity'))
+                    [$this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\SequenceEmulatedIdentityEntity')]
                 );
             } catch (\Exception $e) {
                 // Swallow all exceptions. We do not test the schema tool here.
diff --git a/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php b/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php
index 2fcd6a1b9..f77e1b0da 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php
@@ -19,9 +19,11 @@ class SequenceGeneratorTest extends OrmFunctionalTestCase
         }
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\SequenceEntity'),
-            ));
+                ]
+            );
         } catch(\Exception $e) {
 
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/SingleTableCompositeKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/SingleTableCompositeKeyTest.php
index 53829a1c0..80cf1596f 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SingleTableCompositeKeyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SingleTableCompositeKeyTest.php
@@ -58,7 +58,7 @@ class SingleTableCompositeKeyTest extends OrmFunctionalTestCase
     {
         return $this->_em->find(
             'Doctrine\Tests\Models\CompositeKeyInheritance\SingleRootClass',
-            array('keyPart1' => 'part-1', 'keyPart2' => 'part-2')
+            ['keyPart1' => 'part-1', 'keyPart2' => 'part-2']
         );
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php
index 72be4c4d6..380f84b8b 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php
@@ -14,7 +14,7 @@ use Doctrine\Tests\OrmFunctionalTestCase;
 class SingleTableInheritanceTest extends OrmFunctionalTestCase
 {
     private $salesPerson;
-    private $engineers = array();
+    private $engineers = [];
     private $fix;
     private $flex;
     private $ultra;
@@ -232,7 +232,7 @@ class SingleTableInheritanceTest extends OrmFunctionalTestCase
 
         sort($discrValues);
 
-        $this->assertEquals(array('fix', 'flexible', 'flexultra'), $discrValues);
+        $this->assertEquals(['fix', 'flexible', 'flexultra'], $discrValues);
     }
 
     public function testQueryChildClassWithCondition()
@@ -327,19 +327,19 @@ class SingleTableInheritanceTest extends OrmFunctionalTestCase
         $this->loadFullFixture();
 
         $repos = $this->_em->getRepository("Doctrine\Tests\Models\Company\CompanyContract");
-        $contracts = $repos->findBy(array('salesPerson' => $this->salesPerson->getId()));
+        $contracts = $repos->findBy(['salesPerson' => $this->salesPerson->getId()]);
         $this->assertEquals(3, count($contracts), "There should be 3 entities related to " . $this->salesPerson->getId() . " for 'Doctrine\Tests\Models\Company\CompanyContract'");
 
         $repos = $this->_em->getRepository("Doctrine\Tests\Models\Company\CompanyFixContract");
-        $contracts = $repos->findBy(array('salesPerson' => $this->salesPerson->getId()));
+        $contracts = $repos->findBy(['salesPerson' => $this->salesPerson->getId()]);
         $this->assertEquals(1, count($contracts), "There should be 1 entities related to " . $this->salesPerson->getId() . " for 'Doctrine\Tests\Models\Company\CompanyFixContract'");
 
         $repos = $this->_em->getRepository("Doctrine\Tests\Models\Company\CompanyFlexContract");
-        $contracts = $repos->findBy(array('salesPerson' => $this->salesPerson->getId()));
+        $contracts = $repos->findBy(['salesPerson' => $this->salesPerson->getId()]);
         $this->assertEquals(2, count($contracts), "There should be 2 entities related to " . $this->salesPerson->getId() . " for 'Doctrine\Tests\Models\Company\CompanyFlexContract'");
 
         $repos = $this->_em->getRepository("Doctrine\Tests\Models\Company\CompanyFlexUltraContract");
-        $contracts = $repos->findBy(array('salesPerson' => $this->salesPerson->getId()));
+        $contracts = $repos->findBy(['salesPerson' => $this->salesPerson->getId()]);
         $this->assertEquals(1, count($contracts), "There should be 1 entities related to " . $this->salesPerson->getId() . " for 'Doctrine\Tests\Models\Company\CompanyFlexUltraContract'");
     }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php b/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php
index a335b234e..f7f651f1e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php
@@ -39,8 +39,8 @@ class StandardEntityPersisterTest extends OrmFunctionalTestCase
 
         $persister = $this->_em->getUnitOfWork()->getEntityPersister('Doctrine\Tests\Models\ECommerce\ECommerceCart');
         $newCart = new ECommerceCart();
-        $this->_em->getUnitOfWork()->registerManaged($newCart, array('id' => $cardId), array());
-        $persister->load(array('customer_id' => $customer->getId()), $newCart, $class->associationMappings['customer']);
+        $this->_em->getUnitOfWork()->registerManaged($newCart, ['id' => $cardId], []);
+        $persister->load(['customer_id' => $customer->getId()], $newCart, $class->associationMappings['customer']);
         $this->assertEquals('Credit card', $newCart->getPayment());
     }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php
index 9369ca4c9..637b42cdf 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php
@@ -11,11 +11,13 @@ class DDC1080Test extends OrmFunctionalTestCase
 {
     public function testHydration()
     {
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1080Foo'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1080Bar'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1080FooBar'),
-        ));
+            ]
+        );
 
         $foo1 = new DDC1080Foo();
         $foo1->setFooTitle('foo title 1');
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php
index e40f27994..9ff8882b5 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php
@@ -13,12 +13,14 @@ class DDC1113Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1113Engine'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1113Vehicle'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1113Car'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1113Bus'),
-            ));
+                ]
+            );
         } catch (\Exception $e) {
 
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1151Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1151Test.php
index 8e67b514f..053586bc9 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1151Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1151Test.php
@@ -13,10 +13,12 @@ class DDC1151Test extends \Doctrine\Tests\OrmFunctionalTestCase
             $this->markTestSkipped("This test is useful for all databases, but designed only for postgresql.");
         }
 
-        $sql = $this->_schemaTool->getCreateSchemaSql(array(
+        $sql = $this->_schemaTool->getCreateSchemaSql(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1151User'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1151Group'),
-        ));
+            ]
+        );
 
         $this->assertEquals("CREATE TABLE \"User\" (id INT NOT NULL, PRIMARY KEY(id))", $sql[0]);
         $this->assertEquals("CREATE TABLE ddc1151user_ddc1151group (ddc1151user_id INT NOT NULL, ddc1151group_id INT NOT NULL, PRIMARY KEY(ddc1151user_id, ddc1151group_id))", $sql[1]);
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php
index dad902b35..8e8fcdb8b 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php
@@ -11,12 +11,14 @@ class DDC1163Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger);
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1163Product'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1163SpecialProduct'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1163ProxyHolder'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1163Tag'),
-        ));
+            ]
+        );
     }
 
     public function testIssue()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php
index 9c28b7e88..51141b4e6 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php
@@ -34,7 +34,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $link = new DDC117Link($this->article1, $this->article2, "Link-Description");
         $this->_em->persist($link);
-        
+
         $this->reference = new DDC117Reference($this->article1, $this->article2, "Test-Description");
         $this->_em->persist($this->reference);
 
@@ -53,7 +53,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase
      */
     public function testAssociationOnlyCompositeKey()
     {
-        $idCriteria = array('source' => $this->article1->id(), 'target' => $this->article2->id());
+        $idCriteria = ['source' => $this->article1->id(), 'target' => $this->article2->id()];
 
         $mapRef = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria);
         $this->assertInstanceOf("Doctrine\Tests\Models\DDC117\DDC117Reference", $mapRef);
@@ -92,7 +92,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase
      */
     public function testUpdateAssociationEntity()
     {
-        $idCriteria = array('source' => $this->article1->id(), 'target' => $this->article2->id());
+        $idCriteria = ['source' => $this->article1->id(), 'target' => $this->article2->id()];
 
         $mapRef = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria);
         $this->assertNotNull($mapRef);
@@ -126,7 +126,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase
      */
     public function testRemoveCompositeElement()
     {
-        $idCriteria = array('source' => $this->article1->id(), 'target' => $this->article2->id());
+        $idCriteria = ['source' => $this->article1->id(), 'target' => $this->article2->id()];
 
         $refRep = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria);
 
@@ -143,7 +143,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase
      */
     public function testDqlRemoveCompositeElement()
     {
-        $idCriteria = array('source' => $this->article1->id(), 'target' => $this->article2->id());
+        $idCriteria = ['source' => $this->article1->id(), 'target' => $this->article2->id()];
 
         $dql = "DELETE "."Doctrine\Tests\Models\DDC117\DDC117Reference r WHERE r.source = ?1 AND r.target = ?2";
         $this->_em->createQuery($dql)
@@ -188,7 +188,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase
      */
     public function testMixedCompositeKey()
     {
-        $idCriteria = array('article' => $this->article1->id(), 'language' => 'en');
+        $idCriteria = ['article' => $this->article1->id(), 'language' => 'en'];
 
         $this->translation = $this->_em->find('Doctrine\Tests\Models\DDC117\DDC117Translation', $idCriteria);
         $this->assertInstanceOf('Doctrine\Tests\Models\DDC117\DDC117Translation', $this->translation);
@@ -282,10 +282,10 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase
      */
     public function testReferencesToForeignKeyEntities()
     {
-        $idCriteria = array('source' => $this->article1->id(), 'target' => $this->article2->id());
+        $idCriteria = ['source' => $this->article1->id(), 'target' => $this->article2->id()];
         $reference = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria);
 
-        $idCriteria = array('article' => $this->article1->id(), 'language' => 'en');
+        $idCriteria = ['article' => $this->article1->id(), 'language' => 'en'];
         $translation = $this->_em->find('Doctrine\Tests\Models\DDC117\DDC117Translation', $idCriteria);
 
         $approveChanges = new DDC117ApproveChanges($reference->source()->getDetails(), $reference, $translation);
@@ -429,7 +429,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase
      */
     public function testMergeForeignKeyIdentifierEntity()
     {
-        $idCriteria = array('source' => $this->article1->id(), 'target' => $this->article2->id());
+        $idCriteria = ['source' => $this->article1->id(), 'target' => $this->article2->id()];
 
         $refRep = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria);
 
@@ -484,7 +484,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($this->reference));
 
-        $idCriteria = array('source' => $this->article1->id(), 'target' => $this->article2->id());
+        $idCriteria = ['source' => $this->article1->id(), 'target' => $this->article2->id()];
         $reference = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria);
 
         $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($reference));
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php
index b6d82816c..8cf1ebe15 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php
@@ -9,11 +9,13 @@ class DDC1181Test extends OrmFunctionalTestCase
     public function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1181Hotel'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1181Booking'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1181Room'),
-        ));
+            ]
+        );
     }
 
     /**
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php
index a4ecf5d39..00d0a35a4 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php
@@ -10,11 +10,13 @@ class DDC1193Test extends OrmFunctionalTestCase
     {
         parent::setUp();
         //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger);
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1193Company'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1193Person'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1193Account')
-        ));
+            ]
+        );
     }
 
     /**
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php
index 06dde7696..7700aa0a5 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php
@@ -10,11 +10,13 @@ class DDC1209Test extends OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1209_1'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1209_2'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1209_3')
-            ));
+                ]
+            );
         } catch(\Exception $e) {
         }
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php
index 95ff58fb5..105ae9f90 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php
@@ -11,10 +11,12 @@ class DDC1225Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1225_TestEntity1'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1225_TestEntity2'),
-            ));
+                ]
+            );
         } catch(\PDOException $e) {
 
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php
index 913a3df76..8a9f252df 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php
@@ -12,10 +12,12 @@ class DDC1228Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1228User'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1228Profile'),
-            ));
+                ]
+            );
         } catch(\Exception $e) {
 
         }
@@ -40,7 +42,7 @@ class DDC1228Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertTrue($user->getProfile()->__isInitialized__, "Proxy is not initialized");
 
         $this->assertEquals("Bar", $user->getProfile()->getName());
-        $this->assertEquals(array("id" => 1, "name" => "Foo"), $this->_em->getUnitOfWork()->getOriginalEntityData($user->getProfile()));
+        $this->assertEquals(["id" => 1, "name" => "Foo"], $this->_em->getUnitOfWork()->getOriginalEntityData($user->getProfile()));
 
         $this->_em->flush();
         $this->_em->clear();
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php
index dd0f99d03..6c24b2f55 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php
@@ -11,9 +11,11 @@ class DDC1238Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1238User'),
-            ));
+                ]
+            );
         } catch(\Exception $e) {
 
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php
index 3d88b8cb1..ed54ec681 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php
@@ -11,9 +11,11 @@ class DDC1250Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1250ClientHistory'),
-            ));
+                ]
+            );
         } catch(\PDOException $e) {
 
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1300Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1300Test.php
index bffb48764..97fd33b2a 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1300Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1300Test.php
@@ -10,10 +10,12 @@ class DDC1300Test extends \Doctrine\Tests\OrmFunctionalTestCase
     public function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1300Foo'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1300FooLocale'),
-        ));
+            ]
+        );
     }
 
     public function testIssue()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php
index 911a4bf61..d92a32781 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php
@@ -11,10 +11,12 @@ class DDC1335Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1335User'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1335Phone'),
-            ));
+                ]
+            );
             $this->loadFixture();
         } catch(\Exception $e) {
         }
@@ -128,9 +130,9 @@ class DDC1335Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
     private function loadFixture()
     {
-        $p1 = array('11 xxxx-xxxx','11 yyyy-yyyy','11 zzzz-zzzz');
-        $p2 = array('22 xxxx-xxxx','22 yyyy-yyyy','22 zzzz-zzzz');
-        $p3 = array('33 xxxx-xxxx','33 yyyy-yyyy','33 zzzz-zzzz');
+        $p1 = ['11 xxxx-xxxx','11 yyyy-yyyy','11 zzzz-zzzz'];
+        $p2 = ['22 xxxx-xxxx','22 yyyy-yyyy','22 zzzz-zzzz'];
+        $p3 = ['33 xxxx-xxxx','33 yyyy-yyyy','33 zzzz-zzzz'];
 
         $u1 = new DDC1335User("foo@foo.com", "Foo",$p1);
         $u2 = new DDC1335User("bar@bar.com", "Bar",$p2);
@@ -171,7 +173,7 @@ class DDC1335User
      */
     public $phones;
 
-    public function __construct($email, $name, array $numbers = array())
+    public function __construct($email, $name, array $numbers = [])
     {
         $this->name   = $name;
         $this->email  = $email;
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php
index e423de5bb..05a99b7cb 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php
@@ -15,15 +15,18 @@ class DDC1360Test extends OrmFunctionalTestCase
             $this->markTestSkipped("PostgreSQL only test.");
         }
 
-        $sql = $this->_schemaTool->getCreateSchemaSql(array(
+        $sql = $this->_schemaTool->getCreateSchemaSql(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1360DoubleQuote')
-        ));
+            ]
+        );
 
-        $this->assertEquals(array(
+        $this->assertEquals(
+            [
             'CREATE SCHEMA user',
             'CREATE TABLE "user"."user" (id INT NOT NULL, PRIMARY KEY(id))',
             'CREATE SEQUENCE "user"."user_id_seq" INCREMENT BY 1 MINVALUE 1 START 1',
-        ), $sql);
+            ], $sql);
     }
 }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1383Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1383Test.php
index fb6ae25e6..a84fd7154 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1383Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1383Test.php
@@ -12,10 +12,12 @@ class DDC1383Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1383AbstractEntity'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1383Entity'),
-            ));
+                ]
+            );
         } catch(\Exception $ignored) {}
     }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1392Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1392Test.php
index 2e0df824b..5fe34f6cc 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1392Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1392Test.php
@@ -14,10 +14,12 @@ class DDC1392Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1392File'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1392Picture'),
-            ));
+                ]
+            );
         } catch (\Exception $ignored) {
         }
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php
index 41183ffdd..22fd282ce 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php
@@ -12,11 +12,13 @@ class DDC1400Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1400Article'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1400User'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1400UserState'),
-            ));
+                ]
+            );
         } catch (\Exception $ignored) {
         }
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1404Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1404Test.php
index 322582c20..e4d0a47f2 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1404Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1404Test.php
@@ -13,10 +13,12 @@ class DDC1404Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1404ParentEntity'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1404ChildEntity'),
-            ));
+                ]
+            );
 
             $this->loadFixtures();
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC142Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC142Test.php
index c985d61ac..6f08cf80c 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC142Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC142Test.php
@@ -17,12 +17,14 @@ class DDC142Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\User'),
                 $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Group'),
                 $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Phone'),
                 $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Address'),
-            ));
+                ]
+            );
         } catch(\Exception $e) {
         }
     }
@@ -50,7 +52,7 @@ class DDC142Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $id = $user->id;
         $this->assertNotNull($id);
 
-        
+
         $user       = $this->_em->find('Doctrine\Tests\Models\Quote\User', $id);
         $address    = $user->getAddress();
 
@@ -75,8 +77,8 @@ class DDC142Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertNull($user->getAddress());
 
         $this->assertEquals('FabioBatSilva1', $user->name);
-        
-        
+
+
         $this->_em->remove($user);
         $this->_em->flush();
         $this->_em->clear();
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1430Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1430Test.php
index 30e681d72..3356d4268 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1430Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1430Test.php
@@ -13,10 +13,12 @@ class DDC1430Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1430Order'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1430OrderProduct'),
-            ));
+                ]
+            );
             $this->loadFixtures();
         } catch (\Exception $exc) {
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1436Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1436Test.php
index fa25c69e0..cd9ff6b32 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1436Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1436Test.php
@@ -12,9 +12,11 @@ class DDC1436Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1436Page'),
-            ));
+                ]
+            );
         } catch (\Exception $ignored) {
         }
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php
index 2fc8eef93..d7b280f00 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php
@@ -10,11 +10,13 @@ class DDC144Test extends OrmFunctionalTestCase
         parent::setUp();
         //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger);
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC144FlowElement'),
         //    $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC144Expression'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC144Operand'),
-        ));
+            ]
+        );
 
     }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1452Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1452Test.php
index 4db5fe0cb..4dd486c1e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1452Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1452Test.php
@@ -15,10 +15,12 @@ class DDC1452Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1452EntityA'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1452EntityB'),
-            ));
+                ]
+            );
         } catch (\Exception $ignored) {
         }
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php
index 02e900317..f4b456e65 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php
@@ -12,10 +12,12 @@ class DDC1454Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1454File'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1454Picture'),
-            ));
+                ]
+            );
         } catch (\Exception $ignored) {
 
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1458Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1458Test.php
index f04e6cb01..6f2d80afb 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1458Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1458Test.php
@@ -9,10 +9,12 @@ class DDC1258Test extends OrmFunctionalTestCase
     public function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\TestEntity'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\TestAdditionalEntity')
-        ));
+            ]
+        );
     }
 
     public function testIssue()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1461Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1461Test.php
index bfa469155..fd419d743 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1461Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1461Test.php
@@ -12,10 +12,12 @@ class DDC1461Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1461TwitterAccount'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1461User')
-            ));
+                ]
+            );
         } catch(\Exception $e) {
 
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1509Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1509Test.php
index edceef666..351a963c4 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1509Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1509Test.php
@@ -13,11 +13,13 @@ class DDC1509Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1509AbstractFile'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1509File'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1509Picture'),
-            ));
+                ]
+            );
         } catch (\Exception $ignored) {
 
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1514Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1514Test.php
index daaa69b2a..36dd46748 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1514Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1514Test.php
@@ -14,11 +14,13 @@ class DDC1514Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1514EntityA'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1514EntityB'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1514EntityC'),
-            ));
+                ]
+            );
         } catch (\Exception $ignored) {
         }
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php
index 9116a4df1..2ceaaa104 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php
@@ -11,10 +11,12 @@ class DDC1515Test extends \Doctrine\Tests\OrmFunctionalTestCase
     public function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1515Foo'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1515Bar'),
-        ));
+            ]
+        );
     }
 
     public function testIssue()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1526Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1526Test.php
index e2d770a53..c33549afb 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1526Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1526Test.php
@@ -10,14 +10,16 @@ class DDC1526Test extends \Doctrine\Tests\OrmFunctionalTestCase
     public function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1526Menu'),
-        ));
+            ]
+        );
     }
 
     public function testIssue()
     {
-        $parents = array();
+        $parents = [];
         for ($i = 0; $i < 9; $i++) {
             $entity = new DDC1526Menu;
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1548Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1548Test.php
index 74c1fe1d5..179d4914c 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1548Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1548Test.php
@@ -10,11 +10,13 @@ class DDC1548Test extends \Doctrine\Tests\OrmFunctionalTestCase
     public function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1548E1'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1548E2'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1548Rel'),
-        ));
+            ]
+        );
     }
 
     public function testIssue()
@@ -78,4 +80,4 @@ class DDC1548Rel
      * @OneToOne(targetEntity="DDC1548E2", mappedBy="rel")
      */
     public $e2;
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1595Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1595Test.php
index 144894f17..c44896b85 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1595Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1595Test.php
@@ -15,11 +15,13 @@ class DDC1595Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\DebugStack);
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1595BaseInheritance'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1595InheritedEntity1'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1595InheritedEntity2'),
-        ));
+            ]
+        );
     }
 
     public function testIssue()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1654Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1654Test.php
index a63eab8eb..aad2902d9 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1654Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1654Test.php
@@ -10,10 +10,12 @@ class DDC1654Test extends \Doctrine\Tests\OrmFunctionalTestCase
     public function setUp()
     {
         parent::setUp();
-        $this->setUpEntitySchema(array(
+        $this->setUpEntitySchema(
+            [
             __NAMESPACE__ . '\\DDC1654Post',
             __NAMESPACE__ . '\\DDC1654Comment',
-        ));
+            ]
+        );
     }
 
     public function tearDown()
@@ -142,7 +144,7 @@ class DDC1654Post
      * @ManyToMany(targetEntity="DDC1654Comment", orphanRemoval=true,
      * cascade={"persist"})
      */
-    public $comments = array();
+    public $comments = [];
 }
 
 /**
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1655Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1655Test.php
index cb5023a86..3b24b4d91 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1655Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1655Test.php
@@ -14,11 +14,13 @@ class DDC1655Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1655Foo'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1655Bar'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1655Baz'),
-            ));
+                ]
+            );
         } catch(\Exception $e) {
         }
     }
@@ -26,10 +28,10 @@ class DDC1655Test extends \Doctrine\Tests\OrmFunctionalTestCase
     public function testPostLoadOneToManyInheritance()
     {
         $cm = $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1655Foo');
-        $this->assertEquals(array("postLoad" => array("postLoad")), $cm->lifecycleCallbacks);
+        $this->assertEquals(["postLoad" => ["postLoad"]], $cm->lifecycleCallbacks);
 
         $cm = $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1655Bar');
-        $this->assertEquals(array("postLoad" => array("postLoad", "postSubLoaded")), $cm->lifecycleCallbacks);
+        $this->assertEquals(["postLoad" => ["postLoad", "postSubLoaded"]], $cm->lifecycleCallbacks);
 
         $baz = new DDC1655Baz();
         $foo = new DDC1655Foo();
@@ -140,5 +142,5 @@ class DDC1655Baz
     /**
      * @OneToMany(targetEntity="DDC1655Foo", mappedBy="baz")
      */
-    public $foos = array();
+    public $foos = [];
 }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1690Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1690Test.php
index ed1cb4257..a108f81b8 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1690Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1690Test.php
@@ -10,10 +10,12 @@ class DDC1690Test extends \Doctrine\Tests\OrmFunctionalTestCase
     protected function setUp() {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1690Parent'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1690Child')
-            ));
+                ]
+            );
         } catch (\Exception $e) {
             // Swallow all exceptions. We do not test the schema tool here.
         }
@@ -75,7 +77,7 @@ class DDC1690Test extends \Doctrine\Tests\OrmFunctionalTestCase
 }
 
 class NotifyBaseEntity implements NotifyPropertyChanged {
-    public $listeners = array();
+    public $listeners = [];
 
     public function addPropertyChangedListener(PropertyChangedListener $listener) {
         if (!in_array($listener, $this->listeners)) {
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1707Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1707Test.php
index 5e587c4df..dd6dcaeeb 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1707Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1707Test.php
@@ -15,10 +15,12 @@ class DDC1707Test extends OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1509File'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1509Picture'),
-            ));
+                ]
+            );
         } catch (\Exception $ignored) {
 
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1719Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1719Test.php
index a9cadb3cc..fe5a0de65 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1719Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1719Test.php
@@ -15,18 +15,22 @@ class DDC1719Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(self::CLASS_NAME),
-        ));
+            ]
+        );
     }
 
     protected function tearDown()
     {
         parent::tearDown();
 
-        $this->_schemaTool->dropSchema(array(
+        $this->_schemaTool->dropSchema(
+            [
             $this->_em->getClassMetadata(self::CLASS_NAME),
-        ));
+            ]
+        );
     }
 
     public function testCreateRetrieveUpdateDelete()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1787Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1787Test.php
index 862d9196a..134108030 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1787Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1787Test.php
@@ -10,10 +10,12 @@ class DDC1787Test extends \Doctrine\Tests\OrmFunctionalTestCase
     public function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1787Foo'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1787Bar'),
-        ));
+            ]
+        );
     }
 
     public function testIssue()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php
index bf52e570b..6cf8c68c4 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php
@@ -16,12 +16,14 @@ class DDC1843Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\User'),
                 $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Group'),
                 $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Phone'),
                 $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Address'),
-            ));
+                ]
+            );
         } catch(\Exception $e) {
         }
     }
@@ -109,7 +111,7 @@ class DDC1843Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->remove($e3);
         $this->_em->remove($e2);
         $this->_em->remove($e1);
-        
+
         $this->_em->flush();
         $this->_em->clear();
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1884Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1884Test.php
index 46f7cca7f..2e638278d 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1884Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1884Test.php
@@ -72,7 +72,7 @@ class DDC1884Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->persist($merc);
         $this->_em->persist($volvo);
 
-        return array($bimmer, $crysler, $merc, $volvo);
+        return [$bimmer, $crysler, $merc, $volvo];
     }
 
     private function createDrivers($class)
@@ -86,7 +86,7 @@ class DDC1884Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->persist($foo);
         $this->_em->persist($john);
 
-        return array($john, $foo);
+        return [$john, $foo];
     }
 
     /**
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1885Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1885Test.php
index 91f49282e..356a2c881 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1885Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1885Test.php
@@ -22,11 +22,13 @@ class DDC1885Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\User'),
                 $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Group'),
                 $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Address'),
-            ));
+                ]
+            );
         } catch(\Exception $e) {
         }
 
@@ -41,7 +43,7 @@ class DDC1885Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->persist($user);
         $this->_em->flush();
         $this->_em->clear();
-        
+
     }
 
     public function testCreateRetrieveUpdateDelete()
@@ -60,7 +62,7 @@ class DDC1885Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertInstanceOf('Doctrine\Tests\Models\Quote\User', $user);
         $this->assertEquals('FabioBatSilva', $user->name);
         $this->assertEquals($u1Id, $user->id);
-        
+
         $this->assertCount(2, $user->groups);
 
         $g1 = $user->getGroups()->get(0);
@@ -85,7 +87,7 @@ class DDC1885Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         // Delete
         $this->_em->remove($user);
-        
+
         $this->_em->flush();
         $this->_em->clear();
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1918Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1918Test.php
index 64b3ad48d..4b0c7eb91 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1918Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1918Test.php
@@ -19,7 +19,7 @@ class DDC1918Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
     public function testLastPageCorrect()
     {
-        $groups = array();
+        $groups = [];
         for ($i = 0; $i < 3; $i++) {
             $group = new CmsGroup();
             $group->name = "test";
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php
index 4c50cf262..f42a3655f 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php
@@ -12,10 +12,12 @@ class DDC1925Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     public function testIssue()
     {
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1925User'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1925Product'),
-        ));
+            ]
+        );
 
         $user = new DDC1925User();
         $user->setTitle("Test User");
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php
index f01a2abac..2627a17d8 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php
@@ -8,10 +8,12 @@ class DDC192Test extends OrmFunctionalTestCase
 {
     public function testSchemaCreation()
     {
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC192User'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC192Phonenumber')
-        ));
+            ]
+        );
     }
 }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1998Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1998Test.php
index 95e0a76f5..bc2fe26cf 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1998Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1998Test.php
@@ -15,9 +15,11 @@ class DDC1998Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         Type::addType('ddc1998', __NAMESPACE__ . '\\DDC1998Type');
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1998Entity'),
-        ));
+            ]
+        );
 
         $entity = new DDC1998Entity();
         $entity->id = new DDC1998Id("foo");
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php
index 17a115d0f..9db6dad96 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php
@@ -9,11 +9,13 @@ class DDC199Test extends OrmFunctionalTestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC199ParentClass'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC199ChildClass'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC199RelatedClass')
-        ));
+            ]
+        );
     }
 
     public function testPolymorphicLoading()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2012Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2012Test.php
index 92510cb02..5d2be3bbc 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2012Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2012Test.php
@@ -17,18 +17,20 @@ class DDC2012Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         Type::addType(DDC2012TsVectorType::MYTYPE, __NAMESPACE__ . '\DDC2012TsVectorType');
 
-        DDC2012TsVectorType::$calls = array();
+        DDC2012TsVectorType::$calls = [];
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2012Item'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2012ItemPerson'),
-        ));
+            ]
+        );
     }
 
     public function testIssue()
     {
         $item       = new DDC2012ItemPerson();
-        $item->tsv  = array('word1', 'word2', 'word3');
+        $item->tsv  = ['word1', 'word2', 'word3'];
 
         $this->_em->persist($item);
         $this->_em->flush();
@@ -45,10 +47,10 @@ class DDC2012Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertCount(1, DDC2012TsVectorType::$calls['convertToPHPValue']);
 
         $this->assertInstanceOf(__NAMESPACE__ . '\DDC2012Item', $item);
-        $this->assertEquals(array('word1', 'word2', 'word3'), $item->tsv);
+        $this->assertEquals(['word1', 'word2', 'word3'], $item->tsv);
 
 
-        $item->tsv = array('word1', 'word2');
+        $item->tsv = ['word1', 'word2'];
 
         $this->_em->persist($item);
         $this->_em->flush();
@@ -61,7 +63,7 @@ class DDC2012Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertCount(2, DDC2012TsVectorType::$calls['convertToPHPValue']);
 
         $this->assertInstanceOf(__NAMESPACE__ . '\DDC2012Item', $item);
-        $this->assertEquals(array('word1', 'word2'), $item->tsv);
+        $this->assertEquals(['word1', 'word2'], $item->tsv);
     }
 }
 
@@ -103,7 +105,7 @@ class DDC2012TsVectorType extends Type
 {
     const MYTYPE = 'tsvector';
 
-    public static $calls = array();
+    public static $calls = [];
 
     /**
      * {@inheritdoc}
@@ -122,10 +124,10 @@ class DDC2012TsVectorType extends Type
             $value = implode(" ", $value);
         }
 
-        self::$calls[__FUNCTION__][] = array(
+        self::$calls[__FUNCTION__][] = [
             'value'     => $value,
             'platform'  => $platform,
-        );
+        ];
 
         return $value;
     }
@@ -135,10 +137,10 @@ class DDC2012TsVectorType extends Type
      */
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
-        self::$calls[__FUNCTION__][] = array(
+        self::$calls[__FUNCTION__][] = [
             'value'     => $value,
             'platform'  => $platform,
-        );
+        ];
 
         return explode(" ", strtolower($value));
     }
@@ -148,14 +150,14 @@ class DDC2012TsVectorType extends Type
      */
     public function convertToDatabaseValueSQL($sqlExpr, AbstractPlatform $platform)
     {
-        self::$calls[__FUNCTION__][] = array(
+        self::$calls[__FUNCTION__][] = [
             'sqlExpr'   => $sqlExpr,
             'platform'  => $platform,
-        );
+        ];
 
         // changed to upper expression to keep the test compatible with other Databases
         //sprintf('to_tsvector(%s)', $sqlExpr);
-        
+
         return $platform->getUpperExpression($sqlExpr);
     }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2074Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2074Test.php
index f53857ab3..b0ae37e0e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2074Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2074Test.php
@@ -23,7 +23,7 @@ class DDC2074Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\ECommerce\ECommerceProduct');
         $product = new ECommerceProduct();
         $category = new ECommerceCategory();
-        $collection = new PersistentCollection($this->_em, $class, new ArrayCollection(array($category)));
+        $collection = new PersistentCollection($this->_em, $class, new ArrayCollection([$category]));
         $collection->setOwner($product, $class->associationMappings['categories']);
 
         $uow = $this->_em->getUnitOfWork();
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2084Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2084Test.php
index abd0fe2d8..eadbc1caf 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2084Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2084Test.php
@@ -12,10 +12,12 @@ class DDC2084Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2084\MyEntity1'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2084\MyEntity2'),
-            ));
+                ]
+            );
         } catch (\Exception $exc) {
         }
     }
@@ -125,4 +127,4 @@ class MyEntity2
     {
         $this->value = $value;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2090Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2090Test.php
index cd6db8857..dc7563c66 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2090Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2090Test.php
@@ -44,11 +44,13 @@ class DDC2090Test extends \Doctrine\Tests\OrmFunctionalTestCase
             ->set('e.startDate', ':date')
             ->set('e.salary', ':salary')
             ->where('e = :e')
-            ->setParameters(array(
+            ->setParameters(
+                [
                 'e'      => $employee1,
                 'date'   => $date1,
                 'salary' => 101,
-            ))
+                ]
+            )
             ->getQuery()
             ->useQueryCache(true)
             ->execute();
@@ -58,11 +60,13 @@ class DDC2090Test extends \Doctrine\Tests\OrmFunctionalTestCase
             ->set('e.startDate', ':date')
             ->set('e.salary', ':salary')
             ->where('e = :e')
-            ->setParameters(array(
+            ->setParameters(
+                [
                 'e'      => $employee2,
                 'date'   => $date2,
                 'salary' => 102,
-            ))
+                ]
+            )
             ->getQuery()
             ->useQueryCache(true)
             ->execute();
@@ -82,7 +86,7 @@ class DDC2090Test extends \Doctrine\Tests\OrmFunctionalTestCase
             ->set('e.startDate', '?1')
             ->set('e.salary', '?2')
             ->where('e = ?0')
-            ->setParameters(array($employee1, $date1, 101))
+            ->setParameters([$employee1, $date1, 101])
             ->getQuery()
             ->useQueryCache(true)
             ->execute();
@@ -92,7 +96,7 @@ class DDC2090Test extends \Doctrine\Tests\OrmFunctionalTestCase
             ->set('e.startDate', '?1')
             ->set('e.salary', '?2')
             ->where('e = ?0')
-            ->setParameters(array($employee2, $date2, 102))
+            ->setParameters([$employee2, $date2, 102])
             ->getQuery()
             ->useQueryCache(true)
             ->execute();
@@ -108,4 +112,4 @@ class DDC2090Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertEquals($date1, $e1->getStartDate());
         $this->assertEquals($date2, $e2->getStartDate());
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php
index 925362b08..3e3e8670f 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php
@@ -12,9 +12,11 @@ class DDC2106Test extends \Doctrine\Tests\OrmFunctionalTestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2106Entity'),
-        ));
+            ]
+        );
     }
 
     public function testDetachedEntityAsId()
@@ -24,7 +26,7 @@ class DDC2106Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->persist($entity);
         $this->_em->flush();
         $this->_em->detach($entity);
-        $entity = $this->_em->getRepository(__NAMESPACE__ . '\DDC2106Entity')->findOneBy(array());
+        $entity = $this->_em->getRepository(__NAMESPACE__ . '\DDC2106Entity')->findOneBy([]);
 
         // ... and a managed entity without id
         $entityWithoutId = new DDC2106Entity();
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php
index 728a393a0..cd94f75a5 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php
@@ -9,10 +9,12 @@ class DDC211Test extends OrmFunctionalTestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC211User'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC211Group')
-        ));
+            ]
+        );
     }
 
     public function testIssue()
@@ -25,7 +27,7 @@ class DDC211Test extends OrmFunctionalTestCase
         $this->_em->persist($user);
         $this->_em->flush();
 
-        $groupNames = array('group 1', 'group 2', 'group 3', 'group 4');
+        $groupNames = ['group 1', 'group 2', 'group 3', 'group 4'];
         foreach ($groupNames as $name) {
 
             $group = new DDC211Group;
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2138Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2138Test.php
index 97fdb3050..a0abb6754 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2138Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2138Test.php
@@ -16,21 +16,21 @@ class DDC2138Test extends OrmFunctionalTestCase
         $em = $this->_em;
         $schemaTool = new SchemaTool($em);
 
-        $classes = array(
+        $classes = [
             $em->getClassMetadata(__NAMESPACE__ . '\DDC2138User'),
             $em->getClassMetadata(__NAMESPACE__ . '\DDC2138Structure'),
             $em->getClassMetadata(__NAMESPACE__ . '\DDC2138UserFollowedObject'),
             $em->getClassMetadata(__NAMESPACE__ . '\DDC2138UserFollowedStructure'),
             $em->getClassMetadata(__NAMESPACE__ . '\DDC2138UserFollowedUser')
-        );
+        ];
 
         $schema = $schemaTool->getSchemaFromMetadata($classes);
         $this->assertTrue($schema->hasTable('users_followed_objects'), "Table users_followed_objects should exist.");
 
         /* @var $table \Doctrine\DBAL\Schema\Table */
         $table = ($schema->getTable('users_followed_objects'));
-        $this->assertTrue($table->columnsAreIndexed(array('object_id')));
-        $this->assertTrue($table->columnsAreIndexed(array('user_id')));
+        $this->assertTrue($table->columnsAreIndexed(['object_id']));
+        $this->assertTrue($table->columnsAreIndexed(['user_id']));
         $foreignKeys = $table->getForeignKeys();
         $this->assertCount(1, $foreignKeys, 'user_id column has to have FK, but not object_id');
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2175Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2175Test.php
index 178685b39..d1a2e27a9 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2175Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2175Test.php
@@ -10,9 +10,11 @@ class DDC2175Test extends \Doctrine\Tests\OrmFunctionalTestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2175Entity'),
-        ));
+            ]
+        );
     }
 
     public function testIssue()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2182Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2182Test.php
index 031156dcc..47e6671e8 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2182Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2182Test.php
@@ -10,10 +10,12 @@ class DDC2182Test extends \Doctrine\Tests\OrmFunctionalTestCase
             $this->markTestSkipped("This test is useful for all databases, but designed only for mysql.");
         }
 
-        $sql = $this->_schemaTool->getCreateSchemaSql(array(
+        $sql = $this->_schemaTool->getCreateSchemaSql(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2182OptionParent'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2182OptionChild'),
-        ));
+            ]
+        );
 
         $this->assertEquals("CREATE TABLE DDC2182OptionParent (id INT UNSIGNED NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB", $sql[0]);
         $this->assertEquals("CREATE TABLE DDC2182OptionChild (id VARCHAR(255) NOT NULL, parent_id INT UNSIGNED DEFAULT NULL, INDEX IDX_B314D4AD727ACA70 (parent_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB", $sql[1]);
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2214Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2214Test.php
index 060b6ba33..03d9b8f5d 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2214Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2214Test.php
@@ -17,10 +17,12 @@ class DDC2214Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2214Foo'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2214Bar'),
-        ));
+            ]
+        );
     }
 
     public function testIssue()
@@ -44,7 +46,7 @@ class DDC2214Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $related = $this
             ->_em
             ->createQuery('SELECT b FROM '.__NAMESPACE__ . '\DDC2214Bar b WHERE b.id IN(:ids)')
-            ->setParameter('ids', array($bar))
+            ->setParameter('ids', [$bar])
             ->getResult();
 
         $query = end($logger->queries);
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2230Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2230Test.php
index 8c2655d1b..accb24a7a 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2230Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2230Test.php
@@ -17,10 +17,12 @@ class DDC2230Test extends OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2230User'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2230Address'),
-            ));
+                ]
+            );
         } catch (ToolsException $e) {}
     }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php
index d6ff17c55..1caeffcc7 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php
@@ -14,9 +14,11 @@ class DDC2231Test extends \Doctrine\Tests\OrmFunctionalTestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2231EntityY'),
-        ));
+            ]
+        );
     }
 
     public function testInjectObjectManagerInProxyIfInitializedInUow()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2252Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2252Test.php
index 491cf3bd6..643c054ab 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2252Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2252Test.php
@@ -12,18 +12,20 @@ class DDC2252Test extends \Doctrine\Tests\OrmFunctionalTestCase
     private $user;
     private $merchant;
     private $membership;
-    private $privileges = array();
+    private $privileges = [];
 
     protected function setUp()
     {
         parent::setUp();
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC2252User'),
             $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC2252Privilege'),
             $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC2252Membership'),
             $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC2252MerchantAccount'),
-        ));
+            ]
+        );
 
         $this->loadFixtures();
     }
@@ -56,10 +58,10 @@ class DDC2252Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
     public function testIssue()
     {
-        $identifier = array(
+        $identifier = [
             'merchantAccount' => $this->merchant->getAccountid(),
             'userAccount'     => $this->user->getUid(),
-        );
+        ];
 
         $class      = 'Doctrine\Tests\ORM\Functional\Ticket\DDC2252Membership';
         $membership = $this->_em->find($class, $identifier);
@@ -226,4 +228,4 @@ class DDC2252Membership
     {
         return $this->privileges;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php
index 42aeca43e..2ec88f9f3 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php
@@ -13,10 +13,12 @@ class DDC2256Test extends \Doctrine\Tests\OrmFunctionalTestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2256User'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2256Group')
-        ));
+            ]
+        );
     }
 
     public function testIssue()
@@ -53,7 +55,8 @@ class DDC2256Test extends \Doctrine\Tests\OrmFunctionalTestCase
         // Test ResultSetMappingBuilder.
         $rsm = new ResultSetMappingBuilder($this->_em);
         $rsm->addRootEntityFromClassMetadata('MyNamespace:DDC2256User', 'u');
-        $rsm->addJoinedEntityFromClassMetadata('MyNamespace:DDC2256Group', 'g', 'u', 'group', array('id' => 'group_id', 'name' => 'group_name'));
+        $rsm->addJoinedEntityFromClassMetadata('MyNamespace:DDC2256Group', 'g', 'u', 'group', ['id' => 'group_id', 'name' => 'group_name']
+        );
 
         $this->_em->createNativeQuery($sql, $rsm)->getResult();
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php
index ca3ee1a50..818443698 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php
@@ -16,12 +16,14 @@ class DDC2306Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2306Zone'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2306User'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2306Address'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2306UserAddress'),
-        ));
+            ]
+        );
     }
 
     /**
@@ -148,4 +150,4 @@ class DDC2306UserAddress
         $user->addresses->add($this);
         $address->users->add($this);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2346Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2346Test.php
index 3d2781763..9172904c8 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2346Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2346Test.php
@@ -22,11 +22,13 @@ class DDC2346Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2346Foo'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2346Bar'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2346Baz'),
-        ));
+            ]
+        );
 
         $this->logger = new DebugStack();
     }
@@ -106,4 +108,4 @@ class DDC2346Bar
 class DDC2346Baz extends DDC2346Bar
 {
 
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2350Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2350Test.php
index 145b17330..919f74cf7 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2350Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2350Test.php
@@ -14,10 +14,12 @@ class DDC2350Test extends OrmFunctionalTestCase
     {
         parent::setUp();
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2350User'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2350Bug'),
-        ));
+            ]
+        );
     }
 
     public function testEagerCollectionsAreOnlyRetrievedOnce()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2359Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2359Test.php
index 12be3241a..af51a2d7c 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2359Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2359Test.php
@@ -27,11 +27,11 @@ class DDC2359Test extends \PHPUnit_Framework_TestCase
 
         /* @var $metadataFactory \Doctrine\ORM\Mapping\ClassMetadataFactory|\PHPUnit_Framework_MockObject_MockObject */
         $metadataFactory = $this->getMockBuilder(ClassMetadataFactory::class)
-                                ->setMethods(array('newClassMetadataInstance', 'wakeupReflection'))
+                                ->setMethods(['newClassMetadataInstance', 'wakeupReflection'])
                                 ->getMock();
 
         $configuration = $this->getMockBuilder(Configuration::class)
-                              ->setMethods(array('getMetadataDriverImpl'))
+                              ->setMethods(['getMetadataDriverImpl'])
                               ->getMock();
 
         $connection = $this->createMock(Connection::class);
@@ -62,4 +62,4 @@ class DDC2359Foo
 {
     /** @Id @Column(type="integer") @GeneratedValue */
     public $id;
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php
index 3ff5cd9b4..225369739 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php
@@ -7,11 +7,13 @@ class DDC237Test extends \Doctrine\Tests\OrmFunctionalTestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC237EntityX'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC237EntityY'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC237EntityZ')
-        ));
+            ]
+        );
     }
 
     public function testUninitializedProxyIsInitializedOnFetchJoin()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2387Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2387Test.php
index f74d4e15c..de4e20589 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2387Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2387Test.php
@@ -14,15 +14,15 @@ class DDC2387Test extends DatabaseDriverTestCase
     {
         $product = new \Doctrine\DBAL\Schema\Table('ddc2387_product');
         $product->addColumn('id', 'integer');
-        $product->setPrimaryKey(array('id'));
+        $product->setPrimaryKey(['id']);
 
         $attributes = new \Doctrine\DBAL\Schema\Table('ddc2387_attributes');
         $attributes->addColumn('product_id', 'integer');
         $attributes->addColumn('attribute_name', 'string');
-        $attributes->setPrimaryKey(array('product_id', 'attribute_name'));
-        $attributes->addForeignKeyConstraint('ddc2387_product', array('product_id'), array('product_id'));
+        $attributes->setPrimaryKey(['product_id', 'attribute_name']);
+        $attributes->addForeignKeyConstraint('ddc2387_product', ['product_id'], ['product_id']);
 
-        $metadata = $this->convertToClassMetadata(array($product, $attributes), array());
+        $metadata = $this->convertToClassMetadata([$product, $attributes], []);
 
         $this->assertEquals(ClassMetadataInfo::GENERATOR_TYPE_NONE, $metadata['Ddc2387Attributes']->generatorType);
         $this->assertEquals(ClassMetadataInfo::GENERATOR_TYPE_AUTO, $metadata['Ddc2387Product']->generatorType);
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php
index 0283e6457..aa29b9fea 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php
@@ -16,12 +16,14 @@ class DDC2415Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
 
-        $this->_em->getConfiguration()->setMetadataDriverImpl(new StaticPHPDriver(array()));
+        $this->_em->getConfiguration()->setMetadataDriverImpl(new StaticPHPDriver([]));
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2415ParentEntity'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2415ChildEntity'),
-        ));
+            ]
+        );
     }
 
     public function testTicket()
@@ -57,16 +59,20 @@ class DDC2415ParentEntity
 
     public static function loadMetadata(ClassMetadataInfo $metadata)
     {
-        $metadata->mapField(array (
+        $metadata->mapField(
+            [
             'id'        => true,
             'fieldName' => 'id',
             'type'      => 'string',
-        ));
+            ]
+        );
 
         $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_CUSTOM);
-        $metadata->setCustomGeneratorDefinition(array(
+        $metadata->setCustomGeneratorDefinition(
+            [
             'class' => 'Doctrine\Tests\ORM\Functional\Ticket\DDC2415Generator'
-        ));
+            ]
+        );
 
         $metadata->isMappedSuperclass = true;
     }
@@ -88,10 +94,12 @@ class DDC2415ChildEntity extends DDC2415ParentEntity
 
     public static function loadMetadata(ClassMetadataInfo $metadata)
     {
-        $metadata->mapField(array (
+        $metadata->mapField(
+            [
             'fieldName' => 'name',
             'type'      => 'string',
-        ));
+            ]
+        );
     }
 }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php
index b5a09f922..7590a14f1 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php
@@ -15,14 +15,16 @@ class DDC2494Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
 
-        DDC2494TinyIntType::$calls = array();
+        DDC2494TinyIntType::$calls = [];
 
         Type::addType('ddc2494_tinyint', __NAMESPACE__ . '\DDC2494TinyIntType');
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(DDC2494Currency::CLASSNAME),
             $this->_em->getClassMetadata(DDC2494Campaign::CLASSNAME),
-        ));
+            ]
+        );
     }
 
     public function testIssue()
@@ -160,7 +162,7 @@ class DDC2494Campaign
 
 class DDC2494TinyIntType extends Type
 {
-    public static $calls = array();
+    public static $calls = [];
 
     /**
      * {@inheritdoc}
@@ -177,11 +179,11 @@ class DDC2494TinyIntType extends Type
     {
         $return = (string) $value;
 
-        self::$calls[__FUNCTION__][] = array(
+        self::$calls[__FUNCTION__][] = [
             'value'     => $value,
             'return'    => $return,
             'platform'  => $platform,
-        );
+        ];
 
         return $return;
     }
@@ -193,11 +195,11 @@ class DDC2494TinyIntType extends Type
     {
         $return = (integer) $value;
 
-        self::$calls[__FUNCTION__][] = array(
+        self::$calls[__FUNCTION__][] = [
             'value'     => $value,
             'return'    => $return,
             'platform'  => $platform,
-        );
+        ];
 
         return $return;
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2575Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2575Test.php
index 2f6b406d3..771b8b801 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2575Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2575Test.php
@@ -7,19 +7,21 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
  */
 class DDC2575Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
-    private $rootsEntities = array();
-    private $aEntities = array();
-    private $bEntities = array();
+    private $rootsEntities = [];
+    private $aEntities = [];
+    private $bEntities = [];
 
     protected function setUp()
     {
         parent::setUp();
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2575Root'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2575A'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2575B'),
-        ));
+            ]
+        );
 
         $entityRoot1 = new DDC2575Root(1);
         $entityB1 = new DDC2575B(2);
@@ -61,7 +63,7 @@ class DDC2575Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $query = $qb->getQuery();
         $result = $query->getResult();
-        
+
         $this->assertCount(2, $result);
 
         $row = $result[0];
@@ -157,4 +159,4 @@ class DDC2575B
         $this->id = $id;
         $this->sampleField = $value;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2579Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2579Test.php
index fe68ff564..f80eba96c 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2579Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2579Test.php
@@ -17,11 +17,13 @@ class DDC2579Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         Type::addType(DDC2579Type::NAME, DDC2579Type::CLASSNAME);
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(DDC2579Entity::CLASSNAME),
             $this->_em->getClassMetadata(DDC2579EntityAssoc::CLASSNAME),
             $this->_em->getClassMetadata(DDC2579AssocAssoc::CLASSNAME),
-        ));
+            ]
+        );
     }
 
     public function testIssue()
@@ -36,7 +38,7 @@ class DDC2579Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->persist($assocAssoc);
         $this->_em->persist($entity);
         $this->_em->flush();
-        
+
         $entity->value++;
 
         $this->_em->persist($entity);
@@ -45,7 +47,7 @@ class DDC2579Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $id       = $entity->id;
         $value    = $entity->value;
-        $criteria = array('assoc' => $assoc, 'id' => $id);
+        $criteria = ['assoc' => $assoc, 'id' => $id];
         $entity   = $repository->findOneBy($criteria);
 
         $this->assertInstanceOf(DDC2579Entity::CLASSNAME, $entity);
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php
index d9dca3752..e0cd3257b 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php
@@ -9,12 +9,14 @@ class DDC258Test extends OrmFunctionalTestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC258Super'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC258Class1'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC258Class2'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC258Class3'),
-        ));
+            ]
+        );
     }
 
     /**
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2660Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2660Test.php
index 2ec46ba29..0a542b1af 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2660Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2660Test.php
@@ -17,11 +17,13 @@ class DDC2660Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2660Product'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2660Customer'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2660CustomerOrder')
-            ));
+                ]
+            );
         } catch(\Exception $e) {
             return;
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2692Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2692Test.php
index 437f89ffb..ff4739e48 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2692Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2692Test.php
@@ -18,9 +18,11 @@ class DDC2692Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2692Foo'),
-            ));
+                ]
+            );
         } catch(\Exception $e) {
             return;
         }
@@ -30,7 +32,7 @@ class DDC2692Test extends \Doctrine\Tests\OrmFunctionalTestCase
     public function testIsListenerCalledOnlyOnceOnPreFlush()
     {
         $listener = $this->getMockBuilder(DDC2692Listener::class)
-                         ->setMethods(array('preFlush'))
+                         ->setMethods(['preFlush'])
                          ->getMock();
 
         $listener->expects($this->once())->method('preFlush');
@@ -56,7 +58,7 @@ class DDC2692Foo
 class DDC2692Listener implements EventSubscriber {
 
     public function getSubscribedEvents() {
-        return array(\Doctrine\ORM\Events::preFlush);
+        return [\Doctrine\ORM\Events::preFlush];
     }
 
     public function preFlush(PreFlushEventArgs $args) {
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2759Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2759Test.php
index 6198663e6..1ebb4e9c1 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2759Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2759Test.php
@@ -15,12 +15,14 @@ class DDC2759Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2759Qualification'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2759Category'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2759QualificationMetadata'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2759MetadataCategory'),
-            ));
+                ]
+            );
         } catch(\Exception $e) {
             return;
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php
index e98ff91a3..efc7a6286 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php
@@ -15,12 +15,14 @@ class DDC2775Test extends OrmFunctionalTestCase
     {
         parent::setUp();
 
-        $this->setUpEntitySchema(array(
+        $this->setUpEntitySchema(
+            [
             'Doctrine\Tests\ORM\Functional\Ticket\User',
             'Doctrine\Tests\ORM\Functional\Ticket\Role',
             'Doctrine\Tests\ORM\Functional\Ticket\AdminRole',
             'Doctrine\Tests\ORM\Functional\Ticket\Authorization',
-        ));
+            ]
+        );
     }
 
     /**
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC279Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC279Test.php
index 2f1be3d32..499b85b68 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC279Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC279Test.php
@@ -7,12 +7,14 @@ class DDC279Test extends \Doctrine\Tests\OrmFunctionalTestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC279EntityXAbstract'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC279EntityX'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC279EntityY'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC279EntityZ'),
-        ));
+            ]
+        );
     }
 
     /**
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php
index 87c94cb84..d5b287a73 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php
@@ -67,7 +67,7 @@ class DDC2825Test extends \Doctrine\Tests\OrmFunctionalTestCase
     public function testPersistenceOfEntityWithSchemaMapping($className)
     {
         try {
-            $this->_schemaTool->createSchema(array($this->_em->getClassMetadata($className)));
+            $this->_schemaTool->createSchema([$this->_em->getClassMetadata($className)]);
         } catch (ToolsException $e) {
             // table already exists
         }
@@ -86,11 +86,11 @@ class DDC2825Test extends \Doctrine\Tests\OrmFunctionalTestCase
      */
     public function getTestedClasses()
     {
-        return array(
-            array(ExplicitSchemaAndTable::CLASSNAME, 'explicit_schema', 'explicit_table'),
-            array(SchemaAndTableInTableName::CLASSNAME, 'implicit_schema', 'implicit_table'),
-            array(DDC2825ClassWithImplicitlyDefinedSchemaAndQuotedTableName::CLASSNAME, 'myschema', 'order'),
-        );
+        return [
+            [ExplicitSchemaAndTable::CLASSNAME, 'explicit_schema', 'explicit_table'],
+            [SchemaAndTableInTableName::CLASSNAME, 'implicit_schema', 'implicit_table'],
+            [DDC2825ClassWithImplicitlyDefinedSchemaAndQuotedTableName::CLASSNAME, 'myschema', 'order'],
+        ];
     }
 }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2862Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2862Test.php
index 28535a3d7..d772e441c 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2862Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2862Test.php
@@ -16,10 +16,12 @@ class DDC2862Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(DDC2862User::CLASSNAME),
                 $this->_em->getClassMetadata(DDC2862Driver::CLASSNAME),
-            ));
+                ]
+            );
         } catch (ToolsException $exc) {
         }
     }
@@ -34,8 +36,8 @@ class DDC2862Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->flush();
         $this->_em->clear();
 
-        $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862User::CLASSNAME, array('id' => $user1->getId())));
-        $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862Driver::CLASSNAME, array('id' => $driver1->getId())));
+        $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862User::CLASSNAME, ['id' => $user1->getId()]));
+        $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862Driver::CLASSNAME, ['id' => $driver1->getId()]));
 
         $queryCount = $this->getCurrentQueryCount();
         $driver2    = $this->_em->find(DDC2862Driver::CLASSNAME, $driver1->getId());
@@ -49,8 +51,8 @@ class DDC2862Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->flush();
         $this->_em->clear();
 
-        $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862User::CLASSNAME, array('id' => $user1->getId())));
-        $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862Driver::CLASSNAME, array('id' => $driver1->getId())));
+        $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862User::CLASSNAME, ['id' => $user1->getId()]));
+        $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862Driver::CLASSNAME, ['id' => $driver1->getId()]));
 
         $queryCount = $this->getCurrentQueryCount();
         $driver3    = $this->_em->find(DDC2862Driver::CLASSNAME, $driver1->getId());
@@ -75,8 +77,8 @@ class DDC2862Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->getCache()->evictEntityRegion(DDC2862User::CLASSNAME);
         $this->_em->getCache()->evictEntityRegion(DDC2862Driver::CLASSNAME);
 
-        $this->assertFalse($this->_em->getCache()->containsEntity(DDC2862User::CLASSNAME, array('id' => $user1->getId())));
-        $this->assertFalse($this->_em->getCache()->containsEntity(DDC2862Driver::CLASSNAME, array('id' => $driver1->getId())));
+        $this->assertFalse($this->_em->getCache()->containsEntity(DDC2862User::CLASSNAME, ['id' => $user1->getId()]));
+        $this->assertFalse($this->_em->getCache()->containsEntity(DDC2862Driver::CLASSNAME, ['id' => $driver1->getId()]));
 
         $queryCount = $this->getCurrentQueryCount();
         $driver2    = $this->_em->find(DDC2862Driver::CLASSNAME, $driver1->getId());
@@ -87,8 +89,8 @@ class DDC2862Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $this->_em->clear();
 
-        $this->assertFalse($this->_em->getCache()->containsEntity(DDC2862User::CLASSNAME, array('id' => $user1->getId())));
-        $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862Driver::CLASSNAME, array('id' => $driver1->getId())));
+        $this->assertFalse($this->_em->getCache()->containsEntity(DDC2862User::CLASSNAME, ['id' => $user1->getId()]));
+        $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862Driver::CLASSNAME, ['id' => $driver1->getId()]));
 
         $queryCount = $this->getCurrentQueryCount();
         $driver3    = $this->_em->find(DDC2862Driver::CLASSNAME, $driver1->getId());
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2895Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2895Test.php
index 5eece3f9b..7f8451a29 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2895Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2895Test.php
@@ -13,9 +13,11 @@ class DDC2895Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC2895'),
-            ));
+                ]
+            );
         } catch(\Exception $e) {
 
         }
@@ -26,10 +28,10 @@ class DDC2895Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $cm = $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC2895');
 
         $this->assertEquals(
-            array(
-                "prePersist" => array("setLastModifiedPreUpdate"),
-                "preUpdate" => array("setLastModifiedPreUpdate"),
-            ),
+            [
+                "prePersist" => ["setLastModifiedPreUpdate"],
+                "preUpdate" => ["setLastModifiedPreUpdate"],
+            ],
             $cm->lifecycleCallbacks
         );
 
@@ -109,4 +111,4 @@ class DDC2895 extends AbstractDDC2895
     {
         return $this->id;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2931Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2931Test.php
index 8923f2764..ff494225f 100755
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2931Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2931Test.php
@@ -14,9 +14,11 @@ class DDC2931Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2931User'),
-            ));
+                ]
+            );
         } catch (\Exception $e) {
             // no action needed - schema seems to be already in place
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2984Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2984Test.php
index 19439c143..bf685328f 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2984Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2984Test.php
@@ -15,18 +15,20 @@ class DDC2984Test extends \Doctrine\Tests\OrmFunctionalTestCase
     public function setUp()
     {
         parent::setUp();
-        
+
         if ( ! Type::hasType('ddc2984_domain_user_id')) {
             Type::addType(
-                'ddc2984_domain_user_id', 
+                'ddc2984_domain_user_id',
                 __NAMESPACE__ . '\DDC2984UserIdCustomDbalType'
             );
         }
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2984User'),
-            ));
+                ]
+            );
         } catch (\Exception $e) {
             // no action needed - schema seems to be already in place
         }
@@ -36,10 +38,10 @@ class DDC2984Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         $user = new DDC2984User(new DDC2984DomainUserId('unique_id_within_a_vo'));
         $user->applyName('Alex');
-        
+
         $this->_em->persist($user);
         $this->_em->flush($user);
-        
+
         $repository = $this->_em->getRepository(__NAMESPACE__ . "\DDC2984User");
 
         $sameUser = $repository->find(new DDC2984DomainUserId('unique_id_within_a_vo'));
@@ -154,7 +156,7 @@ class DDC2984DomainUserId
     {
         return $this->toString() === $other->toString();
     }
-} 
+}
 
 /**
  * Class DDC2984UserIdCustomDbalType
@@ -196,4 +198,4 @@ class DDC2984UserIdCustomDbalType extends StringType
 
         return $value->toString();
     }
-} 
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2996Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2996Test.php
index 09d7415d2..897d3bfdf 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2996Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2996Test.php
@@ -9,10 +9,12 @@ class DDC2996Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     public function testIssue()
     {
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC2996User'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC2996UserPreference'),
-        ));
+            ]
+        );
 
         $pref = new DDC2996UserPreference();
         $pref->user = new DDC2996User();
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3033Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3033Test.php
index e79551191..153457805 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3033Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3033Test.php
@@ -12,10 +12,12 @@ class DDC3033Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     public function testIssue()
     {
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC3033User'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC3033Product'),
-        ));
+            ]
+        );
 
         $user = new DDC3033User();
         $user->name = "Test User";
@@ -38,12 +40,12 @@ class DDC3033Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->persist($product);
         $this->_em->flush();
 
-        $expect = array(
-            'title' => array(
+        $expect = [
+            'title' => [
                 0 => 'Test product',
                 1 => 'Test Change title',
-            ),
-        );
+            ],
+        ];
 
         $this->assertEquals($expect, $product->changeSet);
     }
@@ -55,7 +57,7 @@ class DDC3033Test extends \Doctrine\Tests\OrmFunctionalTestCase
  */
 class DDC3033Product
 {
-    public $changeSet = array();
+    public $changeSet = [];
 
     /**
      * @var int $id
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3042Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3042Test.php
index fe84e11ff..222b30fc0 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3042Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3042Test.php
@@ -13,10 +13,12 @@ class DDC3042Test extends OrmFunctionalTestCase
     {
         parent::setUp();
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3042Foo'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3042Bar'),
-        ));
+            ]
+        );
     }
 
     public function testSQLGenerationDoesNotProvokeAliasCollisions()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3068Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3068Test.php
index d43e35563..83eb50aa9 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3068Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3068Test.php
@@ -8,7 +8,7 @@ use Doctrine\Tests\Models\Taxi\Ride;
 
 /**
  * @group DDC-3068
- * 
+ *
  * @author Giorgio Premi <giosh94mhz@gmail.com>
  */
 class DDC3068Test extends \Doctrine\Tests\OrmFunctionalTestCase
@@ -40,17 +40,19 @@ class DDC3068Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
     public function testFindUsingAnArrayOfObjectAsPrimaryKey()
     {
-        $ride1 = $this->_em->find('Doctrine\Tests\Models\Taxi\Ride', array(
+        $ride1 = $this->_em->find('Doctrine\Tests\Models\Taxi\Ride', [
             'driver' => $this->foo->getId(),
-            'car'    => $this->merc->getBrand())
+            'car'    => $this->merc->getBrand()
+            ]
         );
 
         $this->assertInstanceOf('Doctrine\Tests\Models\Taxi\Ride', $ride1);
 
-        $ride2 = $this->_em->find('Doctrine\Tests\Models\Taxi\Ride', array(
+        $ride2 = $this->_em->find('Doctrine\Tests\Models\Taxi\Ride', [
             'driver' => $this->foo,
             'car'    => $this->merc
-        ));
+        ]
+        );
 
         $this->assertInstanceOf('Doctrine\Tests\Models\Taxi\Ride', $ride2);
         $this->assertSame($ride1, $ride2);
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC309Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC309Test.php
index 402c4374a..4d5583c75 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC309Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC309Test.php
@@ -9,10 +9,12 @@ class DDC309Test extends OrmFunctionalTestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC309Country'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC309User'),
-        ));
+            ]
+        );
     }
 
     public function testTwoIterateHydrations()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3123Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3123Test.php
index 7f82e6c89..515aa9feb 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3123Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3123Test.php
@@ -26,10 +26,10 @@ class DDC3123Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $user->username = 'ocramius';
 
         $this->_em->persist($user);
-        $uow->scheduleExtraUpdate($user, array('name' => 'changed name'));
+        $uow->scheduleExtraUpdate($user, ['name' => 'changed name']);
 
         $listener = $this->getMockBuilder(\stdClass::class)
-                         ->setMethods(array(Events::postFlush))
+                         ->setMethods([Events::postFlush])
                          ->getMock();
 
         $listener
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php
index 4924d39f9..92f2c1b27 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php
@@ -18,12 +18,12 @@ class DDC3170Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         $this->_schemaTool->createSchema(
-            array(
+            [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3170AbstractEntityJoined'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3170ProductJoined'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3170AbstractEntitySingleTable'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3170ProductSingleTable'),
-            )
+            ]
         );
     }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3192Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3192Test.php
index da6a8de1d..79dd4267e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3192Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3192Test.php
@@ -25,10 +25,12 @@ class DDC3192Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         Type::addType('ddc3192_currency_code', __NAMESPACE__ . '\DDC3192CurrencyCode');
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(DDC3192Currency::CLASSNAME),
             $this->_em->getClassMetadata(DDC3192Transaction::CLASSNAME),
-        ));
+            ]
+        );
     }
 
     public function testIssue()
@@ -130,9 +132,9 @@ class DDC3192Transaction
 
 class DDC3192CurrencyCode extends Type
 {
-    private static $map = array(
+    private static $map = [
         'BYR' => 974,
-    );
+    ];
 
     /**
      * {@inheritdoc}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3223Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3223Test.php
index 541221aa0..be2c58617 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3223Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3223Test.php
@@ -15,12 +15,14 @@ class DDC3223Test extends OrmFunctionalTestCase
     {
         parent::setUp();
 
-        $this->setUpEntitySchema(array(
+        $this->setUpEntitySchema(
+            [
             'Doctrine\Tests\ORM\Functional\Ticket\Journalist',
             'Doctrine\Tests\ORM\Functional\Ticket\Participant',
             'Doctrine\Tests\ORM\Functional\Ticket\Status',
             'Doctrine\Tests\ORM\Functional\Ticket\ProfileStatus',
-        ));
+            ]
+        );
     }
 
     public function testIssueGetId()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3300Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3300Test.php
index b7905ca3d..8014ae6f8 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3300Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3300Test.php
@@ -16,20 +16,22 @@ class DDC3300Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $resolveTargetEntity->addResolveTargetEntity(
             DDC3300BossInterface::INTERFACENAME,
             DDC3300Boss::CLASSNAME,
-            array()
+            []
         );
 
         $resolveTargetEntity->addResolveTargetEntity(
             DDC3300EmployeeInterface::INTERFACENAME,
             DDC3300Employee::CLASSNAME,
-            array()
+            []
         );
 
         $this->_em->getEventManager()->addEventSubscriber($resolveTargetEntity);
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(DDC3300Person::CLASSNAME),
-        ));
+            ]
+        );
 
         $boss     = new DDC3300Boss();
         $employee = new DDC3300Employee();
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3330Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3330Test.php
index a5ed25770..9edf58170 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3330Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3330Test.php
@@ -16,10 +16,12 @@ class DDC3330Test extends OrmFunctionalTestCase
     {
         parent::setUp();
 
-        $this->setUpEntitySchema(array(
+        $this->setUpEntitySchema(
+            [
             'Doctrine\Tests\ORM\Functional\Ticket\DDC3330_Building',
             'Doctrine\Tests\ORM\Functional\Ticket\DDC3330_Hall',
-        ));
+            ]
+        );
     }
 
     public function testIssueCollectionOrderWithPaginator()
@@ -29,7 +31,7 @@ class DDC3330Test extends OrmFunctionalTestCase
         $this->createBuildingAndHalls();
 
         $this->_em->clear();
-        
+
         $query = $this->_em->createQuery(
             'SELECT b, h'.
             ' FROM Doctrine\Tests\ORM\Functional\Ticket\DDC3330_Building b'.
@@ -37,32 +39,32 @@ class DDC3330Test extends OrmFunctionalTestCase
             ' ORDER BY b.id ASC, h.name DESC'
         )
         ->setMaxResults(3);
-        
+
         $paginator = new Paginator($query, true);
-        
+
         /*foreach ($paginator as $building) {
              echo 'BUILDING ID: '.$building->id."\n";
              foreach ($building->halls as $hall) {
                  echo '   - HALL: '.$hall->id.' - '.$hall->name."\n";
              }
          }*/
-        
+
         $this->assertEquals(3, count(iterator_to_array($paginator)), 'Count is not correct for pagination');
     }
-    
+
     /**
      * Create a building and 10 halls
      */
     private function createBuildingAndHalls()
     {
         $building = new DDC3330_Building();
-    
+
         for ($i = 0; $i < 10; $i++) {
             $hall = new DDC3330_Hall();
             $hall->name = 'HALL-'.$i;
             $building->addHall($hall);
         }
-    
+
         $this->_em->persist($building);
         $this->_em->flush();
     }
@@ -78,7 +80,7 @@ class DDC3330_Building
      * @GeneratedValue
      */
     public $id;
-    
+
     /**
      * @OneToMany(targetEntity="DDC3330_Hall", mappedBy="building", cascade={"persist"})
      */
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php
index ba286da24..85b2086c7 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php
@@ -23,7 +23,7 @@ class DDC3346Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         /* @var DDC3346Author $author */
         $author = $this->_em->getRepository(DDC3346Author::CLASSNAME)->findOneBy(
-            array('username' => 'bwoogy')
+            ['username' => 'bwoogy']
         );
 
         $this->assertCount(2, $author->articles);
@@ -33,7 +33,7 @@ class DDC3346Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         /* @var DDC3346Author[] $authors */
         $authors = $this->_em->getRepository(DDC3346Author::CLASSNAME)->findBy(
-            array('username' => 'bwoogy'),
+            ['username' => 'bwoogy'],
             null,
             1
         );
@@ -46,7 +46,7 @@ class DDC3346Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         /* @var DDC3346Author[] $authors */
         $authors = $this->_em->getRepository(DDC3346Author::CLASSNAME)->findBy(
-            array('username' => 'bwoogy'),
+            ['username' => 'bwoogy'],
             null,
             null,
             0 // using an explicitly defined offset
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php
index 255790d7c..ea4c37722 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php
@@ -8,11 +8,13 @@ class DDC345Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger);
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC345User'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC345Group'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC345Membership'),
-        ));
+            ]
+        );
     }
 
     public function testTwoIterateHydrations()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC353Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC353Test.php
index 03d28bb2e..5d9e8a014 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC353Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC353Test.php
@@ -10,10 +10,12 @@ class DDC353Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC353File'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC353Picture'),
-            ));
+                ]
+            );
         } catch(\Exception $ignored) {}
     }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3597Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3597Test.php
index e6f25b852..b4bb7891c 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3597Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3597Test.php
@@ -13,11 +13,13 @@ class DDC3597Test extends \Doctrine\Tests\OrmFunctionalTestCase {
 
     protected function setUp() {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(DDC3597Root::CLASSNAME),
             $this->_em->getClassMetadata(DDC3597Media::CLASSNAME),
             $this->_em->getClassMetadata(DDC3597Image::CLASSNAME)
-        ));
+            ]
+        );
     }
 
     /**
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3644Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3644Test.php
index 46eeeab74..f4e338eac 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3644Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3644Test.php
@@ -16,12 +16,14 @@ class DDC3644Test extends OrmFunctionalTestCase
     {
         parent::setUp();
 
-        $this->setUpEntitySchema(array(
+        $this->setUpEntitySchema(
+            [
             'Doctrine\Tests\ORM\Functional\Ticket\DDC3644User',
             'Doctrine\Tests\ORM\Functional\Ticket\DDC3644Address',
             'Doctrine\Tests\ORM\Functional\Ticket\DDC3644Animal',
             'Doctrine\Tests\ORM\Functional\Ticket\DDC3644Pet',
-        ));
+            ]
+        );
     }
 
     /**
@@ -33,7 +35,7 @@ class DDC3644Test extends OrmFunctionalTestCase
         $current   = new DDC3644Address('Sao Paulo, SP, Brazil');
         $previous  = new DDC3644Address('Rio de Janeiro, RJ, Brazil');
         $initial   = new DDC3644Address('Sao Carlos, SP, Brazil');
-        $addresses = new ArrayCollection(array($current, $previous, $initial));
+        $addresses = new ArrayCollection([$current, $previous, $initial]);
         $user      = new DDC3644User();
 
         $user->name = 'Guilherme Blanco';
@@ -53,7 +55,7 @@ class DDC3644Test extends OrmFunctionalTestCase
 
         // Replace entire collection (this should trigger OneToManyPersister::remove())
         $current   = new DDC3644Address('Toronto, ON, Canada');
-        $addresses = new ArrayCollection(array($current));
+        $addresses = new ArrayCollection([$current]);
         $user      = $this->_em->find(__NAMESPACE__ . '\DDC3644User', $userId);
 
         $user->setAddresses($addresses);
@@ -84,7 +86,7 @@ class DDC3644Test extends OrmFunctionalTestCase
         // Define initial dataset
         $actual = new DDC3644Pet('Catharina');
         $past   = new DDC3644Pet('Nanny');
-        $pets   = new ArrayCollection(array($actual, $past));
+        $pets   = new ArrayCollection([$actual, $past]);
         $user   = new DDC3644User();
 
         $user->name = 'Guilherme Blanco';
@@ -103,7 +105,7 @@ class DDC3644Test extends OrmFunctionalTestCase
 
         // Replace entire collection (this should trigger OneToManyPersister::remove())
         $actual = new DDC3644Pet('Valentina');
-        $pets   = new ArrayCollection(array($actual));
+        $pets   = new ArrayCollection([$actual]);
         $user   = $this->_em->find(__NAMESPACE__ . '\DDC3644User', $userId);
 
         $user->setPets($pets);
@@ -242,4 +244,4 @@ class DDC3644Pet extends DDC3644Animal
      * @JoinColumn(referencedColumnName="hash_id")
      */
     public $owner;
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3711Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3711Test.php
index 60d872b4a..6a08b49bc 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3711Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3711Test.php
@@ -23,8 +23,8 @@ class DDC3711Test extends YamlMappingDriverTest
         $entityA = new ClassMetadata('Doctrine\Tests\Models\DDC3711\DDC3711EntityA');
         $entityA = $factory->getMetadataFor('Doctrine\Tests\Models\DDC3711\DDC3711EntityA');
 
-        $this->assertEquals(array('link_a_id1' => "id1", 'link_a_id2' => "id2"), $entityA->associationMappings['entityB']['relationToSourceKeyColumns']);
-        $this->assertEquals(array('link_b_id1' => "id1", 'link_b_id2' => "id2"), $entityA->associationMappings['entityB']['relationToTargetKeyColumns']);
+        $this->assertEquals(['link_a_id1' => "id1", 'link_a_id2' => "id2"], $entityA->associationMappings['entityB']['relationToSourceKeyColumns']);
+        $this->assertEquals(['link_b_id1' => "id1", 'link_b_id2' => "id2"], $entityA->associationMappings['entityB']['relationToTargetKeyColumns']);
 
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php
index 37e94c542..f7013d6d8 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php
@@ -12,10 +12,12 @@ class DDC371Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger);
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC371Parent'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC371Child')
-        ));
+            ]
+        );
     }
 
     public function testIssue()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php
index 4940c8abc..f5b8cac01 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php
@@ -15,11 +15,13 @@ class DDC3785Test extends \Doctrine\Tests\OrmFunctionalTestCase
         Type::addType('ddc3785_asset_id', __NAMESPACE__ . '\\DDC3785_AssetIdType');
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC3785_Asset'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC3785_AssetId'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC3785_Attribute')
-            ));
+                ]
+            );
         } catch(\Exception $e) {
         }
     }
@@ -30,10 +32,10 @@ class DDC3785Test extends \Doctrine\Tests\OrmFunctionalTestCase
     public function testOwningValueObjectIdIsCorrectlyTransformedWhenRemovingOrphanedChildEntities()
     {
     	$id = new DDC3785_AssetId("919609ba-57d9-4a13-be1d-d202521e858a");
-    	$attributes = array(
-    		$attribute1 = new DDC3785_Attribute("foo1", "bar1"), 
+    	$attributes = [
+    		$attribute1 = new DDC3785_Attribute("foo1", "bar1"),
     		$attribute2 = new DDC3785_Attribute("foo2", "bar2")
-    	);
+        ];
         $this->_em->persist($asset = new DDC3785_Asset($id, $attributes));
         $this->_em->flush();
 
@@ -64,7 +66,7 @@ class DDC3785_Asset
      **/
     private $attributes;
 
-    public function __construct(DDC3785_AssetId $id, $attributes = array())
+    public function __construct(DDC3785_AssetId $id, $attributes = [])
     {
     	$this->id = $id;
     	$this->attributes = new ArrayCollection();
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC381Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC381Test.php
index eb3b77f56..2bf52eb34 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC381Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC381Test.php
@@ -9,9 +9,11 @@ class DDC381Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC381Entity'),
-            ));
+                ]
+            );
         } catch(\Exception $e) {
 
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php
index 07f374b36..0325e1175 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php
@@ -8,11 +8,13 @@ class DDC422Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger);
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC422Guest'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC422Customer'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC422Contact')
-        ));
+            ]
+        );
     }
 
     /**
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php
index d3d3e27ba..e6389ebf9 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php
@@ -8,10 +8,12 @@ class DDC425Test extends \Doctrine\Tests\OrmFunctionalTestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC425Entity'),
             //$this->_em->getClassMetadata(__NAMESPACE__ . '\DDC425Other')
-        ));
+            ]
+        );
     }
 
     /**
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php
index f4f944ad5..7fa7b58bd 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php
@@ -9,10 +9,12 @@ class DDC440Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC440Phone'),
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC440Client')
-            ));
+                ]
+            );
         } catch (\Exception $e) {
             // Swallow all exceptions. We do not test the schema tool here.
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php
index 58ac8f20a..2615e37c6 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php
@@ -8,9 +8,11 @@ class DDC444Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger);
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC444User'),
-        ));
+            ]
+        );
     }
 
     public function testExplicitPolicy()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php
index 3688a80d8..41d1fdee6 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php
@@ -9,11 +9,13 @@ class DDC448Test extends OrmFunctionalTestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC448MainTable'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC448ConnectedClass'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC448SubTable'),
-        ));
+            ]
+        );
     }
 
     public function testIssue()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC493Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC493Test.php
index 1a8384f7d..5aebed107 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC493Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC493Test.php
@@ -7,11 +7,13 @@ class DDC493Test extends \Doctrine\Tests\OrmFunctionalTestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC493Customer'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC493Distributor'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC493Contact')
-        ));
+            ]
+        );
     }
 
     public function testIssue()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC501Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC501Test.php
index 45c202ee5..3763b15d7 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC501Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC501Test.php
@@ -89,13 +89,13 @@ class DDC501Test extends OrmFunctionalTestCase
         $user->username = 'lukacho';
         $user->status = 'developer';
 
-        foreach(array(1111,2222,3333,4444) as $number) {
+        foreach([1111,2222,3333,4444] as $number) {
             $phone = new CmsPhonenumber;
             $phone->phonenumber = $number;
             $user->addPhonenumber($phone);
         }
 
-        foreach(array('Moshers', 'Headbangers') as $groupName) {
+        foreach(['Moshers', 'Headbangers'] as $groupName) {
             $group = new CmsGroup;
             $group->setName($groupName);
             $user->addGroup($group);
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php
index c6d792d39..4cc5aee8c 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php
@@ -9,11 +9,13 @@ class DDC512Test extends OrmFunctionalTestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC512Customer'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC512OfferItem'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC512Item'),
-        ));
+            ]
+        );
     }
 
     public function testIssue()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC513Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC513Test.php
index 36bb29c74..11a7d2f6f 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC513Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC513Test.php
@@ -7,11 +7,13 @@ class DDC513Test extends \Doctrine\Tests\OrmFunctionalTestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC513OfferItem'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC513Item'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC513Price'),
-        ));
+            ]
+        );
     }
 
     public function testIssue()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php
index f87216a55..d8592b482 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php
@@ -12,11 +12,13 @@ class DDC522Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC522Customer'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC522Cart'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC522ForeignKeyTest')
-            ));
+                ]
+            );
         } catch(\Exception $e) {
 
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC531Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC531Test.php
index 50f96968d..f205ae697 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC531Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC531Test.php
@@ -7,10 +7,12 @@ class DDC531Test extends \Doctrine\Tests\OrmFunctionalTestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC531Item'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC531SubItem'),
-        ));
+            ]
+        );
     }
 
     public function testIssue()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php
index b5ace06b0..055438359 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php
@@ -7,9 +7,11 @@ class DDC588Test extends \Doctrine\Tests\OrmFunctionalTestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC588Site'),
-        ));
+            ]
+        );
     }
 
     public function testIssue()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC599Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC599Test.php
index ed91bd59d..fb596da52 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC599Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC599Test.php
@@ -9,11 +9,13 @@ class DDC599Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
         //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger);
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC599Item'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC599Subitem'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC599Child'),
-            ));
+                ]
+            );
         } catch (\Exception $ignored) {}
     }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php
index 165a42b6d..5d5a6ac1e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php
@@ -11,10 +11,12 @@ class DDC618Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC618Author'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC618Book')
-            ));
+                ]
+            );
 
             // Create author 10/Joe with two books 22/JoeA and 20/JoeB
             $author = new DDC618Author();
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC633Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC633Test.php
index 0a538ee3e..b88b1b154 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC633Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC633Test.php
@@ -8,10 +8,12 @@ class DDC633Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC633Patient'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC633Appointment'),
-            ));
+                ]
+            );
         } catch(\Exception $e) {
 
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC656Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC656Test.php
index eb368cd89..2ebffe340 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC656Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC656Test.php
@@ -8,9 +8,11 @@ class DDC656Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC656Entity')
-            ));
+                ]
+            );
         } catch(\Exception $e) {
 
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php
index cf15770a8..c9bb3f09e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php
@@ -8,10 +8,12 @@ class DDC698Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC698Role'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC698Privilege')
-            ));
+                ]
+            );
         } catch(\Exception $e) {
 
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php
index 428fe057a..1ae26394c 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php
@@ -8,9 +8,11 @@ class DDC719Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger);
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC719Group'),
-        ));
+            ]
+        );
     }
 
     public function testIsEmptySqlGeneration()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC729Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC729Test.php
index 0dc89a3b3..730eb99ee 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC729Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC729Test.php
@@ -10,10 +10,12 @@ class DDC729Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         try {
             $schemaTool = new \Doctrine\ORM\Tools\SchemaTool($this->_em);
-            $schemaTool->createSchema(array(
+            $schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC729A'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC729B'),
-            ));
+                ]
+            );
         } catch(\Exception $e) {
 
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC735Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC735Test.php
index 41f7b293b..61babe8e6 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC735Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC735Test.php
@@ -10,10 +10,12 @@ class DDC735Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC735Product'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC735Review')
-            ));
+                ]
+            );
         } catch(\Exception $e) {
 
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC736Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC736Test.php
index a93c91c7e..5141e9f3a 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC736Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC736Test.php
@@ -41,7 +41,7 @@ class DDC736Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCart', $cart2);
         $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $cart2->getCustomer());
         $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCustomer', $cart2->getCustomer());
-        $this->assertEquals(array('name' => 'roman', 'payment' => 'cash'), $result);
+        $this->assertEquals(['name' => 'roman', 'payment' => 'cash'], $result);
     }
 
     /**
@@ -65,7 +65,8 @@ class DDC736Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $dql = "select c, c.name, ca, ca.payment from Doctrine\Tests\Models\ECommerce\ECommerceCart ca join ca.customer c";
         $result = $this->_em->createQuery($dql)
-                            ->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\Tests\ORM\Functional\Ticket\DisableFetchJoinTreeWalker'))
+                            ->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\Tests\ORM\Functional\Ticket\DisableFetchJoinTreeWalker']
+                            )
                             ->getResult();
 
         /* @var $cart2 Doctrine\Tests\Models\ECommerce\ECommerceCart */
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php
index 46dddff6b..773ad06a8 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php
@@ -25,10 +25,12 @@ class DDC742Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->getMetadataFactory()->setCacheDriver(new FilesystemCache($testDir));
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC742User'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC742Comment')
-            ));
+                ]
+            );
         } catch(\Exception $e) {
         }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC767Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC767Test.php
index bcf72e4e9..8420db132 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC767Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC767Test.php
@@ -48,7 +48,7 @@ class DDC767Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $this->assertNotNull($pUser, "User not retrieved from database.");
 
-        $groups = array($group2->id, $group3->id);
+        $groups = [$group2->id, $group3->id];
 
         try {
             $this->_em->beginTransaction();
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php
index a88bbad81..f6d7b95b9 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php
@@ -7,31 +7,33 @@ class DDC809Test extends \Doctrine\Tests\OrmFunctionalTestCase
     public function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC809Variant'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC809SpecificationValue')
-        ));
+            ]
+        );
 
         $conn = $this->_em->getConnection();
-        $conn->insert('specification_value_test', array('specification_value_id' => 94589));
-        $conn->insert('specification_value_test', array('specification_value_id' => 94593));
-        $conn->insert('specification_value_test', array('specification_value_id' => 94606));
-        $conn->insert('specification_value_test', array('specification_value_id' => 94607));
-        $conn->insert('specification_value_test', array('specification_value_id' => 94609));
-        $conn->insert('specification_value_test', array('specification_value_id' => 94711));
+        $conn->insert('specification_value_test', ['specification_value_id' => 94589]);
+        $conn->insert('specification_value_test', ['specification_value_id' => 94593]);
+        $conn->insert('specification_value_test', ['specification_value_id' => 94606]);
+        $conn->insert('specification_value_test', ['specification_value_id' => 94607]);
+        $conn->insert('specification_value_test', ['specification_value_id' => 94609]);
+        $conn->insert('specification_value_test', ['specification_value_id' => 94711]);
 
-        $conn->insert('variant_test', array('variant_id' => 545208));
-        $conn->insert('variant_test', array('variant_id' => 545209));
+        $conn->insert('variant_test', ['variant_id' => 545208]);
+        $conn->insert('variant_test', ['variant_id' => 545209]);
 
-        $conn->insert('var_spec_value_test', array('variant_id' => 545208, 'specification_value_id' => 94606));
-        $conn->insert('var_spec_value_test', array('variant_id' => 545208, 'specification_value_id' => 94607));
-        $conn->insert('var_spec_value_test', array('variant_id' => 545208, 'specification_value_id' => 94609));
-        $conn->insert('var_spec_value_test', array('variant_id' => 545208, 'specification_value_id' => 94711));
+        $conn->insert('var_spec_value_test', ['variant_id' => 545208, 'specification_value_id' => 94606]);
+        $conn->insert('var_spec_value_test', ['variant_id' => 545208, 'specification_value_id' => 94607]);
+        $conn->insert('var_spec_value_test', ['variant_id' => 545208, 'specification_value_id' => 94609]);
+        $conn->insert('var_spec_value_test', ['variant_id' => 545208, 'specification_value_id' => 94711]);
 
-        $conn->insert('var_spec_value_test', array('variant_id' => 545209, 'specification_value_id' => 94589));
-        $conn->insert('var_spec_value_test', array('variant_id' => 545209, 'specification_value_id' => 94593));
-        $conn->insert('var_spec_value_test', array('variant_id' => 545209, 'specification_value_id' => 94606));
-        $conn->insert('var_spec_value_test', array('variant_id' => 545209, 'specification_value_id' => 94607));
+        $conn->insert('var_spec_value_test', ['variant_id' => 545209, 'specification_value_id' => 94589]);
+        $conn->insert('var_spec_value_test', ['variant_id' => 545209, 'specification_value_id' => 94593]);
+        $conn->insert('var_spec_value_test', ['variant_id' => 545209, 'specification_value_id' => 94606]);
+        $conn->insert('var_spec_value_test', ['variant_id' => 545209, 'specification_value_id' => 94607]);
     }
 
     /**
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php
index 219aed48d..6e7d4ea2c 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php
@@ -14,11 +14,13 @@ class DDC832Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $this->_em->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger());
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC832JoinedIndex'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC832JoinedTreeIndex'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC832Like'),
-            ));
+                ]
+            );
         } catch(\Exception $e) {
 
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC837Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC837Test.php
index ef4484ee7..5cb8f925a 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC837Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC837Test.php
@@ -7,13 +7,15 @@ class DDC837Test extends \Doctrine\Tests\OrmFunctionalTestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC837Super'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC837Class1'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC837Class2'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC837Class3'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC837Aggregate'),
-        ));
+            ]
+        );
     }
 
     /**
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC881Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC881Test.php
index 22e39f849..5bbeca210 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC881Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC881Test.php
@@ -10,11 +10,13 @@ class DDC881Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC881User'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC881Phonenumber'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC881Phonecall'),
-            ));
+                ]
+            );
         } catch (\Exception $e) {
 
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php
index a1634fe5d..7e10c2c2c 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php
@@ -29,8 +29,12 @@ class DDC949Test extends OrmFunctionalTestCase
         $this->_em->flush();
         $this->_em->clear();
 
-        $true = $this->_em->getRepository('Doctrine\Tests\Models\Generic\BooleanModel')->findOneBy(array('booleanField' => true));
-        $false = $this->_em->getRepository('Doctrine\Tests\Models\Generic\BooleanModel')->findOneBy(array('booleanField' => false));
+        $true = $this->_em->getRepository('Doctrine\Tests\Models\Generic\BooleanModel')->findOneBy(
+            ['booleanField' => true]
+        );
+        $false = $this->_em->getRepository('Doctrine\Tests\Models\Generic\BooleanModel')->findOneBy(
+            ['booleanField' => false]
+        );
 
         $this->assertInstanceOf('Doctrine\Tests\Models\Generic\BooleanModel', $true, "True model not found");
         $this->assertTrue($true->booleanField, "True Boolean Model should be true.");
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC960Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC960Test.php
index b1432ec8b..7f9167601 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC960Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC960Test.php
@@ -10,10 +10,12 @@ class DDC960Test extends OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC960Root'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC960Child')
-            ));
+                ]
+            );
         } catch(\Exception $e) {
 
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC992Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC992Test.php
index 25363b0b3..e8849e10f 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC992Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC992Test.php
@@ -13,11 +13,13 @@ class DDC992Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC992Role'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC992Parent'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC992Child'),
-            ));
+                ]
+            );
         } catch(\Exception $e) {
 
         }
@@ -65,7 +67,7 @@ class DDC992Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertEquals(1, count($parent->childs));
         $this->assertEquals(0, count($parent->childs[0]->childs()));
 
-        $child = $parentRepository->findOneBy(array("id" => $child->id));
+        $child = $parentRepository->findOneBy(["id" => $child->id]);
         $this->assertSame($parent->childs[0], $child);
 
         $this->_em->clear();
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5762Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5762Test.php
index b42dd6534..b7a748ddc 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5762Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5762Test.php
@@ -15,11 +15,13 @@ class GH5762Test extends OrmFunctionalTestCase
     {
         parent::setUp();
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(GH5762Driver::class),
             $this->_em->getClassMetadata(GH5762DriverRide::class),
             $this->_em->getClassMetadata(GH5762Car::class),
-        ));
+            ]
+        );
     }
 
     public function testIssue()
@@ -31,7 +33,7 @@ class GH5762Test extends OrmFunctionalTestCase
         self::assertInstanceOf(GH5762DriverRide::class, $result->driverRides->get(0));
         self::assertInstanceOf(GH5762Car::class, $result->driverRides->get(0)->car);
 
-        $cars = array();
+        $cars = [];
         foreach ($result->driverRides as $ride) {
             $cars[] = $ride->car->brand;
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php
index 91521b5d5..86a7d641f 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php
@@ -9,9 +9,11 @@ class Ticket2481Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\Ticket2481Product')
-            ));
+                ]
+            );
         } catch (\Exception $e) {
             // Swallow all exceptions. We do not test the schema tool here.
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php
index d9ac1cc6a..d04ac2730 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php
@@ -14,11 +14,13 @@ class AdvancedAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase {
     {
         parent::setUp();
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                     $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\Lemma'),
                     $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\Relation'),
                     $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\RelationType')
-            ));
+                ]
+            );
         } catch (\Exception $e) {
             // Swallow all exceptions. We do not test the schema tool here.
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/TypeTest.php b/tests/Doctrine/Tests/ORM/Functional/TypeTest.php
index c27e0dee6..a8afcf8ca 100644
--- a/tests/Doctrine/Tests/ORM/Functional/TypeTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/TypeTest.php
@@ -78,7 +78,7 @@ class TypeTest extends OrmFunctionalTestCase
         $dql = "SELECT s FROM Doctrine\Tests\Models\Generic\SerializationModel s";
         $serialize = $this->_em->createQuery($dql)->getSingleResult();
 
-        $this->assertEquals(array("foo" => "bar", "bar" => "baz"), $serialize->array);
+        $this->assertEquals(["foo" => "bar", "bar" => "baz"], $serialize->array);
     }
 
     public function testObject()
@@ -125,7 +125,8 @@ class TypeTest extends OrmFunctionalTestCase
         $this->assertInstanceOf('DateTime', $dateTimeDb->datetime);
         $this->assertEquals('2009-10-02 20:10:52', $dateTimeDb->datetime->format('Y-m-d H:i:s'));
 
-        $articles = $this->_em->getRepository( 'Doctrine\Tests\Models\Generic\DateTimeModel' )->findBy( array( 'datetime' => new \DateTime( "now" ) ) );
+        $articles = $this->_em->getRepository( 'Doctrine\Tests\Models\Generic\DateTimeModel' )->findBy( ['datetime' => new \DateTime( "now" )]
+        );
         $this->assertEquals( 0, count( $articles ) );
     }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/UUIDGeneratorTest.php b/tests/Doctrine/Tests/ORM/Functional/UUIDGeneratorTest.php
index d5d559a4f..c722771da 100644
--- a/tests/Doctrine/Tests/ORM/Functional/UUIDGeneratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/UUIDGeneratorTest.php
@@ -15,9 +15,11 @@ class UUIDGeneratorTest extends OrmFunctionalTestCase
             $this->markTestSkipped('Currently restricted to MySQL platform.');
         }
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\UUIDEntity')
-        ));
+            ]
+        );
     }
 
     public function testGenerateUUID()
diff --git a/tests/Doctrine/Tests/ORM/Functional/UnitOfWorkLifecycleTest.php b/tests/Doctrine/Tests/ORM/Functional/UnitOfWorkLifecycleTest.php
index 3e8285e8f..8c4c500e7 100644
--- a/tests/Doctrine/Tests/ORM/Functional/UnitOfWorkLifecycleTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/UnitOfWorkLifecycleTest.php
@@ -68,7 +68,7 @@ class UnitOfWorkLifecycleTest extends OrmFunctionalTestCase
         $this->expectException(ORMInvalidArgumentException::class);
         $this->expectExceptionMessage("The given entity of type 'Doctrine\Tests\Models\CMS\CmsUser' (Doctrine\Tests\Models\CMS\CmsUser@");
 
-        $this->_em->getUnitOfWork()->registerManaged($user, array(), array());
+        $this->_em->getUnitOfWork()->registerManaged($user, [], []);
     }
 
     public function testMarkReadOnlyNonManaged()
@@ -80,4 +80,4 @@ class UnitOfWorkLifecycleTest extends OrmFunctionalTestCase
 
         $this->_em->getUnitOfWork()->markReadOnly($user);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdForeignKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdForeignKeyTest.php
index a6ad68d0a..1094da877 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdForeignKeyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdForeignKeyTest.php
@@ -81,7 +81,7 @@ class ManyToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase
 
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity',
-            array('id1' => 'def', 'foreignEntity' => 'abc')
+            ['id1' => 'def', 'foreignEntity' => 'abc']
         );
 
         $owning = $this->_em->find(
@@ -106,7 +106,7 @@ class ManyToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase
 
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity',
-            array('id1' => 'def', 'foreignEntity' => 'abc')
+            ['id1' => 'def', 'foreignEntity' => 'abc']
         );
 
         $owning = $this->_em->find(
@@ -132,7 +132,7 @@ class ManyToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase
 
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity',
-            array('id1' => 'def', 'foreignEntity' => $auxiliary)
+            ['id1' => 'def', 'foreignEntity' => $auxiliary]
         );
 
         $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity', $inversed);
@@ -158,7 +158,7 @@ class ManyToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase
     {
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity',
-            array('id1' => 'def', 'foreignEntity' => 'abc')
+            ['id1' => 'def', 'foreignEntity' => 'abc']
         );
 
         $this->assertCount(1, $inversed->associatedEntities);
@@ -176,7 +176,7 @@ class ManyToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase
 
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity',
-            array('id1' => 'def', 'foreignEntity' => 'abc')
+            ['id1' => 'def', 'foreignEntity' => 'abc']
         );
 
         foreach ($inversed->associatedEntities as $owning) {
diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdTest.php
index 327791648..c7470a198 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdTest.php
@@ -68,7 +68,7 @@ class ManyToManyCompositeIdTest extends OrmFunctionalTestCase
     {
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdEntity',
-            array('id1' => 'abc', 'id2' => 'def')
+            ['id1' => 'abc', 'id2' => 'def']
         );
 
         $owning = $this->_em->find(
@@ -87,7 +87,7 @@ class ManyToManyCompositeIdTest extends OrmFunctionalTestCase
     {
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdEntity',
-            array('id1' => 'abc', 'id2' => 'def')
+            ['id1' => 'abc', 'id2' => 'def']
         );
 
         $owning = $this->_em->find(
@@ -120,7 +120,7 @@ class ManyToManyCompositeIdTest extends OrmFunctionalTestCase
     {
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdEntity',
-            array('id1' => 'abc', 'id2' => 'def')
+            ['id1' => 'abc', 'id2' => 'def']
         );
 
         $this->assertCount(1, $inversed->associatedEntities);
@@ -138,7 +138,7 @@ class ManyToManyCompositeIdTest extends OrmFunctionalTestCase
 
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdEntity',
-            array('id1' => 'abc', 'id2' => 'def')
+            ['id1' => 'abc', 'id2' => 'def']
         );
 
         foreach ($inversed->associatedEntities as $owning) {
diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdForeignKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdForeignKeyTest.php
index e899fbeb8..eb3de5f12 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdForeignKeyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdForeignKeyTest.php
@@ -79,7 +79,7 @@ class OneToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase
 
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity',
-            array('id1' => 'def', 'foreignEntity' => 'abc')
+            ['id1' => 'def', 'foreignEntity' => 'abc']
         );
 
         $owning = $this->_em->find(
@@ -104,7 +104,7 @@ class OneToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase
 
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity',
-            array('id1' => 'def', 'foreignEntity' => 'abc')
+            ['id1' => 'def', 'foreignEntity' => 'abc']
         );
 
         $owning = $this->_em->find(
@@ -130,7 +130,7 @@ class OneToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase
 
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity',
-            array('id1' => 'def', 'foreignEntity' => $auxiliary)
+            ['id1' => 'def', 'foreignEntity' => $auxiliary]
         );
 
         $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity', $inversed);
@@ -160,7 +160,7 @@ class OneToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase
     {
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity',
-            array('id1' => 'def', 'foreignEntity' => 'abc')
+            ['id1' => 'def', 'foreignEntity' => 'abc']
         );
 
         $this->assertCount(1, $inversed->associatedEntities);
diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdTest.php
index eabf26a80..f68084eb5 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdTest.php
@@ -66,7 +66,7 @@ class OneToManyCompositeIdTest extends OrmFunctionalTestCase
     {
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdEntity',
-            array('id1' => 'abc', 'id2' => 'def')
+            ['id1' => 'abc', 'id2' => 'def']
         );
 
         $owning = $this->_em->find(
@@ -85,7 +85,7 @@ class OneToManyCompositeIdTest extends OrmFunctionalTestCase
     {
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdEntity',
-            array('id1' => 'abc', 'id2' => 'def')
+            ['id1' => 'abc', 'id2' => 'def']
         );
 
         $owning = $this->_em->find(
@@ -120,7 +120,7 @@ class OneToManyCompositeIdTest extends OrmFunctionalTestCase
     {
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdEntity',
-            array('id1' => 'abc', 'id2' => 'def')
+            ['id1' => 'abc', 'id2' => 'def']
         );
 
         $this->assertCount(1, $inversed->associatedEntities);
diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdForeignKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdForeignKeyTest.php
index 762cad2ee..e527ee2ef 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdForeignKeyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdForeignKeyTest.php
@@ -78,7 +78,7 @@ class OneToOneCompositeIdForeignKeyTest extends OrmFunctionalTestCase
 
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity',
-            array('id1' => 'def', 'foreignEntity' => 'abc')
+            ['id1' => 'def', 'foreignEntity' => 'abc']
         );
 
         $owning = $this->_em->find(
@@ -103,7 +103,7 @@ class OneToOneCompositeIdForeignKeyTest extends OrmFunctionalTestCase
 
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity',
-            array('id1' => 'def', 'foreignEntity' => 'abc')
+            ['id1' => 'def', 'foreignEntity' => 'abc']
         );
 
         $owning = $this->_em->find(
@@ -129,7 +129,7 @@ class OneToOneCompositeIdForeignKeyTest extends OrmFunctionalTestCase
 
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity',
-            array('id1' => 'def', 'foreignEntity' => $auxiliary)
+            ['id1' => 'def', 'foreignEntity' => $auxiliary]
         );
 
         $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity', $inversed);
@@ -157,7 +157,7 @@ class OneToOneCompositeIdForeignKeyTest extends OrmFunctionalTestCase
     {
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity',
-            array('id1' => 'def', 'foreignEntity' => 'abc')
+            ['id1' => 'def', 'foreignEntity' => 'abc']
         );
 
         $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdForeignKeyEntity', $inversed->associatedEntity);
diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdTest.php
index a179ab61a..2f944f235 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdTest.php
@@ -65,7 +65,7 @@ class OneToOneCompositeIdTest extends OrmFunctionalTestCase
     {
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdEntity',
-            array('id1' => 'abc', 'id2' => 'def')
+            ['id1' => 'abc', 'id2' => 'def']
         );
 
         $owning = $this->_em->find(
@@ -84,7 +84,7 @@ class OneToOneCompositeIdTest extends OrmFunctionalTestCase
     {
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdEntity',
-            array('id1' => 'abc', 'id2' => 'def')
+            ['id1' => 'abc', 'id2' => 'def']
         );
 
         $owning = $this->_em->find(
@@ -119,7 +119,7 @@ class OneToOneCompositeIdTest extends OrmFunctionalTestCase
     {
         $inversed = $this->_em->find(
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdEntity',
-            array('id1' => 'abc', 'id2' => 'def')
+            ['id1' => 'abc', 'id2' => 'def']
         );
 
         $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdEntity', $inversed->associatedEntity);
diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php
index 47e98d25c..02b4748be 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php
@@ -15,14 +15,16 @@ class ValueObjectsTest extends OrmFunctionalTestCase
         parent::setUp();
 
         try {
-            $this->_schemaTool->createSchema(array(
+            $this->_schemaTool->createSchema(
+                [
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Person'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Address'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Vehicle'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Car'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3027Animal'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3027Dog'),
-            ));
+                ]
+            );
         } catch(\Exception $e) {
         }
     }
@@ -175,35 +177,35 @@ class ValueObjectsTest extends OrmFunctionalTestCase
         $this->_em->clear();
         $this->assertNull($this->_em->find(__NAMESPACE__.'\\DDC93Person', $person->id));
     }
-    
+
     public function testPartialDqlOnEmbeddedObjectsField()
     {
         $person = new DDC93Person('Karl', new DDC93Address('Foo', '12345', 'Gosport', new DDC93Country('England')));
         $this->_em->persist($person);
         $this->_em->flush($person);
         $this->_em->clear();
-        
+
         // Prove that the entity was persisted correctly.
         $dql = "SELECT p FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.name = :name";
-    
+
         $person = $this->_em->createQuery($dql)
             ->setParameter('name', 'Karl')
             ->getSingleResult();
-    
+
         $this->assertEquals('Gosport', $person->address->city);
         $this->assertEquals('Foo', $person->address->street);
         $this->assertEquals('12345', $person->address->zip);
         $this->assertEquals('England', $person->address->country->name);
-        
+
         // Clear the EM and prove that the embeddable can be the subject of a partial query.
         $this->_em->clear();
-    
+
         $dql = "SELECT PARTIAL p.{id,address.city} FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.name = :name";
-    
+
         $person = $this->_em->createQuery($dql)
             ->setParameter('name', 'Karl')
             ->getSingleResult();
-        
+
         // Selected field must be equal, all other fields must be null.
         $this->assertEquals('Gosport', $person->address->city);
         $this->assertNull($person->address->street);
@@ -213,13 +215,13 @@ class ValueObjectsTest extends OrmFunctionalTestCase
 
         // Clear the EM and prove that the embeddable can be the subject of a partial query regardless of attributes positions.
         $this->_em->clear();
-    
+
         $dql = "SELECT PARTIAL p.{address.city, id} FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.name = :name";
-    
+
         $person = $this->_em->createQuery($dql)
             ->setParameter('name', 'Karl')
             ->getSingleResult();
-        
+
         // Selected field must be equal, all other fields must be null.
         $this->assertEquals('Gosport', $person->address->city);
         $this->assertNull($person->address->street);
@@ -236,7 +238,7 @@ class ValueObjectsTest extends OrmFunctionalTestCase
         $this->_em->createQuery("SELECT p FROM " . __NAMESPACE__ . "\\DDC93Person p WHERE p.address.asdfasdf IS NULL")
             ->execute();
     }
-    
+
     public function testPartialDqlWithNonExistentEmbeddableField()
     {
         $this->expectException(QueryException::class);
@@ -310,17 +312,19 @@ class ValueObjectsTest extends OrmFunctionalTestCase
             )
         );
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\' . $embeddableClassName),
-        ));
+            ]
+        );
     }
 
     public function getInfiniteEmbeddableNestingData()
     {
-        return array(
-            array('DDCInfiniteNestingEmbeddable', 'DDCInfiniteNestingEmbeddable'),
-            array('DDCNestingEmbeddable1', 'DDCNestingEmbeddable4'),
-        );
+        return [
+            ['DDCInfiniteNestingEmbeddable', 'DDCInfiniteNestingEmbeddable'],
+            ['DDCNestingEmbeddable1', 'DDCNestingEmbeddable4'],
+        ];
     }
 }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/VersionedOneToOneTest.php b/tests/Doctrine/Tests/ORM/Functional/VersionedOneToOneTest.php
index f354be600..0fef61a48 100644
--- a/tests/Doctrine/Tests/ORM/Functional/VersionedOneToOneTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/VersionedOneToOneTest.php
@@ -22,10 +22,10 @@ class VersionedOneToOneTest extends OrmFunctionalTestCase
 
         try {
             $this->_schemaTool->createSchema(
-                array(
+                [
                     $this->_em->getClassMetadata('Doctrine\Tests\Models\VersionedOneToOne\FirstRelatedEntity'),
                     $this->_em->getClassMetadata('Doctrine\Tests\Models\VersionedOneToOne\SecondRelatedEntity')
-                )
+                ]
             );
         } catch (ORMException $e) {
         }
@@ -51,10 +51,10 @@ class VersionedOneToOneTest extends OrmFunctionalTestCase
         $this->_em->flush();
 
         $firstEntity = $this->_em->getRepository('Doctrine\Tests\Models\VersionedOneToOne\FirstRelatedEntity')
-            ->findOneBy(array('name' => 'Fred'));
+            ->findOneBy(['name' => 'Fred']);
 
         $secondEntity = $this->_em->getRepository('Doctrine\Tests\Models\VersionedOneToOne\SecondRelatedEntity')
-            ->findOneBy(array('name' => 'Bob'));
+            ->findOneBy(['name' => 'Bob']);
 
         $this->assertSame($firstRelatedEntity, $firstEntity);
         $this->assertSame($secondRelatedEntity, $secondEntity);
diff --git a/tests/Doctrine/Tests/ORM/Hydration/ArrayHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ArrayHydratorTest.php
index 0942a6051..4763ded58 100644
--- a/tests/Doctrine/Tests/ORM/Hydration/ArrayHydratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Hydration/ArrayHydratorTest.php
@@ -9,12 +9,12 @@ class ArrayHydratorTest extends HydrationTestCase
 {
     public function provideDataForUserEntityResult()
     {
-        return array(
-            array(0),
-            array('user'),
-            array('scalars'),
-            array('newObjects'),
-        );
+        return [
+            [0],
+            ['user'],
+            ['scalars'],
+            ['newObjects'],
+        ];
     }
 
     /**
@@ -30,16 +30,16 @@ class ArrayHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('u', 'u__name', 'name');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage'
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em);
@@ -72,18 +72,18 @@ class ArrayHydratorTest extends HydrationTestCase
         $rsm->addScalarResult('sclr0', 'nameUpper', 'string');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 's__id' => '1',
                 's__name' => 'romanb',
                 'sclr0' => 'ROMANB',
-            ),
-            array(
+            ],
+            [
                 's__id' => '2',
                 's__name' => 'jwage',
                 'sclr0' => 'JWAGE',
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em);
@@ -122,16 +122,16 @@ class ArrayHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('u', 'u__name', 'name');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage'
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em);
@@ -165,20 +165,20 @@ class ArrayHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('a', 'a__topic', 'topic');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb',
                 'a__id' => '1',
                 'a__topic' => 'Cool things.'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'a__id' => '2',
                 'a__topic' => 'Cool things II.'
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em);
@@ -215,20 +215,20 @@ class ArrayHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('a', 'a__topic', 'topic');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb',
                 'a__id' => '1',
                 'a__topic' => 'Cool things.'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'a__id' => '2',
                 'a__topic' => 'Cool things II.'
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em);
@@ -269,20 +269,20 @@ class ArrayHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('a', 'a__topic', 'topic');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb',
                 'a__id' => '1',
                 'a__topic' => 'Cool things.'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'a__id' => '2',
                 'a__topic' => 'Cool things II.'
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em);
@@ -323,20 +323,20 @@ class ArrayHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('a', 'a__topic', 'topic');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb',
                 'a__id' => '1',
                 'a__topic' => 'Cool things.'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'a__id' => '2',
                 'a__topic' => 'Cool things II.'
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em);
@@ -379,19 +379,19 @@ class ArrayHydratorTest extends HydrationTestCase
         $rsm->addScalarResult('sclr0', 'numPhones', 'integer');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => '2',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'sclr0' => '1',
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em);
@@ -435,27 +435,27 @@ class ArrayHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('p', 'p__phonenumber', 'phonenumber');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
                 'p__phonenumber' => '42',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
                 'p__phonenumber' => '43',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'sclr0' => 'JWAGE',
                 'p__phonenumber' => '91'
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em);
@@ -508,27 +508,27 @@ class ArrayHydratorTest extends HydrationTestCase
         $rsm->addIndexBy('p', 'phonenumber');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
                 'p__phonenumber' => '42',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
                 'p__phonenumber' => '43',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'sclr0' => 'JWAGE',
                 'p__phonenumber' => '91'
-            )
-        );
+            ]
+        ];
 
 
         $stmt     = new HydratorMockStatement($resultSet);
@@ -593,57 +593,57 @@ class ArrayHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('a', 'a__topic', 'topic');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
                 'p__phonenumber' => '42',
                 'a__id' => '1',
                 'a__topic' => 'Getting things done!'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
                 'p__phonenumber' => '43',
                 'a__id' => '1',
                 'a__topic' => 'Getting things done!'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
                 'p__phonenumber' => '42',
                 'a__id' => '2',
                 'a__topic' => 'ZendCon'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
                 'p__phonenumber' => '43',
                 'a__id' => '2',
                 'a__topic' => 'ZendCon'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'sclr0' => 'JWAGE',
                 'p__phonenumber' => '91',
                 'a__id' => '3',
                 'a__topic' => 'LINQ'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'sclr0' => 'JWAGE',
                 'p__phonenumber' => '91',
                 'a__id' => '4',
                 'a__topic' => 'PHP7'
-            ),
-        );
+            ],
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em);
@@ -720,9 +720,9 @@ class ArrayHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('c', 'c__topic', 'topic');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
@@ -731,8 +731,8 @@ class ArrayHydratorTest extends HydrationTestCase
                 'a__topic' => 'Getting things done!',
                 'c__id' => '1',
                 'c__topic' => 'First!'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
@@ -741,8 +741,8 @@ class ArrayHydratorTest extends HydrationTestCase
                 'a__topic' => 'Getting things done!',
                 'c__id' => '1',
                 'c__topic' => 'First!'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
@@ -751,8 +751,8 @@ class ArrayHydratorTest extends HydrationTestCase
                 'a__topic' => 'ZendCon',
                 'c__id' => null,
                 'c__topic' => null
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
@@ -761,8 +761,8 @@ class ArrayHydratorTest extends HydrationTestCase
                 'a__topic' => 'ZendCon',
                 'c__id' => null,
                 'c__topic' => null
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'sclr0' => 'JWAGE',
@@ -771,8 +771,8 @@ class ArrayHydratorTest extends HydrationTestCase
                 'a__topic' => 'LINQ',
                 'c__id' => null,
                 'c__topic' => null
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'sclr0' => 'JWAGE',
@@ -781,8 +781,8 @@ class ArrayHydratorTest extends HydrationTestCase
                 'a__topic' => 'PHP7',
                 'c__id' => null,
                 'c__topic' => null
-            ),
-        );
+            ],
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em);
@@ -863,40 +863,40 @@ class ArrayHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('b', 'b__position', 'position');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'c__id' => '1',
                 'c__position' => '0',
                 'c__name' => 'First',
                 'b__id' => '1',
                 'b__position' => '0',
                 //'b__category_id' => '1'
-            ),
-            array(
+            ],
+            [
                 'c__id' => '2',
                 'c__position' => '0',
                 'c__name' => 'Second',
                 'b__id' => '2',
                 'b__position' => '0',
                 //'b__category_id' => '2'
-            ),
-            array(
+            ],
+            [
                 'c__id' => '1',
                 'c__position' => '0',
                 'c__name' => 'First',
                 'b__id' => '3',
                 'b__position' => '1',
                 //'b__category_id' => '1'
-            ),
-            array(
+            ],
+            [
                 'c__id' => '1',
                 'c__position' => '0',
                 'c__name' => 'First',
                 'b__id' => '4',
                 'b__position' => '2',
                 //'b__category_id' => '1'
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em);
@@ -933,33 +933,33 @@ class ArrayHydratorTest extends HydrationTestCase
         $rsm->addScalarResult('c__topic', 'ctopic', 'string');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'a__id' => '1',
                 'a__topic' => 'The First',
                 'c__id' => '1',
                 'c__topic' => 'First Comment'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'a__id' => '1',
                 'a__topic' => 'The First',
                 'c__id' => '2',
                 'c__topic' => 'Second Comment'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'a__id' => '42',
                 'a__topic' => 'The Answer',
                 'c__id' => null,
                 'c__topic' => null
-            ),
-        );
+            ],
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em);
@@ -999,16 +999,16 @@ class ArrayHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('u', 'u__name', 'name');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage'
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em);
@@ -1044,16 +1044,16 @@ class ArrayHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('u', 'u__name', 'name');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage'
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em);
@@ -1092,13 +1092,13 @@ class ArrayHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('u', 'u__name', 'name');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb',
                 'foo' => 'bar', // unknown!
-            ),
-        );
+            ],
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em);
@@ -1127,29 +1127,29 @@ class ArrayHydratorTest extends HydrationTestCase
         $rsm->addScalarResult('sclr0', 'nameUpper', 'string');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
-            ),
-            array(
+            ],
+            [
                 'u__id' => null,
                 'u__status' => null,
                 'sclr0' => 'ROMANB',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'sclr0' => 'JWAGE',
-            ),
-            array(
+            ],
+            [
                 'u__id' => null,
                 'u__status' => null,
                 'sclr0' => 'JWAGE',
-            ),
-        );
+            ],
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em);
@@ -1162,9 +1162,9 @@ class ArrayHydratorTest extends HydrationTestCase
         $this->assertEquals('JWAGE', $result[2]['nameUpper']);
         $this->assertEquals('JWAGE', $result[3]['nameUpper']);
 
-        $this->assertEquals(array('id' => 1, 'status' => 'developer'), $result[0][$userEntityKey]);
+        $this->assertEquals(['id' => 1, 'status' => 'developer'], $result[0][$userEntityKey]);
         $this->assertNull($result[1][$userEntityKey]);
-        $this->assertEquals(array('id' => 2, 'status' => 'developer'), $result[2][$userEntityKey]);
+        $this->assertEquals(['id' => 2, 'status' => 'developer'], $result[2][$userEntityKey]);
         $this->assertNull($result[3][$userEntityKey]);
     }
 
@@ -1187,19 +1187,19 @@ class ArrayHydratorTest extends HydrationTestCase
         $rsm->addIndexBy('u', 'id');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'sclr0' => 'JWAGE',
-            ),
-        );
+            ],
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em);
diff --git a/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php
index 22cf3b598..7a4c8aaed 100644
--- a/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php
@@ -14,28 +14,28 @@ class ObjectHydratorTest extends HydrationTestCase
 {
     public function provideDataForUserEntityResult()
     {
-        return array(
-            array(0),
-            array('user'),
-        );
+        return [
+            [0],
+            ['user'],
+        ];
     }
 
     public function provideDataForMultipleRootEntityResult()
     {
-        return array(
-            array(0, 0),
-            array('user', 0),
-            array(0, 'article'),
-            array('user', 'article'),
-        );
+        return [
+            [0, 0],
+            ['user', 0],
+            [0, 'article'],
+            ['user', 'article'],
+        ];
     }
 
     public function provideDataForProductEntityResult()
     {
-        return array(
-            array(0),
-            array('product'),
-        );
+        return [
+            [0],
+            ['product'],
+        ];
     }
 
     /**
@@ -50,20 +50,20 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('u', 'u__name', 'name');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage'
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(2, count($result));
 
@@ -89,20 +89,20 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('u', 'u__name', 'name');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage'
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(2, count($result));
 
@@ -134,24 +134,24 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('a', 'a__topic', 'topic');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb',
                 'a__id' => '1',
                 'a__topic' => 'Cool things.'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'a__id' => '2',
                 'a__topic' => 'Cool things II.'
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(4, count($result));
 
@@ -188,24 +188,24 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('a', 'a__topic', 'topic');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb',
                 'a__id' => '1',
                 'a__topic' => 'Cool things.'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'a__id' => '2',
                 'a__topic' => 'Cool things II.'
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(4, count($result));
 
@@ -249,24 +249,24 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('a', 'a__topic', 'topic');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb',
                 'a__id' => '1',
                 'a__topic' => 'Cool things.'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'a__id' => '2',
                 'a__topic' => 'Cool things II.'
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(4, count($result));
 
@@ -310,24 +310,24 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('a', 'a__topic', 'topic');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb',
                 'a__id' => '1',
                 'a__topic' => 'Cool things.'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'a__id' => '2',
                 'a__topic' => 'Cool things II.'
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(4, count($result));
 
@@ -373,23 +373,23 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addScalarResult('sclr0', 'numPhones', 'integer');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => '2',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'sclr0' => '1',
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(2, count($result));
 
@@ -429,31 +429,31 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addScalarResult('sclr0', 'nameUpper', 'string');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'p__phonenumber' => '42',
                 'sclr0' => 'ROMANB',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'p__phonenumber' => '43',
                 'sclr0' => 'ROMANB',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'p__phonenumber' => '91',
                 'sclr0' => 'JWAGE',
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(2, count($result));
 
@@ -509,32 +509,32 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addIndexBy('p', 'phonenumber');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
                 'p__phonenumber' => '42',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
                 'p__phonenumber' => '43',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'sclr0' => 'JWAGE',
                 'p__phonenumber' => '91'
-            )
-        );
+            ]
+        ];
 
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(2, count($result));
 
@@ -594,61 +594,61 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('a', 'a__topic', 'topic');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
                 'p__phonenumber' => '42',
                 'a__id' => '1',
                 'a__topic' => 'Getting things done!'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
                 'p__phonenumber' => '43',
                 'a__id' => '1',
                 'a__topic' => 'Getting things done!'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
                 'p__phonenumber' => '42',
                 'a__id' => '2',
                 'a__topic' => 'ZendCon'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
                 'p__phonenumber' => '43',
                 'a__id' => '2',
                 'a__topic' => 'ZendCon'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'sclr0' => 'JWAGE',
                 'p__phonenumber' => '91',
                 'a__id' => '3',
                 'a__topic' => 'LINQ'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'sclr0' => 'JWAGE',
                 'p__phonenumber' => '91',
                 'a__id' => '4',
                 'a__topic' => 'PHP7'
-            ),
-        );
+            ],
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(2, count($result));
 
@@ -712,9 +712,9 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('c', 'c__topic', 'topic');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
@@ -723,8 +723,8 @@ class ObjectHydratorTest extends HydrationTestCase
                 'a__topic' => 'Getting things done!',
                 'c__id' => '1',
                 'c__topic' => 'First!'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
@@ -733,8 +733,8 @@ class ObjectHydratorTest extends HydrationTestCase
                 'a__topic' => 'Getting things done!',
                 'c__id' => '1',
                 'c__topic' => 'First!'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
@@ -743,8 +743,8 @@ class ObjectHydratorTest extends HydrationTestCase
                 'a__topic' => 'ZendCon',
                 'c__id' => null,
                 'c__topic' => null
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
@@ -753,8 +753,8 @@ class ObjectHydratorTest extends HydrationTestCase
                 'a__topic' => 'ZendCon',
                 'c__id' => null,
                 'c__topic' => null
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'sclr0' => 'JWAGE',
@@ -763,8 +763,8 @@ class ObjectHydratorTest extends HydrationTestCase
                 'a__topic' => 'LINQ',
                 'c__id' => null,
                 'c__topic' => null
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'sclr0' => 'JWAGE',
@@ -773,12 +773,12 @@ class ObjectHydratorTest extends HydrationTestCase
                 'a__topic' => 'PHP7',
                 'c__id' => null,
                 'c__topic' => null
-            ),
-        );
+            ],
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(2, count($result));
 
@@ -854,44 +854,44 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('b', 'b__position', 'position');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'c__id' => '1',
                 'c__position' => '0',
                 'c__name' => 'First',
                 'b__id' => '1',
                 'b__position' => '0',
                 //'b__category_id' => '1'
-            ),
-            array(
+            ],
+            [
                 'c__id' => '2',
                 'c__position' => '0',
                 'c__name' => 'Second',
                 'b__id' => '2',
                 'b__position' => '0',
                 //'b__category_id' => '2'
-            ),
-            array(
+            ],
+            [
                 'c__id' => '1',
                 'c__position' => '0',
                 'c__name' => 'First',
                 'b__id' => '3',
                 'b__position' => '1',
                 //'b__category_id' => '1'
-            ),
-            array(
+            ],
+            [
                 'c__id' => '1',
                 'c__position' => '0',
                 'c__name' => 'First',
                 'b__id' => '4',
                 'b__position' => '2',
                 //'b__category_id' => '1'
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(2, count($result));
 
@@ -924,17 +924,17 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('u', 'u__name', 'name');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb',
                 'foo' => 'bar', // unknown!
-            ),
-        );
+            ],
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(1, count($result));
         $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]);
@@ -954,20 +954,20 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addScalarResult('sclr1', 'name', 'string');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'sclr0' => '1',
                 'sclr1' => 'romanb'
-            ),
-            array(
+            ],
+            [
                 'sclr0' => '2',
                 'sclr1' => 'jwage'
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(2, count($result));
 
@@ -994,25 +994,25 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addMetaResult('p', 'p__shipping_id', 'shipping_id', false, 'integer');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'p__id' => '1',
                 'p__name' => 'Doctrine Book',
                 'p__shipping_id' => 42
-            )
-        );
+            ]
+        ];
 
         $proxyInstance = new \Doctrine\Tests\Models\ECommerce\ECommerceShipping();
 
         // mocking the proxy factory
         $proxyFactory = $this->getMockBuilder(ProxyFactory::class)
-                             ->setMethods(array('getProxy'))
+                             ->setMethods(['getProxy'])
                              ->disableOriginalConstructor()
                              ->getMock();
 
         $proxyFactory->expects($this->once())
                      ->method('getProxy')
-                     ->with($this->equalTo('Doctrine\Tests\Models\ECommerce\ECommerceShipping'), array('id' => 42))
+                     ->with($this->equalTo('Doctrine\Tests\Models\ECommerce\ECommerceShipping'), ['id' => 42])
                      ->will($this->returnValue($proxyInstance));
 
         $this->_em->setProxyFactory($proxyFactory);
@@ -1043,25 +1043,25 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addMetaResult('p', 'p__shipping_id', 'shipping_id', false, 'integer');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'p__id' => '1',
                 'p__name' => 'Doctrine Book',
                 'p__shipping_id' => 42
-            )
-        );
+            ]
+        ];
 
         $proxyInstance = new \Doctrine\Tests\Models\ECommerce\ECommerceShipping();
 
         // mocking the proxy factory
         $proxyFactory = $this->getMockBuilder(ProxyFactory::class)
-                             ->setMethods(array('getProxy'))
+                             ->setMethods(['getProxy'])
                              ->disableOriginalConstructor()
                              ->getMock();
 
         $proxyFactory->expects($this->once())
                      ->method('getProxy')
-                     ->with($this->equalTo('Doctrine\Tests\Models\ECommerce\ECommerceShipping'), array('id' => 42))
+                     ->with($this->equalTo('Doctrine\Tests\Models\ECommerce\ECommerceShipping'), ['id' => 42])
                      ->will($this->returnValue($proxyInstance));
 
         $this->_em->setProxyFactory($proxyFactory);
@@ -1110,29 +1110,29 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('c', 'c__topic', 'topic');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'a__id' => null,
                 'a__topic' => null,
                 'c__id' => null,
                 'c__topic' => null
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'a__id' => null,
                 'a__topic' => null,
                 'c__id' => null,
                 'c__topic' => null
-            ),
-        );
+            ],
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(2, count($result));
 
@@ -1173,29 +1173,29 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('c', 'c__topic', 'topic');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'a__id' => null,
                 'a__topic' => null,
                 'c__id' => null,
                 'c__topic' => null
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'a__id' => null,
                 'a__topic' => null,
                 'c__id' => null,
                 'c__topic' => null
-            ),
-        );
+            ],
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(2, count($result));
 
@@ -1285,20 +1285,20 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('u', 'u__name', 'name');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage'
-            )
-        );
+            ]
+        ];
 
         $stmt           = new HydratorMockStatement($resultSet);
         $hydrator       = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $iterableResult = $hydrator->iterate($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $iterableResult = $hydrator->iterate($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
         $rowNum         = 0;
 
         while (($row = $iterableResult->next()) !== false) {
@@ -1329,20 +1329,20 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('u', 'u__name', 'name');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage'
-            )
-        );
+            ]
+        ];
 
         $stmt           = new HydratorMockStatement($resultSet);
         $hydrator       = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $iterableResult = $hydrator->iterate($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $iterableResult = $hydrator->iterate($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
         $rowNum         = 0;
 
         while (($row = $iterableResult->next()) !== false) {
@@ -1384,96 +1384,96 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('p', 'p__phonenumber', 'phonenumber');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb',
                 'g__id' => '3',
                 'g__name' => 'TestGroupB',
                 'p__phonenumber' => 1111,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb',
                 'g__id' => '5',
                 'g__name' => 'TestGroupD',
                 'p__phonenumber' => 1111,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb',
                 'g__id' => '3',
                 'g__name' => 'TestGroupB',
                 'p__phonenumber' => 2222,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb',
                 'g__id' => '5',
                 'g__name' => 'TestGroupD',
                 'p__phonenumber' => 2222,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'g__id' => '2',
                 'g__name' => 'TestGroupA',
                 'p__phonenumber' => 3333,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'g__id' => '3',
                 'g__name' => 'TestGroupB',
                 'p__phonenumber' => 3333,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'g__id' => '4',
                 'g__name' => 'TestGroupC',
                 'p__phonenumber' => 3333,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'g__id' => '5',
                 'g__name' => 'TestGroupD',
                 'p__phonenumber' => 3333,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'g__id' => '2',
                 'g__name' => 'TestGroupA',
                 'p__phonenumber' => 4444,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'g__id' => '3',
                 'g__name' => 'TestGroupB',
                 'p__phonenumber' => 4444,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'g__id' => '4',
                 'g__name' => 'TestGroupC',
                 'p__phonenumber' => 4444,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'g__id' => '5',
                 'g__name' => 'TestGroupD',
                 'p__phonenumber' => 4444,
-            ),
-        );
+            ],
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(2, count($result));
 
@@ -1507,96 +1507,96 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('p', 'p__phonenumber', 'phonenumber');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb',
                 'g__id' => '3',
                 'g__name' => 'TestGroupB',
                 'p__phonenumber' => 1111,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb',
                 'g__id' => '5',
                 'g__name' => 'TestGroupD',
                 'p__phonenumber' => 1111,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb',
                 'g__id' => '3',
                 'g__name' => 'TestGroupB',
                 'p__phonenumber' => 2222,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb',
                 'g__id' => '5',
                 'g__name' => 'TestGroupD',
                 'p__phonenumber' => 2222,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'g__id' => '2',
                 'g__name' => 'TestGroupA',
                 'p__phonenumber' => 3333,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'g__id' => '3',
                 'g__name' => 'TestGroupB',
                 'p__phonenumber' => 3333,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'g__id' => '4',
                 'g__name' => 'TestGroupC',
                 'p__phonenumber' => 3333,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'g__id' => '5',
                 'g__name' => 'TestGroupD',
                 'p__phonenumber' => 3333,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'g__id' => '2',
                 'g__name' => 'TestGroupA',
                 'p__phonenumber' => 4444,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'g__id' => '3',
                 'g__name' => 'TestGroupB',
                 'p__phonenumber' => 4444,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'g__id' => '4',
                 'g__name' => 'TestGroupC',
                 'p__phonenumber' => 4444,
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage',
                 'g__id' => '5',
                 'g__name' => 'TestGroupD',
                 'p__phonenumber' => 4444,
-            ),
-        );
+            ],
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(2, count($result));
 
@@ -1628,33 +1628,33 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addScalarResult('sclr0', 'nameUpper', 'string');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
-            ),
-            array(
+            ],
+            [
                 'u__id' => null,
                 'u__status' => null,
                 'sclr0' => 'ROMANB',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'sclr0' => 'JWAGE',
-            ),
-            array(
+            ],
+            [
                 'u__id' => null,
                 'u__status' => null,
                 'sclr0' => 'JWAGE',
-            ),
-        );
+            ],
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(4, count($result), "Should hydrate four results.");
 
@@ -1694,37 +1694,37 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('p', 'p__phonenumber', 'phonenumber');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
                 'p__phonenumber' => '42',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
                 'p__phonenumber' => null
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'sclr0' => 'JWAGE',
                 'p__phonenumber' => '91'
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'sclr0' => 'JWAGE',
                 'p__phonenumber' => null
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(2, count($result));
 
@@ -1758,27 +1758,27 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addMetaResult('a', 'user_id', 'user_id', false, 'string');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
                 'a__id' => 1,
                 'a__city' => 'Berlin',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'sclr0' => 'BENJAMIN',
                 'a__id' => null,
                 'a__city' => null,
-            ),
-        );
+            ],
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(2, count($result));
 
@@ -1804,23 +1804,23 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addIndexBy('u', 'id');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'sclr0' => 'ROMANB',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'sclr0' => 'JWAGE',
-            ),
-        );
+            ],
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(2, count($result));
 
@@ -1846,25 +1846,25 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addIndexByScalar('sclr0');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'sclr0' => 'ROMANB',
-            ),
-            array(
+            ],
+            [
                 'sclr0' => 'JWAGE',
-            ),
-        );
+            ],
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
-        $result   = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result   = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
 
         $this->assertEquals(
-            array(
-                'ROMANB' => array('nameUpper' => 'ROMANB'),
-                'JWAGE'  => array('nameUpper' => 'JWAGE')
-            ),
+            [
+                'ROMANB' => ['nameUpper' => 'ROMANB'],
+                'JWAGE'  => ['nameUpper' => 'JWAGE']
+            ],
             $result
         );
     }
@@ -1885,12 +1885,12 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('c', 'c__id', 'id');
         $rsm->setDiscriminatorColumn('c', 'c_discr');
 
-        $resultSet = array(
-              array(
+        $resultSet = [
+              [
                   'c__id'   => '1',
                   'c_discr' => 'fix',
-              ),
-         );
+              ],
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
@@ -1917,14 +1917,14 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addMetaResult('e ', 'e_discr', 'discr', false, 'string');
         $rsm->setDiscriminatorColumn('e', 'e_discr');
 
-        $resultSet = array(
-              array(
+        $resultSet = [
+              [
                   'c__id'   => '1',
                   'c_discr' => 'fix',
                   'e__id'   => '1',
                   'e__name' => 'Fabio B. Silva'
-              ),
-         );
+              ],
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
@@ -1947,13 +1947,13 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addMetaResult('p', 'discr', 'discr', false, 'string');
         $rsm->setDiscriminatorColumn('p', 'discr');
 
-        $resultSet = array(
-              array(
+        $resultSet = [
+              [
                   'p__id'   => '1',
                   'p__name' => 'Fabio B. Silva',
                   'discr'   => 'subworker'
-              ),
-         );
+              ],
+        ];
 
         $stmt       = new HydratorMockStatement($resultSet);
         $hydrator   = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
@@ -1969,12 +1969,12 @@ class ObjectHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('e1', 'a1__id', 'id');
         $rsm->addFieldResult('e2', 'e2__id', 'id');
 
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'a1__id' => '1',
                 'e2__id' => '1',
-            )
-        );
+            ]
+        ];
 
         $stmt     = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
diff --git a/tests/Doctrine/Tests/ORM/Hydration/ResultSetMappingTest.php b/tests/Doctrine/Tests/ORM/Hydration/ResultSetMappingTest.php
index 2ce9ae789..745f30ec0 100644
--- a/tests/Doctrine/Tests/ORM/Hydration/ResultSetMappingTest.php
+++ b/tests/Doctrine/Tests/ORM/Hydration/ResultSetMappingTest.php
@@ -99,61 +99,68 @@ class ResultSetMappingTest extends \Doctrine\Tests\OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
 
-        $cm->mapOneToOne(array(
+        $cm->mapOneToOne(
+            [
             'fieldName'     => 'email',
             'targetEntity'  => 'Doctrine\Tests\Models\CMS\CmsEmail',
-            'cascade'       => array('persist'),
+            'cascade'       => ['persist'],
             'inversedBy'    => 'user',
             'orphanRemoval' => false,
-            'joinColumns'   => array(array(
+            'joinColumns'   => [
+                [
                     'nullable' => true,
                     'referencedColumnName' => 'id',
-                )
-            )
-        ));
+                ]
+            ]
+            ]
+        );
 
-        $cm->addNamedNativeQuery(array(
+        $cm->addNamedNativeQuery(
+            [
             'name'              => 'find-all',
             'query'             => 'SELECT u.id AS user_id, e.id AS email_id, u.name, e.email, u.id + e.id AS scalarColumn FROM cms_users u INNER JOIN cms_emails e ON e.id = u.email_id',
             'resultSetMapping'  => 'find-all',
-        ));
+            ]
+        );
 
-        $cm->addSqlResultSetMapping(array(
+        $cm->addSqlResultSetMapping(
+            [
             'name'      => 'find-all',
-            'entities'  => array(
-                array(
+            'entities'  => [
+                [
                     'entityClass'   => '__CLASS__',
-                    'fields'        => array(
-                        array(
+                    'fields'        => [
+                        [
                             'name'  => 'id',
                             'column'=> 'user_id'
-                        ),
-                        array(
+                        ],
+                        [
                             'name'  => 'name',
                             'column'=> 'name'
-                        )
-                    )
-                ),
-                array(
+                        ]
+                    ]
+                ],
+                [
                     'entityClass'   => 'CmsEmail',
-                    'fields'        => array(
-                        array(
+                    'fields'        => [
+                        [
                             'name'  => 'id',
                             'column'=> 'email_id'
-                        ),
-                        array(
+                        ],
+                        [
                             'name'  => 'email',
                             'column'=> 'email'
-                        )
-                    )
-                )
-            ),
-            'columns'   => array(
-                array(
+                        ]
+                    ]
+                ]
+            ],
+            'columns'   => [
+                [
                     'name' => 'scalarColumn'
-                )
-            )
-        ));
+                ]
+            ]
+            ]
+        );
 
         $queryMapping = $cm->getNamedNativeQuery('find-all');
 
@@ -184,25 +191,29 @@ class ResultSetMappingTest extends \Doctrine\Tests\OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
 
-        $cm->addNamedNativeQuery(array(
+        $cm->addNamedNativeQuery(
+            [
             'name'              => 'find-all',
             'query'             => 'SELECT u.id AS user_id, e.id AS email_id, u.name, e.email, u.id + e.id AS scalarColumn FROM cms_users u INNER JOIN cms_emails e ON e.id = u.email_id',
             'resultSetMapping'  => 'find-all',
-        ));
+            ]
+        );
 
-        $cm->addSqlResultSetMapping(array(
+        $cm->addSqlResultSetMapping(
+            [
             'name'      => 'find-all',
-            'entities'  => array(
-                array(
+            'entities'  => [
+                [
                     'entityClass'   => '__CLASS__',
-                )
-            ),
-            'columns'   => array(
-                array(
+                ]
+            ],
+            'columns'   => [
+                [
                     'name' => 'scalarColumn'
-                )
-            )
-        ));
+                ]
+            ]
+            ]
+        );
 
         $queryMapping = $cm->getNamedNativeQuery('find-all');
         $rsm          = new \Doctrine\ORM\Query\ResultSetMappingBuilder($this->_em);
@@ -230,11 +241,13 @@ class ResultSetMappingTest extends \Doctrine\Tests\OrmTestCase
 
         $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
 
-        $cm->addNamedNativeQuery(array(
+        $cm->addNamedNativeQuery(
+            [
             'name'              => 'find-all',
             'resultClass'       => '__CLASS__',
             'query'             => 'SELECT * FROM cms_users',
-        ));
+            ]
+        );
 
         $queryMapping = $cm->getNamedNativeQuery('find-all');
         $rsm          = new \Doctrine\ORM\Query\ResultSetMappingBuilder($this->_em);
diff --git a/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php
index 5c5f55f40..6cce68811 100644
--- a/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php
@@ -18,16 +18,16 @@ class ScalarHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('u', 'u__name', 'name');
 
         // Faked result set
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb'
-                ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__name' => 'jwage'
-                )
-            );
+            ]
+        ];
 
 
         $stmt = new HydratorMockStatement($resultSet);
@@ -53,13 +53,13 @@ class ScalarHydratorTest extends HydrationTestCase
         $rsm->addScalarResult('bar2', 'bar', 'string');
         $rsm->addScalarResult('baz3', 'baz', 'string');
 
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'foo1' => 'A',
                 'bar2' => 'B',
                 'baz3' => 'C',
-            ),
-        );
+            ],
+        ];
 
         $stmt = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ScalarHydrator($this->_em);
@@ -80,16 +80,16 @@ class ScalarHydratorTest extends HydrationTestCase
         $rsm->addScalarResult('bar2', 'bar', 'string');
         $rsm->addScalarResult('baz3', 'baz', 'string');
 
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'u__id' => '1',
                 'u__name' => 'romanb',
                 'foo1' => 'A',
                 'bar2' => 'B',
                 'baz3' => 'C',
                 'foo' => 'bar', // Unknown!
-            ),
-        );
+            ],
+        ];
 
         $stmt = new HydratorMockStatement($resultSet);
         $hydrator = new \Doctrine\ORM\Internal\Hydration\ScalarHydrator($this->_em);
diff --git a/tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php
index d56718834..d6eaeb10c 100644
--- a/tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php
@@ -21,12 +21,12 @@ class SimpleObjectHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('p', 'p__name', 'name');
         $rsm->addMetaResult('p ', 'discr', 'discr', false, 'string');
         $rsm->setDiscriminatorColumn('p', 'discr');
-        $resultSet = array(
-              array(
+        $resultSet = [
+              [
                   'u__id'   => '1',
                   'u__name' => 'Fabio B. Silva'
-              ),
-         );
+              ],
+        ];
 
         $stmt       = new HydratorMockStatement($resultSet);
         $hydrator   = new \Doctrine\ORM\Internal\Hydration\SimpleObjectHydrator($this->_em);
@@ -39,13 +39,13 @@ class SimpleObjectHydratorTest extends HydrationTestCase
         $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsAddress', 'a');
         $rsm->addFieldResult('a', 'a__id', 'id');
         $rsm->addFieldResult('a', 'a__city', 'city');
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'a__id'   => '1',
                 'a__city' => 'Cracow',
                 'doctrine_rownum' => '1'
-            ),
-        );
+            ],
+        ];
 
         $expectedEntity = new \Doctrine\Tests\Models\CMS\CmsAddress();
         $expectedEntity->id = 1;
@@ -74,13 +74,13 @@ class SimpleObjectHydratorTest extends HydrationTestCase
         $rsm->addMetaResult('p', 'discr', 'discr', false, 'string');
         $rsm->setDiscriminatorColumn('p', 'discr');
 
-        $resultSet = array(
-              array(
+        $resultSet = [
+              [
                   'p__id'   => '1',
                   'p__name' => 'Fabio B. Silva',
                   'discr'   => 'subworker'
-              ),
-         );
+              ],
+        ];
 
         $stmt       = new HydratorMockStatement($resultSet);
         $hydrator   = new \Doctrine\ORM\Internal\Hydration\SimpleObjectHydrator($this->_em);
@@ -98,14 +98,14 @@ class SimpleObjectHydratorTest extends HydrationTestCase
         $rsm->addFieldResult('p', 'm__tags', 'tags', 'Doctrine\Tests\Models\Issue5989\Issue5989Manager');
         $rsm->addFieldResult('p', 'e__tags', 'tags', 'Doctrine\Tests\Models\Issue5989\Issue5989Employee');
         $rsm->addMetaResult('p', 'discr', 'discr', false, 'string');
-        $resultSet = array(
-            array(
+        $resultSet = [
+            [
                 'p__id'   => '1',
                 'm__tags' => 'tag1,tag2',
                 'e__tags' => null,
                 'discr'   => 'manager'
-            ),
-        );
+            ],
+        ];
 
         $expectedEntity = new \Doctrine\Tests\Models\Issue5989\Issue5989Manager();
         $expectedEntity->id = 1;
diff --git a/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php
index 219c7384c..fa98dd070 100644
--- a/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php
@@ -9,40 +9,48 @@ class SingleScalarHydratorTest extends HydrationTestCase
 {
     /** Result set provider for the HYDRATE_SINGLE_SCALAR tests */
     public static function singleScalarResultSetProvider() {
-        return array(
+        return [
           // valid
-          array('name' => 'result1',
-                'resultSet' => array(
-                  array(
+          [
+              'name' => 'result1',
+                'resultSet' => [
+                  [
                       'u__name' => 'romanb'
-                  )
-               )),
+                  ]
+                ]
+          ],
           // valid
-          array('name' => 'result2',
-                'resultSet' => array(
-                  array(
+          [
+              'name' => 'result2',
+                'resultSet' => [
+                  [
                       'u__id' => '1'
-                  )
-             )),
+                  ]
+                ]
+          ],
            // invalid
-           array('name' => 'result3',
-                'resultSet' => array(
-                  array(
+           [
+               'name' => 'result3',
+                'resultSet' => [
+                  [
                       'u__id' => '1',
                       'u__name' => 'romanb'
-                  )
-             )),
+                  ]
+                ]
+           ],
            // invalid
-           array('name' => 'result4',
-                'resultSet' => array(
-                  array(
+           [
+               'name' => 'result4',
+                'resultSet' => [
+                  [
                       'u__id' => '1'
-                  ),
-                  array(
+                  ],
+                  [
                       'u__id' => '2'
-                  )
-             )),
-        );
+                  ]
+                ]
+           ],
+        ];
     }
 
     /**
diff --git a/tests/Doctrine/Tests/ORM/Id/AssignedGeneratorTest.php b/tests/Doctrine/Tests/ORM/Id/AssignedGeneratorTest.php
index 855a9256f..acc951c16 100644
--- a/tests/Doctrine/Tests/ORM/Id/AssignedGeneratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Id/AssignedGeneratorTest.php
@@ -42,13 +42,13 @@ class AssignedGeneratorTest extends OrmTestCase
         $entity = new AssignedSingleIdEntity;
         $entity->myId = 1;
         $id = $this->_assignedGen->generate($this->_em, $entity);
-        $this->assertEquals(array('myId' => 1), $id);
+        $this->assertEquals(['myId' => 1], $id);
 
         $entity = new AssignedCompositeIdEntity;
         $entity->myId2 = 2;
         $entity->myId1 = 4;
         $id = $this->_assignedGen->generate($this->_em, $entity);
-        $this->assertEquals(array('myId1' => 4, 'myId2' => 2), $id);
+        $this->assertEquals(['myId1' => 4, 'myId2' => 2], $id);
     }
 }
 
diff --git a/tests/Doctrine/Tests/ORM/Internal/HydrationCompleteHandlerTest.php b/tests/Doctrine/Tests/ORM/Internal/HydrationCompleteHandlerTest.php
index 1063b5aca..851cc2ae3 100644
--- a/tests/Doctrine/Tests/ORM/Internal/HydrationCompleteHandlerTest.php
+++ b/tests/Doctrine/Tests/ORM/Internal/HydrationCompleteHandlerTest.php
@@ -158,7 +158,7 @@ class HydrationCompleteHandlerTest extends PHPUnit_Framework_TestCase
                 Events::postLoad,
                 $this->logicalOr($entity1, $entity2),
                 $this->callback(function (LifecycleEventArgs $args) use ($entityManager, $entity1, $entity2) {
-                    return in_array($args->getEntity(), array($entity1, $entity2), true)
+                    return in_array($args->getEntity(), [$entity1, $entity2], true)
                         && $entityManager === $args->getObjectManager();
                 }),
                 $listenersFlag
@@ -189,13 +189,13 @@ class HydrationCompleteHandlerTest extends PHPUnit_Framework_TestCase
 
     public function testGetValidListenerInvocationFlags()
     {
-        return array(
-            array(ListenersInvoker::INVOKE_LISTENERS),
-            array(ListenersInvoker::INVOKE_CALLBACKS),
-            array(ListenersInvoker::INVOKE_MANAGER),
-            array(ListenersInvoker::INVOKE_LISTENERS | ListenersInvoker::INVOKE_CALLBACKS),
-            array(ListenersInvoker::INVOKE_LISTENERS | ListenersInvoker::INVOKE_MANAGER),
-            array(ListenersInvoker::INVOKE_LISTENERS | ListenersInvoker::INVOKE_CALLBACKS | ListenersInvoker::INVOKE_MANAGER),
-        );
+        return [
+            [ListenersInvoker::INVOKE_LISTENERS],
+            [ListenersInvoker::INVOKE_CALLBACKS],
+            [ListenersInvoker::INVOKE_MANAGER],
+            [ListenersInvoker::INVOKE_LISTENERS | ListenersInvoker::INVOKE_CALLBACKS],
+            [ListenersInvoker::INVOKE_LISTENERS | ListenersInvoker::INVOKE_MANAGER],
+            [ListenersInvoker::INVOKE_LISTENERS | ListenersInvoker::INVOKE_CALLBACKS | ListenersInvoker::INVOKE_MANAGER],
+        ];
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php b/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php
index 512b21115..1f667b464 100644
--- a/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php
+++ b/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php
@@ -64,12 +64,12 @@ class LazyCriteriaCollectionTest extends \PHPUnit_Framework_TestCase
             ->expects($this->once())
             ->method('loadCriteria')
             ->with($this->criteria)
-            ->will($this->returnValue(array('foo', 'bar', 'baz')));
+            ->will($this->returnValue(['foo', 'bar', 'baz']));
 
         // should never call the persister's count
         $this->persister->expects($this->never())->method('count');
 
-        $this->assertSame(array('foo', 'bar', 'baz'), $this->lazyCriteriaCollection->toArray());
+        $this->assertSame(['foo', 'bar', 'baz'], $this->lazyCriteriaCollection->toArray());
 
         $this->assertSame(3, $this->lazyCriteriaCollection->count());
     }
@@ -89,7 +89,7 @@ class LazyCriteriaCollectionTest extends \PHPUnit_Framework_TestCase
             ->expects($this->once())
             ->method('loadCriteria')
             ->with($this->criteria)
-            ->will($this->returnValue(array($foo, $bar, $baz)));
+            ->will($this->returnValue([$foo, $bar, $baz]));
 
         $criteria = new Criteria();
 
@@ -98,9 +98,9 @@ class LazyCriteriaCollectionTest extends \PHPUnit_Framework_TestCase
         $filtered = $this->lazyCriteriaCollection->matching($criteria);
 
         $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $filtered);
-        $this->assertEquals(array($foo), $filtered->toArray());
+        $this->assertEquals([$foo], $filtered->toArray());
 
-        $this->assertEquals(array($foo), $this->lazyCriteriaCollection->matching($criteria)->toArray());
+        $this->assertEquals([$foo], $this->lazyCriteriaCollection->matching($criteria)->toArray());
     }
 
     public function testIsEmptyUsesCountWhenNotInitialized()
@@ -124,12 +124,12 @@ class LazyCriteriaCollectionTest extends \PHPUnit_Framework_TestCase
             ->expects($this->once())
             ->method('loadCriteria')
             ->with($this->criteria)
-            ->will($this->returnValue(array('foo', 'bar', 'baz')));
+            ->will($this->returnValue(['foo', 'bar', 'baz']));
 
         // should never call the persister's count
         $this->persister->expects($this->never())->method('count');
 
-        $this->assertSame(array('foo', 'bar', 'baz'), $this->lazyCriteriaCollection->toArray());
+        $this->assertSame(['foo', 'bar', 'baz'], $this->lazyCriteriaCollection->toArray());
 
         $this->assertFalse($this->lazyCriteriaCollection->isEmpty());
     }
diff --git a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
index c4fd1381d..4e9546daa 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
@@ -72,10 +72,11 @@ abstract class AbstractMappingDriverTest extends OrmTestCase
     public function testEntityIndexes($class)
     {
         $this->assertArrayHasKey('indexes', $class->table, 'ClassMetadata should have indexes key in table property.');
-        $this->assertEquals(array(
-            'name_idx' => array('columns' => array('name')),
-            0 => array('columns' => array('user_email'))
-        ), $class->table['indexes']);
+        $this->assertEquals(
+            [
+            'name_idx' => ['columns' => ['name']],
+            0 => ['columns' => ['user_email']]
+            ], $class->table['indexes']);
 
         return $class;
     }
@@ -84,13 +85,14 @@ abstract class AbstractMappingDriverTest extends OrmTestCase
     {
         $class = $this->createClassMetadata('Doctrine\Tests\ORM\Mapping\Comment');
 
-        $this->assertEquals(array(
-            0 => array(
-                'columns' => array('content'),
-                'flags' => array('fulltext'),
-                'options' => array('where' => 'content IS NOT NULL'),
-            )
-        ), $class->table['indexes']);
+        $this->assertEquals(
+            [
+            0 => [
+                'columns' => ['content'],
+                'flags' => ['fulltext'],
+                'options' => ['where' => 'content IS NOT NULL'],
+            ]
+            ], $class->table['indexes']);
     }
 
     /**
@@ -102,9 +104,10 @@ abstract class AbstractMappingDriverTest extends OrmTestCase
         $this->assertArrayHasKey('uniqueConstraints', $class->table,
             'ClassMetadata should have uniqueConstraints key in table property when Unique Constraints are set.');
 
-        $this->assertEquals(array(
-            "search_idx" => array("columns" => array("name", "user_email"), 'options' => array('where' => 'name IS NOT NULL'))
-        ), $class->table['uniqueConstraints']);
+        $this->assertEquals(
+            [
+            "search_idx" => ["columns" => ["name", "user_email"], 'options' => ['where' => 'name IS NOT NULL']]
+            ], $class->table['uniqueConstraints']);
 
         return $class;
     }
@@ -117,9 +120,10 @@ abstract class AbstractMappingDriverTest extends OrmTestCase
     {
         $this->assertArrayHasKey('options', $class->table, 'ClassMetadata should have options key in table property.');
 
-        $this->assertEquals(array(
-            'foo' => 'bar', 'baz' => array('key' => 'val')
-        ), $class->table['options']);
+        $this->assertEquals(
+            [
+            'foo' => 'bar', 'baz' => ['key' => 'val']
+            ], $class->table['options']);
 
         return $class;
     }
@@ -132,11 +136,11 @@ abstract class AbstractMappingDriverTest extends OrmTestCase
     {
         $this->assertInternalType('array', $class->sequenceGeneratorDefinition, 'No Sequence Definition set on this driver.');
         $this->assertEquals(
-            array(
+            [
                 'sequenceName' => 'tablename_seq',
                 'allocationSize' => 100,
                 'initialValue' => 1,
-            ),
+            ],
             $class->sequenceGeneratorDefinition
         );
     }
@@ -148,7 +152,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase
         $this->assertEquals(ClassMetadata::GENERATOR_TYPE_CUSTOM,
             $class->generatorType, "Generator Type");
         $this->assertEquals(
-            array("class" => "stdClass"),
+            ["class" => "stdClass"],
             $class->customGeneratorDefinition,
             "Custom Generator Definition");
     }
@@ -240,7 +244,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase
      */
     public function testIdentifier($class)
     {
-        $this->assertEquals(array('id'), $class->identifier);
+        $this->assertEquals(['id'], $class->identifier);
         $this->assertEquals('integer', $class->fieldMappings['id']['type']);
         $this->assertEquals(ClassMetadata::GENERATOR_TYPE_AUTO, $class->generatorType, "ID-Generator is not ClassMetadata::GENERATOR_TYPE_AUTO");
 
@@ -313,7 +317,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase
         $this->assertTrue($class->associationMappings['phonenumbers']['orphanRemoval']);
 
         // Test Order By
-        $this->assertEquals(array('number' => 'ASC'), $class->associationMappings['phonenumbers']['orderBy']);
+        $this->assertEquals(['number' => 'ASC'], $class->associationMappings['phonenumbers']['orderBy']);
 
         return $class;
     }
@@ -411,7 +415,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase
         $class = $this->createClassMetadata('Doctrine\Tests\ORM\Mapping\Animal');
 
         $this->assertEquals(
-            array('name' => 'discr', 'type' => 'string', 'length' => '32', 'fieldName' => 'discr', 'columnDefinition' => null),
+            ['name' => 'discr', 'type' => 'string', 'length' => '32', 'fieldName' => 'discr', 'columnDefinition' => null],
             $class->discriminatorColumn
         );
     }
@@ -609,18 +613,18 @@ abstract class AbstractMappingDriverTest extends OrmTestCase
         $findAllMapping = $class->getSqlResultSetMapping('mapping-find-all');
         $this->assertEquals('mapping-find-all', $findAllMapping['name']);
         $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddress', $findAllMapping['entities'][0]['entityClass']);
-        $this->assertEquals(array('name'=>'id','column'=>'id'), $findAllMapping['entities'][0]['fields'][0]);
-        $this->assertEquals(array('name'=>'city','column'=>'city'), $findAllMapping['entities'][0]['fields'][1]);
-        $this->assertEquals(array('name'=>'country','column'=>'country'), $findAllMapping['entities'][0]['fields'][2]);
+        $this->assertEquals(['name'=>'id','column'=>'id'], $findAllMapping['entities'][0]['fields'][0]);
+        $this->assertEquals(['name'=>'city','column'=>'city'], $findAllMapping['entities'][0]['fields'][1]);
+        $this->assertEquals(['name'=>'country','column'=>'country'], $findAllMapping['entities'][0]['fields'][2]);
 
         $withoutFieldsMapping = $class->getSqlResultSetMapping('mapping-without-fields');
         $this->assertEquals('mapping-without-fields', $withoutFieldsMapping['name']);
         $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddress', $withoutFieldsMapping['entities'][0]['entityClass']);
-        $this->assertEquals(array(), $withoutFieldsMapping['entities'][0]['fields']);
+        $this->assertEquals([], $withoutFieldsMapping['entities'][0]['fields']);
 
         $countMapping = $class->getSqlResultSetMapping('mapping-count');
         $this->assertEquals('mapping-count', $countMapping['name']);
-        $this->assertEquals(array('name'=>'count'), $countMapping['columns'][0]);
+        $this->assertEquals(['name'=>'count'], $countMapping['columns'][0]);
 
     }
 
@@ -637,61 +641,61 @@ abstract class AbstractMappingDriverTest extends OrmTestCase
         $this->assertCount(4, $userMetadata->getSqlResultSetMappings());
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingJoinedAddress');
-        $this->assertEquals(array(),$mapping['columns']);
+        $this->assertEquals([],$mapping['columns']);
         $this->assertEquals('mappingJoinedAddress', $mapping['name']);
         $this->assertNull($mapping['entities'][0]['discriminatorColumn']);
-        $this->assertEquals(array('name'=>'id','column'=>'id'),                     $mapping['entities'][0]['fields'][0]);
-        $this->assertEquals(array('name'=>'name','column'=>'name'),                 $mapping['entities'][0]['fields'][1]);
-        $this->assertEquals(array('name'=>'status','column'=>'status'),             $mapping['entities'][0]['fields'][2]);
-        $this->assertEquals(array('name'=>'address.zip','column'=>'zip'),           $mapping['entities'][0]['fields'][3]);
-        $this->assertEquals(array('name'=>'address.city','column'=>'city'),         $mapping['entities'][0]['fields'][4]);
-        $this->assertEquals(array('name'=>'address.country','column'=>'country'),   $mapping['entities'][0]['fields'][5]);
-        $this->assertEquals(array('name'=>'address.id','column'=>'a_id'),           $mapping['entities'][0]['fields'][6]);
+        $this->assertEquals(['name'=>'id','column'=>'id'],                     $mapping['entities'][0]['fields'][0]);
+        $this->assertEquals(['name'=>'name','column'=>'name'],                 $mapping['entities'][0]['fields'][1]);
+        $this->assertEquals(['name'=>'status','column'=>'status'],             $mapping['entities'][0]['fields'][2]);
+        $this->assertEquals(['name'=>'address.zip','column'=>'zip'],           $mapping['entities'][0]['fields'][3]);
+        $this->assertEquals(['name'=>'address.city','column'=>'city'],         $mapping['entities'][0]['fields'][4]);
+        $this->assertEquals(['name'=>'address.country','column'=>'country'],   $mapping['entities'][0]['fields'][5]);
+        $this->assertEquals(['name'=>'address.id','column'=>'a_id'],           $mapping['entities'][0]['fields'][6]);
         $this->assertEquals($userMetadata->name,                                    $mapping['entities'][0]['entityClass']);
 
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingJoinedPhonenumber');
-        $this->assertEquals(array(),$mapping['columns']);
+        $this->assertEquals([],$mapping['columns']);
         $this->assertEquals('mappingJoinedPhonenumber', $mapping['name']);
         $this->assertNull($mapping['entities'][0]['discriminatorColumn']);
-        $this->assertEquals(array('name'=>'id','column'=>'id'),                             $mapping['entities'][0]['fields'][0]);
-        $this->assertEquals(array('name'=>'name','column'=>'name'),                         $mapping['entities'][0]['fields'][1]);
-        $this->assertEquals(array('name'=>'status','column'=>'status'),                     $mapping['entities'][0]['fields'][2]);
-        $this->assertEquals(array('name'=>'phonenumbers.phonenumber','column'=>'number'),   $mapping['entities'][0]['fields'][3]);
+        $this->assertEquals(['name'=>'id','column'=>'id'],                             $mapping['entities'][0]['fields'][0]);
+        $this->assertEquals(['name'=>'name','column'=>'name'],                         $mapping['entities'][0]['fields'][1]);
+        $this->assertEquals(['name'=>'status','column'=>'status'],                     $mapping['entities'][0]['fields'][2]);
+        $this->assertEquals(['name'=>'phonenumbers.phonenumber','column'=>'number'],   $mapping['entities'][0]['fields'][3]);
         $this->assertEquals($userMetadata->name,                                            $mapping['entities'][0]['entityClass']);
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingUserPhonenumberCount');
-        $this->assertEquals(array('name'=>'numphones'),$mapping['columns'][0]);
+        $this->assertEquals(['name'=>'numphones'],$mapping['columns'][0]);
         $this->assertEquals('mappingUserPhonenumberCount', $mapping['name']);
         $this->assertNull($mapping['entities'][0]['discriminatorColumn']);
-        $this->assertEquals(array('name'=>'id','column'=>'id'),         $mapping['entities'][0]['fields'][0]);
-        $this->assertEquals(array('name'=>'name','column'=>'name'),     $mapping['entities'][0]['fields'][1]);
-        $this->assertEquals(array('name'=>'status','column'=>'status'), $mapping['entities'][0]['fields'][2]);
+        $this->assertEquals(['name'=>'id','column'=>'id'],         $mapping['entities'][0]['fields'][0]);
+        $this->assertEquals(['name'=>'name','column'=>'name'],     $mapping['entities'][0]['fields'][1]);
+        $this->assertEquals(['name'=>'status','column'=>'status'], $mapping['entities'][0]['fields'][2]);
         $this->assertEquals($userMetadata->name,                        $mapping['entities'][0]['entityClass']);
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingMultipleJoinsEntityResults');
-        $this->assertEquals(array('name'=>'numphones'),$mapping['columns'][0]);
+        $this->assertEquals(['name'=>'numphones'],$mapping['columns'][0]);
         $this->assertEquals('mappingMultipleJoinsEntityResults', $mapping['name']);
         $this->assertNull($mapping['entities'][0]['discriminatorColumn']);
-        $this->assertEquals(array('name'=>'id','column'=>'u_id'),           $mapping['entities'][0]['fields'][0]);
-        $this->assertEquals(array('name'=>'name','column'=>'u_name'),       $mapping['entities'][0]['fields'][1]);
-        $this->assertEquals(array('name'=>'status','column'=>'u_status'),   $mapping['entities'][0]['fields'][2]);
+        $this->assertEquals(['name'=>'id','column'=>'u_id'],           $mapping['entities'][0]['fields'][0]);
+        $this->assertEquals(['name'=>'name','column'=>'u_name'],       $mapping['entities'][0]['fields'][1]);
+        $this->assertEquals(['name'=>'status','column'=>'u_status'],   $mapping['entities'][0]['fields'][2]);
         $this->assertEquals($userMetadata->name,                            $mapping['entities'][0]['entityClass']);
         $this->assertNull($mapping['entities'][1]['discriminatorColumn']);
-        $this->assertEquals(array('name'=>'id','column'=>'a_id'),           $mapping['entities'][1]['fields'][0]);
-        $this->assertEquals(array('name'=>'zip','column'=>'a_zip'),         $mapping['entities'][1]['fields'][1]);
-        $this->assertEquals(array('name'=>'country','column'=>'a_country'), $mapping['entities'][1]['fields'][2]);
+        $this->assertEquals(['name'=>'id','column'=>'a_id'],           $mapping['entities'][1]['fields'][0]);
+        $this->assertEquals(['name'=>'zip','column'=>'a_zip'],         $mapping['entities'][1]['fields'][1]);
+        $this->assertEquals(['name'=>'country','column'=>'a_country'], $mapping['entities'][1]['fields'][2]);
         $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddress',         $mapping['entities'][1]['entityClass']);
 
         //person asserts
         $this->assertCount(1, $personMetadata->getSqlResultSetMappings());
 
         $mapping = $personMetadata->getSqlResultSetMapping('mappingFetchAll');
-        $this->assertEquals(array(),$mapping['columns']);
+        $this->assertEquals([],$mapping['columns']);
         $this->assertEquals('mappingFetchAll', $mapping['name']);
         $this->assertEquals('discriminator',                            $mapping['entities'][0]['discriminatorColumn']);
-        $this->assertEquals(array('name'=>'id','column'=>'id'),         $mapping['entities'][0]['fields'][0]);
-        $this->assertEquals(array('name'=>'name','column'=>'name'),     $mapping['entities'][0]['fields'][1]);
+        $this->assertEquals(['name'=>'id','column'=>'id'],         $mapping['entities'][0]['fields'][0]);
+        $this->assertEquals(['name'=>'name','column'=>'name'],     $mapping['entities'][0]['fields'][1]);
         $this->assertEquals($personMetadata->name,                      $mapping['entities'][0]['entityClass']);
     }
 
@@ -731,18 +735,18 @@ abstract class AbstractMappingDriverTest extends OrmTestCase
         $this->assertEquals('user_id', $guestGroups['joinTable']['joinColumns'][0]['name']);
         $this->assertEquals('group_id', $guestGroups['joinTable']['inverseJoinColumns'][0]['name']);
 
-        $this->assertEquals(array('user_id'=>'id'), $guestGroups['relationToSourceKeyColumns']);
-        $this->assertEquals(array('group_id'=>'id'), $guestGroups['relationToTargetKeyColumns']);
-        $this->assertEquals(array('user_id','group_id'), $guestGroups['joinTableColumns']);
+        $this->assertEquals(['user_id'=>'id'], $guestGroups['relationToSourceKeyColumns']);
+        $this->assertEquals(['group_id'=>'id'], $guestGroups['relationToTargetKeyColumns']);
+        $this->assertEquals(['user_id','group_id'], $guestGroups['joinTableColumns']);
 
 
         $this->assertEquals('ddc964_users_admingroups', $adminGroups['joinTable']['name']);
         $this->assertEquals('adminuser_id', $adminGroups['joinTable']['joinColumns'][0]['name']);
         $this->assertEquals('admingroup_id', $adminGroups['joinTable']['inverseJoinColumns'][0]['name']);
 
-        $this->assertEquals(array('adminuser_id'=>'id'), $adminGroups['relationToSourceKeyColumns']);
-        $this->assertEquals(array('admingroup_id'=>'id'), $adminGroups['relationToTargetKeyColumns']);
-        $this->assertEquals(array('adminuser_id','admingroup_id'), $adminGroups['joinTableColumns']);
+        $this->assertEquals(['adminuser_id'=>'id'], $adminGroups['relationToSourceKeyColumns']);
+        $this->assertEquals(['admingroup_id'=>'id'], $adminGroups['relationToTargetKeyColumns']);
+        $this->assertEquals(['adminuser_id','admingroup_id'], $adminGroups['joinTableColumns']);
 
 
         // assert address association mappings
@@ -767,15 +771,15 @@ abstract class AbstractMappingDriverTest extends OrmTestCase
 
         // assert override
         $this->assertEquals('address_id', $guestAddress['joinColumns'][0]['name']);
-        $this->assertEquals(array('address_id'=>'id'), $guestAddress['sourceToTargetKeyColumns']);
-        $this->assertEquals(array('address_id'=>'address_id'), $guestAddress['joinColumnFieldNames']);
-        $this->assertEquals(array('id'=>'address_id'), $guestAddress['targetToSourceKeyColumns']);
+        $this->assertEquals(['address_id'=>'id'], $guestAddress['sourceToTargetKeyColumns']);
+        $this->assertEquals(['address_id'=>'address_id'], $guestAddress['joinColumnFieldNames']);
+        $this->assertEquals(['id'=>'address_id'], $guestAddress['targetToSourceKeyColumns']);
 
 
         $this->assertEquals('adminaddress_id', $adminAddress['joinColumns'][0]['name']);
-        $this->assertEquals(array('adminaddress_id'=>'id'), $adminAddress['sourceToTargetKeyColumns']);
-        $this->assertEquals(array('adminaddress_id'=>'adminaddress_id'), $adminAddress['joinColumnFieldNames']);
-        $this->assertEquals(array('id'=>'adminaddress_id'), $adminAddress['targetToSourceKeyColumns']);
+        $this->assertEquals(['adminaddress_id'=>'id'], $adminAddress['sourceToTargetKeyColumns']);
+        $this->assertEquals(['adminaddress_id'=>'adminaddress_id'], $adminAddress['joinColumnFieldNames']);
+        $this->assertEquals(['id'=>'adminaddress_id'], $adminAddress['targetToSourceKeyColumns']);
     }
 
     /*
@@ -808,8 +812,8 @@ abstract class AbstractMappingDriverTest extends OrmTestCase
         $this->assertTrue($adminMetadata->fieldMappings['id']['id']);
         $this->assertEquals('id', $adminMetadata->fieldMappings['id']['fieldName']);
         $this->assertEquals('user_id', $adminMetadata->fieldMappings['id']['columnName']);
-        $this->assertEquals(array('user_id'=>'id','user_name'=>'name'), $adminMetadata->fieldNames);
-        $this->assertEquals(array('id'=>'user_id','name'=>'user_name'), $adminMetadata->columnNames);
+        $this->assertEquals(['user_id'=>'id','user_name'=>'name'], $adminMetadata->fieldNames);
+        $this->assertEquals(['id'=>'user_id','name'=>'user_name'], $adminMetadata->columnNames);
         $this->assertEquals(150, $adminMetadata->fieldMappings['id']['length']);
 
 
@@ -823,8 +827,8 @@ abstract class AbstractMappingDriverTest extends OrmTestCase
         $this->assertTrue($guestMetadata->fieldMappings['id']['id']);
         $this->assertEquals('guest_id', $guestMetadata->fieldMappings['id']['columnName']);
         $this->assertEquals('id', $guestMetadata->fieldMappings['id']['fieldName']);
-        $this->assertEquals(array('guest_id'=>'id','guest_name'=>'name'), $guestMetadata->fieldNames);
-        $this->assertEquals(array('id'=>'guest_id','name'=>'guest_name'), $guestMetadata->columnNames);
+        $this->assertEquals(['guest_id'=>'id','guest_name'=>'name'], $guestMetadata->fieldNames);
+        $this->assertEquals(['id'=>'guest_id','name'=>'guest_name'], $guestMetadata->columnNames);
         $this->assertEquals(140, $guestMetadata->fieldMappings['id']['length']);
 
         $this->assertEquals('name', $guestMetadata->fieldMappings['name']['fieldName']);
@@ -1139,126 +1143,144 @@ class User
     public static function loadMetadata(ClassMetadataInfo $metadata)
     {
         $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE);
-        $metadata->setPrimaryTable(array(
+        $metadata->setPrimaryTable(
+            [
            'name' => 'cms_users',
-           'options' => array('foo' => 'bar', 'baz' => array('key' => 'val')),
-          ));
+           'options' => ['foo' => 'bar', 'baz' => ['key' => 'val']],
+            ]
+        );
         $metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_DEFERRED_IMPLICIT);
         $metadata->addLifecycleCallback('doStuffOnPrePersist', 'prePersist');
         $metadata->addLifecycleCallback('doOtherStuffOnPrePersistToo', 'prePersist');
         $metadata->addLifecycleCallback('doStuffOnPostPersist', 'postPersist');
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
            'id' => true,
            'fieldName' => 'id',
            'type' => 'integer',
            'columnName' => 'id',
-           'options' => array('foo' => 'bar', 'unsigned' => false),
-          ));
-        $metadata->mapField(array(
+           'options' => ['foo' => 'bar', 'unsigned' => false],
+            ]
+        );
+        $metadata->mapField(
+            [
            'fieldName' => 'name',
            'type' => 'string',
            'length' => 50,
            'unique' => true,
            'nullable' => true,
            'columnName' => 'name',
-           'options' => array('foo' => 'bar', 'baz' => array('key' => 'val'), 'fixed' => false),
-          ));
-        $metadata->mapField(array(
+           'options' => ['foo' => 'bar', 'baz' => ['key' => 'val'], 'fixed' => false],
+            ]
+        );
+        $metadata->mapField(
+            [
            'fieldName' => 'email',
            'type' => 'string',
            'columnName' => 'user_email',
            'columnDefinition' => 'CHAR(32) NOT NULL',
-          ));
-        $mapping = array('fieldName' => 'version', 'type' => 'integer');
+            ]
+        );
+        $mapping = ['fieldName' => 'version', 'type' => 'integer'];
         $metadata->setVersionMapping($mapping);
         $metadata->mapField($mapping);
         $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
-        $metadata->mapOneToOne(array(
+        $metadata->mapOneToOne(
+            [
            'fieldName' => 'address',
            'targetEntity' => 'Doctrine\\Tests\\ORM\\Mapping\\Address',
            'cascade' =>
-           array(
+           [
            0 => 'remove',
-           ),
+           ],
            'mappedBy' => NULL,
            'inversedBy' => 'user',
            'joinColumns' =>
-           array(
+           [
            0 =>
-           array(
+           [
             'name' => 'address_id',
             'referencedColumnName' => 'id',
             'onDelete' => 'CASCADE',
-           ),
-           ),
+           ],
+           ],
            'orphanRemoval' => false,
-          ));
-        $metadata->mapOneToMany(array(
+            ]
+        );
+        $metadata->mapOneToMany(
+            [
            'fieldName' => 'phonenumbers',
            'targetEntity' => 'Doctrine\\Tests\\ORM\\Mapping\\Phonenumber',
            'cascade' =>
-           array(
+           [
            1 => 'persist',
-           ),
+           ],
            'mappedBy' => 'user',
            'orphanRemoval' => true,
            'orderBy' =>
-           array(
+           [
            'number' => 'ASC',
-           ),
-          ));
-        $metadata->mapManyToMany(array(
+           ],
+            ]
+        );
+        $metadata->mapManyToMany(
+            [
            'fieldName' => 'groups',
            'targetEntity' => 'Doctrine\\Tests\\ORM\\Mapping\\Group',
            'cascade' =>
-           array(
+           [
            0 => 'remove',
            1 => 'persist',
            2 => 'refresh',
            3 => 'merge',
            4 => 'detach',
-           ),
+           ],
            'mappedBy' => NULL,
            'joinTable' =>
-           array(
+           [
            'name' => 'cms_users_groups',
            'joinColumns' =>
-           array(
+           [
             0 =>
-            array(
+            [
             'name' => 'user_id',
             'referencedColumnName' => 'id',
             'unique' => false,
             'nullable' => false,
-            ),
-           ),
+            ],
+           ],
            'inverseJoinColumns' =>
-           array(
+           [
             0 =>
-            array(
+            [
             'name' => 'group_id',
             'referencedColumnName' => 'id',
             'columnDefinition' => 'INT NULL',
-            ),
-           ),
-           ),
+            ],
+           ],
+           ],
            'orderBy' => NULL,
-          ));
-        $metadata->table['uniqueConstraints'] = array(
-            'search_idx' => array('columns' => array('name', 'user_email'), 'options'=> array('where' => 'name IS NOT NULL')),
+            ]
         );
-        $metadata->table['indexes'] = array(
-            'name_idx' => array('columns' => array('name')), 0 => array('columns' => array('user_email'))
-        );
-        $metadata->setSequenceGeneratorDefinition(array(
+        $metadata->table['uniqueConstraints'] = [
+            'search_idx' => ['columns' => ['name', 'user_email'], 'options'=> ['where' => 'name IS NOT NULL']],
+        ];
+        $metadata->table['indexes'] = [
+            'name_idx' => ['columns' => ['name']], 0 => ['columns' => ['user_email']]
+        ];
+        $metadata->setSequenceGeneratorDefinition(
+            [
                 'sequenceName' => 'tablename_seq',
                 'allocationSize' => 100,
                 'initialValue' => 1,
-            ));
-        $metadata->addNamedQuery(array(
+            ]
+        );
+        $metadata->addNamedQuery(
+            [
                 'name' => 'all',
                 'query' => 'SELECT u FROM __CLASS__ u'
-            ));
+            ]
+        );
     }
 }
 
@@ -1279,7 +1301,7 @@ abstract class Animal
     public static function loadMetadata(ClassMetadataInfo $metadata)
     {
         $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_CUSTOM);
-        $metadata->setCustomGeneratorDefinition(array("class" => "stdClass"));
+        $metadata->setCustomGeneratorDefinition(["class" => "stdClass"]);
     }
 }
 
@@ -1346,16 +1368,20 @@ class DDC1170Entity
 
     public static function loadMetadata(ClassMetadataInfo $metadata)
     {
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
            'id'                 => true,
            'fieldName'          => 'id',
            'columnDefinition'   => 'INT unsigned NOT NULL',
-        ));
+            ]
+        );
 
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
             'fieldName'         => 'value',
             'columnDefinition'  => 'VARCHAR(255) NOT NULL'
-        ));
+            ]
+        );
 
         $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_NONE);
     }
@@ -1379,16 +1405,20 @@ class DDC807Entity
 
    public static function loadMetadata(ClassMetadataInfo $metadata)
     {
-         $metadata->mapField(array(
+         $metadata->mapField(
+             [
            'id'                 => true,
            'fieldName'          => 'id',
-        ));
+             ]
+         );
 
-        $metadata->setDiscriminatorColumn(array(
+        $metadata->setDiscriminatorColumn(
+            [
             'name'              => "dtype",
             'type'              => "string",
             'columnDefinition'  => "ENUM('ONE','TWO')"
-        ));
+            ]
+        );
 
         $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_NONE);
     }
@@ -1415,13 +1445,16 @@ class Comment
     public static function loadMetadata(ClassMetadataInfo $metadata)
     {
         $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE);
-        $metadata->setPrimaryTable(array(
-            'indexes' => array(
-                array('columns' => array('content'), 'flags' => array('fulltext'), 'options' => array('where' => 'content IS NOT NULL'))
-            )
-        ));
+        $metadata->setPrimaryTable(
+            [
+            'indexes' => [
+                ['columns' => ['content'], 'flags' => ['fulltext'], 'options' => ['where' => 'content IS NOT NULL']]
+            ]
+            ]
+        );
 
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
             'fieldName' => 'content',
             'type' => 'text',
             'scale' => 0,
@@ -1430,7 +1463,8 @@ class Comment
             'nullable' => false,
             'precision' => 0,
             'columnName' => 'content',
-        ));
+            ]
+        );
     }
 }
 
@@ -1453,10 +1487,12 @@ class SingleTableEntityNoDiscriminatorColumnMapping
 
     public static function loadMetadata(ClassMetadataInfo $metadata)
     {
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
             'id' => true,
             'fieldName' => 'id',
-        ));
+            ]
+        );
 
         $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_NONE);
     }
@@ -1485,10 +1521,12 @@ class SingleTableEntityIncompleteDiscriminatorColumnMapping
 
     public static function loadMetadata(ClassMetadataInfo $metadata)
     {
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
             'id' => true,
             'fieldName' => 'id',
-        ));
+            ]
+        );
 
         $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_NONE);
     }
diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php
index ac17b63a2..e87412d3e 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php
@@ -111,7 +111,7 @@ class AnnotationDriverTest extends AbstractMappingDriverTest
     protected function _loadDriverForCMSModels()
     {
         $annotationDriver = $this->_loadDriver();
-        $annotationDriver->addPaths(array(__DIR__ . '/../../Models/CMS/'));
+        $annotationDriver->addPaths([__DIR__ . '/../../Models/CMS/']);
         return $annotationDriver;
     }
 
@@ -133,7 +133,7 @@ class AnnotationDriverTest extends AbstractMappingDriverTest
     public function testJoinTablesWithMappedSuperclassForAnnotationDriver()
     {
         $annotationDriver = $this->_loadDriver();
-        $annotationDriver->addPaths(array(__DIR__ . '/../../Models/DirectoryTree/'));
+        $annotationDriver->addPaths([__DIR__ . '/../../Models/DirectoryTree/']);
 
         $em = $this->_getTestEntityManager();
         $em->getConfiguration()->setMetadataDriverImpl($annotationDriver);
@@ -202,10 +202,10 @@ class AnnotationDriverTest extends AbstractMappingDriverTest
         $factory->setEntityManager($em);
 
         $cm = $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\AnnotationChild');
-        $this->assertEquals(array("postLoad" => array("postLoad"), "preUpdate" => array("preUpdate")), $cm->lifecycleCallbacks);
+        $this->assertEquals(["postLoad" => ["postLoad"], "preUpdate" => ["preUpdate"]], $cm->lifecycleCallbacks);
 
         $cm = $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\AnnotationParent');
-        $this->assertEquals(array("postLoad" => array("postLoad"), "preUpdate" => array("preUpdate")), $cm->lifecycleCallbacks);
+        $this->assertEquals(["postLoad" => ["postLoad"], "preUpdate" => ["preUpdate"]], $cm->lifecycleCallbacks);
     }
 
     /**
diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnsiQuoteStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnsiQuoteStrategyTest.php
index d5f2a9738..497e2a005 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/AnsiQuoteStrategyTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/AnsiQuoteStrategyTest.php
@@ -48,8 +48,8 @@ class AnsiQuoteStrategyTest extends OrmTestCase
     public function testGetColumnName()
     {
         $class = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
-        $class->mapField(array('fieldName' => 'name', 'columnName' => 'name'));
-        $class->mapField(array('fieldName' => 'id', 'columnName' => 'id', 'id' => true));
+        $class->mapField(['fieldName' => 'name', 'columnName' => 'name']);
+        $class->mapField(['fieldName' => 'id', 'columnName' => 'id', 'id' => true]);
 
         $this->assertEquals('id' ,$this->strategy->getColumnName('id', $class, $this->platform));
         $this->assertEquals('name' ,$this->strategy->getColumnName('name', $class, $this->platform));
@@ -59,38 +59,42 @@ class AnsiQuoteStrategyTest extends OrmTestCase
     {
         $class = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
 
-        $class->setPrimaryTable(array('name'=>'cms_user'));
+        $class->setPrimaryTable(['name'=>'cms_user']);
         $this->assertEquals('cms_user' ,$this->strategy->getTableName($class, $this->platform));
     }
 
     public function testJoinTableName()
     {
         $class = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress');
-        
-        $class->mapManyToMany(array(
+
+        $class->mapManyToMany(
+            [
             'fieldName'     => 'user',
             'targetEntity'  => 'CmsUser',
             'inversedBy'    => 'users',
-            'joinTable'     => array(
+            'joinTable'     => [
                 'name'  => 'cmsaddress_cmsuser'
-            )
-        ));
-        
+            ]
+            ]
+        );
+
         $this->assertEquals('cmsaddress_cmsuser', $this->strategy->getJoinTableName($class->associationMappings['user'], $class, $this->platform));
-       
+
     }
 
     public function testIdentifierColumnNames()
     {
         $class = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress');
 
-        $class->mapField(array(
+        $class->mapField(
+            [
             'id'            => true,
             'fieldName'     => 'id',
             'columnName'    => 'id',
-        ));
+            ]
+        );
 
-        $this->assertEquals(array('id'), $this->strategy->getIdentifierColumnNames($class, $this->platform));
+        $this->assertEquals(['id'], $this->strategy->getIdentifierColumnNames($class, $this->platform));
     }
 
 
@@ -103,14 +107,18 @@ class AnsiQuoteStrategyTest extends OrmTestCase
     {
         $class = $this->createClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails');
 
-        $class->mapOneToOne(array(
+        $class->mapOneToOne(
+            [
             'id'            => true,
             'fieldName'     => 'article',
             'targetEntity'  => 'Doctrine\Tests\Models\DDC117\DDC117Article',
-            'joinColumns'    => array(array(
+            'joinColumns'    => [
+                [
                 'name'  => 'article'
-            )),
-        ));
+                ]
+            ],
+            ]
+        );
 
         $joinColumn = $class->associationMappings['article']['joinColumns'][0];
         $this->assertEquals('article',$this->strategy->getJoinColumnName($joinColumn, $class, $this->platform));
@@ -120,14 +128,18 @@ class AnsiQuoteStrategyTest extends OrmTestCase
     {
         $cm = $this->createClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails');
 
-        $cm->mapOneToOne(array(
+        $cm->mapOneToOne(
+            [
             'id'            => true,
             'fieldName'     => 'article',
             'targetEntity'  => 'Doctrine\Tests\Models\DDC117\DDC117Article',
-            'joinColumns'    => array(array(
+            'joinColumns'    => [
+                [
                 'name'  => 'article'
-            )),
-        ));
+                ]
+            ],
+            ]
+        );
 
         $joinColumn = $cm->associationMappings['article']['joinColumns'][0];
         $this->assertEquals('id',$this->strategy->getReferencedJoinColumnName($joinColumn, $cm, $this->platform));
@@ -136,14 +148,14 @@ class AnsiQuoteStrategyTest extends OrmTestCase
     public function testGetSequenceName()
     {
         $class      = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
-        $definition = array(
+        $definition = [
             'sequenceName'      => 'user_id_seq',
             'allocationSize'    => 1,
             'initialValue'      => 2
-        );
+        ];
 
         $class->setSequenceGeneratorDefinition($definition);
 
         $this->assertEquals('user_id_seq',$this->strategy->getSequenceName($definition, $class, $this->platform));
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php
index be2bee9f5..7cd1247dd 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php
@@ -156,7 +156,7 @@ class BasicInheritanceMappingTest extends OrmTestCase
 
         $this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator);
         $this->assertEquals(
-            array('allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'),
+            ['allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'],
             $class->sequenceGeneratorDefinition
         );
     }
@@ -172,7 +172,7 @@ class BasicInheritanceMappingTest extends OrmTestCase
 
         $this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator);
         $this->assertEquals(
-            array('allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'),
+            ['allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'],
             $class->sequenceGeneratorDefinition
         );
     }
@@ -188,7 +188,7 @@ class BasicInheritanceMappingTest extends OrmTestCase
 
         $this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator);
         $this->assertEquals(
-            array('allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'),
+            ['allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'],
             $class->sequenceGeneratorDefinition
         );
     }
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php
index da4f4abf5..e19687c84 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php
@@ -51,14 +51,15 @@ class ClassMetadataBuilderTest extends OrmTestCase
             )
         );
 
-        $this->assertEquals(array(
-            'name' => array(
+        $this->assertEquals(
+            [
+            'name' => [
                 'class' => 'Doctrine\Tests\Models\ValueObjects\Name',
                 'columnPrefix' => null,
                 'declaredField' => null,
                 'originalField' => null,
-            )
-        ), $this->cm->embeddedClasses);
+            ]
+            ], $this->cm->embeddedClasses);
     }
 
     public function testAddEmbeddedWithPrefix()
@@ -71,14 +72,15 @@ class ClassMetadataBuilderTest extends OrmTestCase
             )
         );
 
-        $this->assertEquals(array(
-            'name' => array(
+        $this->assertEquals(
+            [
+            'name' => [
                 'class' => 'Doctrine\Tests\Models\ValueObjects\Name',
                 'columnPrefix' => 'nm_',
                 'declaredField' => null,
                 'originalField' => null,
-            )
-        ), $this->cm->embeddedClasses);
+            ]
+            ], $this->cm->embeddedClasses);
     }
 
     public function testCreateEmbeddedWithoutExtraParams()
@@ -90,12 +92,12 @@ class ClassMetadataBuilderTest extends OrmTestCase
 
         $this->assertIsFluent($embeddedBuilder->build());
         $this->assertEquals(
-            array(
+            [
                 'class' => 'Doctrine\Tests\Models\ValueObjects\Name',
                 'columnPrefix' => null,
                 'declaredField' => null,
                 'originalField' => null
-            ),
+            ],
             $this->cm->embeddedClasses['name']
         );
     }
@@ -109,12 +111,12 @@ class ClassMetadataBuilderTest extends OrmTestCase
         $this->assertIsFluent($embeddedBuilder->build());
 
         $this->assertEquals(
-            array(
+            [
                 'class' => 'Doctrine\Tests\Models\ValueObjects\Name',
                 'columnPrefix' => 'nm_',
                 'declaredField' => null,
                 'originalField' => null
-            ),
+            ],
             $this->cm->embeddedClasses['name']
         );
     }
@@ -139,28 +141,28 @@ class ClassMetadataBuilderTest extends OrmTestCase
 
     public function testAddIndex()
     {
-        $this->assertIsFluent($this->builder->addIndex(array('username', 'name'), 'users_idx'));
-        $this->assertEquals(array('users_idx' => array('columns' => array('username', 'name'))), $this->cm->table['indexes']);
+        $this->assertIsFluent($this->builder->addIndex(['username', 'name'], 'users_idx'));
+        $this->assertEquals(['users_idx' => ['columns' => ['username', 'name']]], $this->cm->table['indexes']);
     }
 
     public function testAddUniqueConstraint()
     {
-        $this->assertIsFluent($this->builder->addUniqueConstraint(array('username', 'name'), 'users_idx'));
-        $this->assertEquals(array('users_idx' => array('columns' => array('username', 'name'))), $this->cm->table['uniqueConstraints']);
+        $this->assertIsFluent($this->builder->addUniqueConstraint(['username', 'name'], 'users_idx'));
+        $this->assertEquals(['users_idx' => ['columns' => ['username', 'name']]], $this->cm->table['uniqueConstraints']);
     }
 
     public function testSetPrimaryTableRelated()
     {
-        $this->builder->addUniqueConstraint(array('username', 'name'), 'users_idx');
-        $this->builder->addIndex(array('username', 'name'), 'users_idx');
+        $this->builder->addUniqueConstraint(['username', 'name'], 'users_idx');
+        $this->builder->addIndex(['username', 'name'], 'users_idx');
         $this->builder->setTable('users');
 
         $this->assertEquals(
-            array(
+            [
                 'name' => 'users',
-                'indexes' => array('users_idx' => array('columns' => array('username', 'name'))),
-                'uniqueConstraints' => array('users_idx' => array('columns' => array('username', 'name'))),
-            ),
+                'indexes' => ['users_idx' => ['columns' => ['username', 'name']]],
+                'uniqueConstraints' => ['users_idx' => ['columns' => ['username', 'name']]],
+            ],
             $this->cm->table
         );
     }
@@ -180,7 +182,7 @@ class ClassMetadataBuilderTest extends OrmTestCase
     public function testSetDiscriminatorColumn()
     {
         $this->assertIsFluent($this->builder->setDiscriminatorColumn('discr', 'string', '124'));
-        $this->assertEquals(array('fieldName' => 'discr', 'name' => 'discr', 'type' => 'string', 'length' => '124'), $this->cm->discriminatorColumn);
+        $this->assertEquals(['fieldName' => 'discr', 'name' => 'discr', 'type' => 'string', 'length' => '124'], $this->cm->discriminatorColumn);
     }
 
     public function testAddDiscriminatorMapClass()
@@ -188,7 +190,8 @@ class ClassMetadataBuilderTest extends OrmTestCase
         $this->assertIsFluent($this->builder->addDiscriminatorMapClass('test', 'Doctrine\Tests\Models\CMS\CmsUser'));
         $this->assertIsFluent($this->builder->addDiscriminatorMapClass('test2', 'Doctrine\Tests\Models\CMS\CmsGroup'));
 
-        $this->assertEquals(array('test' => 'Doctrine\Tests\Models\CMS\CmsUser', 'test2' => 'Doctrine\Tests\Models\CMS\CmsGroup'), $this->cm->discriminatorMap);
+        $this->assertEquals(
+            ['test' => 'Doctrine\Tests\Models\CMS\CmsUser', 'test2' => 'Doctrine\Tests\Models\CMS\CmsGroup'], $this->cm->discriminatorMap);
         $this->assertEquals('test', $this->cm->discriminatorValue);
     }
 
@@ -207,7 +210,7 @@ class ClassMetadataBuilderTest extends OrmTestCase
     public function testAddField()
     {
         $this->assertIsFluent($this->builder->addField('name', 'string'));
-        $this->assertEquals(array('columnName' => 'name', 'fieldName' => 'name', 'type' => 'string'), $this->cm->fieldMappings['name']);
+        $this->assertEquals(['columnName' => 'name', 'fieldName' => 'name', 'type' => 'string'], $this->cm->fieldMappings['name']);
     }
 
     public function testCreateField()
@@ -217,13 +220,14 @@ class ClassMetadataBuilderTest extends OrmTestCase
 
         $this->assertFalse(isset($this->cm->fieldMappings['name']));
         $this->assertIsFluent($fieldBuilder->build());
-        $this->assertEquals(array('columnName' => 'name', 'fieldName' => 'name', 'type' => 'string'), $this->cm->fieldMappings['name']);
+        $this->assertEquals(['columnName' => 'name', 'fieldName' => 'name', 'type' => 'string'], $this->cm->fieldMappings['name']);
     }
 
     public function testCreateVersionedField()
     {
         $this->builder->createField('name', 'integer')->columnName('username')->length(124)->nullable()->columnDefinition('foobar')->unique()->isVersionField()->build();
-        $this->assertEquals(array(
+        $this->assertEquals(
+            [
             'columnDefinition' => 'foobar',
             'columnName' => 'username',
             'default' => 1,
@@ -232,29 +236,30 @@ class ClassMetadataBuilderTest extends OrmTestCase
             'type' => 'integer',
             'nullable' => true,
             'unique' => true,
-        ), $this->cm->fieldMappings['name']);
+            ], $this->cm->fieldMappings['name']);
     }
 
     public function testCreatePrimaryField()
     {
         $this->builder->createField('id', 'integer')->makePrimaryKey()->generatedValue()->build();
 
-        $this->assertEquals(array('id'), $this->cm->identifier);
-        $this->assertEquals(array('columnName' => 'id', 'fieldName' => 'id', 'id' => true, 'type' => 'integer'), $this->cm->fieldMappings['id']);
+        $this->assertEquals(['id'], $this->cm->identifier);
+        $this->assertEquals(['columnName' => 'id', 'fieldName' => 'id', 'id' => true, 'type' => 'integer'], $this->cm->fieldMappings['id']);
     }
 
     public function testCreateUnsignedOptionField()
     {
         $this->builder->createField('state', 'integer')->option('unsigned', true)->build();
 
-        $this->assertEquals(array('fieldName' => 'state', 'type' => 'integer', 'options' => array('unsigned' => true), 'columnName' => 'state'), $this->cm->fieldMappings['state']);
+        $this->assertEquals(
+            ['fieldName' => 'state', 'type' => 'integer', 'options' => ['unsigned' => true], 'columnName' => 'state'], $this->cm->fieldMappings['state']);
     }
 
     public function testAddLifecycleEvent()
     {
         $this->builder->addLifecycleEvent('getStatus', 'postLoad');
 
-        $this->assertEquals(array('postLoad' => array('getStatus')), $this->cm->lifecycleCallbacks);
+        $this->assertEquals(['postLoad' => ['getStatus']], $this->cm->lifecycleCallbacks);
     }
 
     public function testCreateManyToOne()
@@ -267,28 +272,30 @@ class ClassMetadataBuilderTest extends OrmTestCase
                               ->build()
         );
 
-        $this->assertEquals(array('groups' => array (
+        $this->assertEquals(
+            [
+                'groups' => [
                 'fieldName' => 'groups',
                 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup',
-                'cascade' => array (
+                'cascade' => [
                   0 => 'remove',
                   1 => 'persist',
                   2 => 'refresh',
                   3 => 'merge',
                   4 => 'detach',
-                ),
+                ],
                 'fetch' => 4,
-                'joinColumns' => array (
+                'joinColumns' => [
                   0 =>
-                  array (
+                  [
                     'name' => 'group_id',
                     'referencedColumnName' => 'id',
                     'nullable' => true,
                     'unique' => false,
                     'onDelete' => 'CASCADE',
                     'columnDefinition' => NULL,
-                  ),
-                ),
+                  ],
+                ],
                 'type' => 2,
                 'mappedBy' => NULL,
                 'inversedBy' => NULL,
@@ -300,20 +307,20 @@ class ClassMetadataBuilderTest extends OrmTestCase
                 'isCascadeMerge' => true,
                 'isCascadeDetach' => true,
                 'sourceToTargetKeyColumns' =>
-                array (
+                [
                   'group_id' => 'id',
-                ),
+                ],
                 'joinColumnFieldNames' =>
-                array (
+                [
                   'group_id' => 'group_id',
-                ),
+                ],
                 'targetToSourceKeyColumns' =>
-                array (
+                [
                   'id' => 'group_id',
-                ),
+                ],
                 'orphanRemoval' => false,
-              ),
-            ), $this->cm->associationMappings);
+                ],
+            ], $this->cm->associationMappings);
     }
 
     public function testCreateManyToOneWithIdentity()
@@ -330,29 +337,29 @@ class ClassMetadataBuilderTest extends OrmTestCase
         );
 
         $this->assertEquals(
-            array(
-                'groups' => array(
+            [
+                'groups' => [
                     'fieldName' => 'groups',
                     'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup',
-                    'cascade' => array(
+                    'cascade' => [
                         0 => 'remove',
                         1 => 'persist',
                         2 => 'refresh',
                         3 => 'merge',
                         4 => 'detach',
-                    ),
+                    ],
                     'fetch' => 4,
-                    'joinColumns' => array(
+                    'joinColumns' => [
                         0 =>
-                            array(
+                            [
                                 'name' => 'group_id',
                                 'referencedColumnName' => 'id',
                                 'nullable' => true,
                                 'unique' => false,
                                 'onDelete' => 'CASCADE',
                                 'columnDefinition' => NULL,
-                            ),
-                    ),
+                            ],
+                    ],
                     'type' => 2,
                     'mappedBy' => NULL,
                     'inversedBy' => NULL,
@@ -364,21 +371,21 @@ class ClassMetadataBuilderTest extends OrmTestCase
                     'isCascadeMerge' => true,
                     'isCascadeDetach' => true,
                     'sourceToTargetKeyColumns' =>
-                        array(
+                        [
                             'group_id' => 'id',
-                        ),
+                        ],
                     'joinColumnFieldNames' =>
-                        array(
+                        [
                             'group_id' => 'group_id',
-                        ),
+                        ],
                     'targetToSourceKeyColumns' =>
-                        array(
+                        [
                             'id' => 'group_id',
-                        ),
+                        ],
                     'orphanRemoval' => false,
                     'id' => true
-                ),
-            ),
+                ],
+            ],
             $this->cm->associationMappings
         );
     }
@@ -393,28 +400,30 @@ class ClassMetadataBuilderTest extends OrmTestCase
                               ->build()
         );
 
-        $this->assertEquals(array('groups' => array (
+        $this->assertEquals(
+            [
+                'groups' => [
                 'fieldName' => 'groups',
                 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup',
-                'cascade' => array (
+                'cascade' => [
                   0 => 'remove',
                   1 => 'persist',
                   2 => 'refresh',
                   3 => 'merge',
                   4 => 'detach',
-                ),
+                ],
                 'fetch' => 4,
-                'joinColumns' => array (
+                'joinColumns' => [
                   0 =>
-                  array (
+                  [
                     'name' => 'group_id',
                     'referencedColumnName' => 'id',
                     'nullable' => true,
                     'unique' => true,
                     'onDelete' => 'CASCADE',
                     'columnDefinition' => NULL,
-                  ),
-                ),
+                  ],
+                ],
                 'type' => 1,
                 'mappedBy' => NULL,
                 'inversedBy' => NULL,
@@ -426,20 +435,20 @@ class ClassMetadataBuilderTest extends OrmTestCase
                 'isCascadeMerge' => true,
                 'isCascadeDetach' => true,
                 'sourceToTargetKeyColumns' =>
-                array (
+                [
                   'group_id' => 'id',
-                ),
+                ],
                 'joinColumnFieldNames' =>
-                array (
+                [
                   'group_id' => 'group_id',
-                ),
+                ],
                 'targetToSourceKeyColumns' =>
-                array (
+                [
                   'id' => 'group_id',
-                ),
+                ],
                 'orphanRemoval' => false
-              ),
-            ), $this->cm->associationMappings);
+                ],
+            ], $this->cm->associationMappings);
     }
 
     public function testCreateOneToOneWithIdentity()
@@ -456,30 +465,30 @@ class ClassMetadataBuilderTest extends OrmTestCase
         );
 
         $this->assertEquals(
-            array(
-                'groups' => array(
+            [
+                'groups' => [
                     'fieldName' => 'groups',
                     'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup',
-                    'cascade' => array(
+                    'cascade' => [
                         0 => 'remove',
                         1 => 'persist',
                         2 => 'refresh',
                         3 => 'merge',
                         4 => 'detach',
-                    ),
+                    ],
                     'fetch' => 4,
                     'id' => true,
-                    'joinColumns' => array(
+                    'joinColumns' => [
                         0 =>
-                            array(
+                            [
                                 'name' => 'group_id',
                                 'referencedColumnName' => 'id',
                                 'nullable' => true,
                                 'unique' => false,
                                 'onDelete' => 'CASCADE',
                                 'columnDefinition' => NULL,
-                            ),
-                    ),
+                            ],
+                    ],
                     'type' => 1,
                     'mappedBy' => NULL,
                     'inversedBy' => NULL,
@@ -491,20 +500,20 @@ class ClassMetadataBuilderTest extends OrmTestCase
                     'isCascadeMerge' => true,
                     'isCascadeDetach' => true,
                     'sourceToTargetKeyColumns' =>
-                        array(
+                        [
                             'group_id' => 'id',
-                        ),
+                        ],
                     'joinColumnFieldNames' =>
-                        array(
+                        [
                             'group_id' => 'group_id',
-                        ),
+                        ],
                     'targetToSourceKeyColumns' =>
-                        array(
+                        [
                             'id' => 'group_id',
-                        ),
+                        ],
                     'orphanRemoval' => false
-                ),
-            ),
+                ],
+            ],
             $this->cm->associationMappings
         );
     }
@@ -534,48 +543,49 @@ class ClassMetadataBuilderTest extends OrmTestCase
                               ->build()
         );
 
-        $this->assertEquals(array(
+        $this->assertEquals(
+            [
             'groups' =>
-            array(
+            [
                 'fieldName' => 'groups',
                 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup',
                 'cascade' =>
-                array(
+                [
                     0 => 'remove',
                     1 => 'persist',
                     2 => 'refresh',
                     3 => 'merge',
                     4 => 'detach',
-                ),
+                ],
                 'fetch' => 4,
                 'joinTable' =>
-                array(
+                [
                     'joinColumns' =>
-                    array(
+                    [
                         0 =>
-                        array(
+                        [
                             'name' => 'group_id',
                             'referencedColumnName' => 'id',
                             'nullable' => true,
                             'unique' => false,
                             'onDelete' => 'CASCADE',
                             'columnDefinition' => NULL,
-                        ),
-                    ),
+                        ],
+                    ],
                     'inverseJoinColumns' =>
-                    array(
+                    [
                         0 =>
-                        array(
+                        [
                             'name' => 'user_id',
                             'referencedColumnName' => 'id',
                             'nullable' => true,
                             'unique' => false,
                             'onDelete' => NULL,
                             'columnDefinition' => NULL,
-                        ),
-                    ),
+                        ],
+                    ],
                     'name' => 'groups_users',
-                ),
+                ],
                 'type' => 8,
                 'mappedBy' => NULL,
                 'inversedBy' => NULL,
@@ -588,21 +598,21 @@ class ClassMetadataBuilderTest extends OrmTestCase
                 'isCascadeDetach' => true,
                 'isOnDeleteCascade' => true,
                 'relationToSourceKeyColumns' =>
-                array(
+                [
                     'group_id' => 'id',
-                ),
+                ],
                 'joinTableColumns' =>
-                array(
+                [
                     0 => 'group_id',
                     1 => 'user_id',
-                ),
+                ],
                 'relationToTargetKeyColumns' =>
-                array(
+                [
                     'user_id' => 'id',
-                ),
+                ],
                 'orphanRemoval' => false,
-            ),
-                ), $this->cm->associationMappings);
+            ],
+            ], $this->cm->associationMappings);
     }
 
     public function testThrowsExceptionOnCreateManyToManyWithIdentity()
@@ -624,21 +634,22 @@ class ClassMetadataBuilderTest extends OrmTestCase
         $this->assertIsFluent(
                 $this->builder->createOneToMany('groups', 'Doctrine\Tests\Models\CMS\CmsGroup')
                         ->mappedBy('test')
-                        ->setOrderBy(array('test'))
+                        ->setOrderBy(['test'])
                         ->setIndexBy('test')
                         ->build()
         );
 
-        $this->assertEquals(array(
+        $this->assertEquals(
+            [
             'groups' =>
-            array(
+            [
                 'fieldName' => 'groups',
                 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup',
                 'mappedBy' => 'test',
                 'orderBy' =>
-                array(
+                [
                     0 => 'test',
-                ),
+                ],
                 'indexBy' => 'test',
                 'type' => 4,
                 'inversedBy' => NULL,
@@ -646,16 +657,16 @@ class ClassMetadataBuilderTest extends OrmTestCase
                 'sourceEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser',
                 'fetch' => 2,
                 'cascade' =>
-                array(
-                ),
+                [
+                ],
                 'isCascadeRemove' => false,
                 'isCascadePersist' => false,
                 'isCascadeRefresh' => false,
                 'isCascadeMerge' => false,
                 'isCascadeDetach' => false,
                 'orphanRemoval' => false,
-            ),
-                ), $this->cm->associationMappings);
+            ],
+            ], $this->cm->associationMappings);
     }
 
     public function testThrowsExceptionOnCreateOneToManyWithIdentity()
@@ -665,7 +676,7 @@ class ClassMetadataBuilderTest extends OrmTestCase
         $this->builder->createOneToMany('groups', 'Doctrine\Tests\Models\CMS\CmsGroup')
                 ->makePrimaryKey()
                 ->mappedBy('test')
-                ->setOrderBy(array('test'))
+                ->setOrderBy(['test'])
                 ->setIndexBy('test')
                 ->build();
     }
@@ -680,23 +691,24 @@ class ClassMetadataBuilderTest extends OrmTestCase
                 ->build()
         );
 
-        $this->assertEquals(array(
-            'groups' => array(
+        $this->assertEquals(
+            [
+            'groups' => [
                 'fieldName' => 'groups',
                 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup',
-                'cascade' => array (),
+                'cascade' => [],
                 'fetch' => 2,
-                'joinColumns' => array (
+                'joinColumns' => [
                   0 =>
-                  array (
+                  [
                     'name' => 'group_id',
                     'referencedColumnName' => 'id',
                     'nullable' => true,
                     'unique' => true,
                     'onDelete' => 'CASCADE',
                     'columnDefinition' => NULL,
-                  ),
-                ),
+                  ],
+                ],
                 'type' => 1,
                 'mappedBy' => NULL,
                 'inversedBy' => NULL,
@@ -708,20 +720,20 @@ class ClassMetadataBuilderTest extends OrmTestCase
                 'isCascadeMerge' => false,
                 'isCascadeDetach' => false,
                 'sourceToTargetKeyColumns' =>
-                array (
+                [
                   'group_id' => 'id',
-                ),
+                ],
                 'joinColumnFieldNames' =>
-                array (
+                [
                   'group_id' => 'group_id',
-                ),
+                ],
                 'targetToSourceKeyColumns' =>
-                array (
+                [
                   'id' => 'group_id',
-                ),
+                ],
                 'orphanRemoval' => true
-            ),
-        ), $this->cm->associationMappings);
+            ],
+            ], $this->cm->associationMappings);
     }
 
     public function testOrphanRemovalOnCreateOneToMany()
@@ -734,9 +746,10 @@ class ClassMetadataBuilderTest extends OrmTestCase
                 ->build()
         );
 
-        $this->assertEquals(array(
+        $this->assertEquals(
+            [
             'groups' =>
-            array(
+            [
                 'fieldName' => 'groups',
                 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup',
                 'mappedBy' => 'test',
@@ -745,15 +758,15 @@ class ClassMetadataBuilderTest extends OrmTestCase
                 'isOwningSide' => false,
                 'sourceEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser',
                 'fetch' => 2,
-                'cascade' => array(),
+                'cascade' => [],
                 'isCascadeRemove' => true,
                 'isCascadePersist' => false,
                 'isCascadeRefresh' => false,
                 'isCascadeMerge' => false,
                 'isCascadeDetach' => false,
                 'orphanRemoval' => true,
-            ),
-        ), $this->cm->associationMappings);
+            ],
+            ], $this->cm->associationMappings);
     }
 
     public function testExceptionOnOrphanRemovalOnManyToOne()
@@ -775,32 +788,33 @@ class ClassMetadataBuilderTest extends OrmTestCase
             ->orphanRemoval()
             ->build();
 
-        $this->assertEquals(array(
-            'groups' => array(
+        $this->assertEquals(
+            [
+            'groups' => [
                 'fieldName' => 'groups',
                 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup',
-                'cascade' => array(),
+                'cascade' => [],
                 'fetch' => 2,
-                'joinTable' => array(
-                    'joinColumns' => array(
-                        0 => array(
+                'joinTable' => [
+                    'joinColumns' => [
+                        0 => [
                             'name' => 'group_id',
                             'referencedColumnName' => 'id',
                             'nullable' => true,
                             'unique' => false,
                             'onDelete' => 'CASCADE',
                             'columnDefinition' => NULL,
-                        ),
-                    ),
-                    'inverseJoinColumns' => array(
-                        0 => array(
+                        ],
+                    ],
+                    'inverseJoinColumns' => [
+                        0 => [
                             'name' => 'cmsgroup_id',
                             'referencedColumnName' => 'id',
                             'onDelete' => 'CASCADE'
-                        )
-                    ),
+                        ]
+                    ],
                     'name' => 'cmsuser_cmsgroup',
-                ),
+                ],
                 'type' => 8,
                 'mappedBy' => NULL,
                 'inversedBy' => NULL,
@@ -812,19 +826,19 @@ class ClassMetadataBuilderTest extends OrmTestCase
                 'isCascadeMerge' => false,
                 'isCascadeDetach' => false,
                 'isOnDeleteCascade' => true,
-                'relationToSourceKeyColumns' => array(
+                'relationToSourceKeyColumns' => [
                     'group_id' => 'id',
-                ),
-                'joinTableColumns' => array(
+                ],
+                'joinTableColumns' => [
                     0 => 'group_id',
                     1 => 'cmsgroup_id',
-                ),
-                'relationToTargetKeyColumns' => array(
+                ],
+                'relationToTargetKeyColumns' => [
                     'cmsgroup_id' => 'id',
-                ),
+                ],
                 'orphanRemoval' => true,
-            ),
-        ), $this->cm->associationMappings);
+            ],
+            ], $this->cm->associationMappings);
     }
 
     public function assertIsFluent($ret)
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
index f40d657b5..bdfd6893d 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
@@ -42,7 +42,7 @@ class ClassMetadataFactoryTest extends OrmTestCase
         $cmf->setMetadataFor($cm1->name, $cm1);
 
         // Prechecks
-        $this->assertEquals(array(), $cm1->parentClasses);
+        $this->assertEquals([], $cm1->parentClasses);
         $this->assertEquals(ClassMetadata::INHERITANCE_TYPE_NONE, $cm1->inheritanceType);
         $this->assertTrue($cm1->hasField('name'));
         $this->assertEquals(2, count($cm1->associationMappings));
@@ -55,7 +55,7 @@ class ClassMetadataFactoryTest extends OrmTestCase
         $this->assertSame($cm1, $cmMap1);
         $this->assertEquals('group', $cmMap1->table['name']);
         $this->assertTrue($cmMap1->table['quoted']);
-        $this->assertEquals(array(), $cmMap1->parentClasses);
+        $this->assertEquals([], $cmMap1->parentClasses);
         $this->assertTrue($cmMap1->hasField('name'));
     }
 
@@ -63,8 +63,9 @@ class ClassMetadataFactoryTest extends OrmTestCase
     {
         $cm1 = $this->_createValidClassMetadata();
         $cm1->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_CUSTOM);
-        $cm1->customGeneratorDefinition = array(
-            "class" => "Doctrine\Tests\ORM\Mapping\CustomIdGenerator");
+        $cm1->customGeneratorDefinition = [
+            "class" => "Doctrine\Tests\ORM\Mapping\CustomIdGenerator"
+        ];
         $cmf = $this->_createTestFactory();
         $cmf->setMetadataForClass($cm1->name, $cm1);
 
@@ -80,7 +81,7 @@ class ClassMetadataFactoryTest extends OrmTestCase
     {
         $cm1 = $this->_createValidClassMetadata();
         $cm1->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_CUSTOM);
-        $cm1->customGeneratorDefinition = array("class" => "NotExistingGenerator");
+        $cm1->customGeneratorDefinition = ["class" => "NotExistingGenerator"];
         $cmf = $this->_createTestFactory();
         $cmf->setMetadataForClass($cm1->name, $cm1);
         $this->expectException(ORMException::class);
@@ -103,7 +104,7 @@ class ClassMetadataFactoryTest extends OrmTestCase
     {
         require_once __DIR__."/../../Models/Global/GlobalNamespaceModel.php";
 
-        $metadataDriver = $this->createAnnotationDriver(array(__DIR__ . '/../../Models/Global/'));
+        $metadataDriver = $this->createAnnotationDriver([__DIR__ . '/../../Models/Global/']);
 
         $entityManager = $this->_createEntityManager($metadataDriver);
 
@@ -166,7 +167,7 @@ class ClassMetadataFactoryTest extends OrmTestCase
     public function testAddDefaultDiscriminatorMap()
     {
         $cmf = new ClassMetadataFactory();
-        $driver = $this->createAnnotationDriver(array(__DIR__ . '/../../Models/JoinedInheritanceType/'));
+        $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/JoinedInheritanceType/']);
         $em = $this->_createEntityManager($driver);
         $cmf->setEntityManager($em);
 
@@ -194,7 +195,7 @@ class ClassMetadataFactoryTest extends OrmTestCase
 
         // ClassMetadataFactory::addDefaultDiscriminatorMap shouldn't be called again, because the
         // discriminator map is already cached
-        $cmf = $this->getMockBuilder(ClassMetadataFactory::class)->setMethods(array('addDefaultDiscriminatorMap'))->getMock();
+        $cmf = $this->getMockBuilder(ClassMetadataFactory::class)->setMethods(['addDefaultDiscriminatorMap'])->getMock();
         $cmf->setEntityManager($em);
         $cmf->expects($this->never())
             ->method('addDefaultDiscriminatorMap');
@@ -219,7 +220,7 @@ class ClassMetadataFactoryTest extends OrmTestCase
         // getting all the metadata should work, even if get DatabasePlatform blows up
         $metadata = $cmf->getAllMetadata();
         // this will just be an empty array - there was no error
-        $this->assertEquals(array(), $metadata);
+        $this->assertEquals([], $metadata);
     }
 
     protected function _createEntityManager($metadataDriver, $conn = null)
@@ -230,7 +231,7 @@ class ClassMetadataFactoryTest extends OrmTestCase
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
         $eventManager = new EventManager();
         if (!$conn) {
-            $conn = new ConnectionMock(array(), $driverMock, $config, $eventManager);
+            $conn = new ConnectionMock([], $driverMock, $config, $eventManager);
         }
         $config->setMetadataDriverImpl($metadataDriver);
 
@@ -258,18 +259,20 @@ class ClassMetadataFactoryTest extends OrmTestCase
         // Self-made metadata
         $cm1 = new ClassMetadata('Doctrine\Tests\ORM\Mapping\TestEntity1');
         $cm1->initializeReflection(new RuntimeReflectionService());
-        $cm1->setPrimaryTable(array('name' => '`group`'));
+        $cm1->setPrimaryTable(['name' => '`group`']);
         // Add a mapped field
-        $cm1->mapField(array('fieldName' => 'name', 'type' => 'string'));
+        $cm1->mapField(['fieldName' => 'name', 'type' => 'string']);
         // Add a mapped field
-        $cm1->mapField(array('fieldName' => 'id', 'type' => 'integer', 'id' => true));
+        $cm1->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]);
         // and a mapped association
-        $cm1->mapOneToOne(array('fieldName' => 'other', 'targetEntity' => 'TestEntity1', 'mappedBy' => 'this'));
+        $cm1->mapOneToOne(['fieldName' => 'other', 'targetEntity' => 'TestEntity1', 'mappedBy' => 'this']);
         // and an association on the owning side
-        $joinColumns = array(
-            array('name' => 'other_id', 'referencedColumnName' => 'id')
+        $joinColumns = [
+            ['name' => 'other_id', 'referencedColumnName' => 'id']
+        ];
+        $cm1->mapOneToOne(
+            ['fieldName' => 'association', 'targetEntity' => 'TestEntity1', 'joinColumns' => $joinColumns]
         );
-        $cm1->mapOneToOne(array('fieldName' => 'association', 'targetEntity' => 'TestEntity1', 'joinColumns' => $joinColumns));
         // and an id generator type
         $cm1->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_AUTO);
         return $cm1;
@@ -281,7 +284,7 @@ class ClassMetadataFactoryTest extends OrmTestCase
     public function testQuoteMetadata()
     {
         $cmf    = new ClassMetadataFactory();
-        $driver = $this->createAnnotationDriver(array(__DIR__ . '/../../Models/Quote/'));
+        $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/Quote/']);
         $em     = $this->_createEntityManager($driver);
         $cmf->setEntityManager($em);
 
@@ -368,7 +371,7 @@ class ClassMetadataFactoryTest extends OrmTestCase
         $cmf           = new ClassMetadataFactory();
         $mockDriver    = new MetadataDriverMock();
         $em = $this->_createEntityManager($mockDriver);
-        $listener      = $this->getMockBuilder(\stdClass::class)->setMethods(array('onClassMetadataNotFound'))->getMock();
+        $listener      = $this->getMockBuilder(\stdClass::class)->setMethods(['onClassMetadataNotFound'])->getMock();
         $eventManager  = $em->getEventManager();
 
         $cmf->setEntityManager($em);
@@ -384,7 +387,7 @@ class ClassMetadataFactoryTest extends OrmTestCase
                 $args->setFoundMetadata($metadata);
             }));
 
-        $eventManager->addEventListener(array(Events::onClassMetadataNotFound), $listener);
+        $eventManager->addEventListener([Events::onClassMetadataNotFound], $listener);
 
         $this->assertSame($metadata, $cmf->getMetadataFor('Foo'));
     }
@@ -412,11 +415,13 @@ class ClassMetadataFactoryTest extends OrmTestCase
     {
         $metadata = $this->_createValidClassMetadata();
 
-        $metadata->mapEmbedded(array(
+        $metadata->mapEmbedded(
+            [
             'fieldName'    => 'embedded',
             'class'        => '',
             'columnPrefix' => false,
-        ));
+            ]
+        );
 
         $cmf = $this->_createTestFactory();
 
@@ -434,7 +439,7 @@ class ClassMetadataFactoryTest extends OrmTestCase
     public function testInheritsIdGeneratorMappingFromEmbeddable()
     {
         $cmf = new ClassMetadataFactory();
-        $driver = $this->createAnnotationDriver(array(__DIR__ . '/../../Models/DDC4006/'));
+        $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/DDC4006/']);
         $em = $this->_createEntityManager($driver);
         $cmf->setEntityManager($em);
 
@@ -447,8 +452,8 @@ class ClassMetadataFactoryTest extends OrmTestCase
 /* Test subject class with overridden factory method for mocking purposes */
 class ClassMetadataFactoryTestSubject extends ClassMetadataFactory
 {
-    private $mockMetadata = array();
-    private $requestedClasses = array();
+    private $mockMetadata = [];
+    private $requestedClasses = [];
 
     /** @override */
     protected function newClassMetadataInstance($className)
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php
index 04cea3894..424cafb94 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php
@@ -26,11 +26,11 @@ class ClassMetadataLoadEventTest extends OrmTestCase
     public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs)
     {
         $classMetadata = $eventArgs->getClassMetadata();
-        $field = array(
+        $field = [
             'fieldName' => 'about',
             'type' => 'string',
             'length' => 255
-        );
+        ];
         $classMetadata->mapField($field);
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
index 44243e113..bfaec8041 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
@@ -26,19 +26,19 @@ class ClassMetadataTest extends OrmTestCase
         $this->assertInstanceOf('ReflectionClass', $cm->reflClass);
         $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $cm->name);
         $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $cm->rootEntityName);
-        $this->assertEquals(array(), $cm->subClasses);
-        $this->assertEquals(array(), $cm->parentClasses);
+        $this->assertEquals([], $cm->subClasses);
+        $this->assertEquals([], $cm->parentClasses);
         $this->assertEquals(ClassMetadata::INHERITANCE_TYPE_NONE, $cm->inheritanceType);
 
         // Customize state
         $cm->setInheritanceType(ClassMetadata::INHERITANCE_TYPE_SINGLE_TABLE);
-        $cm->setSubclasses(array("One", "Two", "Three"));
-        $cm->setParentClasses(array("UserParent"));
+        $cm->setSubclasses(["One", "Two", "Three"]);
+        $cm->setParentClasses(["UserParent"]);
         $cm->setCustomRepositoryClass("UserRepository");
-        $cm->setDiscriminatorColumn(array('name' => 'disc', 'type' => 'integer'));
-        $cm->mapOneToOne(array('fieldName' => 'phonenumbers', 'targetEntity' => 'CmsAddress', 'mappedBy' => 'foo'));
+        $cm->setDiscriminatorColumn(['name' => 'disc', 'type' => 'integer']);
+        $cm->mapOneToOne(['fieldName' => 'phonenumbers', 'targetEntity' => 'CmsAddress', 'mappedBy' => 'foo']);
         $cm->markReadOnly();
-        $cm->addNamedQuery(array('name' => 'dql', 'query' => 'foo'));
+        $cm->addNamedQuery(['name' => 'dql', 'query' => 'foo']);
         $this->assertEquals(1, count($cm->associationMappings));
 
         $serialized = serialize($cm);
@@ -51,10 +51,11 @@ class ClassMetadataTest extends OrmTestCase
         $this->assertInstanceOf('ReflectionClass', $cm->reflClass);
         $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $cm->name);
         $this->assertEquals('UserParent', $cm->rootEntityName);
-        $this->assertEquals(array('Doctrine\Tests\Models\CMS\One', 'Doctrine\Tests\Models\CMS\Two', 'Doctrine\Tests\Models\CMS\Three'), $cm->subClasses);
-        $this->assertEquals(array('UserParent'), $cm->parentClasses);
+        $this->assertEquals(
+            ['Doctrine\Tests\Models\CMS\One', 'Doctrine\Tests\Models\CMS\Two', 'Doctrine\Tests\Models\CMS\Three'], $cm->subClasses);
+        $this->assertEquals(['UserParent'], $cm->parentClasses);
         $this->assertEquals('Doctrine\Tests\Models\CMS\UserRepository', $cm->customRepositoryClassName);
-        $this->assertEquals(array('name' => 'disc', 'type' => 'integer', 'fieldName' => 'disc'), $cm->discriminatorColumn);
+        $this->assertEquals(['name' => 'disc', 'type' => 'integer', 'fieldName' => 'disc'], $cm->discriminatorColumn);
         $this->assertTrue($cm->associationMappings['phonenumbers']['type'] == ClassMetadata::ONE_TO_ONE);
         $this->assertEquals(1, count($cm->associationMappings));
         $oneOneMapping = $cm->getAssociationMapping('phonenumbers');
@@ -62,7 +63,7 @@ class ClassMetadataTest extends OrmTestCase
         $this->assertEquals('phonenumbers', $oneOneMapping['fieldName']);
         $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddress', $oneOneMapping['targetEntity']);
         $this->assertTrue($cm->isReadOnly);
-        $this->assertEquals(array('dql' => array('name'=>'dql','query'=>'foo','dql'=>'foo')), $cm->namedQueries);
+        $this->assertEquals(['dql' => ['name'=>'dql','query'=>'foo','dql'=>'foo']], $cm->namedQueries);
     }
 
     public function testFieldIsNullable()
@@ -71,15 +72,15 @@ class ClassMetadataTest extends OrmTestCase
         $cm->initializeReflection(new RuntimeReflectionService());
 
         // Explicit Nullable
-        $cm->mapField(array('fieldName' => 'status', 'nullable' => true, 'type' => 'string', 'length' => 50));
+        $cm->mapField(['fieldName' => 'status', 'nullable' => true, 'type' => 'string', 'length' => 50]);
         $this->assertTrue($cm->isNullable('status'));
 
         // Explicit Not Nullable
-        $cm->mapField(array('fieldName' => 'username', 'nullable' => false, 'type' => 'string', 'length' => 50));
+        $cm->mapField(['fieldName' => 'username', 'nullable' => false, 'type' => 'string', 'length' => 50]);
         $this->assertFalse($cm->isNullable('username'));
 
         // Implicit Not Nullable
-        $cm->mapField(array('fieldName' => 'name', 'type' => 'string', 'length' => 50));
+        $cm->mapField(['fieldName' => 'name', 'type' => 'string', 'length' => 50]);
         $this->assertFalse($cm->isNullable('name'), "By default a field should not be nullable.");
     }
 
@@ -92,15 +93,17 @@ class ClassMetadataTest extends OrmTestCase
 
         $cm = new ClassMetadata('DoctrineGlobal_Article');
         $cm->initializeReflection(new RuntimeReflectionService());
-        $cm->mapManyToMany(array(
+        $cm->mapManyToMany(
+            [
             'fieldName' => 'author',
             'targetEntity' => 'DoctrineGlobal_User',
-            'joinTable' => array(
+            'joinTable' => [
                 'name' => 'bar',
-                'joinColumns' => array(array('name' => 'bar_id', 'referencedColumnName' => 'id')),
-                'inverseJoinColumns' => array(array('name' => 'baz_id', 'referencedColumnName' => 'id')),
-            ),
-        ));
+                'joinColumns' => [['name' => 'bar_id', 'referencedColumnName' => 'id']],
+                'inverseJoinColumns' => [['name' => 'baz_id', 'referencedColumnName' => 'id']],
+            ],
+            ]
+        );
 
         $this->assertEquals("DoctrineGlobal_User", $cm->associationMappings['author']['targetEntity']);
     }
@@ -110,18 +113,20 @@ class ClassMetadataTest extends OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
         $cm->mapManyToMany(
-            array(
+            [
             'fieldName' => 'groups',
             'targetEntity' => 'CmsGroup'
-        ));
+            ]
+        );
 
         $assoc = $cm->associationMappings['groups'];
         //$this->assertInstanceOf('Doctrine\ORM\Mapping\ManyToManyMapping', $assoc);
-        $this->assertEquals(array(
+        $this->assertEquals(
+            [
             'name' => 'cmsuser_cmsgroup',
-            'joinColumns' => array(array('name' => 'cmsuser_id', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE')),
-            'inverseJoinColumns' => array(array('name' => 'cmsgroup_id', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE'))
-        ), $assoc['joinTable']);
+            'joinColumns' => [['name' => 'cmsuser_id', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE']],
+            'inverseJoinColumns' => [['name' => 'cmsgroup_id', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE']]
+            ], $assoc['joinTable']);
         $this->assertTrue($assoc['isOnDeleteCascade']);
     }
 
@@ -130,10 +135,11 @@ class ClassMetadataTest extends OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
         $cm->mapManyToMany(
-            array(
+            [
             'fieldName' => 'groups',
             'targetEntity' => 'CmsGroup'
-        ));
+            ]
+        );
 
         /* @var $assoc \Doctrine\ORM\Mapping\ManyToManyMapping */
         $assoc = $cm->associationMappings['groups'];
@@ -151,7 +157,7 @@ class ClassMetadataTest extends OrmTestCase
 
         $cm = new ClassMetadata('DoctrineGlobal_User');
         $cm->initializeReflection(new RuntimeReflectionService());
-        $cm->setDiscriminatorMap(array('descr' => 'DoctrineGlobal_Article', 'foo' => 'DoctrineGlobal_User'));
+        $cm->setDiscriminatorMap(['descr' => 'DoctrineGlobal_Article', 'foo' => 'DoctrineGlobal_User']);
 
         $this->assertEquals("DoctrineGlobal_Article", $cm->discriminatorMap['descr']);
         $this->assertEquals("DoctrineGlobal_User", $cm->discriminatorMap['foo']);
@@ -166,7 +172,7 @@ class ClassMetadataTest extends OrmTestCase
 
         $cm = new ClassMetadata('DoctrineGlobal_User');
         $cm->initializeReflection(new RuntimeReflectionService());
-        $cm->setSubclasses(array('DoctrineGlobal_Article'));
+        $cm->setSubclasses(['DoctrineGlobal_Article']);
 
         $this->assertEquals("DoctrineGlobal_Article", $cm->subClasses[0]);
     }
@@ -176,7 +182,7 @@ class ClassMetadataTest extends OrmTestCase
      */
     public function testSetInvalidVersionMapping_ThrowsException()
     {
-        $field = array();
+        $field = [];
         $field['fieldName'] = 'foo';
         $field['type'] = 'string';
 
@@ -202,8 +208,8 @@ class ClassMetadataTest extends OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
 
-        $a1 = array('fieldName' => 'foo', 'sourceEntity' => 'stdClass', 'targetEntity' => 'stdClass', 'mappedBy' => 'foo');
-        $a2 = array('fieldName' => 'foo', 'sourceEntity' => 'stdClass', 'targetEntity' => 'stdClass', 'mappedBy' => 'foo');
+        $a1 = ['fieldName' => 'foo', 'sourceEntity' => 'stdClass', 'targetEntity' => 'stdClass', 'mappedBy' => 'foo'];
+        $a2 = ['fieldName' => 'foo', 'sourceEntity' => 'stdClass', 'targetEntity' => 'stdClass', 'mappedBy' => 'foo'];
 
         $cm->addInheritedAssociationMapping($a1);
         $this->expectException(\Doctrine\ORM\Mapping\MappingException::class);
@@ -215,10 +221,10 @@ class ClassMetadataTest extends OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
 
-        $cm->mapField(array('fieldName' => 'name', 'columnName' => 'name'));
+        $cm->mapField(['fieldName' => 'name', 'columnName' => 'name']);
 
         $this->expectException(\Doctrine\ORM\Mapping\MappingException::class);
-        $cm->mapField(array('fieldName' => 'username', 'columnName' => 'name'));
+        $cm->mapField(['fieldName' => 'username', 'columnName' => 'name']);
     }
 
     public function testDuplicateColumnName_DiscriminatorColumn_ThrowsMappingException()
@@ -226,10 +232,10 @@ class ClassMetadataTest extends OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
 
-        $cm->mapField(array('fieldName' => 'name', 'columnName' => 'name'));
+        $cm->mapField(['fieldName' => 'name', 'columnName' => 'name']);
 
         $this->expectException(\Doctrine\ORM\Mapping\MappingException::class);
-        $cm->setDiscriminatorColumn(array('name' => 'name'));
+        $cm->setDiscriminatorColumn(['name' => 'name']);
     }
 
     public function testDuplicateColumnName_DiscriminatorColumn2_ThrowsMappingException()
@@ -237,10 +243,10 @@ class ClassMetadataTest extends OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
 
-        $cm->setDiscriminatorColumn(array('name' => 'name'));
+        $cm->setDiscriminatorColumn(['name' => 'name']);
 
         $this->expectException(\Doctrine\ORM\Mapping\MappingException::class);
-        $cm->mapField(array('fieldName' => 'name', 'columnName' => 'name'));
+        $cm->mapField(['fieldName' => 'name', 'columnName' => 'name']);
     }
 
     public function testDuplicateFieldAndAssociationMapping1_ThrowsException()
@@ -248,10 +254,10 @@ class ClassMetadataTest extends OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
 
-        $cm->mapField(array('fieldName' => 'name', 'columnName' => 'name'));
+        $cm->mapField(['fieldName' => 'name', 'columnName' => 'name']);
 
         $this->expectException(\Doctrine\ORM\Mapping\MappingException::class);
-        $cm->mapOneToOne(array('fieldName' => 'name', 'targetEntity' => 'CmsUser'));
+        $cm->mapOneToOne(['fieldName' => 'name', 'targetEntity' => 'CmsUser']);
     }
 
     public function testDuplicateFieldAndAssociationMapping2_ThrowsException()
@@ -259,10 +265,10 @@ class ClassMetadataTest extends OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
 
-        $cm->mapOneToOne(array('fieldName' => 'name', 'targetEntity' => 'CmsUser'));
+        $cm->mapOneToOne(['fieldName' => 'name', 'targetEntity' => 'CmsUser']);
 
         $this->expectException(\Doctrine\ORM\Mapping\MappingException::class);
-        $cm->mapField(array('fieldName' => 'name', 'columnName' => 'name'));
+        $cm->mapField(['fieldName' => 'name', 'columnName' => 'name']);
     }
 
     /**
@@ -284,7 +290,7 @@ class ClassMetadataTest extends OrmTestCase
         $cm->initializeReflection(new RuntimeReflectionService());
 
         // When table's name is not given
-        $primaryTable = array();
+        $primaryTable = [];
         $cm->setPrimaryTable($primaryTable);
 
         $this->assertEquals('CmsUser', $cm->getTableName());
@@ -293,12 +299,17 @@ class ClassMetadataTest extends OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress');
         $cm->initializeReflection(new RuntimeReflectionService());
         // When joinTable's name is not given
-        $cm->mapManyToMany(array(
+        $cm->mapManyToMany(
+            [
             'fieldName' => 'user',
             'targetEntity' => 'CmsUser',
             'inversedBy' => 'users',
-            'joinTable' => array('joinColumns' => array(array('referencedColumnName' => 'id')),
-                                 'inverseJoinColumns' => array(array('referencedColumnName' => 'id')))));
+            'joinTable' => [
+                'joinColumns' => [['referencedColumnName' => 'id']],
+                                 'inverseJoinColumns' => [['referencedColumnName' => 'id']]
+            ]
+            ]
+        );
         $this->assertEquals('cmsaddress_cmsuser', $cm->associationMappings['user']['joinTable']['name']);
     }
 
@@ -309,21 +320,29 @@ class ClassMetadataTest extends OrmTestCase
 
         // this is really dirty, but it's the simplest way to test whether
         // joinColumn's name will be automatically set to user_id
-        $cm->mapOneToOne(array(
+        $cm->mapOneToOne(
+            [
             'fieldName' => 'user',
             'targetEntity' => 'CmsUser',
-            'joinColumns' => array(array('referencedColumnName' => 'id'))));
+            'joinColumns' => [['referencedColumnName' => 'id']]
+            ]
+        );
         $this->assertEquals('user_id', $cm->associationMappings['user']['joinColumns'][0]['name']);
 
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress');
         $cm->initializeReflection(new RuntimeReflectionService());
-        $cm->mapManyToMany(array(
+        $cm->mapManyToMany(
+            [
             'fieldName' => 'user',
             'targetEntity' => 'CmsUser',
             'inversedBy' => 'users',
-            'joinTable' => array('name' => 'user_CmsUser',
-                                'joinColumns' => array(array('referencedColumnName' => 'id')),
-                                'inverseJoinColumns' => array(array('referencedColumnName' => 'id')))));
+            'joinTable' => [
+                'name' => 'user_CmsUser',
+                                'joinColumns' => [['referencedColumnName' => 'id']],
+                                'inverseJoinColumns' => [['referencedColumnName' => 'id']]
+            ]
+            ]
+        );
         $this->assertEquals('cmsaddress_id', $cm->associationMappings['user']['joinTable']['joinColumns'][0]['name']);
         $this->assertEquals('cmsuser_id', $cm->associationMappings['user']['joinTable']['inverseJoinColumns'][0]['name']);
     }
@@ -337,19 +356,23 @@ class ClassMetadataTest extends OrmTestCase
         $oneToOneMetadata   = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy);
         $manyToManyMetadata = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy);
 
-        $oneToOneMetadata->mapOneToOne(array(
+        $oneToOneMetadata->mapOneToOne(
+            [
             'fieldName'     => 'user',
             'targetEntity'  => 'CmsUser'
-        ));
+            ]
+        );
 
-        $manyToManyMetadata->mapManyToMany(array(
+        $manyToManyMetadata->mapManyToMany(
+            [
             'fieldName'     => 'user',
             'targetEntity'  => 'CmsUser'
-        ));
+            ]
+        );
 
-        $this->assertEquals(array('USER_ID'=>'ID'), $oneToOneMetadata->associationMappings['user']['sourceToTargetKeyColumns']);
-        $this->assertEquals(array('USER_ID'=>'USER_ID'), $oneToOneMetadata->associationMappings['user']['joinColumnFieldNames']);
-        $this->assertEquals(array('ID'=>'USER_ID'), $oneToOneMetadata->associationMappings['user']['targetToSourceKeyColumns']);
+        $this->assertEquals(['USER_ID'=>'ID'], $oneToOneMetadata->associationMappings['user']['sourceToTargetKeyColumns']);
+        $this->assertEquals(['USER_ID'=>'USER_ID'], $oneToOneMetadata->associationMappings['user']['joinColumnFieldNames']);
+        $this->assertEquals(['ID'=>'USER_ID'], $oneToOneMetadata->associationMappings['user']['targetToSourceKeyColumns']);
 
         $this->assertEquals('USER_ID', $oneToOneMetadata->associationMappings['user']['joinColumns'][0]['name']);
         $this->assertEquals('ID', $oneToOneMetadata->associationMappings['user']['joinColumns'][0]['referencedColumnName']);
@@ -357,9 +380,9 @@ class ClassMetadataTest extends OrmTestCase
 
         $this->assertEquals('CMS_ADDRESS_CMS_USER', $manyToManyMetadata->associationMappings['user']['joinTable']['name']);
 
-        $this->assertEquals(array('CMS_ADDRESS_ID','CMS_USER_ID'), $manyToManyMetadata->associationMappings['user']['joinTableColumns']);
-        $this->assertEquals(array('CMS_ADDRESS_ID'=>'ID'), $manyToManyMetadata->associationMappings['user']['relationToSourceKeyColumns']);
-        $this->assertEquals(array('CMS_USER_ID'=>'ID'), $manyToManyMetadata->associationMappings['user']['relationToTargetKeyColumns']);
+        $this->assertEquals(['CMS_ADDRESS_ID','CMS_USER_ID'], $manyToManyMetadata->associationMappings['user']['joinTableColumns']);
+        $this->assertEquals(['CMS_ADDRESS_ID'=>'ID'], $manyToManyMetadata->associationMappings['user']['relationToSourceKeyColumns']);
+        $this->assertEquals(['CMS_USER_ID'=>'ID'], $manyToManyMetadata->associationMappings['user']['relationToTargetKeyColumns']);
 
         $this->assertEquals('CMS_ADDRESS_ID', $manyToManyMetadata->associationMappings['user']['joinTable']['joinColumns'][0]['name']);
         $this->assertEquals('CMS_USER_ID', $manyToManyMetadata->associationMappings['user']['joinTable']['inverseJoinColumns'][0]['name']);
@@ -369,7 +392,7 @@ class ClassMetadataTest extends OrmTestCase
 
 
         $cm = new ClassMetadata('DoctrineGlobal_Article', $namingStrategy);
-        $cm->mapManyToMany(array('fieldName' => 'author', 'targetEntity' => 'Doctrine\Tests\Models\CMS\CmsUser'));
+        $cm->mapManyToMany(['fieldName' => 'author', 'targetEntity' => 'Doctrine\Tests\Models\CMS\CmsUser']);
         $this->assertEquals('DOCTRINE_GLOBAL_ARTICLE_CMS_USER', $cm->associationMappings['author']['joinTable']['name']);
     }
 
@@ -381,10 +404,10 @@ class ClassMetadataTest extends OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
 
-        $cm->mapField(array('fieldName' => 'name'));
-        $cm->mapField(array('fieldName' => 'username'));
+        $cm->mapField(['fieldName' => 'name']);
+        $cm->mapField(['fieldName' => 'username']);
 
-        $cm->setIdentifier(array('name', 'username'));
+        $cm->setIdentifier(['name', 'username']);
         $this->assertTrue($cm->isIdentifierComposite);
     }
 
@@ -410,7 +433,7 @@ class ClassMetadataTest extends OrmTestCase
         $cm = new ClassMetadata('DoctrineGlobal_Article');
         $cm->initializeReflection(new RuntimeReflectionService());
 
-        $cm->mapManyToMany(array('fieldName' => 'author', 'targetEntity' => 'Doctrine\Tests\Models\CMS\CmsUser'));
+        $cm->mapManyToMany(['fieldName' => 'author', 'targetEntity' => 'Doctrine\Tests\Models\CMS\CmsUser']);
 
         $this->assertEquals('doctrineglobal_article_cmsuser', $cm->associationMappings['author']['joinTable']['name']);
     }
@@ -423,15 +446,17 @@ class ClassMetadataTest extends OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails');
         $cm->initializeReflection(new RuntimeReflectionService());
 
-        $cm->mapOneToOne(array(
+        $cm->mapOneToOne(
+            [
             'fieldName' => 'article',
             'id' => true,
             'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article',
-            'joinColumns' => array(),
-        ));
+            'joinColumns' => [],
+            ]
+        );
 
         $this->assertTrue($cm->containsForeignIdentifier, "Identifier Association should set 'containsForeignIdentifier' boolean flag.");
-        $this->assertEquals(array("article"), $cm->identifier);
+        $this->assertEquals(["article"], $cm->identifier);
     }
 
     /**
@@ -445,13 +470,15 @@ class ClassMetadataTest extends OrmTestCase
         $this->expectException(MappingException::class);
         $this->expectExceptionMessage('The orphan removal option is not allowed on an association that');
 
-        $cm->mapOneToOne(array(
+        $cm->mapOneToOne(
+            [
             'fieldName' => 'article',
             'id' => true,
             'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article',
             'orphanRemoval' => true,
-            'joinColumns' => array(),
-        ));
+            'joinColumns' => [],
+            ]
+        );
     }
 
     /**
@@ -465,13 +492,15 @@ class ClassMetadataTest extends OrmTestCase
         $this->expectException(MappingException::class);
         $this->expectExceptionMessage('An inverse association is not allowed to be identifier in');
 
-        $cm->mapOneToOne(array(
+        $cm->mapOneToOne(
+            [
             'fieldName' => 'article',
             'id' => true,
             'mappedBy' => 'details', // INVERSE!
             'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article',
-            'joinColumns' => array(),
-        ));
+            'joinColumns' => [],
+            ]
+        );
     }
 
     /**
@@ -485,12 +514,14 @@ class ClassMetadataTest extends OrmTestCase
         $this->expectException(MappingException::class);
         $this->expectExceptionMessage('Many-to-many or one-to-many associations are not allowed to be identifier in');
 
-        $cm->mapManyToMany(array(
+        $cm->mapManyToMany(
+            [
             'fieldName' => 'article',
             'id' => true,
             'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article',
-            'joinColumns' => array(),
-        ));
+            'joinColumns' => [],
+            ]
+        );
     }
 
     /**
@@ -504,7 +535,7 @@ class ClassMetadataTest extends OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
 
-        $cm->mapField(array('fieldName' => ''));
+        $cm->mapField(['fieldName' => '']);
     }
 
     public function testRetrievalOfNamedQueries()
@@ -515,10 +546,12 @@ class ClassMetadataTest extends OrmTestCase
 
         $this->assertEquals(0, count($cm->getNamedQueries()));
 
-        $cm->addNamedQuery(array(
+        $cm->addNamedQuery(
+            [
             'name'  => 'userById',
             'query' => 'SELECT u FROM __CLASS__ u WHERE u.id = ?1'
-        ));
+            ]
+        );
 
         $this->assertEquals(1, count($cm->getNamedQueries()));
     }
@@ -534,14 +567,16 @@ class ClassMetadataTest extends OrmTestCase
 
         $this->assertEquals(0, count($cm->getSqlResultSetMappings()));
 
-        $cm->addSqlResultSetMapping(array(
+        $cm->addSqlResultSetMapping(
+            [
             'name'      => 'find-all',
-            'entities'  => array(
-                array(
+            'entities'  => [
+                [
                     'entityClass'   => 'Doctrine\Tests\Models\CMS\CmsUser',
-                ),
-            ),
-        ));
+                ],
+            ],
+            ]
+        );
 
         $this->assertEquals(1, count($cm->getSqlResultSetMappings()));
     }
@@ -552,10 +587,12 @@ class ClassMetadataTest extends OrmTestCase
         $cm->initializeReflection(new RuntimeReflectionService());
 
 
-        $cm->addNamedQuery(array(
+        $cm->addNamedQuery(
+            [
             'name'  => 'all',
             'query' => 'SELECT u FROM __CLASS__ u'
-        ));
+            ]
+        );
 
         $this->assertTrue($cm->hasNamedQuery('all'));
         $this->assertFalse($cm->hasNamedQuery('userById'));
@@ -569,19 +606,23 @@ class ClassMetadataTest extends OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
 
-        $cm->addNamedNativeQuery(array(
+        $cm->addNamedNativeQuery(
+            [
             'name'              => 'find-all',
             'query'             => 'SELECT * FROM cms_users',
             'resultSetMapping'  => 'result-mapping-name',
             'resultClass'       => 'Doctrine\Tests\Models\CMS\CmsUser',
-        ));
+            ]
+        );
 
-        $cm->addNamedNativeQuery(array(
+        $cm->addNamedNativeQuery(
+            [
             'name'              => 'find-by-id',
             'query'             => 'SELECT * FROM cms_users WHERE id = ?',
             'resultClass'       => '__CLASS__',
             'resultSetMapping'  => 'result-mapping-name',
-        ));
+            ]
+        );
 
         $mapping = $cm->getNamedNativeQuery('find-all');
         $this->assertEquals('SELECT * FROM cms_users', $mapping['query']);
@@ -602,52 +643,54 @@ class ClassMetadataTest extends OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
 
-        $cm->addSqlResultSetMapping(array(
+        $cm->addSqlResultSetMapping(
+            [
             'name'      => 'find-all',
-            'entities'  => array(
-                array(
+            'entities'  => [
+                [
                     'entityClass'   => '__CLASS__',
-                    'fields'        => array(
-                        array(
+                    'fields'        => [
+                        [
                             'name'  => 'id',
                             'column'=> 'id'
-                        ),
-                        array(
+                        ],
+                        [
                             'name'  => 'name',
                             'column'=> 'name'
-                        )
-                    )
-                ),
-                array(
+                        ]
+                    ]
+                ],
+                [
                     'entityClass'   => 'Doctrine\Tests\Models\CMS\CmsEmail',
-                    'fields'        => array(
-                        array(
+                    'fields'        => [
+                        [
                             'name'  => 'id',
                             'column'=> 'id'
-                        ),
-                        array(
+                        ],
+                        [
                             'name'  => 'email',
                             'column'=> 'email'
-                        )
-                    )
-                )
-            ),
-            'columns'   => array(
-                array(
+                        ]
+                    ]
+                ]
+            ],
+            'columns'   => [
+                [
                     'name' => 'scalarColumn'
-                )
-            )
-        ));
+                ]
+            ]
+            ]
+        );
 
         $mapping = $cm->getSqlResultSetMapping('find-all');
 
         $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $mapping['entities'][0]['entityClass']);
-        $this->assertEquals(array('name'=>'id','column'=>'id'), $mapping['entities'][0]['fields'][0]);
-        $this->assertEquals(array('name'=>'name','column'=>'name'), $mapping['entities'][0]['fields'][1]);
+        $this->assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        $this->assertEquals(['name'=>'name','column'=>'name'], $mapping['entities'][0]['fields'][1]);
 
         $this->assertEquals('Doctrine\Tests\Models\CMS\CmsEmail', $mapping['entities'][1]['entityClass']);
-        $this->assertEquals(array('name'=>'id','column'=>'id'), $mapping['entities'][1]['fields'][0]);
-        $this->assertEquals(array('name'=>'email','column'=>'email'), $mapping['entities'][1]['fields'][1]);
+        $this->assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][1]['fields'][0]);
+        $this->assertEquals(['name'=>'email','column'=>'email'], $mapping['entities'][1]['fields'][1]);
 
         $this->assertEquals('scalarColumn', $mapping['columns'][0]['name']);
     }
@@ -660,14 +703,16 @@ class ClassMetadataTest extends OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
 
-        $cm->addSqlResultSetMapping(array(
+        $cm->addSqlResultSetMapping(
+            [
             'name'      => 'find-all',
-            'entities'  => array(
-                array(
+            'entities'  => [
+                [
                     'entityClass'   => 'Doctrine\Tests\Models\CMS\CmsUser',
-                ),
-            ),
-        ));
+                ],
+            ],
+            ]
+        );
 
         $this->assertTrue($cm->hasSqlResultSetMapping('find-all'));
         $this->assertFalse($cm->hasSqlResultSetMapping('find-by-id'));
@@ -682,12 +727,14 @@ class ClassMetadataTest extends OrmTestCase
         $cm->initializeReflection(new RuntimeReflectionService());
 
 
-        $cm->addNamedNativeQuery(array(
+        $cm->addNamedNativeQuery(
+            [
             'name'              => 'find-all',
             'query'             => 'SELECT * FROM cms_users',
             'resultClass'       => 'Doctrine\Tests\Models\CMS\CmsUser',
             'resultSetMapping'  => 'result-mapping-name'
-        ));
+            ]
+        );
 
         $this->assertTrue($cm->hasNamedNativeQuery('find-all'));
         $this->assertFalse($cm->hasNamedNativeQuery('find-by-id'));
@@ -699,10 +746,12 @@ class ClassMetadataTest extends OrmTestCase
         $cm->initializeReflection(new RuntimeReflectionService());
 
 
-        $cm->addNamedQuery(array(
+        $cm->addNamedQuery(
+            [
             'name'  => 'userById',
             'query' => 'SELECT u FROM __CLASS__ u WHERE u.id = ?1'
-        ));
+            ]
+        );
 
         $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = ?1', $cm->getNamedQuery('userById'));
     }
@@ -717,12 +766,14 @@ class ClassMetadataTest extends OrmTestCase
 
         $this->assertEquals(0, count($cm->getNamedNativeQueries()));
 
-        $cm->addNamedNativeQuery(array(
+        $cm->addNamedNativeQuery(
+            [
             'name'              => 'find-all',
             'query'             => 'SELECT * FROM cms_users',
             'resultClass'       => 'Doctrine\Tests\Models\CMS\CmsUser',
             'resultSetMapping'  => 'result-mapping-name'
-        ));
+            ]
+        );
 
         $this->assertEquals(1, count($cm->getNamedNativeQueries()));
     }
@@ -753,15 +804,19 @@ class ClassMetadataTest extends OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
 
-        $cm->addNamedQuery(array(
+        $cm->addNamedQuery(
+            [
             'name'  => 'userById',
             'query' => 'SELECT u FROM __CLASS__ u WHERE u.id = ?1'
-        ));
+            ]
+        );
 
-        $cm->addNamedQuery(array(
+        $cm->addNamedQuery(
+            [
             'name'  => 'userById',
             'query' => 'SELECT u FROM __CLASS__ u WHERE u.id = ?1'
-        ));
+            ]
+        );
     }
 
     /**
@@ -775,19 +830,23 @@ class ClassMetadataTest extends OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
 
-        $cm->addNamedNativeQuery(array(
+        $cm->addNamedNativeQuery(
+            [
             'name'              => 'find-all',
             'query'             => 'SELECT * FROM cms_users',
             'resultClass'       => 'Doctrine\Tests\Models\CMS\CmsUser',
             'resultSetMapping'  => 'result-mapping-name'
-        ));
+            ]
+        );
 
-        $cm->addNamedNativeQuery(array(
+        $cm->addNamedNativeQuery(
+            [
             'name'              => 'find-all',
             'query'             => 'SELECT * FROM cms_users',
             'resultClass'       => 'Doctrine\Tests\Models\CMS\CmsUser',
             'resultSetMapping'  => 'result-mapping-name'
-        ));
+            ]
+        );
     }
 
     /**
@@ -801,23 +860,27 @@ class ClassMetadataTest extends OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
 
-        $cm->addSqlResultSetMapping(array(
+        $cm->addSqlResultSetMapping(
+            [
             'name'      => 'find-all',
-            'entities'  => array(
-                array(
+            'entities'  => [
+                [
                     'entityClass'   => 'Doctrine\Tests\Models\CMS\CmsUser',
-                ),
-            ),
-        ));
+                ],
+            ],
+            ]
+        );
 
-        $cm->addSqlResultSetMapping(array(
+        $cm->addSqlResultSetMapping(
+            [
             'name'      => 'find-all',
-            'entities'  => array(
-                array(
+            'entities'  => [
+                [
                     'entityClass'   => 'Doctrine\Tests\Models\CMS\CmsUser',
-                ),
-            ),
-        ));
+                ],
+            ],
+            ]
+        );
     }
 
     /**
@@ -854,7 +917,7 @@ class ClassMetadataTest extends OrmTestCase
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
-        $cm->mapManyToOne(array('fieldName' => 'address', 'targetEntity' => 'UnknownClass'));
+        $cm->mapManyToOne(['fieldName' => 'address', 'targetEntity' => 'UnknownClass']);
 
         $this->expectException(MappingException::class);
         $this->expectExceptionMessage("The target-entity Doctrine\Tests\Models\CMS\UnknownClass cannot be found in 'Doctrine\Tests\Models\CMS\CmsUser#address'.");
@@ -872,9 +935,11 @@ class ClassMetadataTest extends OrmTestCase
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
-        $cm->addNamedQuery(array(
+        $cm->addNamedQuery(
+            [
             'query' => 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u',
-        ));
+            ]
+        );
     }
 
     /**
@@ -887,11 +952,13 @@ class ClassMetadataTest extends OrmTestCase
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
-        $cm->addNamedQuery(array(
+        $cm->addNamedQuery(
+            [
             'query'             => 'SELECT * FROM cms_users',
             'resultClass'       => 'Doctrine\Tests\Models\CMS\CmsUser',
             'resultSetMapping'  => 'result-mapping-name'
-        ));
+            ]
+        );
     }
 
     /**
@@ -904,14 +971,16 @@ class ClassMetadataTest extends OrmTestCase
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
-        $cm->addSqlResultSetMapping(array(
+        $cm->addSqlResultSetMapping(
+            [
             'name'      => 'find-all',
-            'entities'  => array(
-                array(
-                    'fields' => array()
-                )
-            ),
-        ));
+            'entities'  => [
+                [
+                    'fields' => []
+                ]
+            ],
+            ]
+        );
     }
 
     /**
@@ -922,7 +991,7 @@ class ClassMetadataTest extends OrmTestCase
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
-        $cm->setDiscriminatorColumn(array());
+        $cm->setDiscriminatorColumn([]);
     }
 
     /**
@@ -941,15 +1010,19 @@ class ClassMetadataTest extends OrmTestCase
         $articleMetadata->initializeReflection(new RuntimeReflectionService());
         $routingMetadata->initializeReflection(new RuntimeReflectionService());
 
-        $addressMetadata->mapManyToMany(array(
+        $addressMetadata->mapManyToMany(
+            [
             'fieldName'     => 'user',
             'targetEntity'  => 'CmsUser'
-        ));
+            ]
+        );
 
-        $articleMetadata->mapManyToMany(array(
+        $articleMetadata->mapManyToMany(
+            [
             'fieldName'     => 'author',
             'targetEntity'  => 'Doctrine\Tests\Models\CMS\CmsUser'
-        ));
+            ]
+        );
 
         $this->assertEquals('routing_routingleg', $routingMetadata->table['name']);
         $this->assertEquals('cms_cmsaddress_cms_cmsuser', $addressMetadata->associationMappings['user']['joinTable']['name']);
@@ -967,13 +1040,14 @@ class ClassMetadataTest extends OrmTestCase
 
         $metadata->initializeReflection(new RuntimeReflectionService());
 
-        $metadata->mapField(array('fieldName'=>'country'));
-        $metadata->mapField(array('fieldName'=>'city'));
+        $metadata->mapField(['fieldName'=>'country']);
+        $metadata->mapField(['fieldName'=>'city']);
 
-        $this->assertEquals($metadata->fieldNames, array(
+        $this->assertEquals($metadata->fieldNames, [
             'cmsaddress_country'   => 'country',
             'cmsaddress_city'      => 'city'
-        ));
+        ]
+        );
     }
 
     /**
@@ -987,7 +1061,7 @@ class ClassMetadataTest extends OrmTestCase
         $this->expectException(MappingException::class);
         $this->expectExceptionMessage("You have specified invalid cascade options for Doctrine\Tests\Models\CMS\CmsUser::\$address: 'invalid'; available options: 'remove', 'persist', 'refresh', 'merge', and 'detach'");
 
-        $cm->mapManyToOne(array('fieldName' => 'address', 'targetEntity' => 'UnknownClass', 'cascade' => array('invalid')));
+        $cm->mapManyToOne(['fieldName' => 'address', 'targetEntity' => 'UnknownClass', 'cascade' => ['invalid']]);
      }
 
     /**
@@ -999,9 +1073,9 @@ class ClassMetadataTest extends OrmTestCase
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\DDC964\DDC964Admin');
         $cm->initializeReflection(new RuntimeReflectionService());
-        $cm->mapManyToOne(array('fieldName' => 'address', 'targetEntity' => 'DDC964Address'));
+        $cm->mapManyToOne(['fieldName' => 'address', 'targetEntity' => 'DDC964Address']);
 
-        $cm->setAssociationOverride('invalidPropertyName', array());
+        $cm->setAssociationOverride('invalidPropertyName', []);
     }
 
     /**
@@ -1013,9 +1087,9 @@ class ClassMetadataTest extends OrmTestCase
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\DDC964\DDC964Guest');
         $cm->initializeReflection(new RuntimeReflectionService());
-        $cm->mapField(array('fieldName' => 'name'));
+        $cm->mapField(['fieldName' => 'name']);
 
-        $cm->setAttributeOverride('invalidPropertyName', array());
+        $cm->setAttributeOverride('invalidPropertyName', []);
     }
 
     /**
@@ -1027,9 +1101,9 @@ class ClassMetadataTest extends OrmTestCase
     {
         $cm = new ClassMetadata('Doctrine\Tests\Models\DDC964\DDC964Guest');
         $cm->initializeReflection(new RuntimeReflectionService());
-        $cm->mapField(array('fieldName' => 'name', 'type'=>'string'));
+        $cm->mapField(['fieldName' => 'name', 'type'=>'string']);
 
-        $cm->setAttributeOverride('name', array('type'=>'date'));
+        $cm->setAttributeOverride('name', ['type'=>'date']);
     }
 
     /**
@@ -1065,23 +1139,23 @@ class ClassMetadataTest extends OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\CustomType\CustomTypeParent');
         $cm->initializeReflection(new RuntimeReflectionService());
         $cm->mapManyToMany(
-            array(
+            [
                 'fieldName' => 'friendsWithMe',
                 'targetEntity' => 'CustomTypeParent'
-            )
+            ]
         );
 
         $this->assertEquals(
-            array(
+            [
                 'name' => 'customtypeparent_customtypeparent',
-                'joinColumns' => array(array('name' => 'customtypeparent_source', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE')),
-                'inverseJoinColumns' => array(array('name' => 'customtypeparent_target', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE')),
-            ),
+                'joinColumns' => [['name' => 'customtypeparent_source', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE']],
+                'inverseJoinColumns' => [['name' => 'customtypeparent_target', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE']],
+            ],
             $cm->associationMappings['friendsWithMe']['joinTable']
         );
-        $this->assertEquals(array('customtypeparent_source', 'customtypeparent_target'), $cm->associationMappings['friendsWithMe']['joinTableColumns']);
-        $this->assertEquals(array('customtypeparent_source' => 'id'), $cm->associationMappings['friendsWithMe']['relationToSourceKeyColumns']);
-        $this->assertEquals(array('customtypeparent_target' => 'id'), $cm->associationMappings['friendsWithMe']['relationToTargetKeyColumns']);
+        $this->assertEquals(['customtypeparent_source', 'customtypeparent_target'], $cm->associationMappings['friendsWithMe']['joinTableColumns']);
+        $this->assertEquals(['customtypeparent_source' => 'id'], $cm->associationMappings['friendsWithMe']['relationToSourceKeyColumns']);
+        $this->assertEquals(['customtypeparent_target' => 'id'], $cm->associationMappings['friendsWithMe']['relationToTargetKeyColumns']);
     }
 
     /**
@@ -1093,7 +1167,7 @@ class ClassMetadataTest extends OrmTestCase
         $cm->initializeReflection(new RuntimeReflectionService());
 
         $this->expectException(\Doctrine\ORM\Mapping\MappingException::class);
-        $cm->setSequenceGeneratorDefinition(array());
+        $cm->setSequenceGeneratorDefinition([]);
     }
 
     /**
@@ -1104,9 +1178,9 @@ class ClassMetadataTest extends OrmTestCase
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
 
-        $cm->setSequenceGeneratorDefinition(array('sequenceName' => '`foo`'));
+        $cm->setSequenceGeneratorDefinition(['sequenceName' => '`foo`']);
 
-        $this->assertEquals(array('sequenceName' => 'foo', 'quoted' => true), $cm->sequenceGeneratorDefinition);
+        $this->assertEquals(['sequenceName' => 'foo', 'quoted' => true], $cm->sequenceGeneratorDefinition);
     }
 
     /**
@@ -1146,24 +1220,26 @@ class ClassMetadataTest extends OrmTestCase
     {
         $classMetadata = new ClassMetadata('Doctrine\Tests\ORM\Mapping\TestEntity1');
 
-        $classMetadata->mapEmbedded(array(
+        $classMetadata->mapEmbedded(
+            [
             'fieldName'    => 'test',
             'class'        => 'Doctrine\Tests\ORM\Mapping\TestEntity1',
             'columnPrefix' => false,
-        ));
+            ]
+        );
 
-        $field = array(
+        $field = [
             'fieldName' => 'test.embeddedProperty',
             'type' => 'string',
             'originalClass' => 'Doctrine\Tests\ORM\Mapping\TestEntity1',
             'declaredField' => 'test',
             'originalField' => 'embeddedProperty'
-        );
+        ];
 
         $classMetadata->mapField($field);
         $classMetadata->wakeupReflection(new StaticReflectionService());
 
-        $this->assertEquals(array('test' => null, 'test.embeddedProperty' => null), $classMetadata->getReflectionProperties());
+        $this->assertEquals(['test' => null, 'test.embeddedProperty' => null], $classMetadata->getReflectionProperties());
     }
 
     public function testGetColumnNamesWithGivenFieldNames()
@@ -1171,9 +1247,9 @@ class ClassMetadataTest extends OrmTestCase
         $metadata = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $metadata->initializeReflection(new RuntimeReflectionService());
 
-        $metadata->mapField(array('fieldName' => 'status', 'type' => 'string', 'columnName' => 'foo'));
-        $metadata->mapField(array('fieldName' => 'username', 'type' => 'string', 'columnName' => 'bar'));
-        $metadata->mapField(array('fieldName' => 'name', 'type' => 'string', 'columnName' => 'baz'));
+        $metadata->mapField(['fieldName' => 'status', 'type' => 'string', 'columnName' => 'foo']);
+        $metadata->mapField(['fieldName' => 'username', 'type' => 'string', 'columnName' => 'bar']);
+        $metadata->mapField(['fieldName' => 'name', 'type' => 'string', 'columnName' => 'baz']);
 
         self::assertSame(['foo', 'baz'], $metadata->getColumnNames(['status', 'name']));
     }
diff --git a/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php
index 6274a1468..220a26363 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php
@@ -44,32 +44,39 @@ class NamingStrategyTest extends OrmTestCase
      */
     static public function dataClassToTableName()
     {
-        return array(
+        return [
             // DefaultNamingStrategy
-            array(self::defaultNaming(), 'SomeClassName',
+            [
+                self::defaultNaming(), 'SomeClassName',
                 'SomeClassName'
-            ),
-            array(self::defaultNaming(), 'SomeClassName',
+            ],
+            [
+                self::defaultNaming(), 'SomeClassName',
                 '\SomeClassName'
-            ),
-            array(self::defaultNaming(), 'Name',
+            ],
+            [
+                self::defaultNaming(), 'Name',
                 '\Some\Class\Name'
-            ),
+            ],
 
             // UnderscoreNamingStrategy
-            array(self::underscoreNamingLower(), 'some_class_name',
+            [
+                self::underscoreNamingLower(), 'some_class_name',
                 '\Name\Space\SomeClassName'
-            ),
-            array(self::underscoreNamingLower(), 'name',
+            ],
+            [
+                self::underscoreNamingLower(), 'name',
                 '\Some\Class\Name'
-            ),
-            array(self::underscoreNamingUpper(), 'SOME_CLASS_NAME',
+            ],
+            [
+                self::underscoreNamingUpper(), 'SOME_CLASS_NAME',
                 '\Name\Space\SomeClassName'
-            ),
-            array(self::underscoreNamingUpper(), 'NAME',
+            ],
+            [
+                self::underscoreNamingUpper(), 'NAME',
                 '\Some\Class\Name'
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -82,39 +89,46 @@ class NamingStrategyTest extends OrmTestCase
 
     /**
      * Data Provider for NamingStrategy#propertyToColumnName
-     * 
+     *
      * @return array
      */
     static public function dataPropertyToColumnName()
     {
-        return array(
+        return [
             // DefaultNamingStrategy
-            array(self::defaultNaming(), 'someProperty',
+            [
+                self::defaultNaming(), 'someProperty',
                 'someProperty'
-            ),
-            array(self::defaultNaming(), 'SOME_PROPERTY',
+            ],
+            [
+                self::defaultNaming(), 'SOME_PROPERTY',
                 'SOME_PROPERTY'
-            ),
-            array(self::defaultNaming(), 'some_property',
+            ],
+            [
+                self::defaultNaming(), 'some_property',
                 'some_property'
-            ),
+            ],
 
             // UnderscoreNamingStrategy
-            array(self::underscoreNamingLower(), 'some_property',
+            [
+                self::underscoreNamingLower(), 'some_property',
                 'someProperty'
-            ),
-            array(self::underscoreNamingUpper(), 'SOME_PROPERTY',
+            ],
+            [
+                self::underscoreNamingUpper(), 'SOME_PROPERTY',
                 'someProperty'
-            ),
-            array(self::underscoreNamingUpper(), 'SOME_PROPERTY',
+            ],
+            [
+                self::underscoreNamingUpper(), 'SOME_PROPERTY',
                 'some_property'
-            ),
-            array(self::underscoreNamingUpper(), 'SOME_PROPERTY',
+            ],
+            [
+                self::underscoreNamingUpper(), 'SOME_PROPERTY',
                 'SOME_PROPERTY'
-            ),
-        );
+            ],
+        ];
     }
-    
+
     /**
      * @dataProvider dataPropertyToColumnName
      *
@@ -134,14 +148,14 @@ class NamingStrategyTest extends OrmTestCase
      */
     static public function dataReferenceColumnName()
     {
-        return array(
+        return [
             // DefaultNamingStrategy
-            array(self::defaultNaming(), 'id'),
+            [self::defaultNaming(), 'id'],
 
             // UnderscoreNamingStrategy
-            array(self::underscoreNamingLower(), 'id'),
-            array(self::underscoreNamingUpper(), 'ID'),
-        );
+            [self::underscoreNamingLower(), 'id'],
+            [self::underscoreNamingUpper(), 'ID'],
+        ];
     }
 
     /**
@@ -162,18 +176,18 @@ class NamingStrategyTest extends OrmTestCase
      */
     static public function dataJoinColumnName()
     {
-        return array(
+        return [
             // DefaultNamingStrategy
-            array(self::defaultNaming(), 'someColumn_id', 'someColumn', null),
-            array(self::defaultNaming(), 'some_column_id', 'some_column', null),
+            [self::defaultNaming(), 'someColumn_id', 'someColumn', null],
+            [self::defaultNaming(), 'some_column_id', 'some_column', null],
 
             // UnderscoreNamingStrategy
-            array(self::underscoreNamingLower(), 'some_column_id', 'someColumn', null),
-            array(self::underscoreNamingUpper(), 'SOME_COLUMN_ID', 'someColumn', null),
+            [self::underscoreNamingLower(), 'some_column_id', 'someColumn', null],
+            [self::underscoreNamingUpper(), 'SOME_COLUMN_ID', 'someColumn', null],
             // JoinColumnClassNamingStrategy
-            array(new JoinColumnClassNamingStrategy(), 'classname_someColumn_id', 'someColumn', 'Some\ClassName'),
-            array(new JoinColumnClassNamingStrategy(), 'classname_some_column_id', 'some_column', 'ClassName'),
-        );
+            [new JoinColumnClassNamingStrategy(), 'classname_someColumn_id', 'someColumn', 'Some\ClassName'],
+            [new JoinColumnClassNamingStrategy(), 'classname_some_column_id', 'some_column', 'ClassName'],
+        ];
     }
 
     /**
@@ -195,39 +209,48 @@ class NamingStrategyTest extends OrmTestCase
      */
     static public function dataJoinTableName()
     {
-        return array(
+        return [
             // DefaultNamingStrategy
-            array(self::defaultNaming(), 'someclassname_classname',
+            [
+                self::defaultNaming(), 'someclassname_classname',
                 'SomeClassName', 'Some\ClassName', null,
-            ),
-            array(self::defaultNaming(), 'someclassname_classname',
+            ],
+            [
+                self::defaultNaming(), 'someclassname_classname',
                 '\SomeClassName', 'ClassName', null,
-            ),
-            array(self::defaultNaming(), 'name_classname',
+            ],
+            [
+                self::defaultNaming(), 'name_classname',
                 '\Some\Class\Name', 'ClassName', null,
-            ),
+            ],
 
             // UnderscoreNamingStrategy
-            array(self::underscoreNamingLower(), 'some_class_name_class_name',
+            [
+                self::underscoreNamingLower(), 'some_class_name_class_name',
                 'SomeClassName', 'Some\ClassName', null,
-            ),
-            array(self::underscoreNamingLower(), 'some_class_name_class_name',
+            ],
+            [
+                self::underscoreNamingLower(), 'some_class_name_class_name',
                 '\SomeClassName', 'ClassName', null,
-            ),
-            array(self::underscoreNamingLower(), 'name_class_name',
+            ],
+            [
+                self::underscoreNamingLower(), 'name_class_name',
                 '\Some\Class\Name', 'ClassName', null,
-            ),
+            ],
 
-            array(self::underscoreNamingUpper(), 'SOME_CLASS_NAME_CLASS_NAME',
+            [
+                self::underscoreNamingUpper(), 'SOME_CLASS_NAME_CLASS_NAME',
                 'SomeClassName', 'Some\ClassName', null,
-            ),
-            array(self::underscoreNamingUpper(), 'SOME_CLASS_NAME_CLASS_NAME',
+            ],
+            [
+                self::underscoreNamingUpper(), 'SOME_CLASS_NAME_CLASS_NAME',
                 '\SomeClassName', 'ClassName', null,
-            ),
-            array(self::underscoreNamingUpper(), 'NAME_CLASS_NAME',
+            ],
+            [
+                self::underscoreNamingUpper(), 'NAME_CLASS_NAME',
                 '\Some\Class\Name', 'ClassName', null,
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -251,30 +274,36 @@ class NamingStrategyTest extends OrmTestCase
      */
     static public function dataJoinKeyColumnName()
     {
-        return array(
+        return [
             // DefaultNamingStrategy
-            array(self::defaultNaming(), 'someclassname_id',
+            [
+                self::defaultNaming(), 'someclassname_id',
                 'SomeClassName', null, null,
-            ),
-            array(self::defaultNaming(), 'name_identifier',
+            ],
+            [
+                self::defaultNaming(), 'name_identifier',
                 '\Some\Class\Name', 'identifier', null,
-            ),
+            ],
 
             // UnderscoreNamingStrategy
-            array(self::underscoreNamingLower(), 'some_class_name_id',
+            [
+                self::underscoreNamingLower(), 'some_class_name_id',
                 'SomeClassName', null, null,
-            ),
-            array(self::underscoreNamingLower(), 'class_name_identifier',
+            ],
+            [
+                self::underscoreNamingLower(), 'class_name_identifier',
                 '\Some\Class\ClassName', 'identifier', null,
-            ),
+            ],
 
-            array(self::underscoreNamingUpper(), 'SOME_CLASS_NAME_ID',
+            [
+                self::underscoreNamingUpper(), 'SOME_CLASS_NAME_ID',
                 'SomeClassName', null, null,
-            ),
-            array(self::underscoreNamingUpper(), 'CLASS_NAME_IDENTIFIER',
+            ],
+            [
+                self::underscoreNamingUpper(), 'CLASS_NAME_IDENTIFIER',
                 '\Some\Class\ClassName', 'IDENTIFIER', null,
-            ),
-        );
+            ],
+        ];
     }
 
     /**
diff --git a/tests/Doctrine/Tests/ORM/Mapping/QuoteStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/QuoteStrategyTest.php
index 0b736dd0b..0afb3698d 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/QuoteStrategyTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/QuoteStrategyTest.php
@@ -60,9 +60,9 @@ class QuoteStrategyTest extends OrmTestCase
     public function testGetColumnName()
     {
         $cm = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
-        $cm->mapField(array('fieldName' => 'name', 'columnName' => '`name`'));
-        $cm->mapField(array('fieldName' => 'id', 'columnName' => 'id'));
-        
+        $cm->mapField(['fieldName' => 'name', 'columnName' => '`name`']);
+        $cm->mapField(['fieldName' => 'id', 'columnName' => 'id']);
+
         $this->assertEquals('id' ,$this->strategy->getColumnName('id', $cm, $this->platform));
         $this->assertEquals('"name"' ,$this->strategy->getColumnName('name', $cm, $this->platform));
     }
@@ -70,42 +70,45 @@ class QuoteStrategyTest extends OrmTestCase
     public function testGetTableName()
     {
         $cm = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
-        $cm->setPrimaryTable(array('name'=>'`cms_user`'));
+        $cm->setPrimaryTable(['name'=>'`cms_user`']);
         $this->assertEquals('"cms_user"' ,$this->strategy->getTableName($cm, $this->platform));
 
         $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
         $cm->initializeReflection(new RuntimeReflectionService());
-        $cm->setPrimaryTable(array('name'=>'cms_user'));
+        $cm->setPrimaryTable(['name'=>'cms_user']);
         $this->assertEquals('cms_user' ,$this->strategy->getTableName($cm, $this->platform));
     }
-    
+
     public function testJoinTableName()
     {
         $cm1 = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress');
         $cm2 = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress');
-        
-        $cm1->mapManyToMany(array(
+
+        $cm1->mapManyToMany(
+            [
             'fieldName'     => 'user',
             'targetEntity'  => 'CmsUser',
             'inversedBy'    => 'users',
-            'joinTable'     => array(
+            'joinTable'     => [
                 'name'  => '`cmsaddress_cmsuser`'
-            )
-        ));
-        
-        $cm2->mapManyToMany(array(
+            ]
+            ]
+        );
+
+        $cm2->mapManyToMany(
+            [
             'fieldName'     => 'user',
             'targetEntity'  => 'CmsUser',
             'inversedBy'    => 'users',
-            'joinTable'     => array(
+            'joinTable'     => [
                     'name'  => 'cmsaddress_cmsuser'
-                )
-            )
+            ]
+            ]
         );
 
         $this->assertEquals('"cmsaddress_cmsuser"', $this->strategy->getJoinTableName($cm1->associationMappings['user'], $cm1, $this->platform));
         $this->assertEquals('cmsaddress_cmsuser', $this->strategy->getJoinTableName($cm2->associationMappings['user'], $cm2, $this->platform));
-       
+
     }
 
     public function testIdentifierColumnNames()
@@ -113,20 +116,24 @@ class QuoteStrategyTest extends OrmTestCase
         $cm1 = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress');
         $cm2 = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress');
 
-        $cm1->mapField(array(
+        $cm1->mapField(
+            [
             'id'            => true,
             'fieldName'     => 'id',
             'columnName'    => '`id`',
-        ));
+            ]
+        );
 
-        $cm2->mapField(array(
+        $cm2->mapField(
+            [
             'id'            => true,
             'fieldName'     => 'id',
             'columnName'    => 'id',
-        ));
+            ]
+        );
 
-        $this->assertEquals(array('"id"'), $this->strategy->getIdentifierColumnNames($cm1, $this->platform));
-        $this->assertEquals(array('id'), $this->strategy->getIdentifierColumnNames($cm2, $this->platform));
+        $this->assertEquals(['"id"'], $this->strategy->getIdentifierColumnNames($cm1, $this->platform));
+        $this->assertEquals(['id'], $this->strategy->getIdentifierColumnNames($cm2, $this->platform));
     }
 
 
@@ -143,30 +150,38 @@ class QuoteStrategyTest extends OrmTestCase
     {
         $cm = $this->createClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails');
 
-        $cm->mapOneToOne(array(
+        $cm->mapOneToOne(
+            [
             'id'            => true,
             'fieldName'     => 'article',
             'targetEntity'  => 'Doctrine\Tests\Models\DDC117\DDC117Article',
-            'joinColumns'    => array(array(
+            'joinColumns'    => [
+                [
                 'name'  => '`article`'
-            )),
-        ));
+                ]
+            ],
+            ]
+        );
 
-        $this->assertEquals(array('"article"'), $this->strategy->getIdentifierColumnNames($cm, $this->platform));
+        $this->assertEquals(['"article"'], $this->strategy->getIdentifierColumnNames($cm, $this->platform));
     }
 
     public function testJoinColumnName()
     {
         $cm = $this->createClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails');
 
-        $cm->mapOneToOne(array(
+        $cm->mapOneToOne(
+            [
             'id'            => true,
             'fieldName'     => 'article',
             'targetEntity'  => 'Doctrine\Tests\Models\DDC117\DDC117Article',
-            'joinColumns'    => array(array(
+            'joinColumns'    => [
+                [
                 'name'  => '`article`'
-            )),
-        ));
+                ]
+            ],
+            ]
+        );
 
         $joinColumn = $cm->associationMappings['article']['joinColumns'][0];
         $this->assertEquals('"article"',$this->strategy->getJoinColumnName($joinColumn, $cm, $this->platform));
@@ -176,14 +191,18 @@ class QuoteStrategyTest extends OrmTestCase
     {
         $cm = $this->createClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails');
 
-        $cm->mapOneToOne(array(
+        $cm->mapOneToOne(
+            [
             'id'            => true,
             'fieldName'     => 'article',
             'targetEntity'  => 'Doctrine\Tests\Models\DDC117\DDC117Article',
-            'joinColumns'    => array(array(
+            'joinColumns'    => [
+                [
                 'name'  => '`article`'
-            )),
-        ));
+                ]
+            ],
+            ]
+        );
 
         $joinColumn = $cm->associationMappings['article']['joinColumns'][0];
         $this->assertEquals('"id"',$this->strategy->getReferencedJoinColumnName($joinColumn, $cm, $this->platform));
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php b/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php
index 9be006e5a..d6f629149 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php
@@ -69,8 +69,8 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase
      */
     public function getTestedReflectionProperties()
     {
-        return array(
-            array(
+        return [
+            [
                 $this->getReflectionProperty(
                     'Doctrine\\Tests\\Models\\Generic\\BooleanModel',
                     'id'
@@ -80,9 +80,9 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase
                     'id'
                 ),
                 'Doctrine\\Tests\\Models\\Generic\\BooleanModel'
-            ),
+            ],
             // reflection on embeddables that have properties defined in abstract ancestors:
-            array(
+            [
                 $this->getReflectionProperty(
                     'Doctrine\\Tests\\Models\\Generic\\BooleanModel',
                     'id'
@@ -92,8 +92,8 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase
                     'propertyInAbstractClass'
                 ),
                 'Doctrine\\Tests\\Models\\Reflection\\ConcreteEmbeddable'
-            ),
-            array(
+            ],
+            [
                 $this->getReflectionProperty(
                     'Doctrine\\Tests\\Models\\Generic\\BooleanModel',
                     'id'
@@ -103,9 +103,9 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase
                     'propertyInConcreteClass'
                 ),
                 'Doctrine\\Tests\\Models\\Reflection\\ConcreteEmbeddable'
-            ),
+            ],
             // reflection on classes extending internal PHP classes:
-            array(
+            [
                 $this->getReflectionProperty(
                     'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass',
                     'publicProperty'
@@ -115,8 +115,8 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase
                     'privateProperty'
                 ),
                 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass'
-            ),
-            array(
+            ],
+            [
                 $this->getReflectionProperty(
                     'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass',
                     'publicProperty'
@@ -126,8 +126,8 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase
                     'protectedProperty'
                 ),
                 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass'
-            ),
-            array(
+            ],
+            [
                 $this->getReflectionProperty(
                     'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass',
                     'publicProperty'
@@ -137,8 +137,8 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase
                     'publicProperty'
                 ),
                 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass'
-            ),
-        );
+            ],
+        ];
     }
 
     /**
diff --git a/tests/Doctrine/Tests/ORM/Mapping/Symfony/AbstractDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/Symfony/AbstractDriverTest.php
index ac8f1d695..082ebaf94 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/Symfony/AbstractDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/Symfony/AbstractDriverTest.php
@@ -10,10 +10,12 @@ abstract class AbstractDriverTest extends \PHPUnit_Framework_TestCase
 {
     public function testFindMappingFile()
     {
-        $driver = $this->getDriver(array(
+        $driver = $this->getDriver(
+            [
             'MyNamespace\MySubnamespace\EntityFoo' => 'foo',
             'MyNamespace\MySubnamespace\Entity' => $this->dir,
-        ));
+            ]
+        );
 
         touch($filename = $this->dir.'/Foo'.$this->getFileExtension());
         $this->assertEquals($filename, $driver->getLocator()->findMappingFile('MyNamespace\MySubnamespace\Entity\Foo'));
@@ -21,9 +23,11 @@ abstract class AbstractDriverTest extends \PHPUnit_Framework_TestCase
 
     public function testFindMappingFileInSubnamespace()
     {
-        $driver = $this->getDriver(array(
+        $driver = $this->getDriver(
+            [
             'MyNamespace\MySubnamespace\Entity' => $this->dir,
-        ));
+            ]
+        );
 
         touch($filename = $this->dir.'/Foo.Bar'.$this->getFileExtension());
         $this->assertEquals($filename, $driver->getLocator()->findMappingFile('MyNamespace\MySubnamespace\Entity\Foo\Bar'));
@@ -34,9 +38,11 @@ abstract class AbstractDriverTest extends \PHPUnit_Framework_TestCase
         $this->expectException(MappingException::class);
         $this->expectExceptionMessage('No mapping file found named');
 
-        $driver = $this->getDriver(array(
+        $driver = $this->getDriver(
+            [
             'MyNamespace\MySubnamespace\Entity' => $this->dir,
-        ));
+            ]
+        );
 
         $driver->getLocator()->findMappingFile('MyNamespace\MySubnamespace\Entity\Foo');
     }
@@ -46,9 +52,11 @@ abstract class AbstractDriverTest extends \PHPUnit_Framework_TestCase
         $this->expectException(MappingException::class);
         $this->expectExceptionMessage("No mapping file found named 'Foo" . $this->getFileExtension() . "' for class 'MyOtherNamespace\MySubnamespace\Entity\Foo'.");
 
-        $driver = $this->getDriver(array(
+        $driver = $this->getDriver(
+            [
             'MyNamespace\MySubnamespace\Entity' => $this->dir,
-        ));
+            ]
+        );
 
         $driver->getLocator()->findMappingFile('MyOtherNamespace\MySubnamespace\Entity\Foo');
     }
@@ -75,5 +83,5 @@ abstract class AbstractDriverTest extends \PHPUnit_Framework_TestCase
     }
 
     abstract protected function getFileExtension();
-    abstract protected function getDriver(array $paths = array());
+    abstract protected function getDriver(array $paths = []);
 }
diff --git a/tests/Doctrine/Tests/ORM/Mapping/Symfony/XmlDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/Symfony/XmlDriverTest.php
index f32d9f2ad..2fa836813 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/Symfony/XmlDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/Symfony/XmlDriverTest.php
@@ -14,7 +14,7 @@ class XmlDriverTest extends AbstractDriverTest
         return '.orm.xml';
     }
 
-    protected function getDriver(array $paths = array())
+    protected function getDriver(array $paths = [])
     {
         $driver = new SimplifiedXmlDriver(array_flip($paths));
 
diff --git a/tests/Doctrine/Tests/ORM/Mapping/Symfony/YamlDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/Symfony/YamlDriverTest.php
index 5b7f38ead..f9c8a839b 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/Symfony/YamlDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/Symfony/YamlDriverTest.php
@@ -14,7 +14,7 @@ class YamlDriverTest extends AbstractDriverTest
         return '.orm.yml';
     }
 
-    protected function getDriver(array $paths = array())
+    protected function getDriver(array $paths = [])
     {
         $driver = new SimplifiedYamlDriver(array_flip($paths));
 
diff --git a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
index ae188057d..6d5dde331 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
@@ -23,11 +23,11 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest
         $class->initializeReflection(new RuntimeReflectionService());
         $mappingDriver->loadMetadataForClass($className, $class);
 
-        $expectedMap = array(
+        $expectedMap = [
             'foo' => 'Doctrine\Tests\ORM\Mapping\CTIFoo',
             'bar' => 'Doctrine\Tests\ORM\Mapping\CTIBar',
             'baz' => 'Doctrine\Tests\ORM\Mapping\CTIBaz',
-        );
+        ];
 
         $this->assertEquals(3, count($class->discriminatorMap));
         $this->assertEquals($expectedMap, $class->discriminatorMap);
@@ -57,7 +57,7 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest
 
         $class = $factory->getMetadataFor('Doctrine\Tests\Models\DDC117\DDC117Translation');
 
-        $this->assertEquals(array('language', 'article'), $class->identifier);
+        $this->assertEquals(['language', 'article'], $class->identifier);
         $this->assertArrayHasKey('article', $class->associationMappings);
 
         $this->assertArrayHasKey('id', $class->associationMappings['article']);
@@ -117,14 +117,14 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest
         $class = $this->createClassMetadata('Doctrine\Tests\Models\ValueObjects\Person');
 
         $this->assertEquals(
-            array(
-                'name' => array(
+            [
+                'name' => [
                     'class' => 'Doctrine\Tests\Models\ValueObjects\Name',
                     'columnPrefix' => 'nm_',
                     'declaredField' => null,
                     'originalField' => null,
-                )
-            ),
+                ]
+            ],
             $class->embeddedClasses
         );
     }
@@ -158,16 +158,16 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest
     static public function dataValidSchema()
     {
         $list    = glob(__DIR__ . '/xml/*.xml');
-        $invalid = array(
+        $invalid = [
             'Doctrine.Tests.Models.DDC889.DDC889Class.dcm'
-        );
+        ];
 
         $list = array_filter($list, function($item) use ($invalid){
             return ! in_array(pathinfo($item, PATHINFO_FILENAME), $invalid);
         });
 
         return array_map(function($item){
-            return array($item);
+            return [$item];
         }, $list);
     }
 
diff --git a/tests/Doctrine/Tests/ORM/Mapping/YamlMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/YamlMappingDriverTest.php
index c752c6a82..a739c2b61 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/YamlMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/YamlMappingDriverTest.php
@@ -25,7 +25,7 @@ class YamlMappingDriverTest extends AbstractMappingDriverTest
     public function testJoinTablesWithMappedSuperclassForYamlDriver()
     {
         $yamlDriver = $this->_loadDriver();
-        $yamlDriver->getLocator()->addPaths(array(__DIR__ . DIRECTORY_SEPARATOR . 'yaml'));
+        $yamlDriver->getLocator()->addPaths([__DIR__ . DIRECTORY_SEPARATOR . 'yaml']);
 
         $em = $this->_getTestEntityManager();
         $em->getConfiguration()->setMetadataDriverImpl($yamlDriver);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsAddress.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsAddress.php
index b0ac6cade..2dce0c416 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsAddress.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsAddress.php
@@ -1,91 +1,115 @@
 <?php
 
-$metadata->setPrimaryTable(array(
+$metadata->setPrimaryTable(
+    [
    'name' => 'company_person',
-));
+    ]
+);
 
-$metadata->mapField(array (
+$metadata->mapField(
+    [
     'id'        => true,
     'fieldName' => 'id',
     'type'      => 'integer',
-));
+    ]
+);
 
-$metadata->mapField(array (
+$metadata->mapField(
+    [
     'fieldName' => 'zip',
     'length'    => 50,
-));
+    ]
+);
 
-$metadata->mapField(array (
+$metadata->mapField(
+    [
     'fieldName' => 'city',
     'length'    => 50,
-));
+    ]
+);
 
-$metadata->mapOneToOne(array(
+$metadata->mapOneToOne(
+    [
     'fieldName'     => 'user',
     'targetEntity'  => 'CmsUser',
-    'joinColumns'   => array(array('referencedColumnName' => 'id'))
-));
+    'joinColumns'   => [['referencedColumnName' => 'id']]
+    ]
+);
 
-$metadata->addNamedNativeQuery(array (
+$metadata->addNamedNativeQuery(
+    [
     'name'              => 'find-all',
     'query'             => 'SELECT id, country, city FROM cms_addresses',
     'resultSetMapping'  => 'mapping-find-all',
-));
+    ]
+);
 
-$metadata->addNamedNativeQuery(array (
+$metadata->addNamedNativeQuery(
+    [
     'name'              => 'find-by-id',
     'query'             => 'SELECT * FROM cms_addresses WHERE id = ?',
     'resultClass'       => 'Doctrine\\Tests\\Models\\CMS\\CmsAddress',
-));
+    ]
+);
 
-$metadata->addNamedNativeQuery(array (
+$metadata->addNamedNativeQuery(
+    [
     'name'              => 'count',
     'query'             => 'SELECT COUNT(*) AS count FROM cms_addresses',
     'resultSetMapping'  => 'mapping-count',
-));
+    ]
+);
 
 
-$metadata->addSqlResultSetMapping(array (
+$metadata->addSqlResultSetMapping(
+    [
     'name'      => 'mapping-find-all',
-    'columns'   => array(),
-    'entities'  => array ( array (
-        'fields' => array (
-          array (
+    'columns'   => [],
+    'entities'  => [
+        [
+        'fields' => [
+          [
             'name'      => 'id',
             'column'    => 'id',
-          ),
-          array (
+          ],
+          [
             'name'      => 'city',
             'column'    => 'city',
-          ),
-          array (
+          ],
+          [
             'name'      => 'country',
             'column'    => 'country',
-          ),
-        ),
+          ],
+        ],
         'entityClass' => 'Doctrine\Tests\Models\CMS\CmsAddress',
-      ),
-    ),
-));
+        ],
+    ],
+    ]
+);
 
-$metadata->addSqlResultSetMapping(array (
+$metadata->addSqlResultSetMapping(
+    [
     'name'      => 'mapping-without-fields',
-    'columns'   => array(),
-    'entities'  => array(array (
+    'columns'   => [],
+    'entities'  => [
+        [
         'entityClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsAddress',
-        'fields' => array()
-      )
-    )
-));
+        'fields' => []
+        ]
+    ]
+    ]
+);
 
-$metadata->addSqlResultSetMapping(array (
+$metadata->addSqlResultSetMapping(
+    [
     'name' => 'mapping-count',
-    'columns' =>array (
-        array (
+    'columns' => [
+        [
             'name' => 'count',
-        ),
-    )
-));
+        ],
+    ]
+    ]
+);
 
 $metadata->addEntityListener(\Doctrine\ORM\Events::postPersist, 'CmsAddressListener', 'postPersist');
 $metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CmsAddressListener', 'prePersist');
@@ -97,4 +121,4 @@ $metadata->addEntityListener(\Doctrine\ORM\Events::postRemove, 'CmsAddressListen
 $metadata->addEntityListener(\Doctrine\ORM\Events::preRemove, 'CmsAddressListener', 'preRemove');
 
 $metadata->addEntityListener(\Doctrine\ORM\Events::preFlush, 'CmsAddressListener', 'preFlush');
-$metadata->addEntityListener(\Doctrine\ORM\Events::postLoad, 'CmsAddressListener', 'postLoad');
\ No newline at end of file
+$metadata->addEntityListener(\Doctrine\ORM\Events::postLoad, 'CmsAddressListener', 'postLoad');
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsUser.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsUser.php
index dfa89851a..c707f3fdf 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsUser.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsUser.php
@@ -1,184 +1,210 @@
 <?php
 
-$metadata->setPrimaryTable(array(
+$metadata->setPrimaryTable(
+    [
    'name' => 'cms_users',
-));
+    ]
+);
 
-$metadata->addNamedNativeQuery(array (
+$metadata->addNamedNativeQuery(
+    [
     'name'              => 'fetchIdAndUsernameWithResultClass',
     'query'             => 'SELECT id, username FROM cms_users WHERE username = ?',
     'resultClass'       => 'Doctrine\\Tests\\Models\\CMS\\CmsUser',
-));
+    ]
+);
 
-$metadata->addNamedNativeQuery(array (
+$metadata->addNamedNativeQuery(
+    [
     'name'              => 'fetchAllColumns',
     'query'             => 'SELECT * FROM cms_users WHERE username = ?',
     'resultClass'       => 'Doctrine\\Tests\\Models\\CMS\\CmsUser',
-));
+    ]
+);
 
-$metadata->addNamedNativeQuery(array (
+$metadata->addNamedNativeQuery(
+    [
     'name'              => 'fetchJoinedAddress',
     'query'             => 'SELECT u.id, u.name, u.status, a.id AS a_id, a.country, a.zip, a.city FROM cms_users u INNER JOIN cms_addresses a ON u.id = a.user_id WHERE u.username = ?',
     'resultSetMapping'  => 'mappingJoinedAddress',
-));
+    ]
+);
 
-$metadata->addNamedNativeQuery(array (
+$metadata->addNamedNativeQuery(
+    [
     'name'              => 'fetchJoinedPhonenumber',
     'query'             => 'SELECT id, name, status, phonenumber AS number FROM cms_users INNER JOIN cms_phonenumbers ON id = user_id WHERE username = ?',
     'resultSetMapping'  => 'mappingJoinedPhonenumber',
-));
+    ]
+);
 
-$metadata->addNamedNativeQuery(array (
+$metadata->addNamedNativeQuery(
+    [
     'name'              => 'fetchUserPhonenumberCount',
     'query'             => 'SELECT id, name, status, COUNT(phonenumber) AS numphones FROM cms_users INNER JOIN cms_phonenumbers ON id = user_id WHERE username IN (?) GROUP BY id, name, status, username ORDER BY username',
     'resultSetMapping'  => 'mappingUserPhonenumberCount',
-));
+    ]
+);
 
-$metadata->addNamedNativeQuery(array (
+$metadata->addNamedNativeQuery(
+    [
     "name"              => "fetchMultipleJoinsEntityResults",
     "resultSetMapping"  => "mappingMultipleJoinsEntityResults",
     "query"             => "SELECT u.id AS u_id, u.name AS u_name, u.status AS u_status, a.id AS a_id, a.zip AS a_zip, a.country AS a_country, COUNT(p.phonenumber) AS numphones FROM cms_users u INNER JOIN cms_addresses a ON u.id = a.user_id INNER JOIN cms_phonenumbers p ON u.id = p.user_id GROUP BY u.id, u.name, u.status, u.username, a.id, a.zip, a.country ORDER BY u.username"
-));
+    ]
+);
 
-$metadata->addSqlResultSetMapping(array (
+$metadata->addSqlResultSetMapping(
+    [
     'name'      => 'mappingJoinedAddress',
-    'columns'   => array(),
-    'entities'  => array(array (
-        'fields'=> array (
-          array (
+    'columns'   => [],
+    'entities'  => [
+        [
+        'fields'=> [
+          [
             'name'      => 'id',
             'column'    => 'id',
-          ),
-          array (
+          ],
+          [
             'name'      => 'name',
             'column'    => 'name',
-          ),
-          array (
+          ],
+          [
             'name'      => 'status',
             'column'    => 'status',
-          ),
-          array (
+          ],
+          [
             'name'      => 'address.zip',
             'column'    => 'zip',
-          ),
-          array (
+          ],
+          [
             'name'      => 'address.city',
             'column'    => 'city',
-          ),
-          array (
+          ],
+          [
             'name'      => 'address.country',
             'column'    => 'country',
-          ),
-          array (
+          ],
+          [
             'name'      => 'address.id',
             'column'    => 'a_id',
-          ),
-        ),
+          ],
+        ],
         'entityClass'           => 'Doctrine\Tests\Models\CMS\CmsUser',
         'discriminatorColumn'   => null
-      ),
-    ),
-));
+        ],
+    ],
+    ]
+);
 
-$metadata->addSqlResultSetMapping(array (
+$metadata->addSqlResultSetMapping(
+    [
     'name'      => 'mappingJoinedPhonenumber',
-    'columns'   => array(),
-    'entities'  => array(array(
-        'fields'=> array (
-          array (
+    'columns'   => [],
+    'entities'  => [
+        [
+        'fields'=> [
+          [
             'name'      => 'id',
             'column'    => 'id',
-          ),
-          array (
+          ],
+          [
             'name'      => 'name',
             'column'    => 'name',
-          ),
-          array (
+          ],
+          [
             'name'      => 'status',
             'column'    => 'status',
-          ),
-          array (
+          ],
+          [
             'name'      => 'phonenumbers.phonenumber',
             'column'    => 'number',
-          ),
-        ),
+          ],
+        ],
         'entityClass'   => 'Doctrine\\Tests\\Models\\CMS\\CmsUser',
         'discriminatorColumn'   => null
-      ),
-    ),
-));
+        ],
+    ],
+    ]
+);
 
-$metadata->addSqlResultSetMapping(array (
+$metadata->addSqlResultSetMapping(
+    [
     'name'      => 'mappingUserPhonenumberCount',
-    'columns'   => array(),
-    'entities'  => array (
-      array(
-        'fields' => array (
-          array (
+    'columns'   => [],
+    'entities'  => [
+      [
+        'fields' => [
+          [
             'name'      => 'id',
             'column'    => 'id',
-          ),
-          array (
+          ],
+          [
             'name'      => 'name',
             'column'    => 'name',
-          ),
-          array (
+          ],
+          [
             'name'      => 'status',
             'column'    => 'status',
-          )
-        ),
+          ]
+        ],
         'entityClass'   => 'Doctrine\Tests\Models\CMS\CmsUser',
         'discriminatorColumn'   => null
-      )
-    ),
-    'columns' => array (
-          array (
+      ]
+    ],
+    'columns' => [
+          [
             'name' => 'numphones',
-          )
-    )
-));
+          ]
+    ]
+    ]
+);
 
-$metadata->addSqlResultSetMapping(array(
+$metadata->addSqlResultSetMapping(
+    [
     'name'      => 'mappingMultipleJoinsEntityResults',
-    'entities'  => array(array(
-            'fields' => array(
-                array(
+    'entities'  => [
+        [
+            'fields' => [
+                [
                     'name'      => 'id',
                     'column'    => 'u_id',
-                ),
-                array(
+                ],
+                [
                     'name'      => 'name',
                     'column'    => 'u_name',
-                ),
-                array(
+                ],
+                [
                     'name'      => 'status',
                     'column'    => 'u_status',
-                )
-            ),
+                ]
+            ],
             'entityClass'           => 'Doctrine\Tests\Models\CMS\CmsUser',
             'discriminatorColumn'   => null,
-        ),
-        array(
-            'fields' => array(
-                array(
+        ],
+        [
+            'fields' => [
+                [
                     'name'      => 'id',
                     'column'    => 'a_id',
-                ),
-                array(
+                ],
+                [
                     'name'      => 'zip',
                     'column'    => 'a_zip',
-                ),
-                array(
+                ],
+                [
                     'name'      => 'country',
                     'column'    => 'a_country',
-                ),
-            ),
+                ],
+            ],
             'entityClass'           => 'Doctrine\Tests\Models\CMS\CmsAddress',
             'discriminatorColumn'   => null,
-        ),
-    ),
-    'columns' => array(array(
+        ],
+    ],
+    'columns' => [
+        [
             'name' => 'numphones',
-        )
-    )
-));
\ No newline at end of file
+        ]
+    ]
+    ]
+);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Cache.City.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Cache.City.php
index 6dd477fa6..4626cd46b 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Cache.City.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Cache.City.php
@@ -3,52 +3,68 @@
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
 $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE);
-$metadata->setPrimaryTable(array('name' => 'cache_city'));
+$metadata->setPrimaryTable(['name' => 'cache_city']);
 $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_IDENTITY);
 $metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_DEFERRED_IMPLICIT);
 
-$metadata->enableCache(array(
+$metadata->enableCache(
+    [
     'usage' => ClassMetadataInfo::CACHE_USAGE_READ_ONLY
-));
+    ]
+);
 
-$metadata->mapField(array(
+$metadata->mapField(
+    [
    'fieldName' => 'id',
    'type' => 'integer',
    'id' => true,
-  ));
+    ]
+);
 
-$metadata->mapField(array(
+$metadata->mapField(
+    [
    'fieldName' => 'name',
    'type' => 'string',
-));
+    ]
+);
 
 
-$metadata->mapOneToOne(array(
+$metadata->mapOneToOne(
+    [
    'fieldName'      => 'state',
    'targetEntity'   => 'Doctrine\\Tests\\Models\\Cache\\State',
    'inversedBy'     => 'cities',
    'joinColumns'    =>
-   array(array(
+   [
+       [
     'name' => 'state_id',
     'referencedColumnName' => 'id',
-   ))
-));
-$metadata->enableAssociationCache('state', array(
+       ]
+   ]
+    ]
+);
+$metadata->enableAssociationCache('state', [
     'usage' => ClassMetadataInfo::CACHE_USAGE_READ_ONLY
-));
+]
+);
 
-$metadata->mapManyToMany(array(
+$metadata->mapManyToMany(
+    [
    'fieldName' => 'travels',
    'targetEntity' => 'Doctrine\\Tests\\Models\\Cache\\Travel',
    'mappedBy' => 'visitedCities',
-));
+    ]
+);
 
-$metadata->mapOneToMany(array(
+$metadata->mapOneToMany(
+    [
    'fieldName' => 'attractions',
    'targetEntity' => 'Doctrine\\Tests\\Models\\Cache\\Attraction',
    'mappedBy' => 'city',
-   'orderBy' => array('name' => 'ASC',),
-));
-$metadata->enableAssociationCache('attractions', array(
+   'orderBy' => ['name' => 'ASC',],
+    ]
+);
+$metadata->enableAssociationCache('attractions', [
     'usage' => ClassMetadataInfo::CACHE_USAGE_READ_ONLY
-));
\ No newline at end of file
+]
+);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyContract.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyContract.php
index d307ba7f1..33389ce95 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyContract.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyContract.php
@@ -4,28 +4,36 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
 $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_JOINED);
 $metadata->setTableName( 'company_contracts');
-$metadata->setDiscriminatorColumn(array(
+$metadata->setDiscriminatorColumn(
+    [
     'name' => 'discr',
     'type' => 'string',
-));
+    ]
+);
 
-$metadata->mapField(array(
+$metadata->mapField(
+    [
     'id'        => true,
     'name'      => 'id',
     'fieldName' => 'id',
-));
+    ]
+);
 
-$metadata->mapField(array(
+$metadata->mapField(
+    [
     'type'      => 'boolean',
     'name'      => 'completed',
     'fieldName' => 'completed',
-));
+    ]
+);
 
-$metadata->setDiscriminatorMap(array(
+$metadata->setDiscriminatorMap(
+    [
     "fix"       => "CompanyFixContract",
     "flexible"  => "CompanyFlexContract",
     "flexultra" => "CompanyFlexUltraContract"
-));
+    ]
+);
 
 $metadata->addEntityListener(\Doctrine\ORM\Events::postPersist, 'CompanyContractListener', 'postPersistHandler');
 $metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CompanyContractListener', 'prePersistHandler');
@@ -37,4 +45,4 @@ $metadata->addEntityListener(\Doctrine\ORM\Events::postRemove, 'CompanyContractL
 $metadata->addEntityListener(\Doctrine\ORM\Events::preRemove, 'CompanyContractListener', 'preRemoveHandler');
 
 $metadata->addEntityListener(\Doctrine\ORM\Events::preFlush, 'CompanyContractListener', 'preFlushHandler');
-$metadata->addEntityListener(\Doctrine\ORM\Events::postLoad, 'CompanyContractListener', 'postLoadHandler');
\ No newline at end of file
+$metadata->addEntityListener(\Doctrine\ORM\Events::postLoad, 'CompanyContractListener', 'postLoadHandler');
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFixContract.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFixContract.php
index 79b117729..3ea44ee73 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFixContract.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFixContract.php
@@ -1,7 +1,9 @@
 <?php
 
-$metadata->mapField(array(
+$metadata->mapField(
+    [
     'type'      => 'integer',
     'name'      => 'fixPrice',
     'fieldName' => 'fixPrice',
-));
\ No newline at end of file
+    ]
+);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFlexContract.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFlexContract.php
index 5f1542dde..7cc2b5504 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFlexContract.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFlexContract.php
@@ -1,13 +1,17 @@
 <?php
 
-$metadata->mapField(array(
+$metadata->mapField(
+    [
     'type'      => 'integer',
     'name'      => 'hoursWorked',
     'fieldName' => 'hoursWorked',
-));
+    ]
+);
 
-$metadata->mapField(array(
+$metadata->mapField(
+    [
     'type'      => 'integer',
     'name'      => 'pricePerHour',
     'fieldName' => 'pricePerHour',
-));
+    ]
+);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFlexUltraContract.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFlexUltraContract.php
index d16d4f3f5..9e392416d 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFlexUltraContract.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFlexUltraContract.php
@@ -1,10 +1,12 @@
 <?php
 
-$metadata->mapField(array(
+$metadata->mapField(
+    [
     'type'      => 'integer',
     'name'      => 'maxPrice',
     'fieldName' => 'maxPrice',
-));
+    ]
+);
 $metadata->addEntityListener(\Doctrine\ORM\Events::postPersist, 'CompanyContractListener', 'postPersistHandler');
 $metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CompanyContractListener', 'prePersistHandler');
 
@@ -18,4 +20,4 @@ $metadata->addEntityListener(\Doctrine\ORM\Events::preFlush, 'CompanyContractLis
 $metadata->addEntityListener(\Doctrine\ORM\Events::postLoad, 'CompanyContractListener', 'postLoadHandler');
 
 $metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CompanyFlexUltraContractListener', 'prePersistHandler1');
-$metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CompanyFlexUltraContractListener', 'prePersistHandler2');
\ No newline at end of file
+$metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CompanyFlexUltraContractListener', 'prePersistHandler2');
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyPerson.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyPerson.php
index 32cc813da..9402cc1ed 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyPerson.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyPerson.php
@@ -1,37 +1,46 @@
 <?php
 
-$metadata->setPrimaryTable(array(
+$metadata->setPrimaryTable(
+    [
    'name' => 'company_person',
-));
+    ]
+);
 
-$metadata->addNamedNativeQuery(array (
+$metadata->addNamedNativeQuery(
+    [
     'name'              => 'fetchAllWithResultClass',
     'query'             => 'SELECT id, name, discr FROM company_persons ORDER BY name',
     'resultClass'       => 'Doctrine\\Tests\\Models\\Company\\CompanyPerson',
-));
+    ]
+);
 
-$metadata->addNamedNativeQuery(array (
+$metadata->addNamedNativeQuery(
+    [
     'name'              => 'fetchAllWithSqlResultSetMapping',
     'query'             => 'SELECT id, name, discr AS discriminator FROM company_persons ORDER BY name',
     'resultSetMapping'  => 'mappingFetchAll',
-));
+    ]
+);
 
-$metadata->addSqlResultSetMapping(array (
+$metadata->addSqlResultSetMapping(
+    [
     'name'      => 'mappingFetchAll',
-    'columns'   => array(),
-    'entities'  => array ( array (
-        'fields' => array (
-          array (
+    'columns'   => [],
+    'entities'  => [
+        [
+        'fields' => [
+          [
             'name'      => 'id',
             'column'    => 'id',
-          ),
-          array (
+          ],
+          [
             'name'      => 'name',
             'column'    => 'name',
-          ),
-        ),
+          ],
+        ],
         'entityClass' => 'Doctrine\Tests\Models\Company\CompanyPerson',
         'discriminatorColumn' => 'discriminator',
-      ),
-    ),
-));
\ No newline at end of file
+        ],
+    ],
+    ]
+);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC1476.DDC1476EntityWithDefaultFieldType.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC1476.DDC1476EntityWithDefaultFieldType.php
index 56a99633a..62459aad0 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC1476.DDC1476EntityWithDefaultFieldType.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC1476.DDC1476EntityWithDefaultFieldType.php
@@ -2,11 +2,15 @@
 
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
-$metadata->mapField(array(
+$metadata->mapField(
+    [
    'id'         => true,
    'fieldName'  => 'id',
-));
-$metadata->mapField(array(
+    ]
+);
+$metadata->mapField(
+    [
    'fieldName'  => 'name'
-));
-$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_NONE);
\ No newline at end of file
+    ]
+);
+$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_NONE);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.php
index 4a163c9bd..85128c9ae 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.php
@@ -4,14 +4,18 @@ use Doctrine\ORM\Mapping\ClassMetadata;
 
 /* @var $metadata ClassMetadata */
 
-$metadata->setPrimaryTable(array(
+$metadata->setPrimaryTable(
+    [
     'name'   => 'explicit_table',
     'schema' => 'explicit_schema',
-));
+    ]
+);
 
-$metadata->mapField(array(
+$metadata->mapField(
+    [
     'id'         => true,
     'fieldName'  => 'id',
-));
+    ]
+);
 
 $metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_AUTO);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.php
index 045a97858..fb2edfcfb 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.php
@@ -4,13 +4,17 @@ use Doctrine\ORM\Mapping\ClassMetadata;
 
 /* @var $metadata ClassMetadata */
 
-$metadata->setPrimaryTable(array(
+$metadata->setPrimaryTable(
+    [
     'name' => 'implicit_schema.implicit_table',
-));
+    ]
+);
 
-$metadata->mapField(array(
+$metadata->mapField(
+    [
     'id'         => true,
     'fieldName'  => 'id',
-));
+    ]
+);
 
 $metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_AUTO);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC3579.DDC3579Admin.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC3579.DDC3579Admin.php
index dd59e65fa..9b7c87b3e 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC3579.DDC3579Admin.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC3579.DDC3579Admin.php
@@ -1,5 +1,6 @@
 <?php
 
-$metadata->setAssociationOverride('groups', array(
+$metadata->setAssociationOverride('groups', [
     'inversedBy' => 'admins'
-));
+]
+);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC3579.DDC3579User.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC3579.DDC3579User.php
index 1eb3555ec..49aeacb1e 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC3579.DDC3579User.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC3579.DDC3579User.php
@@ -2,26 +2,32 @@
 
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
-$metadata->mapField(array(
+$metadata->mapField(
+    [
    'id'         => true,
    'fieldName'  => 'id',
    'type'       => 'integer',
    'columnName' => 'user_id',
    'length'     => 150,
-));
+    ]
+);
 
-$metadata->mapField(array(
+$metadata->mapField(
+    [
     'fieldName' => 'name',
     'type'      => 'string',
     'columnName'=> 'user_name',
     'nullable'  => true,
     'unique'    => false,
     'length'    => 250,
-));
+    ]
+);
 
-$metadata->mapManyToMany(array(
+$metadata->mapManyToMany(
+    [
    'fieldName'      => 'groups',
    'targetEntity'   => 'DDC3579Group'
-));
+    ]
+);
 
 $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869ChequePayment.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869ChequePayment.php
index ad8b86d9e..e97e16f95 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869ChequePayment.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869ChequePayment.php
@@ -1,5 +1,7 @@
 <?php
-$metadata->mapField(array(
+$metadata->mapField(
+    [
    'fieldName'  => 'serialNumber',
    'type'       => 'string',
-));
\ No newline at end of file
+    ]
+);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869CreditCardPayment.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869CreditCardPayment.php
index 1318333a8..de9d8dae0 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869CreditCardPayment.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869CreditCardPayment.php
@@ -1,5 +1,7 @@
 <?php
-$metadata->mapField(array(
+$metadata->mapField(
+    [
    'fieldName'  => 'creditCardNumber',
    'type'       => 'string',
-));
\ No newline at end of file
+    ]
+);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869Payment.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869Payment.php
index 1d1f551ba..3a9b84793 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869Payment.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869Payment.php
@@ -2,16 +2,20 @@
 
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
-$metadata->mapField(array(
+$metadata->mapField(
+    [
    'id'         => true,
    'fieldName'  => 'id',
    'type'       => 'integer',
    'columnName' => 'id',
-));
-$metadata->mapField(array(
+    ]
+);
+$metadata->mapField(
+    [
    'fieldName'  => 'value',
    'type'       => 'float',
-  ));
+    ]
+);
 $metadata->isMappedSuperclass = true;
 $metadata->setCustomRepositoryClass("Doctrine\Tests\Models\DDC869\DDC869PaymentRepository");
-$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
\ No newline at end of file
+$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC889.DDC889Class.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC889.DDC889Class.php
index 90cfdc10b..e1161da13 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC889.DDC889Class.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC889.DDC889Class.php
@@ -2,11 +2,13 @@
 
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
-$metadata->mapField(array(
+$metadata->mapField(
+    [
    'id'         => true,
    'fieldName'  => 'id',
    'type'       => 'integer',
    'columnName' => 'id',
-));
+    ]
+);
 
-//$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
\ No newline at end of file
+//$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC889.DDC889SuperClass.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC889.DDC889SuperClass.php
index e56cc9bfd..c3ee069df 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC889.DDC889SuperClass.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC889.DDC889SuperClass.php
@@ -2,10 +2,12 @@
 
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
-$metadata->mapField(array(
+$metadata->mapField(
+    [
    'fieldName'  => 'name',
    'type'       => 'string',
-  ));
+    ]
+);
 $metadata->isMappedSuperclass = true;
 $metadata->setCustomRepositoryClass("Doctrine\Tests\Models\DDC889\DDC889SuperClass");
-$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
\ No newline at end of file
+$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964Admin.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964Admin.php
index bb8920e76..10175feca 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964Admin.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964Admin.php
@@ -1,21 +1,29 @@
 <?php
 
-$metadata->setAssociationOverride('address',array(
-    'joinColumns'=>array(array(
+$metadata->setAssociationOverride('address',
+    [
+    'joinColumns'=> [
+        [
         'name' => 'adminaddress_id',
         'referencedColumnName' => 'id',
-    ))
-));
+        ]
+    ]
+    ]
+);
 
-$metadata->setAssociationOverride('groups',array(
-    'joinTable' => array (
+$metadata->setAssociationOverride('groups',
+    [
+    'joinTable' => [
         'name'      => 'ddc964_users_admingroups',
-        'joinColumns' => array(array(
+        'joinColumns' => [
+            [
             'name' => 'adminuser_id',
-        )),
+            ]
+        ],
 
-        'inverseJoinColumns' =>array (array (
+        'inverseJoinColumns' => [[
             'name'      => 'admingroup_id',
-        ))
-  )
-));
\ No newline at end of file
+        ]]
+    ]
+    ]
+);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964Guest.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964Guest.php
index 5094ecddf..28f6f48c5 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964Guest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964Guest.php
@@ -1,13 +1,16 @@
 <?php
-$metadata->setAttributeOverride('id', array(
+$metadata->setAttributeOverride('id', [
     'columnName'    => 'guest_id',
     'type'          => 'integer',
     'length'        => 140,
-));
+]
+);
 
-$metadata->setAttributeOverride('name',array(
+$metadata->setAttributeOverride('name',
+    [
     'columnName'    => 'guest_name',
     'nullable'      => false,
     'unique'        => true,
     'length'        => 240,
-));
\ No newline at end of file
+    ]
+);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964User.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964User.php
index 7b66deef0..dc445f1ca 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964User.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964User.php
@@ -2,45 +2,57 @@
 
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
-$metadata->mapField(array(
+$metadata->mapField(
+    [
    'id'         => true,
    'fieldName'  => 'id',
    'type'       => 'integer',
    'columnName' => 'user_id',
    'length'     => 150,
-));
-$metadata->mapField(array(
+    ]
+);
+$metadata->mapField(
+    [
     'fieldName' => 'name',
     'type'      => 'string',
     'columnName'=> 'user_name',
     'nullable'  => true,
     'unique'    => false,
     'length'    => 250,
-));
+    ]
+);
 
-$metadata->mapManyToOne(array(
+$metadata->mapManyToOne(
+    [
    'fieldName'      => 'address',
    'targetEntity'   => 'DDC964Address',
-   'cascade'        => array('persist','merge'),
-   'joinColumn'     => array('name'=>'address_id', 'referencedColumnMame'=>'id'),
-));
+   'cascade'        => ['persist','merge'],
+   'joinColumn'     => ['name'=>'address_id', 'referencedColumnMame'=>'id'],
+    ]
+);
 
-$metadata->mapManyToMany(array(
+$metadata->mapManyToMany(
+    [
    'fieldName'      => 'groups',
    'targetEntity'   => 'DDC964Group',
    'inversedBy'     => 'users',
-   'cascade'        => array('persist','merge','detach'),
-   'joinTable'      => array(
+   'cascade'        => ['persist','merge','detach'],
+   'joinTable'      => [
         'name'          => 'ddc964_users_groups',
-        'joinColumns'   => array(array(
+        'joinColumns'   => [
+            [
             'name'=>'user_id',
             'referencedColumnName'=>'id',
-        )),
-        'inverseJoinColumns'=>array(array(
+            ]
+        ],
+        'inverseJoinColumns'=> [
+            [
             'name'=>'group_id',
             'referencedColumnName'=>'id',
-        ))
-   )
-));
+            ]
+        ]
+   ]
+    ]
+);
 
-$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
\ No newline at end of file
+$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Animal.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Animal.php
index 005178eed..3adc2a7a6 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Animal.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Animal.php
@@ -4,18 +4,23 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
 /* @var $metadata ClassMetadataInfo */
 $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_SINGLE_TABLE);
-$metadata->setDiscriminatorColumn(array(
+$metadata->setDiscriminatorColumn(
+    [
    'name' => 'dtype',
    'type' => 'string',
    'length' => 255,
    'fieldName' => 'dtype',
-  ));
-$metadata->setDiscriminatorMap(array(
+    ]
+);
+$metadata->setDiscriminatorMap(
+    [
    'cat' => 'Doctrine\\Tests\\ORM\\Mapping\\Cat',
    'dog' => 'Doctrine\\Tests\\ORM\\Mapping\\Dog',
-  ));
+    ]
+);
 $metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_DEFERRED_IMPLICIT);
-$metadata->mapField(array(
+$metadata->mapField(
+    [
    'fieldName' => 'id',
    'type' => 'string',
    'length' => NULL,
@@ -25,6 +30,7 @@ $metadata->mapField(array(
    'unique' => false,
    'id' => true,
    'columnName' => 'id',
-  ));
+    ]
+);
 $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_CUSTOM);
-$metadata->setCustomGeneratorDefinition(array("class" => "stdClass"));
+$metadata->setCustomGeneratorDefinition(["class" => "stdClass"]);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Comment.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Comment.php
index 85cbed4dc..a33ebbaeb 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Comment.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Comment.php
@@ -3,13 +3,16 @@
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
 $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE);
-$metadata->setPrimaryTable(array(
-   'indexes' => array(
-       array('columns' => array('content'), 'flags' => array('fulltext'), 'options'=> array('where' => 'content IS NOT NULL'))
-   )
-  ));
+$metadata->setPrimaryTable(
+    [
+   'indexes' => [
+       ['columns' => ['content'], 'flags' => ['fulltext'], 'options'=> ['where' => 'content IS NOT NULL']]
+   ]
+    ]
+);
 
-$metadata->mapField(array(
+$metadata->mapField(
+    [
     'fieldName' => 'content',
     'type' => 'text',
     'scale' => 0,
@@ -18,4 +21,5 @@ $metadata->mapField(array(
     'nullable' => false,
     'precision' => 0,
     'columnName' => 'content',
-));
\ No newline at end of file
+    ]
+);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.DDC1170Entity.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.DDC1170Entity.php
index 97f4624ba..dd442ceb0 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.DDC1170Entity.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.DDC1170Entity.php
@@ -2,15 +2,19 @@
 
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
-$metadata->mapField(array(
+$metadata->mapField(
+    [
    'id'                 => true,
    'fieldName'          => 'id',
    'columnDefinition'   => 'INT unsigned NOT NULL',
-));
+    ]
+);
 
-$metadata->mapField(array(
+$metadata->mapField(
+    [
     'fieldName'         => 'value',
     'columnDefinition'  => 'VARCHAR(255) NOT NULL'
-));
+    ]
+);
 
-$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_NONE);
\ No newline at end of file
+$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_NONE);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.DDC807Entity.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.DDC807Entity.php
index 1682d7a0d..c9d8ad9f2 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.DDC807Entity.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.DDC807Entity.php
@@ -2,14 +2,18 @@
 
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
-$metadata->mapField(array(
+$metadata->mapField(
+    [
    'id'                 => true,
    'fieldName'          => 'id',
-));
+    ]
+);
 
-$metadata->setDiscriminatorColumn(array(
+$metadata->setDiscriminatorColumn(
+    [
     'name'              => "dtype",
     'columnDefinition'  => "ENUM('ONE','TWO')"
-));
+    ]
+);
 
-$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_NONE);
\ No newline at end of file
+$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_NONE);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.PHPSLC.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.PHPSLC.php
index c9341958a..ad1ed23bf 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.PHPSLC.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.PHPSLC.php
@@ -2,11 +2,15 @@
 
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
-$metadata->enableCache(array(
+$metadata->enableCache(
+    [
     'usage' => ClassMetadataInfo::CACHE_USAGE_READ_ONLY
-));
-$metadata->mapManyToOne(array(
+    ]
+);
+$metadata->mapManyToOne(
+    [
     'fieldName'      => 'foo',
     'id'         => true,
     'targetEntity'   => 'PHPSLCFoo'
-));
\ No newline at end of file
+    ]
+);
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php
index 5bcc6d029..cc23c3992 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php
@@ -3,126 +3,144 @@
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
 $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE);
-$metadata->setPrimaryTable(array(
+$metadata->setPrimaryTable(
+    [
    'name' => 'cms_users',
-  ));
+    ]
+);
 $metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_DEFERRED_IMPLICIT);
 $metadata->addLifecycleCallback('doStuffOnPrePersist', 'prePersist');
 $metadata->addLifecycleCallback('doOtherStuffOnPrePersistToo', 'prePersist');
 $metadata->addLifecycleCallback('doStuffOnPostPersist', 'postPersist');
-$metadata->addNamedQuery(array(
+$metadata->addNamedQuery(
+    [
     'name'  => 'all',
     'query' => 'SELECT u FROM __CLASS__ u'
-));
-$metadata->mapField(array(
+    ]
+);
+$metadata->mapField(
+    [
    'id' => true,
    'fieldName' => 'id',
    'type' => 'integer',
    'columnName' => 'id',
-   'options' => array('foo' => 'bar', 'unsigned' => false),
-  ));
-$metadata->mapField(array(
+   'options' => ['foo' => 'bar', 'unsigned' => false],
+    ]
+);
+$metadata->mapField(
+    [
    'fieldName' => 'name',
    'type' => 'string',
    'length' => 50,
    'unique' => true,
    'nullable' => true,
    'columnName' => 'name',
-   'options' => array('foo' => 'bar', 'baz' => array('key' => 'val'), 'fixed' => false),
-  ));
-$metadata->mapField(array(
+   'options' => ['foo' => 'bar', 'baz' => ['key' => 'val'], 'fixed' => false],
+    ]
+);
+$metadata->mapField(
+    [
    'fieldName' => 'email',
    'type' => 'string',
    'columnName' => 'user_email',
    'columnDefinition' => 'CHAR(32) NOT NULL',
-  ));
-$mapping = array('fieldName' => 'version', 'type' => 'integer');
+    ]
+);
+$mapping = ['fieldName' => 'version', 'type' => 'integer'];
 $metadata->setVersionMapping($mapping);
 $metadata->mapField($mapping);
 $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
-$metadata->mapOneToOne(array(
+$metadata->mapOneToOne(
+    [
    'fieldName' => 'address',
    'targetEntity' => 'Doctrine\\Tests\\ORM\\Mapping\\Address',
    'cascade' =>
-   array(
+   [
    0 => 'remove',
-   ),
+   ],
    'mappedBy' => NULL,
    'inversedBy' => 'user',
    'joinColumns' =>
-   array(
+   [
    0 =>
-   array(
+   [
     'name' => 'address_id',
     'referencedColumnName' => 'id',
     'onDelete' => 'CASCADE',
-   ),
-   ),
+   ],
+   ],
    'orphanRemoval' => false,
-  ));
-$metadata->mapOneToMany(array(
+    ]
+);
+$metadata->mapOneToMany(
+    [
    'fieldName' => 'phonenumbers',
    'targetEntity' => 'Doctrine\\Tests\\ORM\\Mapping\\Phonenumber',
    'cascade' =>
-   array(
+   [
    1 => 'persist',
-   ),
+   ],
    'mappedBy' => 'user',
    'orphanRemoval' => true,
    'orderBy' =>
-   array(
+   [
    'number' => 'ASC',
-   ),
-  ));
-$metadata->mapManyToMany(array(
+   ],
+    ]
+);
+$metadata->mapManyToMany(
+    [
    'fieldName' => 'groups',
    'targetEntity' => 'Doctrine\\Tests\\ORM\\Mapping\\Group',
    'cascade' =>
-   array(
+   [
    0 => 'remove',
    1 => 'persist',
    2 => 'refresh',
    3 => 'merge',
    4 => 'detach',
-   ),
+   ],
    'mappedBy' => NULL,
    'joinTable' =>
-   array(
+   [
    'name' => 'cms_users_groups',
    'joinColumns' =>
-   array(
+   [
     0 =>
-    array(
+    [
     'name' => 'user_id',
     'referencedColumnName' => 'id',
     'unique' => false,
     'nullable' => false,
-    ),
-   ),
+    ],
+   ],
    'inverseJoinColumns' =>
-   array(
+   [
     0 =>
-    array(
+    [
     'name' => 'group_id',
     'referencedColumnName' => 'id',
     'columnDefinition' => 'INT NULL',
-    ),
-   ),
-   ),
+    ],
+   ],
+   ],
    'orderBy' => NULL,
-  ));
-$metadata->table['options'] = array(
+    ]
+);
+$metadata->table['options'] = [
     'foo' => 'bar',
-    'baz' => array('key' => 'val')
-);
-$metadata->table['uniqueConstraints'] = array(
-    'search_idx' => array('columns' => array('name', 'user_email'), 'options' => array('where' => 'name IS NOT NULL')),
-);
-$metadata->table['indexes'] = array(
-    'name_idx' => array('columns' => array('name')), 0 => array('columns' => array('user_email'))
-);
-$metadata->setSequenceGeneratorDefinition(array(
+    'baz' => ['key' => 'val']
+];
+$metadata->table['uniqueConstraints'] = [
+    'search_idx' => ['columns' => ['name', 'user_email'], 'options' => ['where' => 'name IS NOT NULL']],
+];
+$metadata->table['indexes'] = [
+    'name_idx' => ['columns' => ['name']], 0 => ['columns' => ['user_email']]
+];
+$metadata->setSequenceGeneratorDefinition(
+    [
         'sequenceName' => 'tablename_seq',
         'allocationSize' => 100,
         'initialValue' => 1,
-    ));
+    ]
+);
diff --git a/tests/Doctrine/Tests/ORM/Performance/DDC2602Test.php b/tests/Doctrine/Tests/ORM/Performance/DDC2602Test.php
index 210f72c80..4c992a870 100644
--- a/tests/Doctrine/Tests/ORM/Performance/DDC2602Test.php
+++ b/tests/Doctrine/Tests/ORM/Performance/DDC2602Test.php
@@ -17,12 +17,14 @@ class DDC2602Test extends OrmPerformanceTestCase
     {
         parent::setUp();
 
-        $this->_schemaTool->createSchema(array(
+        $this->_schemaTool->createSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602User'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602Biography'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602BiographyField'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602BiographyFieldChoice'),
-        ));
+            ]
+        );
 
         $this->loadFixture();
     }
@@ -31,18 +33,20 @@ class DDC2602Test extends OrmPerformanceTestCase
     {
         parent::tearDown();
 
-        $this->_schemaTool->dropSchema(array(
+        $this->_schemaTool->dropSchema(
+            [
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602User'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602Biography'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602BiographyField'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602BiographyFieldChoice'),
-        ));
+            ]
+        );
     }
 
     public function testIssue()
     {
         $eventManager = $this->_em->getEventManager();
-        $eventManager->addEventListener(array(Events::postLoad), new DDC2602PostLoadListener());
+        $eventManager->addEventListener([Events::postLoad], new DDC2602PostLoadListener());
 
         // Set maximum seconds this can run
         $this->setMaxRunningTime(1);
@@ -232,7 +236,7 @@ class DDC2602Biography
     /**
      * @var array
      */
-    public $fieldList = array();
+    public $fieldList = [];
 }
 
 /**
diff --git a/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php
index e4d65e1e7..0846ca4de 100644
--- a/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php
+++ b/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php
@@ -38,35 +38,35 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase
         $rsm->addFieldResult('u', 'u__name', 'name');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'u__username' => 'romanb',
                 'u__name' => 'Roman',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'u__username' => 'romanb',
                 'u__name' => 'Roman',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'u__username' => 'romanb',
                 'u__name' => 'Roman',
-            )
-        );
+            ]
+        ];
 
         for ($i = 4; $i < 10000; ++$i) {
-            $resultSet[] = array(
+            $resultSet[] = [
                 'u__id' => $i,
                 'u__status' => 'developer',
                 'u__username' => 'jwage',
                 'u__name' => 'Jonathan',
-            );
+            ];
         }
 
         $stmt = new HydratorMockStatement($resultSet);
@@ -96,35 +96,35 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase
         $rsm->addFieldResult('u', 'u__name', 'name');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'u__username' => 'romanb',
                 'u__name' => 'Roman',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'u__username' => 'romanb',
                 'u__name' => 'Roman',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'u__username' => 'romanb',
                 'u__name' => 'Roman',
-            )
-        );
+            ]
+        ];
 
         for ($i = 4; $i < 10000; ++$i) {
-            $resultSet[] = array(
+            $resultSet[] = [
                 'u__id' => $i,
                 'u__status' => 'developer',
                 'u__username' => 'jwage',
                 'u__name' => 'Jonathan',
-            );
+            ];
         }
 
         $stmt = new HydratorMockStatement($resultSet);
@@ -162,43 +162,43 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase
         $rsm->addFieldResult('p', 'p__phonenumber', 'phonenumber');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'u__username' => 'romanb',
                 'u__name' => 'Roman',
                 'sclr0' => 'ROMANB',
                 'p__phonenumber' => '42',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'u__username' => 'romanb',
                 'u__name' => 'Roman',
                 'sclr0' => 'ROMANB',
                 'p__phonenumber' => '43',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'u__username' => 'romanb',
                 'u__name' => 'Roman',
                 'sclr0' => 'JWAGE',
                 'p__phonenumber' => '91'
-            )
-        );
+            ]
+        ];
 
         for ($i = 4; $i < 10000; ++$i) {
-            $resultSet[] = array(
+            $resultSet[] = [
                 'u__id' => $i,
                 'u__status' => 'developer',
                 'u__username' => 'jwage',
                 'u__name' => 'Jonathan',
                 'sclr0' => 'JWAGE' . $i,
                 'p__phonenumber' => '91'
-            );
+            ];
         }
 
         $stmt = new HydratorMockStatement($resultSet);
@@ -226,35 +226,35 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase
         $rsm->addFieldResult('u', 'u__name', 'name');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'u__username' => 'romanb',
                 'u__name' => 'Roman',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'u__username' => 'romanb',
                 'u__name' => 'Roman',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'u__username' => 'romanb',
                 'u__name' => 'Roman',
-            )
-        );
+            ]
+        ];
 
         for ($i = 4; $i < 10000; ++$i) {
-            $resultSet[] = array(
+            $resultSet[] = [
                 'u__id' => $i,
                 'u__status' => 'developer',
                 'u__username' => 'jwage',
                 'u__name' => 'Jonathan',
-            );
+            ];
         }
 
         $stmt = new HydratorMockStatement($resultSet);
@@ -262,7 +262,7 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase
 
         $this->setMaxRunningTime(3);
         $s = microtime(true);
-        $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
         $e = microtime(true);
         echo __FUNCTION__ . " - " . ($e - $s) . " seconds" . PHP_EOL;
     }
@@ -292,25 +292,25 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase
         //$rsm->addFieldResult('a', 'a__city', 'city');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'u__username' => 'romanb',
                 'u__name' => 'Roman',
                 'a__id' => '1'
-            )
-        );
+            ]
+        ];
 
         for ($i = 2; $i < 10000; ++$i) {
-            $resultSet[] = array(
+            $resultSet[] = [
                 'u__id' => $i,
                 'u__status' => 'developer',
                 'u__username' => 'jwage',
                 'u__name' => 'Jonathan',
                 'a__id' => $i
-            );
+            ];
         }
 
         $stmt = new HydratorMockStatement($resultSet);
@@ -346,43 +346,43 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase
         $rsm->addFieldResult('p', 'p__phonenumber', 'phonenumber');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'u__username' => 'romanb',
                 'u__name' => 'Roman',
                 'sclr0' => 'ROMANB',
                 'p__phonenumber' => '42',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'u__username' => 'romanb',
                 'u__name' => 'Roman',
                 'sclr0' => 'ROMANB',
                 'p__phonenumber' => '43',
-            ),
-            array(
+            ],
+            [
                 'u__id' => '2',
                 'u__status' => 'developer',
                 'u__username' => 'romanb',
                 'u__name' => 'Roman',
                 'sclr0' => 'JWAGE',
                 'p__phonenumber' => '91'
-            )
-        );
+            ]
+        ];
 
         for ($i = 4; $i < 2000; ++$i) {
-            $resultSet[] = array(
+            $resultSet[] = [
                 'u__id' => $i,
                 'u__status' => 'developer',
                 'u__username' => 'jwage',
                 'u__name' => 'Jonathan',
                 'sclr0' => 'JWAGE' . $i,
                 'p__phonenumber' => '91'
-            );
+            ];
         }
 
         $stmt = new HydratorMockStatement($resultSet);
@@ -390,7 +390,7 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase
 
         $this->setMaxRunningTime(1);
         $s = microtime(true);
-        $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+        $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]);
         $e = microtime(true);
         echo __FUNCTION__ . " - " . ($e - $s) . " seconds" . PHP_EOL;
     }
@@ -425,9 +425,9 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase
         $rsm->addFieldResult('a', 'a__id', 'id');
 
         // Faked result set
-        $resultSet = array(
+        $resultSet = [
             //row1
-            array(
+            [
                 'u__id' => '1',
                 'u__status' => 'developer',
                 'u__username' => 'romanb',
@@ -435,11 +435,11 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase
                 'sclr0' => 'ROMANB',
                 'p__phonenumber' => '42',
                 'a__id' => '1'
-            )
-        );
+            ]
+        ];
 
         for ($i = 2; $i < 2000; ++$i) {
-            $resultSet[] = array(
+            $resultSet[] = [
                 'u__id' => $i,
                 'u__status' => 'developer',
                 'u__username' => 'jwage',
@@ -447,7 +447,7 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase
                 'sclr0' => 'JWAGE' . $i,
                 'p__phonenumber' => '91',
                 'a__id' => $i
-            );
+            ];
         }
 
         $stmt = new HydratorMockStatement($resultSet);
diff --git a/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php
index db5d0f8ef..8d66ba601 100644
--- a/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php
+++ b/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php
@@ -27,7 +27,7 @@ class PersisterPerformanceTest extends OrmFunctionalTestCase
         $author->username = "beberlei";
         $this->_em->persist($author);
 
-        $ids = array();
+        $ids = [];
         for ($i = 0; $i < 100; $i++) {
             $article = new CmsArticle();
             $article->text = "foo";
diff --git a/tests/Doctrine/Tests/ORM/Performance/ProxyPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/ProxyPerformanceTest.php
index bc98c23f6..de77aafd8 100644
--- a/tests/Doctrine/Tests/ORM/Performance/ProxyPerformanceTest.php
+++ b/tests/Doctrine/Tests/ORM/Performance/ProxyPerformanceTest.php
@@ -21,10 +21,10 @@ class ProxyPerformanceTest extends OrmPerformanceTestCase
      */
     public function entitiesProvider()
     {
-        return array(
-            array('Doctrine\Tests\Models\CMS\CmsEmployee'),
-            array('Doctrine\Tests\Models\CMS\CmsUser'),
-        );
+        return [
+            ['Doctrine\Tests\Models\CMS\CmsEmployee'],
+            ['Doctrine\Tests\Models\CMS\CmsUser'],
+        ];
     }
 
     /**
@@ -37,7 +37,7 @@ class ProxyPerformanceTest extends OrmPerformanceTestCase
         $start = microtime(true);
 
         for ($i = 0; $i < 100000; $i += 1) {
-            $user = $proxyFactory->getProxy($entityName, array('id' => $i));
+            $user = $proxyFactory->getProxy($entityName, ['id' => $i]);
         }
 
         echo __FUNCTION__ . " - " . (microtime(true) - $start) . " seconds with " . $entityName . PHP_EOL;
@@ -51,7 +51,7 @@ class ProxyPerformanceTest extends OrmPerformanceTestCase
         $em              = new MockEntityManager($this->_getEntityManager());
         $proxyFactory    = $em->getProxyFactory();
         /* @var $user \Doctrine\Common\Proxy\Proxy */
-        $user            = $proxyFactory->getProxy($entityName, array('id' => 1));
+        $user            = $proxyFactory->getProxy($entityName, ['id' => 1]);
         $initializer     = $user->__getInitializer();
 
         $this->setMaxRunningTime(5);
@@ -146,7 +146,7 @@ class PersisterMock extends BasicEntityPersister
     }
 
     /** {@inheritDoc} */
-    public function load(array $criteria, $entity = null, $assoc = null, array $hints = array(), $lockMode = 0, $limit = null, array $orderBy = null)
+    public function load(array $criteria, $entity = null, $assoc = null, array $hints = [], $lockMode = 0, $limit = null, array $orderBy = null)
     {
         return $entity;
     }
diff --git a/tests/Doctrine/Tests/ORM/Performance/SecondLevelCacheTest.php b/tests/Doctrine/Tests/ORM/Performance/SecondLevelCacheTest.php
index 774945c5a..279740918 100644
--- a/tests/Doctrine/Tests/ORM/Performance/SecondLevelCacheTest.php
+++ b/tests/Doctrine/Tests/ORM/Performance/SecondLevelCacheTest.php
@@ -159,8 +159,8 @@ class SecondLevelCacheTest extends OrmFunctionalTestCase
     {
         $times        = 50;
         $size         = 30;
-        $states       = array();
-        $cities       = array();
+        $states       = [];
+        $cities       = [];
         $startPersist = microtime(true);
         $country      = new Country("Country");
 
@@ -218,7 +218,7 @@ class SecondLevelCacheTest extends OrmFunctionalTestCase
     {
         $times        = 10;
         $size         = 500;
-        $countries    = array();
+        $countries    = [];
         $startPersist = microtime(true);
 
         echo PHP_EOL . $label;
@@ -279,4 +279,4 @@ class SecondLevelCacheTest extends OrmFunctionalTestCase
         printf("\n[%s] find %s countries (%s times)", number_format(microtime(true) - $startFind, 6), $size, $times);
         printf("\n%s\n", str_repeat('-', 50));
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Performance/UnitOfWorkPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/UnitOfWorkPerformanceTest.php
index 934933635..3d63eb4d8 100644
--- a/tests/Doctrine/Tests/ORM/Performance/UnitOfWorkPerformanceTest.php
+++ b/tests/Doctrine/Tests/ORM/Performance/UnitOfWorkPerformanceTest.php
@@ -23,7 +23,7 @@ class UnitOfWorkPerformanceTest extends OrmPerformanceTestCase
     {
         $n = 100;
 
-        $users = array();
+        $users = [];
         for ($i=1; $i<=$n; ++$i) {
             $user = new CmsUser;
             $user->status = 'user';
diff --git a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeParametersTest.php b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeParametersTest.php
index 74d72856e..db6fa5c83 100644
--- a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeParametersTest.php
+++ b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeParametersTest.php
@@ -43,12 +43,14 @@ class BasicEntityPersisterCompositeTypeParametersTest extends OrmTestCase
         $admin1  = new Admin1(10, "Rome", $country);
 
 
-        list ($values, $types) = $this->_persister->expandParameters(array(
+        list ($values, $types) = $this->_persister->expandParameters(
+            [
             'admin1' => $admin1
-        ));
+            ]
+        );
 
-        $this->assertEquals(array('integer', 'string'), $types);
-        $this->assertEquals(array(10, 'IT'), $values);
+        $this->assertEquals(['integer', 'string'], $types);
+        $this->assertEquals([10, 'IT'], $values);
     }
 
     public function testExpandCriteriaParametersWillExpandCompositeEntityKeys()
@@ -62,7 +64,7 @@ class BasicEntityPersisterCompositeTypeParametersTest extends OrmTestCase
 
         list ($values, $types) = $this->_persister->expandCriteriaParameters($criteria);
 
-        $this->assertEquals(array('integer', 'string'), $types);
-        $this->assertEquals(array(10, 'IT'), $values);
+        $this->assertEquals(['integer', 'string'], $types);
+        $this->assertEquals([10, 'IT'], $values);
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeSqlTest.php b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeSqlTest.php
index e788826d4..441ff0101 100644
--- a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeSqlTest.php
+++ b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeSqlTest.php
@@ -32,19 +32,19 @@ class BasicEntityPersisterCompositeTypeSqlTest extends OrmTestCase
 
     public function testSelectConditionStatementEq()
     {
-        $statement = $this->_persister->getSelectConditionStatementSQL('admin1', 1, array(), Comparison::EQ);
+        $statement = $this->_persister->getSelectConditionStatementSQL('admin1', 1, [], Comparison::EQ);
         $this->assertEquals('t0.admin1 = ? AND t0.country = ?', $statement);
     }
 
     public function testSelectConditionStatementEqNull()
     {
-        $statement = $this->_persister->getSelectConditionStatementSQL('admin1', null, array(), Comparison::IS);
+        $statement = $this->_persister->getSelectConditionStatementSQL('admin1', null, [], Comparison::IS);
         $this->assertEquals('t0.admin1 IS NULL AND t0.country IS NULL', $statement);
     }
 
     public function testSelectConditionStatementNeqNull()
     {
-        $statement = $this->_persister->getSelectConditionStatementSQL('admin1', null, array(), Comparison::NEQ);
+        $statement = $this->_persister->getSelectConditionStatementSQL('admin1', null, [], Comparison::NEQ);
         $this->assertEquals('t0.admin1 IS NOT NULL AND t0.country IS NOT NULL', $statement);
     }
 
@@ -53,6 +53,6 @@ class BasicEntityPersisterCompositeTypeSqlTest extends OrmTestCase
      */
     public function testSelectConditionStatementIn()
     {
-        $this->_persister->getSelectConditionStatementSQL('admin1', array(), array(), Comparison::IN);
+        $this->_persister->getSelectConditionStatementSQL('admin1', [], [], Comparison::IN);
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php
index b617d14da..c4d747058 100644
--- a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php
+++ b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php
@@ -65,8 +65,8 @@ class BasicEntityPersisterTypeValueSqlTest extends OrmTestCase
         $parent->customInteger = 1;
         $parent->child = $child;
 
-        $this->_em->getUnitOfWork()->registerManaged($parent, array('id' => 1), array('customInteger' => 0, 'child' => null));
-        $this->_em->getUnitOfWork()->registerManaged($child, array('id' => 1), array());
+        $this->_em->getUnitOfWork()->registerManaged($parent, ['id' => 1], ['customInteger' => 0, 'child' => null]);
+        $this->_em->getUnitOfWork()->registerManaged($child, ['id' => 1], []);
 
         $this->_em->getUnitOfWork()->propertyChanged($parent, 'customInteger', 0, 1);
         $this->_em->getUnitOfWork()->propertyChanged($parent, 'child', null, $child);
@@ -83,7 +83,7 @@ class BasicEntityPersisterTypeValueSqlTest extends OrmTestCase
         $method = new \ReflectionMethod($this->_persister, 'getSelectConditionSQL');
         $method->setAccessible(true);
 
-        $sql = $method->invoke($this->_persister,  array('customInteger' => 1, 'child' => 1));
+        $sql = $method->invoke($this->_persister,  ['customInteger' => 1, 'child' => 1]);
 
         $this->assertEquals('t0.customInteger = ABS(?) AND t0.child_id = ?', $sql);
     }
@@ -105,19 +105,19 @@ class BasicEntityPersisterTypeValueSqlTest extends OrmTestCase
      */
     public function testSelectConditionStatementIsNull()
     {
-        $statement = $this->_persister->getSelectConditionStatementSQL('test', null, array(), Comparison::IS);
+        $statement = $this->_persister->getSelectConditionStatementSQL('test', null, [], Comparison::IS);
         $this->assertEquals('test IS NULL', $statement);
     }
 
     public function testSelectConditionStatementEqNull()
     {
-        $statement = $this->_persister->getSelectConditionStatementSQL('test', null, array(), Comparison::EQ);
+        $statement = $this->_persister->getSelectConditionStatementSQL('test', null, [], Comparison::EQ);
         $this->assertEquals('test IS NULL', $statement);
     }
 
     public function testSelectConditionStatementNeqNull()
     {
-        $statement = $this->_persister->getSelectConditionStatementSQL('test', null, array(), Comparison::NEQ);
+        $statement = $this->_persister->getSelectConditionStatementSQL('test', null, [], Comparison::NEQ);
         $this->assertEquals('test IS NOT NULL', $statement);
     }
 
@@ -128,17 +128,17 @@ class BasicEntityPersisterTypeValueSqlTest extends OrmTestCase
     {
         $this->assertEquals(
             '(t0.id IN (?) OR t0.id IS NULL)',
-            $this->_persister->getSelectConditionStatementSQL('id', array(null))
+            $this->_persister->getSelectConditionStatementSQL('id', [null])
         );
 
         $this->assertEquals(
             '(t0.id IN (?) OR t0.id IS NULL)',
-            $this->_persister->getSelectConditionStatementSQL('id', array(null, 123))
+            $this->_persister->getSelectConditionStatementSQL('id', [null, 123])
         );
 
         $this->assertEquals(
             '(t0.id IN (?) OR t0.id IS NULL)',
-            $this->_persister->getSelectConditionStatementSQL('id', array(123, null))
+            $this->_persister->getSelectConditionStatementSQL('id', [123, null])
         );
     }
 
@@ -147,7 +147,7 @@ class BasicEntityPersisterTypeValueSqlTest extends OrmTestCase
         $persister = new BasicEntityPersister($this->_em, $this->_em->getClassMetadata('Doctrine\Tests\Models\Generic\NonAlphaColumnsEntity'));
 
         // Using a criteria as array
-        $statement = $persister->getCountSQL(array('value' => 'bar'));
+        $statement = $persister->getCountSQL(['value' => 'bar']);
         $this->assertEquals('SELECT COUNT(*) FROM "not-a-simple-entity" t0 WHERE t0."simple-entity-value" = ?', $statement);
 
         // Using a criteria object
diff --git a/tests/Doctrine/Tests/ORM/Persisters/JoinedSubclassPersisterTest.php b/tests/Doctrine/Tests/ORM/Persisters/JoinedSubclassPersisterTest.php
index 5d4e992f7..14deca100 100644
--- a/tests/Doctrine/Tests/ORM/Persisters/JoinedSubclassPersisterTest.php
+++ b/tests/Doctrine/Tests/ORM/Persisters/JoinedSubclassPersisterTest.php
@@ -42,6 +42,6 @@ class JoinedSubClassPersisterTest extends OrmTestCase
      */
     public function testExecuteInsertsWillReturnEmptySetWithNoQueuedInserts()
     {
-        $this->assertSame(array(), $this->persister->executeInserts());
+        $this->assertSame([], $this->persister->executeInserts());
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php b/tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php
index 174daf3c0..e7da7a463 100644
--- a/tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php
+++ b/tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php
@@ -48,7 +48,7 @@ class ProxyFactoryTest extends OrmTestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->connectionMock = new ConnectionMock(array(), new DriverMock());
+        $this->connectionMock = new ConnectionMock([], new DriverMock());
         $this->emMock = EntityManagerMock::create($this->connectionMock);
         $this->uowMock = new UnitOfWorkMock($this->emMock);
         $this->emMock->setUnitOfWork($this->uowMock);
@@ -57,9 +57,9 @@ class ProxyFactoryTest extends OrmTestCase
 
     public function testReferenceProxyDelegatesLoadingToThePersister()
     {
-        $identifier = array('id' => 42);
+        $identifier = ['id' => 42];
         $proxyClass = 'Proxies\__CG__\Doctrine\Tests\Models\ECommerce\ECommerceFeature';
-        $persister  = $this->getMockBuilder(BasicEntityPersister::class)->setMethods(array('load'))->disableOriginalConstructor()->getMock();
+        $persister  = $this->getMockBuilder(BasicEntityPersister::class)->setMethods(['load'])->disableOriginalConstructor()->getMock();
 
         $this->uowMock->setEntityPersister('Doctrine\Tests\Models\ECommerce\ECommerceFeature', $persister);
 
@@ -83,7 +83,7 @@ class ProxyFactoryTest extends OrmTestCase
         $cm->initializeReflection(new RuntimeReflectionService());
         $this->assertNotNull($cm->reflClass);
 
-        $num = $this->proxyFactory->generateProxyClasses(array($cm));
+        $num = $this->proxyFactory->generateProxyClasses([$cm]);
 
         $this->assertEquals(0, $num, "No proxies generated.");
     }
@@ -93,11 +93,11 @@ class ProxyFactoryTest extends OrmTestCase
      */
     public function testFailedProxyLoadingDoesNotMarkTheProxyAsInitialized()
     {
-        $persister = $this->getMockBuilder(BasicEntityPersister::class)->setMethods(array('load'))->disableOriginalConstructor()->getMock();
+        $persister = $this->getMockBuilder(BasicEntityPersister::class)->setMethods(['load'])->disableOriginalConstructor()->getMock();
         $this->uowMock->setEntityPersister('Doctrine\Tests\Models\ECommerce\ECommerceFeature', $persister);
 
         /* @var $proxy \Doctrine\Common\Proxy\Proxy */
-        $proxy = $this->proxyFactory->getProxy('Doctrine\Tests\Models\ECommerce\ECommerceFeature', array('id' => 42));
+        $proxy = $this->proxyFactory->getProxy('Doctrine\Tests\Models\ECommerce\ECommerceFeature', ['id' => 42]);
 
         $persister
             ->expects($this->atLeastOnce())
@@ -120,11 +120,11 @@ class ProxyFactoryTest extends OrmTestCase
      */
     public function testFailedProxyCloningDoesNotMarkTheProxyAsInitialized()
     {
-        $persister = $this->getMockBuilder(BasicEntityPersister::class)->setMethods(array('load'))->disableOriginalConstructor()->getMock();
+        $persister = $this->getMockBuilder(BasicEntityPersister::class)->setMethods(['load'])->disableOriginalConstructor()->getMock();
         $this->uowMock->setEntityPersister('Doctrine\Tests\Models\ECommerce\ECommerceFeature', $persister);
 
         /* @var $proxy \Doctrine\Common\Proxy\Proxy */
-        $proxy = $this->proxyFactory->getProxy('Doctrine\Tests\Models\ECommerce\ECommerceFeature', array('id' => 42));
+        $proxy = $this->proxyFactory->getProxy('Doctrine\Tests\Models\ECommerce\ECommerceFeature', ['id' => 42]);
 
         $persister
             ->expects($this->atLeastOnce())
diff --git a/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersJoinTest.php b/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersJoinTest.php
index e47c48215..bedcd6597 100644
--- a/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersJoinTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersJoinTest.php
@@ -25,7 +25,7 @@ class CustomTreeWalkersJoinTest extends OrmTestCase
     {
         try {
             $query = $this->em->createQuery($dqlToBeTested);
-            $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\Tests\ORM\Query\CustomTreeWalkerJoin'))
+            $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\Tests\ORM\Query\CustomTreeWalkerJoin'])
                   ->useQueryCache(false);
 
             $this->assertEquals($sqlToBeConfirmed, $query->getSql());
@@ -59,15 +59,15 @@ class CustomTreeWalkerJoin extends Query\TreeWalkerAdapter
     {
         foreach ($selectStatement->fromClause->identificationVariableDeclarations as $identificationVariableDeclaration) {
             $rangeVariableDecl = $identificationVariableDeclaration->rangeVariableDeclaration;
-            
+
             if ($rangeVariableDecl->abstractSchemaName !== 'Doctrine\Tests\Models\CMS\CmsUser') {
                 continue;
             }
-            
+
             $this->modifySelectStatement($selectStatement, $identificationVariableDeclaration);
         }
     }
-    
+
     private function modifySelectStatement(Query\AST\SelectStatement $selectStatement, $identificationVariableDecl)
     {
         $rangeVariableDecl       = $identificationVariableDecl->rangeVariableDeclaration;
@@ -75,7 +75,7 @@ class CustomTreeWalkerJoin extends Query\TreeWalkerAdapter
         $joinAssocDeclaration    = new Query\AST\JoinAssociationDeclaration($joinAssocPathExpression, $rangeVariableDecl->aliasIdentificationVariable . 'a', null);
         $join                    = new Query\AST\Join(Query\AST\Join::JOIN_TYPE_LEFT, $joinAssocDeclaration);
         $selectExpression        = new Query\AST\SelectExpression($rangeVariableDecl->aliasIdentificationVariable . 'a', null, false);
-        
+
         $identificationVariableDecl->joins[]                = $join;
         $selectStatement->selectClause->selectExpressions[] = $selectExpression;
 
@@ -84,14 +84,14 @@ class CustomTreeWalkerJoin extends Query\TreeWalkerAdapter
         $addressMetadata = $entityManager->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress');
 
         $this->setQueryComponent($rangeVariableDecl->aliasIdentificationVariable . 'a',
-            array(
+            [
                 'metadata'     => $addressMetadata,
                 'parent'       => $rangeVariableDecl->aliasIdentificationVariable,
                 'relation'     => $userMetadata->getAssociationMapping('address'),
                 'map'          => null,
                 'nestingLevel' => 0,
                 'token'        => null,
-            )
+            ]
         );
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersTest.php b/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersTest.php
index 4114c4f8b..d6ae70818 100644
--- a/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersTest.php
@@ -36,7 +36,7 @@ class CustomTreeWalkersTest extends OrmTestCase
         return $query->getSql();
     }
 
-    public function assertSqlGeneration($dqlToBeTested, $sqlToBeConfirmed, $treeWalkers = array(), $outputWalker = null)
+    public function assertSqlGeneration($dqlToBeTested, $sqlToBeConfirmed, $treeWalkers = [], $outputWalker = null)
     {
         try {
             $this->assertEquals($sqlToBeConfirmed, $this->generateSql($dqlToBeTested, $treeWalkers, $outputWalker));
@@ -50,7 +50,7 @@ class CustomTreeWalkersTest extends OrmTestCase
         $this->assertSqlGeneration(
             'select u from Doctrine\Tests\Models\CMS\CmsUser u',
             "SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3, c0_.email_id AS email_id_4 FROM cms_users c0_ WHERE c0_.id = 1",
-            array('Doctrine\Tests\ORM\Functional\CustomTreeWalker')
+            ['Doctrine\Tests\ORM\Functional\CustomTreeWalker']
         );
     }
 
@@ -59,7 +59,7 @@ class CustomTreeWalkersTest extends OrmTestCase
         $this->assertSqlGeneration(
             'select u from Doctrine\Tests\Models\CMS\CmsUser u where u.name = :name or u.name = :otherName',
             "SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3, c0_.email_id AS email_id_4 FROM cms_users c0_ WHERE (c0_.name = ? OR c0_.name = ?) AND c0_.id = 1",
-            array('Doctrine\Tests\ORM\Functional\CustomTreeWalker')
+            ['Doctrine\Tests\ORM\Functional\CustomTreeWalker']
         );
     }
 
@@ -68,7 +68,7 @@ class CustomTreeWalkersTest extends OrmTestCase
         $this->assertSqlGeneration(
             'select u from Doctrine\Tests\Models\CMS\CmsUser u where u.name = :name',
             "SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3, c0_.email_id AS email_id_4 FROM cms_users c0_ WHERE c0_.name = ? AND c0_.id = 1",
-            array('Doctrine\Tests\ORM\Functional\CustomTreeWalker')
+            ['Doctrine\Tests\ORM\Functional\CustomTreeWalker']
         );
     }
 
@@ -79,7 +79,7 @@ class CustomTreeWalkersTest extends OrmTestCase
 
         $this->generateSql(
             'select u from Doctrine\Tests\Models\CMS\CmsUser u',
-            array(),
+            [],
             __NAMESPACE__ . '\\AddUnknownQueryComponentWalker'
         );
     }
@@ -89,7 +89,7 @@ class CustomTreeWalkersTest extends OrmTestCase
         $this->assertSqlGeneration(
             'select u from Doctrine\Tests\Models\CMS\CmsUser u',
             "SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3, c1_.id AS id_4, c1_.country AS country_5, c1_.zip AS zip_6, c1_.city AS city_7, c0_.email_id AS email_id_8, c1_.user_id AS user_id_9 FROM cms_users c0_ LEFT JOIN cms_addresses c1_ ON c0_.id = c1_.user_id WHERE c0_.id = 1",
-            array('Doctrine\Tests\ORM\Functional\CustomTreeWalkerJoin', 'Doctrine\Tests\ORM\Functional\CustomTreeWalker')
+            ['Doctrine\Tests\ORM\Functional\CustomTreeWalkerJoin', 'Doctrine\Tests\ORM\Functional\CustomTreeWalker']
         );
     }
 }
@@ -100,7 +100,7 @@ class AddUnknownQueryComponentWalker extends Query\SqlWalker
     {
         parent::walkSelectStatement($selectStatement);
 
-        $this->setQueryComponent('x', array());
+        $this->setQueryComponent('x', []);
     }
 }
 
@@ -109,7 +109,7 @@ class CustomTreeWalker extends Query\TreeWalkerAdapter
     public function walkSelectStatement(Query\AST\SelectStatement $selectStatement)
     {
         // Get the DQL aliases of all the classes we want to modify
-        $dqlAliases = array();
+        $dqlAliases = [];
 
         foreach ($this->_getQueryComponents() as $dqlAlias => $comp) {
             // Hard-coded check just for demonstration: We want to modify the query if
@@ -120,7 +120,7 @@ class CustomTreeWalker extends Query\TreeWalkerAdapter
         }
 
         // Create our conditions for all involved classes
-        $factors = array();
+        $factors = [];
         foreach ($dqlAliases as $alias) {
             $pathExpr = new Query\AST\PathExpression(Query\AST\PathExpression::TYPE_STATE_FIELD, $alias, 'id');
             $pathExpr->type = Query\AST\PathExpression::TYPE_STATE_FIELD;
@@ -139,7 +139,7 @@ class CustomTreeWalker extends Query\TreeWalkerAdapter
 
             // Since Phase 1 AST optimizations were included, we need to re-add the ConditionalExpression
             if ( ! ($condExpr instanceof Query\AST\ConditionalExpression)) {
-                $condExpr = new Query\AST\ConditionalExpression(array($condExpr));
+                $condExpr = new Query\AST\ConditionalExpression([$condExpr]);
 
                 $whereClause->conditionalExpression = $condExpr;
             }
@@ -153,27 +153,27 @@ class CustomTreeWalker extends Query\TreeWalkerAdapter
                 $primary = new Query\AST\ConditionalPrimary;
                 $primary->conditionalExpression = new Query\AST\ConditionalExpression($existingTerms);
                 $existingFactor = new Query\AST\ConditionalFactor($primary);
-                $term = new Query\AST\ConditionalTerm(array_merge(array($existingFactor), $factors));
+                $term = new Query\AST\ConditionalTerm(array_merge([$existingFactor], $factors));
 
-                $selectStatement->whereClause->conditionalExpression->conditionalTerms = array($term);
+                $selectStatement->whereClause->conditionalExpression->conditionalTerms = [$term];
             } else {
                 // Just one term so we can simply append our factors to that term
                 $singleTerm = $selectStatement->whereClause->conditionalExpression->conditionalTerms[0];
 
                 // Since Phase 1 AST optimizations were included, we need to re-add the ConditionalExpression
                 if ( ! ($singleTerm instanceof Query\AST\ConditionalTerm)) {
-                    $singleTerm = new Query\AST\ConditionalTerm(array($singleTerm));
+                    $singleTerm = new Query\AST\ConditionalTerm([$singleTerm]);
 
                     $selectStatement->whereClause->conditionalExpression->conditionalTerms[0] = $singleTerm;
                 }
 
                 $singleTerm->conditionalFactors = array_merge($singleTerm->conditionalFactors, $factors);
-                $selectStatement->whereClause->conditionalExpression->conditionalTerms = array($singleTerm);
+                $selectStatement->whereClause->conditionalExpression->conditionalTerms = [$singleTerm];
             }
         } else {
             // Create a new WHERE clause with our factors
             $term = new Query\AST\ConditionalTerm($factors);
-            $condExpr = new Query\AST\ConditionalExpression(array($term));
+            $condExpr = new Query\AST\ConditionalExpression([$term]);
             $whereClause = new Query\AST\WhereClause($condExpr);
             $selectStatement->whereClause = $whereClause;
         }
@@ -186,15 +186,15 @@ class CustomTreeWalkerJoin extends Query\TreeWalkerAdapter
     {
         foreach ($selectStatement->fromClause->identificationVariableDeclarations as $identificationVariableDeclaration) {
             $rangeVariableDecl = $identificationVariableDeclaration->rangeVariableDeclaration;
-            
+
             if ($rangeVariableDecl->abstractSchemaName !== 'Doctrine\Tests\Models\CMS\CmsUser') {
                 continue;
             }
-            
+
             $this->modifySelectStatement($selectStatement, $identificationVariableDeclaration);
         }
     }
-    
+
     private function modifySelectStatement(Query\AST\SelectStatement $selectStatement, $identificationVariableDecl)
     {
         $rangeVariableDecl       = $identificationVariableDecl->rangeVariableDeclaration;
@@ -202,7 +202,7 @@ class CustomTreeWalkerJoin extends Query\TreeWalkerAdapter
         $joinAssocDeclaration    = new Query\AST\JoinAssociationDeclaration($joinAssocPathExpression, $rangeVariableDecl->aliasIdentificationVariable . 'a', null);
         $join                    = new Query\AST\Join(Query\AST\Join::JOIN_TYPE_LEFT, $joinAssocDeclaration);
         $selectExpression        = new Query\AST\SelectExpression($rangeVariableDecl->aliasIdentificationVariable . 'a', null, false);
-        
+
         $identificationVariableDecl->joins[]                = $join;
         $selectStatement->selectClause->selectExpressions[] = $selectExpression;
 
@@ -211,14 +211,14 @@ class CustomTreeWalkerJoin extends Query\TreeWalkerAdapter
         $addressMetadata = $entityManager->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress');
 
         $this->setQueryComponent($rangeVariableDecl->aliasIdentificationVariable . 'a',
-            array(
+            [
                 'metadata'     => $addressMetadata,
                 'parent'       => $rangeVariableDecl->aliasIdentificationVariable,
                 'relation'     => $userMetadata->getAssociationMapping('address'),
                 'map'          => null,
                 'nestingLevel' => 0,
                 'token'        => null,
-            )
+            ]
         );
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Query/ExprTest.php b/tests/Doctrine/Tests/ORM/Query/ExprTest.php
index 61def1770..791f2f9b9 100644
--- a/tests/Doctrine/Tests/ORM/Query/ExprTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/ExprTest.php
@@ -55,7 +55,7 @@ class ExprTest extends OrmTestCase
     {
         $this->assertEquals('COUNT(DISTINCT u.id)', (string) $this->_expr->countDistinct('u.id'));
     }
-    
+
     public function testCountDistinctExprMulti()
     {
         $this->assertEquals('COUNT(DISTINCT u.id, u.name)', (string) $this->_expr->countDistinct('u.id', 'u.name'));
@@ -274,22 +274,22 @@ class ExprTest extends OrmTestCase
 
     public function testInExpr()
     {
-        $this->assertEquals('u.id IN(1, 2, 3)', (string) $this->_expr->in('u.id', array(1, 2, 3)));
+        $this->assertEquals('u.id IN(1, 2, 3)', (string) $this->_expr->in('u.id', [1, 2, 3]));
     }
 
     public function testInLiteralExpr()
     {
-        $this->assertEquals("u.type IN('foo', 'bar')", (string) $this->_expr->in('u.type', array('foo', 'bar')));
+        $this->assertEquals("u.type IN('foo', 'bar')", (string) $this->_expr->in('u.type', ['foo', 'bar']));
     }
 
     public function testNotInExpr()
     {
-        $this->assertEquals('u.id NOT IN(1, 2, 3)', (string) $this->_expr->notIn('u.id', array(1, 2, 3)));
+        $this->assertEquals('u.id NOT IN(1, 2, 3)', (string) $this->_expr->notIn('u.id', [1, 2, 3]));
     }
 
     public function testNotInLiteralExpr()
     {
-        $this->assertEquals("u.type NOT IN('foo', 'bar')", (string) $this->_expr->notIn('u.type', array('foo', 'bar')));
+        $this->assertEquals("u.type NOT IN('foo', 'bar')", (string) $this->_expr->notIn('u.type', ['foo', 'bar']));
     }
 
     public function testAndxOrxExpr()
@@ -360,8 +360,8 @@ class ExprTest extends OrmTestCase
     {
 
         // Andx
-        $andx = new Expr\Andx(array('1 = 1', '2 = 2'));
-        $this->assertEquals(array('1 = 1', '2 = 2'), $andx->getParts());
+        $andx = new Expr\Andx(['1 = 1', '2 = 2']);
+        $this->assertEquals(['1 = 1', '2 = 2'], $andx->getParts());
 
         // Comparison
         $comparison = new Expr\Comparison('foo', Expr\Comparison::EQ, 'bar');
@@ -376,13 +376,13 @@ class ExprTest extends OrmTestCase
         $this->assertEquals('f.id', $from->getIndexBy());
 
         // Func
-        $func = new Expr\Func('MAX', array('f.id'));
+        $func = new Expr\Func('MAX', ['f.id']);
         $this->assertEquals('MAX', $func->getName());
-        $this->assertEquals(array('f.id'), $func->getArguments());
+        $this->assertEquals(['f.id'], $func->getArguments());
 
         // GroupBy
-        $group = new Expr\GroupBy(array('foo DESC', 'bar ASC'));
-        $this->assertEquals(array('foo DESC', 'bar ASC'), $group->getParts());
+        $group = new Expr\GroupBy(['foo DESC', 'bar ASC']);
+        $this->assertEquals(['foo DESC', 'bar ASC'], $group->getParts());
 
         // Join
         $join = new Expr\Join(Expr\Join::INNER_JOIN, 'f.bar', 'b', Expr\Join::ON, 'b.bar_id = 1', 'b.bar_id');
@@ -394,8 +394,8 @@ class ExprTest extends OrmTestCase
         $this->assertEquals('b', $join->getAlias());
 
         // Literal
-        $literal = new Expr\Literal(array('foo'));
-        $this->assertEquals(array('foo'), $literal->getParts());
+        $literal = new Expr\Literal(['foo']);
+        $this->assertEquals(['foo'], $literal->getParts());
 
         // Math
         $math = new Expr\Math(10, '+', 20);
@@ -405,22 +405,22 @@ class ExprTest extends OrmTestCase
 
         // OrderBy
         $order = new Expr\OrderBy('foo', 'DESC');
-        $this->assertEquals(array('foo DESC'), $order->getParts());
+        $this->assertEquals(['foo DESC'], $order->getParts());
 
         // Andx
-        $orx = new Expr\Orx(array('foo = 1', 'bar = 2'));
-        $this->assertEquals(array('foo = 1', 'bar = 2'), $orx->getParts());
+        $orx = new Expr\Orx(['foo = 1', 'bar = 2']);
+        $this->assertEquals(['foo = 1', 'bar = 2'], $orx->getParts());
 
         // Select
-        $select = new Expr\Select(array('foo', 'bar'));
-        $this->assertEquals(array('foo', 'bar'), $select->getParts());
+        $select = new Expr\Select(['foo', 'bar']);
+        $this->assertEquals(['foo', 'bar'], $select->getParts());
     }
 
     public function testAddEmpty()
     {
         $andExpr = $this->_expr->andX();
         $andExpr->add($this->_expr->andX());
-        
+
         $this->assertEquals(0, $andExpr->count());
     }
 
@@ -428,7 +428,7 @@ class ExprTest extends OrmTestCase
     {
         $andExpr = $this->_expr->andX();
         $andExpr->add(null);
-        
+
         $this->assertEquals(0, $andExpr->count());
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php b/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php
index fe12b3989..88fdca9bf 100644
--- a/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php
@@ -46,7 +46,7 @@ class LanguageRecognitionTest extends OrmTestCase
         }
     }
 
-    public function parseDql($dql, $hints = array())
+    public function parseDql($dql, $hints = [])
     {
         $query = $this->_em->createQuery($dql);
         $query->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true);
@@ -86,50 +86,52 @@ class LanguageRecognitionTest extends OrmTestCase
     {
         $this->expectException(QueryException::class);
 
-        $this->_em->getConfiguration()->setEntityNamespaces(array(
+        $this->_em->getConfiguration()->setEntityNamespaces(
+            [
             'Unknown' => 'Unknown',
             'CMS' => 'Doctrine\Tests\Models\CMS'
-        ));
+            ]
+        );
 
         $this->parseDql($dql);
     }
 
     public function invalidDQL()
     {
-        return array(
+        return [
 
-            array('SELECT \'foo\' AS foo\bar FROM Doctrine\Tests\Models\CMS\CmsUser u'),
+            ['SELECT \'foo\' AS foo\bar FROM Doctrine\Tests\Models\CMS\CmsUser u'],
             /* Checks for invalid IdentificationVariables and AliasIdentificationVariables */
-            array('SELECT \foo FROM Doctrine\Tests\Models\CMS\CmsUser \foo'),
-            array('SELECT foo\ FROM Doctrine\Tests\Models\CMS\CmsUser foo\\'),
-            array('SELECT foo\bar FROM Doctrine\Tests\Models\CMS\CmsUser foo\bar'),
-            array('SELECT foo:bar FROM Doctrine\Tests\Models\CMS\CmsUser foo:bar'),
-            array('SELECT foo: FROM Doctrine\Tests\Models\CMS\CmsUser foo:'),
+            ['SELECT \foo FROM Doctrine\Tests\Models\CMS\CmsUser \foo'],
+            ['SELECT foo\ FROM Doctrine\Tests\Models\CMS\CmsUser foo\\'],
+            ['SELECT foo\bar FROM Doctrine\Tests\Models\CMS\CmsUser foo\bar'],
+            ['SELECT foo:bar FROM Doctrine\Tests\Models\CMS\CmsUser foo:bar'],
+            ['SELECT foo: FROM Doctrine\Tests\Models\CMS\CmsUser foo:'],
 
             /* Checks for invalid AbstractSchemaName */
-            array('SELECT u FROM UnknownClass u'),  // unknown
-            array('SELECT u FROM Unknown\Class u'), // unknown with namespace
-            array('SELECT u FROM \Unknown\Class u'), // unknown, leading backslash
-            array('SELECT u FROM Unknown\\\\Class u'), // unknown, syntactically bogus (duplicate \\)
-            array('SELECT u FROM Unknown\Class\ u'), // unknown, syntactically bogus (trailing \)
-            array('SELECT u FROM Unknown:Class u'), // unknown, with namespace alias
-            array('SELECT u FROM Unknown::Class u'), // unknown, with PAAMAYIM_NEKUDOTAYIM
-            array('SELECT u FROM Unknown:Class:Name u'), // unknown, with invalid namespace alias
-            array('SELECT u FROM UnknownClass: u'), // unknown, with invalid namespace alias
-            array('SELECT u FROM Unknown:Class: u'), // unknown, with invalid namespace alias
-            array('SELECT u FROM Doctrine\Tests\Models\CMS\\\\CmsUser u'), // syntactically bogus (duplicate \\)array('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser\ u'), // syntactically bogus (trailing \)
-            array('SELECT u FROM CMS::User u'),
-            array('SELECT u FROM CMS:User: u'),
-            array('SELECT u FROM CMS:User:Foo u'),
+            ['SELECT u FROM UnknownClass u'],  // unknown
+            ['SELECT u FROM Unknown\Class u'], // unknown with namespace
+            ['SELECT u FROM \Unknown\Class u'], // unknown, leading backslash
+            ['SELECT u FROM Unknown\\\\Class u'], // unknown, syntactically bogus (duplicate \\)
+            ['SELECT u FROM Unknown\Class\ u'], // unknown, syntactically bogus (trailing \)
+            ['SELECT u FROM Unknown:Class u'], // unknown, with namespace alias
+            ['SELECT u FROM Unknown::Class u'], // unknown, with PAAMAYIM_NEKUDOTAYIM
+            ['SELECT u FROM Unknown:Class:Name u'], // unknown, with invalid namespace alias
+            ['SELECT u FROM UnknownClass: u'], // unknown, with invalid namespace alias
+            ['SELECT u FROM Unknown:Class: u'], // unknown, with invalid namespace alias
+            ['SELECT u FROM Doctrine\Tests\Models\CMS\\\\CmsUser u'], // syntactically bogus (duplicate \\)array('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser\ u'), // syntactically bogus (trailing \)
+            ['SELECT u FROM CMS::User u'],
+            ['SELECT u FROM CMS:User: u'],
+            ['SELECT u FROM CMS:User:Foo u'],
 
             /* Checks for invalid AliasResultVariable */
-            array('SELECT \'foo\' AS \foo FROM Doctrine\Tests\Models\CMS\CmsUser u'),
-            array('SELECT \'foo\' AS \foo\bar FROM Doctrine\Tests\Models\CMS\CmsUser u'),
-            array('SELECT \'foo\' AS foo\ FROM Doctrine\Tests\Models\CMS\CmsUser u'),
-            array('SELECT \'foo\' AS foo\\\\bar FROM Doctrine\Tests\Models\CMS\CmsUser u'),
-            array('SELECT \'foo\' AS foo: FROM Doctrine\Tests\Models\CMS\CmsUser u'),
-            array('SELECT \'foo\' AS foo:bar FROM Doctrine\Tests\Models\CMS\CmsUser u'),
-        );
+            ['SELECT \'foo\' AS \foo FROM Doctrine\Tests\Models\CMS\CmsUser u'],
+            ['SELECT \'foo\' AS \foo\bar FROM Doctrine\Tests\Models\CMS\CmsUser u'],
+            ['SELECT \'foo\' AS foo\ FROM Doctrine\Tests\Models\CMS\CmsUser u'],
+            ['SELECT \'foo\' AS foo\\\\bar FROM Doctrine\Tests\Models\CMS\CmsUser u'],
+            ['SELECT \'foo\' AS foo: FROM Doctrine\Tests\Models\CMS\CmsUser u'],
+            ['SELECT \'foo\' AS foo:bar FROM Doctrine\Tests\Models\CMS\CmsUser u'],
+        ];
     }
 
     public function testSelectSingleComponentWithMultipleColumns()
@@ -671,7 +673,7 @@ class LanguageRecognitionTest extends OrmTestCase
     {
         $this->assertValidDQL("SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u HAVING u.username IS NULL");
     }
-    
+
     /**
      * @group DDC-3085
      */
diff --git a/tests/Doctrine/Tests/ORM/Query/LexerTest.php b/tests/Doctrine/Tests/ORM/Query/LexerTest.php
index 9c4a889f0..904b89787 100644
--- a/tests/Doctrine/Tests/ORM/Query/LexerTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/LexerTest.php
@@ -161,63 +161,63 @@ class LexerTest extends OrmTestCase
         $dql = "SELECT u FROM My\Namespace\User u WHERE u.name = 'Jack O''Neil'";
         $lexer = new Lexer($dql);
 
-        $tokens = array(
-            array(
+        $tokens = [
+            [
                 'value' => 'SELECT',
                 'type'  => Lexer::T_SELECT,
                 'position' => 0
-            ),
-            array(
+            ],
+            [
                 'value' => 'u',
                 'type'  => Lexer::T_IDENTIFIER,
                 'position' => 7
-            ),
-            array(
+            ],
+            [
                 'value' => 'FROM',
                 'type'  => Lexer::T_FROM,
                 'position' => 9
-            ),
-            array(
+            ],
+            [
                 'value' => 'My\Namespace\User',
                 'type'  => Lexer::T_FULLY_QUALIFIED_NAME,
                 'position' => 14
-            ),
-            array(
+            ],
+            [
                 'value' => 'u',
                 'type'  => Lexer::T_IDENTIFIER,
                 'position' => 32
-            ),
-            array(
+            ],
+            [
                 'value' => 'WHERE',
                 'type'  => Lexer::T_WHERE,
                 'position' => 34
-            ),
-            array(
+            ],
+            [
                 'value' => 'u',
                 'type'  => Lexer::T_IDENTIFIER,
                 'position' => 40
-            ),
-            array(
+            ],
+            [
                 'value' => '.',
                 'type'  => Lexer::T_DOT,
                 'position' => 41
-            ),
-            array(
+            ],
+            [
                 'value' => 'name',
                 'type'  => Lexer::T_IDENTIFIER,
                 'position' => 42
-            ),
-            array(
+            ],
+            [
                 'value' => '=',
                 'type'  => Lexer::T_EQUALS,
                 'position' => 47
-            ),
-            array(
+            ],
+            [
                 'value' => "Jack O'Neil",
                 'type'  => Lexer::T_STRING,
                 'position' => 49
-            )
-        );
+            ]
+        ];
 
         foreach ($tokens as $expected) {
             $lexer->moveNext();
@@ -232,16 +232,16 @@ class LexerTest extends OrmTestCase
 
     public function provideTokens()
     {
-        return array(
-            array(Lexer::T_IDENTIFIER, 'u'), // one char
-            array(Lexer::T_IDENTIFIER, 'someIdentifier'),
-            array(Lexer::T_IDENTIFIER, 's0m31d3nt1f13r'), // including digits
-            array(Lexer::T_IDENTIFIER, 'some_identifier'), // including underscore
-            array(Lexer::T_IDENTIFIER, '_some_identifier'), // starts with underscore
-            array(Lexer::T_IDENTIFIER, 'comma'), // name of a token class with value < 100 (whitebox test)
-            array(Lexer::T_FULLY_QUALIFIED_NAME, 'Some\Class'), // DQL class reference
-            array(Lexer::T_ALIASED_NAME, 'Some:Name'),
-            array(Lexer::T_ALIASED_NAME, 'Some:Subclassed\Name')
-        );
+        return [
+            [Lexer::T_IDENTIFIER, 'u'], // one char
+            [Lexer::T_IDENTIFIER, 'someIdentifier'],
+            [Lexer::T_IDENTIFIER, 's0m31d3nt1f13r'], // including digits
+            [Lexer::T_IDENTIFIER, 'some_identifier'], // including underscore
+            [Lexer::T_IDENTIFIER, '_some_identifier'], // starts with underscore
+            [Lexer::T_IDENTIFIER, 'comma'], // name of a token class with value < 100 (whitebox test)
+            [Lexer::T_FULLY_QUALIFIED_NAME, 'Some\Class'], // DQL class reference
+            [Lexer::T_ALIASED_NAME, 'Some:Name'],
+            [Lexer::T_ALIASED_NAME, 'Some:Subclassed\Name']
+        ];
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Query/ParameterTypeInfererTest.php b/tests/Doctrine/Tests/ORM/Query/ParameterTypeInfererTest.php
index 640a91314..b929f8d18 100644
--- a/tests/Doctrine/Tests/ORM/Query/ParameterTypeInfererTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/ParameterTypeInfererTest.php
@@ -13,20 +13,20 @@ class ParameterTypeInfererTest extends OrmTestCase
 
     public function providerParameterTypeInferer()
     {
-         $data = array(
-            array(1,                 Type::INTEGER),
-            array("bar",             PDO::PARAM_STR),
-            array("1",               PDO::PARAM_STR),
-            array(new \DateTime,     Type::DATETIME),
-            array(array(2),          Connection::PARAM_INT_ARRAY),
-            array(array("foo"),      Connection::PARAM_STR_ARRAY),
-            array(array("1","2"),    Connection::PARAM_STR_ARRAY),
-            array(array(),           Connection::PARAM_STR_ARRAY),
-            array(true,              Type::BOOLEAN),
-        );
+         $data = [
+            [1,                 Type::INTEGER],
+            ["bar",             PDO::PARAM_STR],
+            ["1",               PDO::PARAM_STR],
+            [new \DateTime,     Type::DATETIME],
+            [[2],          Connection::PARAM_INT_ARRAY],
+            [["foo"],      Connection::PARAM_STR_ARRAY],
+            [["1","2"],    Connection::PARAM_STR_ARRAY],
+            [[],           Connection::PARAM_STR_ARRAY],
+            [true,              Type::BOOLEAN],
+         ];
 
         if (PHP_VERSION_ID >= 50500) {
-            $data[] = array(new \DateTimeImmutable(), Type::DATETIME);
+            $data[] = [new \DateTimeImmutable(), Type::DATETIME];
         }
 
         return $data;
diff --git a/tests/Doctrine/Tests/ORM/Query/ParserResultTest.php b/tests/Doctrine/Tests/ORM/Query/ParserResultTest.php
index 086e1d43e..0a61d7d31 100644
--- a/tests/Doctrine/Tests/ORM/Query/ParserResultTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/ParserResultTest.php
@@ -26,7 +26,7 @@ class ParserResultTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertNull($this->parserResult->getSqlExecutor());
 
-        $executor = $this->getMockBuilder(AbstractSqlExecutor::class)->setMethods(array('execute'))->getMock();
+        $executor = $this->getMockBuilder(AbstractSqlExecutor::class)->setMethods(['execute'])->getMock();
         $this->parserResult->setSqlExecutor($executor);
         $this->assertSame($executor, $this->parserResult->getSqlExecutor());
     }
@@ -35,7 +35,7 @@ class ParserResultTest extends \PHPUnit_Framework_TestCase
     {
         $this->parserResult->addParameterMapping(1, 1);
         $this->parserResult->addParameterMapping(1, 2);
-        $this->assertEquals(array(1, 2), $this->parserResult->getSqlParameterPositions(1));
+        $this->assertEquals([1, 2], $this->parserResult->getSqlParameterPositions(1));
     }
 
     public function testGetParameterMappings()
@@ -44,6 +44,6 @@ class ParserResultTest extends \PHPUnit_Framework_TestCase
 
         $this->parserResult->addParameterMapping(1, 1);
         $this->parserResult->addParameterMapping(1, 2);
-        $this->assertEquals(array(1 => array(1, 2)), $this->parserResult->getParameterMappings());
+        $this->assertEquals([1 => [1, 2]], $this->parserResult->getParameterMappings());
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Query/ParserTest.php b/tests/Doctrine/Tests/ORM/Query/ParserTest.php
index fb320773e..6b898f80b 100644
--- a/tests/Doctrine/Tests/ORM/Query/ParserTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/ParserTest.php
@@ -108,28 +108,29 @@ class ParserTest extends OrmTestCase
          * The basic checks that tokens are classified correctly do not belong here
          * but in LexerTest.
          */
-        return array(
-            array(Lexer::T_WHERE, 'where'), // keyword
-            array(Lexer::T_DOT, '.'), // token that cannot be an identifier
-            array(Lexer::T_IDENTIFIER, 'someIdentifier'),
-            array(Lexer::T_IDENTIFIER, 'from'), // also a terminal string (the "FROM" keyword) as in DDC-505
-            array(Lexer::T_IDENTIFIER, 'comma') // not even a terminal string, but the name of a constant in the Lexer (whitebox test)
-        );
+        return [
+            [Lexer::T_WHERE, 'where'], // keyword
+            [Lexer::T_DOT, '.'], // token that cannot be an identifier
+            [Lexer::T_IDENTIFIER, 'someIdentifier'],
+            [Lexer::T_IDENTIFIER, 'from'], // also a terminal string (the "FROM" keyword) as in DDC-505
+            [Lexer::T_IDENTIFIER, 'comma']
+            // not even a terminal string, but the name of a constant in the Lexer (whitebox test)
+        ];
     }
 
     public function invalidMatches()
     {
-        return array(
-            array(Lexer::T_DOT, 'ALL'), // ALL is a terminal string (reserved keyword) and also possibly an identifier
-            array(Lexer::T_DOT, ','), // "," is a token on its own, but cannot be used as identifier
-            array(Lexer::T_WHERE, 'WITH'), // as in DDC-3697
-            array(Lexer::T_WHERE, '.'),
+        return [
+            [Lexer::T_DOT, 'ALL'], // ALL is a terminal string (reserved keyword) and also possibly an identifier
+            [Lexer::T_DOT, ','], // "," is a token on its own, but cannot be used as identifier
+            [Lexer::T_WHERE, 'WITH'], // as in DDC-3697
+            [Lexer::T_WHERE, '.'],
 
             // The following are qualified or aliased names and must not be accepted where only an Identifier is expected
-            array(Lexer::T_IDENTIFIER, '\\Some\\Class'),
-            array(Lexer::T_IDENTIFIER, 'Some\\Class'),
-            array(Lexer::T_IDENTIFIER, 'Some:Name'),
-        );
+            [Lexer::T_IDENTIFIER, '\\Some\\Class'],
+            [Lexer::T_IDENTIFIER, 'Some\\Class'],
+            [Lexer::T_IDENTIFIER, 'Some:Name'],
+        ];
     }
 
     private function createParser($dql)
diff --git a/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php b/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php
index b8d688261..7653be5ec 100644
--- a/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php
@@ -30,7 +30,7 @@ class QueryExpressionVisitorTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $this->visitor = new QueryExpressionVisitor(array('o','p'));
+        $this->visitor = new QueryExpressionVisitor(['o','p']);
     }
 
     /**
@@ -44,7 +44,7 @@ class QueryExpressionVisitorTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertEquals($queryExpr, $this->visitor->walkComparison($criteriaExpr));
         if ($parameter) {
-            $this->assertEquals(new ArrayCollection(array($parameter)), $this->visitor->getParameters());
+            $this->assertEquals(new ArrayCollection([$parameter]), $this->visitor->getParameters());
         }
     }
 
@@ -53,30 +53,30 @@ class QueryExpressionVisitorTest extends \PHPUnit_Framework_TestCase
         $cb = new CriteriaBuilder();
         $qb = new QueryBuilder();
 
-        return array(
-            array($cb->eq('field', 'value'), $qb->eq('o.field', ':field'), new Parameter('field', 'value')),
-            array($cb->neq('field', 'value'), $qb->neq('o.field', ':field'), new Parameter('field', 'value')),
-            array($cb->eq('field', null), $qb->isNull('o.field')),
-            array($cb->neq('field', null), $qb->isNotNull('o.field')),
-            array($cb->isNull('field'), $qb->isNull('o.field')),
+        return [
+            [$cb->eq('field', 'value'), $qb->eq('o.field', ':field'), new Parameter('field', 'value')],
+            [$cb->neq('field', 'value'), $qb->neq('o.field', ':field'), new Parameter('field', 'value')],
+            [$cb->eq('field', null), $qb->isNull('o.field')],
+            [$cb->neq('field', null), $qb->isNotNull('o.field')],
+            [$cb->isNull('field'), $qb->isNull('o.field')],
 
-            array($cb->gt('field', 'value'), $qb->gt('o.field', ':field'), new Parameter('field', 'value')),
-            array($cb->gte('field', 'value'), $qb->gte('o.field', ':field'), new Parameter('field', 'value')),
-            array($cb->lt('field', 'value'), $qb->lt('o.field', ':field'), new Parameter('field', 'value')),
-            array($cb->lte('field', 'value'), $qb->lte('o.field', ':field'), new Parameter('field', 'value')),
+            [$cb->gt('field', 'value'), $qb->gt('o.field', ':field'), new Parameter('field', 'value')],
+            [$cb->gte('field', 'value'), $qb->gte('o.field', ':field'), new Parameter('field', 'value')],
+            [$cb->lt('field', 'value'), $qb->lt('o.field', ':field'), new Parameter('field', 'value')],
+            [$cb->lte('field', 'value'), $qb->lte('o.field', ':field'), new Parameter('field', 'value')],
 
-            array($cb->in('field', array('value')), $qb->in('o.field', ':field'), new Parameter('field', array('value'))),
-            array($cb->notIn('field', array('value')), $qb->notIn('o.field', ':field'), new Parameter('field', array('value'))),
+            [$cb->in('field', ['value']), $qb->in('o.field', ':field'), new Parameter('field', ['value'])],
+            [$cb->notIn('field', ['value']), $qb->notIn('o.field', ':field'), new Parameter('field', ['value'])],
 
-            array($cb->contains('field', 'value'), $qb->like('o.field', ':field'), new Parameter('field', '%value%')),
+            [$cb->contains('field', 'value'), $qb->like('o.field', ':field'), new Parameter('field', '%value%')],
 
             // Test parameter conversion
-            array($cb->eq('object.field', 'value'), $qb->eq('o.object.field', ':object_field'), new Parameter('object_field', 'value')),
+            [$cb->eq('object.field', 'value'), $qb->eq('o.object.field', ':object_field'), new Parameter('object_field', 'value')],
 
             // Test alternative rootAlias
-            array($cb->eq('p.field', 'value'), $qb->eq('p.field', ':p_field'), new Parameter('p_field', 'value')),
-            array($cb->eq('p.object.field', 'value'), $qb->eq('p.object.field', ':p_object_field'), new Parameter('p_object_field', 'value')),
-        );
+            [$cb->eq('p.field', 'value'), $qb->eq('p.field', ':p_field'), new Parameter('p_field', 'value')],
+            [$cb->eq('p.object.field', 'value'), $qb->eq('p.object.field', ':p_object_field'), new Parameter('p_object_field', 'value')],
+        ];
     }
 
     public function testWalkAndCompositeExpression()
diff --git a/tests/Doctrine/Tests/ORM/Query/QueryTest.php b/tests/Doctrine/Tests/ORM/Query/QueryTest.php
index 7a3687c52..e646d670a 100644
--- a/tests/Doctrine/Tests/ORM/Query/QueryTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/QueryTest.php
@@ -89,7 +89,7 @@ class QueryTest extends OrmTestCase
           ->setHint('foo', 'bar')
           ->setHint('bar', 'baz')
           ->setParameter(1, 'bar')
-          ->setParameters(new ArrayCollection(array(new Parameter(2, 'baz'))))
+          ->setParameters(new ArrayCollection([new Parameter(2, 'baz')]))
           ->setResultCacheDriver(null)
           ->setResultCacheId('foo')
           ->setDQL('foo')
@@ -109,7 +109,7 @@ class QueryTest extends OrmTestCase
 
         $this->assertEquals('bar', $q->getHint('foo'));
         $this->assertEquals('baz', $q->getHint('bar'));
-        $this->assertEquals(array('foo' => 'bar', 'bar' => 'baz'), $q->getHints());
+        $this->assertEquals(['foo' => 'bar', 'bar' => 'baz'], $q->getHints());
         $this->assertTrue($q->hasHint('foo'));
         $this->assertFalse($q->hasHint('barFooBaz'));
     }
@@ -154,11 +154,11 @@ class QueryTest extends OrmTestCase
      */
     public function testCollectionParameters()
     {
-        $cities = array(
+        $cities = [
             0 => "Paris",
             3 => "Canne",
             9 => "St Julien"
-        );
+        ];
 
         $query  = $this->_em
                 ->createQuery("SELECT a FROM Doctrine\Tests\Models\CMS\CmsAddress a WHERE a.city IN (:cities)")
@@ -186,11 +186,11 @@ class QueryTest extends OrmTestCase
     public function testDefaultQueryHints()
     {
         $config = $this->_em->getConfiguration();
-        $defaultHints = array(
+        $defaultHints = [
             'hint_name_1' => 'hint_value_1',
             'hint_name_2' => 'hint_value_2',
             'hint_name_3' => 'hint_value_3',
-        );
+        ];
 
         $config->setDefaultQueryHints($defaultHints);
         $query = $this->_em->createQuery();
diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
index 707973495..9a074d60e 100644
--- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
@@ -37,7 +37,8 @@ class SelectSqlGenerationTest extends OrmTestCase
      * @param array $queryHints
      * @param array $queryParams
      */
-    public function assertSqlGeneration($dqlToBeTested, $sqlToBeConfirmed, array $queryHints = array(), array $queryParams = array())
+    public function assertSqlGeneration($dqlToBeTested, $sqlToBeConfirmed, array $queryHints = [], array $queryParams = []
+    )
     {
         try {
             $query = $this->_em->createQuery($dqlToBeTested);
@@ -75,7 +76,8 @@ class SelectSqlGenerationTest extends OrmTestCase
      * @param array $queryHints
      * @param array $queryParams
      */
-    public function assertInvalidSqlGeneration($dqlToBeTested, $expectedException, array $queryHints = array(), array $queryParams = array())
+    public function assertInvalidSqlGeneration($dqlToBeTested, $expectedException, array $queryHints = [], array $queryParams = []
+    )
     {
         $this->expectException($expectedException);
 
@@ -107,7 +109,7 @@ class SelectSqlGenerationTest extends OrmTestCase
         $this->assertSqlGeneration(
             'SELECT c.id FROM Doctrine\Tests\Models\Company\CompanyPerson c JOIN Doctrine\Tests\Models\Company\CompanyPerson r WHERE c.spouse = r AND r.id = 42',
             'SELECT c0_.id AS id_0 FROM company_persons c0_ INNER JOIN company_persons c1_ WHERE c0_.spouse_id = c1_.id AND c1_.id = 42',
-            array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => true)
+            [ORMQuery::HINT_FORCE_PARTIAL_LOAD => true]
         );
     }
 
@@ -124,7 +126,7 @@ class SelectSqlGenerationTest extends OrmTestCase
         $this->assertSqlGeneration(
             'SELECT c.id FROM Doctrine\Tests\Models\Company\CompanyPerson c JOIN Doctrine\Tests\Models\Company\CompanyPerson r WHERE c.spouse = r AND r.id = 42',
             'SELECT c0_.id AS id_0 FROM company_persons c0_ LEFT JOIN company_managers c1_ ON c0_.id = c1_.id LEFT JOIN company_employees c2_ ON c0_.id = c2_.id INNER JOIN company_persons c3_ LEFT JOIN company_managers c4_ ON c3_.id = c4_.id LEFT JOIN company_employees c5_ ON c3_.id = c5_.id WHERE c0_.spouse_id = c3_.id AND c3_.id = 42',
-            array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false)
+            [ORMQuery::HINT_FORCE_PARTIAL_LOAD => false]
         );
     }
 
@@ -554,7 +556,7 @@ class SelectSqlGenerationTest extends OrmTestCase
         $this->assertSqlGeneration(
             "SELECT u FROM Doctrine\Tests\Models\Company\CompanyPerson u WHERE u INSTANCE OF ?1",
             "SELECT c0_.id AS id_0, c0_.name AS name_1, c0_.discr AS discr_2 FROM company_persons c0_ WHERE c0_.discr IN (?)",
-            array(), array(1 => $this->_em->getClassMetadata('Doctrine\Tests\Models\Company\CompanyEmployee'))
+            [], [1 => $this->_em->getClassMetadata('Doctrine\Tests\Models\Company\CompanyEmployee')]
         );
     }
 
@@ -699,7 +701,7 @@ class SelectSqlGenerationTest extends OrmTestCase
         $group->id = 101;
         $group2 = new CmsGroup();
         $group2->id = 105;
-        $q->setParameter('param', array($group, $group2));
+        $q->setParameter('param', [$group, $group2]);
 
         $this->assertEquals(
             'SELECT c0_.id AS id_0 FROM cms_users c0_ WHERE EXISTS (SELECT 1 FROM cms_users_groups c1_ INNER JOIN cms_groups c2_ ON c1_.group_id = c2_.id WHERE c1_.user_id = c0_.id AND c2_.id IN (?))',
@@ -713,7 +715,7 @@ class SelectSqlGenerationTest extends OrmTestCase
         // Tough one: Many-many self-referencing ("friends") with class table inheritance
         $q = $this->_em->createQuery('SELECT p FROM Doctrine\Tests\Models\Company\CompanyPerson p WHERE :param MEMBER OF p.friends');
         $person = new CompanyPerson();
-        $this->_em->getClassMetadata(get_class($person))->setIdentifierValues($person, array('id' => 101));
+        $this->_em->getClassMetadata(get_class($person))->setIdentifierValues($person, ['id' => 101]);
         $q->setParameter('param', $person);
         $this->assertEquals(
             'SELECT c0_.id AS id_0, c0_.name AS name_1, c1_.title AS title_2, c2_.salary AS salary_3, c2_.department AS department_4, c2_.startDate AS startDate_5, c0_.discr AS discr_6, c0_.spouse_id AS spouse_id_7, c1_.car_id AS car_id_8 FROM company_persons c0_ LEFT JOIN company_managers c1_ ON c0_.id = c1_.id LEFT JOIN company_employees c2_ ON c0_.id = c2_.id WHERE EXISTS (SELECT 1 FROM company_persons_friends c3_ INNER JOIN company_persons c4_ ON c3_.friend_id = c4_.id WHERE c3_.person_id = c0_.id AND c4_.id IN (?))',
@@ -1047,7 +1049,7 @@ class SelectSqlGenerationTest extends OrmTestCase
             "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = 'gblanco'",
             "SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3 ".
             "FROM cms_users c0_ WHERE c0_.username = 'gblanco' FOR UPDATE",
-            array(ORMQuery::HINT_LOCK_MODE => LockMode::PESSIMISTIC_WRITE)
+            [ORMQuery::HINT_LOCK_MODE => LockMode::PESSIMISTIC_WRITE]
         );
     }
 
@@ -1063,7 +1065,7 @@ class SelectSqlGenerationTest extends OrmTestCase
             "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = 'gblanco'",
             "SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3 ".
             "FROM cms_users c0_ WHERE c0_.username = 'gblanco' FOR SHARE",
-            array(ORMQuery::HINT_LOCK_MODE => LockMode::PESSIMISTIC_READ)
+            [ORMQuery::HINT_LOCK_MODE => LockMode::PESSIMISTIC_READ]
         );
     }
 
@@ -1077,7 +1079,7 @@ class SelectSqlGenerationTest extends OrmTestCase
             "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = 'gblanco'",
             "SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3 ".
             "FROM cms_users c0_ WHERE c0_.username = 'gblanco'",
-            array(ORMQuery::HINT_LOCK_MODE => LockMode::NONE)
+            [ORMQuery::HINT_LOCK_MODE => LockMode::NONE]
         );
     }
 
@@ -1104,7 +1106,7 @@ class SelectSqlGenerationTest extends OrmTestCase
             "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = 'gblanco'",
             "SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3 ".
             "FROM cms_users c0_ WHERE c0_.username = 'gblanco' LOCK IN SHARE MODE",
-            array(ORMQuery::HINT_LOCK_MODE => LockMode::PESSIMISTIC_READ)
+            [ORMQuery::HINT_LOCK_MODE => LockMode::PESSIMISTIC_READ]
         );
     }
 
@@ -1120,7 +1122,7 @@ class SelectSqlGenerationTest extends OrmTestCase
             "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = 'gblanco'",
             "SELECT c0_.id AS ID_0, c0_.status AS STATUS_1, c0_.username AS USERNAME_2, c0_.name AS NAME_3 ".
             "FROM cms_users c0_ WHERE c0_.username = 'gblanco' FOR UPDATE",
-            array(ORMQuery::HINT_LOCK_MODE => LockMode::PESSIMISTIC_READ)
+            [ORMQuery::HINT_LOCK_MODE => LockMode::PESSIMISTIC_READ]
         );
     }
 
@@ -1137,7 +1139,7 @@ class SelectSqlGenerationTest extends OrmTestCase
             'SELECT ABS(c0_.phonenumber) AS sclr_0 FROM cms_phonenumbers c0_'
         );
 
-        $config->setCustomNumericFunctions(array());
+        $config->setCustomNumericFunctions([]);
     }
 
     /**
@@ -1441,7 +1443,7 @@ class SelectSqlGenerationTest extends OrmTestCase
         $this->assertSqlGeneration(
             'SELECT p FROM Doctrine\Tests\Models\Company\CompanyPerson p',
             'SELECT c0_.id AS id_0, c0_.name AS name_1, c1_.title AS title_2, c2_.salary AS salary_3, c2_.department AS department_4, c2_.startDate AS startDate_5, c0_.discr AS discr_6, c0_.spouse_id AS spouse_id_7, c1_.car_id AS car_id_8 FROM company_persons c0_ LEFT JOIN company_managers c1_ ON c0_.id = c1_.id LEFT JOIN company_employees c2_ ON c0_.id = c2_.id',
-            array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false)
+            [ORMQuery::HINT_FORCE_PARTIAL_LOAD => false]
         );
     }
 
@@ -1453,7 +1455,7 @@ class SelectSqlGenerationTest extends OrmTestCase
         $this->assertSqlGeneration(
             'SELECT p FROM Doctrine\Tests\Models\Company\CompanyPerson p',
             'SELECT c0_.id AS id_0, c0_.name AS name_1, c0_.discr AS discr_2 FROM company_persons c0_',
-            array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => true)
+            [ORMQuery::HINT_FORCE_PARTIAL_LOAD => true]
         );
     }
 
@@ -1465,7 +1467,7 @@ class SelectSqlGenerationTest extends OrmTestCase
         $this->assertSqlGeneration(
             'SELECT e FROM Doctrine\Tests\Models\Company\CompanyEmployee e',
             'SELECT c0_.id AS id_0, c0_.name AS name_1, c1_.salary AS salary_2, c1_.department AS department_3, c1_.startDate AS startDate_4, c2_.title AS title_5, c0_.discr AS discr_6, c0_.spouse_id AS spouse_id_7, c2_.car_id AS car_id_8 FROM company_employees c1_ INNER JOIN company_persons c0_ ON c1_.id = c0_.id LEFT JOIN company_managers c2_ ON c1_.id = c2_.id',
-            array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false)
+            [ORMQuery::HINT_FORCE_PARTIAL_LOAD => false]
         );
     }
 
@@ -1477,7 +1479,7 @@ class SelectSqlGenerationTest extends OrmTestCase
         $this->assertSqlGeneration(
             'SELECT e FROM Doctrine\Tests\Models\Company\CompanyEmployee e',
             'SELECT c0_.id AS id_0, c0_.name AS name_1, c1_.salary AS salary_2, c1_.department AS department_3, c1_.startDate AS startDate_4, c0_.discr AS discr_5 FROM company_employees c1_ INNER JOIN company_persons c0_ ON c1_.id = c0_.id',
-            array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => true)
+            [ORMQuery::HINT_FORCE_PARTIAL_LOAD => true]
         );
     }
 
@@ -1489,7 +1491,7 @@ class SelectSqlGenerationTest extends OrmTestCase
         $this->assertSqlGeneration(
             'SELECT m FROM Doctrine\Tests\Models\Company\CompanyManager m',
             'SELECT c0_.id AS id_0, c0_.name AS name_1, c1_.salary AS salary_2, c1_.department AS department_3, c1_.startDate AS startDate_4, c2_.title AS title_5, c0_.discr AS discr_6, c0_.spouse_id AS spouse_id_7, c2_.car_id AS car_id_8 FROM company_managers c2_ INNER JOIN company_employees c1_ ON c2_.id = c1_.id INNER JOIN company_persons c0_ ON c2_.id = c0_.id',
-            array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false)
+            [ORMQuery::HINT_FORCE_PARTIAL_LOAD => false]
         );
     }
 
@@ -1501,7 +1503,7 @@ class SelectSqlGenerationTest extends OrmTestCase
         $this->assertSqlGeneration(
             'SELECT m FROM Doctrine\Tests\Models\Company\CompanyManager m',
             'SELECT c0_.id AS id_0, c0_.name AS name_1, c1_.salary AS salary_2, c1_.department AS department_3, c1_.startDate AS startDate_4, c2_.title AS title_5, c0_.discr AS discr_6 FROM company_managers c2_ INNER JOIN company_employees c1_ ON c2_.id = c1_.id INNER JOIN company_persons c0_ ON c2_.id = c0_.id',
-            array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => true)
+            [ORMQuery::HINT_FORCE_PARTIAL_LOAD => true]
         );
     }
 
@@ -1513,7 +1515,7 @@ class SelectSqlGenerationTest extends OrmTestCase
         $this->assertSqlGeneration(
             'SELECT c FROM Doctrine\Tests\Models\Company\CompanyContract c',
             "SELECT c0_.id AS id_0, c0_.completed AS completed_1, c0_.fixPrice AS fixPrice_2, c0_.hoursWorked AS hoursWorked_3, c0_.pricePerHour AS pricePerHour_4, c0_.maxPrice AS maxPrice_5, c0_.discr AS discr_6, c0_.salesPerson_id AS salesPerson_id_7 FROM company_contracts c0_ WHERE c0_.discr IN ('fix', 'flexible', 'flexultra')",
-            array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false)
+            [ORMQuery::HINT_FORCE_PARTIAL_LOAD => false]
         );
     }
 
@@ -1525,7 +1527,7 @@ class SelectSqlGenerationTest extends OrmTestCase
         $this->assertSqlGeneration(
             'SELECT c FROM Doctrine\Tests\Models\Company\CompanyContract c',
             "SELECT c0_.id AS id_0, c0_.completed AS completed_1, c0_.fixPrice AS fixPrice_2, c0_.hoursWorked AS hoursWorked_3, c0_.pricePerHour AS pricePerHour_4, c0_.maxPrice AS maxPrice_5, c0_.discr AS discr_6 FROM company_contracts c0_ WHERE c0_.discr IN ('fix', 'flexible', 'flexultra')",
-            array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => true)
+            [ORMQuery::HINT_FORCE_PARTIAL_LOAD => true]
         );
     }
 
@@ -1537,7 +1539,7 @@ class SelectSqlGenerationTest extends OrmTestCase
         $this->assertSqlGeneration(
             'SELECT fc FROM Doctrine\Tests\Models\Company\CompanyFlexContract fc',
             "SELECT c0_.id AS id_0, c0_.completed AS completed_1, c0_.hoursWorked AS hoursWorked_2, c0_.pricePerHour AS pricePerHour_3, c0_.maxPrice AS maxPrice_4, c0_.discr AS discr_5, c0_.salesPerson_id AS salesPerson_id_6 FROM company_contracts c0_ WHERE c0_.discr IN ('flexible', 'flexultra')",
-            array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false)
+            [ORMQuery::HINT_FORCE_PARTIAL_LOAD => false]
         );
     }
 
@@ -1549,7 +1551,7 @@ class SelectSqlGenerationTest extends OrmTestCase
         $this->assertSqlGeneration(
             'SELECT fc FROM Doctrine\Tests\Models\Company\CompanyFlexContract fc',
             "SELECT c0_.id AS id_0, c0_.completed AS completed_1, c0_.hoursWorked AS hoursWorked_2, c0_.pricePerHour AS pricePerHour_3, c0_.maxPrice AS maxPrice_4, c0_.discr AS discr_5 FROM company_contracts c0_ WHERE c0_.discr IN ('flexible', 'flexultra')",
-            array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => true)
+            [ORMQuery::HINT_FORCE_PARTIAL_LOAD => true]
         );
     }
 
@@ -1561,7 +1563,7 @@ class SelectSqlGenerationTest extends OrmTestCase
         $this->assertSqlGeneration(
             'SELECT fuc FROM Doctrine\Tests\Models\Company\CompanyFlexUltraContract fuc',
             "SELECT c0_.id AS id_0, c0_.completed AS completed_1, c0_.hoursWorked AS hoursWorked_2, c0_.pricePerHour AS pricePerHour_3, c0_.maxPrice AS maxPrice_4, c0_.discr AS discr_5, c0_.salesPerson_id AS salesPerson_id_6 FROM company_contracts c0_ WHERE c0_.discr IN ('flexultra')",
-            array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false)
+            [ORMQuery::HINT_FORCE_PARTIAL_LOAD => false]
         );
     }
 
@@ -1573,7 +1575,7 @@ class SelectSqlGenerationTest extends OrmTestCase
         $this->assertSqlGeneration(
             'SELECT fuc FROM Doctrine\Tests\Models\Company\CompanyFlexUltraContract fuc',
             "SELECT c0_.id AS id_0, c0_.completed AS completed_1, c0_.hoursWorked AS hoursWorked_2, c0_.pricePerHour AS pricePerHour_3, c0_.maxPrice AS maxPrice_4, c0_.discr AS discr_5 FROM company_contracts c0_ WHERE c0_.discr IN ('flexultra')",
-            array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => true)
+            [ORMQuery::HINT_FORCE_PARTIAL_LOAD => true]
         );
     }
 
@@ -1585,7 +1587,7 @@ class SelectSqlGenerationTest extends OrmTestCase
         $this->assertSqlGeneration(
             'SELECT p, pp FROM Doctrine\Tests\Models\Company\CompanyPerson p JOIN p.spouse pp',
             "SELECT c0_.id AS id_0, c0_.name AS name_1, c1_.title AS title_2, c2_.salary AS salary_3, c2_.department AS department_4, c2_.startDate AS startDate_5, c3_.id AS id_6, c3_.name AS name_7, c4_.title AS title_8, c5_.salary AS salary_9, c5_.department AS department_10, c5_.startDate AS startDate_11, c0_.discr AS discr_12, c0_.spouse_id AS spouse_id_13, c1_.car_id AS car_id_14, c3_.discr AS discr_15, c3_.spouse_id AS spouse_id_16, c4_.car_id AS car_id_17 FROM company_persons c0_ LEFT JOIN company_managers c1_ ON c0_.id = c1_.id LEFT JOIN company_employees c2_ ON c0_.id = c2_.id INNER JOIN company_persons c3_ ON c0_.spouse_id = c3_.id LEFT JOIN company_managers c4_ ON c3_.id = c4_.id LEFT JOIN company_employees c5_ ON c3_.id = c5_.id",
-            array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false)
+            [ORMQuery::HINT_FORCE_PARTIAL_LOAD => false]
         );
     }
 
@@ -2145,7 +2147,7 @@ class SelectSqlGenerationTest extends OrmTestCase
             'SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u HAVING u.username IS NULL',
             'SELECT c0_.name AS name_0 FROM cms_users c0_ HAVING c0_.username IS NULL'
         );
-        
+
         $this->assertSqlGeneration(
             'SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u HAVING MAX(u.name) IS NULL',
             'SELECT c0_.name AS name_0 FROM cms_users c0_ HAVING MAX(c0_.name) IS NULL'
@@ -2160,7 +2162,7 @@ class SelectSqlGenerationTest extends OrmTestCase
         $this->assertSqlGeneration(
             'SELECT e.id FROM Doctrine\Tests\Models\Company\CompanyOrganization o JOIN o.events e WITH e.id = ?1',
             'SELECT c0_.id AS id_0 FROM company_organizations c1_ INNER JOIN (company_events c0_ LEFT JOIN company_auctions c2_ ON c0_.id = c2_.id LEFT JOIN company_raffles c3_ ON c0_.id = c3_.id) ON c1_.id = c0_.org_id AND (c0_.id = ?)',
-            array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false)
+            [ORMQuery::HINT_FORCE_PARTIAL_LOAD => false]
         );
     }
 
@@ -2238,8 +2240,8 @@ class SelectSqlGenerationTest extends OrmTestCase
         $this->assertSqlGeneration(
             'SELECT e, COUNT(c) FROM Doctrine\Tests\Models\Company\CompanyEmployee e JOIN e.contracts c WHERE e.department = :department',
             "SELECT c0_.id AS id_0, c0_.name AS name_1, c1_.salary AS salary_2, c1_.department AS department_3, c1_.startDate AS startDate_4, COUNT(c2_.id) AS sclr_5, c0_.discr AS discr_6 FROM company_employees c1_ INNER JOIN company_persons c0_ ON c1_.id = c0_.id INNER JOIN company_contract_employees c3_ ON c1_.id = c3_.employee_id INNER JOIN company_contracts c2_ ON c2_.id = c3_.contract_id AND c2_.discr IN ('fix', 'flexible', 'flexultra') WHERE c1_.department = ?",
-            array(),
-            array('department' => 'foobar')
+            [],
+            ['department' => 'foobar']
         );
     }
 
@@ -2264,7 +2266,7 @@ class SelectSqlGenerationTest extends OrmTestCase
             "SELECT c0_.name AS name_0 FROM cms_users c0_ HAVING name_0 LIKE '3'"
         );
     }
-    
+
     /**
      * @group DDC-3085
      */
diff --git a/tests/Doctrine/Tests/ORM/Query/SqlWalkerTest.php b/tests/Doctrine/Tests/ORM/Query/SqlWalkerTest.php
index 263cffc56..e23ee0117 100644
--- a/tests/Doctrine/Tests/ORM/Query/SqlWalkerTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/SqlWalkerTest.php
@@ -24,7 +24,7 @@ class SqlWalkerTest extends OrmTestCase
      */
     protected function setUp()
     {
-        $this->sqlWalker = new SqlWalker(new Query($this->_getTestEntityManager()), new ParserResult(), array());
+        $this->sqlWalker = new SqlWalker(new Query($this->_getTestEntityManager()), new ParserResult(), []);
     }
 
     /**
@@ -53,10 +53,10 @@ class SqlWalkerTest extends OrmTestCase
      */
     public function getColumnNamesAndSqlAliases()
     {
-        return array(
-            array('aaaaa', 'a0_'),
-            array('table', 't0_'),
-            array('çtable', 't0_'),
-        );
+        return [
+            ['aaaaa', 'a0_'],
+            ['table', 't0_'],
+            ['çtable', 't0_'],
+        ];
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php
index acf4d08e6..9418028ec 100644
--- a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php
+++ b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php
@@ -285,7 +285,7 @@ class QueryBuilderTest extends OrmTestCase
         $qb->select('u')
            ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u')
            ->where('u.id = :uid')
-           ->andWhere($qb->expr()->in('u.id', array(1, 2, 3)));
+           ->andWhere($qb->expr()->in('u.id', [1, 2, 3]));
 
         $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid AND u.id IN(1, 2, 3)');
     }
@@ -296,7 +296,7 @@ class QueryBuilderTest extends OrmTestCase
         $qb->select('u')
            ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u')
            ->where('u.id = :uid')
-           ->orWhere($qb->expr()->in('u.id', array(1, 2, 3)));
+           ->orWhere($qb->expr()->in('u.id', [1, 2, 3]));
 
         $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid OR u.id IN(1, 2, 3)');
     }
@@ -307,7 +307,7 @@ class QueryBuilderTest extends OrmTestCase
         $qb->select('u')
            ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u')
            ->where('u.id = :uid')
-           ->andWhere($qb->expr()->notIn('u.id', array(1, 2, 3)));
+           ->andWhere($qb->expr()->notIn('u.id', [1, 2, 3]));
 
         $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid AND u.id NOT IN(1, 2, 3)');
     }
@@ -318,7 +318,7 @@ class QueryBuilderTest extends OrmTestCase
         $qb->select('u')
            ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u')
            ->where('u.id = :uid')
-           ->orWhere($qb->expr()->notIn('u.id', array(1, 2, 3)));
+           ->orWhere($qb->expr()->notIn('u.id', [1, 2, 3]));
 
         $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid OR u.id NOT IN(1, 2, 3)');
     }
@@ -528,7 +528,7 @@ class QueryBuilderTest extends OrmTestCase
             ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u');
 
         $criteria = new Criteria();
-        $criteria->orderBy(array('field' => Criteria::DESC));
+        $criteria->orderBy(['field' => Criteria::DESC]);
 
         $qb->addCriteria($criteria);
 
@@ -547,7 +547,7 @@ class QueryBuilderTest extends OrmTestCase
             ->join('u.article','a');
 
         $criteria = new Criteria();
-        $criteria->orderBy(array('a.field' => Criteria::DESC));
+        $criteria->orderBy(['a.field' => Criteria::DESC]);
 
         $qb->addCriteria($criteria);
 
@@ -692,7 +692,7 @@ class QueryBuilderTest extends OrmTestCase
         $qb = $this->_em->createQueryBuilder();
         $orExpr = $qb->expr()->orX();
         $orExpr->add($qb->expr()->eq('u.id', ':uid3'));
-        $orExpr->add($qb->expr()->in('u.id', array(1)));
+        $orExpr->add($qb->expr()->in('u.id', [1]));
 
         $qb->select('u')
            ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u')
@@ -706,11 +706,11 @@ class QueryBuilderTest extends OrmTestCase
         $qb = $this->_em->createQueryBuilder();
         $qb->select('u')
            ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u')
-           ->where($qb->expr()->in('u.name', array('one', 'two', 'three')));
+           ->where($qb->expr()->in('u.name', ['one', 'two', 'three']));
 
         $this->assertValidQueryBuilder($qb, "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name IN('one', 'two', 'three')");
 
-        $qb->where($qb->expr()->in('u.name', array("O'Reilly", "O'Neil", 'Smith')));
+        $qb->where($qb->expr()->in('u.name', ["O'Reilly", "O'Neil", 'Smith']));
 
         $this->assertValidQueryBuilder($qb, "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name IN('O''Reilly', 'O''Neil', 'Smith')");
     }
@@ -721,11 +721,11 @@ class QueryBuilderTest extends OrmTestCase
         $expr = $this->_em->getExpressionBuilder();
         $qb->select('u')
            ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u')
-           ->where($expr->in('u.name', array($expr->literal('one'), $expr->literal('two'), $expr->literal('three'))));
+           ->where($expr->in('u.name', [$expr->literal('one'), $expr->literal('two'), $expr->literal('three')]));
 
         $this->assertValidQueryBuilder($qb, "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name IN('one', 'two', 'three')");
 
-        $qb->where($expr->in('u.name', array($expr->literal("O'Reilly"), $expr->literal("O'Neil"), $expr->literal('Smith'))));
+        $qb->where($expr->in('u.name', [$expr->literal("O'Reilly"), $expr->literal("O'Neil"), $expr->literal('Smith')]));
 
         $this->assertValidQueryBuilder($qb, "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name IN('O''Reilly', 'O''Neil', 'Smith')");
     }
@@ -735,7 +735,7 @@ class QueryBuilderTest extends OrmTestCase
         $expr = $this->_em->getExpressionBuilder();
         $orExpr = $expr->orX();
         $orExpr->add($expr->eq('u.id', ':uid3'));
-        $orExpr->add($expr->not($expr->in('u.id', array(1))));
+        $orExpr->add($expr->not($expr->in('u.id', [1])));
 
         $qb = $this->_em->createQueryBuilder();
         $qb->select('u')
@@ -839,7 +839,7 @@ class QueryBuilderTest extends OrmTestCase
             ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u')
             ->where('u.username = ?1')->orderBy('u.username');
 
-        $qb->resetDQLParts(array('where', 'orderBy'));
+        $qb->resetDQLParts(['where', 'orderBy']);
 
         $this->assertEquals(1, count($qb->getDQLPart('select')));
         $this->assertNull($qb->getDQLPart('where'));
@@ -975,7 +975,7 @@ class QueryBuilderTest extends OrmTestCase
             ->select('u')
             ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u');
 
-        $this->assertEquals(array('u'), $qb->getRootAliases());
+        $this->assertEquals(['u'], $qb->getRootAliases());
     }
 
     public function testGetRootEntities()
@@ -984,7 +984,7 @@ class QueryBuilderTest extends OrmTestCase
             ->select('u')
             ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u');
 
-        $this->assertEquals(array('Doctrine\Tests\Models\CMS\CmsUser'), $qb->getRootEntities());
+        $this->assertEquals(['Doctrine\Tests\Models\CMS\CmsUser'], $qb->getRootEntities());
     }
 
     public function testGetSeveralRootAliases()
@@ -994,7 +994,7 @@ class QueryBuilderTest extends OrmTestCase
             ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u')
             ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u2');
 
-        $this->assertEquals(array('u', 'u2'), $qb->getRootAliases());
+        $this->assertEquals(['u', 'u2'], $qb->getRootAliases());
         $this->assertEquals('u', $qb->getRootAlias());
     }
 
@@ -1003,7 +1003,7 @@ class QueryBuilderTest extends OrmTestCase
         $qb = $this->_em->createQueryBuilder()
             ->select('u')
             ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u')
-            ->add('join', array('INNER JOIN u.groups g'), true);
+            ->add('join', ['INNER JOIN u.groups g'], true);
 
         $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u INNER JOIN u.groups g', $qb->getDQL());
     }
diff --git a/tests/Doctrine/Tests/ORM/Repository/DefaultRepositoryFactoryTest.php b/tests/Doctrine/Tests/ORM/Repository/DefaultRepositoryFactoryTest.php
index bdccb4d7e..182554c93 100644
--- a/tests/Doctrine/Tests/ORM/Repository/DefaultRepositoryFactoryTest.php
+++ b/tests/Doctrine/Tests/ORM/Repository/DefaultRepositoryFactoryTest.php
@@ -52,7 +52,7 @@ class DefaultRepositoryFactoryTest extends PHPUnit_Framework_TestCase
             ->entityManager
             ->expects($this->any())
             ->method('getClassMetadata')
-            ->will($this->returnCallback(array($this, 'buildClassMetadata')));
+            ->will($this->returnCallback([$this, 'buildClassMetadata']));
 
         $this->assertInstanceOf(
             'Doctrine\\Tests\\Models\\DDC869\\DDC869PaymentRepository',
@@ -66,7 +66,7 @@ class DefaultRepositoryFactoryTest extends PHPUnit_Framework_TestCase
             ->entityManager
             ->expects($this->any())
             ->method('getClassMetadata')
-            ->will($this->returnCallback(array($this, 'buildClassMetadata')));
+            ->will($this->returnCallback([$this, 'buildClassMetadata']));
 
         $this->assertSame(
             $this->repositoryFactory->getRepository($this->entityManager, __CLASS__),
@@ -100,11 +100,11 @@ class DefaultRepositoryFactoryTest extends PHPUnit_Framework_TestCase
         $em1
             ->expects($this->any())
             ->method('getClassMetadata')
-            ->will($this->returnCallback(array($this, 'buildClassMetadata')));
+            ->will($this->returnCallback([$this, 'buildClassMetadata']));
         $em2
             ->expects($this->any())
             ->method('getClassMetadata')
-            ->will($this->returnCallback(array($this, 'buildClassMetadata')));
+            ->will($this->returnCallback([$this, 'buildClassMetadata']));
 
         $repo1 = $this->repositoryFactory->getRepository($em1, __CLASS__);
         $repo2 = $this->repositoryFactory->getRepository($em2, __CLASS__);
diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheCollectionRegionCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheCollectionRegionCommandTest.php
index 298ca23a9..c8e2abca7 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheCollectionRegionCommandTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheCollectionRegionCommandTest.php
@@ -32,9 +32,11 @@ class ClearCacheCollectionRegionCommandTest extends OrmFunctionalTestCase
         $this->application = new Application();
         $this->command     = new CollectionRegionCommand();
 
-        $this->application->setHelperSet(new HelperSet(array(
+        $this->application->setHelperSet(new HelperSet(
+            [
             'em' => new EntityManagerHelper($this->_em)
-        )));
+            ]
+        ));
 
         $this->application->add($this->command);
     }
@@ -43,10 +45,12 @@ class ClearCacheCollectionRegionCommandTest extends OrmFunctionalTestCase
     {
         $command    = $this->application->find('orm:clear-cache:region:collection');
         $tester     = new CommandTester($command);
-        $tester->execute(array(
+        $tester->execute(
+            [
             'command' => $command->getName(),
             '--all'   => true,
-        ), array('decorated' => false));
+            ], ['decorated' => false]
+        );
 
         $this->assertEquals('Clearing all second-level cache collection regions' . PHP_EOL, $tester->getDisplay());
     }
@@ -55,11 +59,13 @@ class ClearCacheCollectionRegionCommandTest extends OrmFunctionalTestCase
     {
         $command    = $this->application->find('orm:clear-cache:region:collection');
         $tester     = new CommandTester($command);
-        $tester->execute(array(
+        $tester->execute(
+            [
             'command'       => $command->getName(),
             'owner-class'   => 'Doctrine\Tests\Models\Cache\State',
             'association'   => 'cities',
-        ), array('decorated' => false));
+            ], ['decorated' => false]
+        );
 
         $this->assertEquals('Clearing second-level cache for collection "Doctrine\Tests\Models\Cache\State#cities"' . PHP_EOL, $tester->getDisplay());
     }
@@ -68,12 +74,14 @@ class ClearCacheCollectionRegionCommandTest extends OrmFunctionalTestCase
     {
         $command    = $this->application->find('orm:clear-cache:region:collection');
         $tester     = new CommandTester($command);
-        $tester->execute(array(
+        $tester->execute(
+            [
             'command'       => $command->getName(),
             'owner-class'   => 'Doctrine\Tests\Models\Cache\State',
             'association'   => 'cities',
             'owner-id'      => 1,
-        ), array('decorated' => false));
+            ], ['decorated' => false]
+        );
 
         $this->assertEquals('Clearing second-level cache entry for collection "Doctrine\Tests\Models\Cache\State#cities" owner entity identified by "1"' . PHP_EOL, $tester->getDisplay());
     }
@@ -82,12 +90,14 @@ class ClearCacheCollectionRegionCommandTest extends OrmFunctionalTestCase
     {
         $command    = $this->application->find('orm:clear-cache:region:collection');
         $tester     = new CommandTester($command);
-        $tester->execute(array(
+        $tester->execute(
+            [
             'command'       => $command->getName(),
             'owner-class'   => 'Doctrine\Tests\Models\Cache\State',
             'association'   => 'cities',
             '--flush'       => true,
-        ), array('decorated' => false));
+            ], ['decorated' => false]
+        );
 
         $this->assertEquals('Flushing cache provider configured for "Doctrine\Tests\Models\Cache\State#cities"' . PHP_EOL, $tester->getDisplay());
     }
diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheEntityRegionCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheEntityRegionCommandTest.php
index d16fa2e7f..b579c14d1 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheEntityRegionCommandTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheEntityRegionCommandTest.php
@@ -32,9 +32,11 @@ class ClearCacheEntityRegionCommandTest extends OrmFunctionalTestCase
         $this->application = new Application();
         $this->command     = new EntityRegionCommand();
 
-        $this->application->setHelperSet(new HelperSet(array(
+        $this->application->setHelperSet(new HelperSet(
+            [
             'em' => new EntityManagerHelper($this->_em)
-        )));
+            ]
+        ));
 
         $this->application->add($this->command);
     }
@@ -43,10 +45,12 @@ class ClearCacheEntityRegionCommandTest extends OrmFunctionalTestCase
     {
         $command    = $this->application->find('orm:clear-cache:region:entity');
         $tester     = new CommandTester($command);
-        $tester->execute(array(
+        $tester->execute(
+            [
             'command' => $command->getName(),
             '--all'   => true,
-        ), array('decorated' => false));
+            ], ['decorated' => false]
+        );
 
         $this->assertEquals('Clearing all second-level cache entity regions' . PHP_EOL, $tester->getDisplay());
     }
@@ -55,10 +59,12 @@ class ClearCacheEntityRegionCommandTest extends OrmFunctionalTestCase
     {
         $command    = $this->application->find('orm:clear-cache:region:entity');
         $tester     = new CommandTester($command);
-        $tester->execute(array(
+        $tester->execute(
+            [
             'command'       => $command->getName(),
             'entity-class'  => 'Doctrine\Tests\Models\Cache\Country',
-        ), array('decorated' => false));
+            ], ['decorated' => false]
+        );
 
         $this->assertEquals('Clearing second-level cache for entity "Doctrine\Tests\Models\Cache\Country"' . PHP_EOL, $tester->getDisplay());
     }
@@ -67,11 +73,13 @@ class ClearCacheEntityRegionCommandTest extends OrmFunctionalTestCase
     {
         $command    = $this->application->find('orm:clear-cache:region:entity');
         $tester     = new CommandTester($command);
-        $tester->execute(array(
+        $tester->execute(
+            [
             'command'       => $command->getName(),
             'entity-class'  => 'Doctrine\Tests\Models\Cache\Country',
             'entity-id'     => 1,
-        ), array('decorated' => false));
+            ], ['decorated' => false]
+        );
 
         $this->assertEquals('Clearing second-level cache entry for entity "Doctrine\Tests\Models\Cache\Country" identified by "1"' . PHP_EOL, $tester->getDisplay());
     }
@@ -80,11 +88,13 @@ class ClearCacheEntityRegionCommandTest extends OrmFunctionalTestCase
     {
         $command    = $this->application->find('orm:clear-cache:region:entity');
         $tester     = new CommandTester($command);
-        $tester->execute(array(
+        $tester->execute(
+            [
             'command'       => $command->getName(),
             'entity-class'  => 'Doctrine\Tests\Models\Cache\Country',
             '--flush'       => true,
-        ), array('decorated' => false));
+            ], ['decorated' => false]
+        );
 
         $this->assertEquals('Flushing cache provider configured for entity named "Doctrine\Tests\Models\Cache\Country"' . PHP_EOL, $tester->getDisplay());
     }
diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheQueryRegionCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheQueryRegionCommandTest.php
index 4468faf96..0d296bf55 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheQueryRegionCommandTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheQueryRegionCommandTest.php
@@ -32,9 +32,11 @@ class ClearCacheQueryRegionCommandTest extends OrmFunctionalTestCase
         $this->application = new Application();
         $this->command     = new QueryRegionCommand();
 
-        $this->application->setHelperSet(new HelperSet(array(
+        $this->application->setHelperSet(new HelperSet(
+            [
             'em' => new EntityManagerHelper($this->_em)
-        )));
+            ]
+        ));
 
         $this->application->add($this->command);
     }
@@ -43,10 +45,12 @@ class ClearCacheQueryRegionCommandTest extends OrmFunctionalTestCase
     {
         $command    = $this->application->find('orm:clear-cache:region:query');
         $tester     = new CommandTester($command);
-        $tester->execute(array(
+        $tester->execute(
+            [
             'command' => $command->getName(),
             '--all'   => true,
-        ), array('decorated' => false));
+            ], ['decorated' => false]
+        );
 
         $this->assertEquals('Clearing all second-level cache query regions' . PHP_EOL, $tester->getDisplay());
     }
@@ -55,10 +59,12 @@ class ClearCacheQueryRegionCommandTest extends OrmFunctionalTestCase
     {
         $command    = $this->application->find('orm:clear-cache:region:query');
         $tester     = new CommandTester($command);
-        $tester->execute(array(
+        $tester->execute(
+            [
             'command'       => $command->getName(),
             'region-name'   => null,
-        ), array('decorated' => false));
+            ], ['decorated' => false]
+        );
 
         $this->assertEquals('Clearing second-level cache query region named "query_cache_region"' . PHP_EOL, $tester->getDisplay());
     }
@@ -67,10 +73,12 @@ class ClearCacheQueryRegionCommandTest extends OrmFunctionalTestCase
     {
         $command    = $this->application->find('orm:clear-cache:region:query');
         $tester     = new CommandTester($command);
-        $tester->execute(array(
+        $tester->execute(
+            [
             'command'       => $command->getName(),
             'region-name'   => 'my_region',
-        ), array('decorated' => false));
+            ], ['decorated' => false]
+        );
 
         $this->assertEquals('Clearing second-level cache query region named "my_region"' . PHP_EOL, $tester->getDisplay());
     }
@@ -79,11 +87,13 @@ class ClearCacheQueryRegionCommandTest extends OrmFunctionalTestCase
     {
         $command    = $this->application->find('orm:clear-cache:region:query');
         $tester     = new CommandTester($command);
-        $tester->execute(array(
+        $tester->execute(
+            [
             'command'       => $command->getName(),
             'region-name'   => 'my_region',
             '--flush'       => true,
-        ), array('decorated' => false));
+            ], ['decorated' => false]
+        );
 
         $this->assertEquals('Flushing cache provider configured for second-level cache query region named "my_region"' . PHP_EOL, $tester->getDisplay());
     }
diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommandTest.php
index af89c866d..3e6a0e904 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommandTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommandTest.php
@@ -20,6 +20,6 @@ class ConvertDoctrine1SchemaCommandTest extends OrmTestCase
                ->method('writeln')
                ->with($this->equalTo('No Metadata Classes to process.'));
 
-        $command->convertDoctrine1Schema(array(), sys_get_temp_dir(), 'annotation', 4, null, $output);
+        $command->convertDoctrine1Schema([], sys_get_temp_dir(), 'annotation', 4, null, $output);
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/GenerateRepositoriesCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/GenerateRepositoriesCommandTest.php
index 08ade2999..e306c34b6 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/GenerateRepositoriesCommandTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/GenerateRepositoriesCommandTest.php
@@ -35,15 +35,19 @@ class GenerateRepositoriesCommandTest extends OrmFunctionalTestCase
 
         $metadataDriver = $this->_em->getConfiguration()->getMetadataDriverImpl();
 
-        $metadataDriver->addPaths(array(
+        $metadataDriver->addPaths(
+            [
             __DIR__ . '/../../../../Models/DDC3231/'
-        ));
-        
+            ]
+        );
+
         $this->application = new Application();
 
-        $this->application->setHelperSet(new HelperSet(array(
+        $this->application->setHelperSet(new HelperSet(
+            [
             'em' => new EntityManagerHelper($this->_em)
-        )));
+            ]
+        ));
 
         $this->application->add(new GenerateRepositoriesCommand());
 
@@ -54,7 +58,7 @@ class GenerateRepositoriesCommandTest extends OrmFunctionalTestCase
      */
     public function tearDown()
     {
-        $dirs = array();
+        $dirs = [];
 
         $ri = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->path));
         foreach ($ri AS $file) {
@@ -133,11 +137,13 @@ class GenerateRepositoriesCommandTest extends OrmFunctionalTestCase
 
         $command    = $this->application->find('orm:generate-repositories');
         $tester     = new CommandTester($command);
-        $tester->execute(array(
+        $tester->execute(
+            [
             'command'   => $command->getName(),
             'dest-path' => $this->path,
             '--filter'  => $filter,
-        ));
+            ]
+        );
     }
 
 }
diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/InfoCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/InfoCommandTest.php
index fb63e4f64..01a4d13db 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/InfoCommandTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/InfoCommandTest.php
@@ -33,9 +33,11 @@ class InfoCommandTest extends OrmFunctionalTestCase
         $this->application = new Application();
         $command           = new InfoCommand();
 
-        $this->application->setHelperSet(new HelperSet(array(
+        $this->application->setHelperSet(new HelperSet(
+            [
             'em' => new EntityManagerHelper($this->_em)
-        )));
+            ]
+        ));
 
         $this->application->add($command);
 
@@ -45,9 +47,11 @@ class InfoCommandTest extends OrmFunctionalTestCase
 
     public function testListAllClasses()
     {
-        $this->tester->execute(array(
+        $this->tester->execute(
+            [
             'command' => $this->command->getName(),
-        ));
+            ]
+        );
 
         $this->assertContains('Doctrine\Tests\Models\Cache\AttractionInfo', $this->tester->getDisplay());
         $this->assertContains('Doctrine\Tests\Models\Cache\City', $this->tester->getDisplay());
diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/MappingDescribeCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/MappingDescribeCommandTest.php
index 017e94aee..9f1cec7f4 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/MappingDescribeCommandTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/MappingDescribeCommandTest.php
@@ -38,9 +38,11 @@ class MappingDescribeCommandTest extends OrmFunctionalTestCase
         $this->application = new Application();
         $command = new MappingDescribeCommand();
 
-        $this->application->setHelperSet(new HelperSet(array(
+        $this->application->setHelperSet(new HelperSet(
+            [
             'em' => new EntityManagerHelper($this->_em)
-        )));
+            ]
+        ));
 
         $this->application->add($command);
 
@@ -50,10 +52,12 @@ class MappingDescribeCommandTest extends OrmFunctionalTestCase
 
     public function testShowSpecificFuzzySingle()
     {
-        $this->tester->execute(array(
+        $this->tester->execute(
+            [
             'command' => $this->command->getName(),
             'entityName' => 'AttractionInfo',
-        ));
+            ]
+        );
 
         $display = $this->tester->getDisplay();
         $this->assertContains('Doctrine\Tests\Models\Cache\AttractionInfo', $display);
@@ -66,10 +70,12 @@ class MappingDescribeCommandTest extends OrmFunctionalTestCase
      */
     public function testShowSpecificFuzzyAmbiguous()
     {
-        $this->tester->execute(array(
+        $this->tester->execute(
+            [
             'command' => $this->command->getName(),
             'entityName' => 'Attraction',
-        ));
+            ]
+        );
     }
 
     /**
@@ -78,10 +84,12 @@ class MappingDescribeCommandTest extends OrmFunctionalTestCase
      */
     public function testShowSpecificNotFound()
     {
-        $this->tester->execute(array(
+        $this->tester->execute(
+            [
             'command' => $this->command->getName(),
             'entityName' => 'AttractionFooBar'
-        ));
+            ]
+        );
     }
 }
 
diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/RunDqlCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/RunDqlCommandTest.php
index 8a78e4970..aa74ce753 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/RunDqlCommandTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/RunDqlCommandTest.php
@@ -41,9 +41,11 @@ class RunDqlCommandTest extends OrmFunctionalTestCase
         $this->application = new Application();
         $this->command     = new RunDqlCommand();
 
-        $this->application->setHelperSet(new HelperSet(array(
+        $this->application->setHelperSet(new HelperSet(
+            [
             'em' => new EntityManagerHelper($this->_em)
-        )));
+            ]
+        ));
 
         $this->application->add($this->command);
 
@@ -62,10 +64,12 @@ class RunDqlCommandTest extends OrmFunctionalTestCase
 
         $this->assertSame(
             0,
-            $this->tester->execute(array(
+            $this->tester->execute(
+                [
                 'command' => $this->command->getName(),
                 'dql'     => 'SELECT e FROM ' . DateTimeModel::CLASSNAME . ' e',
-            ))
+                ]
+            )
         );
 
         $this->assertContains(DateTimeModel::CLASSNAME, $this->tester->getDisplay());
@@ -78,11 +82,13 @@ class RunDqlCommandTest extends OrmFunctionalTestCase
 
         $this->assertSame(
             0,
-            $this->tester->execute(array(
+            $this->tester->execute(
+                [
                 'command'    => $this->command->getName(),
                 'dql'        => 'SELECT e FROM ' . DateTimeModel::CLASSNAME . ' e',
                 '--show-sql' => 'true'
-            ))
+                ]
+            )
         );
 
         $this->assertStringMatchesFormat('%Astring%sSELECT %a', $this->tester->getDisplay());
diff --git a/tests/Doctrine/Tests/ORM/Tools/ConvertDoctrine1SchemaTest.php b/tests/Doctrine/Tests/ORM/Tools/ConvertDoctrine1SchemaTest.php
index 6c62ca352..ca6192faa 100644
--- a/tests/Doctrine/Tests/ORM/Tools/ConvertDoctrine1SchemaTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/ConvertDoctrine1SchemaTest.php
@@ -33,7 +33,7 @@ class ConvertDoctrine1SchemaTest extends OrmTestCase
         $config->setProxyDir(__DIR__ . '/../../Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
         $eventManager = new EventManager();
-        $conn = new ConnectionMock(array(), $driverMock, $config, $eventManager);
+        $conn = new ConnectionMock([], $driverMock, $config, $eventManager);
         $config->setMetadataDriverImpl($metadataDriver);
 
         return EntityManagerMock::create($conn, $config, $eventManager);
diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
index 89c073fd2..e51bb3116 100644
--- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
@@ -54,32 +54,36 @@ class EntityGeneratorTest extends OrmTestCase
      *
      * @return ClassMetadataInfo
      */
-    public function generateBookEntityFixture(array $embeddedClasses = array())
+    public function generateBookEntityFixture(array $embeddedClasses = [])
     {
         $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorBook');
         $metadata->namespace = $this->_namespace;
         $metadata->customRepositoryClassName = $this->_namespace  . '\EntityGeneratorBookRepository';
 
         $metadata->table['name'] = 'book';
-        $metadata->table['uniqueConstraints']['name_uniq'] = array('columns' => array('name'));
-        $metadata->table['indexes']['status_idx'] = array('columns' => array('status'));
-        $metadata->mapField(array('fieldName' => 'name', 'type' => 'string'));
-        $metadata->mapField(array('fieldName' => 'status', 'type' => 'string', 'options' => array('default' => 'published')));
-        $metadata->mapField(array('fieldName' => 'id', 'type' => 'integer', 'id' => true));
-        $metadata->mapOneToOne(array('fieldName' => 'author', 'targetEntity' => 'Doctrine\Tests\ORM\Tools\EntityGeneratorAuthor', 'mappedBy' => 'book'));
-        $joinColumns = array(
-            array('name' => 'author_id', 'referencedColumnName' => 'id')
+        $metadata->table['uniqueConstraints']['name_uniq'] = ['columns' => ['name']];
+        $metadata->table['indexes']['status_idx'] = ['columns' => ['status']];
+        $metadata->mapField(['fieldName' => 'name', 'type' => 'string']);
+        $metadata->mapField(['fieldName' => 'status', 'type' => 'string', 'options' => ['default' => 'published']]);
+        $metadata->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]);
+        $metadata->mapOneToOne(
+            ['fieldName' => 'author', 'targetEntity' => 'Doctrine\Tests\ORM\Tools\EntityGeneratorAuthor', 'mappedBy' => 'book']
         );
-        $metadata->mapManyToMany(array(
+        $joinColumns = [
+            ['name' => 'author_id', 'referencedColumnName' => 'id']
+        ];
+        $metadata->mapManyToMany(
+            [
             'fieldName' => 'comments',
             'targetEntity' => 'Doctrine\Tests\ORM\Tools\EntityGeneratorComment',
             'fetch' => ClassMetadataInfo::FETCH_EXTRA_LAZY,
-            'joinTable' => array(
+            'joinTable' => [
                 'name' => 'book_comment',
-                'joinColumns' => array(array('name' => 'book_id', 'referencedColumnName' => 'id')),
-                'inverseJoinColumns' => array(array('name' => 'comment_id', 'referencedColumnName' => 'id')),
-            ),
-        ));
+                'joinColumns' => [['name' => 'book_id', 'referencedColumnName' => 'id']],
+                'inverseJoinColumns' => [['name' => 'comment_id', 'referencedColumnName' => 'id']],
+            ],
+            ]
+        );
         $metadata->addLifecycleCallback('loading', 'postLoad');
         $metadata->addLifecycleCallback('willBeRemoved', 'preRemove');
         $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
@@ -100,12 +104,12 @@ class EntityGeneratorTest extends OrmTestCase
         $metadata->namespace = $this->_namespace;
 
         $metadata->table['name'] = 'entity_type';
-        $metadata->mapField(array('fieldName' => 'id', 'type' => 'integer', 'id' => true));
+        $metadata->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]);
         $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
 
         $name  = $field['fieldName'];
         $type  = $field['dbType'];
-        $metadata->mapField(array('fieldName' => $name, 'type' => $type));
+        $metadata->mapField(['fieldName' => $name, 'type' => $type]);
 
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
 
@@ -115,16 +119,16 @@ class EntityGeneratorTest extends OrmTestCase
     /**
      * @return ClassMetadataInfo
      */
-    private function generateIsbnEmbeddableFixture(array $embeddedClasses = array())
+    private function generateIsbnEmbeddableFixture(array $embeddedClasses = [])
     {
         $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorIsbn');
         $metadata->namespace = $this->_namespace;
         $metadata->isEmbeddedClass = true;
-        $metadata->mapField(array('fieldName' => 'prefix', 'type' => 'integer'));
-        $metadata->mapField(array('fieldName' => 'groupNumber', 'type' => 'integer'));
-        $metadata->mapField(array('fieldName' => 'publisherNumber', 'type' => 'integer'));
-        $metadata->mapField(array('fieldName' => 'titleNumber', 'type' => 'integer'));
-        $metadata->mapField(array('fieldName' => 'checkDigit', 'type' => 'integer'));
+        $metadata->mapField(['fieldName' => 'prefix', 'type' => 'integer']);
+        $metadata->mapField(['fieldName' => 'groupNumber', 'type' => 'integer']);
+        $metadata->mapField(['fieldName' => 'publisherNumber', 'type' => 'integer']);
+        $metadata->mapField(['fieldName' => 'titleNumber', 'type' => 'integer']);
+        $metadata->mapField(['fieldName' => 'checkDigit', 'type' => 'integer']);
 
         foreach ($embeddedClasses as $fieldName => $embeddedClass) {
             $this->mapEmbedded($fieldName, $metadata, $embeddedClass);
@@ -143,10 +147,10 @@ class EntityGeneratorTest extends OrmTestCase
         $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorTestEmbeddable');
         $metadata->namespace = $this->_namespace;
         $metadata->isEmbeddedClass = true;
-        $metadata->mapField(array('fieldName' => 'field1', 'type' => 'integer'));
-        $metadata->mapField(array('fieldName' => 'field2', 'type' => 'integer', 'nullable' => true));
-        $metadata->mapField(array('fieldName' => 'field3', 'type' => 'datetime'));
-        $metadata->mapField(array('fieldName' => 'field4', 'type' => 'datetime', 'nullable' => true));
+        $metadata->mapField(['fieldName' => 'field1', 'type' => 'integer']);
+        $metadata->mapField(['fieldName' => 'field2', 'type' => 'integer', 'nullable' => true]);
+        $metadata->mapField(['fieldName' => 'field3', 'type' => 'datetime']);
+        $metadata->mapField(['fieldName' => 'field4', 'type' => 'datetime', 'nullable' => true]);
 
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
 
@@ -166,7 +170,7 @@ class EntityGeneratorTest extends OrmTestCase
         $columnPrefix = false
     ) {
         $classMetadata->mapEmbedded(
-            array('fieldName' => $fieldName, 'class' => $embeddableMetadata->name, 'columnPrefix' => $columnPrefix)
+            ['fieldName' => $fieldName, 'class' => $embeddableMetadata->name, 'columnPrefix' => $columnPrefix]
         );
     }
 
@@ -181,7 +185,8 @@ class EntityGeneratorTest extends OrmTestCase
         ClassMetadataInfo $embeddableMetadata
     ) {
         foreach ($embeddableMetadata->embeddedClasses as $property => $embeddableClass) {
-            $classMetadata->mapEmbedded(array(
+            $classMetadata->mapEmbedded(
+                [
                 'fieldName' => $fieldName . '.' . $property,
                 'class' => $embeddableClass['class'],
                 'columnPrefix' => $embeddableClass['columnPrefix'],
@@ -189,7 +194,8 @@ class EntityGeneratorTest extends OrmTestCase
                         ? $fieldName . '.' . $embeddableClass['declaredField']
                         : $fieldName,
                 'originalField' => $embeddableClass['originalField'] ?: $property,
-            ));
+                ]
+            );
         }
     }
 
@@ -221,8 +227,8 @@ class EntityGeneratorTest extends OrmTestCase
     public function testGeneratedEntityClass()
     {
         $testMetadata = $this->generateTestEmbeddableFixture();
-        $isbnMetadata = $this->generateIsbnEmbeddableFixture(array('test' => $testMetadata));
-        $metadata = $this->generateBookEntityFixture(array('isbn' => $isbnMetadata));
+        $isbnMetadata = $this->generateIsbnEmbeddableFixture(['test' => $testMetadata]);
+        $metadata = $this->generateBookEntityFixture(['isbn' => $isbnMetadata]);
 
         $book = $this->newInstance($metadata);
         $this->assertTrue(class_exists($metadata->name), "Class does not exist.");
@@ -265,9 +271,9 @@ class EntityGeneratorTest extends OrmTestCase
         $comment = new EntityGeneratorComment();
         $this->assertInstanceOf($metadata->name, $book->addComment($comment));
         $this->assertInstanceOf('Doctrine\Common\Collections\ArrayCollection', $book->getComments());
-        $this->assertEquals(new ArrayCollection(array($comment)), $book->getComments());
+        $this->assertEquals(new ArrayCollection([$comment]), $book->getComments());
         $this->assertInternalType('boolean', $book->removeComment($comment));
-        $this->assertEquals(new ArrayCollection(array()), $book->getComments());
+        $this->assertEquals(new ArrayCollection([]), $book->getComments());
 
         $this->newInstance($isbnMetadata);
         $isbn = new $isbnMetadata->name();
@@ -282,9 +288,9 @@ class EntityGeneratorTest extends OrmTestCase
 
     public function testEntityUpdatingWorks()
     {
-        $metadata = $this->generateBookEntityFixture(array('isbn' => $this->generateIsbnEmbeddableFixture()));
+        $metadata = $this->generateBookEntityFixture(['isbn' => $this->generateIsbnEmbeddableFixture()]);
 
-        $metadata->mapField(array('fieldName' => 'test', 'type' => 'string'));
+        $metadata->mapField(['fieldName' => 'test', 'type' => 'string']);
 
         $testEmbeddableMetadata = $this->generateTestEmbeddableFixture();
         $this->mapEmbedded('testEmbedded', $metadata, $testEmbeddableMetadata);
@@ -326,7 +332,7 @@ class EntityGeneratorTest extends OrmTestCase
      */
     public function testDoesNotRegenerateExistingMethodsWithDifferentCase()
     {
-        $metadata = $this->generateBookEntityFixture(array('isbn' => $this->generateIsbnEmbeddableFixture()));
+        $metadata = $this->generateBookEntityFixture(['isbn' => $this->generateIsbnEmbeddableFixture()]);
 
         // Workaround to change existing fields case (just to simulate the use case)
         $metadata->fieldMappings['status']['fieldName'] = 'STATUS';
@@ -357,7 +363,7 @@ class EntityGeneratorTest extends OrmTestCase
     public function testMethodDocBlockShouldStartWithBackSlash()
     {
         $embeddedMetadata = $this->generateIsbnEmbeddableFixture();
-        $metadata = $this->generateBookEntityFixture(array('isbn' => $embeddedMetadata));
+        $metadata = $this->generateBookEntityFixture(['isbn' => $embeddedMetadata]);
         $book     = $this->newInstance($metadata);
 
         $this->assertPhpDocVarType('\Doctrine\Common\Collections\Collection', new \ReflectionProperty($book, 'comments'));
@@ -404,7 +410,7 @@ class EntityGeneratorTest extends OrmTestCase
     public function testLoadMetadata()
     {
         $embeddedMetadata = $this->generateIsbnEmbeddableFixture();
-        $metadata = $this->generateBookEntityFixture(array('isbn' => $embeddedMetadata));
+        $metadata = $this->generateBookEntityFixture(['isbn' => $embeddedMetadata]);
 
         $book = $this->newInstance($metadata);
 
@@ -443,10 +449,10 @@ class EntityGeneratorTest extends OrmTestCase
     {
         $this->_generator->setAnnotationPrefix('ORM\\');
         $embeddedMetadata = $this->generateIsbnEmbeddableFixture();
-        $metadata = $this->generateBookEntityFixture(array('isbn' => $embeddedMetadata));
+        $metadata = $this->generateBookEntityFixture(['isbn' => $embeddedMetadata]);
 
         $reader = new AnnotationReader();
-        $driver = new AnnotationDriver($reader, array());
+        $driver = new AnnotationDriver($reader, []);
 
         $book = $this->newInstance($metadata);
 
@@ -489,7 +495,7 @@ class EntityGeneratorTest extends OrmTestCase
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
         $this->newInstance($metadata); // force instantiation (causes autoloading to kick in)
 
-        $driver = new AnnotationDriver(new AnnotationReader(), array());
+        $driver = new AnnotationDriver(new AnnotationReader(), []);
         $cm     = new ClassMetadataInfo($metadata->name);
 
         $cm->initializeReflection(new RuntimeReflectionService);
@@ -521,13 +527,15 @@ class EntityGeneratorTest extends OrmTestCase
     {
         $metadata               = new ClassMetadataInfo($this->_namespace . '\DDC1784Entity');
         $metadata->namespace    = $this->_namespace;
-        $metadata->mapField(array('fieldName' => 'id', 'type' => 'integer', 'id' => true));
+        $metadata->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]);
         $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE);
-        $metadata->setSequenceGeneratorDefinition(array(
+        $metadata->setSequenceGeneratorDefinition(
+            [
             'sequenceName'      => 'DDC1784_ID_SEQ',
             'allocationSize'    => 1,
             'initialValue'      => 2
-        ));
+            ]
+        );
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
 
         $filename = $this->_tmpDir . DIRECTORY_SEPARATOR
@@ -553,23 +561,25 @@ class EntityGeneratorTest extends OrmTestCase
     {
         $metadata               = new ClassMetadataInfo($this->_namespace . '\DDC2079Entity');
         $metadata->namespace    = $this->_namespace;
-        $metadata->mapField(array('fieldName' => 'id', 'type' => 'integer', 'id' => true));
+        $metadata->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]);
         $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE);
-        $metadata->mapManyToMany(array(
+        $metadata->mapManyToMany(
+            [
             'fieldName'     => 'centroCustos',
             'targetEntity'  => 'DDC2079CentroCusto',
-            'joinTable'     => array(
+            'joinTable'     => [
                 'name'                  => 'unidade_centro_custo',
-                'joinColumns'           => array(
-                    array('name' => 'idorcamento',      'referencedColumnName' => 'idorcamento'),
-                    array('name' => 'idunidade',        'referencedColumnName' => 'idunidade')
-                ),
-                'inverseJoinColumns'    => array(
-                    array('name' => 'idcentrocusto',    'referencedColumnName' => 'idcentrocusto'),
-                    array('name' => 'idpais',           'referencedColumnName' => 'idpais'),
-                ),
-            ),
-        ));
+                'joinColumns'           => [
+                    ['name' => 'idorcamento',      'referencedColumnName' => 'idorcamento'],
+                    ['name' => 'idunidade',        'referencedColumnName' => 'idunidade']
+                ],
+                'inverseJoinColumns'    => [
+                    ['name' => 'idcentrocusto',    'referencedColumnName' => 'idcentrocusto'],
+                    ['name' => 'idpais',           'referencedColumnName' => 'idpais'],
+                ],
+            ],
+            ]
+        );
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
 
         $filename = $this->_tmpDir . DIRECTORY_SEPARATOR
@@ -838,7 +848,7 @@ class EntityGeneratorTest extends OrmTestCase
     public function testGeneratedMutableEmbeddablesClass()
     {
         $embeddedMetadata = $this->generateTestEmbeddableFixture();
-        $metadata = $this->generateIsbnEmbeddableFixture(array('test' => $embeddedMetadata));
+        $metadata = $this->generateIsbnEmbeddableFixture(['test' => $embeddedMetadata]);
 
         $isbn = $this->newInstance($metadata);
 
@@ -878,7 +888,7 @@ class EntityGeneratorTest extends OrmTestCase
     {
         $this->_generator->setEmbeddablesImmutable(true);
         $embeddedMetadata = $this->generateTestEmbeddableFixture();
-        $metadata = $this->generateIsbnEmbeddableFixture(array('test' => $embeddedMetadata));
+        $metadata = $this->generateIsbnEmbeddableFixture(['test' => $embeddedMetadata]);
 
         $this->loadEntityClass($embeddedMetadata);
         $this->loadEntityClass($metadata);
@@ -968,86 +978,106 @@ class EntityGeneratorTest extends OrmTestCase
      */
     public function getEntityTypeAliasDataProvider()
     {
-        return array(
-            array(array(
+        return [
+            [
+                [
                 'fieldName' => 'datetimetz',
                 'phpType' => '\\DateTime',
                 'dbType' => 'datetimetz',
                 'value' => new \DateTime
-            )),
-            array(array(
+                ]
+            ],
+            [
+                [
                 'fieldName' => 'datetime',
                 'phpType' => '\\DateTime',
                 'dbType' => 'datetime',
                 'value' => new \DateTime
-            )),
-            array(array(
+                ]
+            ],
+            [
+                [
                 'fieldName' => 'date',
                 'phpType' => '\\DateTime',
                 'dbType' => 'date',
                 'value' => new \DateTime
-            )),
-            array(array(
+                ]
+            ],
+            [
+                [
                 'fieldName' => 'time',
                 'phpType' => '\DateTime',
                 'dbType' => 'time',
                 'value' => new \DateTime
-            )),
-            array(array(
+                ]
+            ],
+            [
+                [
                 'fieldName' => 'object',
                 'phpType' => '\stdClass',
                 'dbType' => 'object',
                 'value' => new \stdClass()
-            )),
-            array(array(
+                ]
+            ],
+            [
+                [
                 'fieldName' => 'bigint',
                 'phpType' => 'int',
                 'dbType' => 'bigint',
                 'value' => 11
-            )),
-            array(array(
+                ]
+            ],
+            [
+                [
                 'fieldName' => 'smallint',
                 'phpType' => 'int',
                 'dbType' => 'smallint',
                 'value' => 22
-            )),
-            array(array(
+                ]
+            ],
+            [
+                [
                 'fieldName' => 'text',
                 'phpType' => 'string',
                 'dbType' => 'text',
                 'value' => 'text'
-            )),
-            array(array(
+                ]
+            ],
+            [
+                [
                 'fieldName' => 'blob',
                 'phpType' => 'string',
                 'dbType' => 'blob',
                 'value' => 'blob'
-            )),
-            array(array(
+                ]
+            ],
+            [
+                [
                 'fieldName' => 'decimal',
                 'phpType' => 'string',
                 'dbType' => 'decimal',
                 'value' => '12.34'
-            ),
-        ));
+                ],
+            ]
+        ];
     }
 
     public function getParseTokensInEntityFileData()
     {
-        return array(
-            array(
+        return [
+            [
                 '<?php namespace Foo\Bar; class Baz {}',
-                array('Foo\Bar\Baz'),
-            ),
-            array(
+                ['Foo\Bar\Baz'],
+            ],
+            [
                 '<?php namespace Foo\Bar; use Foo; class Baz {}',
-                array('Foo\Bar\Baz'),
-            ),
-            array(
+                ['Foo\Bar\Baz'],
+            ],
+            [
                 '<?php namespace /*Comment*/ Foo\Bar; /** Foo */class /* Comment */ Baz {}',
-                array('Foo\Bar\Baz'),
-            ),
-            array(
+                ['Foo\Bar\Baz'],
+            ],
+            [
                 '
 <?php namespace
 /*Comment*/
@@ -1059,9 +1089,9 @@ class
 /* Comment */
  Baz {}
      ',
-                array('Foo\Bar\Baz'),
-            ),
-            array(
+                ['Foo\Bar\Baz'],
+            ],
+            [
                 '
 <?php namespace Foo\Bar; class Baz {
     public static function someMethod(){
@@ -1069,9 +1099,9 @@ class
     }
 }
 ',
-                array('Foo\Bar\Baz'),
-            ),
-        );
+                ['Foo\Bar\Baz'],
+            ],
+        ];
     }
 
     /**
diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityRepositoryGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityRepositoryGeneratorTest.php
index bcb16a3d6..f40aba8f2 100644
--- a/tests/Doctrine/Tests/ORM/Tools/EntityRepositoryGeneratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/EntityRepositoryGeneratorTest.php
@@ -38,7 +38,7 @@ class EntityRepositoryGeneratorTest extends OrmTestCase
         $this->_generator->setRegenerateEntityIfExists(false);
         $this->_generator->setUpdateEntityIfExists(true);
         $this->_generator->setFieldVisibility(EntityGenerator::FIELD_VISIBLE_PROTECTED);
-        
+
         $this->_repositoryGenerator = new EntityRepositoryGenerator();
     }
 
@@ -47,7 +47,7 @@ class EntityRepositoryGeneratorTest extends OrmTestCase
      */
     public function tearDown()
     {
-        $dirs = array();
+        $dirs = [];
 
         $ri = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->_tmpDir));
         foreach ($ri AS $file) {
@@ -119,9 +119,9 @@ class EntityRepositoryGeneratorTest extends OrmTestCase
         $em = $this->_getTestEntityManager();
         $ns = $this->_namespace;
 
-        
+
         require_once __DIR__ . '/../../Models/DDC3231/DDC3231User2.php';
-        
+
         $className = $ns . '\DDC3231User2Tmp';
         $this->writeEntityClass('Doctrine\Tests\Models\DDC3231\DDC3231User2', $className);
 
@@ -131,14 +131,14 @@ class EntityRepositoryGeneratorTest extends OrmTestCase
         $this->assertFileExists($rpath);
 
         require $rpath;
-        
+
         $repo = new \ReflectionClass($em->getRepository($className));
 
         $this->assertTrue($repo->inNamespace());
         $this->assertSame($className . 'Repository', $repo->getName());
         $this->assertSame('Doctrine\Tests\Models\DDC3231\DDC3231EntityRepository', $repo->getParentClass()->getName());
 
-        
+
         require_once __DIR__ . '/../../Models/DDC3231/DDC3231User2NoNamespace.php';
 
         $className2 = 'DDC3231User2NoNamespaceTmp';
@@ -188,10 +188,10 @@ class EntityRepositoryGeneratorTest extends OrmTestCase
     private function writeRepositoryClass($className, $defaultRepository = null)
     {
         $this->_repositoryGenerator->setDefaultRepositoryName($defaultRepository);
-        
+
         $this->_repositoryGenerator->writeEntityRepositoryClass($className . 'Repository', $this->_tmpDir);
 
         return $this->_tmpDir . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $className) . 'Repository.php';
     }
-    
+
 }
diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php
index 5edd47b03..2cf91c390 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php
@@ -39,7 +39,7 @@ abstract class AbstractClassMetadataExporterTest extends OrmTestCase
         $config->setProxyDir(__DIR__ . '/../../Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
         $eventManager = new EventManager();
-        $conn = new ConnectionMock(array(), $driverMock, $config, $eventManager);
+        $conn = new ConnectionMock([], $driverMock, $config, $eventManager);
         $config->setMetadataDriverImpl($metadataDriver);
 
         return EntityManagerMock::create($conn, $config, $eventManager);
@@ -47,18 +47,18 @@ abstract class AbstractClassMetadataExporterTest extends OrmTestCase
 
     protected function _createMetadataDriver($type, $path)
     {
-        $mappingDriver = array(
+        $mappingDriver = [
             'php'        => 'Doctrine\Common\Persistence\Mapping\Driver\PHPDriver',
             'annotation' => 'Doctrine\ORM\Mapping\Driver\AnnotationDriver',
             'xml'        => 'Doctrine\ORM\Mapping\Driver\XmlDriver',
             'yaml'       => 'Doctrine\ORM\Mapping\Driver\YamlDriver',
-        );
+        ];
 
         $this->assertArrayHasKey($type, $mappingDriver, "There is no metadata driver for the type '" . $type . "'.");
 
         $class  = $mappingDriver[$type];
         $driver = ($type === 'annotation')
-            ? $this->createAnnotationDriver(array($path))
+            ? $this->createAnnotationDriver([$path])
             : new $class($path);
 
         return $driver;
@@ -140,7 +140,8 @@ abstract class AbstractClassMetadataExporterTest extends OrmTestCase
     public function testTableIsExported($class)
     {
         $this->assertEquals('cms_users', $class->table['name']);
-        $this->assertEquals(array('engine' => 'MyISAM', 'foo' => array('bar' => 'baz')),
+        $this->assertEquals(
+            ['engine' => 'MyISAM', 'foo' => ['bar' => 'baz']],
             $class->table['options']);
 
         return $class;
@@ -164,7 +165,7 @@ abstract class AbstractClassMetadataExporterTest extends OrmTestCase
     public function testIdentifierIsExported($class)
     {
         $this->assertEquals(ClassMetadataInfo::GENERATOR_TYPE_IDENTITY, $class->generatorType, "Generator Type wrong");
-        $this->assertEquals(array('id'), $class->identifier);
+        $this->assertEquals(['id'], $class->identifier);
         $this->assertTrue(isset($class->fieldMappings['id']['id']) && $class->fieldMappings['id']['id'] === true);
 
         return $class;
@@ -259,7 +260,7 @@ abstract class AbstractClassMetadataExporterTest extends OrmTestCase
         //$this->assertInstanceOf('Doctrine\ORM\Mapping\OneToManyMapping', $class->associationMappings['phonenumbers']);
         $this->assertEquals('Doctrine\Tests\ORM\Tools\Export\Phonenumber', $class->associationMappings['phonenumbers']['targetEntity']);
         $this->assertEquals('user', $class->associationMappings['phonenumbers']['mappedBy']);
-        $this->assertEquals(array('number' => 'ASC'), $class->associationMappings['phonenumbers']['orderBy']);
+        $this->assertEquals(['number' => 'ASC'], $class->associationMappings['phonenumbers']['orderBy']);
 
         $this->assertTrue($class->associationMappings['phonenumbers']['isCascadeRemove']);
         $this->assertTrue($class->associationMappings['phonenumbers']['isCascadePersist']);
diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/XmlClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/XmlClassMetadataExporterTest.php
index 3eca15f9c..424412882 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Export/XmlClassMetadataExporterTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Export/XmlClassMetadataExporterTest.php
@@ -29,19 +29,23 @@ class XmlClassMetadataExporterTest extends AbstractClassMetadataExporterTest
         $exporter = new XmlExporter();
         $metadata = new ClassMetadata('entityTest');
 
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
             "fieldName" => 'id',
             "type" => 'integer',
             "columnName" => 'id',
             "id" => true,
-        ));
+            ]
+        );
 
         $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE);
-        $metadata->setSequenceGeneratorDefinition(array(
+        $metadata->setSequenceGeneratorDefinition(
+            [
             'sequenceName' => 'seq_entity_test_id',
             'allocationSize' => 5,
             'initialValue' => 1
-        ));
+            ]
+        );
 
         $expectedFileContent = <<<'XML'
 <?xml version="1.0" encoding="utf-8"?>
@@ -71,15 +75,17 @@ XML;
         $exporter = new XmlExporter();
         $metadata = new ClassMetadata('entityTest');
 
-        $metadata->mapField(array(
+        $metadata->mapField(
+            [
             "fieldName" => 'myField',
             "type" => 'string',
             "columnName" => 'my_field',
-            "options" => array(
+            "options" => [
                 "default" => "default_string",
                 "comment" => "The comment for the field",
-            ),
-        ));
+            ],
+            ]
+        );
 
         $expectedFileContent = <<<'XML'
 <?xml version="1.0" encoding="utf-8"?>
diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/php/Doctrine.Tests.ORM.Tools.Export.User.php b/tests/Doctrine/Tests/ORM/Tools/Export/php/Doctrine.Tests.ORM.Tools.Export.User.php
index 4a379f82e..8fe7425d9 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Export/php/Doctrine.Tests.ORM.Tools.Export.User.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Export/php/Doctrine.Tests.ORM.Tools.Export.User.php
@@ -3,128 +3,148 @@
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
 $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE);
-$metadata->setPrimaryTable(array(
+$metadata->setPrimaryTable(
+    [
    'name' => 'cms_users',
-   'options' => array('engine' => 'MyISAM', 'foo' => array('bar' => 'baz')),
-  ));
+   'options' => ['engine' => 'MyISAM', 'foo' => ['bar' => 'baz']],
+    ]
+);
 $metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_DEFERRED_IMPLICIT);
 $metadata->addLifecycleCallback('doStuffOnPrePersist', 'prePersist');
 $metadata->addLifecycleCallback('doOtherStuffOnPrePersistToo', 'prePersist');
 $metadata->addLifecycleCallback('doStuffOnPostPersist', 'postPersist');
-$metadata->mapField(array(
+$metadata->mapField(
+    [
    'id' => true,
    'fieldName' => 'id',
    'type' => 'integer',
    'columnName' => 'id',
-  ));
-$metadata->mapField(array(
+    ]
+);
+$metadata->mapField(
+    [
    'fieldName' => 'name',
    'type' => 'string',
    'length' => 50,
    'unique' => true,
    'nullable' => true,
    'columnName' => 'name',
-  ));
-$metadata->mapField(array(
+    ]
+);
+$metadata->mapField(
+    [
    'fieldName' => 'email',
    'type' => 'string',
    'columnName' => 'user_email',
    'columnDefinition' => 'CHAR(32) NOT NULL',
-  ));
-$metadata->mapField(array(
+    ]
+);
+$metadata->mapField(
+    [
    'fieldName' => 'age',
    'type' => 'integer',
-   'options' => array("unsigned"=>true),
-  ));
+   'options' => ["unsigned"=>true],
+    ]
+);
 $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
-$metadata->mapManyToOne(array(
+$metadata->mapManyToOne(
+    [
     'fieldName' => 'mainGroup',
     'targetEntity' => 'Doctrine\\Tests\\ORM\Tools\\Export\\Group',
-));
-$metadata->mapOneToOne(array(
+    ]
+);
+$metadata->mapOneToOne(
+    [
    'fieldName' => 'address',
    'targetEntity' => 'Doctrine\\Tests\\ORM\\Tools\\Export\\Address',
    'inversedBy' => 'user',
    'cascade' =>
-   array(
+   [
    0 => 'persist',
-   ),
+   ],
    'mappedBy' => NULL,
    'joinColumns' =>
-   array(
+   [
    0 =>
-   array(
+   [
     'name' => 'address_id',
     'referencedColumnName' => 'id',
     'onDelete' => 'CASCADE',
-   ),
-   ),
+   ],
+   ],
    'orphanRemoval' => true,
    'fetch' => ClassMetadataInfo::FETCH_EAGER,
-  ));
-$metadata->mapOneToOne(array(
+    ]
+);
+$metadata->mapOneToOne(
+    [
     'fieldName' => 'cart',
     'targetEntity' => 'Doctrine\\Tests\\ORM\\Tools\\Export\\Cart',
     'mappedBy' => 'user',
     'cascade' =>
-        array(
+        [
             0 => 'persist',
-        ),
+        ],
     'inversedBy' => NULL,
     'orphanRemoval' => false,
     'fetch' => ClassMetadataInfo::FETCH_EAGER,
-));
-$metadata->mapOneToMany(array(
+    ]
+);
+$metadata->mapOneToMany(
+    [
    'fieldName' => 'phonenumbers',
    'targetEntity' => 'Doctrine\\Tests\\ORM\\Tools\\Export\\Phonenumber',
    'cascade' =>
-   array(
+   [
    1 => 'persist',
    2 => 'merge',
-   ),
+   ],
    'mappedBy' => 'user',
    'orphanRemoval' => true,
    'fetch' => ClassMetadataInfo::FETCH_LAZY,
    'orderBy' =>
-   array(
+   [
    'number' => 'ASC',
-   ),
-  ));
-$metadata->mapManyToMany(array(
+   ],
+    ]
+);
+$metadata->mapManyToMany(
+    [
    'fieldName' => 'groups',
    'targetEntity' => 'Doctrine\\Tests\\ORM\\Tools\\Export\\Group',
    'fetch' => ClassMetadataInfo::FETCH_EXTRA_LAZY,
    'cascade' =>
-   array(
+   [
    0 => 'remove',
    1 => 'persist',
    2 => 'refresh',
    3 => 'merge',
    4 => 'detach',
-   ),
+   ],
    'mappedBy' => NULL,
    'joinTable' =>
-   array(
+   [
    'name' => 'cms_users_groups',
    'joinColumns' =>
-   array(
+   [
     0 =>
-    array(
+    [
     'name' => 'user_id',
     'referencedColumnName' => 'id',
     'unique' => false,
     'nullable' => false,
-    ),
-   ),
+    ],
+   ],
    'inverseJoinColumns' =>
-   array(
+   [
     0 =>
-    array(
+    [
     'name' => 'group_id',
     'referencedColumnName' => 'id',
     'columnDefinition' => 'INT NULL',
-    ),
-   ),
-   ),
+    ],
+   ],
+   ],
    'orderBy' => NULL,
-  ));
+    ]
+);
diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php
index a85a5f6f8..cb085124d 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php
@@ -14,7 +14,7 @@ class CountWalkerTest extends PaginationTestCase
     {
         $query = $this->entityManager->createQuery(
             'SELECT p, c, a FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p JOIN p.category c JOIN p.author a');
-        $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\CountWalker'));
+        $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\CountWalker']);
         $query->setHint(CountWalker::HINT_DISTINCT, true);
         $query->setFirstResult(null)->setMaxResults(null);
 
@@ -27,7 +27,7 @@ class CountWalkerTest extends PaginationTestCase
     {
         $query = $this->entityManager->createQuery(
             'SELECT a, sum(a.name) as foo FROM Doctrine\Tests\ORM\Tools\Pagination\Author a');
-        $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\CountWalker'));
+        $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\CountWalker']);
         $query->setHint(CountWalker::HINT_DISTINCT, true);
         $query->setFirstResult(null)->setMaxResults(null);
 
@@ -40,7 +40,7 @@ class CountWalkerTest extends PaginationTestCase
     {
         $query = $this->entityManager->createQuery(
             'SELECT b FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost b GROUP BY b.id');
-        $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\CountWalker'));
+        $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\CountWalker']);
         $query->setHint(CountWalker::HINT_DISTINCT, true);
         $query->setFirstResult(null)->setMaxResults(null);
 
@@ -53,7 +53,7 @@ class CountWalkerTest extends PaginationTestCase
     {
         $query = $this->entityManager->createQuery(
             'SELECT p, c, a FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p JOIN p.category c JOIN p.author a ORDER BY a.name');
-        $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\CountWalker'));
+        $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\CountWalker']);
         $query->setHint(CountWalker::HINT_DISTINCT, true);
         $query->setFirstResult(null)->setMaxResults(null);
 
@@ -66,7 +66,7 @@ class CountWalkerTest extends PaginationTestCase
     {
         $query = $this->entityManager->createQuery(
             'SELECT p, c, a FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p JOIN p.category c JOIN p.author a');
-        $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\CountWalker'));
+        $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\CountWalker']);
         $query->setHint(CountWalker::HINT_DISTINCT, true);
         $query->setFirstResult(null)->setMaxResults(null);
 
@@ -80,7 +80,7 @@ class CountWalkerTest extends PaginationTestCase
         $query = $this->entityManager->createQuery(
             "SELECT g, COUNT(u.id) AS userCount FROM Doctrine\Tests\Models\CMS\CmsGroup g LEFT JOIN g.users u GROUP BY g.id HAVING userCount > 0"
         );
-        $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\CountWalker'));
+        $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\CountWalker']);
         $query->setFirstResult(null)->setMaxResults(null);
 
         $this->expectException(\RuntimeException::class);
@@ -88,15 +88,15 @@ class CountWalkerTest extends PaginationTestCase
 
         $query->getSQL();
     }
-    
+
     /**
-     * Arbitrary Join 
+     * Arbitrary Join
      */
     public function testCountQueryWithArbitraryJoin()
     {
         $query = $this->entityManager->createQuery(
             'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p LEFT JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c');
-        $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\CountWalker'));
+        $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\CountWalker']);
         $query->setHint(CountWalker::HINT_DISTINCT, true);
         $query->setFirstResult(null)->setMaxResults(null);
 
diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php
index 30da25789..5ccec2e75 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php
@@ -14,11 +14,11 @@ class LimitSubqueryWalkerTest extends PaginationTestCase
         $dql        = 'SELECT p, c, a FROM Doctrine\Tests\ORM\Tools\Pagination\MyBlogPost p JOIN p.category c JOIN p.author a';
         $query      = $this->entityManager->createQuery($dql);
         $limitQuery = clone $query;
-        
-        $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker'));
+
+        $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker']);
 
         $this->assertEquals(
-            "SELECT DISTINCT m0_.id AS id_0 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id INNER JOIN Author a2_ ON m0_.author_id = a2_.id", 
+            "SELECT DISTINCT m0_.id AS id_0 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id INNER JOIN Author a2_ ON m0_.author_id = a2_.id",
             $limitQuery->getSQL()
         );
     }
@@ -28,11 +28,11 @@ class LimitSubqueryWalkerTest extends PaginationTestCase
         $dql        = 'SELECT p, c, a FROM Doctrine\Tests\ORM\Tools\Pagination\MyBlogPost p JOIN p.category c JOIN p.author a ORDER BY p.title';
         $query      = $this->entityManager->createQuery($dql);
         $limitQuery = clone $query;
-        
-        $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker'));
+
+        $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker']);
 
         $this->assertEquals(
-            "SELECT DISTINCT m0_.id AS id_0, m0_.title AS title_1 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id INNER JOIN Author a2_ ON m0_.author_id = a2_.id ORDER BY m0_.title ASC", 
+            "SELECT DISTINCT m0_.id AS id_0, m0_.title AS title_1 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id INNER JOIN Author a2_ ON m0_.author_id = a2_.id ORDER BY m0_.title ASC",
             $limitQuery->getSQL()
         );
     }
@@ -42,11 +42,11 @@ class LimitSubqueryWalkerTest extends PaginationTestCase
         $dql        = 'SELECT a, sum(a.name) as foo FROM Doctrine\Tests\ORM\Tools\Pagination\Author a';
         $query      = $this->entityManager->createQuery($dql);
         $limitQuery = clone $query;
-        
-        $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker'));
+
+        $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker']);
 
         $this->assertEquals(
-            "SELECT DISTINCT a0_.id AS id_0, sum(a0_.name) AS sclr_1 FROM Author a0_", 
+            "SELECT DISTINCT a0_.id AS id_0, sum(a0_.name) AS sclr_1 FROM Author a0_",
             $limitQuery->getSQL()
         );
     }
@@ -59,28 +59,28 @@ class LimitSubqueryWalkerTest extends PaginationTestCase
         $dql        = 'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\MyBlogPost p ORDER BY p.author';
         $query      = $this->entityManager->createQuery($dql);
         $limitQuery = clone $query;
-        
-        $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker'));
+
+        $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker']);
 
         $this->assertEquals(
-            "SELECT DISTINCT m0_.id AS id_0, m0_.author_id AS sclr_1 FROM MyBlogPost m0_ ORDER BY m0_.author_id ASC", 
+            "SELECT DISTINCT m0_.id AS id_0, m0_.author_id AS sclr_1 FROM MyBlogPost m0_ ORDER BY m0_.author_id ASC",
             $limitQuery->getSQL()
         );
     }
-    
+
     /**
-     * Arbitrary Join 
-     */     
+     * Arbitrary Join
+     */
      public function testLimitSubqueryWithArbitraryJoin()
     {
         $dql        = 'SELECT p, c FROM Doctrine\Tests\ORM\Tools\Pagination\MyBlogPost p JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c';
         $query      = $this->entityManager->createQuery($dql);
         $limitQuery = clone $query;
-        
-        $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker'));
+
+        $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker']);
 
         $this->assertEquals(
-            "SELECT DISTINCT m0_.id AS id_0 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON (m0_.category_id = c1_.id)", 
+            "SELECT DISTINCT m0_.id AS id_0 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON (m0_.category_id = c1_.id)",
             $limitQuery->getSQL()
         );
     }
@@ -90,11 +90,11 @@ class LimitSubqueryWalkerTest extends PaginationTestCase
         $dql        = 'SELECT p, c FROM Doctrine\Tests\ORM\Tools\Pagination\MyBlogPost p JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c ORDER BY p.title';
         $query      = $this->entityManager->createQuery($dql);
         $limitQuery = clone $query;
-        
-        $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker'));
+
+        $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker']);
 
         $this->assertEquals(
-            "SELECT DISTINCT m0_.id AS id_0, m0_.title AS title_1 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON (m0_.category_id = c1_.id) ORDER BY m0_.title ASC", 
+            "SELECT DISTINCT m0_.id AS id_0, m0_.title AS title_1 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON (m0_.category_id = c1_.id) ORDER BY m0_.title ASC",
             $limitQuery->getSQL()
         );
     }
diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php
index f89ea5704..bbe2dcea6 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php
@@ -16,7 +16,7 @@ class WhereInWalkerTest extends PaginationTestCase
             'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g'
         );
         $whereInQuery = clone $query;
-        $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker'));
+        $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']);
         $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10);
 
         $this->assertEquals(
@@ -30,7 +30,7 @@ class WhereInWalkerTest extends PaginationTestCase
             'SELECT a, sum(a.name) as foo FROM Doctrine\Tests\ORM\Tools\Pagination\Author a'
         );
         $whereInQuery = clone $query;
-        $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker'));
+        $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']);
         $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10);
 
         $this->assertEquals(
@@ -44,7 +44,7 @@ class WhereInWalkerTest extends PaginationTestCase
             'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g WHERE 1 = 1'
         );
         $whereInQuery = clone $query;
-        $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker'));
+        $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']);
         $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10);
 
         $this->assertEquals(
@@ -58,7 +58,7 @@ class WhereInWalkerTest extends PaginationTestCase
             'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g WHERE 1 = 1 AND 2 = 2'
         );
         $whereInQuery = clone $query;
-        $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker'));
+        $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']);
         $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10);
 
         $this->assertEquals(
@@ -72,7 +72,7 @@ class WhereInWalkerTest extends PaginationTestCase
             'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g WHERE 1 = 1 OR 2 = 2'
         );
         $whereInQuery = clone $query;
-        $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker'));
+        $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']);
         $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10);
 
         $this->assertEquals(
@@ -86,7 +86,7 @@ class WhereInWalkerTest extends PaginationTestCase
             'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g WHERE (1 = 1 OR 2 = 2) AND 3 = 3'
         );
         $whereInQuery = clone $query;
-        $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker'));
+        $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']);
         $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10);
 
         $this->assertEquals(
@@ -100,7 +100,7 @@ class WhereInWalkerTest extends PaginationTestCase
             'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g WHERE 1 = 1 AND 2 = 2 OR 3 = 3'
         );
         $whereInQuery = clone $query;
-        $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker'));
+        $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']);
         $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10);
 
         $this->assertEquals(
@@ -114,36 +114,36 @@ class WhereInWalkerTest extends PaginationTestCase
             'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g WHERE NOT 1 = 2'
         );
         $whereInQuery = clone $query;
-        $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker'));
+        $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']);
         $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10);
 
         $this->assertEquals(
             "SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE (NOT 1 = 2) AND u0_.id IN (?)", $whereInQuery->getSQL()
         );
     }
-    
+
     /**
-     * Arbitrary Join 
+     * Arbitrary Join
      */
     public function testWhereInQueryWithArbitraryJoin_NoWhere()
     {
         $whereInQuery  = $this->entityManager->createQuery(
             'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c'
         );
-        $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker'));
+        $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']);
         $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10);
 
         $this->assertEquals(
             "SELECT b0_.id AS id_0, b0_.author_id AS author_id_1, b0_.category_id AS category_id_2 FROM BlogPost b0_ INNER JOIN Category c1_ ON (b0_.category_id = c1_.id) WHERE b0_.id IN (?)", $whereInQuery->getSQL()
         );
     }
-    
+
     public function testWhereInQueryWithArbitraryJoin_SingleWhere()
     {
         $whereInQuery = $this->entityManager->createQuery(
             'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c WHERE 1 = 1'
         );
-        $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker'));
+        $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']);
         $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10);
 
         $this->assertEquals(
diff --git a/tests/Doctrine/Tests/ORM/Tools/ResolveTargetEntityListenerTest.php b/tests/Doctrine/Tests/ORM/Tools/ResolveTargetEntityListenerTest.php
index 28753078d..d089317c9 100644
--- a/tests/Doctrine/Tests/ORM/Tools/ResolveTargetEntityListenerTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/ResolveTargetEntityListenerTest.php
@@ -43,12 +43,12 @@ class ResolveTargetEntityListenerTest extends OrmTestCase
         $this->listener->addResolveTargetEntity(
             'Doctrine\Tests\ORM\Tools\ResolveTargetInterface',
             'Doctrine\Tests\ORM\Tools\ResolveTargetEntity',
-            array()
+            []
         );
         $this->listener->addResolveTargetEntity(
             'Doctrine\Tests\ORM\Tools\TargetInterface',
             'Doctrine\Tests\ORM\Tools\TargetEntity',
-            array()
+            []
         );
         $evm->addEventSubscriber($this->listener);
 
@@ -73,7 +73,7 @@ class ResolveTargetEntityListenerTest extends OrmTestCase
         $this->listener->addResolveTargetEntity(
             'Doctrine\Tests\ORM\Tools\ResolveTargetInterface',
             'Doctrine\Tests\ORM\Tools\ResolveTargetEntity',
-            array()
+            []
         );
 
         $this->em->getEventManager()->addEventSubscriber($this->listener);
@@ -92,12 +92,12 @@ class ResolveTargetEntityListenerTest extends OrmTestCase
         $this->listener->addResolveTargetEntity(
             'Doctrine\Tests\ORM\Tools\ResolveTargetInterface',
             'Doctrine\Tests\ORM\Tools\ResolveTargetEntity',
-            array()
+            []
         );
         $this->listener->addResolveTargetEntity(
             'Doctrine\Tests\ORM\Tools\TargetInterface',
             'Doctrine\Tests\ORM\Tools\TargetEntity',
-            array()
+            []
         );
 
         $evm->addEventListener(Events::loadClassMetadata, $this->listener);
@@ -105,7 +105,7 @@ class ResolveTargetEntityListenerTest extends OrmTestCase
         $meta = $cm->associationMappings['manyToMany'];
 
         $this->assertSame('Doctrine\Tests\ORM\Tools\TargetEntity', $meta['targetEntity']);
-        $this->assertEquals(array('resolvetargetentity_id', 'targetinterface_id'), $meta['joinTableColumns']);
+        $this->assertEquals(['resolvetargetentity_id', 'targetinterface_id'], $meta['joinTableColumns']);
     }
 
     /**
@@ -120,7 +120,7 @@ class ResolveTargetEntityListenerTest extends OrmTestCase
         $this->listener->addResolveTargetEntity(
             'Doctrine\Tests\ORM\Tools\ResolveTargetInterface',
             'Doctrine\Tests\ORM\Tools\ResolveTargetEntity',
-            array()
+            []
         );
 
         $evm->addEventSubscriber($this->listener);
diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php
index bc54744b9..142ddcb2f 100644
--- a/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php
@@ -15,7 +15,7 @@ class SchemaToolTest extends OrmTestCase
         $em = $this->_getTestEntityManager();
         $schemaTool = new SchemaTool($em);
 
-        $classes = array(
+        $classes = [
             $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'),
             $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsArticle'),
             $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsComment'),
@@ -23,12 +23,12 @@ class SchemaToolTest extends OrmTestCase
             $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsGroup'),
             $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber'),
             $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'),
-        );
+        ];
 
         $schema = $schemaTool->getSchemaFromMetadata($classes);
 
         $this->assertTrue($schema->hasTable('cms_users'), "Table cms_users should exist.");
-        $this->assertTrue($schema->getTable('cms_users')->columnsAreIndexed(array('username')), "username column should be indexed.");
+        $this->assertTrue($schema->getTable('cms_users')->columnsAreIndexed(['username']), "username column should be indexed.");
     }
 
     public function testAnnotationOptionsAttribute()
@@ -36,13 +36,13 @@ class SchemaToolTest extends OrmTestCase
         $em = $this->_getTestEntityManager();
         $schemaTool = new SchemaTool($em);
 
-        $classes = array(
+        $classes = [
             $em->getClassMetadata(__NAMESPACE__ . '\\TestEntityWithAnnotationOptionsAttribute'),
-        );
+        ];
 
         $schema = $schemaTool->getSchemaFromMetadata($classes);
 
-        $expected = array('foo' => 'bar', 'baz' => array('key' => 'val'));
+        $expected = ['foo' => 'bar', 'baz' => ['key' => 'val']];
 
         $this->assertEquals($expected, $schema->getTable('TestEntityWithAnnotationOptionsAttribute')->getOptions(), "options annotation are passed to the tables options");
         $this->assertEquals($expected, $schema->getTable('TestEntityWithAnnotationOptionsAttribute')->getColumn('test')->getCustomSchemaOptions(), "options annotation are passed to the columns customSchemaOptions");
@@ -62,7 +62,7 @@ class SchemaToolTest extends OrmTestCase
         $avatar->fieldMappings['id']['columnDefinition'] = $customColumnDef;
         $user = $em->getClassMetadata('Doctrine\Tests\Models\Forum\ForumUser');
 
-        $classes = array($avatar, $user);
+        $classes = [$avatar, $user];
 
         $schema = $schemaTool->getSchemaFromMetadata($classes);
 
@@ -81,11 +81,11 @@ class SchemaToolTest extends OrmTestCase
 
         $em = $this->_getTestEntityManager();
         $em->getEventManager()->addEventListener(
-            array(ToolEvents::postGenerateSchemaTable, ToolEvents::postGenerateSchema), $listener
+            [ToolEvents::postGenerateSchemaTable, ToolEvents::postGenerateSchema], $listener
         );
         $schemaTool = new SchemaTool($em);
 
-        $classes = array(
+        $classes = [
             $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'),
             $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsArticle'),
             $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsComment'),
@@ -93,7 +93,7 @@ class SchemaToolTest extends OrmTestCase
             $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsGroup'),
             $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber'),
             $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'),
-        );
+        ];
 
         $schema = $schemaTool->getSchemaFromMetadata($classes);
 
@@ -106,16 +106,16 @@ class SchemaToolTest extends OrmTestCase
         $em = $this->_getTestEntityManager();
         $schemaTool = new SchemaTool($em);
 
-        $classes = array(
+        $classes = [
             $em->getClassMetadata('Doctrine\Tests\Models\NullDefault\NullDefaultColumn'),
-        );
+        ];
 
         $customSchemaOptions = $schemaTool->getSchemaFromMetadata($classes)
             ->getTable('NullDefaultColumn')
             ->getColumn('nullDefault')
             ->getCustomSchemaOptions();
 
-        $this->assertSame(array(), $customSchemaOptions);
+        $this->assertSame([], $customSchemaOptions);
     }
 
     /**
@@ -247,4 +247,4 @@ class SecondEntity
      * @Column(name="name")
      */
     public $name;
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php
index a17d92e7f..627a7b6a6 100644
--- a/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php
@@ -26,49 +26,61 @@ class SchemaValidatorTest extends OrmTestCase
 
     public function testCmsModelSet()
     {
-        $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths(array(
+        $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths(
+            [
             __DIR__ . "/../../Models/CMS"
-        ));
+            ]
+        );
         $this->validator->validateMapping();
     }
 
     public function testCompanyModelSet()
     {
-        $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths(array(
+        $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths(
+            [
             __DIR__ . "/../../Models/Company"
-        ));
+            ]
+        );
         $this->validator->validateMapping();
     }
 
     public function testECommerceModelSet()
     {
-        $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths(array(
+        $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths(
+            [
             __DIR__ . "/../../Models/ECommerce"
-        ));
+            ]
+        );
         $this->validator->validateMapping();
     }
 
     public function testForumModelSet()
     {
-        $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths(array(
+        $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths(
+            [
             __DIR__ . "/../../Models/Forum"
-        ));
+            ]
+        );
         $this->validator->validateMapping();
     }
 
     public function testNavigationModelSet()
     {
-        $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths(array(
+        $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths(
+            [
             __DIR__ . "/../../Models/Navigation"
-        ));
+            ]
+        );
         $this->validator->validateMapping();
     }
 
     public function testRoutingModelSet()
     {
-        $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths(array(
+        $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths(
+            [
             __DIR__ . "/../../Models/Routing"
-        ));
+            ]
+        );
         $this->validator->validateMapping();
     }
 
@@ -83,10 +95,10 @@ class SchemaValidatorTest extends OrmTestCase
         $ce = $this->validator->validateClass($class1);
 
         $this->assertEquals(
-            array(
+            [
                 "The inverse join columns of the many-to-many table 'Entity1Entity2' have to contain to ALL identifier columns of the target entity 'Doctrine\Tests\ORM\Tools\InvalidEntity2', however 'key4' are missing.",
                 "The join columns of the many-to-many table 'Entity1Entity2' have to contain to ALL identifier columns of the source entity 'Doctrine\Tests\ORM\Tools\InvalidEntity1', however 'key2' are missing."
-            ),
+            ],
             $ce
         );
     }
@@ -102,10 +114,10 @@ class SchemaValidatorTest extends OrmTestCase
         $ce = $this->validator->validateClass($class2);
 
         $this->assertEquals(
-            array(
+            [
                 "The referenced column name 'id' has to be a primary key column on the target entity class 'Doctrine\Tests\ORM\Tools\InvalidEntity1'.",
                 "The join columns of the association 'assoc' have to match to ALL identifier columns of the target entity 'Doctrine\Tests\ORM\Tools\InvalidEntity1', however 'key1, key2' are missing."
-            ),
+            ],
             $ce
         );
     }
@@ -120,7 +132,7 @@ class SchemaValidatorTest extends OrmTestCase
 
         $ce = $this->validator->validateClass($class1);
 
-        $this->assertEquals(array(), $ce);
+        $this->assertEquals([], $ce);
     }
 
     /**
@@ -131,10 +143,11 @@ class SchemaValidatorTest extends OrmTestCase
         $classThree = $this->em->getClassMetadata(__NAMESPACE__ . '\DDC1649Three');
         $ce = $this->validator->validateClass($classThree);
 
-        $this->assertEquals(Array(
+        $this->assertEquals(
+            [
             "Cannot map association 'Doctrine\Tests\ORM\Tools\DDC1649Three#two as identifier, because the target entity 'Doctrine\Tests\ORM\Tools\DDC1649Two' also maps an association as identifier.",
             "The referenced column name 'id' has to be a primary key column on the target entity class 'Doctrine\Tests\ORM\Tools\DDC1649Two'."
-        ), $ce);
+            ], $ce);
     }
 
     /**
@@ -146,11 +159,11 @@ class SchemaValidatorTest extends OrmTestCase
         $ce = $this->validator->validateClass($class);
 
         $this->assertEquals(
-            array(
+            [
                 "The field Doctrine\Tests\ORM\Tools\DDC3274One#two is on the inverse side of a bi-directional " .
                 "relationship, but the specified mappedBy association on the target-entity " .
                 "Doctrine\Tests\ORM\Tools\DDC3274Two#one does not contain the required 'inversedBy=\"two\"' attribute."
-            ),
+            ],
             $ce
         );
     }
@@ -164,10 +177,10 @@ class SchemaValidatorTest extends OrmTestCase
         $ce = $this->validator->validateClass($class);
 
         $this->assertEquals(
-            array(
+            [
                 "The association Doctrine\Tests\ORM\Tools\DDC3322One#invalidAssoc is ordered by a foreign field " .
                 "invalidField that is not a field on the target entity Doctrine\Tests\ORM\Tools\DDC3322ValidEntity1."
-            ),
+            ],
             $ce
         );
     }
@@ -181,10 +194,10 @@ class SchemaValidatorTest extends OrmTestCase
         $ce = $this->validator->validateClass($class);
 
         $this->assertEquals(
-            array(
+            [
                 "The association Doctrine\Tests\ORM\Tools\DDC3322Two#invalidAssoc is ordered by a field oneToMany " .
                 "on Doctrine\Tests\ORM\Tools\DDC3322ValidEntity1 that is a collection-valued association."
-            ),
+            ],
             $ce
         );
     }
@@ -198,10 +211,10 @@ class SchemaValidatorTest extends OrmTestCase
         $ce = $this->validator->validateClass($class);
 
         $this->assertEquals(
-            array(
+            [
                 "The association Doctrine\Tests\ORM\Tools\DDC3322Three#invalidAssoc is ordered by a field oneToOneInverse " .
                 "on Doctrine\Tests\ORM\Tools\DDC3322ValidEntity1 that is the inverse side of an association."
-            ),
+            ],
             $ce
         );
     }
diff --git a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php
index 06ef2a07a..0709d5256 100644
--- a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php
@@ -47,7 +47,7 @@ class SetupTest extends OrmTestCase
 
     public function testAnnotationConfiguration()
     {
-        $config = Setup::createAnnotationMetadataConfiguration(array(), true);
+        $config = Setup::createAnnotationMetadataConfiguration([], true);
 
         $this->assertInstanceOf('Doctrine\ORM\Configuration', $config);
         $this->assertEquals(sys_get_temp_dir(), $config->getProxyDir());
@@ -57,7 +57,7 @@ class SetupTest extends OrmTestCase
 
     public function testXMLConfiguration()
     {
-        $config = Setup::createXMLMetadataConfiguration(array(), true);
+        $config = Setup::createXMLMetadataConfiguration([], true);
 
         $this->assertInstanceOf('Doctrine\ORM\Configuration', $config);
         $this->assertInstanceOf('Doctrine\ORM\Mapping\Driver\XmlDriver', $config->getMetadataDriverImpl());
@@ -65,7 +65,7 @@ class SetupTest extends OrmTestCase
 
     public function testYAMLConfiguration()
     {
-        $config = Setup::createYAMLMetadataConfiguration(array(), true);
+        $config = Setup::createYAMLMetadataConfiguration([], true);
 
         $this->assertInstanceOf('Doctrine\ORM\Configuration', $config);
         $this->assertInstanceOf('Doctrine\ORM\Mapping\Driver\YamlDriver', $config->getMetadataDriverImpl());
@@ -76,7 +76,7 @@ class SetupTest extends OrmTestCase
      */
     public function testConfigureProxyDir()
     {
-        $config = Setup::createAnnotationMetadataConfiguration(array(), true, "/foo");
+        $config = Setup::createAnnotationMetadataConfiguration([], true, "/foo");
         $this->assertEquals('/foo', $config->getProxyDir());
     }
 
@@ -86,7 +86,7 @@ class SetupTest extends OrmTestCase
     public function testConfigureCache()
     {
         $cache = new ArrayCache();
-        $config = Setup::createAnnotationMetadataConfiguration(array(), true, null, $cache);
+        $config = Setup::createAnnotationMetadataConfiguration([], true, null, $cache);
 
         $this->assertSame($cache, $config->getResultCacheImpl());
         $this->assertSame($cache, $config->getMetadataCacheImpl());
@@ -99,7 +99,7 @@ class SetupTest extends OrmTestCase
     public function testConfigureCacheCustomInstance()
     {
         $cache  = $this->createMock(Cache::class);
-        $config = Setup::createConfiguration(array(), true, $cache);
+        $config = Setup::createConfiguration([], true, $cache);
 
         $this->assertSame($cache, $config->getResultCacheImpl());
         $this->assertSame($cache, $config->getMetadataCacheImpl());
diff --git a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
index 5a32d2882..42aadd431 100644
--- a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
+++ b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
@@ -52,7 +52,7 @@ class UnitOfWorkTest extends OrmTestCase
 
     protected function setUp() {
         parent::setUp();
-        $this->_connectionMock = new ConnectionMock(array(), new DriverMock());
+        $this->_connectionMock = new ConnectionMock([], new DriverMock());
         $this->_emMock = EntityManagerMock::create($this->_connectionMock);
         // SUT
         $this->_unitOfWork = new UnitOfWorkMock($this->_emMock);
@@ -168,7 +168,7 @@ class UnitOfWorkTest extends OrmTestCase
 
         $this->assertTrue($this->_unitOfWork->isScheduledForDirtyCheck($entity));
 
-        $this->assertEquals(array('data' => array('thedata', 'newdata')), $this->_unitOfWork->getEntityChangeSet($entity));
+        $this->assertEquals(['data' => ['thedata', 'newdata']], $this->_unitOfWork->getEntityChangeSet($entity));
 
         $item = new NotifyChangedRelatedItem();
         $entity->getItems()->add($item);
@@ -215,7 +215,7 @@ class UnitOfWorkTest extends OrmTestCase
         $persister->reset();
 
         // if the entity is already managed the exists() check should be skipped
-        $this->_unitOfWork->registerManaged($ph, array('phonenumber' => '12345'), array());
+        $this->_unitOfWork->registerManaged($ph, ['phonenumber' => '12345'], []);
         $this->assertEquals(UnitOfWork::STATE_MANAGED, $this->_unitOfWork->getEntityState($ph));
         $this->assertFalse($persister->isExistsCalled());
         $ph2 = new CmsPhonenumber();
@@ -319,7 +319,7 @@ class UnitOfWorkTest extends OrmTestCase
         $entity     = new ForumUser();
         $entity->id = 123;
 
-        $this->_unitOfWork->registerManaged($entity, array('id' => 123), array());
+        $this->_unitOfWork->registerManaged($entity, ['id' => 123], []);
         $this->assertTrue($this->_unitOfWork->isInIdentityMap($entity));
 
         $this->_unitOfWork->remove($entity);
@@ -497,7 +497,7 @@ class UnitOfWorkTest extends OrmTestCase
  */
 class NotifyChangedEntity implements NotifyPropertyChanged
 {
-    private $_listeners = array();
+    private $_listeners = [];
     /**
      * @Id
      * @Column(type="integer")
diff --git a/tests/Doctrine/Tests/ORM/Utility/IdentifierFlattenerTest.php b/tests/Doctrine/Tests/ORM/Utility/IdentifierFlattenerTest.php
index dad6ce4b3..384d04328 100644
--- a/tests/Doctrine/Tests/ORM/Utility/IdentifierFlattenerTest.php
+++ b/tests/Doctrine/Tests/ORM/Utility/IdentifierFlattenerTest.php
@@ -36,12 +36,12 @@ class IdentifierFlattenerTest extends OrmFunctionalTestCase
 
         try {
             $this->_schemaTool->createSchema(
-                array(
+                [
                     $this->_em->getClassMetadata('Doctrine\Tests\Models\VersionedOneToOne\FirstRelatedEntity'),
                     $this->_em->getClassMetadata('Doctrine\Tests\Models\VersionedOneToOne\SecondRelatedEntity'),
                     $this->_em->getClassMetadata('Doctrine\Tests\Models\Cache\Flight'),
                     $this->_em->getClassMetadata('Doctrine\Tests\Models\Cache\City')
-                )
+                ]
             );
         } catch (ORMException $e) {
         }
@@ -66,7 +66,7 @@ class IdentifierFlattenerTest extends OrmFunctionalTestCase
         $this->_em->flush();
 
         $firstEntity = $this->_em->getRepository('Doctrine\Tests\Models\VersionedOneToOne\FirstRelatedEntity')
-            ->findOneBy(array('name' => 'Fred'));
+            ->findOneBy(['name' => 'Fred']);
 
         $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\VersionedOneToOne\FirstRelatedEntity');
 
diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
index a6a3bece4..b6d2f005c 100644
--- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php
+++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
@@ -63,29 +63,29 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
      *
      * @var array
      */
-    protected $_usedModelSets = array();
+    protected $_usedModelSets = [];
 
     /**
      * Whether the database schema has already been created.
      *
      * @var array
      */
-    protected static $_tablesCreated = array();
+    protected static $_tablesCreated = [];
 
     /**
      * Array of entity class name to their tables that were created.
      *
      * @var array
      */
-    protected static $_entityTablesCreated = array();
+    protected static $_entityTablesCreated = [];
 
     /**
      * List of model sets and their classes.
      *
      * @var array
      */
-    protected static $_modelSets = array(
-        'cms' => array(
+    protected static $_modelSets = [
+        'cms' => [
             'Doctrine\Tests\Models\CMS\CmsUser',
             'Doctrine\Tests\Models\CMS\CmsPhonenumber',
             'Doctrine\Tests\Models\CMS\CmsAddress',
@@ -94,9 +94,9 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
             'Doctrine\Tests\Models\CMS\CmsTag',
             'Doctrine\Tests\Models\CMS\CmsArticle',
             'Doctrine\Tests\Models\CMS\CmsComment',
-        ),
-        'forum' => array(),
-        'company' => array(
+        ],
+        'forum' => [],
+        'company' => [
             'Doctrine\Tests\Models\Company\CompanyPerson',
             'Doctrine\Tests\Models\Company\CompanyEmployee',
             'Doctrine\Tests\Models\Company\CompanyManager',
@@ -106,40 +106,40 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
             'Doctrine\Tests\Models\Company\CompanyRaffle',
             'Doctrine\Tests\Models\Company\CompanyCar',
             'Doctrine\Tests\Models\Company\CompanyContract',
-        ),
-        'ecommerce' => array(
+        ],
+        'ecommerce' => [
             'Doctrine\Tests\Models\ECommerce\ECommerceCart',
             'Doctrine\Tests\Models\ECommerce\ECommerceCustomer',
             'Doctrine\Tests\Models\ECommerce\ECommerceProduct',
             'Doctrine\Tests\Models\ECommerce\ECommerceShipping',
             'Doctrine\Tests\Models\ECommerce\ECommerceFeature',
             'Doctrine\Tests\Models\ECommerce\ECommerceCategory'
-        ),
-        'generic' => array(
+        ],
+        'generic' => [
             'Doctrine\Tests\Models\Generic\BooleanModel',
             'Doctrine\Tests\Models\Generic\DateTimeModel',
             'Doctrine\Tests\Models\Generic\DecimalModel',
             'Doctrine\Tests\Models\Generic\SerializationModel',
-        ),
-        'routing' => array(
+        ],
+        'routing' => [
             'Doctrine\Tests\Models\Routing\RoutingLeg',
             'Doctrine\Tests\Models\Routing\RoutingLocation',
             'Doctrine\Tests\Models\Routing\RoutingRoute',
             'Doctrine\Tests\Models\Routing\RoutingRouteBooking',
-        ),
-        'navigation' => array(
+        ],
+        'navigation' => [
             'Doctrine\Tests\Models\Navigation\NavUser',
             'Doctrine\Tests\Models\Navigation\NavCountry',
             'Doctrine\Tests\Models\Navigation\NavPhotos',
             'Doctrine\Tests\Models\Navigation\NavTour',
             'Doctrine\Tests\Models\Navigation\NavPointOfInterest',
-        ),
-        'directorytree' => array(
+        ],
+        'directorytree' => [
             'Doctrine\Tests\Models\DirectoryTree\AbstractContentItem',
             'Doctrine\Tests\Models\DirectoryTree\File',
             'Doctrine\Tests\Models\DirectoryTree\Directory',
-        ),
-        'ddc117' => array(
+        ],
+        'ddc117' => [
             'Doctrine\Tests\Models\DDC117\DDC117Article',
             'Doctrine\Tests\Models\DDC117\DDC117Reference',
             'Doctrine\Tests\Models\DDC117\DDC117Translation',
@@ -147,42 +147,42 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
             'Doctrine\Tests\Models\DDC117\DDC117ApproveChanges',
             'Doctrine\Tests\Models\DDC117\DDC117Editor',
             'Doctrine\Tests\Models\DDC117\DDC117Link',
-        ),
-        'ddc3699' => array(
+        ],
+        'ddc3699' => [
             'Doctrine\Tests\Models\DDC3699\DDC3699Parent',
             'Doctrine\Tests\Models\DDC3699\DDC3699RelationOne',
             'Doctrine\Tests\Models\DDC3699\DDC3699RelationMany',
             'Doctrine\Tests\Models\DDC3699\DDC3699Child',
-        ),
-        'stockexchange' => array(
+        ],
+        'stockexchange' => [
             'Doctrine\Tests\Models\StockExchange\Bond',
             'Doctrine\Tests\Models\StockExchange\Stock',
             'Doctrine\Tests\Models\StockExchange\Market',
-        ),
-        'legacy' => array(
+        ],
+        'legacy' => [
             'Doctrine\Tests\Models\Legacy\LegacyUser',
             'Doctrine\Tests\Models\Legacy\LegacyUserReference',
             'Doctrine\Tests\Models\Legacy\LegacyArticle',
             'Doctrine\Tests\Models\Legacy\LegacyCar',
-        ),
-        'customtype' => array(
+        ],
+        'customtype' => [
             'Doctrine\Tests\Models\CustomType\CustomTypeChild',
             'Doctrine\Tests\Models\CustomType\CustomTypeParent',
             'Doctrine\Tests\Models\CustomType\CustomTypeUpperCase',
-        ),
-        'compositekeyinheritance' => array(
+        ],
+        'compositekeyinheritance' => [
             'Doctrine\Tests\Models\CompositeKeyInheritance\JoinedRootClass',
             'Doctrine\Tests\Models\CompositeKeyInheritance\JoinedChildClass',
             'Doctrine\Tests\Models\CompositeKeyInheritance\SingleRootClass',
             'Doctrine\Tests\Models\CompositeKeyInheritance\SingleChildClass',
-        ),
-        'taxi' => array(
+        ],
+        'taxi' => [
             'Doctrine\Tests\Models\Taxi\PaidRide',
             'Doctrine\Tests\Models\Taxi\Ride',
             'Doctrine\Tests\Models\Taxi\Car',
             'Doctrine\Tests\Models\Taxi\Driver',
-        ),
-        'cache' => array(
+        ],
+        'cache' => [
             'Doctrine\Tests\Models\Cache\Country',
             'Doctrine\Tests\Models\Cache\State',
             'Doctrine\Tests\Models\Cache\City',
@@ -205,102 +205,102 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
             'Doctrine\Tests\Models\Cache\AttractionInfo',
             'Doctrine\Tests\Models\Cache\AttractionContactInfo',
             'Doctrine\Tests\Models\Cache\AttractionLocationInfo'
-        ),
-        'tweet' => array(
+        ],
+        'tweet' => [
             'Doctrine\Tests\Models\Tweet\User',
             'Doctrine\Tests\Models\Tweet\Tweet',
             'Doctrine\Tests\Models\Tweet\UserList',
-        ),
-        'ddc2504' => array(
+        ],
+        'ddc2504' => [
             'Doctrine\Tests\Models\DDC2504\DDC2504RootClass',
             'Doctrine\Tests\Models\DDC2504\DDC2504ChildClass',
             'Doctrine\Tests\Models\DDC2504\DDC2504OtherClass',
-        ),
-        'ddc3346' => array(
+        ],
+        'ddc3346' => [
             'Doctrine\Tests\Models\DDC3346\DDC3346Author',
             'Doctrine\Tests\Models\DDC3346\DDC3346Article',
-        ),
-        'quote' => array(
+        ],
+        'quote' => [
             'Doctrine\Tests\Models\Quote\Address',
             'Doctrine\Tests\Models\Quote\Group',
             'Doctrine\Tests\Models\Quote\NumericEntity',
             'Doctrine\Tests\Models\Quote\Phone',
             'Doctrine\Tests\Models\Quote\User'
-        ),
-        'vct_onetoone' => array(
+        ],
+        'vct_onetoone' => [
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneEntity',
             'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneEntity'
-        ),
-        'vct_onetoone_compositeid' => array(
+        ],
+        'vct_onetoone_compositeid' => [
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdEntity',
             'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdEntity'
-        ),
-        'vct_onetoone_compositeid_foreignkey' => array(
+        ],
+        'vct_onetoone_compositeid_foreignkey' => [
             'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity',
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity',
             'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdForeignKeyEntity'
-        ),
-        'vct_onetomany' => array(
+        ],
+        'vct_onetomany' => [
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyEntity',
             'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneEntity'
-        ),
-        'vct_onetomany_compositeid' => array(
+        ],
+        'vct_onetomany_compositeid' => [
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdEntity',
             'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdEntity'
-        ),
-        'vct_onetomany_compositeid_foreignkey' => array(
+        ],
+        'vct_onetomany_compositeid_foreignkey' => [
             'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity',
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity',
             'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdForeignKeyEntity'
-        ),
-        'vct_onetomany_extralazy' => array(
+        ],
+        'vct_onetomany_extralazy' => [
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyExtraLazyEntity',
             'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneExtraLazyEntity'
-        ),
-        'vct_manytomany' => array(
+        ],
+        'vct_manytomany' => [
             'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyEntity',
             'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyEntity'
-        ),
-        'vct_manytomany_compositeid' => array(
+        ],
+        'vct_manytomany_compositeid' => [
             'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdEntity',
             'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdEntity'
-        ),
-        'vct_manytomany_compositeid_foreignkey' => array(
+        ],
+        'vct_manytomany_compositeid_foreignkey' => [
             'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity',
             'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity',
             'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdForeignKeyEntity'
-        ),
-        'vct_manytomany_extralazy' => array(
+        ],
+        'vct_manytomany_extralazy' => [
             'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyExtraLazyEntity',
             'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyExtraLazyEntity'
-        ),
-        'geonames' => array(
+        ],
+        'geonames' => [
             'Doctrine\Tests\Models\GeoNames\Country',
             'Doctrine\Tests\Models\GeoNames\Admin1',
             'Doctrine\Tests\Models\GeoNames\Admin1AlternateName',
             'Doctrine\Tests\Models\GeoNames\City'
-        ),
-        'custom_id_object_type' => array(
+        ],
+        'custom_id_object_type' => [
             'Doctrine\Tests\Models\CustomType\CustomIdObjectTypeParent',
             'Doctrine\Tests\Models\CustomType\CustomIdObjectTypeChild',
-        ),
-        'pagination' => array(
+        ],
+        'pagination' => [
             'Doctrine\Tests\Models\Pagination\Company',
             'Doctrine\Tests\Models\Pagination\Logo',
             'Doctrine\Tests\Models\Pagination\Department',
             'Doctrine\Tests\Models\Pagination\User',
             'Doctrine\Tests\Models\Pagination\User1',
-        ),
-        'versioned_many_to_one' => array(
+        ],
+        'versioned_many_to_one' => [
             'Doctrine\Tests\Models\VersionedManyToOne\Category',
             'Doctrine\Tests\Models\VersionedManyToOne\Article',
-        ),
-        'issue5989' => array(
+        ],
+        'issue5989' => [
             'Doctrine\Tests\Models\Issue5989\Issue5989Person',
             'Doctrine\Tests\Models\Issue5989\Issue5989Employee',
             'Doctrine\Tests\Models\Issue5989\Issue5989Manager',
-        ),
-    );
+        ],
+    ];
 
     /**
      * @param string $setName
@@ -590,7 +590,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
             throw new \RuntimeException("EntityManager not set, you have to call parent::setUp() before invoking this method.");
         }
 
-        $classes = array();
+        $classes = [];
         foreach ($classNames as $className) {
             if ( ! isset(static::$_entityTablesCreated[$className])) {
                 static::$_entityTablesCreated[$className] = true;
@@ -624,7 +624,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
         }
 
         if (isset($GLOBALS['DOCTRINE_MARK_SQL_LOGS'])) {
-            if (in_array(static::$_sharedConn->getDatabasePlatform()->getName(), array("mysql", "postgresql"))) {
+            if (in_array(static::$_sharedConn->getDatabasePlatform()->getName(), ["mysql", "postgresql"])) {
                 static::$_sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/');
             } else if (static::$_sharedConn->getDatabasePlatform()->getName() == "oracle") {
                 static::$_sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/ FROM dual');
@@ -636,7 +636,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
             $this->_schemaTool = new SchemaTool($this->_em);
         }
 
-        $classes = array();
+        $classes = [];
 
         foreach ($this->_usedModelSets as $setName => $bool) {
             if ( ! isset(static::$_tablesCreated[$setName])/* || $forceCreateTables*/) {
@@ -712,10 +712,11 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
             $this->isSecondLevelCacheEnabled = true;
         }
 
-        $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(array(
+        $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(
+            [
             realpath(__DIR__ . '/Models/Cache'),
             realpath(__DIR__ . '/Models/GeoNames')
-        ), true));
+            ], true));
 
         $conn = static::$_sharedConn;
         $conn->getConfiguration()->setSQLLogger($this->_sqlLoggerStack);
@@ -724,7 +725,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
         $evm = $conn->getEventManager();
         foreach ($evm->getListeners() AS $event => $listeners) {
             foreach ($listeners AS $listener) {
-                $evm->removeEventListener(array($event), $listener);
+                $evm->removeEventListener([$event], $listener);
             }
         }
 
@@ -740,7 +741,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
         }
 
         if (isset($GLOBALS['debug_uow_listener'])) {
-            $evm->addEventListener(array('onFlush'), new DebugUnitOfWorkListener());
+            $evm->addEventListener(['onFlush'], new DebugUnitOfWorkListener());
         }
 
         return EntityManager::create($conn, $config);
@@ -763,7 +764,8 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
             $queries = "";
             $last25queries = array_slice(array_reverse($this->_sqlLoggerStack->queries, true), 0, 25, true);
             foreach ($last25queries as $i => $query) {
-                $params = array_map(function($p) { if (is_object($p)) return get_class($p); else return var_export($p, true); }, $query['params'] ?: array());
+                $params = array_map(function($p) { if (is_object($p)) return get_class($p); else return var_export($p, true); }, $query['params'] ?: []
+                );
                 $queries .= $i.". SQL: '".$query['sql']."' Params: ".implode(", ", $params).PHP_EOL;
             }
 
diff --git a/tests/Doctrine/Tests/OrmTestCase.php b/tests/Doctrine/Tests/OrmTestCase.php
index 200f53450..9d6e9b5ac 100644
--- a/tests/Doctrine/Tests/OrmTestCase.php
+++ b/tests/Doctrine/Tests/OrmTestCase.php
@@ -62,7 +62,7 @@ abstract class OrmTestCase extends DoctrineTestCase
      *
      * @return \Doctrine\ORM\Mapping\Driver\AnnotationDriver
      */
-    protected function createAnnotationDriver($paths = array(), $alias = null)
+    protected function createAnnotationDriver($paths = [], $alias = null)
     {
         if (version_compare(Version::VERSION, '3.0.0', '>=')) {
             $reader = new Annotations\CachedReader(new Annotations\AnnotationReader(), new ArrayCache());
@@ -125,13 +125,14 @@ abstract class OrmTestCase extends DoctrineTestCase
         $config = new Configuration();
 
         $config->setMetadataCacheImpl($metadataCache);
-        $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(array(), true));
+        $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver([], true));
         $config->setQueryCacheImpl(self::getSharedQueryCacheImpl());
         $config->setProxyDir(__DIR__ . '/Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
-        $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(array(
+        $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(
+            [
             realpath(__DIR__ . '/Models/Cache')
-        ), true));
+            ], true));
 
         if ($this->isSecondLevelCacheEnabled) {
 
@@ -147,12 +148,12 @@ abstract class OrmTestCase extends DoctrineTestCase
         }
 
         if ($conn === null) {
-            $conn = array(
+            $conn = [
                 'driverClass'  => 'Doctrine\Tests\Mocks\DriverMock',
                 'wrapperClass' => 'Doctrine\Tests\Mocks\ConnectionMock',
                 'user'         => 'john',
                 'password'     => 'wayne'
-            );
+            ];
         }
 
         if (is_array($conn)) {
diff --git a/tests/Doctrine/Tests/TestUtil.php b/tests/Doctrine/Tests/TestUtil.php
index 8a830f724..812961c92 100644
--- a/tests/Doctrine/Tests/TestUtil.php
+++ b/tests/Doctrine/Tests/TestUtil.php
@@ -125,10 +125,10 @@ class TestUtil
 
     private static function getFallbackConnectionParams()
     {
-        $params = array(
+        $params = [
             'driver' => 'pdo_sqlite',
             'memory' => true
-        );
+        ];
 
         if (isset($GLOBALS['db_path'])) {
             $params['path'] = $GLOBALS['db_path'];
@@ -151,14 +151,14 @@ class TestUtil
 
     private static function getParamsForTemporaryConnection()
     {
-        $connectionParams = array(
+        $connectionParams = [
             'driver' => $GLOBALS['tmpdb_type'],
             'user' => $GLOBALS['tmpdb_username'],
             'password' => $GLOBALS['tmpdb_password'],
             'host' => $GLOBALS['tmpdb_host'],
             'dbname' => null,
             'port' => $GLOBALS['tmpdb_port']
-        );
+        ];
 
         if (isset($GLOBALS['tmpdb_name'])) {
             $connectionParams['dbname'] = $GLOBALS['tmpdb_name'];
@@ -177,14 +177,14 @@ class TestUtil
 
     private static function getParamsForMainConnection()
     {
-        $connectionParams = array(
+        $connectionParams = [
             'driver' => $GLOBALS['db_type'],
             'user' => $GLOBALS['db_username'],
             'password' => $GLOBALS['db_password'],
             'host' => $GLOBALS['db_host'],
             'dbname' => $GLOBALS['db_name'],
             'port' => $GLOBALS['db_port']
-        );
+        ];
 
         if (isset($GLOBALS['db_server'])) {
             $connectionParams['server'] = $GLOBALS['db_server'];