Drop injection of DaoFactory

thecodingmachine · Mar 11, 2016 · a49364b · a49364b
1 parent a387bbe
commit a49364b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 44 deletions.
diff --git a/src/Mouf/Mvc/Splash/Services/SplashCreateControllerService.php b/src/Mouf/Mvc/Splash/Services/SplashCreateControllerService.php
@@ -23,11 +23,10 @@ class SplashCreateControllerService
      * @param string $namespace
      * @param string $injectLogger
      * @param string $injectTemplate
-     * @param string $injectDaoFactory
      * @param array  $actions
      */
     public function generate(MoufManager $moufManager, $controllerName, $instanceName, $namespace, $injectLogger = false,
-            $injectTemplate = false, $injectDaoFactory = false, $actions = array())
+            $injectTemplate = false, $actions = array())
     {
         $namespace = rtrim($namespace, '\\').'\\';
 
@@ -48,10 +47,6 @@ public function generate(MoufManager $moufManager, $controllerName, $instanceNam
 
         $namespace = trim($namespace, '\\');
 
-        if (!file_exists(ROOT_PATH.'../database.tdbm') && $injectDaoFactory) {
-            $injectDaoFactory = false;
-        }
-
         // Check that instance does not already exists
         if ($moufManager->has($instanceName)) {
             $errors['instanceError'] = 'This instance already exists.';
@@ -137,12 +132,6 @@ public function generate(MoufManager $moufManager, $controllerName, $instanceNam
     ?>
 use Psr\Log\LoggerInterface;
 <?php 
-}
-                ?>
-<?php if ($injectDaoFactory) {
-    ?>
-use <?= $moufManager->getVariable('tdbmDefaultDaoNamespace').'\\'.$moufManager->getVariable('tdbmDefaultDaoFactoryName') ?>;
-<?php 
 }
                 ?>
 <?php if ($injectTwig) {
@@ -201,17 +190,6 @@ class <?= $controllerName ?> extends Controller {
      */
     private $content;
 
-<?php 
-}
-                ?>
-<?php if ($injectDaoFactory) {
-    ?>
-    /**
-     * The DAO factory object.
-     * @var DaoFactory
-     */
-    private $daoFactory;
-
 <?php 
 }
                 ?>
@@ -237,9 +215,6 @@ class <?= $controllerName ?> extends Controller {
                     echo "     * @param TemplateInterface \$template The template used by this controller\n";
                     echo "     * @param HtmlBlock \$content The main content block of the page\n";
                 }
-                if ($injectDaoFactory) {
-                    echo "     * @param DaoFactory \$daoFactory The object in charge of retrieving DAOs\n";
-                }
                 if ($injectTwig) {
                     echo "     * @param Twig_Environment \$twig The Twig environment (used to render Twig templates)\n";
                 }
@@ -254,9 +229,6 @@ public function __construct(<?php
                     $parameters[] = 'TemplateInterface $template';
                     $parameters[] = 'HtmlBlock $content';
                 }
-                if ($injectDaoFactory) {
-                    $parameters[] = 'DaoFactory $daoFactory';
-                }
                 if ($injectTwig) {
                     $parameters[] = 'Twig_Environment $twig';
                 }
@@ -271,11 +243,6 @@ public function __construct(<?php
                     ?>
         $this->template = $template;
         $this->content = $content;
-<?php 
-                }
-                if ($injectDaoFactory) {
-                    ?>
-        $this->daoFactory = $daoFactory;
 <?php 
                 }
                 if ($injectTwig) {
@@ -408,11 +375,6 @@ public function <?= $action['method'] ?>(<?php
                         $controllerInstance->getProperty('content')->setValue($moufManager->getInstanceDescriptor('block.content'));
                     }
                 }
-                if ($injectDaoFactory) {
-                    if ($moufManager->has('daoFactory')) {
-                        $controllerInstance->getProperty('daoFactory')->setValue($moufManager->getInstanceDescriptor('daoFactory'));
-                    }
-                }
                 if ($injectTwig) {
                     if ($moufManager->has('twigEnvironment')) {
                         $controllerInstance->getProperty('twig')->setValue($moufManager->getInstanceDescriptor('twigEnvironment'));

diff --git a/src/views/admin/createController.php b/src/views/admin/createController.php
@@ -3,8 +3,7 @@
 
 <script type="text/javascript">
 globalData = <?php echo json_encode(array(
-    'namespace' => $this->controllerNamespace,
-    'tdbmExists' => file_exists(ROOT_PATH.'../database.tdbm'),
+    'namespace' => $this->controllerNamespace
 )); ?>
 </script>
 
@@ -52,9 +51,6 @@
 	    <label class="checkbox inline">
 	    	<input type="checkbox" ng-model="injectTemplate" /> Template and content block
 	    </label>
-	    <label class="checkbox inline" ng-show="tdbmExists">
-	    	<input type="checkbox" ng-model="injectDaoFactory" /> DAO Factory
-	    </label>
 	</div>
 </div>