Skip to content

Issue#39: Cannot inherit from custom base controller #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Evgenas wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Issue#39: Cannot inherit from custom base controller #153

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bc6b0e4
Initial change to pickup parent class Inject
Jan 13, 2014
e7402db
change classes lookup direction: first - parent, last - child
Jan 13, 2014
dee3e75
separate functions for Methods and Annotations parent lookup
Jan 13, 2014
6e8ec89
fixing test failing
Jan 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
166 changes: 93 additions & 73 deletions Metadata/Driver/AnnotationDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,64 +66,50 @@ public function loadMetadataForClass(\ReflectionClass $class)
return null;
}

foreach ($this->reader->getClassAnnotations($class) as $annot) {
if ($annot instanceof Service) {
if (null === $annot->id) {
$metadata->id = $this->generateId($className);
} else {
$metadata->id = $annot->id;
}
$hasInjection = false;

if($parentClass = $class->getParentClass()) {
$this->buildAnnotations($parentClass, $metadata);
$this->buildProperties($parentClass, $metadata, $hasInjection);
// temp disabledavoid test failing, only child lookup for now
// @todo fix test failing Cannot redeclare class EnhancedProxy_...SecuredController in EnhancedProxy___CG__-JMS-DiExtraBundle-Tests-Functional-Bundle-TestBundle-Controller-SecuredController.php on line 11
//$this->buildMethods($parentClass, $metadata, $hasInjection);
}

$this->buildAnnotations($class, $metadata);
$this->buildProperties($class, $metadata, $hasInjection);
$this->buildMethods($class, $metadata, $hasInjection);

$metadata->parent = $annot->parent;
$metadata->public = $annot->public;
$metadata->scope = $annot->scope;
$metadata->abstract = $annot->abstract;
} else if ($annot instanceof Tag) {
$metadata->tags[$annot->name][] = $annot->attributes;
} else if ($annot instanceof Validator) {
// automatically register as service if not done explicitly
if (null === $metadata->id) {
$metadata->id = $this->generateId($className);
}
if (null == $metadata->id && !$hasInjection) {
return null;
}

$metadata->tags['validator.constraint_validator'][] = array(
'alias' => $annot->alias,
);
} else if ($annot instanceof AbstractDoctrineListener) {
if (null === $metadata->id) {
$metadata->id = $this->generateId($className);
}
return $metadata;
}

foreach ($annot->events as $event) {
$metadata->tags[$annot->getTag()][] = array(
'event' => $event,
'connection' => $annot->connection ?: 'default',
'lazy' => $annot->lazy,
'priority' => $annot->priority,
);
}
} else if ($annot instanceof FormType) {
if (null === $metadata->id) {
$metadata->id = $this->generateId($className);
}
private function convertReferenceValue($name, AnnotReference $annot)
{
if (null === $annot->value) {
return new Reference($this->generateId($name), false !== $annot->required ? ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE : ContainerInterface::NULL_ON_INVALID_REFERENCE, $annot->strict);
}

$alias = $annot->alias;
if (false === strpos($annot->value, '%')) {
return new Reference($annot->value, false !== $annot->required ? ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE : ContainerInterface::NULL_ON_INVALID_REFERENCE, $annot->strict);
}

// try to extract it from the class itself
if (null === $alias) {
$instance = unserialize(sprintf('O:%d:"%s":0:{}', strlen($className), $className));
$alias = $instance->getName();
}
return $annot->value;
}

$metadata->tags['form.type'][] = array(
'alias' => $alias,
);
}
}
private function generateId($name)
{
$name = preg_replace('/(?<=[a-zA-Z0-9])[A-Z]/', '_\\0', $name);

$hasInjection = false;
foreach ($class->getProperties() as $property) {
if ($property->getDeclaringClass()->getName() !== $className) {
return strtolower(strtr($name, '\\', '.'));
}

private function buildProperties($class, &$metadata, &$hasInjection) {
foreach ($class->getProperties() as $property) {
if ($property->getDeclaringClass()->getName() !== $class->getName()) {
continue;
}
$name = $property->getName();
Expand All @@ -135,9 +121,11 @@ public function loadMetadataForClass(\ReflectionClass $class)
}
}
}

}

private function buildMethods($class, &$metadata, &$hasInjection) {
foreach ($class->getMethods() as $method) {
if ($method->getDeclaringClass()->getName() !== $className) {
if ($method->getDeclaringClass()->getName() !== $class->getName()) {
continue;
}
$name = $method->getName();
Expand Down Expand Up @@ -199,31 +187,63 @@ public function loadMetadataForClass(\ReflectionClass $class)
}
}
}

if (null == $metadata->id && !$hasInjection) {
return null;
}

return $metadata;
}

private function buildAnnotations($class, &$metadata) {
$className = $class->getName();
foreach ($this->reader->getClassAnnotations($class) as $annot) {
if ($annot instanceof Service) {
if (null === $annot->id) {
$metadata->id = $this->generateId($className);
} else {
$metadata->id = $annot->id;
}

private function convertReferenceValue($name, AnnotReference $annot)
{
if (null === $annot->value) {
return new Reference($this->generateId($name), false !== $annot->required ? ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE : ContainerInterface::NULL_ON_INVALID_REFERENCE, $annot->strict);
}
$metadata->parent = $annot->parent;
$metadata->public = $annot->public;
$metadata->scope = $annot->scope;
$metadata->abstract = $annot->abstract;
} else if ($annot instanceof Tag) {
$metadata->tags[$annot->name][] = $annot->attributes;
} else if ($annot instanceof Validator) {
// automatically register as service if not done explicitly
if (null === $metadata->id) {
$metadata->id = $this->generateId($className);
}

if (false === strpos($annot->value, '%')) {
return new Reference($annot->value, false !== $annot->required ? ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE : ContainerInterface::NULL_ON_INVALID_REFERENCE, $annot->strict);
}
$metadata->tags['validator.constraint_validator'][] = array(
'alias' => $annot->alias,
);
} else if ($annot instanceof AbstractDoctrineListener) {
if (null === $metadata->id) {
$metadata->id = $this->generateId($className);
}

return $annot->value;
}
foreach ($annot->events as $event) {
$metadata->tags[$annot->getTag()][] = array(
'event' => $event,
'connection' => $annot->connection ?: 'default',
'lazy' => $annot->lazy,
'priority' => $annot->priority,
);
}
} else if ($annot instanceof FormType) {
if (null === $metadata->id) {
$metadata->id = $this->generateId($className);
}

private function generateId($name)
{
$name = preg_replace('/(?<=[a-zA-Z0-9])[A-Z]/', '_\\0', $name);
$alias = $annot->alias;

return strtolower(strtr($name, '\\', '.'));
// try to extract it from the class itself
if (null === $alias) {
$instance = unserialize(sprintf('O:%d:"%s":0:{}', strlen($className), $className));
$alias = $instance->getName();
}

$metadata->tags['form.type'][] = array(
'alias' => $alias,
);
}
}
}
}