From 06251791b03349c0d1eeb00229b9047224576769 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 30 Sep 2019 08:44:08 +0200
Subject: - update to 2.6.4 - switch to phpunit7

---
 composer.json              |  5 ++---
 makesrc.sh                 |  1 +
 php-doctrine-orm-bin.patch | 13 +++++++++++++
 php-doctrine-orm.spec      | 16 ++++++++++------
 4 files changed, 26 insertions(+), 9 deletions(-)
 create mode 120000 makesrc.sh

diff --git a/composer.json b/composer.json
index 5f40e2a..abe42e4 100644
--- a/composer.json
+++ b/composer.json
@@ -27,9 +27,8 @@
         "symfony/console": "~3.0|~4.0"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^1.0",
-        "phpunit/phpunit": "^6.5",
-        "squizlabs/php_codesniffer": "^3.2",
+        "doctrine/coding-standard": "^5.0",
+        "phpunit/phpunit": "^7.5",
         "symfony/yaml": "~3.4|~4.0"
     },
     "suggest": {
diff --git a/makesrc.sh b/makesrc.sh
new file mode 120000
index 0000000..42ee1ce
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1 @@
+php-doctrine-orm-get-source.sh
\ No newline at end of file
diff --git a/php-doctrine-orm-bin.patch b/php-doctrine-orm-bin.patch
index 4b6ffa5..77992f0 100644
--- a/php-doctrine-orm-bin.patch
+++ b/php-doctrine-orm-bin.patch
@@ -26,3 +26,16 @@ index 842c5493f..e1ccb7506 100755
  
  $directories = [getcwd(), getcwd() . DIRECTORY_SEPARATOR . 'config'];
  
+diff -up a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php.rpm b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php
+--- a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php.rpm	2019-09-30 08:35:50.547638239 +0200
++++ b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php	2019-09-30 08:37:02.769360851 +0200
+@@ -45,7 +45,7 @@ class SetupTest extends OrmTestCase
+ 
+     public function testDirectoryAutoload()
+     {
+-        Setup::registerAutoloadDirectory(__DIR__ . "/../../../../../vendor/doctrine/common/lib");
++        Setup::registerAutoloadDirectory("/usr/share/php");
+ 
+         $this->assertEquals($this->originalAutoloaderCount + 2, count(spl_autoload_functions()));
+     }
+
diff --git a/php-doctrine-orm.spec b/php-doctrine-orm.spec
index 9836e88..4a114cf 100644
--- a/php-doctrine-orm.spec
+++ b/php-doctrine-orm.spec
@@ -12,9 +12,9 @@
 #
 
 %global github_owner     doctrine
-%global github_name      doctrine2
-%global github_version   2.6.3
-%global github_commit    434820973cadf2da2d66e7184be370084cc32ca8
+%global github_name      orm
+%global github_version   2.6.4
+%global github_commit    b52ef5a1002f99ab506a5a2d6dba5a2c236c5f43
 
 %global composer_vendor  doctrine
 %global composer_project orm
@@ -101,7 +101,7 @@ BuildRequires: php-composer(symfony/console) >= %{symfony_min_ver}
 BuildRequires: php-composer(symfony/yaml) <  %{symfony_max_ver}
 BuildRequires: php-composer(symfony/yaml) >= %{symfony_min_ver}
 %endif
-BuildRequires: phpunit6 >= 6.5
+BuildRequires: phpunit7 >= 7.5
 BuildRequires: php-pdo
 # phpcompatinfo (computed from version 2.5.11)
 BuildRequires: php-ctype
@@ -266,9 +266,9 @@ BOOTSTRAP
 
 : Upstream tests
 RETURN_CODE=0
-for PHP_EXEC in "" php71 php72 php73; do
+for PHP_EXEC in "" php71 php72 php73 php74; do
     if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
-        $PHP_EXEC %{_bindir}/phpunit6 --verbose -d memory_limit="512M" --bootstrap bootstrap.php \
+        $PHP_EXEC %{_bindir}/phpunit7 --verbose -d memory_limit="512M" --bootstrap bootstrap.php \
             || RETURN_CODE=1
     fi
 done
@@ -288,6 +288,10 @@ exit $RETURN_CODE
 
 
 %changelog
+* Mon Sep 30 2019 Remi Collet <remi@remirepo.net> - 2.6.4-1
+- update to 2.6.4
+- switch to phpunit7
+
 * Thu Nov 22 2018 Remi Collet <remi@remirepo.net> - 2.6.3-1
 - update to 2.6.3
 
-- 
cgit