diff --git a/.gitignore b/.gitignore index a59557f..3374094 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ clog /php-symfony4-4.4.8-8e1c507fce81169c3889ba5c34d023447b4952e3.tar.gz /php-symfony4-4.4.9-92c4593e3cec1b806495512b1b8cd374728ae3d8.tar.gz /php-symfony4-4.4.10-7eef70427b37763aebfe4ba8aa33e052f91fee3f.tar.gz +/php-symfony4-4.4.11-f5721c658ea5752000baca99f07cc0554708b56f.tar.gz diff --git a/composer.json b/composer.json index 5ad1c5c..2af8cf7 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "php": ">=7.1.3", "ext-xml": "*", "doctrine/event-manager": "~1.0", - "doctrine/persistence": "^1.3", + "doctrine/persistence": "^1.3|^2", "twig/twig": "^1.41|^2.10|^3.0", "psr/cache": "~1.0", "psr/container": "^1.0", @@ -100,10 +100,11 @@ }, "require-dev": { "cache/integration-tests": "dev-master", + "composer/package-versions-deprecated": "^1.8", "doctrine/annotations": "~1.0", "doctrine/cache": "~1.6", "doctrine/collections": "~1.0", - "doctrine/data-fixtures": "1.0.*", + "doctrine/data-fixtures": "^1.1", "doctrine/dbal": "~2.4", "doctrine/orm": "~2.4,>=2.4.5", "doctrine/reflection": "~1.0", @@ -121,7 +122,7 @@ "egulias/email-validator": "~1.2,>=1.2.8|~2.0", "symfony/phpunit-bridge": "^5.0.8", "symfony/security-acl": "~2.8|~3.0", - "phpdocumentor/reflection-docblock": "^3.0|^4.0", + "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "twig/cssinliner-extra": "^2.12", "twig/inky-extra": "^2.12", "twig/markdown-extra": "^2.12" diff --git a/php-symfony4-generate-autoloaders.php b/php-symfony4-generate-autoloaders.php index a566449..8d10691 100755 --- a/php-symfony4-generate-autoloaders.php +++ b/php-symfony4-generate-autoloaders.php @@ -35,6 +35,7 @@ final class AutoloadGenerator { 'prefix' => 'FEDORA_SYMFONY4_PHP_DIR', 'path' => 'Cache/IntegrationTests/autoload.php', ], + 'composer/package-versions-deprecated' => false, 'doctrine/annotations' => [ 'prefix' => 'FEDORA_SYMFONY4_PHP_DIR', 'path' => 'Doctrine/Common/Annotations/autoload.php', @@ -57,7 +58,10 @@ final class AutoloadGenerator { ], 'doctrine/persistence' => [ 'prefix' => 'FEDORA_SYMFONY4_PHP_DIR', - 'path' => 'Doctrine/Common/Persistence/autoload.php', + 'path' => [ + 'Doctrine/Common/Persistence2/autoload.php', + 'Doctrine/Common/Persistence/autoload.php', + ], ], 'doctrine/reflection' => [ 'prefix' => 'FEDORA_SYMFONY4_PHP_DIR', @@ -113,6 +117,7 @@ final class AutoloadGenerator { 'phpdocumentor/reflection-docblock' => [ 'prefix' => 'FEDORA_SYMFONY4_PHP_DIR', 'path' => [ + 'phpDocumentor/Reflection/DocBlock5/autoload.php', 'phpDocumentor/Reflection/DocBlock4/autoload.php', 'phpDocumentor/Reflection/DocBlock/autoload.php', ], diff --git a/php-symfony4.spec b/php-symfony4.spec index 435add2..f67fad3 100644 --- a/php-symfony4.spec +++ b/php-symfony4.spec @@ -12,8 +12,8 @@ %global github_owner symfony %global github_name symfony -%global github_version 4.4.10 -%global github_commit 7eef70427b37763aebfe4ba8aa33e052f91fee3f +%global github_version 4.4.11 +%global github_commit f5721c658ea5752000baca99f07cc0554708b56f %global composer_vendor symfony %global composer_project symfony @@ -36,15 +36,15 @@ # "doctrine/event-manager": "~1.0" %global doctrine_event_manager_min_ver 1.0 %global doctrine_event_manager_max_ver 2 -# "doctrine/persistence": "^1.3" +# "doctrine/persistence": "^1.3|^2" %global doctrine_persistence_min_ver 1.3 -%global doctrine_persistence_max_ver 2 +%global doctrine_persistence_max_ver 3 # "doctrine/reflection": "~1.0" %global doctrine_reflection_min_ver 1.0 %global doctrine_reflection_max_ver 2 -# "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 %global doctrine_datafixtures_max_ver 2 # "doctrine/dbal": "^2.5|^3.0" # ignore 3.0 for now, no yet packaged @@ -68,10 +68,10 @@ # "ocramius/proxy-manager": "~2.1" %global proxy_manager_min_ver 2.1 %global proxy_manager_max_ver 3.0 -# "phpdocumentor/reflection-docblock": "^3.0|^4.0" +# "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0" # conflicts: "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2" %global phpdocumentor_reflection_docblock_min_ver 3.2.2 -%global phpdocumentor_reflection_docblock_max_ver 5.0 +%global phpdocumentor_reflection_docblock_max_ver 6 # "psr/cache": "~1.0" %global psr_cache_min_ver 1.0 %global psr_cache_max_ver 2.0 @@ -223,8 +223,7 @@ BuildRequires: php-composer(masterminds/html5) < %{masterminds_max_ver} BuildRequires: php-composer(masterminds/html5) >= %{masterminds_min_ver} BuildRequires: php-composer(mongodb/mongodb) < %{mongodb_max_ver} BuildRequires: php-composer(mongodb/mongodb) >= %{mongodb_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(nyholm/psr7) < %{nyholm_psr7_max_ver} BuildRequires: php-composer(nyholm/psr7) >= %{nyholm_psr7_min_ver} BuildRequires: php-composer(ocramius/proxy-manager) < %{proxy_manager_max_ver} @@ -439,8 +438,7 @@ Suggests: php-composer(%{composer_vendor}/console) Suggests: php-composer(%{composer_vendor}/security-core) Suggests: php-composer(%{composer_vendor}/var-dumper) %else -Requires: php-composer(monolog/monolog) >= %{monolog_min_ver} -Requires: php-composer(monolog/monolog) < %{monolog_max_ver} +Requires: php-Monolog >= %{monolog_min_ver} Requires: php-composer(%{composer_vendor}/service-contracts) < %{symfony_contracts_max_ver} Requires: php-composer(%{composer_vendor}/service-contracts) >= %{symfony_contracts_min_ver} %endif @@ -3294,6 +3292,12 @@ exit $RET # ############################################################################## %changelog +* Fri Jul 24 2020 Remi Collet - 4.4.11-1 +- update to 4.4.11 +- raise dependency on doctrine/data-fixtures 1.1 +- allow doctrine/persistence 2 +- allow phpdocumentor/reflection-docblock 5 + * Mon Jun 15 2020 Remi Collet - 4.4.10-1 - update to 4.4.10 diff --git a/sources b/sources index e65074f..1c27e17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-symfony4-4.4.10-7eef70427b37763aebfe4ba8aa33e052f91fee3f.tar.gz) = b3959724980c93db824f84360e77797f032b7893bb02618833a590d97f2f6256370bb848cc2fee7cf3aadebbaaa4a4791530aeb6019b48cf780f3b805ae1232c +SHA512 (php-symfony4-4.4.11-f5721c658ea5752000baca99f07cc0554708b56f.tar.gz) = ea09c6da4c7d343bf4542765339dbedd3ab0d7a516e0148a79f73104184a06b6afddec9e09b4c2f95dcd87ffef779ef73ffe50ff82c1473ba25d0c26c67c3f80