mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
24,457 Commits 17 Branches 190 Tags
Commit Graph

80 Commits

Author SHA1 Message Date
Tristan Darricau
fdcd6e81cd [ticket/13063] Fix tests after rebase 
PHPBB3-13063
 2014-11-20 16:37:45 +01:00
Tristan Darricau
a5bfc76a73 [ticket/13063] Introduces a new \phpbb\routing\router class 
PHPBB3-13063
 2014-11-20 16:03:48 +01:00
Joas Schilling
cddb768772 Merge branch 'develop-ascraeus' into develop 2014-11-17 23:33:04 +01:00
Andreas Fischer
21c8985fe8 [ticket/13338] Add include statements for dependencies. 
PHPBB3-13338
 2014-11-17 21:54:02 +01:00
Nils Adermann
6104be6b4d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13280] Output escaping for the symfony request object
  [ticket/13280] Add new tests
  [ticket/13280] Make the tests failing
  [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"
 2014-11-16 16:50:29 +01:00
Tristan Darricau
0dfe1d0d8b [ticket/13280] Output escaping for the symfony request object 
PHPBB3-13280
 2014-11-16 16:45:19 +01:00
Nils Adermann
8de97b8dbe Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13113] Updates the base url only when the front-end isn't app.php
 2014-09-29 16:17:25 +02:00
Tristan Darricau
a159899d02 [ticket/13113] Updates the base url only when the front-end isn't app.php 
PHPBB3-13113
 2014-09-28 23:32:56 +02:00
Marc Alexander
9bf58697dc Merge branch 'ticket/13073' into ticket/13073-develop 
Conflicts:
	tests/controller/common_helper_route.php
 2014-09-19 18:48:24 +02:00
Marc Alexander
3418683cfc [ticket/13073] Remove _test suffix from common test class 
PHPBB3-13073
 2014-09-19 16:50:26 +02:00
Marc Alexander
543d68a7d3 [ticket/13073] Use abstract class for controller helper route tests 
PHPBB3-13073
 2014-09-19 15:21:04 +02:00
Marc Alexander
de7ed7c286 [ticket/13073] Use correct class names in test files 
PHPBB3-13073
 2014-09-19 12:01:31 +02:00
Marc Alexander
a6d9b42e5f [ticket/13073] Rework route tests and add tests for more directory types 
PHPBB3-13073
 2014-09-19 00:35:17 +02:00
Marc Alexander
d74f45aee0 [ticket/13073] Test that routes from subfolders like /adm work 
PHPBB3-13073
 2014-09-19 00:11:36 +02:00
Marc Alexander
a70addbf14 [ticket/13073] Add tests for routes from adm pages 
PHPBB3-13073
 2014-09-19 00:07:31 +02:00
Marc Alexander
f6ccb30781 Merge branch 'develop-ascraeus' into develop 2014-09-17 00:57:34 +02:00
Tristan Darricau
a48b740b94 [ticket/13036] Complete tests 
PHPBB3-13036
 2014-09-16 21:56:45 +02:00
Tristan Darricau
bb5d6a2551 [ticket/13036] Add unit tests 
PHPBB3-13036
 2014-09-16 19:44:58 +02:00
Marc Alexander
cf71bfbdf2 Merge branch 'develop-ascraeus' into develop 2014-09-16 19:24:45 +02:00
Tristan Darricau
f4260e261f [ticket/13034] Fix tests 
PHPBB3-13034
 2014-09-16 01:25:36 +02:00
Tristan Darricau
cb3eb84665 [ticket/13034] Fix the route generated for the frontend not in the phpbb root 
PHPBB3-13034
 2014-09-04 23:21:55 +02:00
Joas Schilling
d998efcf54 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12932] Remove set_datetime_class method from user class
  [ticket/12932] Fix tests and calls to create_datetime
  [ticket/12932] Add method for getting the datetime class and allow overriding

Conflicts:
	phpBB/config/services.yml
 2014-08-10 15:24:43 +02:00
Marc Alexander
8d99b4afe1 [ticket/12932] Fix tests and calls to create_datetime 
PHPBB3-12932
 2014-08-10 13:43:04 +02:00
Tristan Darricau
192b8e2568 [ticket/11649] Expose Twig through the container 
PHPBB3-11649
 2014-08-09 16:13:22 +02:00
Joas Schilling
b7e1959d56 [ticket/12099] Remove config again 
PHPBB3-12099
 2014-06-29 20:54:41 +02:00
Pico88
f383d4221c [ticket/12099] Add request argument to path_helper service 
PHPBB3-12099
 2014-06-29 20:54:38 +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
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers 
PHPBB3-12594
 2014-05-27 20:51:13 +02:00
Tristan Darricau
16cd1db59a [ticket/12529] Move $phpbb_root_path to the end of the constructor 
PHPBB3-12529
 2014-05-11 15:10:14 +02:00
Tristan Darricau
197c801746 [ticket/12529] Use root_path in controller\resolver to check the template dir 
PHPBB3-12529
 2014-05-11 14:10:19 +02:00
Tristan Darricau
346c6f3998 [ticket/11497] Rename set_ext_finder in find_routing_files 
PHPBB3-11497
 2014-05-05 18:20:14 +02:00
Tristan Darricau
8d9133a30e [ticket/11497] Use a mock object to define the root folder for the finder 
PHPBB3-11497
 2014-05-03 14:00:47 +02:00
Nicofuma
dc6e2be884 [ticket/11497] Remove 'ext.finder' from services' list 
PHPBB3-11497
 2014-05-03 11:29:14 +02:00
Joas Schilling
ed089f4b5f [ticket/12480] Remove unused use statements 
PHPBB3-12480
 2014-05-02 22:52:20 +02:00
Joas Schilling
a470b6c519 [ticket/12480] Add subfolder/config/routing.yml which should not be found 
PHPBB3-12480
 2014-05-02 22:48:28 +02:00
Joas Schilling
b29c4c6358 [ticket/12090] Move find() call to container and fix tests 
PHPBB3-12090
 2014-03-09 19:03:15 +01:00
Joas Schilling
2eb24d0ace [ticket/12090] Split finding routes and returning routes into 2 methods 
PHPBB3-12090
 2014-03-09 18:38:21 +01:00
Joas Schilling
07c07171f9 [ticket/12090] Make provider a service and inject it into the helper 
PHPBB3-12090
 2014-03-08 16:37:22 +01:00
Joas Schilling
ecf1e94726 [ticket/12090] Change redirect tests to use route() 
PHPBB3-12090
 2014-03-07 14:07:45 +01:00
Joas Schilling
51273f6fb1 [ticket/12090] Pass route name to url() to allow admins to change the routes 
PHPBB3-12090
 2014-03-07 12:32:38 +01:00
Joas Schilling
96317b2c45 [ticket/11948] Check actual result of routes 
PHPBB3-11948
 2013-10-21 22:18:03 +02:00
Joas Schilling
51561ed538 [ticket/11948] Allow resource importing for routing 
PHPBB3-11948
 2013-10-21 21:52:48 +02:00
Joas Schilling
3cc2e619d2 [ticket/11948] Add second routing file to tests 
PHPBB3-11948
 2013-10-19 12:11:09 +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
Nils Adermann
16fdef4866 [ticket/11700] Get unit tests to run again with namespaces 
PHPBB3-11700
 2013-09-19 18:50:08 +02: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
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