Merge pull request #4 from Ocramius/hotfix/issue-#2

Hotfix/issue #2
Ocramius · Mar 9, 2013 · 5fff76b · 5fff76b
2 parents f6c44b7 + 5901095
commit 5fff76b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -17,6 +17,8 @@ Following steps are necessary to get this project working (considering a zf2-ske
 
   1. add `"ocramius/zf-phpcr-odm": "dev-master"` to your `composer.json` (`"minimum-stability": "dev"` is also required)
   2. Add `DoctrineModule` and `ZfPhpcrOdm` to the enabled modules list
+  3. create directory `my/project/directory/data/ZfPhpcrOdm/Proxy` and make sure your application has write
+          access to it. This directory can be changed using the module options.
 
 ## Usage
 

diff --git a/composer.json b/composer.json
@@ -13,20 +13,20 @@
     "homepage": "http://www.doctrine-project.org/",
     "authors": [
         {
-            "name": "Marco Pivetta",
-            "email": "ocramius@gmail.com",
+            "name":     "Marco Pivetta",
+            "email":    "ocramius@gmail.com",
             "homepage": "http://marco-pivetta.com/"
         }
     ],
     "require": {
-        "php": ">=5.3.3",
-        "doctrine/phpcr-odm": "dev-master",
-        "jackalope/jackalope-jackrabbit": "dev-master",
+        "php":                               ">=5.3.3",
+        "doctrine/phpcr-odm":                "dev-master",
+        "jackalope/jackalope-jackrabbit":    "dev-master",
         "jackalope/jackalope-doctrine-dbal": "dev-master",
-        "doctrine/doctrine-module": "dev-master"
+        "doctrine/doctrine-module":          "~0.7"
     },
     "suggest": {
-        "midgard/phpcr": "Midgard2 adapter for PHPCR if you want to use midgard instead of dbal or jackrabbit",
+        "midgard/phpcr":             "Midgard2 adapter for PHPCR if you want to use midgard instead of dbal or jackrabbit",
         "ocramius/ocra-di-compiler": "Since the module uses Zend\\Di extensively, consider compiling it with OcraDiCompiler"
     },
     "autoload": {

diff --git a/config/module.config.php b/config/module.config.php
@@ -334,8 +334,8 @@
             'zfphpcrodm-configuration' => array(
                 'parameters' => array(
                     'metadataDriverImpl' => 'zfphpcrodm-metadatadriver',
-                    'proxyNamespace' => 'ZfPhpcrOdmSample\Proxy',
-                    'proxyDir' => __DIR__ . '/../src/ZfPhpcrOdmSample/Proxy',
+                    'proxyNamespace' => 'ZfPhpcrOdm\Proxy',
+                    'proxyDir' => 'data/ZfPhpcrOdm/Proxy',
                 ),
             ),
 

diff --git a/src/ZfPhpcrOdm/Module.php b/src/ZfPhpcrOdm/Module.php
@@ -5,6 +5,7 @@
 use Zend\ModuleManager\Feature\BootstrapListenerInterface;
 use Zend\EventManager\Event;
 use Zend\EventManager\EventInterface;
+use Doctrine\Common\Annotations\AnnotationRegistry;
 
 /**
  * Module that provides a PHPCR ODM DocumentManager
@@ -24,7 +25,7 @@ public function getConfig()
     /**
      * {@inheritDoc}
      */
-    public function onBootstrap(Event $e)
+    public function onBootstrap(EventInterface $e)
     {
         /* @var $app \Zend\Mvc\ApplicationInterface */
         $app = $e->getTarget();