summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json49
-rw-r--r--php-doctrine-doctrine-bundle-vendor.patch19
-rw-r--r--php-doctrine-doctrine-bundle.spec176
3 files changed, 177 insertions, 67 deletions
diff --git a/composer.json b/composer.json
index 4e36d0d..40f23f5 100644
--- a/composer.json
+++ b/composer.json
@@ -5,6 +5,7 @@
"keywords": ["DBAL", "ORM", "Database", "Persistence"],
"homepage": "http://www.doctrine-project.org",
"license": "MIT",
+ "minimum-stability": "dev",
"authors": [
{
"name": "Fabien Potencier",
@@ -24,36 +25,44 @@
}
],
"require": {
- "php": "^7.1",
- "symfony/framework-bundle": "^3.4|^4.1",
- "symfony/config": "^3.4|^4.1",
- "symfony/console": "^3.4|^4.1",
- "symfony/dependency-injection": "^3.4|^4.1",
- "doctrine/dbal": "^2.5.12",
+ "php": "^7.1 || ^8.0",
+ "doctrine/dbal": "^2.5.12|^3.0",
+ "doctrine/doctrine-cache-bundle": "~1.2",
+ "doctrine/persistence": "^1.3.3",
"jdorn/sql-formatter": "^1.2.16",
- "symfony/doctrine-bridge": "^3.4|^4.1",
- "doctrine/doctrine-cache-bundle": "~1.2"
+ "symfony/cache": "^3.4.30|^4.3.3",
+ "symfony/config": "^3.4.30|^4.3.3",
+ "symfony/service-contracts": "^1.1.1|^2.0",
+ "symfony/console": "^3.4.30|^4.3.3",
+ "symfony/dependency-injection": "^3.4.30|^4.3.3",
+ "symfony/doctrine-bridge": "^3.4.30|^4.3.3",
+ "symfony/framework-bundle": "^3.4.30|^4.3.3"
},
"require-dev": {
+ "doctrine/coding-standard": "^6.0",
"doctrine/orm": "^2.6",
- "symfony/cache": "^3.4|^4.1",
- "symfony/yaml": "^3.4|^4.1",
- "symfony/validator": "^3.4|^4.1",
- "symfony/property-info": "^3.4|^4.1",
- "symfony/phpunit-bridge": "^4.2",
- "twig/twig": "^1.34|^2.4",
+ "ocramius/proxy-manager": "^2.1",
"php-coveralls/php-coveralls": "^2.1",
- "phpunit/phpunit": "7.0",
- "symfony/web-profiler-bundle": "^3.4|^4.1",
- "doctrine/coding-standard": "^6.0"
+ "phpunit/phpunit": "^7.5",
+ "symfony/phpunit-bridge": "^4.2",
+ "symfony/property-info": "^3.4.30|^4.3.3",
+ "symfony/proxy-manager-bridge": "^3.4|^4|^5",
+ "symfony/twig-bridge": "^3.4|^4.1",
+ "symfony/validator": "^3.4.30|^4.3.3",
+ "symfony/web-profiler-bundle": "^3.4.30|^4.3.3",
+ "symfony/yaml": "^3.4.30|^4.3.3",
+ "twig/twig": "^1.34|^2.12"
+ },
+ "config": {
+ "sort-packages": true
},
"conflict": {
"doctrine/orm": "<2.6",
"twig/twig": "<1.34|>=2.0,<2.4"
},
"suggest": {
- "symfony/web-profiler-bundle": "To use the data collector.",
- "doctrine/orm": "The Doctrine ORM integration is optional in the bundle."
+ "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.",
+ "symfony/web-profiler-bundle": "To use the data collector."
},
"autoload": {
"psr-4": { "Doctrine\\Bundle\\DoctrineBundle\\": "" }
@@ -63,7 +72,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.11.x-dev"
+ "dev-master": "2.3.x-dev"
}
}
}
diff --git a/php-doctrine-doctrine-bundle-vendor.patch b/php-doctrine-doctrine-bundle-vendor.patch
index 7eb2638..2452445 100644
--- a/php-doctrine-doctrine-bundle-vendor.patch
+++ b/php-doctrine-doctrine-bundle-vendor.patch
@@ -1,6 +1,6 @@
diff -up ./Tests/ProfilerTest.php.rpm ./Tests/ProfilerTest.php
---- ./Tests/ProfilerTest.php.rpm 2019-05-13 08:27:20.088593657 +0200
-+++ ./Tests/ProfilerTest.php 2019-05-13 08:27:53.090782715 +0200
+--- ./Tests/ProfilerTest.php.rpm 2019-11-20 15:05:37.038969160 +0100
++++ ./Tests/ProfilerTest.php 2019-11-20 15:07:34.760380533 +0100
@@ -41,7 +41,7 @@ class ProfilerTest extends BaseTestCase
$this->collector->addLogger('foo', $this->logger);
@@ -9,16 +9,5 @@ diff -up ./Tests/ProfilerTest.php.rpm ./Tests/ProfilerTest.php
+ $twigLoaderFilesystem->addPath('/usr/share/php/Symfony4/Bundle/WebProfilerBundle/Resources/views', 'WebProfiler');
$this->twig = new Environment($twigLoaderFilesystem, ['debug' => true, 'strict_variables' => true]);
- $this->twig->addExtension(new CodeExtension('', '', ''));
-diff -up ./Tests/ServiceRepositoryTest.php.rpm ./Tests/ServiceRepositoryTest.php
---- ./Tests/ServiceRepositoryTest.php.rpm 2019-05-13 08:11:25.000000000 +0200
-+++ ./Tests/ServiceRepositoryTest.php 2019-05-13 08:27:20.089593662 +0200
-@@ -35,7 +35,7 @@ class ServiceRepositoryTest extends Test
- public function testRepositoryServiceWiring()
- {
- // needed for older versions of Doctrine
-- AnnotationRegistry::registerFile(__DIR__ . '/../vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php');
-+ AnnotationRegistry::registerFile('/usr/share/php/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php');
-
- $container = new ContainerBuilder(new ParameterBag([
- 'kernel.name' => 'app',
+ $fragmentHandler = $this->getMockBuilder(FragmentHandler::class)->disableOriginalConstructor()->getMock();
+
diff --git a/php-doctrine-doctrine-bundle.spec b/php-doctrine-doctrine-bundle.spec
index 64b0310..78c225c 100644
--- a/php-doctrine-doctrine-bundle.spec
+++ b/php-doctrine-doctrine-bundle.spec
@@ -2,7 +2,7 @@
#
# Fedora spec file for php-doctrine-doctrine-bundle
#
-# Copyright (c) 2015-2019 Shawn Iwinski <shawn.iwinski@gmail.com>
+# Copyright (c) 2015-2020 Shawn Iwinski <shawn.iwinski@gmail.com>
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -12,43 +12,59 @@
%global github_owner doctrine
%global github_name DoctrineBundle
-%global github_version 1.11.1
-%global github_commit 09a38417339dc93849d051b914aae3947eb231a7
+%global github_version 1.12.13
+%global github_commit 85460b85edd8f61a16ad311e7ffc5d255d3c937c
%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.5.12"
+# "doctrine/dbal": "^2.5.12|^3.0"
%global dbal_min_ver 2.5.12
-%global dbal_max_ver 3.0
+%global dbal_max_ver 4
# "doctrine/doctrine-cache-bundle": "~1.2"
%global cache_bundle_min_ver 1.2
%global cache_bundle_max_ver 2.0
+# "doctrine/persistence": "^1.3.3",
+%global persistence_min_ver 1.3.3
+%global persistence_max_ver 2
# "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
%global sql_formatter_max_ver 2.0
-# "symfony/console": "^3.4|^4.1"
-# "symfony/dependency-injection": "^3.4|^4.1"
-# "symfony/doctrine-bridge": "^3.4|^4.1"
-# "symfony/framework-bundle": "~^3.4|^4.1"
-# "symfony/property-info": "^3.4|^4.1"
-# "symfony/validator": "^3.4|^4.1"
-# "symfony/yaml": "^3.4|^4.1"
-# "symfony/web-profiler-bundle": "^3.4|^4.1"
+# "symfony/cache": "^3.4.30|^4.3.3",
+# "symfony/config": "^3.4.30|^4.3.3",
+# "symfony/console": "^3.4.30|^4.3.3"
+# "symfony/dependency-injection": "^3.4.30|^4.3.3"
+# "symfony/doctrine-bridge": "^3.4.30|^4.3.3"
+# "symfony/framework-bundle": "^3.4.30|^4.3.3"
+# "symfony/cache": "^3.4.30|^4.3.3",
+# "symfony/property-info": "^3.4.30|^4.3.3"
+# "symfony/proxy-manager-bridge": "^3.4|^4|^5",
+# "symfony/twig-bridge": "^3.4|^4.1",
+# "symfony/validator": "^3.4.30|^4.3.3"
+# "symfony/web-profiler-bundle": "^3.4.30|^4.3.3"
+# "symfony/yaml": "^3.4.30|^4.3.3"
%global symfony_min_ver 3.4
%global symfony_max_ver 5
-# "twig/twig": "~1.34|~2.4"
+%global symfony_br_ver 4.3.3
+# "symfony/service-contracts": "^1.1.1|^2.0",
+# TODO v2 is not yet packaged
+%global contracts_min_ver 1.1.1
+%global contracts_max_ver 2
+# "twig/twig": "~1.34|~2.12"
%global twig_min_ver 1.34
%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
%global twig_max_ver 3
%else
%global twig_max_ver 2
%endif
+# "ocramius/proxy-manager": "^2.1",
+%global proxy_manager_min_ver 2.1
+%global proxy_manager_max_ver 3
# Build using "--without tests" to disable tests
%global with_tests 0%{!?_without_tests:1}
@@ -78,31 +94,46 @@ BuildRequires: php-theseer-autoload
BuildRequires:(php-composer(doctrine/dbal) >= %{dbal_min_ver} with php-composer(doctrine/dbal) < %{dbal_max_ver})
BuildRequires:(php-composer(doctrine/doctrine-cache-bundle) >= %{cache_bundle_min_ver} with php-composer(doctrine/doctrine-cache-bundle) < %{cache_bundle_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) < %{persistence_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(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})
-# remirepo:12
+# remirepo:18
%else
BuildRequires: php-composer(doctrine/dbal) < %{dbal_max_ver}
BuildRequires: php-composer(doctrine/dbal) >= %{dbal_min_ver}
BuildRequires: php-composer(doctrine/doctrine-cache-bundle) < %{cache_bundle_max_ver}
BuildRequires: php-composer(doctrine/doctrine-cache-bundle) >= %{cache_bundle_min_ver}
+BuildRequires: php-composer(doctrine/persistence) < %{persistence_max_ver}
+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(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}
+BuildRequires: php-composer(ocramius/proxy-manager) >= %{proxy_manager_min_ver}
BuildRequires: php-composer(twig/twig) < %{twig_max_ver}
BuildRequires: php-composer(twig/twig) >= %{twig_min_ver}
%endif
# ensure same version of all components is used
-BuildRequires: php-symfony4-console
-BuildRequires: php-symfony4-dependency-injection
-BuildRequires: php-symfony4-doctrine-bridge
-BuildRequires: php-symfony4-framework-bundle
-BuildRequires: php-symfony4-property-info
-BuildRequires: php-symfony4-validator
-BuildRequires: php-symfony4-yaml
-BuildRequires: php-symfony4-web-profiler-bundle
-BuildRequires: phpunit7
+# "require"
+BuildRequires: php-symfony4-cache >= %{symfony_br_ver}
+BuildRequires: php-symfony4-config >= %{symfony_br_ver}
+BuildRequires: php-symfony4-console >= %{symfony_br_ver}
+BuildRequires: php-symfony4-dependency-injection >= %{symfony_br_ver}
+BuildRequires: php-symfony4-doctrine-bridge >= %{symfony_br_ver}
+BuildRequires: php-symfony4-framework-bundle >= %{symfony_br_ver}
+# "require-dev"
+BuildRequires: php-symfony4-property-info >= %{symfony_br_ver}
+BuildRequires: php-symfony4-proxy-manager-bridge >= %{symfony_br_ver}
+BuildRequires: php-symfony4-twig-bridge >= %{symfony_br_ver}
+BuildRequires: php-symfony4-validator >= %{symfony_br_ver}
+BuildRequires: php-symfony4-web-profiler-bundle >= %{symfony_br_ver}
+BuildRequires: php-symfony4-yaml >= %{symfony_br_ver}
+BuildRequires: phpunit7 >= 7.5
## phpcompatinfo (computed from version 1.11.0)
BuildRequires: php-dom
BuildRequires: php-pcre
@@ -118,21 +149,33 @@ 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/doctrine-cache-bundle) >= %{cache_bundle_min_ver} with php-composer(doctrine/doctrine-cache-bundle) < %{cache_bundle_max_ver})
+Requires: (php-composer(doctrine/persistence) >= %{persistence_min_ver} with php-composer(doctrine/persistence) < %{persistence_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(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})
+Requires: (php-composer(symfony/service-contracts) >= %{contracts_min_ver} with php-composer(symfony/service-contracts) < %{contracts_max_ver})
Requires: (php-composer(symfony/dependency-injection) >= %{symfony_min_ver} with php-composer(symfony/dependency-injection) < %{symfony_max_ver})
Requires: (php-composer(symfony/doctrine-bridge) >= %{symfony_min_ver} with php-composer(symfony/doctrine-bridge) < %{symfony_max_ver})
Requires: (php-composer(symfony/framework-bundle) >= %{symfony_min_ver} with php-composer(symfony/framework-bundle) < %{symfony_max_ver})
-# remirepo:16
+# remirepo:24
%else
Requires: php-composer(doctrine/dbal) >= %{dbal_min_ver}
Requires: php-composer(doctrine/dbal) < %{dbal_max_ver}
Requires: php-composer(doctrine/doctrine-cache-bundle) >= %{cache_bundle_min_ver}
Requires: php-composer(doctrine/doctrine-cache-bundle) < %{cache_bundle_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(symfony/cache) >= %{symfony_min_ver}
+Requires: php-composer(symfony/cache) < %{symfony_max_ver}
+Requires: php-composer(symfony/config) >= %{symfony_min_ver}
+Requires: php-composer(symfony/config) < %{symfony_max_ver}
Requires: php-composer(symfony/console) >= %{symfony_min_ver}
Requires: php-composer(symfony/console) < %{symfony_max_ver}
+Requires: php-composer(symfony/service-contracts) < %{contracts_max_ver}
+Requires: php-composer(symfony/service-contracts) >= %{contracts_min_ver}
Requires: php-composer(symfony/dependency-injection) >= %{symfony_min_ver}
Requires: php-composer(symfony/dependency-injection) < %{symfony_max_ver}
Requires: php-composer(symfony/doctrine-bridge) >= %{symfony_min_ver}
@@ -192,9 +235,6 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('Doctrine\\Bundle\\DoctrineBundle\\', __DIR__);
\Fedora\Autoloader\Dependencies::required([
- '%{phpdir}/Doctrine/Bundle/DoctrineCacheBundle/autoload.php',
- '%{phpdir}/Doctrine/DBAL/autoload.php',
- '%{phpdir}/jdorn-sql-formatter/autoload.php',
[
'%{phpdir}/Symfony4/Bridge/Doctrine/autoload.php',
'%{phpdir}/Symfony3/Bridge/Doctrine/autoload.php',
@@ -202,12 +242,27 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
'%{phpdir}/Symfony4/Bundle/FrameworkBundle/autoload.php',
'%{phpdir}/Symfony3/Bundle/FrameworkBundle/autoload.php',
], [
+ '%{phpdir}/Symfony4/Component/Cache/autoload.php',
+ '%{phpdir}/Symfony3/Component/Cache/autoload.php',
+ ], [
+ '%{phpdir}/Symfony4/Component/Config/autoload.php',
+ '%{phpdir}/Symfony3/Component/Config/autoload.php',
+ ], [
'%{phpdir}/Symfony4/Component/Console/autoload.php',
'%{phpdir}/Symfony3/Component/Console/autoload.php',
], [
'%{phpdir}/Symfony4/Component/DependencyInjection/autoload.php',
'%{phpdir}/Symfony3/Component/DependencyInjection/autoload.php',
-]]);
+ ],
+ '%{phpdir}/Doctrine/Bundle/DoctrineCacheBundle/autoload.php',
+ [
+ '%{phpdir}/Doctrine/DBAL3/autoload.php',
+ '%{phpdir}/Doctrine/DBAL/autoload.php',
+ ],
+ '%{phpdir}/Doctrine/Persistence/autoload.php',
+ '%{phpdir}/jdorn-sql-formatter/autoload.php',
+ '%{phpdir}/Symfony/Contracts/autoload.php',
+]);
\Fedora\Autoloader\Dependencies::optional([
'%{phpdir}/Doctrine/ORM/autoload.php',
@@ -232,16 +287,28 @@ cp -pr * %{buildroot}%{phpdir}/Doctrine/Bundle/DoctrineBundle/
phpab -o bs.php Tests/DependencyInjection
cat << 'EOF' | tee -a bs.php
require '%{buildroot}%{phpdir}/Doctrine/Bundle/DoctrineBundle/autoload.php';
+\Fedora\Autoloader\Dependencies::required([
+ [
+ '%{phpdir}/Twig2/autoload.php',
+ '%{phpdir}/Twig/autoload.php',
+ ],
+ '%{phpdir}/Symfony4/Component/PropertyInfo/autoload.php',
+ '%{phpdir}/Symfony4/Component/Validator/autoload.php',
+ '%{phpdir}/Symfony4/Component/Yaml/autoload.php',
+ '%{phpdir}/Symfony4/Bridge/ProxyManager/autoload.php',
+ '%{phpdir}/Symfony4/Bridge/Twig/autoload.php',
+ '%{phpdir}/ProxyManager/autoload.php',
+]);
EOF
sed -e '/listener/d' phpunit.xml.dist >phpunit.xml
: Upstream tests with SCLs if available
RETURN_CODE=0
-for SCL in php php71 php72 php73; do
+for SCL in php php72 php73 php74; do
if which $SCL; then
$SCL %{_bindir}/phpunit7 \
- --filter '^((?!(testBacktraceLogged)).)*$' \
+ --filter '^((?!(testBacktraceLogged|testRender)).)*$' \
--bootstrap bs.php \
--verbose || RETURN_CODE=1
fi
@@ -263,6 +330,51 @@ exit $RETURN_CODE
%changelog
+* Tue Dec 8 2020 Remi Collet <remi@remirepo.net> - 1.12.13-1
+- update to 1.12.13
+
+* Mon Nov 16 2020 Remi Collet <remi@remirepo.net> - 1.12.12-2
+- allow doctrine/dbal 3
+
+* Thu Nov 12 2020 Remi Collet <remi@remirepo.net> - 1.12.12-1
+- update to 1.12.12
+
+* Mon Nov 9 2020 Remi Collet <remi@remirepo.net> - 1.12.11-1
+- update to 1.12.11
+
+* Tue May 26 2020 Remi Collet <remi@remirepo.net> - 1.12.10-2
+- fix dependency and FTBFS #1863698
+
+* Tue May 26 2020 Remi Collet <remi@remirepo.net> - 1.12.10-1
+- update to 1.12.10
+
+* Thu Apr 23 2020 Remi Collet <remi@remirepo.net> - 1.12.8-1
+- update to 1.12.8
+
+* Mon Jan 20 2020 Remi Collet <remi@remirepo.net> - 1.12.7-1
+- update to 1.12.7
+
+* Fri Jan 3 2020 Remi Collet <remi@remirepo.net> - 1.12.6-1
+- update to 1.12.6
+- add dependency on doctrine/persistence
+- add dependency on symfony/service-contracts
+- add build dependency on ocramius/proxy-manager
+
+* Thu Nov 28 2019 Remi Collet <remi@remirepo.net> - 1.12.2-1
+- update to 1.12.2
+
+* Thu Nov 28 2019 Remi Collet <remi@remirepo.net> - 1.12.1-1
+- update to 1.12.1
+- add dependency on symfony/cache
+
+* Wed Nov 20 2019 Remi Collet <remi@remirepo.net> - 1.12.0-1
+- update to 1.12.0
+- add dependency on symfony/config
+- raise build dependency on Symfony 4.3.3
+
+* Tue Jun 4 2019 Remi Collet <remi@remirepo.net> - 1.11.2-1
+- update to 1.11.2
+
* Tue May 14 2019 Remi Collet <remi@remirepo.net> - 1.11.1-1
- update to 1.11.1