1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

292 Commits

Author SHA1 Message Date
Joas Schilling
b5105363db [ticket/12171] Add functionality to upload attachments to submit_post() method
PHPBB3-12171
2014-02-10 12:56:46 +01:00
Nathan Guse
38eb6b0e13 [ticket/11880] Move get_schema_steps function to a migrator helper class
PHPBB3-11880
2014-02-05 09:57:36 -06:00
Marc Alexander
292961a277 [feature/passwords] Get rid of set_name/get_name methods for passwords drivers
PHPBB3-11610
2014-02-02 14:09:09 +01:00
Marc Alexander
382317b135 Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwords
Conflicts:
	phpBB/config/services.yml
2013-12-29 13:46:42 +01:00
Marc Alexander
7f10312bf2 [ticket/11896] Correctly document return of null in docblocks
Also got rid of previous incorrect comment in docblocks.

PHPBB3-11896
2013-11-14 15:17:25 +01:00
Marc Alexander
308329b547 [ticket/11896] Minor code improvements in phpbb_functional_test_case
Use assertContainsLang() and get rid of unnecessary logic in create_post()
and create_topic(). The docblocks were also slightly improved.

PHPBB3-11896
2013-11-14 15:09:49 +01:00
Marc Alexander
29d3b08d50 [ticket/11896] Add ability to define expected message after posting
This change will add the ability to define the expected message after a
topic or post has been submitted with the methods create_post() and
create_topic(). If the expected message is not 'POST_STORED', we will not
try to get the topic and post id.

PHPBB3-11896
2013-11-09 20:33:01 +01:00
Marc Alexander
5193b3279c [feature/passwords] Pass list of default types to passwords manager
This list is in the order of how the driver types would be used. If a driver
is not supported we will try the subsequent one.

PHPBB3-11610
2013-10-27 14:18:02 +01:00
Dhruv
e1030d3670 [ticket/11608] Set sphinx id from test_config file for tests
PHPBB3-11608
2013-10-05 21:15:32 +05:30
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
93531e7fb0 [feature/passwords] Add prepending backslash to class namespaces
PHPBB3-11610
2013-10-02 23:45:32 +02:00
Marc Alexander
e7e11112b1 [feature/passwords] Fix tests after changes to phpBB hashing functions
PHPBB3-11610
2013-10-02 17:24:11 +02:00
Nathan Guse
870c293bab [ticket/11850] Fix tests
PHPBB3-11850
2013-09-30 20:04:32 -05:00
Nathan Guse
85ae55ca2d [ticket/11850] Update for namespaces
PHPBB3-11850
2013-09-30 18:31:26 -05:00
Nathan Guse
a6df011a10 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11850
# By Nils Adermann (68) and others
# Via Andreas Fischer (12) and others
* 'develop' of github.com:phpbb/phpbb3: (102 commits)
  [ticket/11876] Replace MD5 with SHA256.
  [ticket/11876] Move checksum generation from build PHP files to phing build.xml
  [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now.
  [prep-release-3.0.12] Update changelog for 3.0.12 release.
  [ticket/11873] Add unit test for large password input.
  [ticket/11873] Do not hash very large passwords in order to safe resources.
  [ticket/11862] Correct var names in user_delete() events due to prune-users
  [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag.
  [prep-release-3.0.12] Bumping version number for 3.0.12 final.
  [ticket/11852] Add class file
  [ticket/11852] Move tests to folder with new class name
  [ticket/11852] Split filesystem and path_helper into 2 classes
  [ticket/11868] Add @depends to test
  [ticket/11868] Add functional test for registration
  [ticket/11868] Replace phpbb_request_interface references
  [ticket/11866] Only single backslash in .md files
  [ticket/11866] Remove outdated and broken develop script
  [ticket/11866] More namespaces
  [ticket/11866] Update some occurances of phpbb_db_ to new Namespace
  [ticket/11865] Convert old class name to namespaced version
  ...

Conflicts:
	tests/security/extract_current_page_test.php
	tests/session/testable_facade.php
2013-09-30 18:24:46 -05:00
Joas Schilling
7525c49d45 [ticket/11852] Split filesystem and path_helper into 2 classes
PHPBB3-11852
2013-09-26 15:34:44 +02:00
Nathan Guse
9c535da528 [ticket/11850] page_name contains controller request rather than query string
Fixing tests

PHPBB3-11850
2013-09-17 22:00:06 -05:00
Nils Adermann
9d8ac2b0ce [ticket/11700] Fix unit tests after develop merge
PHPBB3-11700
2013-09-17 17:12:41 +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
Joas Schilling
6ba2fb6d62 Merge remote-tracking branch 'EXreaction/ticket/11832' into develop
* EXreaction/ticket/11832:
  [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)
2013-09-16 21:33:52 +02:00
Nils Adermann
ee1c15fe7e [ticket/11700] Fix another case of non-namespaced classnames
PHPBB3-11700
2013-09-16 04:47:39 +02:00
Nils Adermann
ccbb070652 [ticket/11700] The driver is namespaced now, so properly replace it
PHPBB3-11700
2013-09-16 04:19:52 +02:00
Nils Adermann
721483cd64 [ticket/11700] Default db driver for tests must not lead with \
PHPBB3-11700
2013-09-16 04:07:30 +02:00
Nils Adermann
005c5118cf [ticket/11700] travis has hardcoded driver class names without namespaces
PHPBB3-11700
2013-09-16 04:01:18 +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
bdaf68c113 [ticket/11700] Don't prefix dbms classnames with \
PHPBB3-11700
2013-09-16 00:41:44 +02:00
Nils Adermann
d122d84050 [ticket/11700] Use underscores for generated search test wrappers
PHPBB3-11700
2013-09-16 00:39:36 +02:00
Nils Adermann
b95fdacdd3 [ticket/11700] Move all recent code to namespaces
PHPBB3-11700
2013-09-16 00:25:27 +02:00
Nathan Guse
b8bb16f8e7 Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
* remotes/upstream/develop-olympus:
  [ticket/11831] getAttribute was replaced with attr
  [ticket/11831] Update fabpot/goutte to 1.0.*

Conflicts:
	phpBB/composer.lock
2013-09-13 15:56:28 -05:00
Nathan Guse
b4a374dc73 [ticket/11832] Fix INCLUDE(JS/CSS)
PHPBB3-11832
2013-09-13 10:58:03 -05:00
Nathan Guse
21624e79fc [ticket/11832] Fix constructions of phpbb_filesystem
PHPBB3-11832
2013-09-13 10:04:35 -05:00
Nathan Guse
a194e6ce7a Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832
# By Nathan Guse (22) and others
# Via Nathan Guse (10) and others
* 'develop' of github.com:phpbb/phpbb3: (39 commits)
  [ticket/11843] Added newlines and included numbers in the DEFINE vars test
  [ticket/11843] Add checking DEFINE variables with underscores to template_test
  [ticket/11843] The twig lexer fixes DEFINE variables with underscores again
  [ticket/11727] Fix indentation
  [ticket/11727] Fix indentation
  [ticket/11745] Correct language, coding guidelines
  [ticket/11828] Fix greedy operators in lexer
  [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE
  [ticket/11833] Fix bad template loop
  [ticket/11816] !$DOESNT_EXIST test
  [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php
  [ticket/11829] Use report_closed to determine status in MCP report_details
  [ticket/11816] Test !$DEFINITION
  [ticket/11822] Use namespace lookup order for asset loading
  [ticket/11727] Template loader support for safe directories to load files from
  [ticket/11816] Fix define/loop checks in IF statements containing parenthesis
  [ticket/11373] Use inheritdoc
  [ticket/11637] generate_text_for_display on search.php
  [ticket/11744] Cast to int
  [ticket/11744] Inheritdoc
  ...
2013-09-13 09:15:23 -05:00
David King
d629738675 Merge pull request #1617 from EXreaction/ticket/11744
[ticket/11744] Group join request notification
2013-09-12 21:24:11 -07:00
Nathan Guse
d5f93f5ce4 Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework"
This reverts commit 5e09afa0bc3ff9014812282fd4454f0df54b9dfd.
2013-09-10 10:06:13 -05:00
Nathan Guse
5e09afa0bc [ticket/11832] Make $phpbb_container a global initiated by the framework
Setup common items needed from the container (e.g. filesystem)

PHPBB3-11832
2013-09-09 18:47:25 -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
Nathan
b17d15276f [ticket/11831] getAttribute was replaced with attr
PHPBB3-11831
2013-09-06 12:36:40 -05:00
Andreas Fischer
1ac1b9b7ee Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11775] Fix doc blocks syntax
  [ticket/11775] Remove spaces at line ends
  [ticket/11775] Split test into multiple steps
  [ticket/11775] Add functional test for moving the last post
  [ticket/11775] Backport moving of the posting functions to 3.0
  [ticket/11775] Fix error when moving the last post to another topic

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2013-08-15 01:40:08 +02:00
Andreas Fischer
d089f9693a Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [ticket/11775] Fix doc blocks syntax
  [ticket/11775] Remove spaces at line ends
  [ticket/11775] Split test into multiple steps
  [ticket/11775] Add functional test for moving the last post
  [ticket/11775] Backport moving of the posting functions to 3.0
  [ticket/11775] Fix error when moving the last post to another topic
2013-08-15 01:37:56 +02:00
Joas Schilling
c30d4025d2 [ticket/11775] Fix doc blocks syntax
PHPBB3-11775
2013-08-15 01:36:38 +02:00
Joas Schilling
4b0adfcff5 [ticket/11775] Remove spaces at line ends
PHPBB3-11775
2013-08-15 01:35:02 +02:00
Joas Schilling
a6e69f377b [ticket/11775] Backport moving of the posting functions to 3.0
PHPBB3-11775
2013-08-08 23:33:26 +02:00
Nathaniel Guse
7dd16f4148 [ticket/11744] spelling
PHPBB3-11744
2013-07-26 15:44:49 -05:00
Nathaniel Guse
185d4e112e [ticket/11744] Fix functional test case that's failing
PHPBB3-11744
2013-07-26 14:39:34 -05:00
Andreas Fischer
1004aaf787 Merge remote-tracking branch 'asperous/ticket/11620' into develop
* asperous/ticket/11620: (46 commits)
  [ticket/11620] Whitespace and combine function into test_case
  [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity
  [ticket/11620] Changed incorrect global variable
  [ticket/11620] Minor indentation changes and comment clarity
  [ticket/11620] Expected and actual test conditions wrongly swapped
  [ticket/11620] Space between . in directory import concatenation
  [ticket/11620] Changes to match merge
  [ticket/11620] Changes for code guidelines consistency
  [ticket/11620] Fix a static calls to non-static for session captcha
  [ticket/11620] Cleanup creation_test that was renamed on a cherry-pick
  [ticket/11620] Update auth_provider for new interface
  [ticket/11620] Added garbage_collection_test
  [ticket/11620] Fixed check_ban_test errors with cache and ban warning message
  [ticket/11620] Fixed a typo on check_ban_test
  [ticket/11620]  Refactored check_isvalid_test to use session_test_case
  [ticket/11615] Refactored isvalid test to be more imperative
  [ticket/11615]  Rename continue -> check_isvalid for clarity
  [ticket/11620] Added a test for checking if users are banned
  [ticket/11620] Remove typo in beginning of session_key_test
  [ticket/11620] Typo in file name session_key_tests -> test
  ...
2013-07-23 03:12:33 +02:00
Andy Chase
2fe2724e68 [ticket/11620] Whitespace and combine function into test_case
PHPBB3-11620
2013-07-22 17:39:45 -07:00
Joas Schilling
8dc8ee205a [ticket/11733] Add browse test for feed.php
PHPBB3-11733
2013-07-23 00:58:03 +02:00
Andy Chase
e2a769ac79 Merge branch 'develop' into ticket/11620 2013-07-22 11:29:36 -07:00
asperous
62d7a05700 [ticket/11620] Abstracted session setUp into a test_case class
When defining a database test case with a setUp function, it is important
to call the parent's setup function, because that is when the database is setup.

PHPBB3-11620
2013-07-22 10:53:52 -07:00
Nils Adermann
2aa58ee3b8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11686] Not checking for phpBB Debug errors on functional tests
2013-07-13 17:06:17 -04:00