.+))?$#u', rtrim($this->currentLine), $values)
- && (!str_contains($values['key'], ' #') || \in_array($values['key'][0], ['"', "'"]))
+ && (!str_contains($values['key'], ' #') || \in_array($values['key'][0], ['"', "'"], true))
) {
if ($context && 'sequence' == $context) {
throw new ParseException('You cannot define a mapping item when in a sequence.', $this->currentLineNb + 1, $this->currentLine, $this->filename);
diff --git a/src/Symfony/Component/Yaml/Resources/bin/yaml-lint b/src/Symfony/Component/Yaml/Resources/bin/yaml-lint
index 143869e018148..eca04976f36b6 100755
--- a/src/Symfony/Component/Yaml/Resources/bin/yaml-lint
+++ b/src/Symfony/Component/Yaml/Resources/bin/yaml-lint
@@ -42,8 +42,13 @@ if (!class_exists(Application::class)) {
exit(1);
}
-(new Application())->add($command = new LintCommand())
- ->getApplication()
+$command = new LintCommand();
+if (method_exists($app = new Application(), 'addCommand')) {
+ $app->addCommand($command);
+} else {
+ $app->add($command);
+}
+$app
->setDefaultCommand($command->getName(), true)
->run()
;
diff --git a/src/Symfony/Component/Yaml/Tests/Command/LintCommandTest.php b/src/Symfony/Component/Yaml/Tests/Command/LintCommandTest.php
index a501f48d09e37..856f82cae8105 100644
--- a/src/Symfony/Component/Yaml/Tests/Command/LintCommandTest.php
+++ b/src/Symfony/Component/Yaml/Tests/Command/LintCommandTest.php
@@ -180,7 +180,12 @@ private function createFile($content): string
protected function createCommand(): Command
{
$application = new Application();
- $application->add(new LintCommand());
+ $command = new LintCommand();
+ if (method_exists($application, 'addCommand')) {
+ $application->addCommand($command);
+ } else {
+ $application->add($command);
+ }
return $application->find('lint:yaml');
}
diff --git a/src/Symfony/Component/Yaml/Tests/Fixtures/YtsSpecificationExamples.yml b/src/Symfony/Component/Yaml/Tests/Fixtures/YtsSpecificationExamples.yml
index 2acc4998e207e..ad1284292bcd0 100644
--- a/src/Symfony/Component/Yaml/Tests/Fixtures/YtsSpecificationExamples.yml
+++ b/src/Symfony/Component/Yaml/Tests/Fixtures/YtsSpecificationExamples.yml
@@ -365,7 +365,7 @@ syck: |
---
-test: Literal perserves newlines
+test: Literal preserves newlines
todo: true
spec: 2.13
yaml: |
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
index 836ec23ffa582..eb46c69fb065b 100644
--- a/src/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -11,8 +11,9 @@
namespace Symfony\Component\Yaml\Tests;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ExpectUserDeprecationMessageTrait;
use Symfony\Component\Yaml\Exception\ParseException;
use Symfony\Component\Yaml\Parser;
use Symfony\Component\Yaml\Tag\TaggedValue;
@@ -20,8 +21,6 @@
class ParserTest extends TestCase
{
- use ExpectUserDeprecationMessageTrait;
-
private ?Parser $parser;
protected function setUp(): void
@@ -1059,9 +1058,8 @@ public static function getParseExceptionOnDuplicateData()
return $tests;
}
- /**
- * @group legacy
- */
+ #[IgnoreDeprecations]
+ #[Group('legacy')]
public function testNullAsDuplicatedData()
{
$this->expectUserDeprecationMessage('Since symfony/yaml 7.2: Duplicate key "child" detected on line 4 whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated and will throw a ParseException in 8.0.');
diff --git a/src/Symfony/Component/Yaml/composer.json b/src/Symfony/Component/Yaml/composer.json
index 2ceac94665037..8f31f2e4de031 100644
--- a/src/Symfony/Component/Yaml/composer.json
+++ b/src/Symfony/Component/Yaml/composer.json
@@ -21,7 +21,7 @@
"symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
- "symfony/console": "^6.4|^7.0"
+ "symfony/console": "^6.4|^7.0|^8.0"
},
"conflict": {
"symfony/console": "<6.4"
diff --git a/src/Symfony/Component/Yaml/phpunit.xml.dist b/src/Symfony/Component/Yaml/phpunit.xml.dist
index 3dc41d45ed45d..e1f4cbc888b2e 100644
--- a/src/Symfony/Component/Yaml/phpunit.xml.dist
+++ b/src/Symfony/Component/Yaml/phpunit.xml.dist
@@ -1,10 +1,11 @@
@@ -18,7 +19,7 @@
-
+
./
@@ -26,5 +27,9 @@
./Tests
./vendor
-
+
+
+
+
diff --git a/src/Symfony/Contracts/Service/Test/ServiceLocatorTest.php b/src/Symfony/Contracts/Service/Test/ServiceLocatorTest.php
index 07d12b4a5bdd3..015ca71e187b4 100644
--- a/src/Symfony/Contracts/Service/Test/ServiceLocatorTest.php
+++ b/src/Symfony/Contracts/Service/Test/ServiceLocatorTest.php
@@ -11,13 +11,9 @@
namespace Symfony\Contracts\Service\Test;
-class_alias(ServiceLocatorTestCase::class, ServiceLocatorTest::class);
-
-if (false) {
- /**
- * @deprecated since PHPUnit 9.6
- */
- class ServiceLocatorTest
- {
- }
+/**
+ * @deprecated since PHPUnit 9.6
+ */
+class ServiceLocatorTest extends ServiceLocatorTestCase
+{
}
diff --git a/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php b/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
index bf0db2c1e158a..b506e6e5ae353 100644
--- a/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
+++ b/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
@@ -11,6 +11,8 @@
namespace Symfony\Contracts\Tests\Service;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
use PHPUnit\Framework\TestCase;
use Psr\Container\ContainerInterface;
use Symfony\Contracts\Service\Attribute\Required;
@@ -19,9 +21,8 @@
use Symfony\Contracts\Service\ServiceSubscriberInterface;
use Symfony\Contracts\Service\ServiceSubscriberTrait;
-/**
- * @group legacy
- */
+#[IgnoreDeprecations]
+#[Group('legacy')]
class ServiceSubscriberTraitTest extends TestCase
{
public static function setUpBeforeClass(): void
diff --git a/src/Symfony/Contracts/phpunit.xml.dist b/src/Symfony/Contracts/phpunit.xml.dist
index 947db86d20ad9..8a2d5481ed3cf 100644
--- a/src/Symfony/Contracts/phpunit.xml.dist
+++ b/src/Symfony/Contracts/phpunit.xml.dist
@@ -1,10 +1,11 @@
@@ -20,7 +21,7 @@
-
+
./
@@ -30,6 +31,9 @@
./Translation/Test/
./vendor
-
+
+
+
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy