mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-14 13:46:33 +02:00
Code Issues Releases Wiki Activity
13,629 Commits 18 Branches 192 Tags
eda9bcc65de97b9ffb2c432756907ff0411b281f
Commit Graph

96 Commits

Author SHA1 Message Date
Andreas Fischer
db7b879b82 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10981] Added check for PHP version before running composer
  [ticket/10981] Modified travis to use composer with --dev
  [ticket/10981] Removed setupBeforeClass
  [ticket/10981] Modified functional framework to account for goutte changes
  [ticket/10981] Added goutte via composer

Conflicts:
	.travis.yml
	composer.phar
	phpBB/composer.json
	phpBB/composer.lock
	tests/bootstrap.php
 2012-07-19 16:59:45 +02:00
Andreas Fischer
3bbb882fe8 Merge remote-tracking branch 'Fyorl/ticket/10981' into develop-olympus 
* Fyorl/ticket/10981:
  [ticket/10981] Added check for PHP version before running composer
  [ticket/10981] Modified travis to use composer with --dev
  [ticket/10981] Removed setupBeforeClass
  [ticket/10981] Modified functional framework to account for goutte changes
  [ticket/10981] Added goutte via composer
 2012-07-19 16:40:33 +02:00
Fyorl
7a412f846a [ticket/10981] Removed setupBeforeClass 
PHPBB3-10981
 2012-07-17 21:39:48 +01:00
Nils Adermann
a3757763ac Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10678] Typo and formatting
  [ticket/10678] Add port handling for MSSQL tests
  [ticket/10678] Move config changes to new location
  [ticket/10678] Rename helper class file
  [ticket/10678] Lowercase class name, adjust comment width
  [ticket/10678] More formatting and docblocks
  [ticket/10678] More formatting requests
  [ticket/10678] Fix formatting
  [ticket/10678] Add better support for Firebird, Oracle, and MSSQL
 2012-07-17 21:13:05 +02:00
Nils Adermann
4a87bc2aa9 Merge remote-tracking branch 'github-noxwizard/ticket/10678' into develop-olympus 
* github-noxwizard/ticket/10678:
  [ticket/10678] Typo and formatting
  [ticket/10678] Add port handling for MSSQL tests
  [ticket/10678] Move config changes to new location
  [ticket/10678] Rename helper class file
  [ticket/10678] Lowercase class name, adjust comment width
  [ticket/10678] More formatting and docblocks
  [ticket/10678] More formatting requests
  [ticket/10678] Fix formatting
  [ticket/10678] Add better support for Firebird, Oracle, and MSSQL

Conflicts:
	tests/RUNNING_TESTS.txt
 2012-07-17 21:12:47 +02:00
Fyorl
d88411e10d [ticket/10981] Modified functional framework to account for goutte changes 
PHPBB3-10981
 2012-07-16 17:52:03 +01:00
Fyorl
797ee16eaf [ticket/10981] Added goutte via composer 
composer.phar added and autoloaded before tests

PHPBB3-10981
 2012-07-16 17:52:03 +01:00
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
Patrick Webster
29b36b214a [ticket/10678] Typo and formatting 
PHPBB3-10678
 2012-05-13 16:56:07 -05: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
Patrick Webster
1496a4198a [ticket/10678] Add port handling for MSSQL tests 
PHPBB3-10678
 2012-05-08 04:35:47 -05:00
Patrick Webster
711d09633a [ticket/10678] Move config changes to new location 
PHPBB3-10678
 2012-05-08 04:34:19 -05:00
Patrick Webster
3cdcd44c4b [ticket/10678] Rename helper class file 
PHPBB3-10678
 2012-05-08 04:31:32 -05:00
Patrick Webster
ceacb63abf [ticket/10678] Lowercase class name, adjust comment width 
PHPBB3-10678
 2012-05-08 04:31:32 -05:00
Patrick Webster
9bb2785da0 [ticket/10678] More formatting and docblocks 
PHPBB3-10678
 2012-05-08 04:31:31 -05:00
Patrick Webster
0a596c4b8c [ticket/10678] More formatting requests 
PHPBB3-10678
 2012-05-08 04:31:30 -05:00
Patrick Webster
5cbe919256 [ticket/10678] Fix formatting 
PHPBB3-10678
 2012-05-08 04:31:29 -05:00
Patrick Webster
d578eff712 [ticket/10678] Add better support for Firebird, Oracle, and MSSQL 
Allow ODBC connections for Firebird
Capitalize fixture tables and columns for Firebird
On database drop failure, drop all tables
Provide cleanup utilities for databases that cannot be dropped

PHPBB3-10678
 2012-05-08 04:31:29 -05: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