diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-doctrine-doctrine-bundle2.spec | 24 |
2 files changed, 15 insertions, 11 deletions
diff --git a/composer.json b/composer.json index 8f53203..31cf84f 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,7 @@ "require-dev": { "doctrine/coding-standard": "^8.0", "doctrine/orm": "^2.6", - "ocramius/proxy-manager": "^2.1", + "friendsofphp/proxy-manager-lts": "^1.0", "phpunit/phpunit": "^7.5 || ^8.0 || ^9.3", "symfony/phpunit-bridge": "^4.2", "symfony/property-info": "^4.3.3|^5.0", diff --git a/php-doctrine-doctrine-bundle2.spec b/php-doctrine-doctrine-bundle2.spec index 205208b..53c76be 100644 --- a/php-doctrine-doctrine-bundle2.spec +++ b/php-doctrine-doctrine-bundle2.spec @@ -13,8 +13,8 @@ %global github_owner doctrine %global github_name DoctrineBundle -%global github_version 2.2.2 -%global github_commit 044d33eeffdb236d5013b6b4af99f87519e10751 +%global github_version 2.2.3 +%global github_commit 015fdd490074d4daa891e2d1df998dc35ba54924 %global major 2 %global composer_vendor doctrine @@ -60,9 +60,9 @@ %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 +# "friendsofphp/proxy-manager-lts": "^1.0", +%global proxy_manager_min_ver 1.0 +%global proxy_manager_max_ver 2 # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -71,7 +71,7 @@ Name: php-%{composer_vendor}-%{composer_project}%{major} Version: %{github_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Symfony Bundle for Doctrine License: MIT @@ -94,7 +94,7 @@ BuildRequires:(php-composer(doctrine/orm) >= %{orm_min_ver} BuildRequires:(php-composer(doctrine/persistence) >= %{persistence_min_ver} with php-composer(doctrine/persistence) < %{persistence_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(friendsofphp/proxy-manager-lts) >= %{proxy_manager_min_ver} with php-composer(friendsofphp/proxy-manager-lts) < %{proxy_manager_max_ver}) BuildRequires:(php-composer(twig/twig) >= %{twig_min_ver} with php-composer(twig/twig) < %{twig_max_ver}) # remirepo:16 %else @@ -108,8 +108,8 @@ BuildRequires: php-composer(doctrine/sql-formatter) < %{sql_formatter_m 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} -BuildRequires: php-composer(ocramius/proxy-manager) >= %{proxy_manager_min_ver} +BuildRequires: php-composer(friendsofphp/proxy-manager-lts) < %{proxy_manager_max_ver} +BuildRequires: php-composer(friendsofphp/proxy-manager-lts) >= %{proxy_manager_min_ver} BuildRequires: php-composer(twig/twig) < %{twig_max_ver} BuildRequires: php-composer(twig/twig) >= %{twig_min_ver} %endif @@ -291,7 +291,7 @@ require '%{buildroot}%{phpdir}/Doctrine/Bundle/DoctrineBundle%{major}/autoload.p '%{phpdir}/Symfony4/Component/Yaml/autoload.php', '%{phpdir}/Symfony4/Bridge/ProxyManager/autoload.php', '%{phpdir}/Symfony4/Bridge/Twig/autoload.php', - '%{phpdir}/ProxyManager/autoload.php', + '%{phpdir}/FriendsOfPHP/ProxyManager/autoload.php', ]); EOF @@ -326,6 +326,10 @@ exit $RETURN_CODE %changelog +* Wed Feb 10 2021 Remi Collet <remi@remirepo.net> - 2.2.3-1 +- update to 2.2.3 +- switch from ocramius/proxy-manager to friendsofphp/proxy-manager-lts + * Tue Dec 8 2020 Remi Collet <remi@remirepo.net> - 2.2.2-2 - load ORM autoloader first to ensure proper DBAL version is used |