1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-17 09:46:25 +02:00
Commit Graph

317 Commits

Author SHA1 Message Date
Marc Alexander
d856c5c8c1 [ticket/15905] Adjust tests for twig extensions for master branch
PHPBB3-15905
2019-09-28 21:18:39 +02:00
Marc Alexander
f4462bdfd6 Merge branch '3.3.x' 2019-09-28 12:57:43 +02:00
Marc Alexander
f05022941d [ticket/15905] Reset avatar manager enabled drivers property
PHPBB3-15905
2019-09-28 11:58:02 +02:00
Marc Alexander
e00a154882 [ticket/15905] Add tests for twig extensions
PHPBB3-15905
2019-09-26 22:33:52 +02:00
mrgoldy
133dfd0a84 [ticket/15905] Try it without auth
PHPBB3-15905
2019-09-25 20:39:04 +02:00
mrgoldy
7989f3f71f [ticket/15905] Try with existing phpbb extension
PHPBB3-15905
2019-09-25 20:07:09 +02:00
Marc Alexander
ebac54aa9e [ticket/14948] Adjust calls for twig and phpunit updates
PHPBB3-14948
2019-05-09 21:40:06 +02:00
François-Xavier de Guillebon
40e61e4d1e [ticket/15508] Remove call to getEnvironment() from parser
PHPBB3-15508
2019-05-09 21:30:12 +02:00
rxu
42b7782927 [ticket/14972] Migrate from deprecated getMock() method to createMock()
PHPBB3-14972
2019-05-08 21:57:00 +02:00
Marc Alexander
c6cc6ba8d8 [ticket/14948] Adjust calls for twig and phpunit updates
PHPBB3-14948
2019-01-02 20:19:56 +01:00
Marc Alexander
805b52a2ef Merge pull request #5090 from deguif/twig-2
[ticket/15508] Support Twig 2.x
2018-12-25 23:06:25 +01:00
Marc Alexander
2c9d49bf09 Merge branch 'prep-release-3.2.3' into 3.2.x 2018-09-09 12:00:28 +01:00
Marc Alexander
1f0df30484 Merge branch '3.2.x' into ticket/15746-master 2018-08-26 09:43:33 +02:00
Marc Alexander
7545cb24a0 Merge branch 'prep-release-3.2.3' into 3.2.x 2018-08-21 21:28:44 +02:00
Marc Alexander
c20d84ce17 [ticket/15746] Adjust tests after twig update
PHPBB3-15746
2018-08-21 21:25:33 +02:00
Tristan Darricau
2d26fd5b0c Merge branch '3.2.x'
* 3.2.x:
  [ticket/15659] Fix retrieve_block_vars()
2018-07-08 18:43:17 +02:00
Jakub Senko
b5daa91650 [ticket/15659] Fix retrieve_block_vars()
PHPBB3-15659
2018-07-07 15:46:24 +02:00
Marc Alexander
82ccc43767 Merge branch '3.2.x' 2018-01-17 23:06:19 +01:00
Jakub Senko
ad748ec0a7 [ticket/15099] Fix tests
PHPBB3-15099
2018-01-17 22:10:53 +01:00
François-Xavier de Guillebon
23b13c239b [ticket/15508] Remove call to getEnvironment() from parser
PHPBB3-15508
2018-01-16 15:26:58 +01:00
Marc Alexander
c309b4cd8d Merge branch '3.2.x' 2017-11-01 18:02:14 +01:00
javiexin
bf882826e4 [ticket/14994] Refactor template->assign_block_var
Refactor assign_block_var to use the same block selection mechanism
as is used in alter_block_array.  This allows creating new blocks
at any position in the template structure, not only on the last block.
Allows selecting a block as outer[2].middle.
Added tests.

PHPBB3-14994
2017-11-01 12:29:47 +01:00
Rubén Calvo
c3a422bdeb [ticket/15253] Fix rebase
PHPBB3-15253
2017-07-20 19:55:52 +02:00
Rubén Calvo
b1755d9dac [ticket/15253] Update imports
PHPBB3-15253
2017-07-20 19:55:52 +02:00
Rubén Calvo
603a8c51da [ticket/15253] Move storage helper to filesystem
PHPBB3-15253
2017-07-20 19:55:52 +02:00
Rubén Calvo
ecb79539f4 [ticket/15253] Use storage helper methods instead of filesystem methods
PHPBB3-15253
2017-07-20 19:55:52 +02:00
rxu
e3859d894d [ticket/14972] Migrate from deprecated getMock() method to createMock()
PHPBB3-14972
2017-07-17 16:56:55 +07:00
Marc Alexander
7dc288cb89 Merge remote-tracking branch 'javiexin/ticket/15068' into 3.2.x 2017-05-29 12:13:41 +02:00
javiexin
37c48a59c3 Merge branch 'ticket/15068' of https://github.com/javiexin/phpbb into ticket/15068 2017-05-21 18:25:57 +02:00
javiexin
60d6667eb4 [ticket/15068] Add template vars retrieval from the template object
Added tests.

PHPBB3-15068
2017-05-21 18:18:59 +02:00
rxu
fcc8e155ec [ticket/14990] Move dispatcher object to the front of the options array
PHPBB3-14990
2017-04-16 23:40:16 +07:00
Marc Alexander
269150ed40 Merge pull request #4612 from javiexin/ticket/14950
[ticket/14950] Add possibility to delete a template block
2017-04-15 18:18:32 +02:00
Marc Alexander
7a1f4d5008 Merge branch '3.1.x' into 3.2.x 2017-02-23 22:21:20 +01:00
Marc Alexander
9267235f30 Merge pull request #4605 from javiexin/ticket/14943
[ticket/14943] Fix template loop access by index
2017-02-23 22:21:16 +01:00
Marc Alexander
bdaa6e4909 Merge branch '3.1.x' into 3.2.x 2017-02-19 21:47:06 +01:00
javiexin
849fd9df7d [ticket/14944] Add possibility to search for template loop indexes by key
Adds a new function to the template interface, and implements it in the
context class.  The function returns the ordinal index for a specified key,
with the same structure that the key for alter_block_array.
Reuses same code. Remove unneeded references, do nothing for int keys.
Check out of bounds or wrong blockname errors.  Added tests.
Remove default parameter value.

PHPBB3-14944
2017-01-28 21:34:08 +01:00
javiexin
988865fd0a [ticket/14950] Add possibility to delete a template block
Adds a new mode to alter_block_array to allow for the deletion of
a certain block of template variables.  The selection method is the
same as for the other modes for alter_block_array.  The passed in
vararray is ignored, and an out of bounds index is considered an error.
Added tests for the new function, fixed.

PHPBB3-14950
2017-01-08 01:35:18 +01:00
javiexin
7f8dd6b007 [ticket/14950] Add possibility to delete a template block
Adds a new mode to alter_block_array to allow for the deletion of
a certain block of template variables.  The selection method is the
same as for the other modes for alter_block_array.  The passed in
vararray is ignored, and an out of bounds index is considered an error.
Added tests for the new function, fixed.

PHPBB3-14950
2017-01-08 01:19:22 +01:00
javiexin
696724ac1b [ticket/14950] Add possibility to delete a template block
Adds a new mode to alter_block_array to allow for the deletion of
a certain block of template variables.  The selection method is the
same as for the other modes for alter_block_array.  The passed in
vararray is ignored, and an out of bounds index is considered an error.
Added tests for the new function, fixed.

PHPBB3-14950
2017-01-08 00:59:26 +01:00
javiexin
20c03cccdd [ticket/14944] Add possibility to search for template loop indexes by key
Adds a new function to the template interface, and implements it in the
context class.  The function returns the ordinal index for a specified key,
with the same structure that the key for alter_block_array.
Reuses same code. Remove unneeded references, do nothing for int keys.
Check out of bounds or wrong blockname errors.  Added tests.

PHPBB3-14944
2017-01-08 00:00:47 +01:00
javiexin
9b2b9dd9de [ticket/14950] Add possibility to delete a template block
Adds a new mode to alter_block_array to allow for the deletion of
a certain block of template variables.  The selection method is the
same as for the other modes for alter_block_array.  The passed in
vararray is ignored, and an out of bounds index is considered an error.
Added tests for the new function.

PHPBB3-14950
2017-01-07 22:47:26 +01:00
javiexin
76b3fbc006 [ticket/14943] Fix template loop access by index
Allows inserting elements in a loop specified as 'outer[3].inner'.
This was coded, but malfunctioning.  Name incorrectly set on insert.
Added more tests.

PHPBB3-14943
2017-01-07 20:12:32 +01:00
javiexin
c40642b827 [ticket/14943] Fix template loop access by index
Allows inserting elements in a loop specified as 'outer[3].inner'.
This was coded, but malfunctioning.  Name incorrectly set on insert.
Added tests.

PHPBB3-14943
2017-01-07 19:57:22 +01:00
Tristan Darricau
663e3bc642 [ticket/13616] Updates direct call to twig environment constructor
PHPBB3-13616
2016-04-03 16:23:16 +02:00
Matt Friedman
14e8113fcf [ticket/14576] Move common required files to bootstrap
PHPBB3-14576
2016-03-31 11:06:47 -07:00
Tristan Darricau
99ace63e62 [ticket/14457] Don't set CSS to JS and JS to CSS
PHPBB3-14457
2016-02-18 17:30:31 +01:00
Tristan Darricau
a83bcaa8ac [ticket/14099] Fix tests
PHPBB3-14099
2015-08-14 15:52:35 +02:00
Matt Friedman
80f91da9b9 [ticket/13995] Fix errors in tests from merge conflict
PHPBB3-13995
2015-07-08 15:11:10 -07:00
Marc Alexander
01097a24b5 Merge branch '3.1.x'
Conflicts:
	tests/template/template_includecss_test.php
2015-07-08 22:54:26 +02:00
Matt Friedman
23db3d0b83 [ticket/13995] Remove projection from tests
PHPBB3-13995
2015-07-08 08:11:04 -07:00