fix cach & fix #398 move service fallback

lib/Alchemy/Phrasea/Controller/Prod/Basket.php

@@ -479,10 +479,12 @@ class Basket implements ControllerProviderInterface
               $basket = $em->getRepository('\Entities\Basket')
           ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser());
 
+              if ($basket->getIsRead() === false)
+              {
+                $basket = $em->merge($basket);
                 $basket->setIsRead(true);
-
-        $em->merge($basket);
                 $em->flush();
+              }
 
               /* @var $twig \Twig_Environment */
               $twig = $app['Core']->getTwig();

lib/Alchemy/Phrasea/Core/Service/Cache/MemcacheCache.php

@@ -65,15 +65,14 @@ class MemcacheCache extends ServiceAbstract implements ServiceInterface
 
     $stats = @$memcache->getExtendedStats();
 
-    if ($stats[$key])
+    if (isset($stats[$key]) && @$memcache->connect($this->host, $this->port))
     {
-      $memcache->connect($this->host, $this->port);
       $service = new CacheService\MemcacheCache();
       $service->setMemcache($memcache);
     }
     else
     {
-      $service = new CacheService\ArrayCache();
+      throw new \Exception(sprintf("Memcache instance with host '%s' and port '%s' is not reachable", $this->host, $this->port));
     }
 
     $registry = $this->getRegistry();

lib/Alchemy/Phrasea/Core/Service/Cache/RedisCache.php

@@ -72,7 +72,7 @@ class RedisCache extends ServiceAbstract implements ServiceInterface
     }
     else
     {
-      $service = new CacheService\ArrayCache();
+      throw new \Exception(sprintf("Redis instance with host '%s' and port '%s' is not reachable", $this->host, $this->port));
     }
 
     $registry = $this->getRegistry();

lib/Alchemy/Phrasea/Core/Service/Orm/Doctrine.php

@@ -338,14 +338,17 @@ class Doctrine extends ServiceAbstract implements ServiceInterface
    */
   private function getCache($cacheDoctrine, $serviceName = null)
   {
-    if (null === $serviceName)
+    $defaultServiceName = 'default_cache';
-    {
+    $defaultConfiguration = new ParameterBag(array(
-      $serviceName = 'default_cache';
-      $configuration = new ParameterBag(array(
                 'type' => self::ARRAYCACHE
                 , 'options' => array()
                     )
     );
+
+    if (null === $serviceName)
+    {
+      $serviceName = $defaultServiceName;
+      $configuration = $defaultConfiguration;
     }
     else
     {
@@ -382,6 +385,8 @@ class Doctrine extends ServiceAbstract implements ServiceInterface
 
     $registry = $this->getDependency("registry");
 
+    try
+    {
       $serviceBuilder = new Core\ServiceBuilder\Cache(
                       $serviceName,
                       $configuration,
@@ -390,9 +395,24 @@ class Doctrine extends ServiceAbstract implements ServiceInterface
 
       $service = $serviceBuilder->buildService();
 
+      $cacheService = $service->getService();
+    }
+    catch (\Exception $e)
+    {
+      $serviceBuilder = new Core\ServiceBuilder\Cache(
+                      $defaultServiceName,
+                      $defaultConfiguration,
+                      array("registry" => $registry)
+      );
+
+      $service = $serviceBuilder->buildService();
+
+      $cacheService = $service->getService();
+    }
+
     $this->cacheServices[$cacheDoctrine] = $service;
     
-    return $service->getService();
+    return $cacheService;
   }
 
   private function getLog($serviceName)

lib/Alchemy/Phrasea/Core/Service/TemplateEngine/Twig.php

@@ -34,7 +34,7 @@ class Twig extends ServiceAbstract implements ServiceInterface
 
     try
     {
-      if(!$this->options['debug'])
+      if(!isset($this->options['debug']) || !$this->options['debug'])
       {
         $this->options['cache'] = realpath( __DIR__ . '/../../../../../../tmp/cache_twig/');
       }

lib/Doctrine/Repositories/BasketElementRepository.php

@@ -155,8 +155,6 @@ class BasketElementRepository extends EntityRepository
       throw new \Exception_Forbidden(_('You have not access to this basket element'));
     }
 
-    $element = $this->_em->merge($element);
-
     return $element;
   }
 

lib/Doctrine/Repositories/BasketRepository.php

@@ -56,7 +56,8 @@ class BasketRepository extends EntityRepository
 
     $query = $this->_em->createQuery($dql);
     $query->setParameters(array('usr_id' => $user->get_id()));
-    $idCache = "_active_by_user_" . ($sort === null ? "nosort" : $sort) . "_" . $user->get_id(). Entities\Basket::CACHE_SUFFIX;
+    $idCache = "_active_by_user_" . ($sort === null ? "" : $sort ) . "_" . $user->get_id(). Entities\Basket::CACHE_SUFFIX;
+    
     $query->useResultCache(true, 1800, $idCache);
 
     return $query->getResult();
@@ -80,7 +81,9 @@ class BasketRepository extends EntityRepository
 
     $query = $this->_em->createQuery($dql);
     $query->setParameters(array('usr_id' => $user->get_id()));
-    $idCache = "_unread_active_by_user_" . $user->get_id() . Entities\Basket::CACHE_SUFFIX;
+    
+    $idCache = "findUnreadActiveByUser" . $user->get_id() . Entities\Basket::CACHE_SUFFIX;
+    
     $query->useResultCache(true, 1800, $idCache);
 
     return $query->getResult();
@@ -100,8 +103,8 @@ class BasketRepository extends EntityRepository
             JOIN b.elements e
             JOIN b.validation s
             JOIN s.participants p
-            WHERE b.usr_id != ?1 AND p.usr_id = ?2';
+            WHERE b.usr_id != ?1 AND p.usr_id = ?2
-//@todo implements expires session  AND s.expires > CURRENT_TIMESTAMP()';
+             AND (s.expires IS NULL OR s.expires > CURRENT_TIMESTAMP()) ';
     
     if ($sort == 'date')
     {
@@ -156,8 +159,6 @@ class BasketRepository extends EntityRepository
       throw new \Exception_Forbidden(_('You have not access to this basket'));
     }
 
-    $basket = $this->_em->merge($basket);
-
     return $basket;
   }
 
@@ -254,7 +255,9 @@ class BasketRepository extends EntityRepository
 
     $count = Paginate::getTotalQueryResults($query);
     $paginateQuery = Paginate::getPaginateQuery($query, $offset, $perPage);
+    
     $idCache = "_" . $type . "_workzone_basket_" . $user->get_id() . Entities\Basket::CACHE_SUFFIX;
+    
     $paginateQuery->useResultCache(true, 1800, $idCache);
     $result = $paginateQuery->getResult();