Merge branch '5.2' into 5.3

* 5.2:
  Leverage str_contains/str_starts_with
  Leverage str_ends_with

Author: nicolas-grekas

DependencyInjection/AbstractDoctrineExtension.php

@@ -221,7 +221,7 @@ protected function registerMappingDrivers(array $objectManager, ContainerBuilder
                 ]);
             }
             $mappingDriverDef->setPublic(false);
-            if (false !== strpos($mappingDriverDef->getClass(), 'yml') || false !== strpos($mappingDriverDef->getClass(), 'xml')) {
+            if (str_contains($mappingDriverDef->getClass(), 'yml') || str_contains($mappingDriverDef->getClass(), 'xml')) {
                 $mappingDriverDef->setArguments([array_flip($driverPaths)]);
                 $mappingDriverDef->addMethodCall('setGlobalBasename', ['mapping']);
             }

PropertyInfo/DoctrineExtractor.php

@@ -50,7 +50,7 @@ public function getProperties(string $class, array $context = [])
 
         if ($metadata instanceof ClassMetadataInfo && class_exists(\Doctrine\ORM\Mapping\Embedded::class) && $metadata->embeddedClasses) {
             $properties = array_filter($properties, function ($property) {
-                return false === strpos($property, '.');
+                return !str_contains($property, '.');
             });
 
             $properties = array_merge($properties, array_keys($metadata->embeddedClasses));

Security/User/EntityUserProvider.php

@@ -169,7 +169,7 @@ private function getClass(): string
         if (null === $this->class) {
             $class = $this->classOrAlias;
 
-            if (false !== strpos($class, ':')) {
+            if (str_contains($class, ':')) {
                 $class = $this->getClassMetadata()->getName();
             }
 

Validator/DoctrineLoader.php

@@ -104,7 +104,7 @@ public function loadClassMetadata(ClassMetadata $metadata): bool
             }
 
             if (null === $lengthConstraint) {
-                if (isset($mapping['originalClass']) && false === strpos($mapping['declaredField'], '.')) {
+                if (isset($mapping['originalClass']) && !str_contains($mapping['declaredField'], '.')) {
                     $metadata->addPropertyConstraint($mapping['declaredField'], new Valid());
                     $loaded = true;
                 } elseif (property_exists($className, $mapping['fieldName'])) {

composer.json

@@ -22,7 +22,7 @@
         "symfony/deprecation-contracts": "^2.1",
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.0",
-        "symfony/polyfill-php80": "^1.15",
+        "symfony/polyfill-php80": "^1.16",
         "symfony/service-contracts": "^1.1|^2"
     },
     "require-dev": {