mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 10:16:36 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'nickvergessen/ticket/11574' into develop

Browse Source 
# By Joas Schilling (16) and Igor Wiedler (6)
# Via Joas Schilling (5) and Igor Wiedler (2)
* nickvergessen/ticket/11574: (22 commits)
  [ticket/11574] Remove install/udpate/new/ fallback from database_update.php
  [ticket/11574] Do not display incompatible package note after successful update
  [ticket/11574] Remove old "continue step"-message
  [ticket/11574] Change order of files and database update
  [ticket/11574] Fix more issues in the updater
  [ticket/11574] Add trailing slash for consistency
  [ticket/11574] Fix table prefix in database updater
  [ticket/11574] Fix various path issues in the updater
  [ticket/11574] Make install language filename less crazy
  [ticket/11574] Use alternate DI config file for updater
  [ticket/11574] Include normalizer so it loads form the correct directory
  [ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;)
  [ticket/11574] Use log object instead of old function
  [ticket/11574] Include vendor into update packages
  [ticket/11574] Create phpbb_log object before using it.
  [ticket/11574] Add correct language parameter to return links
  [ticket/11574] Use request object rather then request_var function
  [ticket/11574] Load new language files whenever possible
  [ticket/11574] Require new files in install/index.php and add a class loader
  [ticket/11574] Require new files in database_update.php and add a class loader
  ...
This commit is contained in:
Dhruv
2013-08-08 13:56:39 +05:30
parent 08a6bd2218 32499c8808
commit f35d732f40
11 changed files with 175 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/di/create_container_test.php
View File

@@ -17,7 +17,7 @@ class phpbb_di_container_test extends phpbb_test_case
$phpbb_root_path = __DIR__ . '/../../phpBB/';
$extensions = array(
new phpbb_di_extension_config(__DIR__ . '/fixtures/config.php'),
new phpbb_di_extension_core($phpbb_root_path),
new phpbb_di_extension_core($phpbb_root_path . 'config'),
);
$container = phpbb_create_container($extensions, $phpbb_root_path, 'php');
@@ -29,7 +29,7 @@ class phpbb_di_container_test extends phpbb_test_case
$phpbb_root_path = __DIR__ . '/../../phpBB/';
$extensions = array(
new phpbb_di_extension_config(__DIR__ . '/fixtures/config.php'),
new phpbb_di_extension_core($phpbb_root_path),
new phpbb_di_extension_core($phpbb_root_path . 'config'),
);
$container = phpbb_create_install_container($phpbb_root_path, 'php');
@@ -43,7 +43,7 @@ class phpbb_di_container_test extends phpbb_test_case
$config_file = __DIR__ . '/fixtures/config.php';
$extensions = array(
new phpbb_di_extension_config(__DIR__ . '/fixtures/config.php'),
new phpbb_di_extension_core($phpbb_root_path),
new phpbb_di_extension_core($phpbb_root_path . 'config'),
);
$container = phpbb_create_compiled_container($config_file, $extensions, array(), $phpbb_root_path, 'php');