diff options
| -rw-r--r-- | composer.json | 4 | ||||
| -rwxr-xr-x | php-symfony4-generate-autoloaders.php | 5 | ||||
| -rw-r--r-- | php-symfony4.spec | 17 | ||||
| -rw-r--r-- | src/Symfony/Bridge/Doctrine/composer.json | 2 |
4 files changed, 17 insertions, 11 deletions
diff --git a/composer.json b/composer.json index 2af8cf7..b2f9c50 100644 --- a/composer.json +++ b/composer.json @@ -105,7 +105,7 @@ "doctrine/cache": "~1.6", "doctrine/collections": "~1.0", "doctrine/data-fixtures": "^1.1", - "doctrine/dbal": "~2.4", + "doctrine/dbal": "~2.4|^3.0", "doctrine/orm": "~2.4,>=2.4.5", "doctrine/reflection": "~1.0", "doctrine/doctrine-bundle": "^1.5|^2.0", @@ -120,7 +120,7 @@ "psr/http-client": "^1.0", "psr/simple-cache": "^1.0", "egulias/email-validator": "~1.2,>=1.2.8|~2.0", - "symfony/phpunit-bridge": "^5.0.8", + "symfony/phpunit-bridge": "^5.2", "symfony/security-acl": "~2.8|~3.0", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "twig/cssinliner-extra": "^2.12", diff --git a/php-symfony4-generate-autoloaders.php b/php-symfony4-generate-autoloaders.php index c11db07..8891a75 100755 --- a/php-symfony4-generate-autoloaders.php +++ b/php-symfony4-generate-autoloaders.php @@ -73,7 +73,10 @@ final class AutoloadGenerator { ], 'doctrine/dbal' => [ 'prefix' => 'FEDORA_SYMFONY4_PHP_DIR', - 'path' => 'Doctrine/DBAL/autoload.php', + [ + 'path' => 'Doctrine/DBAL3/autoload.php', + 'path' => 'Doctrine/DBAL/autoload.php', + ] ], 'doctrine/doctrine-bundle' => [ 'prefix' => 'FEDORA_SYMFONY4_PHP_DIR', diff --git a/php-symfony4.spec b/php-symfony4.spec index f871047..7292316 100644 --- a/php-symfony4.spec +++ b/php-symfony4.spec @@ -13,8 +13,8 @@ %global github_owner symfony %global github_name symfony -%global github_version 4.4.11 -%global github_commit f5721c658ea5752000baca99f07cc0554708b56f +%global github_version 4.4.12 +%global github_commit da9869f6939e19341eae226bb8ac20419cf3790e %global composer_vendor symfony %global composer_project symfony @@ -47,10 +47,9 @@ # ignore max version %global doctrine_datafixtures_min_ver 1.1 %global doctrine_datafixtures_max_ver 2 -# "doctrine/dbal": "^2.5|^3.0" -# ignore 3.0 for now, no yet packaged -%global doctrine_dbal_min_ver 2.5 -%global doctrine_dbal_max_ver 3.0 +# "doctrine/dbal": "^2.6|^3.0" +%global doctrine_dbal_min_ver 2.6 +%global doctrine_dbal_max_ver 4 # "doctrine/doctrine-bundle": "^1.5|^2.0" %global doctrine_bundle_min_ver 1.5 %global doctrine_bundle_max_ver 3 @@ -143,7 +142,7 @@ Name: php-%{composer_project}4 Version: %{github_version} -Release: 3%{?github_prerelease:.%{github_prerelease}}%{?dist} +Release: 1%{?github_prerelease:.%{github_prerelease}}%{?dist} Summary: Symfony PHP framework (version 4) # MIT and CC-BY-SA: @@ -3293,6 +3292,10 @@ exit $RET # ############################################################################## %changelog +* Mon Aug 31 2020 Remi Collet <remi@remirepo.net> - 4.4.12-1 +- update to 4.4.12 +- allow doctrine/dbal 3.0 + * Tue Aug 25 2020 Remi Collet <remi@remirepo.net> - 4.4.11-3 - fix autoloader path for doctrine/persistence 2 diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 4194aa2..5bc8ffd 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -43,7 +43,7 @@ "doctrine/cache": "~1.6", "doctrine/collections": "~1.0", "doctrine/data-fixtures": "^1.1", - "doctrine/dbal": "~2.4", + "doctrine/dbal": "~2.4|^3.0", "doctrine/orm": "^2.6.3", "doctrine/reflection": "~1.0" }, |