Merge pull request #300 from mikeSimonson/orm-24

Making sure that we only require the orm 2.4 for now
doctrine · Jul 5, 2015 · 78954cc · 78954cc
2 parents 70c5801 + 487224e
commit 78954cc
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -23,10 +23,6 @@
         "mockery/mockery": "^0.9.4",
         "johnkary/phpunit-speedtrap": "~1.0@dev"
     },
-    "conflict": {
-        "doctrine/orm": "<2.4"
-
-    },
     "suggest": {
         "symfony/console": "to run the migration from the console"
     },

diff --git a/lib/Doctrine/DBAL/Migrations/Provider/OrmSchemaProvider.php b/lib/Doctrine/DBAL/Migrations/Provider/OrmSchemaProvider.php
@@ -19,6 +19,7 @@
 
 namespace Doctrine\DBAL\Migrations\Provider;
 
+use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Tools\SchemaTool;
 
@@ -34,8 +35,15 @@ final class OrmSchemaProvider implements SchemaProviderInterface
      */
     private $entityManager;
 
-    public function __construct(EntityManagerInterface $em)
+    public function __construct($em)
     {
+        if (!$this->isEntityManager($em)) {
+            throw new \InvalidArgumentException(sprintf(
+                '$em is not a valid Doctrine ORM Entity Manager, got "%s"',
+                is_object($em) ? get_class($em) : gettype($em)
+            ));
+        }
+
         $this->entityManager = $em;
     }
 
@@ -53,4 +61,22 @@ public function createSchema()
 
         return $tool->getSchemaFromMetadata($metadata);
     }
+
+
+    /**
+     * Doctrine's EntityManagerInterface was introduced in version 2.4, since this
+     * library allows those older version we need to be able to check for those
+     * old ORM versions. Hence the helper method.
+     *
+     * No need to check to see if EntityManagerInterface exists first here, PHP
+     * doesn't care.
+     *
+     * @param   mixed $manager Hopefully an entity manager, but it may be anything
+     * @return  boolean
+     */
+    private function isEntityManager($manager)
+    {
+        return $manager instanceof EntityManagerInterface || $manager instanceof EntityManager;
+    }
+
 }
diff --git a/tests/Doctrine/DBAL/Migrations/Tests/Provider/OrmSchemaProviderTest.php b/tests/Doctrine/DBAL/Migrations/Tests/Provider/OrmSchemaProviderTest.php
@@ -56,6 +56,26 @@ public function testEntityManagerWithoutMetadataCausesError()
         $this->ormProvider->createSchema();
     }
 
+    public function notEntityManagers()
+    {
+        return array(
+            array(new \stdclass),
+            array(false),
+            array(1),
+            array('oops'),
+            array(1.0),
+        );
+    }
+
+    /**
+     * @dataProvider notEntityManagers
+     * @expectedException InvalidArgumentException
+     */
+    public function testPassingAnInvalidEntityManagerToConstructorCausesError($em)
+    {
+        new OrmSchemaProvider($em);
+    }
+
     protected function setUp()
     {
         $this->conn = $this->getSqliteConnection();