Merge branch '4.4' into 5.3

nicolas-grekas · nicolas-grekas · commit e9a702635a89 · 2021-11-29T16:30:11.000+01:00
* 4.4:
  [Validator] Fix validation for single level domains
  Increased the reserved memory from 10k to 32k
  [DoctrineBridge] Add DbalLoggerTest to group legacy
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -12,7 +12,6 @@ init:
     - SET SYMFONY_DEPRECATIONS_HELPER=strict
     - SET ANSICON=121x90 (121x90)
     - SET SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
-    - SET SYMFONY_DEPRECATIONS_HELPER=max[direct]=1
     - REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v DelayedExpansion /t REG_DWORD /d 1 /f
 
 install:
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -157,7 +157,6 @@ jobs:
       - name: Run tests
         run: ./phpunit --group integration -v
         env:
-          SYMFONY_DEPRECATIONS_HELPER: max[direct]=1 # to be removed once DbalLogger is compatible with dbal 3.2+
           REDIS_HOST: localhost
           REDIS_CLUSTER_HOSTS: 'localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
           REDIS_SENTINEL_HOSTS: 'localhost:26379'
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -63,7 +63,6 @@ jobs:
           echo COLUMNS=120 >> $GITHUB_ENV
           echo PHPUNIT="$(readlink -f ./phpunit) --exclude-group tty,benchmark,intl-data" >> $GITHUB_ENV
           echo COMPOSER_UP='composer update --no-progress --ansi' >> $GITHUB_ENV
-          echo SYMFONY_DEPRECATIONS_HELPER=max[direct]=1 >> $GITHUB_ENV # to be removed once DbalLogger is compatible with dbal 3.2+
 
           SYMFONY_VERSIONS=$(git ls-remote -q --heads | cut -f2 | grep -o '/[1-9][0-9]*\.[0-9].*' | sort -V)
           SYMFONY_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+')
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php b/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
@@ -15,6 +15,9 @@
 use Psr\Log\LoggerInterface;
 use Symfony\Bridge\Doctrine\Logger\DbalLogger;
 
+/**
+ * @group legacy
+ */
 class DbalLoggerTest extends TestCase
 {
     /**
@@ -46,8 +49,8 @@ public function getLogFixtures()
             ['SQL', null, []],
             ['SQL', [], []],
             ['SQL', ['foo' => 'bar'], ['foo' => 'bar']],
-            ['SQL', ['foo' => "\x7F\xFF"], ['foo' => DbalLogger::BINARY_DATA_VALUE]],
-            ['SQL', ['foo' => "bar\x7F\xFF"], ['foo' => DbalLogger::BINARY_DATA_VALUE]],
+            ['SQL', ['foo' => "\x7F\xFF"], ['foo' => '(binary value)']],
+            ['SQL', ['foo' => "bar\x7F\xFF"], ['foo' => '(binary value)']],
             ['SQL', ['foo' => ''], ['foo' => '']],
         ];
     }
diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
@@ -111,7 +111,7 @@ class ErrorHandler
     public static function register(self $handler = null, bool $replace = true): self
     {
         if (null === self::$reservedMemory) {
-            self::$reservedMemory = str_repeat('x', 10240);
+            self::$reservedMemory = str_repeat('x', 32768);
             register_shutdown_function(__CLASS__.'::handleFatalError');
         }
 
diff --git a/src/Symfony/Component/Validator/Constraints/UrlValidator.php b/src/Symfony/Component/Validator/Constraints/UrlValidator.php
@@ -25,7 +25,13 @@ class UrlValidator extends ConstraintValidator
             (%s)://                                 # protocol
             (((?:[\_\.\pL\pN-]|%%[0-9A-Fa-f]{2})+:)?((?:[\_\.\pL\pN-]|%%[0-9A-Fa-f]{2})+)@)?  # basic auth
             (
-                ([\pL\pN\pS\-\_]+\.)*(([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
+                (?:
+                    (?:xn--[a-z0-9-]++\.)*+xn--[a-z0-9-]++            # a domain name using punycode
+                        |
+                    (?:[\pL\pN\pS\pM\-\_]++\.)+[\pL\pN\pM]++          # a multi-level domain name
+                        |
+                    [a-z0-9\-\_]++                                    # a single-level domain name
+                )\.?
                     |                                                 # or
                 \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}                    # an IP address
                     |                                                 # or
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
@@ -123,6 +123,10 @@ public function getValidUrls()
             ['http://very.long.domain.name.com/'],
             ['http://localhost/'],
             ['http://myhost123/'],
+            ['http://internal-api'],
+            ['http://internal-api.'],
+            ['http://internal-api/'],
+            ['http://internal-api/path'],
             ['http://127.0.0.1/'],
             ['http://127.0.0.1:80/'],
             ['http://[::1]/'],
@@ -169,6 +173,7 @@ public function getValidUrls()
             ['http://symfony.com/#fragment'],
             ['http://symfony.com/#one_more%20test'],
             ['http://example.com/exploit.html?hello[0]=test'],
+            ['http://বিডিআইএ.বাংলা'],
         ];
     }
 
@@ -254,7 +259,14 @@ public function getInvalidUrls()
             ['http://127.0.0.1:aa/'],
             ['ftp://[::1]/'],
             ['http://[::1'],
+            ['http://☎'],
+            ['http://☎.'],
+            ['http://☎/'],
+            ['http://☎/path'],
+            ['http://hello.☎'],
+            ['http://hello.☎.'],
             ['http://hello.☎/'],
+            ['http://hello.☎/path'],
             ['http://:password@symfony.com'],
             ['http://:password@@symfony.com'],
             ['http://username:passwordsymfony.com'],
@@ -271,6 +283,9 @@ public function getInvalidUrls()
             ['http://.m.example.com'],
             ['http://wwww.example..com'],
             ['http://.www.example.com'],
+            ['http://example.co-'],
+            ['http://example.co-/path'],
+            ['http:///path'],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ class ErrorHandler`
`111`	`111`	`public static function register(self $handler = null, bool $replace = true): self`
`112`	`112`	`{`
`113`	`113`	`if (null === self::$reservedMemory) {`
`114`		`- self::$reservedMemory = str_repeat('x', 10240);`
	`114`	`+ self::$reservedMemory = str_repeat('x', 32768);`
`115`	`115`	`register_shutdown_function(__CLASS__.'::handleFatalError');`
`116`	`116`	`}`
`117`	`117`