diff --git a/.gitignore b/.gitignore index 9c42946..b8f6be9 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ clog /php-symfony3-3.4.40-ad6f8608e92b548e5695f9213a81d14c2ef274b5.tar.gz /php-symfony3-3.4.41-a72c510fb3bc67d3ba67981178d78be80360ede2.tar.gz /php-symfony3-3.4.42-79b0cc53dfc1bc69509d91c4a967b659a9540910.tar.gz +/php-symfony3-3.4.43-21e652ffdb8c908c8606f923b903be5b8af21e01.tar.gz diff --git a/composer.json b/composer.json index 919941f..5bc6183 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "ext-xml": "*", "doctrine/common": "~2.4", "fig/link-util": "^1.0", - "twig/twig": "^1.40|^2.9", + "twig/twig": "^1.41|^2.10", "psr/cache": "~1.0", "psr/container": "^1.0", "psr/link": "^1.0", @@ -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", @@ -98,11 +98,12 @@ "ocramius/proxy-manager": "~0.4|~1.0|~2.0", "predis/predis": "~1.0", "egulias/email-validator": "~1.2,>=1.2.8|~2.0", - "symfony/phpunit-bridge": "^3.4.19|^4.1.8|~5.0", + "symfony/phpunit-bridge": "^3.4.31|^4.3.4|~5.0", "symfony/security-acl": "~2.8|~3.0", "phpdocumentor/reflection-docblock": "^3.0|^4.0" }, "conflict": { + "monolog/monolog": ">=2", "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2", "phpdocumentor/type-resolver": "<0.3.0", "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" diff --git a/php-symfony3.spec b/php-symfony3.spec index 4b4e53c..d296338 100644 --- a/php-symfony3.spec +++ b/php-symfony3.spec @@ -12,8 +12,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 @@ -39,9 +39,9 @@ # "doctrine/common": "~2.4" %global doctrine_common_min_ver 2.4 %global doctrine_common_max_ver 3.0 -# "doctrine/data-fixtures": "1.0.*" +# "doctrine/data-fixtures": "^1.1" # 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 @@ -177,8 +177,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} @@ -373,8 +372,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) @@ -2876,6 +2874,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/sources b/sources index 2053567..0e0fa47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-symfony3-3.4.42-79b0cc53dfc1bc69509d91c4a967b659a9540910.tar.gz) = 19b259af606a464451202b87672668a93897aea1bc379c51b9bdfb5d6d3696de235b53e12adfffd5980002019c9799dc75aa2ecd8871c5a66eafac9579807ff9 +SHA512 (php-symfony3-3.4.43-21e652ffdb8c908c8606f923b903be5b8af21e01.tar.gz) = f92a6c7a562c5d8fb9015b6a9ec2070f83e8f62a5279a1c2cef4e30a7c36af6ae61bf64bc198ba2199eca470e42285b69f8b99f4342781bacadad8dabfdf11a7