Merge pull request #152 from wmde/doctrine-update-2024

Update Doctrine ORM and DBAL

composer.json

@@ -8,8 +8,8 @@
 		"wmde/euro": "~1.0",
 		"wmde/fun-validators": "~v4.0",
 
-		"doctrine/orm": "^2.16.1",
-		"doctrine/dbal": "^3.3",
+		"doctrine/orm": "~2.18 | ~3.0",
+		"doctrine/dbal": "~3.8 | ~4.0",
 		"doctrine/migrations": "^3.5",
 		"guzzlehttp/guzzle": "^7.4",
 		"sofort/sofortlib-php": "^3.2",

config/DoctrineClassMapping/WMDE.Fundraising.PaymentContext.Domain.Model.PaymentReferenceCode.dcm.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="WMDE\Fundraising\PaymentContext\Domain\Model\PaymentReferenceCode" table="payment_reference_codes">
-        <id name="formattedCode" type="string" column="code">
+        <id name="formattedCode" type="string" column="code" length="255">
             <generator strategy="NONE"/>
         </id>
     </entity>

phpstan-baseline.neon

@@ -1,13 +1,5 @@
 parameters:
     ignoreErrors:
-        # A workaround for Doctrine not specifying an UniqueConstraintViolationException being thrown
-        # See https://github.com/doctrine/orm/issues/7780
-        # This rule might be unnecessary in the future with a fixe discussed in
-        # https://github.com/phpstan/phpstan-doctrine/issues/295
-        - message: /Doctrine\\DBAL\\Exception\\UniqueConstraintViolationException is never thrown in the try block/
-          path: src/DataAccess/DoctrinePaymentRepository.php
-          count: 1
-
         # Workaround for loading the Paypal configuration YAML file (mixed content) and assuming a certain array shape (validated with Symfony config)
         # In the future, Symfony Config might generate PHPStan types that would allow us to at least type the input to PayPalAPIURLGeneratorConfigFactory
         # and the output of PayPalPaymentProviderAdapterConfigReader

tests/Integration/DataAccess/DoctrinePaymentRepositoryTest.php

@@ -85,7 +85,6 @@ public function testRepositoryCatchesDatabaseErrorsFromPaymentsWithTheSameId():
 		$firstPayment = new CreditCardPayment( 1, Euro::newFromInt( 99 ), PaymentInterval::Quarterly );
 		$firstPayment->bookPayment( [ 'transactionId' => 'badcaffee', 'amount' => 9900 ], new DummyPaymentIdRepository() );
 		$secondPayment = new CreditCardPayment( 1, Euro::newFromInt( 42 ), PaymentInterval::Monthly );
-		$this->entityManager->getConfiguration()->setRejectIdCollisionInIdentityMap( false );
 		$repo = new DoctrinePaymentRepository( $this->entityManager );
 		$repo->storePayment( $firstPayment );