Merge branch '5.3' into 5.4

nicolas-grekas · nicolas-grekas · commit 71c299d4516d · 2021-07-21T14:43:48.000+02:00
* 5.3:
  Leverage str_contains/str_starts_with
  Leverage str_ends_with
diff --git a/DependencyInjection/DebugExtension.php b/DependencyInjection/DebugExtension.php
@@ -59,7 +59,7 @@ public function load(array $configs, ContainerBuilder $container)
             $container->getDefinition('var_dumper.command.server_dump')
                 ->setClass(ServerDumpPlaceholderCommand::class)
             ;
-        } elseif (0 === strpos($config['dump_destination'], 'tcp://')) {
+        } elseif (str_starts_with($config['dump_destination'], 'tcp://')) {
             $container->getDefinition('debug.dump_listener')
                 ->replaceArgument(2, new Reference('var_dumper.server_connection'))
             ;
diff --git a/composer.json b/composer.json
@@ -19,6 +19,7 @@
         "php": ">=7.2.5",
         "ext-xml": "*",
         "symfony/http-kernel": "^4.4|^5.0|^6.0",
+        "symfony/polyfill-php80": "^1.16",
         "symfony/twig-bridge": "^4.4|^5.0|^6.0",
         "symfony/var-dumper": "^4.4|^5.0|^6.0"
     },

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function load(array $configs, ContainerBuilder $container)`
`59`	`59`	`$container->getDefinition('var_dumper.command.server_dump')`
`60`	`60`	`->setClass(ServerDumpPlaceholderCommand::class)`
`61`	`61`	`;`
`62`		`- } elseif (0 === strpos($config['dump_destination'], 'tcp://')) {`
	`62`	`+ } elseif (str_starts_with($config['dump_destination'], 'tcp://')) {`
`63`	`63`	`$container->getDefinition('debug.dump_listener')`
`64`	`64`	`->replaceArgument(2, new Reference('var_dumper.server_connection'))`
`65`	`65`	`;`