update to 4.4.21

allow egulias/email-validator v3

13 files changed, 47 insertions, 38 deletions

diff --git a/composer.json b/composer.json
index 63108b1..737f767 100644
--- a/composer.json
+++ b/composer.json
@@ -134,15 +134,16 @@
         "predis/predis": "~1.1",
         "psr/http-client": "^1.0",
         "psr/simple-cache": "^1.0",
-        "egulias/email-validator": "^2.1.10",
+        "egulias/email-validator": "^2.1.10|^3.1",
         "symfony/phpunit-bridge": "^5.2",
         "symfony/security-acl": "~2.8|~3.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"
+        "twig/cssinliner-extra": "^2.12|^3",
+        "twig/inky-extra": "^2.12|^3",
+        "twig/markdown-extra": "^2.12|^3"
     },
     "conflict": {
+        "egulias/email-validator": "~3.0.0",
         "masterminds/html5": "<2.6",
         "monolog/monolog": ">=2",
         "phpdocumentor/reflection-docblock": "<3.0|>=3.2.0,<3.2.2",
diff --git a/php-symfony4-generate-autoloaders.php b/php-symfony4-generate-autoloaders.php
index 2e7742e..ca155fe 100755
--- a/php-symfony4-generate-autoloaders.php
+++ b/php-symfony4-generate-autoloaders.php
@@ -73,16 +73,16 @@ final class AutoloadGenerator {
         ],
         'doctrine/dbal' => [
             'prefix' => 'FEDORA_SYMFONY4_PHP_DIR',
-             [
-                'path' => 'Doctrine/DBAL3/autoload.php',
-                'path' => 'Doctrine/DBAL/autoload.php',
+             'path' => [
+                'Doctrine/DBAL3/autoload.php',
+                'Doctrine/DBAL/autoload.php',
              ],
         ],
         'doctrine/doctrine-bundle' => [
             'prefix' => 'FEDORA_SYMFONY4_PHP_DIR',
-            [
-                'path' => 'Doctrine/Bundle/DoctrineBundle2/autoload.php',
-                'path' => 'Doctrine/Bundle/DoctrineBundle/autoload.php',
+            'path' => [
+                'Doctrine/Bundle/DoctrineBundle2/autoload.php',
+                'Doctrine/Bundle/DoctrineBundle/autoload.php',
             ],
         ],
         'doctrine/orm' => [
@@ -91,7 +91,10 @@ final class AutoloadGenerator {
         ],
         'egulias/email-validator' => [
             'prefix' => 'FEDORA_SYMFONY4_PHP_DIR',
-            'path' => 'Egulias/EmailValidator2/autoload.php',
+            'path' => [
+                'Egulias/EmailValidator3/autoload.php',
+                'Egulias/EmailValidator2/autoload.php',
+            ],
         ],
         'guzzlehttp/promises' => [
             'prefix' => 'FEDORA_SYMFONY4_PHP_DIR',
@@ -302,7 +305,7 @@ final class AutoloadGenerator {
         ],
         'symfony/monolog-bridge' => [
             'prefix' => 'FEDORA_SYMFONY4_DIR',
-            'path' => 'Component/Monolog/autoload.php',
+            'path' => 'Bridge/Monolog/autoload.php',
         ],
         'symfony/options-resolver' => [
             'prefix' => 'FEDORA_SYMFONY4_DIR',
diff --git a/php-symfony4.spec b/php-symfony4.spec
index f5a5102..233d607 100644
--- a/php-symfony4.spec
+++ b/php-symfony4.spec
@@ -13,8 +13,8 @@
 
 %global github_owner     symfony
 %global github_name      symfony
-%global github_version   4.4.20
-%global github_commit    fb90227d34531b06c01f1450c0c490fbf3fd7a8e
+%global github_version   4.4.21
+%global github_commit    0139b7a74507b39b1ace35fa5544be5aee1dca5f
 %global github_short     %(c=%{github_commit}; echo ${c:0:7})
 
 %global composer_vendor  symfony
@@ -54,9 +54,9 @@
 # "doctrine/orm": "^2.6.3"
 %global doctrine_orm_min_ver 2.6.3
 %global doctrine_orm_max_ver 3.0
-# "egulias/email-validator": "^2.1.10"
+# "egulias/email-validator": "^2.1.10|^3.1"
 %global email_validator_min_ver 2.1.10
-%global email_validator_max_ver 3.0
+%global email_validator_max_ver 4
 # "guzzlehttp/promises": "^1.3.1"
 %global guzzlehttp_promises_min_ver 1.3.1
 %global guzzlehttp_promises_max_ver 2
@@ -121,8 +121,8 @@
 %global psr_http_client_min_ver 1.0
 %global psr_http_client_max_ver 2
 
-# Build using "--without tests" to disable tests
-%global with_tests 0%{?_with_tests:1}
+# Build using "--with tests" to enable tests
+%bcond_with tests
 
 %global with_sensio_framework_extra_bundle 0
 
@@ -281,10 +281,10 @@ BuildRequires: php-sysvsem
 BuildRequires: php-tokenizer
 BuildRequires: php-xml
 BuildRequires: php-xmlreader
-## Autoloader
-BuildRequires: php-fedora-autoloader-devel
 # Conflicts
 BuildConflicts: php-composer(phpdocumentor/type-resolver) < 0.3.0
+## Autoloader
+BuildRequires: php-fedora-autoloader-devel
 
 # Bridges
 Requires:      php-composer(%{composer_vendor}/doctrine-bridge) = %{version}
@@ -2322,7 +2322,7 @@ AUTOLOAD
 done
 
 : Create dummy Composer autoloader for tests
-%if %{with_tests}
+%if %{with tests}
 pushd src/Symfony
 cat <<COMPOSER_JSON | tee composer.json
 {
@@ -2356,7 +2356,7 @@ ln -s %{name}-common-%{version} %{buildroot}%{_docdir}/%{name}-%{version}
 
 
 %check
-%if %{with_tests}
+%if %{with tests}
 : Ensure TZ is set
 cp -pf %{_sysconfdir}/php.ini .
 echo "date.timezone=UTC" >> php.ini
@@ -2437,7 +2437,7 @@ exit $RET
      %{symfony4_dir}/Bundle/autoload.php
 %dir %{symfony4_dir}/Component
      %{symfony4_dir}/Component/autoload.php
-%if %{with_tests}
+%if %{with tests}
 %exclude %{symfony4_dir}/vendor
 %endif
 
@@ -3303,6 +3303,10 @@ exit $RET
 # ##############################################################################
 
 %changelog
+* Mon Mar 29 2021 Remi Collet <remi@remirepo.net> - 4.4.21-1
+- update to 4.4.21
+- allow egulias/email-validator v3
+
 * Mon Mar  8 2021 Remi Collet <remi@remirepo.net> - 4.4.20-1
 - update to 4.4.20
 
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
index 6878052..3fbb6b7 100644
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@@ -21,7 +21,7 @@
         "twig/twig": "^1.43|^2.13|^3.0.4"
     },
     "require-dev": {
-        "egulias/email-validator": "^2.1.10",
+        "egulias/email-validator": "^2.1.10|^3",
         "symfony/asset": "^3.4|^4.0|^5.0",
         "symfony/dependency-injection": "^3.4|^4.0|^5.0",
         "symfony/error-handler": "^4.4|^5.0",
@@ -45,9 +45,9 @@
         "symfony/expression-language": "^3.4|^4.0|^5.0",
         "symfony/web-link": "^4.4|^5.0",
         "symfony/workflow": "^4.3|^5.0",
-        "twig/cssinliner-extra": "^2.12",
-        "twig/inky-extra": "^2.12",
-        "twig/markdown-extra": "^2.12"
+        "twig/cssinliner-extra": "^2.12|^3",
+        "twig/inky-extra": "^2.12|^3",
+        "twig/markdown-extra": "^2.12|^3"
     },
     "conflict": {
         "symfony/console": "<3.4",
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index f592065..f262983 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -36,7 +36,7 @@
         "paragonie/sodium_compat": "^1.8",
         "symfony/asset": "^3.4|^4.0|^5.0",
         "symfony/browser-kit": "^4.3|^5.0",
-        "symfony/console": "^4.3.4|^5.0",
+        "symfony/console": "^4.4.21|^5.0",
         "symfony/css-selector": "^3.4|^4.0|^5.0",
         "symfony/dom-crawler": "^4.3|^5.0",
         "symfony/dotenv": "^4.3.6|^5.0",
@@ -72,7 +72,7 @@
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
         "symfony/asset": "<3.4",
         "symfony/browser-kit": "<4.3",
-        "symfony/console": "<4.3",
+        "symfony/console": "<4.4.21",
         "symfony/dotenv": "<4.3.6",
         "symfony/dom-crawler": "<4.3",
         "symfony/http-client": "<4.4",
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json b/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json
index 5108ba3..3f66c41 100644
--- a/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json
+++ b/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=7.1.3",
-        "symfony/mailer": "^4.4|^5.0"
+        "symfony/mailer": "^4.4.21|^5.2.6"
     },
     "require-dev": {
         "symfony/http-client": "^4.3|^5.0"
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json b/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json
index ac4051d..606d002 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=7.1.3",
-        "symfony/mailer": "^4.4|^5.0"
+        "symfony/mailer": "^4.4.21|^5.2.6"
     },
     "require-dev": {
         "symfony/http-client": "^4.3|^5.0"
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json b/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json
index 2efbe5c..e70d4df 100644
--- a/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=7.1.3",
-        "symfony/mailer": "^4.4|^5.0"
+        "symfony/mailer": "^4.4.21|^5.2.6"
     },
     "require-dev": {
         "symfony/http-client": "^4.3|^5.0"
diff --git a/src/Symfony/Component/Mailer/composer.json b/src/Symfony/Component/Mailer/composer.json
index 88bf72e..f8c4166 100644
--- a/src/Symfony/Component/Mailer/composer.json
+++ b/src/Symfony/Component/Mailer/composer.json
@@ -17,10 +17,10 @@
     ],
     "require": {
         "php": ">=7.1.3",
-        "egulias/email-validator": "^2.1.10",
+        "egulias/email-validator": "^2.1.10|^3",
         "psr/log": "~1.0",
         "symfony/event-dispatcher": "^4.3",
-        "symfony/mime": "^4.4|^5.0",
+        "symfony/mime": "^4.4.21|^5.2.6",
         "symfony/service-contracts": "^1.1|^2"
     },
     "require-dev": {
diff --git a/src/Symfony/Component/Mime/composer.json b/src/Symfony/Component/Mime/composer.json
index 166dfea..aaced87 100644
--- a/src/Symfony/Component/Mime/composer.json
+++ b/src/Symfony/Component/Mime/composer.json
@@ -21,10 +21,11 @@
         "symfony/polyfill-mbstring": "^1.0"
     },
     "require-dev": {
-        "egulias/email-validator": "^2.1.10",
+        "egulias/email-validator": "^2.1.10|^3.1",
         "symfony/dependency-injection": "^3.4|^4.1|^5.0"
     },
     "conflict": {
+        "egulias/email-validator": "~3.0.0",
         "symfony/mailer": "<4.4"
     },
     "autoload": {
diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json
index c99f3a1..928d4a5 100644
--- a/src/Symfony/Component/Security/Core/composer.json
+++ b/src/Symfony/Component/Security/Core/composer.json
@@ -21,7 +21,7 @@
         "symfony/service-contracts": "^1.1.6|^2"
     },
     "require-dev": {
-        "psr/container": "^1.0",
+        "psr/container": "^1.0|^2.0",
         "symfony/event-dispatcher": "^4.3",
         "symfony/expression-language": "^3.4|^4.0|^5.0",
         "symfony/http-foundation": "^3.4|^4.0|^5.0",
diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json
index 13a4b1f..254b645 100644
--- a/src/Symfony/Component/Security/composer.json
+++ b/src/Symfony/Component/Security/composer.json
@@ -30,7 +30,7 @@
         "symfony/security-http": "self.version"
     },
     "require-dev": {
-        "psr/container": "^1.0",
+        "psr/container": "^1.0|^2.0",
         "symfony/finder": "^3.4|^4.0|^5.0",
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-intl-icu": "~1.0",
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
index a60c5eb..c9cbe68 100644
--- a/src/Symfony/Component/Validator/composer.json
+++ b/src/Symfony/Component/Validator/composer.json
@@ -37,7 +37,7 @@
         "symfony/translation": "^4.2",
         "doctrine/annotations": "^1.10.4",
         "doctrine/cache": "~1.0",
-        "egulias/email-validator": "^2.1.10"
+        "egulias/email-validator": "^2.1.10|^3"
     },
     "conflict": {
         "doctrine/lexer": "<1.0.2",