From 346e34adf60d8544712d6aa447ca7237c5e3c3ed Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Sun, 8 Jul 2012 17:33:50 +0200
Subject: [PATCH] Reverting to default annotation driver with  - delayed to 3.0

---
 UPGRADE.md                                    | 28 -------------------
 lib/Doctrine/ORM/Configuration.php            |  2 +-
 lib/Doctrine/ORM/Tools/Setup.php              |  2 +-
 .../Doctrine/Tests/ORM/ConfigurationTest.php  |  4 +--
 4 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index 05d19ffa8..f2c99322a 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -1,33 +1,5 @@
 # Upgrade to 2.3
 
-## Configuration *BC Break*
-
-The default annotation syntax has been changed from `@Entity` to `@ORM\Entity`. If you still want to use the simplified
-version, you should use `Doctrine\Common\Annotations\SimpleAnnotationReader` for your AnnotationDriver or call
-`Doctrine\ORM\Configuration#newDefaultAnnotationDriver` with its second parameter set to `true`.
-
- *  before:
-    ```php
-    <?php
-
-    /** @Entity */
-    class MyEntity
-    {
-    }
-    ```
-
- *  after:
-    ```php
-    <?php
-
-    use Doctrine\ORM\Mapping as ORM;
-
-    /** @ORM\Entity */
-    class MyEntity
-    {
-    }
-    ```
-
 ## EntityGenerator add*() method generation
 
 When generating an add*() method for a collection the EntityGenerator will now not
diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php
index d2da10e30..9c7d1cb13 100644
--- a/lib/Doctrine/ORM/Configuration.php
+++ b/lib/Doctrine/ORM/Configuration.php
@@ -133,7 +133,7 @@ class Configuration extends \Doctrine\DBAL\Configuration
      * @param bool $useSimpleAnnotationReader
      * @return AnnotationDriver
      */
-    public function newDefaultAnnotationDriver($paths = array(), $useSimpleAnnotationReader = false)
+    public function newDefaultAnnotationDriver($paths = array(), $useSimpleAnnotationReader = true)
     {
         AnnotationRegistry::registerFile(__DIR__ . '/Mapping/Driver/DoctrineAnnotations.php');
 
diff --git a/lib/Doctrine/ORM/Tools/Setup.php b/lib/Doctrine/ORM/Tools/Setup.php
index 7124cb1d0..f861073ee 100644
--- a/lib/Doctrine/ORM/Tools/Setup.php
+++ b/lib/Doctrine/ORM/Tools/Setup.php
@@ -114,7 +114,7 @@ class Setup
      * @param bool $useSimpleAnnotationReader
      * @return Configuration
      */
-    static public function createAnnotationMetadataConfiguration(array $paths, $isDevMode = false, $proxyDir = null, Cache $cache = null, $useSimpleAnnotationReader = false)
+    static public function createAnnotationMetadataConfiguration(array $paths, $isDevMode = false, $proxyDir = null, Cache $cache = null, $useSimpleAnnotationReader = true)
     {
         $config = self::createConfiguration($isDevMode, $proxyDir, $cache);
         $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver($paths, $useSimpleAnnotationReader));
diff --git a/tests/Doctrine/Tests/ORM/ConfigurationTest.php b/tests/Doctrine/Tests/ORM/ConfigurationTest.php
index 20feb49b1..b53fd617b 100644
--- a/tests/Doctrine/Tests/ORM/ConfigurationTest.php
+++ b/tests/Doctrine/Tests/ORM/ConfigurationTest.php
@@ -65,7 +65,7 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase
         $paths = array(__DIR__);
         $reflectionClass = new ReflectionClass(__NAMESPACE__ . '\ConfigurationTestAnnotationReaderChecker');
 
-        $annotationDriver = $this->configuration->newDefaultAnnotationDriver($paths);
+        $annotationDriver = $this->configuration->newDefaultAnnotationDriver($paths, false);
         $reader = $annotationDriver->getReader();
         $annotation = $reader->getMethodAnnotation(
             $reflectionClass->getMethod('namespacedAnnotationMethod'),
@@ -73,7 +73,7 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase
         );
         $this->assertInstanceOf('Doctrine\ORM\Mapping\PrePersist', $annotation);
 
-        $annotationDriver = $this->configuration->newDefaultAnnotationDriver($paths, true);
+        $annotationDriver = $this->configuration->newDefaultAnnotationDriver($paths);
         $reader = $annotationDriver->getReader();
         $annotation = $reader->getMethodAnnotation(
             $reflectionClass->getMethod('simpleAnnotationMethod'),