From 5d0082471fa7bc39c47cefe1b8994e0ab9f12ff7 Mon Sep 17 00:00:00 2001
From: Luis Cordova <cordoval@gmail.com>
Date: Sun, 29 Jul 2012 22:55:26 -0500
Subject: [PATCH] [DDC-1872] skip 5.4 versions for php 5.3 uncompatible tests

---
 .../Tests/Models/DDC1872/DDC1872Bar.php       | 12 +++
 .../DDC1872ExampleEntityWithOverride.php      | 31 ++++++++
 .../DDC1872ExampleEntityWithoutOverride.php   | 11 +++
 .../Models/DDC1872/DDC1872ExampleTrait.php    | 23 ++++++
 .../ORM/Mapping/AnnotationDriverTest.php      | 73 ++-----------------
 5 files changed, 83 insertions(+), 67 deletions(-)
 create mode 100644 tests/Doctrine/Tests/Models/DDC1872/DDC1872Bar.php
 create mode 100644 tests/Doctrine/Tests/Models/DDC1872/DDC1872ExampleEntityWithOverride.php
 create mode 100644 tests/Doctrine/Tests/Models/DDC1872/DDC1872ExampleEntityWithoutOverride.php
 create mode 100644 tests/Doctrine/Tests/Models/DDC1872/DDC1872ExampleTrait.php

diff --git a/tests/Doctrine/Tests/Models/DDC1872/DDC1872Bar.php b/tests/Doctrine/Tests/Models/DDC1872/DDC1872Bar.php
new file mode 100644
index 000000000..ea170aeff
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/DDC1872/DDC1872Bar.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Doctrine\Tests\Models\DDC1872;
+
+/**
+* @Entity
+*/
+class DDC1872Bar
+{
+    /** @Id @Column(type="string") */
+    private $id;
+}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/Models/DDC1872/DDC1872ExampleEntityWithOverride.php b/tests/Doctrine/Tests/Models/DDC1872/DDC1872ExampleEntityWithOverride.php
new file mode 100644
index 000000000..0a31197db
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/DDC1872/DDC1872ExampleEntityWithOverride.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Doctrine\Tests\Models\DDC1872;
+
+/**
+ * @Entity
+ *
+ * @AttributeOverrides({
+ * @AttributeOverride(name="foo",
+ *          column=@Column(
+ *              name     = "foo_overridden",
+ *              type     = "integer",
+ *              length   = 140,
+ *              nullable = false,
+ *              unique   = false
+ *          )
+ *      )
+ * })
+ *
+ * @AssociationOverrides({
+ * @AssociationOverride(name="bar",
+ *          joinColumns=@JoinColumn(
+ *              name="example_entity_overridden_bar_id", referencedColumnName="id"
+ *          )
+ *      )
+ * })
+ */
+class DDC1872ExampleEntityWithOverride
+{
+    use DDC1872ExampleTrait;
+}
diff --git a/tests/Doctrine/Tests/Models/DDC1872/DDC1872ExampleEntityWithoutOverride.php b/tests/Doctrine/Tests/Models/DDC1872/DDC1872ExampleEntityWithoutOverride.php
new file mode 100644
index 000000000..314d06041
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/DDC1872/DDC1872ExampleEntityWithoutOverride.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Doctrine\Tests\Models\DDC1872;
+
+/**
+ * @Entity
+ */
+class DDC1872ExampleEntityWithoutOverride
+{
+    use DDC1872ExampleTrait;
+}
diff --git a/tests/Doctrine/Tests/Models/DDC1872/DDC1872ExampleTrait.php b/tests/Doctrine/Tests/Models/DDC1872/DDC1872ExampleTrait.php
new file mode 100644
index 000000000..d8fc1eb31
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/DDC1872/DDC1872ExampleTrait.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Doctrine\Tests\Models\DDC1872;
+
+/**
+ * Trait class
+ */
+trait DDC1872ExampleTrait
+{
+    /** @Id @Column(type="string") */
+    private $id;
+
+    /**
+     * @Column(name="trait_foo", type="integer", length=100, nullable=true, unique=true)
+     */
+    protected $foo;
+
+    /**
+     * @OneToOne(targetEntity="DDC1872Bar", cascade={"persist", "merge"})
+     * @JoinColumn(name="example_trait_bar_id", referencedColumnName="id")
+     */
+    protected $bar;
+}
diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php
index df335c56c..4042f690c 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php
@@ -218,10 +218,14 @@ class AnnotationDriverTest extends AbstractMappingDriverTest
 
     public function testAttributeOverridesMappingWithTrait()
     {
+        if (!version_compare(PHP_VERSION, '5.4.0', '>=')) {
+            $this->markTestSkipped('Invalid PHP version, unable to run this test.');
+        }
+
         $factory       = $this->createClassMetadataFactory();
 
-        $metadataWithoutOverride = $factory->getMetadataFor(get_class(new ExampleEntityWithoutOverride()));
-        $metadataWithOverride = $factory->getMetadataFor(get_class(new ExampleEntityWithOverride()));
+        $metadataWithoutOverride = $factory->getMetadataFor('Doctrine\Tests\Models\DDC1872\DDC1872ExampleEntityWithoutOverride');
+        $metadataWithOverride = $factory->getMetadataFor('Doctrine\Tests\Models\DDC1872\DDC1872ExampleEntityWithOverride');
 
         $this->assertEquals('trait_foo', $metadataWithoutOverride->fieldMappings['foo']['columnName']);
         $this->assertEquals('foo_overridden', $metadataWithOverride->fieldMappings['foo']['columnName']);
@@ -350,69 +354,4 @@ class InvalidFetchOption
      * @OneToMany(targetEntity="Doctrine\Tests\Models\CMS\CmsUser", fetch="eager")
      */
     private $collection;
-}
-
-/**
- * @Entity
- *
- * @AttributeOverrides({
- *      @AttributeOverride(name="foo",
- *          column=@Column(
- *              name     = "foo_overridden",
- *              type     = "integer",
- *              length   = 140,
- *              nullable = false,
- *              unique   = false
- *          )
- *      )
- * })
- *
- * @AssociationOverrides({
- *      @AssociationOverride(name="bar",
- *          joinColumns=@JoinColumn(
- *              name="example_entity_overridden_bar_id", referencedColumnName="id"
- *          )
- *      )
- * })
- */
-class ExampleEntityWithOverride
-{
-    use ExampleTrait;
-}
-
-/**
- * @Entity
- */
-class ExampleEntityWithoutOverride
-{
-    use ExampleTrait;
-}
-
-/**
- * Trait class
- */
-trait ExampleTrait
-{
-    /** @Id @Column(type="string") */
-    private $id;
-
-    /**
-     * @Column(name="trait_foo", type="integer", length=100, nullable=true, unique=true)
-     */
-    protected $foo;
-
-    /**
-     * @OneToOne(targetEntity="Bar", cascade={"persist", "merge"})
-     * @JoinColumn(name="example_trait_bar_id", referencedColumnName="id")
-     */
-    protected $bar;
-}
-
-/**
- * @Entity
- */
-class Bar
-{
-    /** @Id @Column(type="string") */
-    private $id;
 }
\ No newline at end of file