Commit graph

2668 commits

Author SHA1 Message Date
Nathan Guse
d879acb7cc Merge pull request #1519 from cyberalien/ticket/11647
Fix INCLUDEJS URLs handling
2013-07-13 08:46:46 -07:00
Joas Schilling
167ca1f33f [ticket/9657] Define user before injecting
PHPBB3-9657
2013-07-13 11:25:38 -04:00
Joas Schilling
1584fdd26d Merge remote-tracking branch 'EXreaction/ticket/11420' into develop
* EXreaction/ticket/11420:
  [ticket/11420] Fix tests
  [ticket/11420] Fix tests
  [ticket/11420] Fix tests
  [ticket/11420] Use !==, === when comparing strings
  [ticket/11420] Fix comments, license link
  [ticket/11420] Rename migrations file to something more helpful
  [ticket/11420] Forgot to include mock sql_insert_buffer
  [ticket/11420] Fix notification options conversion
2013-07-13 11:15:53 -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
Igor Wiedler
1dea0286a4 [ticket/11574] Use alternate DI config file for updater
PHPBB3-11574
2013-07-13 09:57:57 +02:00
Joas Schilling
da38d13094 [ticket/9657] Add functional tests for forking a copy
PHPBB3-9657
2013-07-13 00:53:55 -04:00
Joas Schilling
e96932b0e3 [ticket/9657] Add functional test for splitting topic
PHPBB3-9657
2013-07-12 22:43:11 -04:00
Joas Schilling
a01d8cdfa3 [ticket/9657] Add functional test for restoring a post/topic
PHPBB3-9657
2013-07-12 21:20:33 -04:00
Nathan Guse
86b910692a Merge pull request #1515 from Hardolaf/feature/auth-refactor
[feature/auth-refactor] Use a base class for all authentication providers
2013-07-12 12:51:35 -07:00
Joas Schilling
0297b88aaf [ticket/9657] Add unit tests for softdeleting and moving posts/topics
PHPBB3-9657
2013-07-12 15:41:52 -04:00
Nathaniel Guse
8a93a35def Merge remote-tracking branch 'remotes/Marc/ticket/11548-develop' into develop
# By Marc Alexander
# Via Marc Alexander
* remotes/Marc/ticket/11548-develop:
  [ticket/11548] Fix test errors in groups test on develop
  [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
2013-07-12 14:12:46 -05:00
Andreas Fischer
6c8bfcdef6 Merge remote-tracking branch 'EXreaction/ticket/11669' into develop
* EXreaction/ticket/11669:
  [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
2013-07-12 21:02:29 +02:00
Nathaniel Guse
224aec0f2d [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
PHPBB3-11669
2013-07-12 13:57:24 -05:00
Marc Alexander
01b9f9f9b6 [ticket/11548] Fix test errors in groups test on develop
This will fix the errors that appeared in the functional groups test due to
the changes in the new avatar system. The patch will make them work again.

PHPBB3-11548
2013-07-12 14:38:18 -04:00
Andreas Fischer
0d0338a55c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11548] Fix incorrect usage of array_map on acp groups page

Conflicts:
	tests/functional/common_groups_test.php
	tests/functional/ucp_groups_test.php
2013-07-12 20:09:22 +02:00
Marc Alexander
da8e35ac77 [ticket/11548] Fix incorrect usage of array_map on acp groups page
The array_map was only ran on small parts of the actual error array instead
of the whole one. This resulted in the output of the language variables' names
rather than their actual value.

PHPBB3-11548
2013-07-12 13:40:30 -04:00
Andreas Fischer
ac9dfd023c Merge remote-tracking branch 'EXreaction/ticket/11665' into develop
* EXreaction/ticket/11665:
  [ticket/11665] Fix test class name
  [ticket/11665] Can't change file names already sent to set_filenames
2013-07-12 19:15:25 +02:00
Nathaniel Guse
27b550ae66 [ticket/11665] Fix test class name
PHPBB3-11665
2013-07-12 12:10:57 -05:00
Nathaniel Guse
df3f0a212e [ticket/11664] Stop creating php.html file in root path in tests
Also includephp_absolute.html

PHPBB3-11664
2013-07-12 11:56:03 -05:00
Nathaniel Guse
7e20b71180 [ticket/11665] Can't change file names already sent to set_filenames
PHPBB3-11665
2013-07-12 11:47:34 -05:00
Andreas Fischer
658b378b63 [ticket/11662] Typos: occured -> occurred
PHPBB3-11662
2013-07-12 17:51:29 +02:00
Andreas Fischer
f4b7cbd976 [ticket/11662] Typos: occured -> occurred
PHPBB3-11662
2013-07-12 17:10:18 +02:00
Nathaniel Guse
fa8f62a604 [ticket/11420] Fix tests
PHPBB3-11420
2013-07-12 09:46:51 -05:00
Joseph Warner
b9f33e5a87 [feature/auth-refactor] Add parent::setUp() in setUp()
PHPBB3-9734
2013-07-11 21:57:36 -04:00
Joseph Warner
79f0866b78 [feature/auth-refactor] Changes
PHPBB3-9734
2013-07-11 18:49:56 -04:00
Joseph Warner
e5f1e0f984 [feature/auth-refactor] DataProvider for acp_board test
PHPBB3-9734
2013-07-11 18:36:09 -04:00
Nils Adermann
b1d3c1bf69 Merge pull request #1522 from igorw/feature/bootstrap-dic
[feature/bootstrap-dic] Bootstrap container from config.php
2013-07-11 15:28:26 -07:00
Joseph Warner
4bd676e4ae [feature/auth-refactor] Test selecting invalid provider as well
PHPBB3-9734
2013-07-11 18:26:57 -04:00
Joseph Warner
8b2ca35b54 [feature/auth-refactor] Code style change
PHPBB3-9734
2013-07-11 18:25:19 -04:00
Joseph Warner
0fbf8f8c81 [feature/auth-refactor] Move test classes into separate directory
PHPBB3-9734
2013-07-11 18:22:26 -04:00
Joseph Warner
c17f8a5d37 [feature/auth-refactor] Test that acp_board excludes invalid providers
PHPBB3-9734
2013-07-11 18:15:41 -04:00
Vjacheslav Trushkin
f5c2119e7c [ticket/11647] Always use & for URLs
Remove code for URLs separated with ;
Add test case for mix of & and & in URLs

PHPBB3-11647
2013-07-11 18:13:48 -04:00
Andreas Fischer
382ae5a01e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11548] Use new static methods for request and submit
  [ticket/11548] Run array_map on complete error array and not just colour_error

Conflicts:
	tests/functional/ucp_groups_test.php
2013-07-12 00:11:18 +02:00
Igor Wiedler
1a5d685f45 [feature/bootstrap-dic] Bootstrap container from config.php
PHPBB3-11651
2013-07-11 18:04:40 -04:00
Marc Alexander
2667c3a527 [ticket/11548] Use new static methods for request and submit
PHPBB3-11548
2013-07-11 17:34:34 -04:00
Marc Alexander
dc4687501a Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ticket/11548 2013-07-11 17:30:32 -04:00
Nathaniel Guse
9bfb567854 [ticket/11420] Fix tests
PHPBB3-11420
2013-07-11 15:58:02 -05:00
Nathaniel Guse
91165e0758 [ticket/11420] Fix tests
PHPBB3-11420
2013-07-11 15:49:32 -05:00
Vjacheslav Trushkin
94e5bfaada [ticket/10772] Updating tests
PHPBB3-10772
2013-07-11 22:46:26 +02:00
Vjacheslav Trushkin
335d48775f [ticket/10772] Remove 3.1 code
PHPBB3-10772
2013-07-11 22:46:19 +02:00
Nathaniel Guse
9f5c1e0062 [ticket/11388] Add newlines at EOF
PHPBB3-11388
2013-07-11 15:40:43 -05:00
Nathaniel Guse
159f018056 [ticket/11388] INCLUDECSS
PHPBB3-11388
2013-07-11 15:31:55 -05:00
Marc Alexander
599f83395f [ticket/11548] Run array_map on complete error array and not just colour_error
Up to now the array_map() that turns error messages into the localized output
was only ran if the group's color was set. With this patch it'll run the
array_map() on the complete error array if it's not empty.

PHPBB3-11548
2013-07-11 16:15:27 -04:00
Vjacheslav Trushkin
6eef2aebd7 [ticket/11647] Fix tests for INCLUDEJS
PHPBB-11647
2013-07-11 15:40:28 -04:00
Nils Adermann
59f34bef08 Merge pull request #1470 from EXreaction/feature/twig
Feature/twig
2013-07-11 12:11:41 -07:00
Nathaniel Guse
7104aeb77e Merge branch 'develop-olympus' into develop
# By Vjacheslav Trushkin
# Via Nathaniel Guse (1) and Vjacheslav Trushkin (1)
* develop-olympus:
  [ticket/10772] Remove unnecessary comment
  [ticket/10772] Functional tests for forum style

Conflicts:
	tests/functional/forum_style_test.php
2013-07-11 13:15:26 -05:00
Nathaniel Guse
cb0335ebcb Merge remote-tracking branch 'remotes/cyberalien/ticket/develop/10772' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/develop/10772:
  [ticket/develop/10772] Fix copyright year
  [ticket/develop/10772] Unit tests for forum specific style
  [ticket/10772] Use forum specific style for trigger_error
2013-07-11 13:12:41 -05:00
Nathaniel Guse
406c48c655 Merge remote-tracking branch 'remotes/cyberalien/ticket/10772' into develop-olympus
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/10772:
  [ticket/10772] Remove unnecessary comment
  [ticket/10772] Functional tests for forum style
  [ticket/10772] Use forum specific style for trigger_error
2013-07-11 13:08:24 -05:00
Nathaniel Guse
5b81cad775 Merge branch 'develop-olympus' into develop
# By Igor Wiedler
# Via Igor Wiedler (1) and Nathaniel Guse (1)
* develop-olympus:
  [ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6
2013-07-11 12:25:54 -05:00
Igor Wiedler
20d59c49e2 [ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6
PHPBB3-11644
2013-07-11 13:00:21 -04:00