Merge pull request #38 from dominikzogg/simple-drivers

add simple drivers

Author: simensen

README.md

@@ -84,6 +84,14 @@ $container->register(new DoctrineOrmServiceProvider, array(
                 "namespace" => "Bat\Entities",
                 "path" => __DIR__."/src/Bat/Resources/mappings",
             ),
+            // XML/YAML driver (Symfony2 style)
+            // Mapping files can be named like Foo.orm.yml
+            // instead of Baz.Entities.Foo.dcm.yml
+            array(
+                "type" => "simple_yml",
+                "namespace" => "Baz\Entities",
+                "path" => __DIR__."/src/Bat/Resources/config/doctrine",
+            ),
         ),
     ),
 ));
@@ -157,8 +165,10 @@ Configuration
 
      Each mapping definition should be an array with the following
      options:
-     * **type**: Mapping driver type, one of `annotation`, `xml`, `yml` or `php`.
+     * **type**: Mapping driver type, one of `annotation`, `xml`, `yml`, `simple_xml`, `simple_yml` or `php`.
      * **namespace**: Namespace in which the entities reside.
+     
+     *New: the `simple_xml` and `simple_yml` driver types were added in v1.1 and provide support for the [simplified XML driver][8] and [simplified YAML driver][9] of Doctrine.*
 
      Additionally, each mapping definition should contain one of the
      following options:
@@ -337,6 +347,8 @@ Some inspiration was also taken from [Doctrine Bundle][4] and
 [5]: https://github.com/symfony/symfony/tree/master/src/Symfony/Bridge/Doctrine
 [6]: https://packagist.org/packages/dflydev/doctrine-orm-service-provider
 [7]: https://github.com/saxulum/saxulum-doctrine-orm-manager-registry-provider
+[8]: http://docs.doctrine-project.org/en/latest/reference/xml-mapping.html#simplified-xml-driver
+[9]: http://docs.doctrine-project.org/en/latest/reference/yaml-mapping.html#simplified-yaml-driver
 
 [dflydev]: irc://irc.freenode.net/#dflydev
 [silex-php]: irc://irc.freenode.net/#silex-php

changelog.md

@@ -1,5 +1,6 @@
 ## 2.0.x-dev
 
+ * @dominikzogg: Add Simple driver support (#38)
  * @andrewshell: Use Pimple\Container instead of Pimple for $configs (#34)
  * @dominikzogg: Remove Silex tests (#31)
  * @simensen: Purge PSR-0 Resource Locator

src/Dflydev/Provider/DoctrineOrm/DoctrineOrmServiceProvider.php

@@ -28,6 +28,8 @@
 use Doctrine\ORM\Mapping\DefaultNamingStrategy;
 use Doctrine\ORM\Mapping\DefaultQuoteStrategy;
 use Doctrine\ORM\Mapping\Driver\Driver;
+use Doctrine\ORM\Mapping\Driver\SimplifiedXmlDriver;
+use Doctrine\ORM\Mapping\Driver\SimplifiedYamlDriver;
 use Doctrine\ORM\Mapping\Driver\XmlDriver;
 use Doctrine\ORM\Mapping\Driver\YamlDriver;
 use Doctrine\ORM\Mapping\Driver\StaticPHPDriver;
@@ -167,10 +169,18 @@ public function register(Container $container)
                             $driver = new YamlDriver($entity['path']);
                             $chain->addDriver($driver, $entity['namespace']);
                             break;
+                        case 'simple_yml':
+                            $driver = new SimplifiedYamlDriver(array($entity['path'] => $entity['namespace']));
+                            $chain->addDriver($driver, $entity['namespace']);
+                            break;
                         case 'xml':
                             $driver = new XmlDriver($entity['path']);
                             $chain->addDriver($driver, $entity['namespace']);
                             break;
+                        case 'simple_xml':
+                            $driver = new SimplifiedXmlDriver(array($entity['path'] => $entity['namespace']));
+                            $chain->addDriver($driver, $entity['namespace']);
+                            break;
                         case 'php':
                             $driver = new StaticPHPDriver($entity['path']);
                             $chain->addDriver($driver, $entity['namespace']);