1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-28 02:01:52 +02:00

413 Commits

Author SHA1 Message Date
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
Joas Schilling
65e6ab5530 [ticket/10345] Return the language key when the key has an empty array
PHPBB3-10345
2011-11-30 21:23:00 +01:00
Joas Schilling
6c69bdb734 [ticket/10345] Fix little type in unit test
PHPBB3-10345
2011-11-25 15:10:51 -05:00
Joas Schilling
33e3bf4f64 [ticket/10345] Make the use of the 0-case optional
And correctly determinate the rule otherwise

PHPBB3-10345
2011-11-25 15:10:51 -05:00
Joas Schilling
814220f1c1 [ticket/10345] Add tests for array() as first parameter on call to $user->lang()
PHPBB3-10345
2011-11-25 15:10:50 -05:00
Joas Schilling
2de7153afd [ticket/10345] Allow float as array key and add some tests
Added tests for the fallback when a key is missing and the float-feature.

PHPBB3-10345
2011-11-25 15:10:49 -05:00
Joas Schilling
f16d72fcfb [ticket/10345] Fix documentation on the new function and the switch
Also do not min/max the value, but throw an error on an invalid Plural rule.

PHPBB3-10345
2011-11-25 15:04:31 -05:00
Joas Schilling
757fcd3e63 [ticket/10345] Add a system to allow multiple plural forms
See http://wiki.phpbb.com/Plural_Rules for explanation and examples.

PHPBB3-10345
2011-11-25 15:04:30 -05:00
Andreas Fischer
c4e29bde23 Merge remote-tracking branch 'p/ticket/10481' into develop
* p/ticket/10481:
  [ticket/10481] Use phar:// url for requiring goutte.
  [ticket/10481] Skip functional tests if phar extension is missing.
2011-11-25 19:37:59 +01:00
Oleg Pudeyev
7b4fd00ae5 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10483] Fix test suite when running with MySQL strict mode
2011-11-25 01:08:05 -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
Igor Wiedler
aef3652d7a [ticket/10483] Fix test suite when running with MySQL strict mode
PHPBB3-10483
2011-11-21 13:09:27 +01:00
Igor Wiedler
b7c4fb38de Merge remote-tracking branch 'naderman/feature/extension-manager' into develop
* naderman/feature/extension-manager: (67 commits)
  [feature/extension-manager] Removing now unused acp_search code
  [feature/extension-manager] Split disabling extensions up into steps as well
  [feature/extension-manager] Add documentation on caching in ext finder
  [feature/extension-manager] Reference correct new module basenames in install
  [feature/extension-manager] Rename default methods to core methods on finder.
  [feature/extension-manager] Document what the class loader stores in cache
  [feature/extension-manager] Add docblock to cached paths map in class loader
  [feature/extension-manager] Clear up docs of extension related template changes
  [feature/extension-manager] Use "core files" instead of "global files" in docs
  [feature/extension-manager] Add docblocks to new search backend methods
  [feature/extension-manager] Add docblocks to new methods in functions_module
  [feature/extension-manager] Clarify comment on ext meta class instantiator
  [feature/extension-manager] Add more info on suffixes in extension finder
  [feature/extension-manager] Clarify is_dir parameter description
  [feature/extension-manager] Clarify class finding method docblock
  [feature/extension-manager] Correct default path comment & remove double strlen
  [feature/extension-manager] Fix "disbale" typo in comment
  [feature/extension-manager] Properly remove old ACP language loading code
  [feature/extension-manager] Support extensions in subdirectories of ext/
  [feature/extension-manager] Add prefix to extension meta data / install classes
  ...
2011-11-19 01:20:22 +01:00
Nils Adermann
5a8359b90e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10296] Fix CROSS JOIN with INNER JOIN on MSSQL, Postgres and Oracle
  [ticket/10296] Add unit test for CROSS JOIN with INNER JOIN
2011-11-18 19:17:46 +01:00
Nils Adermann
cfaf0e1e96 Merge remote-tracking branch 'github-nickvergessen/ticket/10296' into develop-olympus
* github-nickvergessen/ticket/10296:
  [ticket/10296] Fix CROSS JOIN with INNER JOIN on MSSQL, Postgres and Oracle
  [ticket/10296] Add unit test for CROSS JOIN with INNER JOIN
2011-11-18 19:17:20 +01:00
Nils Adermann
addf81f62e Merge branch 'develop' into feature/extension-manager
* develop: (93 commits)
  [ticket/10157] Add notification to update cpfs when installing a language.
  [ticket/10185] Always set board startdate on conversion
  [ticket/10419] Reword the language strings
  [ticket/9361] View correct error messages when editing account information
  [ticket/10457] Undefined variable $request, when print-viewing PMs
  [ticket/10452] Fix xHTML errors when print-viewing PMs
  [ticket/9066] Move regex into get_preg_expression function and add tests
  [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css
  [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com.
  [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com.
  [ticket/10254] Remove subsilver2 as default style on theme.
  [ticket/10254] Remove style names from themes and fix some informations on it.
  [ticket/7138] Allow simple header and footer for trigger_error() messages
  [ticket/9066] Disallow some database prefix to prevent same errors and problems
  [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read
  [ticket/10437] Do not display announcements that are waiting for approval
  [ticket/10087] Organize bans in acp_baninto optgroups
  [ticket/8616] Include old U_INBOX var for BC
  [ticket/10435] Remove global announcement from forums total topic count
  [ticket/10435] Readd local announcements to total topic count in viewforum
  ...

Conflicts:
	phpBB/install/database_update.php
2011-11-18 19:14:06 +01:00
Nils Adermann
5068c05887 [feature/extension-manager] Split disabling extensions up into steps as well
PHPBB3-10323
2011-11-18 18:24:18 +01:00
Nils Adermann
0d296785b2 [feature/extension-manager] Rename default methods to core methods on finder.
There are now extension_ and core_ methods for all finder settings as well as
a generic method which overwrites both.

PHPBB3-10323
2011-11-18 16:44:42 +01:00
Joas Schilling
e8686d9dad [ticket/10296] Add unit test for CROSS JOIN with INNER JOIN
PHPBB3-10296
2011-11-15 22:14:28 +01:00
Andreas Fischer
34ed1352a6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9066] Move regex into get_preg_expression function and add tests
  [ticket/9066] Disallow some database prefix to prevent same errors and problems
2011-11-14 15:46:58 +01:00
Andreas Fischer
f31da015fc Merge remote-tracking branch 'nickvergessen/ticket/9066' into develop-olympus
* nickvergessen/ticket/9066:
  [ticket/9066] Move regex into get_preg_expression function and add tests
  [ticket/9066] Disallow some database prefix to prevent same errors and problems
2011-11-14 15:46:50 +01:00
Joas Schilling
3302305cd4 [ticket/9066] Move regex into get_preg_expression function and add tests
PHPBB3-9066
2011-11-14 15:10:25 +01: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
Nils Adermann
9c861a0350 [ticket/10414] Skip functional tests on PHP 5.2 - requires PHPUnit 3.6 on 5.2
Tests still execute correctly using PHPUnit 3.5 on PHP 5.3 and above. The php
version limitation for a directory was added in PHPUnit 3.6. A separate test
suite is required because the functional tests are in the whitelisted tests
directory. The base test for functional testing is only included in bootstrap
in versions 5.3 and above.

PHPBB3-10414
2011-10-17 06:52:34 +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
99d6f00d51 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10327] Use $this->tools instead of creating a new instance of db_tools.
  [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.
2011-10-14 17:50:53 +02:00
Igor Wiedler
cafefe9379 Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympus
* bantu/ticket/10327:
  [ticket/10327] Use $this->tools instead of creating a new instance of db_tools.
  [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.
2011-10-14 17:50:08 +02:00
Nils Adermann
8a82ec95a5 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8240] Add ability to get a list of columns of a tables to db_tools.
  [ticket/8240] Add ability to get a list of tables to db_tools.
2011-10-14 17:48:15 +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
Andreas Fischer
607761e830 [ticket/10327] Use $this->tools instead of creating a new instance of db_tools.
PHPBB3-10327
2011-10-14 17:23:29 +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
Andreas Fischer
4effe8fb8b [ticket/8240] Add ability to get a list of columns of a tables to db_tools.
PHPBB3-8240
2011-10-14 16:35:14 +02:00
Andreas Fischer
234edf674c [ticket/8240] Add ability to get a list of tables to db_tools.
PHPBB3-8240
2011-10-14 16:35:07 +02:00
Igor Wiedler
37d9e7e30c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.
2011-10-14 14:35:21 +02:00
Andreas Fischer
d86fccf9c9 [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.
* CREATE INDEX is internally mapped to an ALTER INDEX statement.
* CREATE INDEX requires the INDEX permission.
* ALTER TABLE requires the (more powerful) ALTER permission.
* We require the ALTER permission anyway for operation.
* Changing CREATE INDEX to ALTER TABLE thus removes dependency on the INDEX
  permission which is good because some management software does not give
  out the INDEX permission by default.

http://dev.mysql.com/doc/refman/5.0/en/create-index.html

PHPBB3-10327
2011-10-14 14:30:51 +02:00
Nils Adermann
4fb9f2101d [feature/extension-manager] Support extensions in subdirectories of ext/
PHPBB3-10323
2011-10-14 01:30:50 +02:00
Nils Adermann
f53892c838 [feature/extension-manager] Add prefix to extension meta data / install classes
PHPBB3-10323
2011-10-14 00:52:36 +02:00
Andreas Fischer
301f9d42f7 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10307] Add a test for PHPBB3-10307
  [ticket/10307] Return false in mysqli sql_fetchrow on empty result
2011-10-13 23:45:04 +02:00
Nils Adermann
724f40f0f4 [feature/extension-manager] extension finder now saves ext it found a file in
PHPBB3-10323
2011-10-13 21:19:35 +02:00
Igor Wiedler
6d9e9d1901 [ticket/10307] Add a test for PHPBB3-10307
PHPBB3-10307
2011-10-13 16:57:42 +02:00
Nils Adermann
77f42969ab [feature/extension-manager] Extend the tests for finding directories
PHPBB3-10323
2011-09-29 16:55:50 +02:00
Nils Adermann
520a5f9295 [feature/extension-manager] Refactoring the structure of extension provider
PHPBB3-10323
2011-09-29 16:15:53 +02:00
Nils Adermann
52f5fa796f [feature/extension-manager] Add extension meta info classes for test extensions
PHPBB3-10323
2011-09-29 16:15:53 +02:00
Nils Adermann
ea46feb115 [feature/extension-manager] Add support for templates in extensions.
This commit adds a template path provider to separate the process of locating
(cached) paths in extensions from the template engine. The locator is supplied
with a list of paths from the path provider.

Admin templates can now be created in ext/<ext>/adm/style/ and regular
templates go into ext/<ext>/styles/<style>/template/. Extension templates
override regular templates. So if an extension supplies a file with a name
used in phpBB, the extension's file will be used.

A side-effect of this commit: Locator and Provider are now able to deal with
arbitrary levels of template inheritance. So we can expose this through
phpbb_template if we choose to, and allow styles to inherit from inherited
styles.

PHPBB3-10323
2011-09-29 16:15:53 +02:00