Fix tests

Author: patrickbrouwers

src/DoctrineManager.php

@@ -22,7 +22,6 @@ class DoctrineManager
     /**
      * @param Container            $container
      * @param EntityManagerFactory $factory
-     * @internal param ManagerRegistry $registry
      */
     public function __construct(Container $container, EntityManagerFactory $factory)
     {

tests/DoctrineManagerTest.php

@@ -8,6 +8,7 @@
 use Illuminate\Contracts\Container\Container;
 use LaravelDoctrine\ORM\DoctrineExtender;
 use LaravelDoctrine\ORM\DoctrineManager;
+use LaravelDoctrine\ORM\EntityManagerFactory;
 use LaravelDoctrine\ORM\Extensions\MappingDriverChain;
 use Mockery as m;
 
@@ -33,15 +34,21 @@ class DoctrineManagerTest extends PHPUnit_Framework_TestCase
      */
     protected $em;
 
+    /**
+     * @var EntityManagerFactory
+     */
+    protected $factory;
+
     protected function setUp()
     {
         $this->container = m::mock(Container::class);
         $this->registry  = m::mock(ManagerRegistry::class);
         $this->em        = m::mock(EntityManagerInterface::class);
+        $this->factory   = m::mock(EntityManagerFactory::class)->makePartial();
 
         $this->manager = new DoctrineManager(
             $this->container,
-            $this->registry
+            $this->factory
         );
     }
 
@@ -57,6 +64,8 @@ public function test_can_extend_doctrine_on_existing_connection_with_callback()
         $this->manager->extend('default', function ($configuration, $connection, $eventManager) {
             $this->assertExtendedCorrectly($configuration, $connection, $eventManager);
         });
+
+        $this->factory->callResolveCallbacks($this->registry);
     }
 
     public function test_can_extend_doctrine_on_existing_connection_with_class()
@@ -74,6 +83,8 @@ public function test_can_extend_doctrine_on_existing_connection_with_class()
         $this->mockEmCalls();
 
         $this->manager->extend('default', MyDoctrineExtender::class);
+
+        $this->factory->callResolveCallbacks($this->registry);
     }
 
     public function test_cant_extend_with_a_non_existing_extender_class()
@@ -86,6 +97,8 @@ public function test_cant_extend_with_a_non_existing_extender_class()
         $this->setExpectedException(InvalidArgumentException::class);
 
         $this->manager->extend('default', 'no_class');
+
+        $this->factory->callResolveCallbacks($this->registry);
     }
 
     public function test_cant_extend_with_an_invalid_class()
@@ -103,6 +116,8 @@ public function test_cant_extend_with_an_invalid_class()
         $this->setExpectedException(InvalidArgumentException::class);
 
         $this->manager->extend('default', InvalidDoctrineExtender::class);
+
+        $this->factory->callResolveCallbacks($this->registry);
     }
 
     public function test_can_extend_all_connections()
@@ -132,6 +147,8 @@ public function test_can_extend_all_connections()
         $this->manager->extendAll(function ($configuration, $connection, $eventManager) {
             $this->assertExtendedCorrectly($configuration, $connection, $eventManager);
         });
+
+        $this->factory->callResolveCallbacks($this->registry);
     }
 
     public function test_can_add_a_new_namespace_to_default_connection()
@@ -154,6 +171,8 @@ public function test_can_add_a_new_namespace_to_default_connection()
                  ->once()->andReturn($configuration);
 
         $this->manager->addNamespace('NewNamespace', 'default');
+
+        $this->factory->callResolveCallbacks($this->registry);
     }
 
     public function test_can_add_paths_to_default_connection()
@@ -176,6 +195,8 @@ public function test_can_add_paths_to_default_connection()
                  ->once()->andReturn($configuration);
 
         $this->manager->addPaths(['paths'], 'default');
+
+        $this->factory->callResolveCallbacks($this->registry);
     }
 
     protected function tearDown()

tests/Extensions/ExtensionManagerTest.php

@@ -85,7 +85,7 @@ public function test_boot_manager_with_one_manager_and_one_extension()
         // Register
         $this->manager->register(new ExtensionMock);
 
-        $this->manager->boot();
+        $this->manager->boot($this->registry);
 
         // Should be inside booted extensions now
         $booted = $this->manager->getBootedExtensions();
@@ -108,7 +108,7 @@ public function test_boot_manager_with_two_managers_and_one_extension()
         // Register
         $this->manager->register(new ExtensionMock);
 
-        $this->manager->boot();
+        $this->manager->boot($this->registry);
 
         // Should be inside booted extensions now
         $booted = $this->manager->getBootedExtensions();
@@ -132,7 +132,7 @@ public function test_boot_manager_with_one_manager_and_two_extensions()
         $this->manager->register(new ExtensionMock);
         $this->manager->register(new ExtensionMock2);
 
-        $this->manager->boot();
+        $this->manager->boot($this->registry);
 
         // Should be inside booted extensions now
         $booted = $this->manager->getBootedExtensions();
@@ -157,7 +157,7 @@ public function test_extension_will_only_be_booted_once()
         $this->manager->register(new ExtensionMock);
         $this->manager->register(new ExtensionMock);
 
-        $this->manager->boot();
+        $this->manager->boot($this->registry);
 
         // Should be inside booted extensions now
         $booted = $this->manager->getBootedExtensions();
@@ -189,7 +189,7 @@ public function test_filters_get_registerd_on_boot()
         // Register
         $this->manager->register(new ExtensionWithFiltersMock);
 
-        $this->manager->boot();
+        $this->manager->boot($this->registry);
 
         // Should be inside booted extensions now
         $booted = $this->manager->getBootedExtensions();
@@ -205,9 +205,7 @@ protected function tearDown()
 
     protected function newManager()
     {
-        return new ExtensionManager(
-            $this->registry
-        );
+        return new ExtensionManager();
     }
 }