1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-30 19:24:13 +02:00

80 Commits

Author SHA1 Message Date
Oleg Pudeyev
b6a364b706 Merge PR #856 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10937] Update documentation to say which comment styles are removed.
  [ticket/10937] Comment removal functions: Restore backward compatibility
2012-07-07 16:43:30 -04:00
Oleg Pudeyev
a7da376004 Merge PR #856 branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10937] Update documentation to say which comment styles are removed.
  [ticket/10937] Comment removal functions: Restore backward compatibility
2012-07-07 16:43:28 -04:00
Andreas Fischer
81d5327e44 [ticket/10937] Comment removal functions: Restore backward compatibility
PHPBB3-10937
2012-07-03 01:02:42 +02:00
Nils Adermann
4ebcb5319e Merge remote-tracking branch 'github-p/ticket/10828' into develop-olympus
* github-p/ticket/10828:
  [ticket/10828] Connect to postgres database by default.
2012-06-12 00:44:59 +02:00
Nils Adermann
a0771b8814 Merge pull request #814 from p/ticket/10828
[ticket/10828] Connect to postgres database by default.
2012-06-11 15:42:26 -07:00
Nils Adermann
6956a6eb00 Merge branch 'develop-olympus' into develop
By David King
via David King (1) and Nils Adermann (1)
* develop-olympus:
  [task/functional] Use proper format for @var doc blocks.
  [task/functional] Fix $lang_path variable
  [task/functional] Change property visibility, remove globals, reword comment
  [task/functional] Make sure missing language values are handled properly
  [task/functional] Increase code coverage for functional tests

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2012-05-22 18:11:08 +02:00
Nils Adermann
5d5049710c Merge remote-tracking branch 'github-imkingdavid/task/functional' into develop-olympus
By David King
via David King
* github-imkingdavid/task/functional:
  [task/functional] Use proper format for @var doc blocks.
  [task/functional] Fix $lang_path variable
  [task/functional] Change property visibility, remove globals, reword comment
  [task/functional] Make sure missing language values are handled properly
  [task/functional] Increase code coverage for functional tests
2012-05-22 18:10:21 +02:00
David King
09d15db1fa [task/functional] Use proper format for @var doc blocks.
PHPBB3-10758
2012-05-22 12:06:27 -03:00
David King
819accedc8 [task/functional] Fix $lang_path variable
PHPBB3-10758
2012-05-22 10:52:49 -04:00
David King
b96c050695 [task/functional] Change property visibility, remove globals, reword comment
PHPBB3-10758
2012-05-22 10:46:36 -04:00
Oleg Pudeyev
9fa7ab62ad [ticket/10828] Connect to postgres database by default.
When not connecting to a specific database, connect to postgres
database which specifically exists as a default database to
connect to.

PHPBB3-10828
2012-05-21 23:02:12 -04:00
Andreas Fischer
2715fc5bdf Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10891] Allow specifying test_config.php path via environment.
2012-05-13 20:09:00 +02:00
Oleg Pudeyev
725db1ba29 [ticket/10891] Allow specifying test_config.php path via environment.
PHPBB3-10891
2012-05-11 22:26:54 -04:00
David King
b82c77b38f [task/functional] Make sure missing language values are handled properly
PHPBB3-10758
2012-04-24 14:10:50 -04:00
David King
8cf0b79a47 [task/functional] Increase code coverage for functional tests
PHPBB3-10758
2012-04-23 17:16:16 -04:00
Patrick Webster
2aa994b5ad [ticket/10492] Backporting functional tests
PHPBB3-10492
2012-04-21 04:37:57 -05:00
Patrick Webster
de70b17b1d [ticket/10492] Separate config generation from the installer
PHPBB3-10492
2012-04-20 23:50:49 -05:00
David King
6a0bad8c0b [ticket/10586] Tests finally work (thanks naderman)
PHPBB3-10586
2012-03-19 09:56:48 -04:00
Nils Adermann
1bbb32a5cf [ticket/10586] Correctly purge board cache and don't rename install directory
PHPBB3-10586
2012-03-19 09:12:34 -04:00
David King
76e6195194 [ticket/10586] trying to get tests to work
PHPBB3-10586
2012-03-19 09:12:34 -04:00
David King
7d1e4bca33 [ticket/10586] more work on getting tests to pass
PHPBB3-10586
2012-03-19 09:12:34 -04:00
David King
66b45318ef [ticket/10586] browse tests now work, but mine dont. at least we are making progress
PHPBB3-10586
2012-03-19 09:12:33 -04:00
David King
d235262bc2 [ticket/10586] Adding the extensions used by the tests
PHPBB3-10586
2012-03-19 09:12:33 -04:00
David King
a37a28b485 [ticket/10586] Now tests run, but fail. But here is what I have.
PHPBB3-10586
2012-03-19 09:12:33 -04:00
Oleg Pudeyev
cddd63aae0 Merge remote-tracking branch 'imkingdavid/ticket/10535' into develop
* imkingdavid/ticket/10535:
  [ticket/10535] Delete no longer needed email confirm language entries.
  [ticket/10535] Delete email confirm from installer
  [ticket/10535] Removed email confirm field from acp_users module
  [ticket/10535] Forgot a subsilver2 change. *doh*
  [ticket/10535] Removed email confirm from UCP, removed unused language entries
  [ticket/10535] Remove email confirm check on registration form
2012-02-03 16:21:51 -05:00
Unknown
66c50f6b30 [ticket/9916] Updating license in non-distributed files
PHPBB3-9916
2012-01-02 19:10:36 +01:00
Andreas Fischer
a01e916737 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9916] Changing header in non-distributed files
  [ticket/9916] Changing coding guidelines license
  [ticket/9916] Updating License in the header

Conflicts:
	tests/mock/cache.php
2012-01-02 17:36:21 +01:00
Unknown
17991823ea [ticket/9916] Updating License in the header
PHPBB3-9916
2012-01-02 16:18:32 +00:00
p
fc297a710e [ticket/10535] Delete email confirm from installer
PHPBB3-10535
2011-12-28 14:14:05 +00:00
Nils Adermann
72eb1ad8cc Merge remote-tracking branch 'github-igorw/feature/functional-tests' into develop
* github-igorw/feature/functional-tests:
  [feature/functional-tests] Introduce bootstrap method
  [feature/functional-tests] Make sure functional tests only install once
2011-12-14 14:35:20 +01:00
Oleg Pudeyev
0c0befe2f8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10349] Removed duplicated functions from schema loading in tests
  [ticket/10349] Update function comment
  [ticket/10349] Use new schema comment function in installer
  [ticket/10349] Unit tests: Consolidate schema comment removal functions
  [ticket/10349] Unit tests: Remove comments while loading schema files
2011-12-03 22:25:32 -05:00
Oleg Pudeyev
bf6d501ab1 Merge remote-tracking branch 'Noxwizard/ticket/10349' into develop-olympus
* Noxwizard/ticket/10349:
  [ticket/10349] Removed duplicated functions from schema loading in tests
  [ticket/10349] Update function comment
  [ticket/10349] Use new schema comment function in installer
  [ticket/10349] Unit tests: Consolidate schema comment removal functions
  [ticket/10349] Unit tests: Remove comments while loading schema files
2011-12-03 22:07:34 -05:00
Oleg Pudeyev
ba1603a5f0 [ticket/10481] Use phar:// url for requiring goutte.
It does not seem to work on my machine without phar:// even with
phar extension installed.

PHPBB3-10481
2011-11-24 14:16:58 -05:00
Oleg Pudeyev
44cab5696f [ticket/10481] Skip functional tests if phar extension is missing.
PHPBB3-10481
2011-11-24 14:03:09 -05:00
Patrick Webster
baac9e5d15 [ticket/10349] Removed duplicated functions from schema loading in tests
PHPBB3-10349
2011-10-29 17:10:10 -05:00
Andreas Fischer
88d064b6f4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10416] Pass dbport to PDO object in ...connection_manager::connect().
2011-10-17 16:43:33 +02:00
Andreas Fischer
38e7f3fff7 [ticket/10417] Fix array_merge() on undefined $config variable.
PHPBB3-10417
2011-10-16 20:34:25 +02:00
Andreas Fischer
fa1d9a4571 [ticket/10416] Pass dbport to PDO object in ...connection_manager::connect().
PHPBB3-10416
2011-10-16 20:10:37 +02:00
Igor Wiedler
d4189013ab [feature/functional-tests] Introduce bootstrap method
PHPBB3-10414
2011-10-14 19:42:35 +02:00
Igor Wiedler
66b0cfe221 [feature/functional-tests] Make sure functional tests only install once
The functional test setup bootstrapping should only be run once per
class.

PHPBB3-10414
2011-10-14 19:37:20 +02:00
Nils Adermann
a8aa7fd6c0 [feature/functional-tests] Don't add elements to backup list twice
PHPBB3-10414
2011-10-14 17:23:31 +02:00
Nils Adermann
a3928bf82d [feature/functional-tests] Generate config correctly and install only once
PHPBB3-10414
2011-10-14 17:23:31 +02:00
Nils Adermann
0ffe494edd [feature/functional-tests] Configure functional tests through config file
The functional tests now also use the test database

PHPBB3-10414
2011-10-14 17:20:54 +02:00
Igor Wiedler
637d8eabe7 [feature/functional-tests] Implementing functional test framework with goutte
PHPBB3-10414
2011-10-14 17:20:53 +02:00
Patrick Webster
b4dcd4193e [ticket/10349] Update function comment
PHPBB3-10349
2011-09-28 11:27:39 -05:00
Patrick Webster
4bc11db0ff [ticket/10349] Unit tests: Consolidate schema comment removal functions
PHPBB3-10349
2011-09-20 23:23:03 -05:00
Patrick Webster
bcaf65d7cd [ticket/10349] Unit tests: Remove comments while loading schema files
Perform the same operations that the installer does when preparing the schema
files. These functions come straight from /includes/functions_install.php and
/includes/functions_admin.php.

PHPBB3-10349
2011-09-03 17:26:36 -05:00
Igor Wiedler
c8ad006b71 [ticket/10060] Fix test suite under MySQL
Regression from PHPBB3-10043, a typo caused the database tests to fail
under MySQL.

PHPBB3-10060
2011-02-25 16:37:20 +01:00
Oleg Pudeyev
bd8e5ff79e [task/refactor-db-testcase] Further improve error messages.
PHPBB3-10043
2011-02-15 21:08:33 -05:00
Igor Wiedler
d3718bf5d4 [task/refactor-db-testcase] Do not show db password on connect error
PHPBB3-10043
2011-02-14 15:25:05 +01:00