Merge branch '6.4' into 7.2

nicolas-grekas · nicolas-grekas · commit 6023ec760725 · 2025-04-09T10:14:01.000+02:00
* 6.4:
  fix tests
  chore: fix some typos
  update Couchbase mirror for Ubuntu 24.04
diff --git a/Tests/InputBagTest.php b/Tests/InputBagTest.php
@@ -71,7 +71,7 @@ public function __toString(): string
         $this->assertSame('foo', $bag->getString('unknown', 'foo'), '->getString() returns the default if a parameter is not defined');
         $this->assertSame('1', $bag->getString('bool_true'), '->getString() returns "1" if a parameter is true');
         $this->assertSame('', $bag->getString('bool_false', 'foo'), '->getString() returns an empty empty string if a parameter is false');
-        $this->assertSame('strval', $bag->getString('stringable'), '->getString() gets a value of a stringable paramater as string');
+        $this->assertSame('strval', $bag->getString('stringable'), '->getString() gets a value of a stringable parameter as string');
     }
 
     public function testGetStringExceptionWithArray()
diff --git a/Tests/ParameterBagTest.php b/Tests/ParameterBagTest.php
@@ -219,7 +219,7 @@ public function __toString(): string
         $this->assertSame('foo', $bag->getString('unknown', 'foo'), '->getString() returns the default if a parameter is not defined');
         $this->assertSame('1', $bag->getString('bool_true'), '->getString() returns "1" if a parameter is true');
         $this->assertSame('', $bag->getString('bool_false', 'foo'), '->getString() returns an empty empty string if a parameter is false');
-        $this->assertSame('strval', $bag->getString('stringable'), '->getString() gets a value of a stringable paramater as string');
+        $this->assertSame('strval', $bag->getString('stringable'), '->getString() gets a value of a stringable parameter as string');
     }
 
     public function testGetStringExceptionWithArray()

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function __toString(): string`
`71`	`71`	`$this->assertSame('foo', $bag->getString('unknown', 'foo'), '->getString() returns the default if a parameter is not defined');`
`72`	`72`	`$this->assertSame('1', $bag->getString('bool_true'), '->getString() returns "1" if a parameter is true');`
`73`	`73`	`$this->assertSame('', $bag->getString('bool_false', 'foo'), '->getString() returns an empty empty string if a parameter is false');`
`74`		`- $this->assertSame('strval', $bag->getString('stringable'), '->getString() gets a value of a stringable paramater as string');`
	`74`	`+ $this->assertSame('strval', $bag->getString('stringable'), '->getString() gets a value of a stringable parameter as string');`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`public function testGetStringExceptionWithArray()`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ public function __toString(): string`
`219`	`219`	`$this->assertSame('foo', $bag->getString('unknown', 'foo'), '->getString() returns the default if a parameter is not defined');`
`220`	`220`	`$this->assertSame('1', $bag->getString('bool_true'), '->getString() returns "1" if a parameter is true');`
`221`	`221`	`$this->assertSame('', $bag->getString('bool_false', 'foo'), '->getString() returns an empty empty string if a parameter is false');`
`222`		`- $this->assertSame('strval', $bag->getString('stringable'), '->getString() gets a value of a stringable paramater as string');`
	`222`	`+ $this->assertSame('strval', $bag->getString('stringable'), '->getString() gets a value of a stringable parameter as string');`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`public function testGetStringExceptionWithArray()`