Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix argument on wrong method call

  • Loading branch information...
commit 4042bc53ce9c98124d24a652b1ef5c5a311296b9 1 parent 841d12e
Jan Sorgalla jsor authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
4 lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View
@@ -736,7 +736,7 @@ protected function _validateAndCompleteFieldMapping(array &$mapping)
// Complete id mapping
if (isset($mapping['id']) && $mapping['id'] === true) {
if ($this->versionField == $mapping['fieldName']) {
- throw MappingException::cannotVersionIdField($this->name, $mapping['fieldName'], $mapping['type']);
+ throw MappingException::cannotVersionIdField($this->name, $mapping['fieldName']);
}
if ( ! in_array($mapping['fieldName'], $this->identifier)) {
@@ -750,7 +750,7 @@ protected function _validateAndCompleteFieldMapping(array &$mapping)
if (Type::hasType($mapping['type']) && Type::getType($mapping['type'])->canRequireSQLConversion()) {
if (isset($mapping['id']) && $mapping['id'] === true) {
- throw MappingException::sqlConversionNotAllowedForIdentifiers($this->name, $mapping['fieldName']);
+ throw MappingException::sqlConversionNotAllowedForIdentifiers($this->name, $mapping['fieldName'], $mapping['type']);
}
$mapping['requireSQLConversion'] = true;
Please sign in to comment.
Something went wrong with that request. Please try again.