1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

189 Commits

Author SHA1 Message Date
Marc Alexander
943ab555da Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11912
Conflicts:
	phpBB/config/services.yml
2013-11-23 00:54:56 +01:00
Cesar G
287c2550b8 [ticket/12008] Update the run time value for the prune notifications cron task
PHPBB3-12008
2013-11-14 01:05:58 -08:00
Nils Adermann
e48b2c07eb Merge pull request #1871 from nickvergessen/ticket/12016
Ticket/12016 Event listeners should be services
2013-11-13 08:45:48 -08:00
Joas Schilling
d3f9a51709 [ticket/12016] Use a service provider for event listeners
This allows them to use dependency injection

PHPBB3-12016
2013-11-13 17:34:06 +01:00
Andreas Fischer
5db1ec163d [ticket/11998] Use container to get all commands using 'console.command' tag.
PHPBB3-11998
2013-11-03 03:24:06 +01:00
Marc Alexander
b2f638b793 [ticket/11857] Use passed service collection instead of container in manager
The service collection that was already passed to the avatar manager should
be used in the avatar manager method get_driver() instead of the container
itself.

PHPBB3-11857
2013-10-27 15:08:58 +01:00
Marc Alexander
789d493595 [ticket/11912] Integrate mimetype guesser with plupload
PHPBB3-11912
2013-10-23 18:34:06 +02:00
Andreas Fischer
2050a39da7 [feature/plupload/integration] Integration of Plupload
This commit is a highly-refactored and up-to-date version of Fyorl's work
which was part of his Google Summer of Code 2012 project "Attachment
Improvements".

PHPBB3-10929
2013-10-11 17:40:16 +02:00
Marc Alexander
7006db7a2d Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords
Conflicts:
	phpBB/includes/functions.php
2013-10-03 10:04:59 +02:00
Marc Alexander
663b4b2eb7 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords
Conflicts:
	phpBB/develop/create_schema_files.php
2013-09-27 10:47:10 +02:00
Joas Schilling
7525c49d45 [ticket/11852] Split filesystem and path_helper into 2 classes
PHPBB3-11852
2013-09-26 15:34:44 +02:00
Nils Adermann
1d7f8f8193 [ticket/11700] Get functional tests running after develop merge
PHPBB3-11700
2013-09-17 18:10:58 +02:00
Nils Adermann
f039a3308a Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700
* github-phpbb/develop:
  [ticket/11832] Correct paths in tests
  [ticket/11832] Correct ROOT_PATH variable
  [ticket/11832] get_url() from phpbb_template_asset should return web path
  [ticket/11832] Fix INCLUDE(JS/CSS)
  [ticket/11832] Fix constructions of phpbb_filesystem
  [ticket/11832] Fix smiley paths
  [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request
  [ticket/11832] Fix build_url and the S_LOGIN_ACTION
  [ticket/11832] Changing comments to say app.php rather than index.php
  [ticket/11832] We must instantiate the $phpbb_filesystem in common
  [ticket/11832] Fix the web path corrections
  [ticket/11832] More extensive testing
  [ticket/11832] Use dirname(__FILE__)
  [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid
  Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework"
  [ticket/11832] Make $phpbb_container a global initiated by the framework
  [ticket/11832] Fix log tests
  [ticket/11832] update_web_root_path helper and tests
  [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)

Conflicts:
	phpBB/common.php
	phpBB/config/services.yml
	phpBB/includes/bbcode.php
	phpBB/includes/functions.php
	phpBB/includes/functions_messenger.php
	phpBB/install/index.php
	phpBB/phpbb/filesystem.php
	phpBB/phpbb/template/twig/environment.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/dbal/migrator_test.php
	tests/extension/manager_test.php
	tests/extension/metadata_manager_test.php
	tests/filesystem/clean_path_test.php
	tests/mock/extension_manager.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
2013-09-17 16:56:50 +02:00
Nils Adermann
c4b53490ad [ticket/11700] Correctly load extensions with nonprefixed namespaces
PHPBB3-11700
2013-09-17 16:15:44 +02:00
Nils Adermann
3634ff14a0 [ticket/11700] Correct service definitions with namespaces
PHPBB3-11700
2013-09-16 06:16:53 +02:00
Nils Adermann
21bbb58503 Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700
* 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
2013-09-16 01:24:05 +02:00
Nils Adermann
b95fdacdd3 [ticket/11700] Move all recent code to namespaces
PHPBB3-11700
2013-09-16 00:25:27 +02:00
Marc Alexander
19512b2595 [feature/passwords] Rename "crypto" files to "passwords" files
PHPBB3-11610
2013-09-14 14:04:48 +02:00
Marc Alexander
8b9370c6a9 [feature/passwords] Define default hashing algorithm in container file
The default hashing algorithm type is defined as a parameter in the service
definition file for the password hashing system. This will allow us to change
this in the future but it will also prevent unexperienced admins from changing
the hashing algorithm.

PHPBB3-11610
2013-09-14 13:55:45 +02:00
Marc Alexander
d66cae7cbc [feature/passwords] Add service collection file crypto.yml
This will contain definitions of the services and the service collection
that will be passed to the passwords manager.

PHPBB3-11610
2013-09-14 13:50:42 +02:00
Marc Alexander
3a0dd248d0 [feature/passwords] Add basic implementation of passwords manager
The passwords manager is capable of checking and hashing passwords.
It will support different hashing algorithms.

PHPBB3-11610
2013-09-14 13:50:07 +02:00
Nathan Guse
b4a374dc73 [ticket/11832] Fix INCLUDE(JS/CSS)
PHPBB3-11832
2013-09-13 10:58:03 -05:00
Nathan Guse
aa710df2db [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request
Now symfony_request is also a service (removed the function
phpbb_create_symfony_request).

Inject symfony request into filesystem

Cleanup for the tests

PHPBB3-11832
2013-09-13 09:52:02 -05:00
Nathan Guse
baa73f6933 Merge remote-tracking branch 'remotes/imkingdavid/ticket/11824' into ticket/11832
* remotes/imkingdavid/ticket/11824:
  [ticket/11824] Revert changes in functions.php
  [ticket/11824] Reorganize test file
  [ticket/11824] Update language string for board settings
  [ticket/11824] Revert changes to functions_content.php
  [ticket/11824] Add tests for urls with mod_rewrite enabled
  [ticket/11824] Correct a comment
  [ticket/11824] Change copyright year in migration file
  [ticket/11824] Remove unused globals
  [ticket/11824] Fix smilies
  [ticket/11824] Fix logic
  [ticket/11824] Add option for mod_rewrite
2013-09-12 12:45:17 -05:00
Nathan Guse
f30b87519e [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)
Function moved from phpbb_get_web_root_path to filesystem::get_web_root_path

PHPBB3-11832
2013-09-09 17:28:56 -05:00
David King
010da72f64 [ticket/11824] Add option for mod_rewrite
PHPBB3-11824
2013-09-03 16:57:27 -07:00
David King
913e5a1f2e [ticket/11215] Make controller helper url() method use correct format
PHPBB3-11215
2013-09-02 10:54:55 -07:00
Nathaniel Guse
5d1afb4532 [ticket/11628] Remove phpbb_style (move methods to phpbb_template)
PHPBB3-11628
2013-07-24 12:24:35 -05:00
Nathaniel Guse
44a82dd083 [ticket/11628] Remove style path provider
No longer used since Twig was implemented.

PHPBB3-11628
2013-07-24 12:05:04 -05:00
Nathaniel Guse
98b385bc1c [ticket/11628] Remove style resource locator
No longer used since Twig was implemented.

PHPBB3-11628
2013-07-24 11:59:21 -05:00
Nathan Guse
b71038486e Merge pull request #1513 from nickvergessen/ticket/11582
Ticket/11582 Split permission logic from translations
2013-07-22 11:28:55 -07:00
Andreas Fischer
792c730f15 [ticket/10931] Add phpbb_php_ini as a service.
PHPBB3-10931
2013-07-16 20:11:58 +02:00
Joas Schilling
7f9a1c8116 [ticket/11582] Add event in constructor and add docs
PHPBB3-11582
2013-07-14 11:51:33 -04:00
Joas Schilling
573987d2d2 [ticket/11582] Add new service for permissions
Replace calls to the language-array type with a call to get_types()

PHPBB3-11582
2013-07-14 11:51:29 -04:00
Joas Schilling
057d860d07 [ticket/11696] Rename db_tools.php so it can be autoloaded
PHPBB3-11696
2013-07-14 10:10:05 -04:00
Joas Schilling
8352a7cada Merge remote-tracking branch 'phpbb/develop' into ticket/9657
* phpbb/develop: (216 commits)
  [ticket/11626] Remove last reference to template in ldap
  [ticket/11626] Remove LDAP dependency on template
  [develop-olympus] Increment version number to 3.0.13-dev.
  [develop-olympus] Add changelog for 3.0.12 release.
  [develop-olympus] Bump version numbers for 3.0.12-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.12 releases.
  [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
  [ticket/11668] Run lint test at the end of the test suite
  [ticket/11548] Fix test errors in groups test on develop
  [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
  [ticket/11548] Fix incorrect usage of array_map on acp groups page
  [ticket/11665] Fix test class name
  [ticket/11664] Stop creating php.html file in root path in tests
  [ticket/11665] Can't change file names already sent to set_filenames
  [ticket/11662] Typos: occured -> occurred
  [ticket/11662] Typos: occured -> occurred
  [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
  [feature/auth-refactor] Add parent::setUp() in setUp()
  [feature/auth-refactor] Changes
  [feature/auth-refactor] DataProvider for acp_board test
  ...
2013-07-13 09:36:24 -04:00
Joas Schilling
9f89cb4cfb [ticket/9657] Make content visibility a service and inject everything
PHPBB3-9657
2013-07-11 13:31:39 +02:00
Nathan Guse
13c3565454 [feature/twig] Remove style dependency for controller helper
If a controller wants to use set_style, it can just use phpbb_style

PHPBB3-11598
2013-07-05 12:11:59 -05:00
Nathaniel Guse
35b628f737 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig
# By Joseph Warner (44) and others
# Via Joas Schilling (4) and others
* 'develop' of https://github.com/phpbb/phpbb3: (63 commits)
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [feature/auth-refactor] A possible fix for the functional test failures
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  [ticket/11566] Rename var to $visual_confirmation_response
  [ticket/11566] Revert forum permission changes
  [ticket/11566] Use language variable instead of hardcode
  [ticket/11566] add tests for reporting post
  [ticket/11566] add captcha reset and hidden fields
  [ticket/11566] display error instead of trigger_error
  [ticket/11566] add error in template
  [ticket/11566] add error functionality
  [ticket/11566] add interface for captcha
  ...
2013-07-04 11:19:10 -05:00
Nathaniel Guse
2fb48d60f1 [feature/twig] Attempt to automatically set style dir for ext controllers
Extension authors can change it themselves if necessary

PHPBB3-11598
2013-07-04 11:08:36 -05:00
Nathaniel Guse
884a5b06fa [feature/twig] Add set_style function to controller helper
PHPBB3-11598
2013-07-04 10:13:05 -05:00
Nathaniel Guse
d7cff78443 [feature/twig] Use adm_relative_path to build admin namespace
PHPBB3-11598
2013-07-01 13:39:51 -05:00
Nathaniel Guse
bdc05b7dc8 [feature/twig] Remove resource locator dependency from template
PHPBB3-11598
2013-07-01 13:28:08 -05:00
Joseph Warner
6601c3d64e [feature/auth-refactor] Start turning auth providers into services
Creates auth_provider.yml and includes auth_providers.yml in
services.yml.

PHPBB3-9734
2013-06-20 21:30:35 -04:00
Nathan Guse
b035697800 [feature/twig] Replace phpBB template with Twig
Move phpbb_template class to phpbb_template_phpbb
Changed phpbb_template class to an interface
Switch services.yml to load phpbb_template_twig instead of phpbb_template

PHPBB3-11598
2013-06-10 12:59:47 -05:00
Joas Schilling
b5f1484744 [ticket/11481] Move functions from feed into helper class
PHPBB3-11481
2013-06-06 19:35:36 +02:00
David King
fedd9d18d2 Merge remote-tracking branch 'EXreaction/ticket/11413' into develop
* EXreaction/ticket/11413: (23 commits)
  [ticket/11413] Revert some cache service related changes from earlier
  [ticket/11413] Use phpbb_user in test
  [ticket/11413] $user should have been $this->user
  [ticket/11413] Fix unit tests
  [ticket/11413] Translate the error
  [ticket/11413] Rename file to something more helpful
  [ticket/11413] Remove remaining irrelevant code to this PR
  [ticket/11413] Remove mock sql_insert_buffer.php (not relevant to PR)
  [ticket/11413] Remove conversion of user_notifications
  [ticket/11413] Correct copyright year
  [ticket/11413] Remove changes for ticket 11420 from this branch
  [ticket/11413] Include mock class
  [ticket/11413] Don't use the database for the convert test
  [ticket/11413] Test get_notification_type_id and _ids functions
  [ticket/11413] Use sql_insert_buffer
  [ticket/11413] Create test for notification conversion
  [ticket/11413] Fix test fixtures and tests
  [ticket/11413] Fix some more tests
  [ticket/11413] Fix notification tests
  [ticket/11413] Prevent recursive function calls
  ...
2013-05-20 11:54:39 -04:00
Nathaniel Guse
60e3272839 [ticket/11415] Remove migrator dependency from extension manager
PHPBB3-11415
2013-05-01 14:09:08 -05:00
Nathaniel Guse
4c5e51e379 [ticket/11413] Rename columns in notification/manager.php
PHPBB3-11413
2013-04-28 23:40:48 -05:00
Nathan Guse
df70b6ebe6 [ticket/11335] (kernel request subscriber) Make php_ext 'php' not '.php'
PHPBB3-11335
2013-04-24 17:45:41 -05:00