Replace somes trigger_error for throw Exception and remove Twig 2

Now old PHP versions (< 7.2.5) uses Twig 1 and new PHP uses Twig 3. The Twig 2 is only selected by composer if developer need.
3 years ago · 204cef2fa3
parent 5f95caecf5
commit 204cef2fa3
1354 changed files with 35137 additions and 32640 deletions
--- a/system/config/autoload.php
+++ b/system/config/autoload.php
--- a/system/database/databases/mssql.php
+++ b/system/database/databases/mssql.php
--- a/system/database/databases/mysql_legacy.php
+++ b/system/database/databases/mysql_legacy.php
--- a/system/database/databases/mysql_pdo.php
+++ b/system/database/databases/mysql_pdo.php
--- a/system/database/databases/oracle.php
+++ b/system/database/databases/oracle.php
--- a/system/database/databases/sqlsrv.php
+++ b/system/database/databases/sqlsrv.php
--- a/system/engine/exception.php
+++ b/system/engine/exception.php
--- a/system/engine/loader.php
+++ b/system/engine/loader.php
--- a/system/language/autoload.php
+++ b/system/language/autoload.php
--- a/system/mail/mail.php
+++ b/system/mail/mail.php
--- a/system/system.php
+++ b/system/system.php
--- a/system/templateEngines/Twig/Twig1x/autoload.php
+++ b/system/templateEngines/Twig/Twig1x/autoload.php
--- a/system/templateEngines/Twig/Twig1x/composer.json
+++ b/system/templateEngines/Twig/Twig1x/composer.json
@ -0,0 +1,8 @@
 {
    "config": {
        "platform-check": false
    },
    "require": {
        "twig/twig": "1.41.*"
    }
 }
--- a/system/templateEngines/Twig/Twig1x/composer.lock
+++ b/system/templateEngines/Twig/Twig1x/composer.lock
--- a/system/templateEngines/Twig/Twig1x/composer/ClassLoader.php
+++ b/system/templateEngines/Twig/Twig1x/composer/ClassLoader.php
--- a/system/templateEngines/Twig/Twig1x/composer/autoload_classmap.php
+++ b/system/templateEngines/Twig/Twig1x/composer/autoload_classmap.php
@ -1,9 +0,0 @@
 <?php
 // autoload_classmap.php @generated by Composer
 $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 return array(
 );
--- a/system/templateEngines/Twig/Twig1x/composer/autoload_real.php
+++ b/system/templateEngines/Twig/Twig1x/composer/autoload_real.php
--- a/system/templateEngines/Twig/Twig1x/composer/autoload_static.php
+++ b/system/templateEngines/Twig/Twig1x/composer/autoload_static.php
--- a/system/templateEngines/Twig/Twig1x/composer/installed.json
+++ b/system/templateEngines/Twig/Twig1x/composer/installed.json
--- a/system/templateEngines/Twig/Twig1x/symfony/polyfill-ctype/bootstrap.php
+++ b/system/templateEngines/Twig/Twig1x/symfony/polyfill-ctype/bootstrap.php
--- a/system/templateEngines/Twig/Twig1x/symfony/polyfill-ctype/composer.json
+++ b/system/templateEngines/Twig/Twig1x/symfony/polyfill-ctype/composer.json
--- a/system/templateEngines/Twig/Twig1x/twig/twig/.gitattributes
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/.gitattributes
@ -1,2 +0,0 @@
 /tests export-ignore
 /phpunit.xml.dist export-ignore
--- a/system/templateEngines/Twig/Twig1x/twig/twig/.gitignore
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/.gitignore
@ -1,6 +0,0 @@
 /build
 /composer.lock
 /ext/twig/autom4te.cache/
 /phpunit.xml
 /vendor
 .phpunit.result.cache
--- a/system/templateEngines/Twig/Twig1x/twig/twig/.php_cs.dist
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/.php_cs.dist
--- a/system/templateEngines/Twig/Twig1x/twig/twig/.travis.yml
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/.travis.yml
--- a/system/templateEngines/Twig/Twig1x/twig/twig/LICENSE
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/LICENSE
--- a/system/templateEngines/Twig/Twig1x/twig/twig/README.rst
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/README.rst
--- a/system/templateEngines/Twig/Twig1x/twig/twig/src/Cache/FilesystemCache.php
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/src/Cache/FilesystemCache.php
--- a/system/templateEngines/Twig/Twig1x/twig/twig/src/Environment.php
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/src/Environment.php
--- a/system/templateEngines/Twig/Twig1x/twig/twig/src/ExpressionParser.php
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/src/ExpressionParser.php
--- a/system/templateEngines/Twig/Twig1x/twig/twig/src/Extension/CoreExtension.php
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/src/Extension/CoreExtension.php
--- a/system/templateEngines/Twig/Twig1x/twig/twig/src/Extension/DebugExtension.php
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/src/Extension/DebugExtension.php
--- a/system/templateEngines/Twig/Twig1x/twig/twig/src/Lexer.php
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/src/Lexer.php
--- a/system/templateEngines/Twig/Twig1x/twig/twig/src/Loader/FilesystemLoader.php
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/src/Loader/FilesystemLoader.php
--- a/system/templateEngines/Twig/Twig1x/twig/twig/src/Node/Expression/NullCoalesceExpression.php
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/src/Node/Expression/NullCoalesceExpression.php
--- a/system/templateEngines/Twig/Twig1x/twig/twig/src/Node/MacroNode.php
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/src/Node/MacroNode.php
--- a/system/templateEngines/Twig/Twig1x/twig/twig/src/Node/SetNode.php
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/src/Node/SetNode.php
--- a/system/templateEngines/Twig/Twig1x/twig/twig/src/Node/SpacelessNode.php
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/src/Node/SpacelessNode.php
--- a/system/templateEngines/Twig/Twig1x/twig/twig/src/NodeVisitor/SandboxNodeVisitor.php
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/src/NodeVisitor/SandboxNodeVisitor.php
--- a/system/templateEngines/Twig/Twig1x/twig/twig/src/Parser.php
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/src/Parser.php
--- a/system/templateEngines/Twig/Twig1x/twig/twig/src/Sandbox/SecurityPolicy.php
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/src/Sandbox/SecurityPolicy.php
--- a/system/templateEngines/Twig/Twig1x/twig/twig/src/Template.php
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/src/Template.php
--- a/system/templateEngines/Twig/Twig1x/twig/twig/src/TemplateWrapper.php
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/src/TemplateWrapper.php
--- a/system/templateEngines/Twig/Twig1x/twig/twig/src/TokenParser/ExtendsTokenParser.php
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/src/TokenParser/ExtendsTokenParser.php
--- a/system/templateEngines/Twig/Twig1x/twig/twig/src/TokenParser/FromTokenParser.php
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/src/TokenParser/FromTokenParser.php
--- a/system/templateEngines/Twig/Twig1x/twig/twig/src/TokenParser/ImportTokenParser.php
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/src/TokenParser/ImportTokenParser.php
--- a/system/templateEngines/Twig/Twig1x/twig/twig/src/TokenStream.php
+++ b/system/templateEngines/Twig/Twig1x/twig/twig/src/TokenStream.php
--- a/system/templateEngines/Twig/Twig1x/vendor/autoload.php
+++ b/system/templateEngines/Twig/Twig1x/vendor/autoload.php
--- a/system/templateEngines/Twig/Twig1x/vendor/composer/ClassLoader.php
+++ b/system/templateEngines/Twig/Twig1x/vendor/composer/ClassLoader.php
--- a/system/templateEngines/Twig/Twig1x/vendor/composer/InstalledVersions.php
+++ b/system/templateEngines/Twig/Twig1x/vendor/composer/InstalledVersions.php
--- a/Show More
+++ b/Show More
		`@ -1,2 +0,0 @@`
			`/tests export-ignore`
			`/phpunit.xml.dist export-ignore`