|
@@ -49,7 +49,7 @@ class Annotation implements Driver
|
|
|
*
|
|
|
* @var array
|
|
|
*/
|
|
|
- public $validTypes = array(
|
|
|
+ protected $_validTypes = array(
|
|
|
'string',
|
|
|
'text'
|
|
|
);
|
|
@@ -57,10 +57,7 @@ class Annotation implements Driver
|
|
|
/**
|
|
|
* {@inheritDoc}
|
|
|
*/
|
|
|
- public function validateFullMetadata($meta, array $config)
|
|
|
- {
|
|
|
-
|
|
|
- }
|
|
|
+ public function validateFullMetadata($meta, array $config) {}
|
|
|
|
|
|
/**
|
|
|
* {@inheritDoc}
|
|
@@ -85,7 +82,7 @@ class Annotation implements Driver
|
|
|
foreach ($class->getProperties() as $property) {
|
|
|
if ($meta->isMappedSuperclass && !$property->isPrivate() ||
|
|
|
$meta->isInheritedField($property->name) ||
|
|
|
- $meta->isInheritedAssociation($property->name)
|
|
|
+ isset($meta->associationMappings[$property->name]['inherited'])
|
|
|
) {
|
|
|
continue;
|
|
|
}
|
|
@@ -127,6 +124,7 @@ class Annotation implements Driver
|
|
|
*/
|
|
|
protected function _isValidField($meta, $field)
|
|
|
{
|
|
|
- return in_array($meta->getTypeOfField($field), $this->validTypes);
|
|
|
+ $mapping = $meta->getFieldMapping($field);
|
|
|
+ return $mapping && in_array($mapping['type'], $this->_validTypes);
|
|
|
}
|
|
|
}
|