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

2364 Commits

Author SHA1 Message Date
Andreas Fischer
7642fbbd63 Merge pull request #2527 from dhruvgoel92/ticket/11445
[ticket/11445] optimize no of queries in get_global_subscriptions( )

* dhruvgoel92/ticket/11445:
  [ticket/11445] Move get user's notification code into its own method
  [ticket/11445] Remove unused foreach key $group_name
  [ticket/11445] Improve unit tests for get_global_subscriptions
  [ticket/11445] Optimize no of queries in get_global_subscriptions
2014-06-14 00:16:52 +02:00
Joas Schilling
309aa1d8bf Merge pull request #2580 from VSEphpbb/ticket/12697
[ticket/12697] Delete cached extension schema.json files after testing

* VSEphpbb/ticket/12697:
  [ticket/12697] Delete cached extension schema.json files after testing
2014-06-13 12:49:04 +02:00
Matt Friedman
be54b64893 [ticket/12697] Delete cached extension schema.json files after testing
PHPBB3-12697
2014-06-12 14:57:32 -07:00
Nils Adermann
694f8391c9 Merge remote-tracking branch 'github-marc1706/ticket/12352' into develop-ascraeus
* github-marc1706/ticket/12352: (33 commits)
  [ticket/12352] Do not check hashes that don't have the necessary length
  [ticket/12352] Update file headers to fit new format
  [ticket/12352] Use custom provider collection for auth providers
  [ticket/12352] Add checks for existing user_pass_convert to migrations
  [ticket/12352] Remove usages of user_pass_convert column
  [ticket/12352] Update schema json file
  [ticket/12352] Remove user_pass_convert column from database
  [ticket/12352] Check each newly added passwords driver in manager_test
  [ticket/12352] Add get_settings_only method to passwords driver base
  [ticket/12352] Add passwords driver for xenforo 1.0, 1.1 passwords
  [ticket/12352] Add tests for wcf1 and wcf2 drivers
  [ticket/12352] Add driver for woltlab community framework 1 passwords
  [ticket/12352] Add driver for woltlab community framework 2 passwords
  [ticket/12352] Add missing $ to md5_mybb and md5_vb driver
  [ticket/12352] Fix spacing in passwords tests
  [ticket/12352] Add passwords driver for vB passwords
  [ticket/12352] Use correct hashing method in md5_mybb driver
  [ticket/12352] Add driver for myBB md5 passwords
  [ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers
  [ticket/12352] Add passwords driver for sha1 password hashes
  ...
2014-06-11 14:27:57 +02:00
Joas Schilling
916db1a0b1 [ticket/12483] Fix selectors for installing extensions in functional tests
PHPBB3-12483
2014-06-10 20:30:07 +02:00
Joas Schilling
38c2d42304 [ticket/12483] Remove unused globals
PHPBB3-12483
2014-06-10 19:44:06 +02:00
Joas Schilling
d0766a2321 [ticket/12483] Fix finder usage when generating the schema.json file
PHPBB3-12483
2014-06-10 19:43:13 +02:00
Joas Schilling
18d145f38f [ticket/12483] Use file_put_contents()
PHPBB3-12483
2014-06-10 19:41:37 +02:00
Joas Schilling
7b0b6a99c0 [ticket/12483] Close database connection when tearDown() is called
Similar to phpbb_database_test_case::tearDown()

PHPBB3-12483
2014-06-10 19:41:36 +02:00
Joas Schilling
13217fe3ff [ticket/12483] Require the extension manager class
PHPBB3-12483
2014-06-10 19:41:36 +02:00
Joas Schilling
5bae2911a2 [ticket/12483] Move schema files into tmp/ and only copy them when needed
PHPBB3-12483
2014-06-10 19:41:35 +02:00
Joas Schilling
997028a0ec [ticket/12483] Allow to setup extensions before database and functional tests
PHPBB3-12483
2014-06-10 19:41:34 +02:00
Joas Schilling
fb3c6b94ae [ticket/12508] Add a unit test for set_extensions()
PHPBB3-12508
2014-06-10 11:47:42 +02:00
Joas Schilling
6980fbd27b [ticket/12508] Only take a list of names for set_extensions()
PHPBB3-12508
2014-06-10 11:47:41 +02:00
Joas Schilling
183492b019 [ticket/12508] Move \phpbb\extension\finder to \phpbb\finder
PHPBB3-12508
2014-06-10 11:47:40 +02:00
Joas Schilling
d45c681b40 [ticket/12508] Fix usages of the finder
PHPBB3-12508
2014-06-10 11:47:39 +02:00
Joas Schilling
771cbb2b3a Merge pull request #2434 from Nicofuma/ticket/8610
[ticket/8610] Merging topics does not handle bookmarks correctly

* Nicofuma/ticket/8610:
  [ticket/8610] Use css selector instead of xPath
  [ticket/8610] Add functional test when two topics are merged
  [ticket/8610] Throw an error when the dest topic isn't set
  [ticket/8610] Fix bookmarks when merging all the posts of a topic
  [ticket/8610] Merging topics does not handle bookmarks correctly
2014-06-09 22:57:27 +02:00
Nils Adermann
b6232aa9b2 Merge remote-tracking branch 'github-nickvergessen/ticket/10073' into develop-ascraeus
* github-nickvergessen/ticket/10073: (36 commits)
  [ticket/10073] Fix button descriptions
  [ticket/10073] Do not check disable boxes by default
  [ticket/10073] Store values with config_text in the ACP
  [ticket/10073] Move config values to config_text
  [ticket/10073] Fix request usage
  [ticket/10073] Deduplicate template variable names
  [ticket/10073] Get service from container
  [ticket/10073] Fix more "Contact Us" strings
  [ticket/10073] Move template code into the template
  [ticket/10073] Make contact page available when board is disabled
  [ticket/10073] Change name of the ACP module
  [ticket/10073] Deduplicate posting buttons code in ACP
  [ticket/10073] Use phpbb_validate_email to verify email address
  [ticket/10073] Add tests for new validate_email()
  [ticket/10073] Split email validation from email ban and taken checks
  [ticket/10073] Deduplicate the if statement
  [ticket/10073] Fallback to board_contact when contact page is disabled
  [ticket/10073] Remove language string from rebase conflict
  [ticket/10073] Add ACP module to add bbcode text for contact admin info
  [ticket/10073] Add new configs to the schema
  ...
2014-06-09 17:55:25 +02:00
Andreas Fischer
69e50dffae Merge pull request #2509 from Stephannos/ticket/12602
[ticket/12602] Add command to print the cron list

* Stephannos/ticket/12602:
  [ticket/12602] Fix language key removal.
  [ticket/12602] Rectify language keys.
  [ticket/12602] Fix test mistake.
  [ticket/12602] Fix language var mistakes.
  [ticket/12602] Add types, change description of cron:list.
  [ticket/12602] Fix internationalisation of cron_list.php
  [ticket/12602] Fix spaces issues.
  [ticket/12602] Coding style correction.
  [ticket/12602] Fix coding style mistakes.
  [ticket/12602] Headers updated.
  [ticket/12602] Changes to respect coding style and to factorize code.
  [ticket/12602] Cleanup tests
  [ticket/12602] Add function get_tasks.
  [ticket/12602] Correction of the output message for the cron list
  [ticket/12602] Add files to print the cron list and test files.
2014-06-06 19:43:09 +02:00
Etienne Baroux
347de7f060 [ticket/12602] Rectify language keys.
PHPBB3-12602
2014-06-06 14:55:37 +02:00
Etienne Baroux
49beb2075b [ticket/12602] Fix test mistake.
PHPBB3-12602
2014-06-06 10:29:58 +02:00
Andreas Fischer
f9c0a6b96e Merge pull request #2526 from Nicofuma/ticket/12639
[ticket/12639] Delete entry in admin-log leads to mysql-error

* Nicofuma/ticket/12639:
  [ticket/12639] Add a space in the code generated by generate_sql_keyword()
  [ticket/12639] Handle $conditions['keywords'] outside of the loop
  [ticket/12639] Don't make a copy of $marked when deleting logs in acp_logs
  [ticket/12639] Send a correct IN entry when deleting marked logs
  [ticket/12639] Use assertSame
  [ticket/12639] Remove old commented tests
  [ticket/12639] Order the results correctly in the test
  [ticket/12639] Fix tests on postgres
  [ticket/12639] Update tests to use a dataProvider
  [ticket/12639] Add a test case with an empty keywords list
  [ticket/12639] Delete entry in admin-log leads to mysql-error
2014-06-04 23:59:20 +02:00
Etienne Baroux
442e12828b [ticket/12602] Fix spaces issues.
PHPBB3-12602
2014-06-04 21:56:55 +02:00
Etienne Baroux
5aca27e8cf [ticket/12602] Fix coding style mistakes.
PHPBB3-12602
2014-06-03 10:54:28 +02:00
Etienne Baroux
721a1d0bc4 [ticket/12602] Headers updated.
PHPBB3-12602
2014-06-03 10:50:00 +02:00
Etienne Baroux
760aa9d402 [ticket/12602] Changes to respect coding style and to factorize code.
PHPBB3-12602
2014-06-03 10:42:50 +02:00
Tristan Darricau
c3ccef10d1 [ticket/12602] Cleanup tests
PHPBB3-12602
2014-06-02 16:21:25 +02:00
Etienne Baroux
58d7302b49 [ticket/12602] Add files to print the cron list and test files.
PHPBB3-12602
2014-06-02 12:17:37 +02:00
Marc Alexander
6f5f0d6d8d [ticket/12352] Use custom provider collection for auth providers
Using this custom provider collection, we can properly check whether the
configured auth provider does exist. The method get_provider() has been added
for returning the default auth provider or the standard db auth provider if
the specified one does not exist.
Additionally, the method get_provider() will throw an RuntimeException if
none of the above exist.

PHPBB3-12352
2014-06-01 21:31:06 +02:00
Marc Alexander
4698f6928e [ticket/12352] Remove usages of user_pass_convert column
PHPBB3-12352
2014-06-01 21:31:05 +02:00
Marc Alexander
fcaae9b047 [ticket/12352] Check each newly added passwords driver in manager_test
PHPBB3-12352
2014-06-01 21:31:05 +02:00
Marc Alexander
4b3aacfd18 [ticket/12352] Add get_settings_only method to passwords driver base
PHPBB3-12352
2014-06-01 21:31:05 +02:00
Marc Alexander
f3eba6275a [ticket/12352] Add passwords driver for xenforo 1.0, 1.1 passwords
PHPBB3-12352
2014-06-01 21:31:05 +02:00
Marc Alexander
97c36b00b3 [ticket/12352] Add tests for wcf1 and wcf2 drivers
PHPBB3-12352
2014-06-01 21:31:05 +02:00
Marc Alexander
cf61d35d75 [ticket/12352] Add driver for woltlab community framework 1 passwords
PHPBB3-12352
2014-06-01 21:31:05 +02:00
Marc Alexander
2d7593995e [ticket/12352] Add driver for woltlab community framework 2 passwords
PHPBB3-12352
2014-06-01 21:31:05 +02:00
Marc Alexander
146d3cfe75 [ticket/12352] Fix spacing in passwords tests
PHPBB3-12352
2014-06-01 21:31:05 +02:00
Marc Alexander
c6e1b51d78 [ticket/12352] Add passwords driver for vB passwords
PHPBB3-12352
2014-06-01 21:31:05 +02:00
Marc Alexander
252a061864 [ticket/12352] Use correct hashing method in md5_mybb driver
PHPBB3-12352
2014-06-01 21:31:05 +02:00
Marc Alexander
af25aef04c [ticket/12352] Add driver for myBB md5 passwords
PHPBB3-12352
2014-06-01 21:31:05 +02:00
Marc Alexander
dc5a5a7cdf [ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers
PHPBB3-12352
2014-06-01 21:31:05 +02:00
Marc Alexander
033272f968 [ticket/12352] Add passwords driver for sha1 password hashes
PHPBB3-12352
2014-06-01 21:31:04 +02:00
Marc Alexander
b35ed3bc69 [ticket/12352] Add tests for functions in convert password driver
PHPBB3-12352
2014-06-01 21:31:04 +02:00
Marc Alexander
3508409c89 [ticket/12352] Add tests for phpBB2 md5 passwords driver
PHPBB3-12352
2014-06-01 21:31:04 +02:00
Marc Alexander
1e758ba7f0 [ticket/12352] Add passwords driver for passwords that should be converted
This driver will only be used for getting the new $CP$ prefix that will signal
that the hash is a legacy hash that needs to be converted.

PHPBB3-12352
2014-06-01 21:31:04 +02:00
Marc Alexander
57e4fb3810 [ticket/12352] Add tests for checking smf passwords
PHPBB3-12352
2014-06-01 21:31:04 +02:00
Marc Alexander
ed1d4fe4a0 [ticket/12352] Revert to db auth provider if default does not exist
This will make sure that we will not encounter a non-existing auth provider.
We will revert to the default db auth provider if the one set in the config
does not exist in our auth provider collection.

PHPBB3-12352
2014-06-01 21:31:04 +02:00
Marc Alexander
2ea45a06e7 [ticket/12352] Add legacy passwords driver for sha1 smf type passwords
PHPBB3-12352
2014-06-01 21:31:04 +02:00
Dhruv
c7687ba5aa [ticket/11445] Improve unit tests for get_global_subscriptions
PHPBB3-11445
2014-06-01 13:44:09 +05:30
Tristan Darricau
8e2a0caf54 [ticket/12639] Use assertSame
PHPBB3-12639
2014-06-01 02:57:16 +02:00