Commit graph

2668 commits

Author SHA1 Message Date
Dhruv
49ce2c13b2 Merge remote-tracking branch 'nickvergessen/ticket/11691' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11691:
  [ticket/11691] Fix conversion test
  [ticket/11691] Fix table names and arguments/docs
  [ticket/11691] Move purge code into new function
  [ticket/11691] Fix typo in comment
  [ticket/11691] Add order by to the query
  [ticket/11691] Fix some minor comments
  [ticket/11691] Fix some more problems with softdelete update
  [ticket/11691] Change detection of effectively_installed()
  [ticket/11691] Stagger user notification reconversion even more
  [ticket/11691] Stagger the convertion of soft delete updates
2013-10-02 20:46:11 +05:30
Marc Alexander
afb7d2e616 [feature/passwords] Rename manager methods to check() and hash()
These method names are more straightforward than the previous ones.

PHPBB3-11610
2013-10-02 13:30:36 +02:00
Marc Alexander
356f3eef07 [feature/passwords] Inject passwords manager into auth providers
The passwords manager will replace the old method of using the functions
phpbb_hash() and phpbb_check_hash().

PHPBB3-11610
2013-10-02 13:28:38 +02:00
Joas Schilling
7aadcd5472 [ticket/11691] Fix conversion test
PHPBB3-11691
2013-10-01 09:56:24 +02:00
Nathan Guse
b931b0b35b [ticket/11840] Correct Moo test extension composer
PHPBB3-11840
2013-09-30 21:36:10 -05:00
Nathan Guse
ff4756f87a [ticket/11840] Use generic information in the test extension
Not sure why I had my name/info in these files...

PHPBB3-11840
2013-09-30 21:24:46 -05:00
Nathan Guse
51c0aec066 [ticket/11850] More namespaces
PHPBB3-11850
2013-09-30 20:42:45 -05:00
Nathan Guse
b81d0bc228 [ticket/11850] More namespaces
PHPBB3-11850
2013-09-30 20:38:41 -05:00
Nathan Guse
870c293bab [ticket/11850] Fix tests
PHPBB3-11850
2013-09-30 20:04:32 -05:00
MichaelC
fd022123c0 [task/composer-compatibility] Minor changes that will break extension BC
PHPBB3-11840
2013-10-01 00:35:36 +01:00
Nathan Guse
85ae55ca2d [ticket/11850] Update for namespaces
PHPBB3-11850
2013-09-30 18:31:26 -05:00
Nathan Guse
a6df011a10 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11850
# By Nils Adermann (68) and others
# Via Andreas Fischer (12) and others
* 'develop' of github.com:phpbb/phpbb3: (102 commits)
  [ticket/11876] Replace MD5 with SHA256.
  [ticket/11876] Move checksum generation from build PHP files to phing build.xml
  [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now.
  [prep-release-3.0.12] Update changelog for 3.0.12 release.
  [ticket/11873] Add unit test for large password input.
  [ticket/11873] Do not hash very large passwords in order to safe resources.
  [ticket/11862] Correct var names in user_delete() events due to prune-users
  [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag.
  [prep-release-3.0.12] Bumping version number for 3.0.12 final.
  [ticket/11852] Add class file
  [ticket/11852] Move tests to folder with new class name
  [ticket/11852] Split filesystem and path_helper into 2 classes
  [ticket/11868] Add @depends to test
  [ticket/11868] Add functional test for registration
  [ticket/11868] Replace phpbb_request_interface references
  [ticket/11866] Only single backslash in .md files
  [ticket/11866] Remove outdated and broken develop script
  [ticket/11866] More namespaces
  [ticket/11866] Update some occurances of phpbb_db_ to new Namespace
  [ticket/11865] Convert old class name to namespaced version
  ...

Conflicts:
	tests/security/extract_current_page_test.php
	tests/session/testable_facade.php
2013-09-30 18:24:46 -05:00
Nathan Guse
179f41475b Merge pull request #1735 from nickvergessen/ticket/11852
Ticket/11852 filesystem class must not depend on a web request
2013-09-30 16:21:02 -07:00
Andreas Fischer
787784e083 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.12] Update changelog for 3.0.12 release.
  [ticket/11873] Add unit test for large password input.
  [ticket/11873] Do not hash very large passwords in order to safe resources.
2013-09-28 15:02:59 +02:00
Andreas Fischer
02f9d179e5 Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [prep-release-3.0.12] Update changelog for 3.0.12 release.
  [ticket/11873] Add unit test for large password input.
  [ticket/11873] Do not hash very large passwords in order to safe resources.
2013-09-28 15:02:44 +02:00
Marc Alexander
3ebff0a960 [feature/passwords] Pass config via service container to driver helper
This will get rid of the global $config in the driver helper

PHPBB3-11610
2013-09-28 12:42:11 +02:00
Joas Schilling
c6aefcf555 [ticket/11873] Add unit test for large password input.
The password should be rejected quite fast.

PHPBB3-11873
2013-09-28 03:14:18 +02:00
Marc Alexander
3f63b9b470 [feature/passwords] Modify passwords files for namespacing changes
PHPBB3-11610
2013-09-27 11:16:47 +02:00
Marc Alexander
663b4b2eb7 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords
Conflicts:
	phpBB/develop/create_schema_files.php
2013-09-27 10:47:10 +02:00
Joas Schilling
c7a9d5e34a [ticket/11852] Move tests to folder with new class name
PHPBB3-11852
2013-09-26 15:35:53 +02:00
Joas Schilling
7525c49d45 [ticket/11852] Split filesystem and path_helper into 2 classes
PHPBB3-11852
2013-09-26 15:34:44 +02:00
Andreas Fischer
36bf4438e4 Merge remote-tracking branch 'cyberalien/ticket/11868' into develop
* cyberalien/ticket/11868:
  [ticket/11868] Add @depends to test
  [ticket/11868] Add functional test for registration
  [ticket/11868] Replace phpbb_request_interface references
2013-09-26 14:24:50 +02:00
Vjacheslav Trushkin
ccf00c7265 [ticket/11868] Add @depends to test
PHPBB3-11868
2013-09-26 15:21:04 +03:00
Joas Schilling
b1dbd5e992 [ticket/11868] Add functional test for registration
PHPBB3-11868
2013-09-26 11:49:35 +02:00
Vjacheslav Trushkin
0e6ac7511e [ticket/11868] Replace phpbb_request_interface references
PHPBB3-11868
2013-09-26 12:02:17 +03:00
Joas Schilling
e8303bc319 Merge remote-tracking branch 'EXreaction/ticket/11816-2' into develop
* EXreaction/ticket/11816-2:
  [ticket/11816] Fix multiple parenthesis as well before $VARs in templates
2013-09-26 10:59:14 +02:00
David King
779688b56b Merge pull request #1733 from nickvergessen/ticket/11866
Ticket/11866 Fix some more namespace issues
2013-09-25 16:49:12 -07:00
David King
427f73a323 Merge pull request #1732 from nickvergessen/ticket/11865
[ticket/11865] includes/bbcode.php is missing namespace change
2013-09-25 16:09:08 -07:00
Joas Schilling
6d5be041e4 [ticket/11866] Only single backslash in .md files
PHPBB3-11866
2013-09-26 01:02:29 +02:00
Joas Schilling
03639c081c [ticket/11866] Update some occurances of phpbb_db_ to new Namespace
PHPBB3-11866
2013-09-26 00:42:04 +02:00
Joas Schilling
bc8c4ac270 [ticket/11865] Add bbcodes to functional posting tests
PHPBB3-11865
2013-09-26 00:07:22 +02:00
Joas Schilling
8c786e82a7 [ticket/11805] Rename test to match the function name
PHPBB3-11805
2013-09-25 17:34:31 +02:00
Joas Schilling
d7119a5054 [ticket/11805] Add unit tests for pagination
PHPBB3-11805
2013-09-25 17:34:31 +02:00
Nils Adermann
3a478cb3e2 [ticket/11700] Use spaces, not tabs
PHPBB3-11700
2013-09-25 14:36:50 +02:00
Marc Alexander
01512104b5 [feature/passwords] Use dependency injection for passwords driver helper
The passwords driver helper is now injected into the driver base instead
of being manually loaded.

PHPBB3-11610
2013-09-22 22:53:10 +02:00
Marc Alexander
f5eb0d744e [feature/passwords] Use dependency injection for helper
This will now be used instead of manually loading the passwords helper
instance in the passwords manager.

PHPBB3-11610
2013-09-22 21:17:30 +02:00
Marc Alexander
211f99d881 [feature/passwords] Do not manually include passwords drivers in tests
PHPBB3-11610
2013-09-20 17:53:33 +02:00
Marc Alexander
a00854c406 [feature/passwords] Do not pass phpbb_container to passwords manager
PHPBB3-11610
2013-09-20 17:31:32 +02:00
Nils Adermann
6b71284681 [ticket/11700] Correctly load templates for extensions
PHPBB3-11700
2013-09-19 19:53:57 +02:00
Nathan Guse
9152455d70 [ticket/11816] Fix multiple parenthesis as well before $VARs in templates
PHPBB3-11816
2013-09-19 12:40:53 -05:00
Nils Adermann
16fdef4866 [ticket/11700] Get unit tests to run again with namespaces
PHPBB3-11700
2013-09-19 18:50:08 +02:00
Nathan Guse
2ee22d4615 [ticket/11850] Fix extract current page test
PHPBB3-11850
2013-09-19 11:49:13 -05:00
Nils Adermann
fe36375a36 [ticket/11700] Fix extension loading with namespaces
class loader now expects all classes to be prefixed with a backslash
when resolving paths

PHPBB3-11700
2013-09-19 18:29:08 +02:00
Nathan Guse
d85ae0f7bc [ticket/11850] Add test for outside of the phpBB directory
PHPBB3-11850
2013-09-18 09:25:58 -05:00
Nathan Guse
9c535da528 [ticket/11850] page_name contains controller request rather than query string
Fixing tests

PHPBB3-11850
2013-09-17 22:00:06 -05:00
Nils Adermann
1a92c04ee3 [ticket/11700] Namespacif skipped filesystem instantiation in test
PHPBB3-11700
2013-09-17 18:30:19 +02:00
Nils Adermann
20b2d03e3b [ticket/11700] Namespace needed for mock object in web path test
PHPBB3-11700
2013-09-17 18:18:31 +02:00
Nils Adermann
9d8ac2b0ce [ticket/11700] Fix unit tests after develop merge
PHPBB3-11700
2013-09-17 17:12:41 +02:00
Nils Adermann
f039a3308a Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700
* github-phpbb/develop:
  [ticket/11832] Correct paths in tests
  [ticket/11832] Correct ROOT_PATH variable
  [ticket/11832] get_url() from phpbb_template_asset should return web path
  [ticket/11832] Fix INCLUDE(JS/CSS)
  [ticket/11832] Fix constructions of phpbb_filesystem
  [ticket/11832] Fix smiley paths
  [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request
  [ticket/11832] Fix build_url and the S_LOGIN_ACTION
  [ticket/11832] Changing comments to say app.php rather than index.php
  [ticket/11832] We must instantiate the $phpbb_filesystem in common
  [ticket/11832] Fix the web path corrections
  [ticket/11832] More extensive testing
  [ticket/11832] Use dirname(__FILE__)
  [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid
  Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework"
  [ticket/11832] Make $phpbb_container a global initiated by the framework
  [ticket/11832] Fix log tests
  [ticket/11832] update_web_root_path helper and tests
  [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)

Conflicts:
	phpBB/common.php
	phpBB/config/services.yml
	phpBB/includes/bbcode.php
	phpBB/includes/functions.php
	phpBB/includes/functions_messenger.php
	phpBB/install/index.php
	phpBB/phpbb/filesystem.php
	phpBB/phpbb/template/twig/environment.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/dbal/migrator_test.php
	tests/extension/manager_test.php
	tests/extension/metadata_manager_test.php
	tests/filesystem/clean_path_test.php
	tests/mock/extension_manager.php
	tests/template/template_events_test.php
	tests/template/template_test_case.php
	tests/template/template_test_case_with_tree.php
	tests/test_framework/phpbb_functional_test_case.php
2013-09-17 16:56:50 +02:00
Nils Adermann
c4b53490ad [ticket/11700] Correctly load extensions with nonprefixed namespaces
PHPBB3-11700
2013-09-17 16:15:44 +02:00