[2.0][DDC-92] Fixed. Patch provided by Christian Heinrich. [DDC-274] …

…Started some method renaming. [DDC-142] Fixed (join column names and discriminator column names dont support quoting) [DDC-258] Fixed.
doctrine · Mar 5, 2010 · df6ca60 · df6ca60
1 parent 715da59
commit df6ca60
Show file tree

Hide file tree

Showing 77 changed files with 1,578 additions and 1,609 deletions.
diff --git a/lib/Doctrine/Common/Annotations/AnnotationException.php b/lib/Doctrine/Common/Annotations/AnnotationException.php
@@ -32,14 +32,14 @@
  * @author  Jonathan Wage <jonwage@gmail.com>
  * @author  Roman Borschel <roman@code-factory.org>
  */
-class AnnotationException extends \Doctrine\Common\DoctrineException 
+class AnnotationException extends \Doctrine\Common\CommonException
 {
 	public static function syntaxError($message)
     {
         return new self('[Syntax Error] ' . $message);
     }
-    
-    
+
+
     public static function semanticalError($message)
     {
         return new self('[Semantical Error] ' . $message);

diff --git a/lib/Doctrine/Common/Annotations/AnnotationReader.php b/lib/Doctrine/Common/Annotations/AnnotationReader.php
@@ -105,7 +105,9 @@ public function setAnnotationNamespaceAlias($namespace, $alias)
     public function getClassAnnotations(ReflectionClass $class)
     {
         $cacheKey = $class->getName() . self::$CACHE_SALT;
-
+
+        //FIXME: Just use ->fetch(), otherwise some drivers, i.e. APC will fetch twice because they
+        // implement contains() in terms of fetch(), *sigh*.
         if ($this->_cache->contains($cacheKey)) {
             return $this->_cache->fetch($cacheKey);
         }
@@ -140,7 +142,9 @@ public function getClassAnnotation(ReflectionClass $class, $annotation)
     public function getPropertyAnnotations(ReflectionProperty $property)
     {
         $cacheKey = $property->getDeclaringClass()->getName() . '$' . $property->getName() . self::$CACHE_SALT;
-
+
+        //FIXME: Just use ->fetch(), otherwise some drivers, i.e. APC will fetch twice because they
+        // implement contains() in terms of fetch(), *sigh*.
         if ($this->_cache->contains($cacheKey)) {
             return $this->_cache->fetch($cacheKey);
         }
@@ -176,7 +180,9 @@ public function getPropertyAnnotation(ReflectionProperty $property, $annotation)
     public function getMethodAnnotations(ReflectionMethod $method)
     {
         $cacheKey = $method->getDeclaringClass()->getName() . '#' . $method->getName() . self::$CACHE_SALT;
-
+
+        //FIXME: Just use ->fetch(), otherwise some drivers, i.e. APC will fetch twice because they
+        // implement contains() in terms of fetch(), *sigh*.
         if ($this->_cache->contains($cacheKey)) {
             return $this->_cache->fetch($cacheKey);
         }