mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/14948] Adjust calls for twig and phpunit updates

Browse Source 
PHPBB3-14948
This commit is contained in:
Marc Alexander
2018-12-30 11:36:08 +01:00
parent 8e78d829b1
commit c6cc6ba8d8
194 changed files with 281 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/phpbb/cache/driver/memory.php vendored
View File

@@ -25,7 +25,7 @@ abstract class memory extends \phpbb\cache\driver\base
*/
function __construct()
{
global $phpbb_root_path, $dbname, $table_prefix, $phpbb_container;
global $dbname, $table_prefix, $phpbb_container;
$this->cache_dir = $phpbb_container->getParameter('core.cache_dir');
$this->key_prefix = substr(md5($dbname . $table_prefix), 0, 8) . '_';

2
phpBB/phpbb/template/twig/tokenparser/defineparser.php
View File

@@ -41,7 +41,7 @@ class defineparser extends \Twig_TokenParser
{
// This would happen if someone improperly formed their DEFINE syntax
// e.g. <!-- DEFINE $VAR = foo -->
throw new \Twig_Error_Syntax('Invalid DEFINE', $token->getLine(), $this->parser->getFilename());
throw new \Twig_Error_Syntax('Invalid DEFINE', $token->getLine(), $this->parser->getStream()->getSourceContext()->getPath());
}
$stream->expect(\Twig_Token::BLOCK_END_TYPE);