Skip to content

Commit 6becada

Browse files
committed
Doctrine: No longer rely on the deprecated commented setting in the doctrine bundle.
Instead, set the commented via the custom type. doctrine/DoctrineBundle#977
1 parent 19cefeb commit 6becada

28 files changed

Lines changed: 135 additions & 27 deletions

config/packages/doctrine.yaml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -33,85 +33,58 @@ doctrine:
3333
types:
3434
authority_role:
3535
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\AuthorityRoleType
36-
commented: false
3736
institution:
3837
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\InstitutionType
39-
commented: false
4038
stepup_contact_information:
4139
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\ContactInformationType
42-
commented: false
4340
stepup_common_name:
4441
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\CommonNameType
45-
commented: false
4642
stepup_datetime:
4743
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\DateTimeType
48-
commented: false
4944
stepup_document_number:
5045
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\DocumentNumberType
51-
commented: false
5246
stepup_email:
5347
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\EmailType
54-
commented: false
5548
stepup_name_id:
5649
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\NameIdType
57-
commented: false
5850
stepup_locale:
5951
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\LocaleType
60-
commented: false
6152
stepup_location:
6253
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\LocationType
63-
commented: false
6454
stepup_second_factor_status:
6555
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\SecondFactorStatusType
66-
commented: false
6756
stepup_recovery_token_status:
6857
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\RecoveryTokenStatusType
69-
commented: false
7058
stepup_ra_location_name:
7159
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\RaLocationNameType
72-
commented: false
7360
stepup_configuration_institution:
7461
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\ConfigurationInstitutionType
75-
commented: false
7662
stepup_configuration_contact_information:
7763
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\ConfigurationContactInformationType
78-
commented: false
7964
stepup_configuration_location:
8065
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\ConfigurationLocationType
81-
commented: false
8266
stepup_use_ra_locations_option:
8367
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\UseRaLocationsOptionType
84-
commented: false
8568
stepup_show_raa_contact_information_option:
8669
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\ShowRaaContactInformationOptionType
87-
commented: false
8870
stepup_second_factor_type:
8971
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\SecondFactorTypeType
90-
commented: false
9172
stepup_verify_email_option:
9273
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\VerifyEmailOptionType
93-
commented: false
9474
stepup_number_of_tokens_per_identity_option:
9575
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\NumberOfTokensPerIdentityType
96-
commented: false
9776
stepup_self_vet_option:
9877
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\SelfVetOptionType
99-
commented: false
10078
stepup_self_asserted_tokens_option:
10179
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\SelfAssertedTokensOptionType
102-
commented: false
10380
stepup_sso_on_2fa_option:
10481
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\SsoOn2faOptionType
105-
commented: false
10682
stepup_sso_registration_bypass_option:
10783
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\SsoRegistrationBypassOptionType
108-
commented: false
10984
stepup_institution_role:
11085
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\InstitutionRoleType
111-
commented: false
11286
stepup_vetting_type_hints:
11387
class: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\VettingTypeHintsType
114-
commented: false
11588
orm:
11689
default_entity_manager: middleware
11790
auto_generate_proxy_classes: "%kernel.debug%"

src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/AuthorityRoleType.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,9 @@ public function getName(): string
7474
{
7575
return self::NAME;
7676
}
77+
78+
public function requiresSQLCommentHint(AbstractPlatform $platform): bool
79+
{
80+
return false;
81+
}
7782
}

src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/CommonNameType.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,9 @@ public function getName(): string
7171
{
7272
return self::NAME;
7373
}
74+
75+
public function requiresSQLCommentHint(AbstractPlatform $platform): bool
76+
{
77+
return false;
78+
}
7479
}

src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,9 @@ public function getName(): string
8383
{
8484
return self::NAME;
8585
}
86+
87+
public function requiresSQLCommentHint(AbstractPlatform $platform): bool
88+
{
89+
return false;
90+
}
8691
}

src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,9 @@ public function getName(): string
8080
{
8181
return self::NAME;
8282
}
83+
84+
public function requiresSQLCommentHint(AbstractPlatform $platform): bool
85+
{
86+
return false;
87+
}
8388
}

src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,9 @@ public function getName(): string
8383
{
8484
return self::NAME;
8585
}
86+
87+
public function requiresSQLCommentHint(AbstractPlatform $platform): bool
88+
{
89+
return false;
90+
}
8691
}

src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,9 @@ public function getName(): string
7373
{
7474
return self::NAME;
7575
}
76+
77+
public function requiresSQLCommentHint(AbstractPlatform $platform): bool
78+
{
79+
return false;
80+
}
7681
}

src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,9 @@ public function getName(): string
8484
{
8585
return self::NAME;
8686
}
87+
88+
public function requiresSQLCommentHint(AbstractPlatform $platform): bool
89+
{
90+
return false;
91+
}
8792
}

src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DocumentNumberType.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,9 @@ public function getName(): string
7676
{
7777
return self::NAME;
7878
}
79+
80+
public function requiresSQLCommentHint(AbstractPlatform $platform): bool
81+
{
82+
return false;
83+
}
7984
}

src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/EmailType.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,9 @@ public function getName(): string
7070
{
7171
return self::NAME;
7272
}
73+
74+
public function requiresSQLCommentHint(AbstractPlatform $platform): bool
75+
{
76+
return false;
77+
}
7378
}

0 commit comments

Comments
 (0)