update to 2.1.0

switch from jdorn/sql-formatter to doctrine/sql-formatter

2 files changed, 19 insertions, 15 deletions

diff --git a/composer.json b/composer.json
index 79634f7..1e04061 100644
--- a/composer.json
+++ b/composer.json
@@ -25,10 +25,10 @@
         }
     ],
     "require": {
-        "php": "^7.1",
+        "php": "^7.1 || ^8.0",
         "doctrine/dbal": "^2.9.0",
         "doctrine/persistence": "^1.3.3",
-        "jdorn/sql-formatter": "^1.2.16",
+        "doctrine/sql-formatter": "^1.0.1",
         "symfony/cache": "^4.3.3|^5.0",
         "symfony/config": "^4.3.3|^5.0",
         "symfony/console": "^3.4.30|^4.3.3|^5.0",
@@ -70,7 +70,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0.x-dev"
+            "dev-master": "2.1.x-dev"
         }
     }
 }
diff --git a/php-doctrine-doctrine-bundle2.spec b/php-doctrine-doctrine-bundle2.spec
index 196cd54..43a3b19 100644
--- a/php-doctrine-doctrine-bundle2.spec
+++ b/php-doctrine-doctrine-bundle2.spec
@@ -13,14 +13,14 @@
 
 %global github_owner     doctrine
 %global github_name      DoctrineBundle
-%global github_version   2.0.8
-%global github_commit    b0e0deb6e700438401ede433a15a6372d2285202
+%global github_version   2.1.0
+%global github_commit    0fb513842c78b43770597ef3c487cdf79d944db3
 %global major            2
 
 %global composer_vendor  doctrine
 %global composer_project doctrine-bundle
 
-# "php": "^7.1"
+# "php": "^7.1 || ^8.0"
 %global php_min_ver 7.1
 # "doctrine/dbal": "^2.9.0"
 %global dbal_min_ver 2.9
@@ -31,8 +31,8 @@
 # "doctrine/orm": "~2.6"
 %global orm_min_ver 2.6
 %global orm_max_ver 3.0
-# "jdorn/sql-formatter": "^1.2.16"
-%global sql_formatter_min_ver 1.2.16
+# "doctrine/sql-formatter": "^1.0.1"
+%global sql_formatter_min_ver 1.0.1
 %global sql_formatter_max_ver 2.0
 # "symfony/config": "^4.3.3|^5.0",
 # "symfony/console": "^3.4.30|^4.3.3|^5.0"
@@ -92,7 +92,7 @@ BuildRequires: php-theseer-autoload
 BuildRequires:(php-composer(doctrine/dbal)                  >= %{dbal_min_ver}          with php-composer(doctrine/dbal)                  < %{dbal_max_ver})
 BuildRequires:(php-composer(doctrine/orm)                   >= %{orm_min_ver}           with php-composer(doctrine/orm)                   < %{orm_max_ver})
 BuildRequires:(php-composer(doctrine/persistence)           >= %{persistence_min_ver}   with php-composer(doctrine/persistence)           < %{orm_max_ver})
-BuildRequires:(php-composer(jdorn/sql-formatter)            >= %{sql_formatter_min_ver} with php-composer(jdorn/sql-formatter)            < %{sql_formatter_max_ver})
+BuildRequires:(php-composer(doctrine/sql-formatter)         >= %{sql_formatter_min_ver} with php-composer(doctrine/sql-formatter)         < %{sql_formatter_max_ver})
 BuildRequires:(php-composer(symfony/service-contracts)      >= %{contracts_min_ver}     with php-composer(symfony/service-contracts)      < %{contracts_max_ver})
 BuildRequires:(php-composer(ocramius/proxy-manager)         >= %{proxy_manager_min_ver} with php-composer(ocramius/proxy-manager)         < %{proxy_manager_max_ver})
 BuildRequires:(php-composer(twig/twig)                      >= %{twig_min_ver}          with php-composer(twig/twig)                      < %{twig_max_ver})
@@ -104,8 +104,8 @@ BuildRequires: php-composer(doctrine/persistence)           <  %{persistence_max
 BuildRequires: php-composer(doctrine/persistence)           >= %{persistence_min_ver}
 BuildRequires: php-composer(doctrine/orm)                   <  %{orm_max_ver}
 BuildRequires: php-composer(doctrine/orm)                   >= %{orm_min_ver}
-BuildRequires: php-composer(jdorn/sql-formatter)            <  %{sql_formatter_max_ver}
-BuildRequires: php-composer(jdorn/sql-formatter)            >= %{sql_formatter_min_ver}
+BuildRequires: php-composer(doctrine/sql-formatter)         <  %{sql_formatter_max_ver}
+BuildRequires: php-composer(doctrine/sql-formatter)         >= %{sql_formatter_min_ver}
 BuildRequires: php-composer(symfony/service-contracts)      <  %{contracts_max_ver}
 BuildRequires: php-composer(symfony/service-contracts)      >= %{contracts_min_ver}
 BuildRequires: php-composer(ocramius/proxy-manager)         <  %{proxy_manager_max_ver}
@@ -144,7 +144,7 @@ Requires:      php(language)                                >= %{php_min_ver}
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires:     (php-composer(doctrine/dbal)                  >= %{dbal_min_ver}          with php-composer(doctrine/dbal)                  <  %{dbal_max_ver})
 Requires:     (php-composer(doctrine/persistence)           >= %{persistence_min_ver}   with php-composer(doctrine/persistence)           < %{orm_max_ver})
-Requires:     (php-composer(jdorn/sql-formatter)            >= %{sql_formatter_min_ver} with php-composer(jdorn/sql-formatter)            <  %{sql_formatter_max_ver})
+Requires:     (php-composer(doctrine/sql-formatter)         >= %{sql_formatter_min_ver} with php-composer(doctrine/sql-formatter)         <  %{sql_formatter_max_ver})
 Requires:     (php-composer(symfony/cache)                  >= %{symfony_min_ver}       with php-composer(symfony/cache)                  <  %{symfony_max_ver})
 Requires:     (php-composer(symfony/config)                 >= %{symfony_min_ver}       with php-composer(symfony/config)                 <  %{symfony_max_ver})
 Requires:     (php-composer(symfony/console)                >= %{symfony_min_ver}       with php-composer(symfony/console)                <  %{symfony_max_ver})
@@ -158,8 +158,8 @@ Requires:      php-composer(doctrine/dbal)                  >= %{dbal_min_ver}
 Requires:      php-composer(doctrine/dbal)                  <  %{dbal_max_ver}
 Requires:      php-composer(doctrine/persistence)           <  %{persistence_max_ver}
 Requires:      php-composer(doctrine/persistence)           >= %{persistence_min_ver}
-Requires:      php-composer(jdorn/sql-formatter)            >= %{sql_formatter_min_ver}
-Requires:      php-composer(jdorn/sql-formatter)            <  %{sql_formatter_max_ver}
+Requires:      php-composer(doctrine/sql-formatter)         >= %{sql_formatter_min_ver}
+Requires:      php-composer(doctrine/sql-formatter)         <  %{sql_formatter_max_ver}
 Requires:      php-composer(symfony/cache)                  >= %{symfony_min_ver}
 Requires:      php-composer(symfony/cache)                  <  %{symfony_max_ver}
 Requires:      php-composer(symfony/config)                 >= %{symfony_min_ver}
@@ -229,7 +229,7 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
 \Fedora\Autoloader\Dependencies::required([
     '%{phpdir}/Doctrine/DBAL/autoload.php',
     '%{phpdir}/Doctrine/Persistence/autoload.php',
-    '%{phpdir}/jdorn-sql-formatter/autoload.php',
+    '%{phpdir}/Doctrine/SqlFormatter/autoload.php',
     '%{phpdir}/Symfony/Contracts/autoload.php',
     [
         '%{phpdir}/Symfony4/Bridge/Doctrine/autoload.php',
@@ -315,6 +315,10 @@ exit $RETURN_CODE
 
 
 %changelog
+* Tue May 26 2020 Remi Collet <remi@remirepo.net> - 2.1.0-1
+- update to 2.1.0
+- switch from jdorn/sql-formatter to doctrine/sql-formatter
+
 * Thu Apr 23 2020 Remi Collet <remi@remirepo.net> - 2.0.8-1
 - update to 2.0.8