Merge c92760b into 772e912

.php_cs

@@ -2,6 +2,7 @@
 
 $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__ . '/src')
+    ->in(__DIR__ . '/tests/integration')
     ->in(__DIR__ . '/tests/functional')
 ;
 

composer.json

@@ -14,7 +14,7 @@
     "require": {
         "php": ">=5.4.0",
         "arachne/di-helpers": "~0.4.0",
-        "kdyby/doctrine": "^3.0.0",
+        "kdyby/doctrine": "dev-events",
         "nette/di": "^2.3.0"
     },
     "suggest": {
@@ -26,9 +26,11 @@
         "php": ">=5.5.0",
         "arachne/bootstrap": "~0.2.1",
         "arachne/codeception": "~0.6.3",
+        "arachne/container-adapter": "@dev",
         "arachne/entity-loader": "~0.8.3",
         "codeception/codeception": "~2.2.0@rc",
         "kdyby/console": "^2.4.0",
+        "symfony/doctrine-bridge": "^2.8.0",
         "symfony/event-dispatcher": "^2.8.0",
         "nette/di": "^2.3.0"
     },
@@ -39,7 +41,14 @@
     },
     "autoload-dev": {
         "psr-4": {
+            "Tests\\Integration\\": "tests/integration/src",
             "Tests\\Functional\\": "tests/functional/src"
         }
-    }
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/enumag/Doctrine.git"
+        }
+    ]
 }

src/DI/DoctrineExtension.php

@@ -18,12 +18,15 @@
 use Kdyby\Validator\DI\ValidatorExtension;
 use Nette\Utils\AssertionException;
 use Nette\Utils\Validators;
+use ReflectionClass;
 
 /**
  * @author Jáchym Toušek <enumag@gmail.com>
  */
 class DoctrineExtension extends CompilerExtension
 {
+    const TAG_SUBSCRIBER = 'arachne.doctrine.subscriber';
+
     /** @var array */
     public $defaults = [
         'validateOnFlush' => false,
@@ -42,6 +45,11 @@ public function loadConfiguration()
 
         $builder = $this->getContainerBuilder();
 
+        if (!$this->getExtension('Kdyby\Events\DI\EventsExtension', false) && $this->getExtension('Arachne\ContainerAdapter\DI\ContainerAdapterExtension', false)) {
+            $builder->addDefinition($this->prefix('eventManager'))
+                ->setClass('Symfony\Bridge\Doctrine\ContainerAwareEventManager');
+        }
+
         if ($this->getExtension('Arachne\EntityLoader\DI\EntityLoaderExtension', false)) {
             $builder->addDefinition($this->prefix('entityLoader.filterInResolver'))
                 ->setClass('Arachne\Doctrine\EntityLoader\FilterInResolver')
@@ -123,5 +131,22 @@ public function beforeCompile()
                     'resolver' => '@' . $extension->get(EntityLoaderExtension::TAG_FILTER_OUT, false),
                 ]);
         }
+
+        $subscribers = $builder->findByTag(self::TAG_SUBSCRIBER);
+        if ($subscribers) {
+            if (!$builder->hasDefinition($this->prefix('eventManager'))) {
+                throw new AssertionException("Subscribers support requires 'Arachne\ContainerAdapter\DI\ContainerAdapterExtension' to be installed and 'Kdyby\Events\DI\EventsExtension' to NOT be installed.", E_USER_NOTICE);
+            }
+
+            $evm = $builder->getDefinition($this->prefix('eventManager'));
+            foreach ($subscribers as $name => $attributes) {
+                $subscriber = $builder->getDefinition($name);
+                $evm->addSetup('?->addEventListener(?, ?)', [
+                    '@self',
+                    (new ReflectionClass($subscriber->getEntity() ?: $subscriber->getClass()))->newInstanceWithoutConstructor()->getSubscribedEvents(),
+                    $name, // Intentionally without @ for laziness.
+                ]);
+            }
+        }
     }
 }

tests/integration.suite.yml

@@ -0,0 +1,3 @@
+error_level: "E_ALL"
+
+class_name: IntegrationSuiteGuy

tests/integration/_bootstrap.php

@@ -0,0 +1,5 @@
+<?php
+
+define('TEMP_DIR', __DIR__ . '/../_temp/integration_' . md5(time()));
+
+mkdir(TEMP_DIR);

tests/integration/config/subscriber-exception.neon

@@ -0,0 +1,20 @@
+extensions:
+    arachne.containeradapter: Arachne\ContainerAdapter\DI\ContainerAdapterExtension
+    arachne.doctrine: Arachne\Doctrine\DI\DoctrineExtension
+    nette.caching: Nette\Bridges\CacheDI\CacheExtension( %tempDir% )
+    kdyby.annotations: Kdyby\Annotations\DI\AnnotationsExtension
+    kdyby.events: Kdyby\Events\DI\EventsExtension
+    kdyby.doctrine: Kdyby\Doctrine\DI\OrmExtension
+
+kdyby.doctrine:
+    driver: pdo_sqlite
+    memory: true
+
+kdyby.events:
+	debugger: false
+
+services:
+    subscriber:
+        class: Tests\Integration\Fixtures\Subscriber
+        tags:
+            - arachne.doctrine.subscriber

tests/integration/config/subscriber.neon

@@ -0,0 +1,16 @@
+extensions:
+    arachne.containeradapter: Arachne\ContainerAdapter\DI\ContainerAdapterExtension
+    arachne.doctrine: Arachne\Doctrine\DI\DoctrineExtension
+    nette.caching: Nette\Bridges\CacheDI\CacheExtension( %tempDir% )
+    kdyby.annotations: Kdyby\Annotations\DI\AnnotationsExtension
+    kdyby.doctrine: Kdyby\Doctrine\DI\OrmExtension
+
+kdyby.doctrine:
+    driver: pdo_sqlite
+    memory: true
+
+services:
+    subscriber:
+        class: Tests\Integration\Fixtures\Subscriber
+        tags:
+            - arachne.doctrine.subscriber

tests/integration/src/DoctrineExtensionTest.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Tests\Integration;
+
+use Arachne\Bootstrap\Configurator;
+use Codeception\TestCase\Test;
+use Doctrine\Common\EventManager;
+use Symfony\Bridge\Doctrine\ContainerAwareEventManager;
+
+/**
+ * @author Jáchym Toušek <enumag@gmail.com>
+ */
+class DoctrineExtensionTest extends Test
+{
+    /**
+     * @expectedException Nette\Utils\AssertionException
+     * @expectedExceptionMessage Subscribers support requires 'Arachne\ContainerAdapter\DI\ContainerAdapterExtension' to be installed and 'Kdyby\Events\DI\EventsExtension' to NOT be installed.
+     */
+    public function testSubscriberException()
+    {
+        $this->createContainer('subscriber-exception.neon');
+    }
+
+    public function testSubscriber()
+    {
+        $container = $this->createContainer('subscriber.neon');
+
+        /* @var $evm EventManager */
+        $evm = $container->getByType(EventManager::class);
+        $this->assertInstanceOf(ContainerAwareEventManager::class, $evm);
+
+        // Ensure laziness.
+        $this->assertFalse($container->isCreated('subscriber'));
+        $evm->dispatchEvent('fooEvent');
+        $this->assertFalse($container->isCreated('subscriber'));
+        $evm->dispatchEvent('barEvent');
+        $this->assertTrue($container->isCreated('subscriber'));
+    }
+
+    private function createContainer($file)
+    {
+        $config = new Configurator();
+        $config->setTempDirectory(TEMP_DIR);
+        $config->addConfig(__DIR__ . '/../config/' . $file, false);
+        return $config->createContainer();
+    }
+}

tests/integration/src/Fixtures/Subscriber.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Tests\Integration\Fixtures;
+
+use Doctrine\Common\EventSubscriber;
+
+/**
+ * @author Jáchym Toušek <enumag@gmail.com>
+ */
+class Subscriber implements EventSubscriber
+{
+    public function getSubscribedEvents()
+    {
+        return [
+            'barEvent',
+        ];
+    }
+
+    public function barEvent()
+    {
+    }
+}