1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-31 19:49:20 +02:00

104 Commits

Author SHA1 Message Date
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
Matt Friedman
14e8113fcf [ticket/14576] Move common required files to bootstrap
PHPBB3-14576
2016-03-31 11:06:47 -07:00
Nicofuma
54753e926d [ticket/13132] Enable twig expressions tests
PHPBB3-13132
2015-03-05 21:53:48 +01:00
Tristan Darricau
cf39cfc593 [ticket/13132] Twig: Add loops content to the root context
PHPBB3-13132
2015-03-05 21:38:59 +01:00
Matt Friedman
2671306304 [ticket/10388] Update tests
PHPBB3-10388
2015-01-29 01:41:52 -08:00
Tristan Darricau
7ef983b426 [ticket/12781] Add tests
PHPBB3-12781
2014-06-27 16:41:21 +02:00
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +02:00
Nils Adermann
c5660ed177 [ticket/12382] Event loop nesting inclusion applies to regular includes too
PHPBB3-12382
2014-05-03 00:20:37 +02:00
Joas Schilling
91eaae122f [ticket/12382] Mark broken nested loop with include as incomplete
PHPBB3-12382
2014-04-14 18:56:34 +02:00
Joas Schilling
b3a758a43b [ticket/12382] Add template test for subloops inside includes
PHPBB3-12382
2014-04-12 11:13:06 +02:00
Matt Friedman
d8c1c7fb9a [ticket/7580] Add test for IF {VAR} is defined in templates
http://tracker.phpbb.com/browse/PHPBB3-7580
This test demonstrates that is possible to test if a
variable exists and then use it if it does, similar to
using isset(), but in template/twig syntax.
<!— IF {VAR} is defined —>{VAR}<!— ENDIF —>

PHPBB3-7580
2014-03-16 20:38:50 -07:00
Nathan Guse
a45aa2e5a0 [ticket/10288] Test to make sure included templates have proper variable scope
PHPBB3-10288
2014-03-13 19:48:07 -05:00
rxu
d29514f3e7 [ticket/12224] Add assign_block_vars_array() test.
Add tests, also change return value to null.

PHPBB3-12224
2014-03-10 20:59:45 +08:00
Nathan Guse
2e5117a71e [ticket/11943] Throw an exception if DEFINE is setup improperly
PHPBB3-11943
2013-11-09 11:14:55 -06:00
Nathan Guse
c609f25bae [ticket/11943] Add test for DEFINE $VAR = false
PHPBB3-11943
2013-11-04 12:15:02 -06: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
rechosen
658f6e2045 [ticket/11843] Added newlines and included numbers in the DEFINE vars test
Per suggestion of nickvergessen, I added newlines in the DEFINE variables with
underscores test. Now if the test fails, it's easier to spot which part is
failing. Also added a test for DEFINE variables containing numbers.

PHPBB3-11843
2013-09-13 13:53:39 +02:00
rechosen
45ecbae1ed [ticket/11843] Add checking DEFINE variables with underscores to template_test
To prevent the underscore in DEFINE variables from being forgotten again,
the template tests now test INCLUDEing a file based on the contents of a
DEFINE variable with underscores in it.

PHPBB3-11843
2013-09-13 12:27:07 +02:00
Nathan Guse
bcb1392351 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816
# By Joseph Warner (187) and others
# Via Nathan Guse (6) and others
* 'develop' of github.com:phpbb/phpbb3: (195 commits)
  [ticket/11828] Fix greedy operators in lexer
  [ticket/11835] Fix ucp_auth_link adding in migration
  [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
  [ticket/develop/11832] Fix path detection
  [feature/oauth] Fix tabindex
  [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php
  [ticket/11829] Use report_closed to determine status in MCP report_details
  [feature/oauth] Fix bug on ucp_auth_link related to error display
  [feature/oauth] More small fixes
  [feature/oauth] More minor changes from review
  [feature/oauth] Fix small bug introduced by update in OAuth library
  [feature/oauth] Fix small issues on ucp pages
  [feature/oauth] Fix typo in OAuth logout method
  [feature/oauth] Make token storage service ignorant
  [feature/oauth] Update oauth::logout() to use clearAllTokens()
  [feature/oauth] Update storage implementation due to inteface change
  [feature/oauth] Update lusitanian/oauth to stable branch
  [ticket/11822] Use namespace lookup order for asset loading
  [feature/oauth] Update comment on oauth service exception
  [feature/oauth] Forgot to remove placeholder comment
  ...

Conflicts:
	phpBB/phpbb/template/twig/lexer.php
	tests/template/template_test.php
2013-09-12 22:56:54 -05:00
Nathan Guse
8c2f73bb09 [ticket/11828] Fix greedy operators in lexer
Use lazy operators and use stricter validation

PHPBB3-11828
2013-09-12 14:15:41 -05:00
Nathan Guse
65f52d7575 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816
# By David King (16) and others
# Via David King (13) and others
* 'develop' of github.com:phpbb/phpbb3: (67 commits)
  [ticket/11825] Move schema_data.php into includes/ instead of phpbb/
  [ticket/11215] Remove unnecessary comment
  [ticket/11755] MySQL upgrader out of date
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
  [ticket/11823] Set up nginx server to match PHP files with characters after .php
  [ticket/11812] Fix empty define
  [ticket/11818] Update Symfony dependencies to 2.3.*
  [ticket/11791] Load adm/ events from styles/adm/event/
  [ticket/11215] Fix helper_url_test.php tests
  [ticket/11215] Add newline back to .htaccess, fix wording
  [ticket/11215] Update comment in .htaccess
  [ticket/11215] Uncomment rewrite rules in .htaccess
  [ticket/11215] Make controller helper url() method use correct format
  [ticket/11215] Add commented-out URL rewrite capability to .htaccess
  [ticket/11821] Fix comma usage next to "You are receiving this notification".
  [ticket/11769] Allow using 0 as poster name
  [ticket/11769] Allow '0' as username
  [ticket/11215] Use new URL structure for controllers
  [ticket/11215] Everything appears to be working...
  ...

Conflicts:
	phpBB/phpbb/template/twig/lexer.php
	tests/template/template_test.php
2013-09-06 09:08:53 -05:00
Nathan Guse
11317ef261 [ticket/11816] !$DOESNT_EXIST test
PHPBB3-11816
2013-09-06 09:04:40 -05:00
Nathan Guse
c8d5ec8927 [ticket/11812] Fix empty define
PHPBB3-11812
2013-09-02 16:35:42 -05:00
Nathan Guse
0c5a39a3ed [ticket/11816] Test !$DEFINITION
PHPBB3-11816
2013-09-02 15:50:34 -05:00
Joas Schilling
9d6370751f Merge remote-tracking branch 'EXreaction/ticket/11724' into develop
* EXreaction/ticket/11724:
  [ticket/11724] Handle ELSE IF separately
  [ticket/11724] Replace spaces with tabs
  [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same way
2013-08-30 19:53:54 +02:00
Nathan Guse
62e81d174d [ticket/11816] Fix define/loop checks in IF statements containing parenthesis
PHPBB3-11816
2013-08-29 10:00:24 -05:00
Nathan Guse
68ed2b6035 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628
# By Bruno Ais (42) and others
# Via Joas Schilling (39) and others
* 'develop' of github.com:phpbb/phpbb3: (157 commits)
  [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0
  [ticket/11799] Send anti abuse headers in "new password" emails.
  [ticket/11792] Add functional test for var lang_set_ext of core.user_setup
  [ticket/11804] Remove </li> from overall_header which was not open
  [ticket/11802] replace $browser with $user->browser
  [ticket/11801] removed some whitespace and added missing semi colon's in css
  [ticket/11792] Add performance remark to core.user_setup event PHPDoc
  [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup
  [ticket/11789] Remove inline color in memberlist_view
  [ticket/11800] Fix scripts variable in subsilver simple_footer
  [ticket/11800] Fix JavaScript in simple_footer.html
  [ticket/11800] Remove forum_fn from memberlist_search.html
  [ticket/11796] Replace pagination with pagination.html
  [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
  [ticket/11775] Fix doc blocks syntax
  [ticket/11775] Remove spaces at line ends
  [ticket/11789] Remove colors from HTML code
  [ticket/11784] Remove naming redundancy for event listeners
  [ticket/11775] Split test into multiple steps
  [ticket/11777] Fix new test for loop variables in extension template listeners
  ...

Conflicts:
	phpBB/install/index.php
	phpBB/install/install_update.php
2013-08-28 13:30:48 -05:00
Nathan Guse
d5c56c5d50 [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same way
PHPBB3-11724
2013-07-27 20:02:03 -05:00
Nathaniel Guse
12c2258506 [ticket/11628] Remove template_path option on set_custom_style
This was set to default 'template/' to append template/ to all the paths,
but every location was actually just setting it to '' to not append anything.
So removed the option entirely (additional paths can be appended to the paths
being sent to the function already)

PHPBB3-11628
2013-07-24 13:25:20 -05:00
Nathaniel Guse
4b761f6575 [ticket/11628] Remove third parameter ($names) from set_custom_style
This was basically duplicating functionality. $names would be used if not
empty, else array($name) would be used. Merged functionality into the first
argument

PHPBB3-11628
2013-07-24 12:56:39 -05:00
Nathaniel Guse
5d1afb4532 [ticket/11628] Remove phpbb_style (move methods to phpbb_template)
PHPBB3-11628
2013-07-24 12:24:35 -05:00
Nathaniel Guse
c0b9db1c62 [ticket/11701] Fix loops var check
PHPBB3-11701
2013-07-23 09:26:50 -05:00
Andreas Fischer
7d8e80241c Merge remote-tracking branch 'EXreaction/ticket/11718' into develop
* EXreaction/ticket/11718:
  [ticket/11718] Quick test for fixes in ELSEIF
  [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF

Conflicts:
	tests/template/template_test.php
2013-07-23 04:24:05 +02:00
Nathaniel Guse
375976eb38 [ticket/11707] Twig DEFINE not working as expected
PHPBB3-11707
2013-07-19 14:12:28 -05:00
Nathaniel Guse
1c59ad87b0 [ticket/11718] Quick test for fixes in ELSEIF
PHPBB3-11718
2013-07-19 13:34:08 -05:00
Nathaniel Guse
df3f0a212e [ticket/11664] Stop creating php.html file in root path in tests
Also includephp_absolute.html

PHPBB3-11664
2013-07-12 11:56:03 -05:00
Nathan Guse
47ec38c011 [feature/twig] Add simple test to make sure Twig filters/tags are working
PHPBB3-11598
2013-07-08 15:21:27 -05:00
Nathan Guse
9ac61565fd [feature/twig] Add template tests for S_NUM_ROWS and S_BLOCK_NAME
PHPBB3-11598
2013-07-05 12:48:02 -05:00
Nathan Guse
1f4a717f9e [feature/twig] Add template test for ===, !==
PHPBB3-11598
2013-07-05 10:29:24 -05:00