diff --git a/.gitignore b/.gitignore index 7b6b4b82a..0a0909bf2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ local/config/build.properties local/config/config_db.php local/config/build +local/config/database.yml core/vendor local/config/runtime-conf.xml cache/* diff --git a/core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterListenersPass.php b/core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterListenersPass.php index 881ddaceb..d6d73eeea 100644 --- a/core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterListenersPass.php +++ b/core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterListenersPass.php @@ -26,7 +26,12 @@ namespace Thelia\Core\DependencyInjection\Compiler; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; - +/** + * Class RegisterListenersPass + * @package Thelia\Core\DependencyInjection\Compiler + * + * Source code come from Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\RegisterKernelListenersPass class + */ class RegisterListenersPass implements CompilerPassInterface { public function process(ContainerBuilder $container) diff --git a/core/lib/Thelia/Tests/Config/Dumper/TpexConfigDumperTest.php b/core/lib/Thelia/Tests/Config/Dumper/TpexConfigDumperTest.php deleted file mode 100644 index 47cd7d982..000000000 --- a/core/lib/Thelia/Tests/Config/Dumper/TpexConfigDumperTest.php +++ /dev/null @@ -1,46 +0,0 @@ -. */ -/* */ -/*************************************************************************************/ - -namespace Thelia\Tests\Config\Dumper; - -use Thelia\Config\Dumper\TpexConfigDumper; - - -class TpexConfigDumperTest extends \PHPUnit_Framework_TestCase -{ - - static protected $fixturePath; - - public static function setUpBeforeClass() - { - self::$fixturePath = realpath(__DIR__ . "/../Fixtures/Dumper/Config"); - } - - public function testDumpWithEmptyConfig() - { - $tpexDumper = new TpexConfigDumper(array(), array(), array(), array()); - - $this->assertStringEqualsFile(self::$fixturePath . "/Empty.php", $tpexDumper->dump()); - } - -} \ No newline at end of file diff --git a/core/lib/Thelia/Tests/bootstrap.php b/core/lib/Thelia/Tests/bootstrap.php index 4bc8dcffb..1d6317dd3 100644 --- a/core/lib/Thelia/Tests/bootstrap.php +++ b/core/lib/Thelia/Tests/bootstrap.php @@ -8,6 +8,10 @@ $env = "test"; require_once __DIR__ . '/../../../bootstrap.php'; +use Thelia\Core\Thelia; + +$thelia = new Thelia("test", true); + + -\Propel::init(THELIA_ROOT . "/core/lib/Thelia/Tests/Db/thelia-conf.php");