makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11700] Fix installation after develop merge

Browse source 
PHPBB3-11700
This commit is contained in:
Nils Adermann 2013-09-16 03:14:39 +02:00
parent 2472271bc0
commit 09cfa01d58
7 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/config/notifications.yml
View file

@ -104,7 +104,7 @@ services:
- { name: notification.type } - { name: notification.type }
notification.type.group_request: notification.type.group_request:
class: phpbb_notification_type_group_request class: phpbb\notification\type\group_request
scope: prototype # scope MUST be prototype for this to work! scope: prototype # scope MUST be prototype for this to work!
arguments: arguments:
- @user_loader - @user_loader
@ -122,7 +122,7 @@ services:
- { name: notification.type } - { name: notification.type }
notification.type.group_request_approved: notification.type.group_request_approved:
class: phpbb_notification_type_group_request_approved class: phpbb\notification\type\group_request_approved
scope: prototype # scope MUST be prototype for this to work! scope: prototype # scope MUST be prototype for this to work!
arguments: arguments:
- @user_loader - @user_loader

6
phpBB/install/index.php
View file

@ -108,11 +108,11 @@ phpbb_include_updated('includes/utf/utf_tools.' . $phpEx);
phpbb_require_updated('includes/functions_install.' . $phpEx); phpbb_require_updated('includes/functions_install.' . $phpEx);
// Setup class loader first // Setup class loader first
$phpbb_class_loader_new = new \phpbb\class_loader('phpbb_', "{$phpbb_root_path}install/update/new/phpbb/", $phpEx); $phpbb_class_loader_new = new \phpbb\class_loader('phpbb\\', "{$phpbb_root_path}install/update/new/phpbb/", $phpEx);
$phpbb_class_loader_new->register(); $phpbb_class_loader_new->register();
$phpbb_class_loader = new \phpbb\class_loader('phpbb_', "{$phpbb_root_path}phpbb/", $phpEx); $phpbb_class_loader = new \phpbb\class_loader('phpbb\\', "{$phpbb_root_path}phpbb/", $phpEx);
$phpbb_class_loader->register(); $phpbb_class_loader->register();
$phpbb_class_loader_ext = new \phpbb\class_loader('phpbb_ext_', "{$phpbb_root_path}ext/", $phpEx); $phpbb_class_loader_ext = new \phpbb\class_loader('phpbb\\ext\\', "{$phpbb_root_path}ext/", $phpEx);
$phpbb_class_loader_ext->register(); $phpbb_class_loader_ext->register();
// Set up container // Set up container

2
phpBB/phpbb/cache/driver/file.php vendored
View file

@ -260,7 +260,7 @@ class file extends \phpbb\cache\driver\base
{ {
try try
{ {
$iterator = new DirectoryIterator($dir); $iterator = new \DirectoryIterator($dir);
} }
catch (Exception $e) catch (Exception $e)
{ {

4
phpBB/phpbb/db/migration/data/310/auth_provider_oauth.php → phpBB/phpbb/db/migration/data/v310/auth_provider_oauth.php
View file

@ -7,7 +7,9 @@
* *
*/ */
class phpbb_db_migration_data_310_auth_provider_oauth extends phpbb_db_migration namespace phpbb\db\migration\data\v310;
class auth_provider_oauth extends \phpbb\db\migration\migration
{ {
public function effectively_installed() public function effectively_installed()
{ {

6
phpBB/phpbb/db/migration/data/310/mod_rewrite.php → phpBB/phpbb/db/migration/data/v310/mod_rewrite.php
View file

@ -7,12 +7,14 @@
* *
*/ */
class phpbb_db_migration_data_310_mod_rewrite extends phpbb_db_migration namespace phpbb\db\migration\data\v310;
class mod_rewrite extends \phpbb\db\migration\migration
{ {
static public function depends_on() static public function depends_on()
{ {
return array( return array(
'phpbb_db_migration_data_310_dev', '\phpbb\db\migration\data\v310\dev',
); );
} }

6
phpBB/phpbb/db/migration/data/310/notifications_cron.php → phpBB/phpbb/db/migration/data/v310/notifications_cron.php
View file

@ -7,11 +7,13 @@
* *
*/ */
class phpbb_db_migration_data_310_notifications_cron extends phpbb_db_migration namespace phpbb\db\migration\data\v310;
class notifications_cron extends \phpbb\db\migration\migration
{ {
static public function depends_on() static public function depends_on()
{ {
return array('phpbb_db_migration_data_310_notifications'); return array('\phpbb\db\migration\data\v310\notifications');
} }
public function update_data() public function update_data()

8
phpBB/phpbb/db/migration/data/310/softdelete_mcp_modules.php → phpBB/phpbb/db/migration/data/v310/softdelete_mcp_modules.php
View file

@ -7,7 +7,9 @@
* *
*/ */
class phpbb_db_migration_data_310_softdelete_mcp_modules extends phpbb_db_migration namespace phpbb\db\migration\data\v310;
class softdelete_mcp_modules extends \phpbb\db\migration\migration
{ {
public function effectively_installed() public function effectively_installed()
{ {
@ -26,8 +28,8 @@ class phpbb_db_migration_data_310_softdelete_mcp_modules extends phpbb_db_migrat
static public function depends_on() static public function depends_on()
{ {
return array( return array(
'phpbb_db_migration_data_310_dev', 'phpbb\db\migration\data\v310\dev',
'phpbb_db_migration_data_310_softdelete_p2', 'phpbb\db\migration\data\v310\softdelete_p2',
); );
} }