RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-09 00:39:25 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'cleanup/#5914-cleanup-sql-walker-code'

Browse Source 
Close #5914
This commit is contained in:
Marco Pivetta 2016-11-26 06:45:16 +01:00
commit 28025b8230
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View File

@ -463,7 +463,7 @@ class ClassMetadataInfo implements ClassMetadata
/**
* READ-ONLY: The registered lifecycle callbacks for entities of this class.
*
* @var array
* @var array[]
*/
public $lifecycleCallbacks = array();

4
lib/Doctrine/ORM/Query.php
View File

@ -309,7 +309,9 @@ final class Query extends AbstractQuery
if ($paramCount > $mappingCount) {
throw QueryException::tooManyParameters($mappingCount, $paramCount);
} elseif ($paramCount < $mappingCount) {
}
if ($paramCount < $mappingCount) {
throw QueryException::tooFewParameters($mappingCount, $paramCount);
}

1
lib/Doctrine/ORM/Query/SqlWalker.php
View File

@ -501,7 +501,6 @@ class SqlWalker implements TreeWalker
default:
//@todo: throw exception?
return '';
break;
}
$filterClauses = array();

24
lib/Doctrine/ORM/Tools/EntityGenerator.php
View File

@ -1259,21 +1259,19 @@ public function __construct(<params>)
*/
protected function generateEntityLifecycleCallbackMethods(ClassMetadataInfo $metadata)
{
if (isset($metadata->lifecycleCallbacks) && $metadata->lifecycleCallbacks) {
$methods = array();
foreach ($metadata->lifecycleCallbacks as $name => $callbacks) {
foreach ($callbacks as $callback) {
if ($code = $this->generateLifecycleCallbackMethod($name, $callback, $metadata)) {
$methods[] = $code;
}
}
}
return implode("\n\n", $methods);
if (empty($metadata->lifecycleCallbacks)) {
return '';
}
return "";
$methods = [];
foreach ($metadata->lifecycleCallbacks as $name => $callbacks) {
foreach ($callbacks as $callback) {
$methods[] = $this->generateLifecycleCallbackMethod($name, $callback, $metadata);
}
}
return implode("\n\n", array_filter($methods));
}
/**