RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-12 07:36:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5910 from ReenExeContributor/clear-code

Browse Source 
Code cleanups: early return/internal function usage
This commit is contained in:
Marco Pivetta 2016-07-01 01:05:16 +02:00 committed by GitHub
commit ffd1465af2
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
View File

@ -583,10 +583,7 @@ class ObjectHydrator extends AbstractHydrator
parent::onClear($eventArgs); parent::onClear($eventArgs);
$aliases = array_keys($this->identifierMap); $aliases = array_keys($this->identifierMap);
$this->identifierMap = array();
foreach ($aliases as $alias) { $this->identifierMap = array_fill_keys($aliases, []);
$this->identifierMap[$alias] = array();
}
} }
} }

6
lib/Doctrine/ORM/Query/Parser.php
View File

@ -827,18 +827,14 @@ class Parser
return; return;
} }
$foundRootEntity = false;
foreach ($this->identVariableExpressions as $dqlAlias => $expr) { foreach ($this->identVariableExpressions as $dqlAlias => $expr) {
if (isset($this->queryComponents[$dqlAlias]) && $this->queryComponents[$dqlAlias]['parent'] === null) { if (isset($this->queryComponents[$dqlAlias]) && $this->queryComponents[$dqlAlias]['parent'] === null) {
$foundRootEntity = true; return;
} }
} }
if ( ! $foundRootEntity) {
$this->semanticalError('Cannot select entity through identification variables without choosing at least one root entity alias.'); $this->semanticalError('Cannot select entity through identification variables without choosing at least one root entity alias.');
} }
}
/** /**
* QueryLanguage ::= SelectStatement | UpdateStatement | DeleteStatement * QueryLanguage ::= SelectStatement | UpdateStatement | DeleteStatement