Merge branch '3.4' into 4.3
* 3.4: Fix CS
This commit is contained in:
commit
5da657bcf3
@ -239,11 +239,7 @@ abstract class AbstractDoctrineExtension extends Extension
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!\in_array($mappingConfig['type'], ['xml', 'yml', 'annotation', 'php', 'staticphp'])) {
|
if (!\in_array($mappingConfig['type'], ['xml', 'yml', 'annotation', 'php', 'staticphp'])) {
|
||||||
throw new \InvalidArgumentException(sprintf('Can only configure "xml", "yml", "annotation", "php" or '.
|
throw new \InvalidArgumentException(sprintf('Can only configure "xml", "yml", "annotation", "php" or "staticphp" through the DoctrineBundle. Use your own bundle to configure other metadata drivers. You can register them by adding a new driver to the "%s" service definition.', $this->getObjectManagerElementName($objectManagerName.'_metadata_driver')));
|
||||||
'"staticphp" through the DoctrineBundle. Use your own bundle to configure other metadata drivers. '.
|
|
||||||
'You can register them by adding a new driver to the '.
|
|
||||||
'"%s" service definition.', $this->getObjectManagerElementName($objectManagerName.'_metadata_driver')
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -83,11 +83,7 @@ class EntityUserProvider implements UserProviderInterface
|
|||||||
// That's the case when the user has been changed by a form with
|
// That's the case when the user has been changed by a form with
|
||||||
// validation errors.
|
// validation errors.
|
||||||
if (!$id = $this->getClassMetadata()->getIdentifierValues($user)) {
|
if (!$id = $this->getClassMetadata()->getIdentifierValues($user)) {
|
||||||
throw new \InvalidArgumentException('You cannot refresh a user '.
|
throw new \InvalidArgumentException('You cannot refresh a user from the EntityUserProvider that does not contain an identifier. The user object has to be serialized with its own identifier mapped by Doctrine.');
|
||||||
'from the EntityUserProvider that does not contain an identifier. '.
|
|
||||||
'The user object has to be serialized with its own identifier '.
|
|
||||||
'mapped by Doctrine.'
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$refreshedUser = $repository->find($id);
|
$refreshedUser = $repository->find($id);
|
||||||
|
@ -49,21 +49,10 @@ class CheckDefinitionValidityPass implements CompilerPassInterface
|
|||||||
}
|
}
|
||||||
if (class_exists($id) || interface_exists($id, false)) {
|
if (class_exists($id) || interface_exists($id, false)) {
|
||||||
if (0 === strpos($id, '\\') && 1 < substr_count($id, '\\')) {
|
if (0 === strpos($id, '\\') && 1 < substr_count($id, '\\')) {
|
||||||
throw new RuntimeException(sprintf(
|
throw new RuntimeException(sprintf('The definition for "%s" has no class attribute, and appears to reference a class or interface. Please specify the class attribute explicitly or remove the leading backslash by renaming the service to "%s" to get rid of this error.', $id, substr($id, 1)));
|
||||||
'The definition for "%s" has no class attribute, and appears to reference a class or interface. '
|
|
||||||
.'Please specify the class attribute explicitly or remove the leading backslash by renaming '
|
|
||||||
.'the service to "%s" to get rid of this error.',
|
|
||||||
$id, substr($id, 1)
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
throw new RuntimeException(sprintf(
|
throw new RuntimeException(sprintf('The definition for "%s" has no class attribute, and appears to reference a class or interface in the global namespace. Leaving out the "class" attribute is only allowed for namespaced classes. Please specify the class attribute explicitly to get rid of this error.', $id));
|
||||||
'The definition for "%s" has no class attribute, and appears to reference a '
|
|
||||||
.'class or interface in the global namespace. Leaving out the "class" attribute '
|
|
||||||
.'is only allowed for namespaced classes. Please specify the class attribute '
|
|
||||||
.'explicitly to get rid of this error.',
|
|
||||||
$id
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
throw new RuntimeException(sprintf('The definition for "%s" has no class. If you intend to inject this service dynamically at runtime, please mark it as synthetic=true. If this is an abstract definition solely used by child definitions, please add abstract=true, otherwise specify a class to get rid of this error.', $id));
|
throw new RuntimeException(sprintf('The definition for "%s" has no class. If you intend to inject this service dynamically at runtime, please mark it as synthetic=true. If this is an abstract definition solely used by child definitions, please add abstract=true, otherwise specify a class to get rid of this error.', $id));
|
||||||
|
@ -48,13 +48,7 @@ class ContainerConfigurator extends AbstractConfigurator
|
|||||||
{
|
{
|
||||||
if (!$this->container->hasExtension($namespace)) {
|
if (!$this->container->hasExtension($namespace)) {
|
||||||
$extensions = array_filter(array_map(function (ExtensionInterface $ext) { return $ext->getAlias(); }, $this->container->getExtensions()));
|
$extensions = array_filter(array_map(function (ExtensionInterface $ext) { return $ext->getAlias(); }, $this->container->getExtensions()));
|
||||||
throw new InvalidArgumentException(sprintf(
|
throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in %s). Looked for namespace "%s", found %s', $namespace, $this->file, $namespace, $extensions ? sprintf('"%s"', implode('", "', $extensions)) : 'none'));
|
||||||
'There is no extension able to load the configuration for "%s" (in %s). Looked for namespace "%s", found %s',
|
|
||||||
$namespace,
|
|
||||||
$this->file,
|
|
||||||
$namespace,
|
|
||||||
$extensions ? sprintf('"%s"', implode('", "', $extensions)) : 'none'
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->container->loadFromExtension($namespace, static::processValue($config));
|
$this->container->loadFromExtension($namespace, static::processValue($config));
|
||||||
|
@ -106,13 +106,7 @@ class DateTimeNormalizer implements NormalizerInterface, DenormalizerInterface,
|
|||||||
|
|
||||||
$dateTimeErrors = \DateTime::class === $type ? \DateTime::getLastErrors() : \DateTimeImmutable::getLastErrors();
|
$dateTimeErrors = \DateTime::class === $type ? \DateTime::getLastErrors() : \DateTimeImmutable::getLastErrors();
|
||||||
|
|
||||||
throw new NotNormalizableValueException(sprintf(
|
throw new NotNormalizableValueException(sprintf('Parsing datetime string "%s" using format "%s" resulted in %d errors:'."\n".'%s', $data, $dateTimeFormat, $dateTimeErrors['error_count'], implode("\n", $this->formatDateTimeErrors($dateTimeErrors['errors']))));
|
||||||
'Parsing datetime string "%s" using format "%s" resulted in %d errors:'."\n".'%s',
|
|
||||||
$data,
|
|
||||||
$dateTimeFormat,
|
|
||||||
$dateTimeErrors['error_count'],
|
|
||||||
implode("\n", $this->formatDateTimeErrors($dateTimeErrors['errors']))
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
Reference in New Issue
Block a user