Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions app/config/config.yml

This file was deleted.

5 changes: 5 additions & 0 deletions app/config/packages/dev/framework.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
framework:
router:
strict_requirements: true
profiler: { only_exceptions: false }
ide: '%env(default::resolve:SYMFONY_IDE)%'
20 changes: 0 additions & 20 deletions app/config/config_dev.yml → app/config/packages/dev/monolog.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
imports:
- { resource: config.yml }

framework:
router:
resource: "%kernel.project_dir%/config/routing_dev.yml"
strict_requirements: true
profiler: { only_exceptions: false }
ide: '%env(default::resolve:SYMFONY_IDE)%'

web_profiler:
toolbar: true
intercept_redirects: false

monolog:
handlers:
main:
Expand All @@ -30,9 +16,3 @@ monolog:
#chromephp:
# type: chromephp
# level: info

parameters:
paybox_ips: [127.0.0.1, 192.168.42.1]

#swiftmailer:
# delivery_address: me@example.com
3 changes: 3 additions & 0 deletions app/config/packages/dev/web_profiler.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
web_profiler:
toolbar: true
intercept_redirects: false
1 change: 0 additions & 1 deletion app/config/packages/framework.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ framework:
default_path: "%kernel.project_dir%/../translations"
secret: "%secret%"
router:
resource: "%kernel.project_dir%/config/routing.yml"
strict_requirements: ~
utf8: true
form: ~
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
imports:
- { resource: config.yml }

#doctrine:
# orm:
# metadata_cache_driver: apc
# result_cache_driver: apc
# query_cache_driver: apc

monolog:
handlers:
main:
Expand Down
2 changes: 2 additions & 0 deletions app/config/packages/test/ewz_recaptcha.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ewz_recaptcha:
enabled: false
4 changes: 4 additions & 0 deletions app/config/packages/test/framework.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
framework:
test: ~
profiler:
collect: false
11 changes: 11 additions & 0 deletions app/config/packages/test/monolog.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
monolog:
handlers:
deprecation_stream:
type: stream
path: "%kernel.logs_dir%/%kernel.environment%.deprecations.log"

deprecation_filter:
type: filter
handler: deprecation_stream
max_level: info
channels: ["php"]
3 changes: 3 additions & 0 deletions app/config/packages/test/web_profiler.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
web_profiler:
toolbar: false
intercept_redirects: false
File renamed without changes.
12 changes: 12 additions & 0 deletions app/config/routes/framework.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
when@dev:
_wdt:
resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml"
prefix: /_wdt

_profiler:
resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
prefix: /_profiler

_errors:
resource: "@FrameworkBundle/Resources/config/routing/errors.xml"
prefix: /_error
14 changes: 0 additions & 14 deletions app/config/routing_dev.yml

This file was deleted.

3 changes: 3 additions & 0 deletions app/config/services.yml → app/config/services.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
imports:
- { resource: config.php }

# Learn more about services, parameters and containers at
# http://symfony.com/doc/current/book/service_container.html
parameters:
Expand Down
2 changes: 2 additions & 0 deletions app/config/services_dev.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
parameters:
paybox_ips: [127.0.0.1, 192.168.42.1]
28 changes: 0 additions & 28 deletions app/config/config_test.yml → app/config/services_test.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
imports:
- { resource: config_dev.yml }

framework:
test: ~
profiler:
collect: false

web_profiler:
toolbar: false
intercept_redirects: false

parameters:
database_host: dbtest
database_port: 3306
Expand Down Expand Up @@ -38,19 +26,3 @@ services:
PlanetePHP\SymfonyFeedClient:
arguments:
$httpClient: '@planetephp.http_client'

ewz_recaptcha:
enabled: false


monolog:
handlers:
deprecation_stream:
type: stream
path: "%kernel.logs_dir%/%kernel.environment%.deprecations.log"

deprecation_filter:
type: filter
handler: deprecation_stream
max_level: info
channels: ["php"]
6 changes: 0 additions & 6 deletions sources/AppBundle/AppKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use AppBundle\DependencyInjection\ControllersWithEventSelectorPass;
use AppBundle\DependencyInjection\TingRepositoryPass;
use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
use Symfony\Component\Config\Loader\LoaderInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\Kernel;

Expand All @@ -30,11 +29,6 @@ public function getLogDir(): string
return __DIR__ . '/../../var/logs';
}

public function registerContainerConfiguration(LoaderInterface $loader): void
{
$loader->load(__DIR__ . '/../../app/config/config_' . $this->getEnvironment() . '.yml');
}

protected function build(ContainerBuilder $container): void
{
$container->addCompilerPass(new TingRepositoryPass());
Expand Down
Loading