diff --git a/composer.json b/composer.json index d5658cd9..00f7aa18 100644 --- a/composer.json +++ b/composer.json @@ -3,6 +3,6 @@ "phpunit/phpunit": "^5", "guzzlehttp/guzzle": "^7.0", "lifo/ip": "^1.1", - "twig/twig": "^3.0" + "twig/twig": "^1.0" } } diff --git a/composer.lock b/composer.lock index 63e200db..ae5a1d52 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "617166141e3d9e8f023c446f53cbd7cd", + "content-hash": "0bffa8d278ee972cf76322245e4e97db", "packages": [ { "name": "doctrine/instantiator", @@ -1905,89 +1905,6 @@ ], "time": "2022-11-03T14:55:06+00:00" }, - { - "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "provide": { - "ext-mbstring": "*" - }, - "suggest": { - "ext-mbstring": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for the Mbstring extension", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "mbstring", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-03T14:55:06+00:00" - }, { "name": "symfony/yaml", "version": "v3.4.47", @@ -2061,29 +1978,36 @@ }, { "name": "twig/twig", - "version": "v3.7.0", + "version": "v1.44.7", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "5cf942bbab3df42afa918caeba947f1b690af64b" + "reference": "0887422319889e442458e48e2f3d9add1a172ad5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/5cf942bbab3df42afa918caeba947f1b690af64b", - "reference": "5cf942bbab3df42afa918caeba947f1b690af64b", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/0887422319889e442458e48e2f3d9add1a172ad5", + "reference": "0887422319889e442458e48e2f3d9add1a172ad5", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/polyfill-ctype": "^1.8", - "symfony/polyfill-mbstring": "^1.3" + "symfony/polyfill-ctype": "^1.8" }, "require-dev": { - "psr/container": "^1.0|^2.0", - "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0" + "psr/container": "^1.0", + "symfony/phpunit-bridge": "^4.4.9|^5.0.9" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.44-dev" + } + }, "autoload": { + "psr-0": { + "Twig_": "lib/" + }, "psr-4": { "Twig\\": "src/" } @@ -2116,7 +2040,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.7.0" + "source": "https://github.com/twigphp/Twig/tree/v1.44.7" }, "funding": [ { @@ -2128,7 +2052,7 @@ "type": "tidelift" } ], - "time": "2023-07-26T07:16:09+00:00" + "time": "2022-09-28T08:38:36+00:00" } ], "packages-dev": [], diff --git a/inc/template.php b/inc/template.php index 15a28b0e..bd0ced62 100644 --- a/inc/template.php +++ b/inc/template.php @@ -14,19 +14,15 @@ function load_twig() { require_once 'vendor/autoload.php'; Twig_Autoloader::register(); - Twig_Autoloader::autoload('Twig_Extensions_Node_Trans'); - Twig_Autoloader::autoload('Twig_Extensions_TokenParser_Trans'); - Twig_Autoloader::autoload('Twig_Extensions_Extension_I18n'); - Twig_Autoloader::autoload('Twig_Extensions_Extension_Tinyboard'); - $loader = new Twig_Loader_Filesystem($config['dir']['template']); - $loader->setPaths($config['dir']['template']); $twig = new Twig_Environment($loader, array( 'autoescape' => false, 'cache' => is_writable('templates') || (is_dir('templates/cache') && is_writable('templates/cache')) ? "{$config['dir']['template']}/cache" : false, 'debug' => $config['debug'] )); + + // Add extensions (if they are still compatible with Twig 1.x) $twig->addExtension(new Twig_Extensions_Extension_Tinyboard()); $twig->addExtension(new Twig_Extensions_Extension_I18n()); }