Merge branch 'propel' of ssh://gitmraynaud:10022/thelia into propel

core/bootstrap.php

@@ -1,9 +1,5 @@
 <?php
 
-if (!isset($env)) {
-    $env = 'prod';
-}
-
 /**
  *
  * @file
@@ -16,8 +12,7 @@ $loader = require __DIR__ . '/autoload.php';
 
 
 
-if(file_exists(THELIA_ROOT . '/local/config/config_db.php'))
-{
+if (file_exists(THELIA_ROOT . '/local/config/config_db.php')) {
     require THELIA_ROOT . '/local/config/config_db.php';
 } else {
     define('THELIA_INSTALL_MODE',true);

core/lib/Thelia/Core/Thelia.php

@@ -51,6 +51,9 @@ class Thelia extends Kernel
     
     protected function initPropel()
     {
+        if (file_exists(THELIA_ROOT . '/local/config/config_db.php') === false) {
+            return ;
+        }
         Propel::init(THELIA_CONF_DIR . "/config_thelia.php");
         
         if ($this->isDebug()) {
@@ -64,35 +67,16 @@ class Thelia extends Kernel
             $con->useDebug(true);
         }
     }
+
     /**
-     * Initializes the service container.
-     *
-     * @TODO cache container initialization
-     *
-     * The cached version of the service container is used when fresh, otherwise the
-     * container is built.
+     * 
+     * Load some configuration 
+     * Initialize all plugins
+     * 
      */
-//    protected function initializeContainer()
-//    {
-//        $class = $this->getContainerClass();
-//        $cache = new ConfigCache($this->getCacheDir().'/'.$class.'.php', $this->debug);
-//        $fresh = true;
-//        if (!$cache->isFresh()) {
-//            $container = $this->buildContainer();
-//            $this->dumpContainer($cache, $container, $class, $this->getContainerBaseClass());
-//
-//            $fresh = false;
-//        }
-//
-//        require_once $cache;
-//        
-//        $this->container = new $class();
-//
-//        if (!$fresh && $this->container->has('cache_warmer')) {
-//            $this->container->get('cache_warmer')->warmUp($this->container->getParameter('kernel.cache_dir'));
-//        }
-//
-//    }
+    public function loadConfiguration(){
+        
+    }
 
     /**
      * Gets the cache directory.

web/index.php

@@ -10,7 +10,7 @@ require __DIR__ . '/../core/bootstrap.php';
 
 $request = Request::createFromGlobals();
 
-$thelia = new Thelia($env, false);
+$thelia = new Thelia("prod", false);
 
 $response = $thelia->handle($request)->prepare($request)->send();
 

web/index_dev.php

@@ -19,7 +19,7 @@ if ( false === in_array($request->getClientIp(), $trustIp)) {
     //change request to send to a 404 error page
 }
 
-$thelia = new Thelia($env, true);
+$thelia = new Thelia("dev", true);
 
 $response = $thelia->handle($request)->prepare($request)->send();