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

Merge branch 'master' into loops

Browse Source 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	install/faker.php
This commit is contained in:
Etienne Roudeix
2013-08-21 09:19:56 +02:00
parent 6a14bef3de a0b82879f5
commit 86b11096ba
3275 changed files with 929970 additions and 274940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
documentation/api/files/Config/DatabaseConfiguration.php.txt Normal file → Executable file
View File

@@ -70,3 +70,4 @@ class DatabaseConfiguration implements ConfigurationInterface
return $treeBuilder;
}
}

7
documentation/api/files/Config/DefinePropel.php.txt Normal file → Executable file
View File

@@ -26,9 +26,8 @@ namespace Thelia\Config;
use Symfony\Component\Config\Definition\Processor;
use Symfony\Component\Config\Definition\ConfigurationInterface;
class DefinePropel {
class DefinePropel
{
private $processorConfig;
public function __construct(ConfigurationInterface $configuration, array $propelConf)
@@ -40,6 +39,7 @@ class DefinePropel {
public function getConfig()
{
$connection = $this->processorConfig["connection"];
return $conf = array(
"dsn" => $connection["dsn"],
"user" => $connection["user"],
@@ -48,3 +48,4 @@ class DefinePropel {
);
}
}