From f5f112d603d85e6ef66802708711325dae12001e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 24 Jul 2020 11:32:53 +0200 Subject: update to 3.4.43 raise dependency on doctrine/data-fixtures 1.1 --- composer.json | 2 +- php-symfony3.spec | 16 +++++++++------- src/Symfony/Bridge/Doctrine/composer.json | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 9ad5e39..5bc6183 100644 --- a/composer.json +++ b/composer.json @@ -90,7 +90,7 @@ "cache/integration-tests": "dev-master", "doctrine/annotations": "~1.0", "doctrine/cache": "~1.6", - "doctrine/data-fixtures": "1.0.*", + "doctrine/data-fixtures": "^1.1", "doctrine/dbal": "~2.4", "doctrine/orm": "~2.4,>=2.4.5", "doctrine/doctrine-bundle": "~1.4", diff --git a/php-symfony3.spec b/php-symfony3.spec index f236f61..276dc16 100644 --- a/php-symfony3.spec +++ b/php-symfony3.spec @@ -13,8 +13,8 @@ %global github_owner symfony %global github_name symfony -%global github_version 3.4.42 -%global github_commit 79b0cc53dfc1bc69509d91c4a967b659a9540910 +%global github_version 3.4.43 +%global github_commit 21e652ffdb8c908c8606f923b903be5b8af21e01 %global composer_vendor symfony %global composer_project symfony @@ -42,7 +42,7 @@ %global doctrine_common_max_ver 3.0 # "doctrine/data-fixtures": "1.0.*" # ignore max version -%global doctrine_datafixtures_min_ver 1.0.0 +%global doctrine_datafixtures_min_ver 1.1.0 %global doctrine_datafixtures_max_ver 2 # "doctrine/dbal": "^2.4|^3.0" # ignore 3.0 for now, no yet packaged @@ -178,8 +178,7 @@ BuildRequires: php-composer(egulias/email-validator) < %{email_validator_max_ve BuildRequires: php-composer(egulias/email-validator) >= %{email_validator_min_ver} BuildRequires: php-composer(fig/link-util) < %{fig_link_util_max_ver} BuildRequires: php-composer(fig/link-util) >= %{fig_link_util_min_ver} -BuildRequires: php-composer(monolog/monolog) < %{monolog_max_ver} -BuildRequires: php-composer(monolog/monolog) >= %{monolog_min_ver} +BuildRequires: php-Monolog >= %{monolog_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(phpdocumentor/reflection-docblock) < %{phpdocumentor_reflection_docblock_max_ver} @@ -374,8 +373,7 @@ Suggests: php-composer(%{composer_vendor}/symfony/security-core) Suggests: php-composer(%{composer_vendor}/var-dumper) %else # composer.json -Requires: php-composer(monolog/monolog) >= %{monolog_min_ver} -Requires: php-composer(monolog/monolog) < %{monolog_max_ver} +Requires: php-Monolog >= %{monolog_min_ver} %endif # phpcompatinfo (computed from version 3.3.6) @@ -2877,6 +2875,10 @@ exit $RET # ############################################################################## %changelog +* Fri Jul 24 2020 Remi Collet - 3.4.43-1 +- update to 3.4.43 +- raise dependency on doctrine/data-fixtures 1.1 + * Mon Jun 15 2020 Remi Collet - 3.4.42-1 - update to 3.4.42 diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 1aa2315..d33ea16 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -34,7 +34,7 @@ "symfony/expression-language": "~2.8|~3.0|~4.0", "symfony/validator": "^3.2.5|~4.0", "symfony/translation": "~2.8|~3.0|~4.0", - "doctrine/data-fixtures": "1.0.*", + "doctrine/data-fixtures": "^1.1", "doctrine/dbal": "~2.4", "doctrine/orm": "^2.4.5" }, -- cgit