Removed the IndexedReader
The ORM now supports using a standard reader and does the needed logic internally. The IndexedReader is also available in Common for people needing it.
This commit is contained in:
parent
ea2cf73715
commit
9546ee6d29
@ -1,76 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This file is part of the Symfony framework.
|
|
||||||
*
|
|
||||||
* (c) Fabien Potencier <fabien@symfony.com>
|
|
||||||
*
|
|
||||||
* This source file is subject to the MIT license that is bundled
|
|
||||||
* with this source code in the file LICENSE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace Symfony\Bridge\Doctrine\Annotations;
|
|
||||||
|
|
||||||
use Doctrine\Common\Annotations\Reader;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Allows the reader to be used in-place of Doctrine's reader.
|
|
||||||
*
|
|
||||||
* This can be removed once the BC layer is in place.
|
|
||||||
*
|
|
||||||
* @author Johannes M. Schmitt <schmittjoh@gmail.com>
|
|
||||||
*/
|
|
||||||
class IndexedReader implements Reader
|
|
||||||
{
|
|
||||||
private $delegate;
|
|
||||||
|
|
||||||
public function __construct(Reader $reader)
|
|
||||||
{
|
|
||||||
$this->delegate = $reader;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getClassAnnotations(\ReflectionClass $class)
|
|
||||||
{
|
|
||||||
$annotations = array();
|
|
||||||
foreach ($this->delegate->getClassAnnotations($class) as $annot) {
|
|
||||||
$annotations[get_class($annot)] = $annot;
|
|
||||||
}
|
|
||||||
|
|
||||||
return $annotations;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getClassAnnotation(\ReflectionClass $class, $annotation)
|
|
||||||
{
|
|
||||||
return $this->delegate->getClassAnnotation($class, $annotation);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getMethodAnnotations(\ReflectionMethod $method)
|
|
||||||
{
|
|
||||||
$annotations = array();
|
|
||||||
foreach ($this->delegate->getMethodAnnotations($method) as $annot) {
|
|
||||||
$annotations[get_class($annot)] = $annot;
|
|
||||||
}
|
|
||||||
|
|
||||||
return $annotations;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getMethodAnnotation(\ReflectionMethod $method, $annotation)
|
|
||||||
{
|
|
||||||
return $this->delegate->getMethodAnnotation($method, $annotation);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getPropertyAnnotations(\ReflectionProperty $property)
|
|
||||||
{
|
|
||||||
$annotations = array();
|
|
||||||
foreach ($this->delegate->getPropertyAnnotations($property) as $annot) {
|
|
||||||
$annotations[get_class($annot)] = $annot;
|
|
||||||
}
|
|
||||||
|
|
||||||
return $annotations;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getPropertyAnnotation(\ReflectionProperty $property, $annotation)
|
|
||||||
{
|
|
||||||
return $this->delegate->getPropertyAnnotation($property, $annotation);
|
|
||||||
}
|
|
||||||
}
|
|
@ -20,7 +20,6 @@
|
|||||||
<!-- metadata -->
|
<!-- metadata -->
|
||||||
<parameter key="doctrine.orm.metadata.driver_chain.class">Doctrine\ORM\Mapping\Driver\DriverChain</parameter>
|
<parameter key="doctrine.orm.metadata.driver_chain.class">Doctrine\ORM\Mapping\Driver\DriverChain</parameter>
|
||||||
<parameter key="doctrine.orm.metadata.annotation.class">Doctrine\ORM\Mapping\Driver\AnnotationDriver</parameter>
|
<parameter key="doctrine.orm.metadata.annotation.class">Doctrine\ORM\Mapping\Driver\AnnotationDriver</parameter>
|
||||||
<parameter key="doctrine.orm.metadata.annotation_reader.class">Symfony\Bridge\Doctrine\Annotations\IndexedReader</parameter>
|
|
||||||
<parameter key="doctrine.orm.metadata.xml.class">Doctrine\ORM\Mapping\Driver\SimplifiedXmlDriver</parameter>
|
<parameter key="doctrine.orm.metadata.xml.class">Doctrine\ORM\Mapping\Driver\SimplifiedXmlDriver</parameter>
|
||||||
<parameter key="doctrine.orm.metadata.yml.class">Doctrine\ORM\Mapping\Driver\SimplifiedYamlDriver</parameter>
|
<parameter key="doctrine.orm.metadata.yml.class">Doctrine\ORM\Mapping\Driver\SimplifiedYamlDriver</parameter>
|
||||||
<parameter key="doctrine.orm.metadata.php.class">Doctrine\ORM\Mapping\Driver\PHPDriver</parameter>
|
<parameter key="doctrine.orm.metadata.php.class">Doctrine\ORM\Mapping\Driver\PHPDriver</parameter>
|
||||||
@ -39,9 +38,7 @@
|
|||||||
|
|
||||||
<services>
|
<services>
|
||||||
<!--- Annotation Metadata Reader Service -->
|
<!--- Annotation Metadata Reader Service -->
|
||||||
<service id="doctrine.orm.metadata.annotation_reader" class="%doctrine.orm.metadata.annotation_reader.class%" public="false">
|
<service id="doctrine.orm.metadata.annotation_reader" alias="annotation_reader" public="false" />
|
||||||
<argument type="service" id="annotation_reader" />
|
|
||||||
</service>
|
|
||||||
|
|
||||||
<service id="doctrine.orm.proxy_cache_warmer" class="%doctrine.orm.proxy_cache_warmer.class%" public="false">
|
<service id="doctrine.orm.proxy_cache_warmer" class="%doctrine.orm.proxy_cache_warmer.class%" public="false">
|
||||||
<tag name="kernel.cache_warmer" />
|
<tag name="kernel.cache_warmer" />
|
||||||
|
Reference in New Issue
Block a user