Merge pull request #1983 from greg0ire/strict-types

Enable strict types

Author: greg0ire

.doctrine-project.json

@@ -6,17 +6,19 @@
   "versions": [
     {
       "name": "3.0",
+      "branchName": "3.0.x",
       "slug": "latest",
       "upcoming": true
     },
     {
       "name": "2.17",
+      "branchName": "2.17.x",
       "slug": "2.17",
       "upcoming": true
     },
     {
       "name": "2.16",
-      "slug": "latest",
+      "slug": "2.16",
       "current": true
     },
     {

config/dbal.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Doctrine\Bundle\DoctrineBundle\Command\CreateDatabaseDoctrineCommand;
@@ -44,17 +46,17 @@
         ->alias(ManagerRegistry::class, 'doctrine')
         ->alias(LegacyManagerRegistry::class, 'doctrine')
 
-        ->set('data_collector.doctrine', param('doctrine.data_collector.class'))
+        ->set('data_collector.doctrine', (string) param('doctrine.data_collector.class'))
             ->args([
                 service('doctrine'),
                 true,
                 service('doctrine.debug_data_holder')->nullOnInvalid(),
             ])
             ->tag('data_collector', ['template' => '@Doctrine/Collector/db.html.twig', 'id' => 'db', 'priority' => 250])
 
-        ->set('doctrine.dbal.connection_factory', param('doctrine.dbal.connection_factory.class'))
+        ->set('doctrine.dbal.connection_factory', (string) param('doctrine.dbal.connection_factory.class'))
             ->args([
-                param('doctrine.dbal.connection_factory.types'),
+                (string) param('doctrine.dbal.connection_factory.types'),
                 service('doctrine.dbal.connection_factory.dsn_parser'),
             ])
 
@@ -67,23 +69,23 @@
             ->abstract()
             ->factory([service('doctrine.dbal.connection_factory'), 'createConnection'])
 
-        ->set('doctrine.dbal.connection.event_manager', param('doctrine.dbal.connection.event_manager.class'))
+        ->set('doctrine.dbal.connection.event_manager', (string) param('doctrine.dbal.connection.event_manager.class'))
             ->abstract()
             ->args([
                 service('service_container'),
             ])
 
-        ->set('doctrine.dbal.connection.configuration', param('doctrine.dbal.configuration.class'))
+        ->set('doctrine.dbal.connection.configuration', (string) param('doctrine.dbal.configuration.class'))
             ->abstract()
 
-        ->set('doctrine', param('doctrine.class'))
+        ->set('doctrine', (string) param('doctrine.class'))
             ->public()
             ->args([
                 service('service_container'),
-                param('doctrine.connections'),
-                param('doctrine.entity_managers'),
-                param('doctrine.default_connection'),
-                param('doctrine.default_entity_manager'),
+                (string) param('doctrine.connections'),
+                (string) param('doctrine.entity_managers'),
+                (string) param('doctrine.default_connection'),
+                (string) param('doctrine.default_entity_manager'),
             ])
             ->tag('kernel.reset', ['method' => 'reset'])
 

config/messenger.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Symfony\Bridge\Doctrine\Messenger\DoctrineClearEntityManagerWorkerSubscriber;

config/middlewares.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use ArrayObject;

config/orm.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Doctrine\Bundle\DoctrineBundle\Command\ImportMappingDoctrineCommand;
@@ -142,13 +144,13 @@
 
         ->alias('doctrine.orm.metadata.annotation_reader', 'annotation_reader')
 
-        ->set('doctrine.orm.proxy_cache_warmer', param('doctrine.orm.proxy_cache_warmer.class'))
+        ->set('doctrine.orm.proxy_cache_warmer', (string) param('doctrine.orm.proxy_cache_warmer.class'))
             ->tag('kernel.cache_warmer')
             ->args([
                 service('doctrine'),
             ])
 
-        ->set('form.type_guesser.doctrine', param('form.type_guesser.doctrine.class'))
+        ->set('form.type_guesser.doctrine', (string) param('form.type_guesser.doctrine.class'))
             ->tag('form.type_guesser')
             ->args([
                 service('doctrine'),
@@ -160,10 +162,10 @@
                 service('doctrine'),
             ])
 
-        ->set('doctrine.orm.configuration', param('doctrine.orm.configuration.class'))
+        ->set('doctrine.orm.configuration', (string) param('doctrine.orm.configuration.class'))
             ->abstract()
 
-        ->set('doctrine.orm.entity_manager.abstract', param('doctrine.orm.entity_manager.class'))
+        ->set('doctrine.orm.entity_manager.abstract', (string) param('doctrine.orm.entity_manager.class'))
             ->abstract()
             ->lazy()
 
@@ -174,32 +176,32 @@
                 ]),
             ])
 
-        ->set('doctrine.orm.manager_configurator.abstract', param('doctrine.orm.manager_configurator.class'))
+        ->set('doctrine.orm.manager_configurator.abstract', (string) param('doctrine.orm.manager_configurator.class'))
             ->abstract()
             ->args([
                 [],
                 [],
             ])
 
-        ->set('doctrine.orm.validator.unique', param('doctrine.orm.validator.unique.class'))
+        ->set('doctrine.orm.validator.unique', (string) param('doctrine.orm.validator.unique.class'))
             ->tag('validator.constraint_validator', ['alias' => 'doctrine.orm.validator.unique'])
             ->args([
                 service('doctrine'),
             ])
 
-        ->set('doctrine.orm.validator_initializer', param('doctrine.orm.validator_initializer.class'))
+        ->set('doctrine.orm.validator_initializer', (string) param('doctrine.orm.validator_initializer.class'))
             ->tag('validator.initializer')
             ->args([
                 service('doctrine'),
             ])
 
-        ->set('doctrine.orm.security.user.provider', param('doctrine.orm.security.user.provider.class'))
+        ->set('doctrine.orm.security.user.provider', (string) param('doctrine.orm.security.user.provider.class'))
             ->abstract()
             ->args([
                 service('doctrine'),
             ])
 
-        ->set('doctrine.orm.listeners.resolve_target_entity', param('doctrine.orm.listeners.resolve_target_entity.class'))
+        ->set('doctrine.orm.listeners.resolve_target_entity', (string) param('doctrine.orm.listeners.resolve_target_entity.class'))
 
         ->set('doctrine.orm.listeners.doctrine_dbal_cache_adapter_schema_listener', DoctrineDbalCacheAdapterSchemaListener::class)
             ->args([
@@ -225,21 +227,21 @@
             ])
             ->tag('doctrine.event_listener', ['event' => 'postGenerateSchema'])
 
-        ->set('doctrine.orm.naming_strategy.default', param('doctrine.orm.naming_strategy.default.class'))
+        ->set('doctrine.orm.naming_strategy.default', (string) param('doctrine.orm.naming_strategy.default.class'))
 
-        ->set('doctrine.orm.naming_strategy.underscore', param('doctrine.orm.naming_strategy.underscore.class'))
+        ->set('doctrine.orm.naming_strategy.underscore', (string) param('doctrine.orm.naming_strategy.underscore.class'))
 
-        ->set('doctrine.orm.naming_strategy.underscore_number_aware', param('doctrine.orm.naming_strategy.underscore.class'))
+        ->set('doctrine.orm.naming_strategy.underscore_number_aware', (string) param('doctrine.orm.naming_strategy.underscore.class'))
             ->args([
                 CASE_LOWER,
                 true,
             ])
 
-        ->set('doctrine.orm.quote_strategy.default', param('doctrine.orm.quote_strategy.default.class'))
+        ->set('doctrine.orm.quote_strategy.default', (string) param('doctrine.orm.quote_strategy.default.class'))
 
-        ->set('doctrine.orm.quote_strategy.ansi', param('doctrine.orm.quote_strategy.ansi.class'))
+        ->set('doctrine.orm.quote_strategy.ansi', (string) param('doctrine.orm.quote_strategy.ansi.class'))
 
-        ->set('doctrine.orm.typed_field_mapper.default', param('doctrine.orm.typed_field_mapper.default.class'))
+        ->set('doctrine.orm.typed_field_mapper.default', (string) param('doctrine.orm.typed_field_mapper.default.class'))
 
         ->set('doctrine.ulid_generator', 'Symfony\\Bridge\\Doctrine\\IdGenerator\\UlidGenerator')
             ->args([
@@ -360,7 +362,7 @@
         ->set('doctrine.mapping_import_command', ImportMappingDoctrineCommand::class)
             ->args([
                 service('doctrine'),
-                param('kernel.bundles'),
+                (string) param('kernel.bundles'),
             ])
             ->tag('console.command', ['command' => 'doctrine:mapping:import']);
 };

phpcs.xml.dist

@@ -18,7 +18,6 @@
     <file>tests</file>
 
     <rule ref="Doctrine">
-        <exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes"/>
         <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint"/> <!-- we can do it in doctrine-bundle 3.0-->
         <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint"/> <!-- we can do it in doctrine-bundle 3.0 -->
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming.SuperfluousSuffix"/>

phpunit.xml.dist

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          colors="true"
-         bootstrap="tests/bootstrap.php"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          displayDetailsOnTestsThatTriggerDeprecations="true"
          failOnDeprecation="true"

src/Attribute/AsDoctrineListener.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Doctrine\Bundle\DoctrineBundle\Attribute;
 
 use Attribute;

src/Attribute/AsEntityListener.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Doctrine\Bundle\DoctrineBundle\Attribute;
 
 use Attribute;

src/Attribute/AsMiddleware.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Doctrine\Bundle\DoctrineBundle\Attribute;
 
 use Attribute;