From 74cd97e75b1dce43a05d8e15e9fbccf01e833b57 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Thu, 2 Oct 2014 00:45:22 +0200 Subject: [ticket/12620] Updates test environment (production => development) PHPBB3-12620 --- tests/bootstrap.php | 2 +- tests/controller/config/development/routing.yml | 3 +++ tests/controller/config/production/routing.yml | 3 --- .../ext/vendor2/bar/config/development/routing.yml | 3 +++ .../ext/vendor2/bar/config/production/routing.yml | 3 --- tests/di/fixtures/config/development/environment.yml | 14 ++++++++++++++ tests/di/fixtures/config/production/environment.yml | 14 -------------- .../ext/vendor/disabled/config/development/environment.yml | 2 ++ .../ext/vendor/disabled/config/production/environment.yml | 2 -- .../vendor/enabled-2/config/development/environment.yml | 2 ++ .../ext/vendor/enabled-2/config/production/environment.yml | 2 -- tests/di/fixtures/other_config/development/environment.yml | 14 ++++++++++++++ tests/di/fixtures/other_config/production/environment.yml | 14 -------------- tests/pagination/config/development/routing.yml | 6 ++++++ tests/pagination/config/production/routing.yml | 6 ------ 15 files changed, 45 insertions(+), 45 deletions(-) create mode 100644 tests/controller/config/development/routing.yml delete mode 100644 tests/controller/config/production/routing.yml create mode 100644 tests/controller/ext/vendor2/bar/config/development/routing.yml delete mode 100644 tests/controller/ext/vendor2/bar/config/production/routing.yml create mode 100644 tests/di/fixtures/config/development/environment.yml delete mode 100644 tests/di/fixtures/config/production/environment.yml create mode 100644 tests/di/fixtures/ext/vendor/disabled/config/development/environment.yml delete mode 100644 tests/di/fixtures/ext/vendor/disabled/config/production/environment.yml create mode 100644 tests/di/fixtures/ext/vendor/enabled-2/config/development/environment.yml delete mode 100644 tests/di/fixtures/ext/vendor/enabled-2/config/production/environment.yml create mode 100644 tests/di/fixtures/other_config/development/environment.yml delete mode 100644 tests/di/fixtures/other_config/production/environment.yml create mode 100644 tests/pagination/config/development/routing.yml delete mode 100644 tests/pagination/config/production/routing.yml diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 229a6ee82b..2fc8858585 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -12,7 +12,7 @@ */ define('IN_PHPBB', true); -define('PHPBB_ENVIRONMENT', 'production'); +define('PHPBB_ENVIRONMENT', 'development'); $phpbb_root_path = 'phpBB/'; $phpEx = 'php'; diff --git a/tests/controller/config/development/routing.yml b/tests/controller/config/development/routing.yml new file mode 100644 index 0000000000..175b11f130 --- /dev/null +++ b/tests/controller/config/development/routing.yml @@ -0,0 +1,3 @@ +core_controller: + pattern: /core_foo + defaults: { _controller: core_foo.controller:bar } diff --git a/tests/controller/config/production/routing.yml b/tests/controller/config/production/routing.yml deleted file mode 100644 index 175b11f130..0000000000 --- a/tests/controller/config/production/routing.yml +++ /dev/null @@ -1,3 +0,0 @@ -core_controller: - pattern: /core_foo - defaults: { _controller: core_foo.controller:bar } diff --git a/tests/controller/ext/vendor2/bar/config/development/routing.yml b/tests/controller/ext/vendor2/bar/config/development/routing.yml new file mode 100644 index 0000000000..85c93b453f --- /dev/null +++ b/tests/controller/ext/vendor2/bar/config/development/routing.yml @@ -0,0 +1,3 @@ +controller3: + pattern: /bar + defaults: { _controller: bar.controller:handle } diff --git a/tests/controller/ext/vendor2/bar/config/production/routing.yml b/tests/controller/ext/vendor2/bar/config/production/routing.yml deleted file mode 100644 index 85c93b453f..0000000000 --- a/tests/controller/ext/vendor2/bar/config/production/routing.yml +++ /dev/null @@ -1,3 +0,0 @@ -controller3: - pattern: /bar - defaults: { _controller: bar.controller:handle } diff --git a/tests/di/fixtures/config/development/environment.yml b/tests/di/fixtures/config/development/environment.yml new file mode 100644 index 0000000000..f2a22ae109 --- /dev/null +++ b/tests/di/fixtures/config/development/environment.yml @@ -0,0 +1,14 @@ +parameters: + core: true + +services: + config.php: + synthetic: true + + dbal.conn: + class: phpbb\db\driver\factory + arguments: + - @service_container + + dispatcher: + class: phpbb\db\driver\container_mock diff --git a/tests/di/fixtures/config/production/environment.yml b/tests/di/fixtures/config/production/environment.yml deleted file mode 100644 index f2a22ae109..0000000000 --- a/tests/di/fixtures/config/production/environment.yml +++ /dev/null @@ -1,14 +0,0 @@ -parameters: - core: true - -services: - config.php: - synthetic: true - - dbal.conn: - class: phpbb\db\driver\factory - arguments: - - @service_container - - dispatcher: - class: phpbb\db\driver\container_mock diff --git a/tests/di/fixtures/ext/vendor/disabled/config/development/environment.yml b/tests/di/fixtures/ext/vendor/disabled/config/development/environment.yml new file mode 100644 index 0000000000..31ada384bf --- /dev/null +++ b/tests/di/fixtures/ext/vendor/disabled/config/development/environment.yml @@ -0,0 +1,2 @@ +parameters: + disabled: true diff --git a/tests/di/fixtures/ext/vendor/disabled/config/production/environment.yml b/tests/di/fixtures/ext/vendor/disabled/config/production/environment.yml deleted file mode 100644 index 31ada384bf..0000000000 --- a/tests/di/fixtures/ext/vendor/disabled/config/production/environment.yml +++ /dev/null @@ -1,2 +0,0 @@ -parameters: - disabled: true diff --git a/tests/di/fixtures/ext/vendor/enabled-2/config/development/environment.yml b/tests/di/fixtures/ext/vendor/enabled-2/config/development/environment.yml new file mode 100644 index 0000000000..feeb5a7a2d --- /dev/null +++ b/tests/di/fixtures/ext/vendor/enabled-2/config/development/environment.yml @@ -0,0 +1,2 @@ +parameters: + enabled_2: true diff --git a/tests/di/fixtures/ext/vendor/enabled-2/config/production/environment.yml b/tests/di/fixtures/ext/vendor/enabled-2/config/production/environment.yml deleted file mode 100644 index feeb5a7a2d..0000000000 --- a/tests/di/fixtures/ext/vendor/enabled-2/config/production/environment.yml +++ /dev/null @@ -1,2 +0,0 @@ -parameters: - enabled_2: true diff --git a/tests/di/fixtures/other_config/development/environment.yml b/tests/di/fixtures/other_config/development/environment.yml new file mode 100644 index 0000000000..c299bfc648 --- /dev/null +++ b/tests/di/fixtures/other_config/development/environment.yml @@ -0,0 +1,14 @@ +parameters: + other_config: true + +services: + config.php: + synthetic: true + + dbal.conn: + class: phpbb\db\driver\factory + arguments: + - @service_container + + dispatcher: + class: phpbb\db\driver\container_mock diff --git a/tests/di/fixtures/other_config/production/environment.yml b/tests/di/fixtures/other_config/production/environment.yml deleted file mode 100644 index c299bfc648..0000000000 --- a/tests/di/fixtures/other_config/production/environment.yml +++ /dev/null @@ -1,14 +0,0 @@ -parameters: - other_config: true - -services: - config.php: - synthetic: true - - dbal.conn: - class: phpbb\db\driver\factory - arguments: - - @service_container - - dispatcher: - class: phpbb\db\driver\container_mock diff --git a/tests/pagination/config/development/routing.yml b/tests/pagination/config/development/routing.yml new file mode 100644 index 0000000000..dd667274cd --- /dev/null +++ b/tests/pagination/config/development/routing.yml @@ -0,0 +1,6 @@ +core_controller: + pattern: /test + defaults: { _controller: core_foo.controller:bar, page: 1} +core_page_controller: + pattern: /test/page/{page} + defaults: { _controller: core_foo.controller:bar} diff --git a/tests/pagination/config/production/routing.yml b/tests/pagination/config/production/routing.yml deleted file mode 100644 index dd667274cd..0000000000 --- a/tests/pagination/config/production/routing.yml +++ /dev/null @@ -1,6 +0,0 @@ -core_controller: - pattern: /test - defaults: { _controller: core_foo.controller:bar, page: 1} -core_page_controller: - pattern: /test/page/{page} - defaults: { _controller: core_foo.controller:bar} -- cgit v1.2.1