diff --git a/DependencyInjection/ChillReportExtension.php b/DependencyInjection/ChillReportExtension.php index 98bd59c98..e0b7406f1 100644 --- a/DependencyInjection/ChillReportExtension.php +++ b/DependencyInjection/ChillReportExtension.php @@ -7,6 +7,7 @@ use Symfony\Component\Config\FileLocator; use Symfony\Component\HttpKernel\DependencyInjection\Extension; use Symfony\Component\DependencyInjection\Loader; use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface; +use Chill\MainBundle\DependencyInjection\MissingBundleException; /** * This is the class that loads and manages your bundle configuration diff --git a/Tests/Controller/DefaultControllerTest.php b/Tests/Controller/DefaultControllerTest.php deleted file mode 100644 index 3ab2fb41c..000000000 --- a/Tests/Controller/DefaultControllerTest.php +++ /dev/null @@ -1,17 +0,0 @@ -request('GET', '/hello/Fabien'); - - $this->assertTrue($crawler->filter('html:contains("Hello Fabien")')->count() > 0); - } -} diff --git a/Tests/Fixtures/App/AppKernel.php b/Tests/Fixtures/App/AppKernel.php index 4874b2330..20f9a4bd5 100644 --- a/Tests/Fixtures/App/AppKernel.php +++ b/Tests/Fixtures/App/AppKernel.php @@ -11,6 +11,8 @@ class AppKernel extends Kernel new Symfony\Bundle\FrameworkBundle\FrameworkBundle(), new Chill\ReportBundle\ChillReportBundle(), new Symfony\Bundle\TwigBundle\TwigBundle(), + new Chill\CustomFieldsBundle\ChillCustomFieldsBundle(), + new Doctrine\Bundle\DoctrineBundle\DoctrineBundle() ); } diff --git a/Tests/Fixtures/App/config/config.yml b/Tests/Fixtures/App/config/config.yml index e0b6e919f..49bf26edf 100644 --- a/Tests/Fixtures/App/config/config.yml +++ b/Tests/Fixtures/App/config/config.yml @@ -1,4 +1,6 @@ -# config/config.yml +imports: + - { resource: parameters.yml } + framework: secret: Not very secret router: { resource: "%kernel.root_dir%/config/routing.yml" } @@ -9,4 +11,17 @@ framework: translator: { fallback: fr } profiler: { only_exceptions: false } templating: #required for assetic. Remove if not needed - engines: ['twig'] \ No newline at end of file + engines: ['twig'] + +doctrine: + dbal: + driver: pdo_pgsql + host: "%database_host%" + port: "%database_port%" + dbname: "%database_name%" + user: "%database_user%" + password: "%database_password%" + charset: UTF8 + orm: + auto_generate_proxy_classes: "%kernel.debug%" + auto_mapping: true \ No newline at end of file diff --git a/Tests/Fixtures/App/config/parameters.yml b/Tests/Fixtures/App/config/parameters.yml new file mode 100644 index 000000000..fa3e55dae --- /dev/null +++ b/Tests/Fixtures/App/config/parameters.yml @@ -0,0 +1,6 @@ +parameters: + database_host: 127.0.0.1 + database_port: 5434 + database_name: symfony + database_user: symfony + database_password: symfony \ No newline at end of file diff --git a/Tests/Fixtures/App/config/parameters.yml.dist b/Tests/Fixtures/App/config/parameters.yml.dist new file mode 100644 index 000000000..fa3e55dae --- /dev/null +++ b/Tests/Fixtures/App/config/parameters.yml.dist @@ -0,0 +1,6 @@ +parameters: + database_host: 127.0.0.1 + database_port: 5434 + database_name: symfony + database_user: symfony + database_password: symfony \ No newline at end of file diff --git a/Tests/Fixtures/App/config/routing.yml b/Tests/Fixtures/App/config/routing.yml index e525ae9d4..e69de29bb 100644 --- a/Tests/Fixtures/App/config/routing.yml +++ b/Tests/Fixtures/App/config/routing.yml @@ -1 +0,0 @@ -routing.yml \ No newline at end of file diff --git a/composer.json b/composer.json index 819cdd1ce..f4ccd8fd4 100644 --- a/composer.json +++ b/composer.json @@ -25,6 +25,10 @@ "doctrine/dbal": "2.5.*@dev", "doctrine/orm": "2.5.*@dev", "doctrine/common": "2.4.*@dev", - "doctrine/doctrine-bundle": "~1.2@dev" + "doctrine/doctrine-bundle": "~1.2@dev", + "chill-project/main": "dev-master", + "chill-project/custom-fields": "dev-master" + }, + "require-dev": { } }