Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP][ticket/11700] Namespaces #1565

Merged
merged 73 commits into from
Sep 25, 2013
Merged

[WIP][ticket/11700] Namespaces #1565

merged 73 commits into from
Sep 25, 2013

Conversation

naderman
Copy link
Sponsor Member

@nickvergessen
Copy link
Contributor

Status?

@@ -183,7 +185,7 @@ public function update_data()

public function move_customise_modules()
{
// Move language management to new location in the Customise tab
// Move language management to new \location in the Customise tab
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^_^

@naderman
Copy link
Sponsor Member Author

Yeah, I'll merge develop when I got this working, and check it all again

@naderman
Copy link
Sponsor Member Author

Please don't review this, it's not done yet.

* github-phpbb/develop: (586 commits)
  [ticket/11735] Display disabled checkbox in subsilver for read notifications
  [ticket/11735] Display disabled checkbox when notification is already read
  [ticket/11844] update acp/authentication language var
  [ticket/11795] Remove PM popup
  [ticket/11795] Remove outdated comment from forum_fn.js
  [ticket/11795] Move find user JS to forum_fn
  [ticket/11795] Replace TWIG with phpBB syntax in ACP
  [ticket/11795] Move MSN scripts to forum_fn.js
  [ticket/11795] Use phpBB template syntax instead of TWIG
  [ticket/11795] Move PM popup JS to forum_fn.js
  [ticket/11795] Get rid of pagination JS variables
  [ticket/11795] Get rid of onload_functions
  [ticket/11795] Use data-reset-on-edit attr to reset elements
  [ticket/11795] Redo form elements auto-focus
  [ticket/11811] Remove outline on :focus
  [ticket/11836] Fix subsilver fatal error
  [ticket/11837] Replace escaped single quote with utf-8 single quote
  [ticket/11836] Fix fatal error on unsupported provider for auth link
  [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED
  [ticket/11809] Ensure code.js is first script included after jQuery
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/develop/create_schema_files.php
	phpBB/develop/mysql_upgrader.php
	phpBB/download/file.php
	phpBB/includes/bbcode.php
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/phpbb/controller/helper.php
	phpBB/phpbb/controller/resolver.php
	phpBB/phpbb/request/request_interface.php
	phpBB/phpbb/session.php
	phpBB/phpbb/style/extension_path_provider.php
	phpBB/phpbb/style/path_provider.php
	phpBB/phpbb/style/path_provider_interface.php
	phpBB/phpbb/style/resource_locator.php
	phpBB/phpbb/style/style.php
	phpBB/phpbb/template/locator.php
	phpBB/phpbb/template/template.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/node/includecss.php
	phpBB/phpbb/template/twig/node/includejs.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/di/create_container_test.php
	tests/extension/style_path_provider_test.php
	tests/notification/notification_test.php
	tests/session/continue_test.php
	tests/session/creation_test.php
	tests/template/template_events_test.php
	tests/template/template_test_case.php
	tests/template/template_test_case_with_tree.php
	tests/test_framework/phpbb_functional_test_case.php
new phpbb_request()
$phpbb_filesystem = new phpbb\filesystem(
new phpbb\symfony_request(
new phpbb\request\request()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should these be prefixed with a back slash?

Copy link
Sponsor Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's in non-namespaced code, so doesn't matter.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be consistent ideally. In this case with \phpbb\class_loader.

@dhruvgoel92
Copy link
Contributor

namespace migration didn't run at all for me. Also some migrations are being duplicated like phpbb\db\migration\data\30x\3_0_1_rc1 and \phpbb\db\migration\data\30x\3_0_1_rc1
We also need to update the config file during migration to change the $acm_type to use namespace or just file,null etc.

@dhruvgoel92
Copy link
Contributor

I tested the PR and it worked fine for me, tests pass and migration too worked apart from the comments :)

@EXreaction
Copy link
Contributor

There should be a function that handles correcting the acm/sql type variables. Just update those functions appropriately, we don't really want to alter the file during updates as that becomes quite complex.

@@ -16,7 +18,7 @@ public function effectively_installed()

static public function depends_on()
{
return array('phpbb_db_migration_data_310_style_update_p1');
return array('\phpbb\db\migration\data0\style_update_p1');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo this is why migrations dont run.

@nickvergessen
Copy link
Contributor

Duplication is caused by dependencies.

They specify \ while the finder returns the version wihout leading \
So both are being added.

naderman added a commit that referenced this pull request Sep 25, 2013
[WIP][ticket/11700] Namespaces
@naderman naderman merged commit 8da3133 into phpbb:develop Sep 25, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
6 participants