Commit graph

16962 commits

Author SHA1 Message Date
Andreas Fischer
86234ea533 Merge branch 'develop-olympus' into develop
* develop-olympus:
2013-06-27 01:22:01 +02:00
Andreas Fischer
e0c572d1d8 Merge remote-tracking branch 'asperous/ticket/11615/creation_test' into develop-olympus
* asperous/ticket/11615/creation_test:
  [ticket/11615] Fix typo in creation_test
  [ticket/11615] Remove magic number in creation_test
  [ticket/11615] Rename class in file to match
  [ticket/11615] Rename init_test to creation_test for clarity
2013-06-27 01:21:28 +02:00
Andreas Fischer
d0f0704515 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11615] Fix typo in creation_test
  [ticket/11615] Remove magic number in creation_test
  [ticket/11615] Rename class in file to match
  [ticket/11615] Rename init_test to creation_test for clarity
2013-06-27 01:12:34 +02:00
Andreas Fischer
95730c1ff1 Merge remote-tracking branch 'asperous/ticket/11615/creation_test' into develop-olympus
* asperous/ticket/11615/creation_test:
  [ticket/11615] Fix typo in creation_test
  [ticket/11615] Remove magic number in creation_test
  [ticket/11615] Rename class in file to match
  [ticket/11615] Rename init_test to creation_test for clarity
2013-06-27 01:09:52 +02:00
Dhruv
fe4bfd02a3 [ticket/10838] Updated RUNNING_TESTS.md
PHPBB3-10838
2013-06-27 01:52:22 +05:30
Dhruv
bd9ece7ab6 [ticket/9341] Add tests for checking Next and Previous template vars
PHPBB3-9341
2013-06-27 00:59:37 +05:30
Dhruv
1f989c6be7 [ticket/9341] Move create_topic and post into functional test case
create_topic and create_post are moved into functional test case
so that they can be used by other tests as well

PHPBB3-9341
2013-06-27 00:57:34 +05:30
Andy Chase
7ba81a293f [ticket/11615] Fix typo in creation_test
PHPBB3-11615
2013-06-26 11:49:37 -07:00
Andy Chase
4c432fecc7 [ticket/11615] Remove magic number in creation_test
Removing this magic number to its own variable
with clean multiplication makes it clear
what the number represents.

PHPBB3-11615
2013-06-26 11:49:36 -07:00
Andy Chase
c29cca1a75 [ticket/11615] Rename class in file to match
PHPBB3-11615
2013-06-26 11:49:35 -07:00
Andy Chase
a105a6d7a7 [ticket/11615] Rename init_test to creation_test for clarity
PHPBB3-11615
2013-06-26 11:49:34 -07:00
Joseph Warner
19bbf7b7de [feature/auth-refactor] Fix two session tests broken by changes
PHPBB3-9734
2013-06-26 11:33:17 -04:00
Joseph Warner
4afdd650cd [feature/auth-refactor] Removed no longer used variable
PHPBB3-9734
2013-06-26 00:02:20 -04:00
Joseph Warner
59929669f5 [feature/auth-refactor] Fix errors in acp_board
Fixes errors introduced by the last several commits.

PHPBB3-9734
2013-06-25 22:27:16 -04:00
Joseph Warner
08614e2b85 [feature/auth-refactor] Fix indentation on acp_board
PHPBB3-9734
2013-06-25 22:26:03 -04:00
Joseph Warner
3c394aee62 [feature/auth-refactor] Refactor auth in acp_board
Changes the acp_board code to directly call the auth providers out
of the $auth_providers variable that is populated by the
phpbb_container.

PHPBB3-9734
2013-06-25 22:21:38 -04:00
Joseph Warner
b78b6711c8 [feature/auth-refactor] Don't truncate name then reattach same thing
PHPBB3-9734
2013-06-25 22:15:21 -04:00
Joseph Warner
09372d765d [feature/auth-refactor] Remove old auth plugins
PHPBB3-9734
2013-06-25 22:01:18 -04:00
Joseph Warner
4f3f0a8791 [feature/auth-refactor] Remove references to old auth plugins
Removes what is hopefully the last references to the old auth
plugins in the code base.

PHPBB3-9734
2013-06-25 21:59:19 -04:00
Joseph Warner
5f3ed197e7 [feature/auth-refactor] Fix auth tests to use mock objects correctly
PHPBB3-9734
2013-06-25 16:26:20 -04:00
Joseph Warner
5444e5b683 [feature/auth-refactor] Test validate_session on provider_apache
Provides a test for the validate_session() method of
provider_apache.

PHPBB3-9734
2013-06-25 14:37:22 -04:00
Joseph Warner
9e04328545 [feature/auth-refactor] Test autologin() on provider_apache
Provides a test for the autologin() method of provider_apache
that assumes the user already exists in the database.

PHPBB3-9734
2013-06-25 14:25:45 -04:00
Joseph Warner
307dd9777b [feature/auth-refactor] Test login() for provider_apache
Provides a test for the login() method for provider_apache.
Appears to be failing due to an issue with the mock phpBB request
class.

PHPBB3-9734
2013-06-25 14:13:36 -04:00
Joseph Warner
e5de05d8db [feature/auth-refactor] Test for init on provider_apache
Provides a test for the init() method of provider_apache.
Appears to be failing due to an error with the mock request class.

PHPBB3-9734
2013-06-25 14:05:40 -04:00
Joseph Warner
91c80dfc8e [feature/auth-refactor] Skeleton of provider_apache_test
Creates a skeleton of the tests for provider_apache.

PHPBB3-9734
2013-06-25 13:38:01 -04:00
Joseph Warner
8e1a503f44 [feature/auth-refactor] Finish provider_db unit test for login
Finishes the provider_db unit test for login. The test currently
passes.

PHPBB3-9734
2013-06-25 13:23:57 -04:00
Joseph Warner
80e2d65399 [feature/auth-refactor] Initial auth unit test provider_db
Initial work on a unit test for the provider_db login function.
Does not work currently.

PHPBB3-9734
2013-06-24 12:07:28 -04:00
Dhruv
fdd60548bf [ticket/9341] Use U_PREVIOUS and U_NEXT in template files
PHPBB3-9341
2013-06-22 03:44:22 +05:30
sakimahesh
465b515600 [ticket/9341] Correctly named template vars
PHPBB3-9341
2013-06-22 03:44:17 +05:30
Joseph Warner
b8610c4b98 [feature/auth-refactor] Refactor code to use services
Refactors all loading of auth providers to use services instead of
directly calling the class.

PHPBB3-9734
2013-06-21 18:04:11 -04:00
Joas Schilling
a5c971176b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10776] update min php version 5.3.3 in readme
  [ticket/10776] Fixed a couple language changes in docs/README.html.
  [ticket/10776] Fixed errors in docs/README.html.

Conflicts:
	phpBB/docs/README.html
2013-06-21 17:12:58 +02:00
Joas Schilling
4828cb21cf Merge remote-tracking branch 'dhruvgoel92/ticket/10776' into develop-olympus
* dhruvgoel92/ticket/10776:
  [ticket/10776] update min php version 5.3.3 in readme
  [ticket/10776] Fixed a couple language changes in docs/README.html.
  [ticket/10776] Fixed errors in docs/README.html.
2013-06-21 16:32:59 +02:00
Dhruv
6cbb2d6136 [ticket/10776] update min php version 5.3.3 in readme
PHPBB3-10776
2013-06-21 18:24:06 +05:30
Joas Schilling
4ac5028d24 Merge remote-tracking branch 'dhruvgoel92/ticket/11503' into develop
* dhruvgoel92/ticket/11503:
  [ticket/11503] similar implementation for mssql_native and odbc
2013-06-21 13:08:11 +02:00
Joseph Warner
95f38b457e [feature/auth-refactor] Create an auth.provider_collector service
Creates an auth.provider_collector service for all auth providers.

PHPBB3-9734
2013-06-20 22:50:35 -04:00
Joseph Warner
c9062fc1ee [feature/auth-refactor] Convert provider_apache to a service
Removes globals from provider_apache and turns it into a service.

PHPBB3-9734
2013-06-20 22:21:22 -04:00
Joseph Warner
c253189e85 [feature/auth-refactor] Convert provider_ldap to a service
Removes globals from provider_ldap and converts it into a service.

PHPBB3-9734
2013-06-20 22:11:53 -04:00
Joseph Warner
24825b9dc8 [feature/auth-refactor] Turn provider_db into a service
Removes globals from provider_db and turns it into a service.

PHPBB3-9734
2013-06-20 21:56:01 -04: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
Joseph Warner
0633666e2b [feature/auth-refactor] Fix LDAP conversion error
I messed up when converting over auth_ldap this commit fixes that
error. I have not been able to extensively test ldap due to not
having ldap set up on this computer yet.
Apache authentication appears to work.

PHPBB3-9734
2013-06-20 16:47:55 -04:00
Dhruv
116888f567 Merge branch 'ticket/10776' of git://github.com/callumacrae/phpbb3 into ticket/10776
# By Callum Macrae
# Via Callum Macrae
* 'ticket/10776' of git://github.com/callumacrae/phpbb3:
  [ticket/10776] Fixed a couple language changes in docs/README.html.
  [ticket/10776] Fixed errors in docs/README.html.

Conflicts:
	phpBB/docs/README.html
2013-06-20 21:39:13 +05:30
Dhruv
3eeeaababd [ticket/11503] similar implementation for mssql_native and odbc
mssql_native and mssql_odbc db drivers varied at some places
where they should have been similar.

PHPBB3-11503
2013-06-20 19:16:21 +05:30
Joas Schilling
bb59875236 Merge branch 'develop-olympus' into develop
Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2013-06-20 12:03:50 +02:00
Joas Schilling
b9afc6f1a5 Merge remote-tracking branch 'bantu/ticket/11604' into develop-olympus 2013-06-20 11:46:00 +02:00
Andreas Fischer
a72bf329d9 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11603] Fix out dated comment
  [ticket/11603] Fix usage note
2013-06-20 11:41:53 +02:00
Andreas Fischer
47241878d0 Merge remote-tracking branch 'nickvergessen/ticket/11603' into develop-olympus
* nickvergessen/ticket/11603:
  [ticket/11603] Fix out dated comment
  [ticket/11603] Fix usage note
2013-06-20 11:41:46 +02:00
Andreas Fischer
1e4ad4c368 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11603] Throw RuntimeExceptions instead of using exit()
  [ticket/11603] Avoid using cURL
  [ticket/11603] Split api_request into two functions (query only vs. full url)
  [ticket/11603] Fix spacing and add some comments
  [ticket/11603] Fix github API calls
  [ticket/11603] Rename network to forks and fix handling
  [ticket/11603] Fix github api url and use curl with valid user agent
2013-06-20 11:34:54 +02:00
Andreas Fischer
f365c99f14 Merge remote-tracking branch 'nickvergessen/ticket/11603' into develop-olympus
* nickvergessen/ticket/11603:
  [ticket/11603] Throw RuntimeExceptions instead of using exit()
  [ticket/11603] Avoid using cURL
  [ticket/11603] Split api_request into two functions (query only vs. full url)
  [ticket/11603] Fix spacing and add some comments
  [ticket/11603] Fix github API calls
  [ticket/11603] Rename network to forks and fix handling
  [ticket/11603] Fix github api url and use curl with valid user agent
2013-06-20 11:29:21 +02:00
Joas Schilling
b362fb44d2 [ticket/11603] Fix out dated comment
PHPBB3-11603
2013-06-20 10:59:43 +02:00
Joas Schilling
5f4daba160 [ticket/11603] Fix usage note
PHPBB3-11603
2013-06-20 10:57:56 +02:00