Refactoring

DependencyInjection/CompilerPass/DetectConnectionPass.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * SimpleThings TransactionalBundle
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to kontakt@beberlei.de so I can send you a copy immediately.
+ */
+
+namespace SimpleThings\TransactionalBundle\DependencyInjection\CompilerPass;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\DefinitionDecorator;
+
+/**
+ * Detects connections and registers the transaction manager services.
+ */
+class DetectConnectionPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $builder)
+    {
+        if ($builder->hasParameter('doctrine.connections')) {
+            foreach ($builder->getParameter('doctrine.connections') AS $alias => $service) {
+                $builder->setDefinition(
+                    'simple_things_transactional.tx.dbal.'.$alias,
+                    new DefinitionDecorator('simple_things_transactional.provider.dbal')
+                )->setArguments(array(new Reference($service)));
+            }
+        }
+
+        if ($builder->hasParameter('doctrine.entity_managers')) {
+            foreach ($builder->getParameter('doctrine.entity_managers') AS $alias => $service) {
+                $builder->setDefinition(
+                    'simple_things_transactional.tx.orm.'.$alias,
+                    new DefinitionDecorator('simple_things_transactional.provider.orm')
+                )->setArguments(array(new Reference('service_container')));
+            }
+        }
+
+        if ($builder->hasParameter('doctrine_couchdb.document_managers')) {
+            foreach ($builder->getParameter('doctrine_couchdb.document_managers') AS $alias => $service) {
+                $builder->setDefinition(
+                    'simple_things_transactional.tx.couchdb.'.$alias,
+                    new DefinitionDecorator('simple_things_transactional.provider.object_manager')
+                )->setArguments(array(new Reference('service_container')));
+            }
+        }
+
+        if ($builder->hasParameter('doctrine_mongodb.document_managers')) {
+            foreach ($builder->getParameter('doctrine_mongodb.document_managers') AS $alias => $service) {
+                $builder->setDefinition(
+                    'simple_things_transactional.tx.mongodb.'.$alias,
+                    new DefinitionDecorator('simple_things_transactional.provider.object_manager')
+                )->setArguments(array(new Reference('service_container')));
+            }
+        }
+    }
+}
+

DependencyInjection/SimpleThingsTransactionalExtension.php

@@ -15,11 +15,10 @@
 namespace SimpleThings\TransactionalBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use SimpleThings\TransactionalBundle\Transactions\TransactionDefinition;
 
 class SimpleThingsTransactionalExtension extends Extension
@@ -48,11 +47,8 @@ public function load(array $configs, ContainerBuilder $builder)
         $config['defaults'] = array_merge(array(
                 'conn' => array(),
                 'pattern' => '.*',
-                'propagation' => TransactionDefinition::PROPAGATION_REQUIRED,
-                'isolation' => TransactionDefinition::ISOLATION_DEFAULT,
                 'noRollbackFor' => array(),
                 'methods' => array('POST', 'PUT', 'DELETE', 'PATCH'),
-                'subrequest' => false,
             ), $config['defaults']);
 
         if (isset($config['auto_transactional']) && $config['auto_transactional']) {
@@ -75,40 +71,5 @@ public function load(array $configs, ContainerBuilder $builder)
         $def = $builder->getDefinition('simple_things_transactional.transactional_matcher');
         $def->setArguments($args);
 
-        if ($builder->hasParameter('doctrine.connections')) {
-            foreach ($builder->getParameter('doctrine.connections') AS $alias => $service) {
-                $builder->setDefinition(
-                    'simple_things_transactional.tx.dbal.'.$alias,
-                    new DefinitionDecorator('simple_things_transactional.manager.dbal')
-                )->setArguments(array(new Reference($service)));
-            }
-        }
-
-        if ($builder->hasParameter('doctrine.entity_managers')) {
-            foreach ($builder->getParameter('doctrine.entity_managers') AS $alias => $service) {
-                $builder->setDefinition(
-                    'simple_things_transactional.tx.orm.'.$alias,
-                    new DefinitionDecorator('simple_things_transactional.manager.orm')
-                )->setArguments(array(new Reference('doctrine'), $alias));
-            }
-        }
-
-        if ($builder->hasParameter('doctrine_couchdb.document_managers')) {
-            foreach ($builder->getParameter('doctrine_couchdb.document_managers') AS $alias => $service) {
-                $builder->setDefinition(
-                    'simple_things_transactional.tx.couchdb.'.$alias,
-                    new DefinitionDecorator('simple_things_transactional.manager.couchdb')
-                )->setArguments(array(new Reference($service)));
-            }
-        }
-
-        if ($builder->hasParameter('doctrine_mongodb.document_managers')) {
-            foreach ($builder->getParameter('doctrine_mongodb.document_managers') AS $alias => $service) {
-                $builder->setDefinition(
-                    'simple_things_transactional.tx.mongodb.'.$alias,
-                    new DefinitionDecorator('simple_things_transactional.manager.mongodb')
-                )->setArguments(array(new Reference($service)));
-            }
-        }
     }
-}
+}

Doctrine/DBALTransactionProvider.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * SimpleThings TransactionalBundle
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to kontakt@beberlei.de so I can send you a copy immediately.
+ */
+
+namespace SimpleThings\TransactionalBundle\Doctrine;
+
+use SimpleThings\TransactionalBundle\Transactions\TransactionStatus;
+use SimpleThings\TransactionalBundle\Transactions\TransactionDefinition;
+use SimpleThings\TransactionalBundle\Transactions\TransactionProviderInterface;
+
+/**
+ * Doctrine DBAL Transaction Provider
+ */
+class DBALTransactionProvider implements TransactionProviderInterface
+{
+    /**
+     * @var ContainerInterface
+     */
+    protected $container;
+
+    public function __construct($container)
+    {
+        $this->container = $container;
+    }
+
+    /**
+     * Get a transaction status object.
+     *
+     * @param TransactionDefinition $def
+     * @return TransactionStatus
+     */
+    public function createTransaction(TransactionDefinition $def)
+    {
+        $conn = $this->container->get('doctrine.' . $def->getConnectionName().'_connection');
+        return new DBALTransactionStatus($conn, $def);
+    }
+}
+