RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

#1120 - cs cleanups - moving success cases at the end of methods

Browse source
This commit is contained in:
Marco Pivetta 2014-10-19 18:21:45 +02:00
parent 97fdd0adb7
commit 0f289a1270
1 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php
View file

@ -142,7 +142,7 @@ EOT
* *
* @param EntityManagerInterface $entityManager * @param EntityManagerInterface $entityManager
* *
* @return \Doctrine\ORM\Mapping\ClassMetadata[] * @return string[]
*/ */
private function getMappedEntities(EntityManagerInterface $entityManager) private function getMappedEntities(EntityManagerInterface $entityManager)
{ {
@ -175,33 +175,34 @@ EOT
try { try {
return $entityManager->getClassMetadata($entityName); return $entityManager->getClassMetadata($entityName);
} catch (MappingException $e) { } catch (MappingException $e) {
$mappedEntities = $this->getMappedEntities($entityManager); }
$matches = array_filter($mappedEntities, function ($mappedEntity) use ($entityName) {
$matches = array_filter(
$this->getMappedEntities($entityManager),
function ($mappedEntity) use ($entityName) {
if (preg_match('{' . preg_quote($entityName) . '}', $mappedEntity)) { if (preg_match('{' . preg_quote($entityName) . '}', $mappedEntity)) {
return true; return true;
} }
return false; return false;
});
if (0 === count($matches)) {
throw new \InvalidArgumentException(sprintf(
'Could not find any mapped Entity classes matching "%s"',
$entityName
));
} }
);
if (1 === count($matches)) { if (! $matches) {
$meta = $entityManager->getClassMetadata(current($matches)); throw new \InvalidArgumentException(sprintf(
} else { 'Could not find any mapped Entity classes matching "%s"',
throw new \InvalidArgumentException(sprintf( $entityName
'Entity name "%s" is ambigous, possible matches: "%s"', ));
$entityName, implode(', ', $matches)
));
}
return $meta;
} }
if (count($matches) > 1) {
throw new \InvalidArgumentException(sprintf(
'Entity name "%s" is ambigous, possible matches: "%s"',
$entityName, implode(', ', $matches)
));
}
return $entityManager->getClassMetadata(current($matches));
} }
/** /**
@ -231,7 +232,7 @@ EOT
if (is_array($value)) { if (is_array($value)) {
if (defined('JSON_UNESCAPED_UNICODE') && defined('JSON_UNESCAPED_SLASHES')) { if (defined('JSON_UNESCAPED_UNICODE') && defined('JSON_UNESCAPED_SLASHES')) {
return json_encode($value, JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES); return json_encode($value, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
} }
return json_encode($value); return json_encode($value);
@ -305,8 +306,10 @@ EOT
private function formatFieldMappings($fieldMappings) private function formatFieldMappings($fieldMappings)
{ {
$this->formatField('Field mappings:', ''); $this->formatField('Field mappings:', '');
foreach ($fieldMappings as $fieldName => $mapping) { foreach ($fieldMappings as $fieldName => $mapping) {
$this->formatField(sprintf(' %s',$fieldName), ''); $this->formatField(sprintf(' %s',$fieldName), '');
foreach ($mapping as $field => $value) { foreach ($mapping as $field => $value) {
$this->formatField(sprintf(' %s', $field), $this->formatValue($value)); $this->formatField(sprintf(' %s', $field), $this->formatValue($value));
} }