Skip to content

Commit 0eabadd

Browse files
Merge branch '3.4' into 4.4
* 3.4: Enable "native_constant_invocation" CS rule Make AbstractPhpFileCacheWarmer public
2 parents f0a138b + 4680896 commit 0eabadd

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

DependencyInjection/AbstractDoctrineExtension.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,11 @@ protected function detectMetadataDriver($dir, ContainerBuilder $container)
253253
$configPath = $this->getMappingResourceConfigDirectory();
254254
$extension = $this->getMappingResourceExtension();
255255

256-
if (glob($dir.'/'.$configPath.'/*.'.$extension.'.xml', GLOB_NOSORT)) {
256+
if (glob($dir.'/'.$configPath.'/*.'.$extension.'.xml', \GLOB_NOSORT)) {
257257
$driver = 'xml';
258-
} elseif (glob($dir.'/'.$configPath.'/*.'.$extension.'.yml', GLOB_NOSORT)) {
258+
} elseif (glob($dir.'/'.$configPath.'/*.'.$extension.'.yml', \GLOB_NOSORT)) {
259259
$driver = 'yml';
260-
} elseif (glob($dir.'/'.$configPath.'/*.'.$extension.'.php', GLOB_NOSORT)) {
260+
} elseif (glob($dir.'/'.$configPath.'/*.'.$extension.'.php', \GLOB_NOSORT)) {
261261
$driver = 'php';
262262
} else {
263263
// add the closest existing directory as a resource
@@ -435,7 +435,7 @@ abstract protected function getMappingResourceExtension();
435435
*/
436436
protected function getMetadataDriverClass(string $driverType): string
437437
{
438-
@trigger_error(sprintf('Not declaring the "%s" method in class "%s" is deprecated since Symfony 4.4. This method will be abstract in Symfony 5.0.', __METHOD__, static::class), E_USER_DEPRECATED);
438+
@trigger_error(sprintf('Not declaring the "%s" method in class "%s" is deprecated since Symfony 4.4. This method will be abstract in Symfony 5.0.', __METHOD__, static::class), \E_USER_DEPRECATED);
439439

440440
return '%'.$this->getObjectManagerElementName('metadata.'.$driverType.'.class%');
441441
}

Form/ChoiceList/DoctrineChoiceLoader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function __construct(ObjectManager $manager, string $class, IdReader $idR
4747
$classMetadata = $manager->getClassMetadata($class);
4848

4949
if ($idReader && !$idReader->isSingleId()) {
50-
@trigger_error(sprintf('Passing an instance of "%s" to "%s" with an entity class "%s" that has a composite id is deprecated since Symfony 4.3 and will throw an exception in 5.0.', IdReader::class, __CLASS__, $class), E_USER_DEPRECATED);
50+
@trigger_error(sprintf('Passing an instance of "%s" to "%s" with an entity class "%s" that has a composite id is deprecated since Symfony 4.3 and will throw an exception in 5.0.', IdReader::class, __CLASS__, $class), \E_USER_DEPRECATED);
5151

5252
// In Symfony 5.0
5353
// throw new \InvalidArgumentException(sprintf('The second argument `$idReader` of "%s" must be null when the query cannot be optimized because of composite id fields.', __METHOD__));
@@ -57,7 +57,7 @@ public function __construct(ObjectManager $manager, string $class, IdReader $idR
5757
$idReader = new IdReader($manager, $classMetadata);
5858

5959
if ($idReader->isSingleId()) {
60-
@trigger_error(sprintf('Not explicitly passing an instance of "%s" to "%s" when it can optimize single id entity "%s" has been deprecated in 4.3 and will not apply any optimization in 5.0.', IdReader::class, __CLASS__, $class), E_USER_DEPRECATED);
60+
@trigger_error(sprintf('Not explicitly passing an instance of "%s" to "%s" when it can optimize single id entity "%s" has been deprecated in 4.3 and will not apply any optimization in 5.0.', IdReader::class, __CLASS__, $class), \E_USER_DEPRECATED);
6161
} else {
6262
$idReader = null;
6363
}

PropertyInfo/DoctrineExtractor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function __construct($entityManager)
4444
if ($entityManager instanceof EntityManagerInterface) {
4545
$this->entityManager = $entityManager;
4646
} elseif ($entityManager instanceof ClassMetadataFactory) {
47-
@trigger_error(sprintf('Injecting an instance of "%s" in "%s" is deprecated since Symfony 4.2, inject an instance of "%s" instead.', ClassMetadataFactory::class, __CLASS__, EntityManagerInterface::class), E_USER_DEPRECATED);
47+
@trigger_error(sprintf('Injecting an instance of "%s" in "%s" is deprecated since Symfony 4.2, inject an instance of "%s" instead.', ClassMetadataFactory::class, __CLASS__, EntityManagerInterface::class), \E_USER_DEPRECATED);
4848
$this->classMetadataFactory = $entityManager;
4949
} else {
5050
throw new \TypeError(sprintf('$entityManager must be an instance of "%s", "%s" given.', EntityManagerInterface::class, \is_object($entityManager) ? \get_class($entityManager) : \gettype($entityManager)));

0 commit comments

Comments
 (0)