TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some CS

Browse Source
This commit is contained in:
Manuel Raynaud
2013-01-09 09:13:25 +01:00
parent a168082d54
commit 4e21c25867
26 changed files with 422 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/lib/Thelia/Core/Bundle/LoggerBundle.php
View File

@@ -42,25 +42,24 @@ class LoggerBundle extends Bundle
/**
*
* Construct the depency injection builder
*
*
* Reference all Model in the Container here
*
* @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
*/
public function build(ContainerBuilder $container)
{
{
$container->setParameter("logger.class", "\Thelia\Log\Tlog");
$container->register("logger","%logger.class%")
->addArgument(new Reference('service_container'));
$kernel = $container->get('kernel');
if($kernel->isDebug())
{
if ($kernel->isDebug()) {
// $debug = function ($query, $parameters)
// {
//
//
// $pattern = '(^' . preg_quote(dirname(__FILE__)) . '(\\.php$|[/\\\\]))'; // can be static
// foreach (debug_backtrace() as $backtrace) {
// if (isset($backtrace["file"]) && !preg_match($pattern, $backtrace["file"])) { // stop on first file outside NotORM source codes
@@ -69,12 +68,12 @@ class LoggerBundle extends Bundle
// }
// file_put_contents(THELIA_ROOT . 'log/request_debug.log', "$backtrace[file]:$backtrace[line]:$query", FILE_APPEND);
// file_put_contents(THELIA_ROOT . 'log/request_debug.log', is_scalar($parameters) ? $parameters : print_r($parameters, true), FILE_APPEND);
//
//
// };
//
//
// $container->getDefinition('database')
// ->addMethodCall('setDebug', array($debug));
$container->get('database')
->setLogger($container->get('logger'));
}

7
core/lib/Thelia/Core/Bundle/ModelBundle.php
View File

@@ -43,16 +43,15 @@ class ModelBundle extends Bundle
/**
*
* Construct the depency injection builder
*
*
* Reference all Model in the Container here
*
* @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
*/
public function build(ContainerBuilder $container)
{
foreach(DIGenerator::genDiModel(realpath(THELIA_ROOT . "core/lib/Thelia/Model"), array('Base')) as $name => $class)
{
{
foreach (DIGenerator::genDiModel(realpath(THELIA_ROOT . "core/lib/Thelia/Model"), array('Base')) as $name => $class) {
$container->register('model.'.$name, $class)
->addArgument(new Reference("database"));
}

34
core/lib/Thelia/Core/Bundle/NotORMBundle.php
View File

@@ -26,8 +26,6 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Reference;
use Thelia\Log\Tlog;
/**
* First Bundle use in Thelia
* It initialize dependency injection container.
@@ -53,20 +51,18 @@ class NotORMBundle extends Bundle
$config = array(
// \PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION
);
$kernel = $container->get('kernel');
$pdo = new \PDO(THELIA_DB_DSN,THELIA_DB_USER, THELIA_DB_PASSWORD, $config);
$pdo->exec("SET NAMES UTF8");
$container->register('database','\Thelia\Database\NotORM')
->addArgument($pdo);
if(defined('THELIA_DB_CACHE') && !$kernel->isDebug())
{
switch(THELIA_DB_CACHE)
{
if (defined('THELIA_DB_CACHE') && !$kernel->isDebug()) {
switch (THELIA_DB_CACHE) {
case 'file':
$container->register('database_cache','\NotORM_Cache_File')
->addArgument($kernel->getCacheDir().'/database.php');
@@ -76,8 +72,7 @@ class NotORMBundle extends Bundle
->addArgument($kernel->getCacheDir().'/database_include.php');
break;
case 'apc':
if (extension_loaded('apc'))
{
if (extension_loaded('apc')) {
$container->register('database_cache','\NotORM_Cache_APC');
}
break;
@@ -85,24 +80,19 @@ class NotORMBundle extends Bundle
$container->register('database_cache','\NotORM_Cache_Session');
break;
case 'memcache':
if(class_exists('Memcache'))
{
if (class_exists('Memcache')) {
$container->register('database_cache','\NotORM_Cache_Memcache')
->addArgument(new \Memcache());
}
break;
}
if($container->hasDefinition('database_cache'))
{
if ($container->hasDefinition('database_cache')) {
$container->getDefinition('database')
->addMethodCall('setCache', array(new Reference('database_cache')));
}
}
}
}

6
core/lib/Thelia/Core/Bundle/TheliaBundle.php
View File

@@ -75,7 +75,7 @@ class TheliaBundle extends Bundle
$container->register('listener.router', 'Symfony\Component\HttpKernel\EventListener\RouterListener')
->setArguments(array(new Reference('matcher')))
;
/**
* @TODO add an other listener on kernel.request for checking some params Like check if User is log in, set the language and other.
*
@@ -91,14 +91,14 @@ class TheliaBundle extends Bundle
->addArgument(new Reference('parser'))
;
$container->register('dispatcher','Symfony\Component\EventDispatcher\EventDispatcher')
->addArgument(new Reference('service_container'))
->addMethodCall('addSubscriber', array(new Reference('listener.router')))
->addMethodCall('addSubscriber', array(new Reference('thelia.listener.view')))
;
$container->register('http_kernel','Thelia\Core\TheliaHttpKernel')
->addArgument(new Reference('dispatcher'))
->addArgument(new Reference('service_container'))

14
core/lib/Thelia/Core/Template/Parser.php
View File

@@ -55,9 +55,9 @@ class Parser implements ParserInterface
protected $status = 200;
/**
*
*
* @param type $container
*
*
* public function __construct(ContainerBuilder $container)
*/
public function __construct(ContainerInterface $container)
@@ -73,15 +73,15 @@ class Parser implements ParserInterface
public function getContent()
{
$this->loadParser();
$request = $this->container->get('request');
$this->content = $request->get("test");
$config = $this->container->get("model.config");
echo $config->read("toto","tutu");
return $this->content;
}

12
core/lib/Thelia/Core/Thelia.php
View File

@@ -52,7 +52,7 @@ class Thelia extends Kernel
//$this->container->set('kernel', $this);
}
/**
* Gets the cache directory.
*
@@ -62,15 +62,14 @@ class Thelia extends Kernel
*/
public function getCacheDir()
{
if(defined('THELIA_ROOT'))
{
if (defined('THELIA_ROOT')) {
return THELIA_ROOT.'cache/'.$this->environment;
} else {
return parent::getCacheDir();
}
}
/**
* Gets the log directory.
*
@@ -80,8 +79,7 @@ class Thelia extends Kernel
*/
public function getLogDir()
{
if(defined('THELIA_ROOT'))
{
if (defined('THELIA_ROOT')) {
return THELIA_ROOT.'log/';
} else {
return parent::getLogDir();

7
core/lib/Thelia/Core/TheliaHttpKernel.php
View File

@@ -30,7 +30,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
/**
*
*
* @author Manuel Raynaud <mraynaud@openstudio.fr>
*/
@@ -42,8 +42,7 @@ class TheliaHttpKernel extends HttpKernel
$this->container = $container;
}
/**
* Handles a Request to convert it to a Response.
*
@@ -80,4 +79,4 @@ class TheliaHttpKernel extends HttpKernel
return $response;
}
}
}