Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.2][ticket/11768] Integrate s9e\TextFormatter #1646

Closed
wants to merge 142 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
dfba919
[ticket/13142] Adding core.mcp_sorting_unapproved_deleted_posts_query…
brunoais Nov 28, 2014
aa10bc2
[ticket/13142] BUMPing version
brunoais Nov 28, 2014
6f52873
[ticket/13142] Fix typo: unaproved -> unapproved
brunoais Nov 28, 2014
ff59240
[ticket/13472] Delete admin activation notification when deleting user
dhruvgoel92 Jan 11, 2015
6842831
[ticket/13513] Use paths relative to the phpBB root in the router
Nicofuma Jan 17, 2015
c1d6447
[ticket/13577] Skip functional tests requiring fileinfo if not enabled
marc1706 Feb 4, 2015
48b64b0
[ticket/13577] Skip filespec test requiring mimetype check on windows
marc1706 Feb 5, 2015
e1eac80
[ticket/13586] Allow '0' as username with Jabber notifications
Feb 7, 2015
072df22
[ticket/13591] Add core events to the function obtain_users_online_st…
rxu Feb 8, 2015
1bcce75
[ticket/13592] Allow changing get_visibility_sql's result
brunoais Feb 8, 2015
8a4df90
[ticket/13592] Allow changing get_visibility_sql's result
brunoais Feb 9, 2015
bb7d294
[ticket/13592] Allow full override of get_visibility_sql()
brunoais Feb 9, 2015
6111f5f
[ticket/13592] Removed unwanted space in self line.
brunoais Feb 9, 2015
74385b8
[ticket/13592] Empty line before event comment block.
brunoais Feb 9, 2015
67a963a
[ticket/13596] Add display_forums() event to allow modifying forums l…
rxu Feb 10, 2015
bf20fb0
[ticket/13592] The name didn't make proper sense
brunoais Feb 11, 2015
9318557
[ticket/13142] BUMPed version
brunoais Feb 11, 2015
4559aca
[ticket/13595] Removed unused code
JoshyPHP Feb 10, 2015
f23d2ec
[ticket/13570] Remove unnecessary ternary condition from mysqli driver
senky Feb 16, 2015
fa1c61f
[ticket/13433] Fix parsing of email addresses
rxu Feb 17, 2015
950c72a
[ticket/13433] Add make_clickable() test for emails
rxu Feb 17, 2015
f3d332b
Merge pull request #3411 from Senky/ticket/13570
bantu Feb 17, 2015
978b96c
Merge branch '3.1.x'
bantu Feb 17, 2015
02d28c2
[ticket/13600] Allow extensions to create a custom help page
nickvergessen Feb 17, 2015
1394871
Merge pull request #3414 from rxu/ticket/13433
marc1706 Feb 17, 2015
ddc96a7
Merge branch '3.1.x'
marc1706 Feb 17, 2015
997b229
[ticket/13631] Fix wrong variable in get_global_visibility_sql()'s event
brunoais Feb 18, 2015
f0850f1
[ticket/13631] Better, more explicit comment explanation
brunoais Feb 18, 2015
153d169
[ticket/13628] Allow ability for extension to add entries to user's p…
rmcgirr83 Feb 18, 2015
60f60ac
Merge pull request #3420 from marc1706/ticket/13628
marc1706 Feb 18, 2015
21c6223
Merge branch '3.1.x'
marc1706 Feb 18, 2015
03f9c69
[ticket/13634] Update branch names on README
VSEphpbb Feb 18, 2015
bbf4bcc
[ticket/13634] Update links to travis build icons
VSEphpbb Feb 18, 2015
098854a
Merge pull request #3395 from s9e/ticket/13595
marc1706 Feb 18, 2015
5ad4685
Merge branch '3.1.x'
marc1706 Feb 18, 2015
7fd3767
Merge pull request #3417 from nickvergessen/ticket/13600
marc1706 Feb 18, 2015
a43c1a4
Merge branch '3.1.x'
marc1706 Feb 18, 2015
1f345a8
[ticket/13635] Add sql_ary to ucp profile event
rmcgirr83 Feb 18, 2015
e4b4428
Merge branch '3.0.x' into 3.1.x
bantu Feb 19, 2015
3db7ac0
Merge pull request #3422 from VSEphpbb/ticket/13634-3.0.x
bantu Feb 19, 2015
19f8e25
Merge branch '3.1.x'
bantu Feb 19, 2015
71d3ddc
[ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
prototech Feb 20, 2015
eff928c
[ticket/13639] Update colours.css
dragosvr92 Feb 20, 2015
31ae574
Merge pull request #3197 from brunoais/ticket/13142
nickvergessen Feb 20, 2015
de061b5
Merge branch '3.1.x'
nickvergessen Feb 20, 2015
5c3ca74
[ticket/13640] Rearrange css in a better order
dragosvr92 Jan 8, 2015
8a06f21
Merge branch 'ticket/13640' into 3.1.x
nickvergessen Feb 20, 2015
a1ecb10
Merge branch '3.1.x'
nickvergessen Feb 20, 2015
c24a840
Merge pull request #3277 from dhruvgoel92/ticket/13472
nickvergessen Feb 20, 2015
0dab7e2
Merge branch '3.1.x'
nickvergessen Feb 20, 2015
cba12ac
[ticket/13533] Add template core event to search results
Wolfsblvt Jan 21, 2015
461ce3f
Merge branch 'Wolfsblvt-ticket/13533' into 3.1.x
nickvergessen Feb 20, 2015
61fa9dc
Merge branch '3.1.x'
nickvergessen Feb 20, 2015
5e215ae
Merge pull request #3369 from marc1706/ticket/13577
nickvergessen Feb 20, 2015
275d6be
Merge branch '3.1.x'
nickvergessen Feb 20, 2015
835ee2b
Merge pull request #3380 from n-aleha/ticket/13586
nickvergessen Feb 20, 2015
76d22f3
Merge branch '3.1.x'
nickvergessen Feb 20, 2015
059790f
Merge pull request #3425 from dragosvr92/patch-4
nickvergessen Feb 20, 2015
33ea266
Merge branch '3.1.x'
nickvergessen Feb 20, 2015
e6e7d70
Merge pull request #3423 from RMcGirr83/ticket/13635
nickvergessen Feb 20, 2015
7f3ad29
Merge branch '3.1.x'
nickvergessen Feb 20, 2015
379eae1
Merge pull request #3418 from brunoais/ticket/13631
nickvergessen Feb 20, 2015
3657d7a
Merge branch '3.1.x'
nickvergessen Feb 20, 2015
7bfb868
[ticket/13578] Add ucp_register.php core events
rmcgirr83 Feb 17, 2015
9b54933
[ticket/13644] Always type hint dispatch_interface
Nicofuma Feb 22, 2015
702a51b
Merge pull request #3431 from Nicofuma/ticket/13644
bantu Feb 22, 2015
6773373
Merge branch '3.1.x'
bantu Feb 22, 2015
d152bbc
Merge pull request #3427 from prototech/ticket/13551
bantu Feb 22, 2015
71eb981
Merge branch '3.1.x'
bantu Feb 22, 2015
ffc5a73
[ticket/13643] Change the priority of kernel_terminate_subscriber to …
Nicofuma Feb 22, 2015
269dee4
Merge pull request #3415 from RMcGirr83/ticket/13578
nickvergessen Feb 22, 2015
0357a4d
Merge branch '3.1.x'
nickvergessen Feb 22, 2015
525a62f
Merge pull request #3433 from Nicofuma/ticket/13643
bantu Feb 22, 2015
b57e002
Merge branch '3.1.x'
bantu Feb 22, 2015
03ded58
[ticket/13650] Validate ucp profile data changes
rmcgirr83 Feb 24, 2015
80e1c23
[ticket/13587] SQL syntax errors in get_prune_users()
rmcgirr83 Feb 24, 2015
56cbff7
Merge pull request #3439 from RMcGirr83/ticket/13587
nickvergessen Feb 24, 2015
17b0081
Merge branch '3.1.x'
nickvergessen Feb 24, 2015
9f9e392
Merge pull request #3436 from RMcGirr83/ticket/13650
nickvergessen Feb 24, 2015
06d6bcb
Merge branch '3.1.x'
nickvergessen Feb 24, 2015
3ac5832
Merge pull request #3381 from rxu/ticket/13591
nickvergessen Feb 24, 2015
261c3bc
Merge branch '3.1.x'
nickvergessen Feb 24, 2015
6f3f628
[ticket/13617] Enforce column size limit for session_forum_id
naderman Feb 25, 2015
d08d988
Merge branch 'ticket/13617' into ticket/13617-ascraeus
naderman Feb 25, 2015
c5a15c0
[ticket/13617] Use request->variable instead of request_var
naderman Feb 25, 2015
106bc1c
[ticket/13617] Document magic number for forum_id
naderman Feb 25, 2015
c8be24f
[ticket/13652] Added $phpbb_dispatcher from global to phpbb_mcp_sorti…
brunoais Feb 25, 2015
37b9191
[ticket/13563] Remove PM column from subsilver2's memberlist_body.html.
prototech Feb 26, 2015
335d88c
[ticket/13649] Fix incorrect subforum tooltip title when unread.
prototech Feb 26, 2015
e29e0e5
[ticket/12599] Remove corner images from documentation style.
prototech May 27, 2014
4565cac
[ticket/12599] Move documentation stylesheet to assets directory.
prototech May 27, 2014
14fecb2
[ticket/12599] Move images to assets/ and update the phpBB logo.
prototech May 27, 2014
5cd3e76
[ticket/12599] Use the back to top icon instead of text.
prototech May 27, 2014
62f6922
[ticket/12599] Add padding on the sides of the inline code boxes.
prototech May 27, 2014
6e5f33e
[ticket/12599] Get the font sizes under control.
prototech May 27, 2014
a07b29c
[ticket/12599] Place standalone text in a box.
prototech May 27, 2014
4df853a
[ticket/12599] Remove empty line at end of code boxes.
prototech Sep 23, 2014
c9df29d
Merge pull request #3303 from Nicofuma/ticket/13513
marc1706 Feb 26, 2015
6647d39
Merge pull request #3448 from prototech/ticket/13563
nickvergessen Feb 26, 2015
b75a0d9
Merge branch '3.1.x'
nickvergessen Feb 26, 2015
ea4b993
Merge pull request #2992 from prototech/ticket/12599
nickvergessen Feb 26, 2015
72f7c5e
Merge branch '3.1.x'
nickvergessen Feb 26, 2015
4928afe
Merge pull request #3447 from brunoais/ticket/13143
nickvergessen Feb 26, 2015
48d208a
Merge branch '3.1.x'
nickvergessen Feb 26, 2015
c814ecc
Merge pull request #3449 from prototech/ticket/13649
nickvergessen Feb 26, 2015
e5595ca
Merge branch '3.1.x'
nickvergessen Feb 26, 2015
8c73f63
[ticket/13510] Add template even viewtopic_body_pagination_after
rmcgirr83 Feb 26, 2015
0daf148
Merge pull request #3384 from brunoais/ticket/13592
marc1706 Feb 27, 2015
a11181b
Merge branch '3.1.x'
marc1706 Feb 27, 2015
e15b9dc
Merge pull request #3388 from rxu/ticket/13596
marc1706 Feb 27, 2015
f526e81
Merge branch '3.1.x'
marc1706 Feb 27, 2015
a7b1b71
Merge pull request #3451 from RMcGirr83/ticket/13510
marc1706 Feb 27, 2015
5d6f868
Merge branch '3.1.x'
marc1706 Feb 27, 2015
62973fa
Merge pull request #3443 from naderman/ticket/13617
nickvergessen Feb 27, 2015
8abf259
Merge pull request #3444 from naderman/ticket/13617-ascraeus
nickvergessen Feb 27, 2015
18de60c
Merge branch '3.0.x' into 3.1.x
nickvergessen Feb 27, 2015
8ec18b1
Merge branch '3.1.x'
nickvergessen Feb 27, 2015
1c2f44c
[ticket/11768] This commit integrates s9e\TextFormatter
JoshyPHP Nov 22, 2014
cd9dc93
[ticket/11768] Updated composer.lock
JoshyPHP Nov 22, 2014
b85f229
[ticket/11768] Updated s9e\TextFormatter
JoshyPHP Nov 24, 2014
5f55097
[ticket/11768] Restored blank line from develop
JoshyPHP Jan 8, 2015
e5f4278
[ticket/11768] Updated annotations to pass sniff
JoshyPHP Jan 8, 2015
c1af83a
[ticket/11768] Toggled Unicode modifier in relative URL filter
JoshyPHP Jan 16, 2015
450426a
[ticket/11768] Reorganized code for readability
JoshyPHP Jan 16, 2015
203620a
[ticket/11768] Updated constructors with explicit dependencies
JoshyPHP Feb 4, 2015
0578519
[ticket/11768] Updated test case helper with new signature
JoshyPHP Feb 4, 2015
6009d5c
[ticket/11768] Updated tests to use the new constructor signature
JoshyPHP Feb 4, 2015
563ba4b
[ticket/11768] Removed unused use statements
JoshyPHP Feb 4, 2015
11ba1ce
[ticket/11768] Re-added the code that got lost in rebase
JoshyPHP Feb 8, 2015
f5b0f26
[ticket/11768] Added test files
JoshyPHP Feb 10, 2015
438a7fc
[ticket/11768] Uncommented disabled test
JoshyPHP Feb 13, 2015
bab2b12
[ticket/11768] Added support for magic links that start with "www."
JoshyPHP Feb 13, 2015
462093a
[ticket/11768] Updated phpbb\textformatter\s9e\factory::regenerate()
JoshyPHP Feb 15, 2015
97c3b92
[ticket/11768] Updated s9e\TextFormatter
JoshyPHP Feb 16, 2015
1132eb7
[ticket/11768] Added limited support for [url] in [quote] author
JoshyPHP Feb 17, 2015
41b421c
[ticket/11768] Replaced the Censor plugin
JoshyPHP Feb 19, 2015
a2abdc6
[ticket/11768] Fixed test
JoshyPHP Feb 19, 2015
20c8d0c
[ticket/11768] Allowed text in places where text is not valid HTML
JoshyPHP Feb 20, 2015
9dbcfdc
[ticket/11768] Updated the cache dir to point to the current environment
JoshyPHP Feb 21, 2015
b2e4e08
[ticket/11768] Added methods to access the library's parser/renderer
JoshyPHP Feb 23, 2015
f63fbe6
[ticket/11768] Fixed censored words being escaped twice
JoshyPHP Feb 23, 2015
9a700f9
[ticket/11768] Updated censor to apply to XML values
JoshyPHP Feb 23, 2015
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

[ticket/11768] Added methods to access the library's parser/renderer

PHPBB3-11768
  • Loading branch information...
JoshyPHP committed Feb 23, 2015
commit b2e4e08f20a398663d039d13052b3b9b305472a0
@@ -191,6 +191,16 @@ public function get_errors()
return array_unique($errors);
}
/**
* Return the instance of s9e\TextFormatter\Parser used by this object
*
* @return s9e\TextFormatter\Parser
*/
public function get_parser()
{
return $this->parser;
}
/**
* {@inheritdoc}
*/
@@ -121,6 +121,16 @@ public function configure_user(\phpbb\user $user, \phpbb\config\config $config,
$this->renderer->setParameter('STYLE_ID', $user->style['style_id']);
}
/**
* Return the instance of s9e\TextFormatter\Renderer used by this object
*
* @return s9e\TextFormatter\Renderer
*/
public function get_renderer()
{
return $this->renderer;
}
/**
* {@inheritdoc}
*/
@@ -7,6 +7,7 @@
*
*/
require_once __DIR__ . '/../../../phpBB/includes/functions.php';
require_once __DIR__ . '/../../../phpBB/includes/functions_content.php';
require_once __DIR__ . '/../../mock/user.php';
require_once __DIR__ . '/../../mock/cache.php';
@@ -164,4 +165,11 @@ public function get_options_tests()
)
);
}
public function test_get_parser()
{
$container = $this->get_test_case_helpers()->set_s9e_services();
$parser = $container->get('text_formatter.parser');
$this->assertInstanceOf('s9e\\TextFormatter\\Parser', $parser->get_parser());
}
}
@@ -353,4 +353,11 @@ public function test_style_inheritance2()
);
}
}
public function test_get_renderer()
{
$container = $this->get_test_case_helpers()->set_s9e_services();
$renderer = $container->get('text_formatter.renderer');
$this->assertInstanceOf('s9e\\TextFormatter\\Renderer', $renderer->get_renderer());
}
}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.