From 7ade3f89bcc4e2ec8828816470fcaf541272eca1 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 4 Oct 2021 10:12:26 +0200
Subject: update to 2.10.0

drop dependency on doctrine/annotations
add dependency on symfony/polyfill-php80
---
 php-doctrine-orm-bin.patch | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'php-doctrine-orm-bin.patch')

diff --git a/php-doctrine-orm-bin.patch b/php-doctrine-orm-bin.patch
index 0326446..f775e0c 100644
--- a/php-doctrine-orm-bin.patch
+++ b/php-doctrine-orm-bin.patch
@@ -1,12 +1,10 @@
-diff -up ./bin/doctrine.php.rpm ./bin/doctrine.php
---- ./bin/doctrine.php.rpm	2021-02-24 11:42:32.000000000 +0100
-+++ ./bin/doctrine.php	2021-02-24 11:43:44.654144234 +0100
-@@ -1,3 +1,4 @@
+diff -up ./bin/doctrine.php.rpm1 ./bin/doctrine.php
+--- ./bin/doctrine.php.rpm1	2021-10-04 09:50:51.000000000 +0200
++++ ./bin/doctrine.php	2021-10-04 10:01:30.938203159 +0200
+@@ -1,19 +1,10 @@
 +#!/usr/bin/env php
  <?php
- /*
-  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-@@ -20,17 +21,7 @@
+ 
  use Symfony\Component\Console\Helper\HelperSet;
  use Doctrine\ORM\Tools\Console\ConsoleRunner;
  
@@ -25,10 +23,10 @@ diff -up ./bin/doctrine.php.rpm ./bin/doctrine.php
  
  $directories = [getcwd(), getcwd() . DIRECTORY_SEPARATOR . 'config'];
  
-diff -up ./lib/Doctrine/ORM/Tools/Setup.php.rpm ./lib/Doctrine/ORM/Tools/Setup.php
---- ./lib/Doctrine/ORM/Tools/Setup.php.rpm	2021-02-24 11:43:44.654144234 +0100
-+++ ./lib/Doctrine/ORM/Tools/Setup.php	2021-02-24 11:45:51.890721815 +0100
-@@ -62,7 +62,11 @@ class Setup
+diff -up ./lib/Doctrine/ORM/Tools/Setup.php.rpm1 ./lib/Doctrine/ORM/Tools/Setup.php
+--- ./lib/Doctrine/ORM/Tools/Setup.php.rpm1	2021-10-04 09:50:51.000000000 +0200
++++ ./lib/Doctrine/ORM/Tools/Setup.php	2021-10-04 09:59:00.880718552 +0200
+@@ -45,7 +45,11 @@ class Setup
      public static function registerAutoloadDirectory($directory)
      {
          if (! class_exists('Doctrine\Common\ClassLoader', false)) {
@@ -41,15 +39,15 @@ diff -up ./lib/Doctrine/ORM/Tools/Setup.php.rpm ./lib/Doctrine/ORM/Tools/Setup.p
          }
  
          $loader = new ClassLoader('Doctrine', $directory);
-diff -up ./tests/Doctrine/Tests/ORM/Tools/SetupTest.php.rpm ./tests/Doctrine/Tests/ORM/Tools/SetupTest.php
---- ./tests/Doctrine/Tests/ORM/Tools/SetupTest.php.rpm	2021-02-24 11:43:44.654144234 +0100
-+++ ./tests/Doctrine/Tests/ORM/Tools/SetupTest.php	2021-02-24 11:45:10.370859668 +0100
-@@ -57,7 +57,7 @@ class SetupTest extends OrmTestCase
+diff -up ./tests/Doctrine/Tests/ORM/Tools/SetupTest.php.rpm1 ./tests/Doctrine/Tests/ORM/Tools/SetupTest.php
+--- ./tests/Doctrine/Tests/ORM/Tools/SetupTest.php.rpm1	2021-10-04 09:59:00.880718552 +0200
++++ ./tests/Doctrine/Tests/ORM/Tools/SetupTest.php	2021-10-04 09:59:52.206542282 +0200
+@@ -52,7 +52,7 @@ class SetupTest extends OrmTestCase
  
      public function testDirectoryAutoload(): void
      {
 -        Setup::registerAutoloadDirectory(__DIR__ . '/../../../../../vendor/doctrine/common/lib');
 +        Setup::registerAutoloadDirectory("/usr/share/php");
  
-         $this->assertEquals($this->originalAutoloaderCount + 2, count(spl_autoload_functions()));
+         self::assertCount($this->originalAutoloaderCount + 2, spl_autoload_functions());
      }
-- 
cgit