1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-19 07:08:09 +01:00

101 Commits

Author SHA1 Message Date
Marc Alexander
92b096b05b Merge pull request #2984 from nickvergessen/ticket/10729-asc
[3.1][ticket/10729] Update editor information when user being deleted
2014-09-23 11:09:29 +02:00
Joas Schilling
9ff6358dc9 Merge branch 'ticket/10729' into ticket/10729-asc
Conflicts:
	phpBB/includes/functions_user.php
2014-09-23 09:31:13 +02:00
Joas Schilling
e28b93e0cc [ticket/10729] Ensure that no bans exist before testing create_session
PHPBB3-10729
2014-09-22 23:56:31 +02:00
Tristan Darricau
b91abf1a0b [ticket/11854] Rename captchas.factory service to captcha.factory
PHPBB3-11854
2014-08-11 01:16:22 +02:00
Tristan Darricau
28cf0ef832 [ticket/11854] Update unit tests
PHPBB3-11854
2014-08-11 01:16:07 +02:00
Marc Alexander
6f5f0d6d8d [ticket/12352] Use custom provider collection for auth providers
Using this custom provider collection, we can properly check whether the
configured auth provider does exist. The method get_provider() has been added
for returning the default auth provider or the standard db auth provider if
the specified one does not exist.
Additionally, the method get_provider() will throw an RuntimeException if
none of the above exist.

PHPBB3-12352
2014-06-01 21:31:06 +02:00
Marc Alexander
ed1d4fe4a0 [ticket/12352] Revert to db auth provider if default does not exist
This will make sure that we will not encounter a non-existing auth provider.
We will revert to the default db auth provider if the one set in the config
does not exist in our auth provider collection.

PHPBB3-12352
2014-06-01 21:31:04 +02:00
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +02:00
Andreas Fischer
6cfee5f2c2 [ticket/12429] Can not insert into more columns than exist.
PHPBB3-12429
2014-05-03 00:37:31 +02:00
Joas Schilling
11a9104b8a [ticket/12282] Use interface for type hinting
PHPBB3-12282
2014-04-01 19:17:41 +02:00
Joas Schilling
bbada27ee9 [ticket/12115] Also port user interests to profile fields
PHPBB3-12115
2014-02-06 11:32:11 +01:00
Nathan Guse
b81d0bc228 [ticket/11850] More namespaces
PHPBB3-11850
2013-09-30 20:38:41 -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
Nathan Guse
d85ae0f7bc [ticket/11850] Add test for outside of the phpBB directory
PHPBB3-11850
2013-09-18 09:25:58 -05: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
2472271bc0 [ticket/11700] Fix tests after merging new develop code
PHPBB3-11700
2013-09-16 02:41:03 +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
Andy Chase
2fe2724e68 [ticket/11620] Whitespace and combine function into test_case
PHPBB3-11620
2013-07-22 17:39:45 -07:00
Andy Chase
0c54fb034b [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity
PHPBB3-11620
2013-07-22 17:39:14 -07:00
Andy Chase
568de3b8ce [ticket/11620] Changed incorrect global variable
PHPBB3-11620
2013-07-22 16:27:22 -07:00
Andy Chase
cc6147f876 [ticket/11620] Minor indentation changes and comment clarity
PHPBB3-11620
2013-07-22 16:27:18 -07:00
Andy Chase
9d38ded228 [ticket/11620] Expected and actual test conditions wrongly swapped
PHPBB3-11620
2013-07-22 13:52:17 -07:00
Andy Chase
9dbd42e945 [ticket/11620] Space between . in directory import concatenation
PHPBB3-11620
2013-07-22 13:51:06 -07:00
Andy Chase
28e98466d9 [ticket/11620] Changes to match merge
PHPBB3-11620
2013-07-22 12:26:02 -07:00
Andy Chase
cc1aef47fb [ticket/11620] Changes for code guidelines consistency
PHPBB3-11620
2013-07-22 11:13:31 -07:00
asperous
25b189d33b [ticket/11620] Cleanup creation_test that was renamed on a cherry-pick
PHPBB3-11620
2013-07-22 11:07:47 -07:00
asperous
7dbd85ad02 [ticket/11620] Added garbage_collection_test
PHPBB3-11620
2013-07-22 11:07:45 -07:00
asperous
af3a4ee33a [ticket/11620] Fixed check_ban_test errors with cache and ban warning message
PHPBB3-11620
2013-07-22 11:07:45 -07:00
asperous
13e4271c50 [ticket/11620] Fixed a typo on check_ban_test
PHPBB3-11620
2013-07-22 11:07:44 -07:00
asperous
2d850ba7a8 [ticket/11620] Refactored check_isvalid_test to use session_test_case
Since the continue->isvalid refactoring is now in a branch with the
session_test_case framework, this test can be refactored to use that framework.

PHPBB3-11620
2013-07-22 11:07:43 -07:00
Andy Chase
e74abfaa2c [ticket/11615] Refactored isvalid test to be more imperative
Refactoring the continue/is_valid test to remove
the confusing data provider work around, while
still keeping redundancies down to a minimum.

PHPBB3-11615
2013-07-22 11:07:43 -07:00
Andy Chase
362480263c [ticket/11615] Rename continue -> check_isvalid for clarity
PHPBB3-11615
2013-07-22 11:07:42 -07:00
asperous
d533e8807c [ticket/11620] Added a test for checking if users are banned
PHPBB3-11620
2013-07-22 11:07:41 -07:00
asperous
016faad668 [ticket/11620] Remove typo in beginning of session_key_test
PHPBB3-11620
2013-07-22 11:07:40 -07:00
asperous
750ea77108 [ticket/11620] Typo in file name session_key_tests -> test
PHPBB3-11620
2013-07-22 11:07:40 -07:00
asperous
f5a09858d0 [ticket/11620] Added a session key reset test
PHPBB3-11620
2013-07-22 11:07:39 -07:00
asperous
f7da773c06 [ticket/11620] Added manual key test
PHPBB3-11620
2013-07-22 11:07:38 -07:00
Andy Chase
87e65224d4 [ticket/11620] Cherry-Pick merge tests from session-storage-cache
PHPBB3-11620
2013-07-22 11:07:17 -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
Andy Chase
c96b0b1a47 [ticket/11620] Removed unnecessary lines and whitespace
PHPBB3-11620
2013-07-09 12:03:17 -07:00
Andy Chase
f51721e905 [ticket/11620] Rename provider -> mock_auth_provider
Rename the class and file name to better match
what the class is mocking, as well as implement the
interface of that class.

PHPBB3-11620
2013-07-08 16:38:53 -07:00
Andy Chase
cd1fe789d2 [ticket/11620] Minor changes to tests for coding standards
PHPBB3-11620
2013-07-08 16:34:46 -07:00
Andy Chase
5cdcb689df [ticket/11620] Implemented a provider mock object.
Due to an auth_refactor, there is a new dependency
in session.php on phpbb_container and a provider.

For purposes of testing, implemented a simple one.

PHPBB3-11620
2013-07-05 14:49:30 -07:00
Andy Chase
6f8187f7fa [ticket/11620] Reworked create_test without data provider
PHPBB3-11620
2013-07-05 14:10:04 -07:00
Andy Chase
521d35dd6e [ticket/11620] Add create_test with test for bot detection
Added a test for the creation of a session with a simple test
for detecting whether a bot is present.

PHPBB3-11620
2013-07-05 14:10:02 -07:00
Andy Chase
7ef95ce8ac [ticket/11620] Fix typo and confusingly named test
PHPBB3-11620
2013-07-05 14:10:01 -07:00
Andy Chase
ab1c42babf [ticket/11620] Add indentation, change quote style.
indentation is probably more important than 80 characters per line apparently.
Single quotes instead of double per coding guidelines.

PHPBB3-11620
2013-07-05 14:10:00 -07:00
Andy Chase
290533a14f [ticket/11620] Add validate_referrer test
Add a test for the validate_referrer function.

PHPBB3-11620
2013-07-05 14:09:58 -07:00