disable proxy regeneration, laod other annotations

sourcefabric · Mar 19, 2015 · 0ff18f0 · 0ff18f0
1 parent a9921ad
commit 0ff18f0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/newscoop/install/Resources/sql/upgrade/4.4.x/2015.03.11/topics.php b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.03.11/topics.php
@@ -4,7 +4,8 @@
 $upgradeErrors = array();
 
 require $newscoopDir.'conf/database_conf.php';
-require_once $newscoopDir.'vendor/autoload.php';
+$loader = require $newscoopDir.'/vendor/autoload.php';
+\Doctrine\Common\Annotations\AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
 
 use Monolog\Logger;
 use Newscoop\NewscoopBundle\Entity\Topic;
@@ -36,6 +37,8 @@
 
 $app->register(new DoctrineOrmServiceProvider(), array(
     "orm.proxies_dir" => $newscoopDir."/library/Proxy",
+    "orm.auto_generate_proxies" => false,
+    "orm.proxies_namespace" => "Proxy",
     "orm.em.options" => array(
         "mappings" => array(
             array(