Merge branch '6.2' into 6.3

fabpot · fabpot · commit 1cb88c483349 · 2023-03-14T16:00:13.000+01:00
* 6.2:
  Fix some Composer keywords
  [FrameworkBundle] Rename limiter’s `strategy` to `policy` in XSD
  [VarDumper] Fixed dumping of CutStub
  Fix test
  Change limit argument from string to integer.
  [Messenger] Fix `evaluate()` calls in `WorkerTest`
  [Mailer] STDOUT blocks infinitely under Windows when STDERR is filled
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -778,7 +778,7 @@
         <xsd:attribute name="lock-factory" type="xsd:string" />
         <xsd:attribute name="storage-service" type="xsd:string" />
         <xsd:attribute name="cache-pool" type="xsd:string" />
-        <xsd:attribute name="strategy" type="xsd:string" />
+        <xsd:attribute name="policy" type="xsd:string" />
         <xsd:attribute name="limit" type="xsd:int" />
         <xsd:attribute name="interval" type="xsd:string" />
     </xsd:complexType>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/rate_limiter.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/rate_limiter.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:rate-limiter>
+            <framework:limiter
+                name="sliding_window"
+                policy="sliding_window"
+                limit="30"
+                lock-factory="null"
+            />
+        </framework:rate-limiter>
+    </framework:config>
+</container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\RateLimiter\Policy\SlidingWindowLimiter;
 
 class XmlFrameworkExtensionTest extends FrameworkExtensionTestCase
 {
@@ -66,4 +67,11 @@ public function testLegacyExceptionsConfig()
             'status_code' => 500,
         ], $configuration[\Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException::class]);
     }
+
+    public function testRateLimiter()
+    {
+        $container = $this->createContainerFromFile('rate_limiter');
+
+        $this->assertTrue($container->hasDefinition('limiter.sliding_window'));
+    }
 }
diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json
@@ -2,7 +2,7 @@
     "name": "symfony/console",
     "type": "library",
     "description": "Eases the creation of beautiful and testable command line interfaces",
-    "keywords": ["console", "cli", "command line", "terminal"],
+    "keywords": ["console", "cli", "command-line", "terminal"],
     "homepage": "https://symfony.com",
     "license": "MIT",
     "authors": [
diff --git a/src/Symfony/Component/HttpClient/composer.json b/src/Symfony/Component/HttpClient/composer.json
@@ -2,6 +2,7 @@
     "name": "symfony/http-client",
     "type": "library",
     "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
+    "keywords": ["http"],
     "homepage": "https://symfony.com",
     "license": "MIT",
     "authors": [
diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
@@ -121,13 +121,13 @@ public function purge()
     /**
      * Finds profiler tokens for the given criteria.
      *
-     * @param string|null $limit The maximum number of tokens to return
+     * @param int|null    $limit The maximum number of tokens to return
      * @param string|null $start The start date to search from
      * @param string|null $end   The end date to search to
      *
      * @see https://php.net/datetime.formats for the supported date/time formats
      */
-    public function find(?string $ip, ?string $url, ?string $limit, ?string $method, ?string $start, ?string $end, string $statusCode = null): array
+    public function find(?string $ip, ?string $url, ?int $limit, ?string $method, ?string $start, ?string $end, string $statusCode = null): array
     {
         return $this->storage->find($ip, $url, $limit, $method, $this->getTimestamp($start), $this->getTimestamp($end), $statusCode);
     }
diff --git a/src/Symfony/Component/Ldap/composer.json b/src/Symfony/Component/Ldap/composer.json
@@ -2,7 +2,7 @@
     "name": "symfony/ldap",
     "type": "library",
     "description": "Provides a LDAP client for PHP on top of PHP's ldap extension",
-    "keywords": ["ldap", "active directory"],
+    "keywords": ["ldap", "active-directory"],
     "homepage": "https://symfony.com",
     "license": "MIT",
     "authors": [
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/Stream/ProcessStream.php b/src/Symfony/Component/Mailer/Transport/Smtp/Stream/ProcessStream.php
@@ -35,7 +35,7 @@ public function initialize(): void
         $descriptorSpec = [
             0 => ['pipe', 'r'],
             1 => ['pipe', 'w'],
-            2 => ['pipe', 'w'],
+            2 => ['pipe', '\\' === \DIRECTORY_SEPARATOR ? 'a' : 'w'],
         ];
         $pipes = [];
         $this->stream = proc_open($this->command, $descriptorSpec, $pipes);
diff --git a/src/Symfony/Component/Messenger/Tests/WorkerTest.php b/src/Symfony/Component/Messenger/Tests/WorkerTest.php
@@ -206,7 +206,7 @@ public function testWorkerDispatchesEventsOnSuccess()
         $eventDispatcher->expects($this->exactly(5))
             ->method('dispatch')
             ->willReturnCallback(function ($event) use (&$series) {
-                array_shift($series)->evaluate($event, '', true);
+                array_shift($series)->evaluate($event);
 
                 if ($event instanceof WorkerRunningEvent) {
                     $event->getWorker()->stop();
@@ -260,7 +260,7 @@ public function testWorkerDispatchesEventsOnError()
         $eventDispatcher->expects($this->exactly(5))
             ->method('dispatch')
             ->willReturnCallback(function ($event) use (&$series) {
-                array_shift($series)->evaluate($event, '', true);
+                array_shift($series)->evaluate($event);
 
                 if ($event instanceof WorkerRunningEvent) {
                     $event->getWorker()->stop();
diff --git a/src/Symfony/Component/PropertyAccess/composer.json b/src/Symfony/Component/PropertyAccess/composer.json
@@ -2,7 +2,7 @@
     "name": "symfony/property-access",
     "type": "library",
     "description": "Provides functions to read and write from/to an object or array using a simple string notation",
-    "keywords": ["property", "index", "access", "object", "array", "extraction", "injection", "reflection", "property path"],
+    "keywords": ["property", "index", "access", "object", "array", "extraction", "injection", "reflection", "property-path"],
     "homepage": "https://symfony.com",
     "license": "MIT",
     "authors": [
diff --git a/src/Symfony/Component/PropertyInfo/composer.json b/src/Symfony/Component/PropertyInfo/composer.json
@@ -5,7 +5,7 @@
     "keywords": [
         "property",
         "type",
-        "PHPDoc",
+        "phpdoc",
         "symfony",
         "validator",
         "doctrine"
diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json
@@ -2,7 +2,7 @@
     "name": "symfony/routing",
     "type": "library",
     "description": "Maps an HTTP request to a set of configuration variables",
-    "keywords": ["routing", "router", "URL", "URI"],
+    "keywords": ["routing", "router", "url", "uri"],
     "homepage": "https://symfony.com",
     "license": "MIT",
     "authors": [
diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
@@ -199,6 +199,9 @@ public function dumpString(Cursor $cursor, string $str, bool $bin, int $cut)
         }
         if ('' === $str) {
             $this->line .= '""';
+            if ($cut) {
+                $this->line .= '…'.$cut;
+            }
             $this->endValue($cursor);
         } else {
             $attr += [
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\VarDumper\Tests\Dumper;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Caster\CutStub;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
 use Symfony\Component\VarDumper\Dumper\AbstractDumper;
 use Symfony\Component\VarDumper\Dumper\CliDumper;
@@ -37,6 +38,11 @@ public function testGet()
             ':stream' => function ($res, $a) {
                 unset($a['uri'], $a['wrapper_data']);
 
+                return $a;
+            },
+            'Symfony\Component\VarDumper\Tests\Fixture\DumbFoo' => function ($foo, $a) {
+                $a['foo'] = new CutStub($a['foo']);
+
                 return $a;
             },
         ]);
@@ -77,7 +83,7 @@ public function testGet()
 %A  options: []
   }
   "obj" => Symfony\Component\VarDumper\Tests\Fixture\DumbFoo {#%d
-    +foo: "foo"
+    +foo: ""…3
     +"bar": "bar"
   }
   "closure" => Closure(\$a, PDO &\$b = null) {#%d

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`use Symfony\Component\Config\FileLocator;`
`15`	`15`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`16`	`16`	`use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;`
	`17`	`+use Symfony\Component\RateLimiter\Policy\SlidingWindowLimiter;`
`17`	`18`
`18`	`19`	`class XmlFrameworkExtensionTest extends FrameworkExtensionTestCase`
`19`	`20`	`{`
`@@ -66,4 +67,11 @@ public function testLegacyExceptionsConfig()`
`66`	`67`	`'status_code' => 500,`
`67`	`68`	`], $configuration[\Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException::class]);`
`68`	`69`	`}`
	`70`	`+`
	`71`	`+ public function testRateLimiter()`
	`72`	`+ {`
	`73`	`+ $container = $this->createContainerFromFile('rate_limiter');`
	`74`	`+`
	`75`	`+ $this->assertTrue($container->hasDefinition('limiter.sliding_window'));`
	`76`	`+ }`
`69`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,13 +121,13 @@ public function purge()`
`121`	`121`	`/**`
`122`	`122`	`* Finds profiler tokens for the given criteria.`
`123`	`123`	`*`
`124`		`- * @param string\|null $limit The maximum number of tokens to return`
	`124`	`+ * @param int\|null $limit The maximum number of tokens to return`
`125`	`125`	`* @param string\|null $start The start date to search from`
`126`	`126`	`* @param string\|null $end The end date to search to`
`127`	`127`	`*`
`128`	`128`	`* @see https://php.net/datetime.formats for the supported date/time formats`
`129`	`129`	`*/`
`130`		`- public function find(?string $ip, ?string $url, ?string $limit, ?string $method, ?string $start, ?string $end, string $statusCode = null): array`
	`130`	`+ public function find(?string $ip, ?string $url, ?int $limit, ?string $method, ?string $start, ?string $end, string $statusCode = null): array`
`131`	`131`	`{`
`132`	`132`	`return $this->storage->find($ip, $url, $limit, $method, $this->getTimestamp($start), $this->getTimestamp($end), $statusCode);`
`133`	`133`	`}`