From: Nicolas Lœuillet Date: Fri, 2 Aug 2013 20:43:56 +0000 (+0200) Subject: move Twig in 3rdparty X-Git-Tag: 1.0-beta1~3^2~45 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=8069e235fd2971675ee5fc05026ffa9bce5cbbb7;p=github%2Fwallabag%2Fwallabag.git move Twig in 3rdparty --- diff --git a/inc/Twig/Autoloader.php b/inc/3rdparty/Twig/Autoloader.php similarity index 100% rename from inc/Twig/Autoloader.php rename to inc/3rdparty/Twig/Autoloader.php diff --git a/inc/Twig/Compiler.php b/inc/3rdparty/Twig/Compiler.php similarity index 100% rename from inc/Twig/Compiler.php rename to inc/3rdparty/Twig/Compiler.php diff --git a/inc/Twig/CompilerInterface.php b/inc/3rdparty/Twig/CompilerInterface.php similarity index 100% rename from inc/Twig/CompilerInterface.php rename to inc/3rdparty/Twig/CompilerInterface.php diff --git a/inc/Twig/Environment.php b/inc/3rdparty/Twig/Environment.php similarity index 100% rename from inc/Twig/Environment.php rename to inc/3rdparty/Twig/Environment.php diff --git a/inc/Twig/Error.php b/inc/3rdparty/Twig/Error.php similarity index 100% rename from inc/Twig/Error.php rename to inc/3rdparty/Twig/Error.php diff --git a/inc/Twig/Error/Loader.php b/inc/3rdparty/Twig/Error/Loader.php similarity index 100% rename from inc/Twig/Error/Loader.php rename to inc/3rdparty/Twig/Error/Loader.php diff --git a/inc/Twig/Error/Runtime.php b/inc/3rdparty/Twig/Error/Runtime.php similarity index 100% rename from inc/Twig/Error/Runtime.php rename to inc/3rdparty/Twig/Error/Runtime.php diff --git a/inc/Twig/Error/Syntax.php b/inc/3rdparty/Twig/Error/Syntax.php similarity index 100% rename from inc/Twig/Error/Syntax.php rename to inc/3rdparty/Twig/Error/Syntax.php diff --git a/inc/Twig/ExistsLoaderInterface.php b/inc/3rdparty/Twig/ExistsLoaderInterface.php similarity index 100% rename from inc/Twig/ExistsLoaderInterface.php rename to inc/3rdparty/Twig/ExistsLoaderInterface.php diff --git a/inc/Twig/ExpressionParser.php b/inc/3rdparty/Twig/ExpressionParser.php similarity index 100% rename from inc/Twig/ExpressionParser.php rename to inc/3rdparty/Twig/ExpressionParser.php diff --git a/inc/Twig/Extension.php b/inc/3rdparty/Twig/Extension.php similarity index 100% rename from inc/Twig/Extension.php rename to inc/3rdparty/Twig/Extension.php diff --git a/inc/Twig/Extension/Core.php b/inc/3rdparty/Twig/Extension/Core.php similarity index 100% rename from inc/Twig/Extension/Core.php rename to inc/3rdparty/Twig/Extension/Core.php diff --git a/inc/Twig/Extension/Debug.php b/inc/3rdparty/Twig/Extension/Debug.php similarity index 100% rename from inc/Twig/Extension/Debug.php rename to inc/3rdparty/Twig/Extension/Debug.php diff --git a/inc/Twig/Extension/Escaper.php b/inc/3rdparty/Twig/Extension/Escaper.php similarity index 100% rename from inc/Twig/Extension/Escaper.php rename to inc/3rdparty/Twig/Extension/Escaper.php diff --git a/inc/Twig/Extension/Optimizer.php b/inc/3rdparty/Twig/Extension/Optimizer.php similarity index 100% rename from inc/Twig/Extension/Optimizer.php rename to inc/3rdparty/Twig/Extension/Optimizer.php diff --git a/inc/Twig/Extension/Sandbox.php b/inc/3rdparty/Twig/Extension/Sandbox.php similarity index 100% rename from inc/Twig/Extension/Sandbox.php rename to inc/3rdparty/Twig/Extension/Sandbox.php diff --git a/inc/Twig/Extension/Staging.php b/inc/3rdparty/Twig/Extension/Staging.php similarity index 100% rename from inc/Twig/Extension/Staging.php rename to inc/3rdparty/Twig/Extension/Staging.php diff --git a/inc/Twig/Extension/StringLoader.php b/inc/3rdparty/Twig/Extension/StringLoader.php similarity index 100% rename from inc/Twig/Extension/StringLoader.php rename to inc/3rdparty/Twig/Extension/StringLoader.php diff --git a/inc/Twig/ExtensionInterface.php b/inc/3rdparty/Twig/ExtensionInterface.php similarity index 100% rename from inc/Twig/ExtensionInterface.php rename to inc/3rdparty/Twig/ExtensionInterface.php diff --git a/inc/Twig/Extensions/Autoloader.php b/inc/3rdparty/Twig/Extensions/Autoloader.php similarity index 100% rename from inc/Twig/Extensions/Autoloader.php rename to inc/3rdparty/Twig/Extensions/Autoloader.php diff --git a/inc/Twig/Extensions/Extension/Debug.php b/inc/3rdparty/Twig/Extensions/Extension/Debug.php similarity index 100% rename from inc/Twig/Extensions/Extension/Debug.php rename to inc/3rdparty/Twig/Extensions/Extension/Debug.php diff --git a/inc/Twig/Extensions/Extension/I18n.php b/inc/3rdparty/Twig/Extensions/Extension/I18n.php similarity index 100% rename from inc/Twig/Extensions/Extension/I18n.php rename to inc/3rdparty/Twig/Extensions/Extension/I18n.php diff --git a/inc/Twig/Extensions/Extension/Intl.php b/inc/3rdparty/Twig/Extensions/Extension/Intl.php similarity index 100% rename from inc/Twig/Extensions/Extension/Intl.php rename to inc/3rdparty/Twig/Extensions/Extension/Intl.php diff --git a/inc/Twig/Extensions/Extension/Text.php b/inc/3rdparty/Twig/Extensions/Extension/Text.php similarity index 100% rename from inc/Twig/Extensions/Extension/Text.php rename to inc/3rdparty/Twig/Extensions/Extension/Text.php diff --git a/inc/Twig/Extensions/Gettext/Extractor.php b/inc/3rdparty/Twig/Extensions/Gettext/Extractor.php similarity index 100% rename from inc/Twig/Extensions/Gettext/Extractor.php rename to inc/3rdparty/Twig/Extensions/Gettext/Extractor.php diff --git a/inc/Twig/Extensions/Gettext/Loader/Filesystem.php b/inc/3rdparty/Twig/Extensions/Gettext/Loader/Filesystem.php similarity index 100% rename from inc/Twig/Extensions/Gettext/Loader/Filesystem.php rename to inc/3rdparty/Twig/Extensions/Gettext/Loader/Filesystem.php diff --git a/inc/Twig/Extensions/Gettext/Routing/Generator/UrlGenerator.php b/inc/3rdparty/Twig/Extensions/Gettext/Routing/Generator/UrlGenerator.php similarity index 100% rename from inc/Twig/Extensions/Gettext/Routing/Generator/UrlGenerator.php rename to inc/3rdparty/Twig/Extensions/Gettext/Routing/Generator/UrlGenerator.php diff --git a/inc/Twig/Extensions/Gettext/Test/ExtractorTest.php b/inc/3rdparty/Twig/Extensions/Gettext/Test/ExtractorTest.php similarity index 100% rename from inc/Twig/Extensions/Gettext/Test/ExtractorTest.php rename to inc/3rdparty/Twig/Extensions/Gettext/Test/ExtractorTest.php diff --git a/inc/Twig/Extensions/Gettext/Test/Fixtures/twig/empty.twig b/inc/3rdparty/Twig/Extensions/Gettext/Test/Fixtures/twig/empty.twig similarity index 100% rename from inc/Twig/Extensions/Gettext/Test/Fixtures/twig/empty.twig rename to inc/3rdparty/Twig/Extensions/Gettext/Test/Fixtures/twig/empty.twig diff --git a/inc/Twig/Extensions/Gettext/Test/Fixtures/twig/plural.twig b/inc/3rdparty/Twig/Extensions/Gettext/Test/Fixtures/twig/plural.twig similarity index 100% rename from inc/Twig/Extensions/Gettext/Test/Fixtures/twig/plural.twig rename to inc/3rdparty/Twig/Extensions/Gettext/Test/Fixtures/twig/plural.twig diff --git a/inc/Twig/Extensions/Gettext/Test/Fixtures/twig/singular.twig b/inc/3rdparty/Twig/Extensions/Gettext/Test/Fixtures/twig/singular.twig similarity index 100% rename from inc/Twig/Extensions/Gettext/Test/Fixtures/twig/singular.twig rename to inc/3rdparty/Twig/Extensions/Gettext/Test/Fixtures/twig/singular.twig diff --git a/inc/Twig/Extensions/Grammar.php b/inc/3rdparty/Twig/Extensions/Grammar.php similarity index 100% rename from inc/Twig/Extensions/Grammar.php rename to inc/3rdparty/Twig/Extensions/Grammar.php diff --git a/inc/Twig/Extensions/Grammar/Arguments.php b/inc/3rdparty/Twig/Extensions/Grammar/Arguments.php similarity index 100% rename from inc/Twig/Extensions/Grammar/Arguments.php rename to inc/3rdparty/Twig/Extensions/Grammar/Arguments.php diff --git a/inc/Twig/Extensions/Grammar/Array.php b/inc/3rdparty/Twig/Extensions/Grammar/Array.php similarity index 100% rename from inc/Twig/Extensions/Grammar/Array.php rename to inc/3rdparty/Twig/Extensions/Grammar/Array.php diff --git a/inc/Twig/Extensions/Grammar/Body.php b/inc/3rdparty/Twig/Extensions/Grammar/Body.php similarity index 100% rename from inc/Twig/Extensions/Grammar/Body.php rename to inc/3rdparty/Twig/Extensions/Grammar/Body.php diff --git a/inc/Twig/Extensions/Grammar/Boolean.php b/inc/3rdparty/Twig/Extensions/Grammar/Boolean.php similarity index 100% rename from inc/Twig/Extensions/Grammar/Boolean.php rename to inc/3rdparty/Twig/Extensions/Grammar/Boolean.php diff --git a/inc/Twig/Extensions/Grammar/Constant.php b/inc/3rdparty/Twig/Extensions/Grammar/Constant.php similarity index 100% rename from inc/Twig/Extensions/Grammar/Constant.php rename to inc/3rdparty/Twig/Extensions/Grammar/Constant.php diff --git a/inc/Twig/Extensions/Grammar/Expression.php b/inc/3rdparty/Twig/Extensions/Grammar/Expression.php similarity index 100% rename from inc/Twig/Extensions/Grammar/Expression.php rename to inc/3rdparty/Twig/Extensions/Grammar/Expression.php diff --git a/inc/Twig/Extensions/Grammar/Hash.php b/inc/3rdparty/Twig/Extensions/Grammar/Hash.php similarity index 100% rename from inc/Twig/Extensions/Grammar/Hash.php rename to inc/3rdparty/Twig/Extensions/Grammar/Hash.php diff --git a/inc/Twig/Extensions/Grammar/Number.php b/inc/3rdparty/Twig/Extensions/Grammar/Number.php similarity index 100% rename from inc/Twig/Extensions/Grammar/Number.php rename to inc/3rdparty/Twig/Extensions/Grammar/Number.php diff --git a/inc/Twig/Extensions/Grammar/Optional.php b/inc/3rdparty/Twig/Extensions/Grammar/Optional.php similarity index 100% rename from inc/Twig/Extensions/Grammar/Optional.php rename to inc/3rdparty/Twig/Extensions/Grammar/Optional.php diff --git a/inc/Twig/Extensions/Grammar/Switch.php b/inc/3rdparty/Twig/Extensions/Grammar/Switch.php similarity index 100% rename from inc/Twig/Extensions/Grammar/Switch.php rename to inc/3rdparty/Twig/Extensions/Grammar/Switch.php diff --git a/inc/Twig/Extensions/Grammar/Tag.php b/inc/3rdparty/Twig/Extensions/Grammar/Tag.php similarity index 100% rename from inc/Twig/Extensions/Grammar/Tag.php rename to inc/3rdparty/Twig/Extensions/Grammar/Tag.php diff --git a/inc/Twig/Extensions/GrammarInterface.php b/inc/3rdparty/Twig/Extensions/GrammarInterface.php similarity index 100% rename from inc/Twig/Extensions/GrammarInterface.php rename to inc/3rdparty/Twig/Extensions/GrammarInterface.php diff --git a/inc/Twig/Extensions/Node/Debug.php b/inc/3rdparty/Twig/Extensions/Node/Debug.php similarity index 100% rename from inc/Twig/Extensions/Node/Debug.php rename to inc/3rdparty/Twig/Extensions/Node/Debug.php diff --git a/inc/Twig/Extensions/Node/Trans.php b/inc/3rdparty/Twig/Extensions/Node/Trans.php similarity index 100% rename from inc/Twig/Extensions/Node/Trans.php rename to inc/3rdparty/Twig/Extensions/Node/Trans.php diff --git a/inc/Twig/Extensions/SimpleTokenParser.php b/inc/3rdparty/Twig/Extensions/SimpleTokenParser.php similarity index 100% rename from inc/Twig/Extensions/SimpleTokenParser.php rename to inc/3rdparty/Twig/Extensions/SimpleTokenParser.php diff --git a/inc/Twig/Extensions/TokenParser/Debug.php b/inc/3rdparty/Twig/Extensions/TokenParser/Debug.php similarity index 100% rename from inc/Twig/Extensions/TokenParser/Debug.php rename to inc/3rdparty/Twig/Extensions/TokenParser/Debug.php diff --git a/inc/Twig/Extensions/TokenParser/Trans.php b/inc/3rdparty/Twig/Extensions/TokenParser/Trans.php similarity index 100% rename from inc/Twig/Extensions/TokenParser/Trans.php rename to inc/3rdparty/Twig/Extensions/TokenParser/Trans.php diff --git a/inc/Twig/Filter.php b/inc/3rdparty/Twig/Filter.php similarity index 100% rename from inc/Twig/Filter.php rename to inc/3rdparty/Twig/Filter.php diff --git a/inc/Twig/Filter/Function.php b/inc/3rdparty/Twig/Filter/Function.php similarity index 100% rename from inc/Twig/Filter/Function.php rename to inc/3rdparty/Twig/Filter/Function.php diff --git a/inc/Twig/Filter/Method.php b/inc/3rdparty/Twig/Filter/Method.php similarity index 100% rename from inc/Twig/Filter/Method.php rename to inc/3rdparty/Twig/Filter/Method.php diff --git a/inc/Twig/Filter/Node.php b/inc/3rdparty/Twig/Filter/Node.php similarity index 100% rename from inc/Twig/Filter/Node.php rename to inc/3rdparty/Twig/Filter/Node.php diff --git a/inc/Twig/FilterCallableInterface.php b/inc/3rdparty/Twig/FilterCallableInterface.php similarity index 100% rename from inc/Twig/FilterCallableInterface.php rename to inc/3rdparty/Twig/FilterCallableInterface.php diff --git a/inc/Twig/FilterInterface.php b/inc/3rdparty/Twig/FilterInterface.php similarity index 100% rename from inc/Twig/FilterInterface.php rename to inc/3rdparty/Twig/FilterInterface.php diff --git a/inc/Twig/Function.php b/inc/3rdparty/Twig/Function.php similarity index 100% rename from inc/Twig/Function.php rename to inc/3rdparty/Twig/Function.php diff --git a/inc/Twig/Function/Function.php b/inc/3rdparty/Twig/Function/Function.php similarity index 100% rename from inc/Twig/Function/Function.php rename to inc/3rdparty/Twig/Function/Function.php diff --git a/inc/Twig/Function/Method.php b/inc/3rdparty/Twig/Function/Method.php similarity index 100% rename from inc/Twig/Function/Method.php rename to inc/3rdparty/Twig/Function/Method.php diff --git a/inc/Twig/Function/Node.php b/inc/3rdparty/Twig/Function/Node.php similarity index 100% rename from inc/Twig/Function/Node.php rename to inc/3rdparty/Twig/Function/Node.php diff --git a/inc/Twig/FunctionCallableInterface.php b/inc/3rdparty/Twig/FunctionCallableInterface.php similarity index 100% rename from inc/Twig/FunctionCallableInterface.php rename to inc/3rdparty/Twig/FunctionCallableInterface.php diff --git a/inc/Twig/FunctionInterface.php b/inc/3rdparty/Twig/FunctionInterface.php similarity index 100% rename from inc/Twig/FunctionInterface.php rename to inc/3rdparty/Twig/FunctionInterface.php diff --git a/inc/Twig/Gettext/Extractor.php b/inc/3rdparty/Twig/Gettext/Extractor.php similarity index 100% rename from inc/Twig/Gettext/Extractor.php rename to inc/3rdparty/Twig/Gettext/Extractor.php diff --git a/inc/Twig/Gettext/Loader/Filesystem.php b/inc/3rdparty/Twig/Gettext/Loader/Filesystem.php similarity index 100% rename from inc/Twig/Gettext/Loader/Filesystem.php rename to inc/3rdparty/Twig/Gettext/Loader/Filesystem.php diff --git a/inc/Twig/Gettext/Routing/Generator/UrlGenerator.php b/inc/3rdparty/Twig/Gettext/Routing/Generator/UrlGenerator.php similarity index 100% rename from inc/Twig/Gettext/Routing/Generator/UrlGenerator.php rename to inc/3rdparty/Twig/Gettext/Routing/Generator/UrlGenerator.php diff --git a/inc/Twig/Gettext/Test/ExtractorTest.php b/inc/3rdparty/Twig/Gettext/Test/ExtractorTest.php similarity index 100% rename from inc/Twig/Gettext/Test/ExtractorTest.php rename to inc/3rdparty/Twig/Gettext/Test/ExtractorTest.php diff --git a/inc/Twig/Gettext/Test/Fixtures/twig/empty.twig b/inc/3rdparty/Twig/Gettext/Test/Fixtures/twig/empty.twig similarity index 100% rename from inc/Twig/Gettext/Test/Fixtures/twig/empty.twig rename to inc/3rdparty/Twig/Gettext/Test/Fixtures/twig/empty.twig diff --git a/inc/Twig/Gettext/Test/Fixtures/twig/plural.twig b/inc/3rdparty/Twig/Gettext/Test/Fixtures/twig/plural.twig similarity index 100% rename from inc/Twig/Gettext/Test/Fixtures/twig/plural.twig rename to inc/3rdparty/Twig/Gettext/Test/Fixtures/twig/plural.twig diff --git a/inc/Twig/Gettext/Test/Fixtures/twig/singular.twig b/inc/3rdparty/Twig/Gettext/Test/Fixtures/twig/singular.twig similarity index 100% rename from inc/Twig/Gettext/Test/Fixtures/twig/singular.twig rename to inc/3rdparty/Twig/Gettext/Test/Fixtures/twig/singular.twig diff --git a/inc/Twig/Lexer.php b/inc/3rdparty/Twig/Lexer.php similarity index 100% rename from inc/Twig/Lexer.php rename to inc/3rdparty/Twig/Lexer.php diff --git a/inc/Twig/LexerInterface.php b/inc/3rdparty/Twig/LexerInterface.php similarity index 100% rename from inc/Twig/LexerInterface.php rename to inc/3rdparty/Twig/LexerInterface.php diff --git a/inc/Twig/Loader/Array.php b/inc/3rdparty/Twig/Loader/Array.php similarity index 100% rename from inc/Twig/Loader/Array.php rename to inc/3rdparty/Twig/Loader/Array.php diff --git a/inc/Twig/Loader/Chain.php b/inc/3rdparty/Twig/Loader/Chain.php similarity index 100% rename from inc/Twig/Loader/Chain.php rename to inc/3rdparty/Twig/Loader/Chain.php diff --git a/inc/Twig/Loader/Filesystem.php b/inc/3rdparty/Twig/Loader/Filesystem.php similarity index 100% rename from inc/Twig/Loader/Filesystem.php rename to inc/3rdparty/Twig/Loader/Filesystem.php diff --git a/inc/Twig/Loader/String.php b/inc/3rdparty/Twig/Loader/String.php similarity index 100% rename from inc/Twig/Loader/String.php rename to inc/3rdparty/Twig/Loader/String.php diff --git a/inc/Twig/LoaderInterface.php b/inc/3rdparty/Twig/LoaderInterface.php similarity index 100% rename from inc/Twig/LoaderInterface.php rename to inc/3rdparty/Twig/LoaderInterface.php diff --git a/inc/Twig/Markup.php b/inc/3rdparty/Twig/Markup.php similarity index 100% rename from inc/Twig/Markup.php rename to inc/3rdparty/Twig/Markup.php diff --git a/inc/Twig/Node.php b/inc/3rdparty/Twig/Node.php similarity index 100% rename from inc/Twig/Node.php rename to inc/3rdparty/Twig/Node.php diff --git a/inc/Twig/Node/AutoEscape.php b/inc/3rdparty/Twig/Node/AutoEscape.php similarity index 100% rename from inc/Twig/Node/AutoEscape.php rename to inc/3rdparty/Twig/Node/AutoEscape.php diff --git a/inc/Twig/Node/Block.php b/inc/3rdparty/Twig/Node/Block.php similarity index 100% rename from inc/Twig/Node/Block.php rename to inc/3rdparty/Twig/Node/Block.php diff --git a/inc/Twig/Node/BlockReference.php b/inc/3rdparty/Twig/Node/BlockReference.php similarity index 100% rename from inc/Twig/Node/BlockReference.php rename to inc/3rdparty/Twig/Node/BlockReference.php diff --git a/inc/Twig/Node/Body.php b/inc/3rdparty/Twig/Node/Body.php similarity index 100% rename from inc/Twig/Node/Body.php rename to inc/3rdparty/Twig/Node/Body.php diff --git a/inc/Twig/Node/Do.php b/inc/3rdparty/Twig/Node/Do.php similarity index 100% rename from inc/Twig/Node/Do.php rename to inc/3rdparty/Twig/Node/Do.php diff --git a/inc/Twig/Node/Embed.php b/inc/3rdparty/Twig/Node/Embed.php similarity index 100% rename from inc/Twig/Node/Embed.php rename to inc/3rdparty/Twig/Node/Embed.php diff --git a/inc/Twig/Node/Expression.php b/inc/3rdparty/Twig/Node/Expression.php similarity index 100% rename from inc/Twig/Node/Expression.php rename to inc/3rdparty/Twig/Node/Expression.php diff --git a/inc/Twig/Node/Expression/Array.php b/inc/3rdparty/Twig/Node/Expression/Array.php similarity index 100% rename from inc/Twig/Node/Expression/Array.php rename to inc/3rdparty/Twig/Node/Expression/Array.php diff --git a/inc/Twig/Node/Expression/AssignName.php b/inc/3rdparty/Twig/Node/Expression/AssignName.php similarity index 100% rename from inc/Twig/Node/Expression/AssignName.php rename to inc/3rdparty/Twig/Node/Expression/AssignName.php diff --git a/inc/Twig/Node/Expression/Binary.php b/inc/3rdparty/Twig/Node/Expression/Binary.php similarity index 100% rename from inc/Twig/Node/Expression/Binary.php rename to inc/3rdparty/Twig/Node/Expression/Binary.php diff --git a/inc/Twig/Node/Expression/Binary/Add.php b/inc/3rdparty/Twig/Node/Expression/Binary/Add.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/Add.php rename to inc/3rdparty/Twig/Node/Expression/Binary/Add.php diff --git a/inc/Twig/Node/Expression/Binary/And.php b/inc/3rdparty/Twig/Node/Expression/Binary/And.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/And.php rename to inc/3rdparty/Twig/Node/Expression/Binary/And.php diff --git a/inc/Twig/Node/Expression/Binary/BitwiseAnd.php b/inc/3rdparty/Twig/Node/Expression/Binary/BitwiseAnd.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/BitwiseAnd.php rename to inc/3rdparty/Twig/Node/Expression/Binary/BitwiseAnd.php diff --git a/inc/Twig/Node/Expression/Binary/BitwiseOr.php b/inc/3rdparty/Twig/Node/Expression/Binary/BitwiseOr.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/BitwiseOr.php rename to inc/3rdparty/Twig/Node/Expression/Binary/BitwiseOr.php diff --git a/inc/Twig/Node/Expression/Binary/BitwiseXor.php b/inc/3rdparty/Twig/Node/Expression/Binary/BitwiseXor.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/BitwiseXor.php rename to inc/3rdparty/Twig/Node/Expression/Binary/BitwiseXor.php diff --git a/inc/Twig/Node/Expression/Binary/Concat.php b/inc/3rdparty/Twig/Node/Expression/Binary/Concat.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/Concat.php rename to inc/3rdparty/Twig/Node/Expression/Binary/Concat.php diff --git a/inc/Twig/Node/Expression/Binary/Div.php b/inc/3rdparty/Twig/Node/Expression/Binary/Div.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/Div.php rename to inc/3rdparty/Twig/Node/Expression/Binary/Div.php diff --git a/inc/Twig/Node/Expression/Binary/Equal.php b/inc/3rdparty/Twig/Node/Expression/Binary/Equal.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/Equal.php rename to inc/3rdparty/Twig/Node/Expression/Binary/Equal.php diff --git a/inc/Twig/Node/Expression/Binary/FloorDiv.php b/inc/3rdparty/Twig/Node/Expression/Binary/FloorDiv.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/FloorDiv.php rename to inc/3rdparty/Twig/Node/Expression/Binary/FloorDiv.php diff --git a/inc/Twig/Node/Expression/Binary/Greater.php b/inc/3rdparty/Twig/Node/Expression/Binary/Greater.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/Greater.php rename to inc/3rdparty/Twig/Node/Expression/Binary/Greater.php diff --git a/inc/Twig/Node/Expression/Binary/GreaterEqual.php b/inc/3rdparty/Twig/Node/Expression/Binary/GreaterEqual.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/GreaterEqual.php rename to inc/3rdparty/Twig/Node/Expression/Binary/GreaterEqual.php diff --git a/inc/Twig/Node/Expression/Binary/In.php b/inc/3rdparty/Twig/Node/Expression/Binary/In.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/In.php rename to inc/3rdparty/Twig/Node/Expression/Binary/In.php diff --git a/inc/Twig/Node/Expression/Binary/Less.php b/inc/3rdparty/Twig/Node/Expression/Binary/Less.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/Less.php rename to inc/3rdparty/Twig/Node/Expression/Binary/Less.php diff --git a/inc/Twig/Node/Expression/Binary/LessEqual.php b/inc/3rdparty/Twig/Node/Expression/Binary/LessEqual.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/LessEqual.php rename to inc/3rdparty/Twig/Node/Expression/Binary/LessEqual.php diff --git a/inc/Twig/Node/Expression/Binary/Mod.php b/inc/3rdparty/Twig/Node/Expression/Binary/Mod.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/Mod.php rename to inc/3rdparty/Twig/Node/Expression/Binary/Mod.php diff --git a/inc/Twig/Node/Expression/Binary/Mul.php b/inc/3rdparty/Twig/Node/Expression/Binary/Mul.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/Mul.php rename to inc/3rdparty/Twig/Node/Expression/Binary/Mul.php diff --git a/inc/Twig/Node/Expression/Binary/NotEqual.php b/inc/3rdparty/Twig/Node/Expression/Binary/NotEqual.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/NotEqual.php rename to inc/3rdparty/Twig/Node/Expression/Binary/NotEqual.php diff --git a/inc/Twig/Node/Expression/Binary/NotIn.php b/inc/3rdparty/Twig/Node/Expression/Binary/NotIn.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/NotIn.php rename to inc/3rdparty/Twig/Node/Expression/Binary/NotIn.php diff --git a/inc/Twig/Node/Expression/Binary/Or.php b/inc/3rdparty/Twig/Node/Expression/Binary/Or.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/Or.php rename to inc/3rdparty/Twig/Node/Expression/Binary/Or.php diff --git a/inc/Twig/Node/Expression/Binary/Power.php b/inc/3rdparty/Twig/Node/Expression/Binary/Power.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/Power.php rename to inc/3rdparty/Twig/Node/Expression/Binary/Power.php diff --git a/inc/Twig/Node/Expression/Binary/Range.php b/inc/3rdparty/Twig/Node/Expression/Binary/Range.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/Range.php rename to inc/3rdparty/Twig/Node/Expression/Binary/Range.php diff --git a/inc/Twig/Node/Expression/Binary/Sub.php b/inc/3rdparty/Twig/Node/Expression/Binary/Sub.php similarity index 100% rename from inc/Twig/Node/Expression/Binary/Sub.php rename to inc/3rdparty/Twig/Node/Expression/Binary/Sub.php diff --git a/inc/Twig/Node/Expression/BlockReference.php b/inc/3rdparty/Twig/Node/Expression/BlockReference.php similarity index 100% rename from inc/Twig/Node/Expression/BlockReference.php rename to inc/3rdparty/Twig/Node/Expression/BlockReference.php diff --git a/inc/Twig/Node/Expression/Call.php b/inc/3rdparty/Twig/Node/Expression/Call.php similarity index 100% rename from inc/Twig/Node/Expression/Call.php rename to inc/3rdparty/Twig/Node/Expression/Call.php diff --git a/inc/Twig/Node/Expression/Conditional.php b/inc/3rdparty/Twig/Node/Expression/Conditional.php similarity index 100% rename from inc/Twig/Node/Expression/Conditional.php rename to inc/3rdparty/Twig/Node/Expression/Conditional.php diff --git a/inc/Twig/Node/Expression/Constant.php b/inc/3rdparty/Twig/Node/Expression/Constant.php similarity index 100% rename from inc/Twig/Node/Expression/Constant.php rename to inc/3rdparty/Twig/Node/Expression/Constant.php diff --git a/inc/Twig/Node/Expression/ExtensionReference.php b/inc/3rdparty/Twig/Node/Expression/ExtensionReference.php similarity index 100% rename from inc/Twig/Node/Expression/ExtensionReference.php rename to inc/3rdparty/Twig/Node/Expression/ExtensionReference.php diff --git a/inc/Twig/Node/Expression/Filter.php b/inc/3rdparty/Twig/Node/Expression/Filter.php similarity index 100% rename from inc/Twig/Node/Expression/Filter.php rename to inc/3rdparty/Twig/Node/Expression/Filter.php diff --git a/inc/Twig/Node/Expression/Filter/Default.php b/inc/3rdparty/Twig/Node/Expression/Filter/Default.php similarity index 100% rename from inc/Twig/Node/Expression/Filter/Default.php rename to inc/3rdparty/Twig/Node/Expression/Filter/Default.php diff --git a/inc/Twig/Node/Expression/Function.php b/inc/3rdparty/Twig/Node/Expression/Function.php similarity index 100% rename from inc/Twig/Node/Expression/Function.php rename to inc/3rdparty/Twig/Node/Expression/Function.php diff --git a/inc/Twig/Node/Expression/GetAttr.php b/inc/3rdparty/Twig/Node/Expression/GetAttr.php similarity index 100% rename from inc/Twig/Node/Expression/GetAttr.php rename to inc/3rdparty/Twig/Node/Expression/GetAttr.php diff --git a/inc/Twig/Node/Expression/MethodCall.php b/inc/3rdparty/Twig/Node/Expression/MethodCall.php similarity index 100% rename from inc/Twig/Node/Expression/MethodCall.php rename to inc/3rdparty/Twig/Node/Expression/MethodCall.php diff --git a/inc/Twig/Node/Expression/Name.php b/inc/3rdparty/Twig/Node/Expression/Name.php similarity index 100% rename from inc/Twig/Node/Expression/Name.php rename to inc/3rdparty/Twig/Node/Expression/Name.php diff --git a/inc/Twig/Node/Expression/Parent.php b/inc/3rdparty/Twig/Node/Expression/Parent.php similarity index 100% rename from inc/Twig/Node/Expression/Parent.php rename to inc/3rdparty/Twig/Node/Expression/Parent.php diff --git a/inc/Twig/Node/Expression/TempName.php b/inc/3rdparty/Twig/Node/Expression/TempName.php similarity index 100% rename from inc/Twig/Node/Expression/TempName.php rename to inc/3rdparty/Twig/Node/Expression/TempName.php diff --git a/inc/Twig/Node/Expression/Test.php b/inc/3rdparty/Twig/Node/Expression/Test.php similarity index 100% rename from inc/Twig/Node/Expression/Test.php rename to inc/3rdparty/Twig/Node/Expression/Test.php diff --git a/inc/Twig/Node/Expression/Test/Constant.php b/inc/3rdparty/Twig/Node/Expression/Test/Constant.php similarity index 100% rename from inc/Twig/Node/Expression/Test/Constant.php rename to inc/3rdparty/Twig/Node/Expression/Test/Constant.php diff --git a/inc/Twig/Node/Expression/Test/Defined.php b/inc/3rdparty/Twig/Node/Expression/Test/Defined.php similarity index 100% rename from inc/Twig/Node/Expression/Test/Defined.php rename to inc/3rdparty/Twig/Node/Expression/Test/Defined.php diff --git a/inc/Twig/Node/Expression/Test/Divisibleby.php b/inc/3rdparty/Twig/Node/Expression/Test/Divisibleby.php similarity index 100% rename from inc/Twig/Node/Expression/Test/Divisibleby.php rename to inc/3rdparty/Twig/Node/Expression/Test/Divisibleby.php diff --git a/inc/Twig/Node/Expression/Test/Even.php b/inc/3rdparty/Twig/Node/Expression/Test/Even.php similarity index 100% rename from inc/Twig/Node/Expression/Test/Even.php rename to inc/3rdparty/Twig/Node/Expression/Test/Even.php diff --git a/inc/Twig/Node/Expression/Test/Null.php b/inc/3rdparty/Twig/Node/Expression/Test/Null.php similarity index 100% rename from inc/Twig/Node/Expression/Test/Null.php rename to inc/3rdparty/Twig/Node/Expression/Test/Null.php diff --git a/inc/Twig/Node/Expression/Test/Odd.php b/inc/3rdparty/Twig/Node/Expression/Test/Odd.php similarity index 100% rename from inc/Twig/Node/Expression/Test/Odd.php rename to inc/3rdparty/Twig/Node/Expression/Test/Odd.php diff --git a/inc/Twig/Node/Expression/Test/Sameas.php b/inc/3rdparty/Twig/Node/Expression/Test/Sameas.php similarity index 100% rename from inc/Twig/Node/Expression/Test/Sameas.php rename to inc/3rdparty/Twig/Node/Expression/Test/Sameas.php diff --git a/inc/Twig/Node/Expression/Unary.php b/inc/3rdparty/Twig/Node/Expression/Unary.php similarity index 100% rename from inc/Twig/Node/Expression/Unary.php rename to inc/3rdparty/Twig/Node/Expression/Unary.php diff --git a/inc/Twig/Node/Expression/Unary/Neg.php b/inc/3rdparty/Twig/Node/Expression/Unary/Neg.php similarity index 100% rename from inc/Twig/Node/Expression/Unary/Neg.php rename to inc/3rdparty/Twig/Node/Expression/Unary/Neg.php diff --git a/inc/Twig/Node/Expression/Unary/Not.php b/inc/3rdparty/Twig/Node/Expression/Unary/Not.php similarity index 100% rename from inc/Twig/Node/Expression/Unary/Not.php rename to inc/3rdparty/Twig/Node/Expression/Unary/Not.php diff --git a/inc/Twig/Node/Expression/Unary/Pos.php b/inc/3rdparty/Twig/Node/Expression/Unary/Pos.php similarity index 100% rename from inc/Twig/Node/Expression/Unary/Pos.php rename to inc/3rdparty/Twig/Node/Expression/Unary/Pos.php diff --git a/inc/Twig/Node/Flush.php b/inc/3rdparty/Twig/Node/Flush.php similarity index 100% rename from inc/Twig/Node/Flush.php rename to inc/3rdparty/Twig/Node/Flush.php diff --git a/inc/Twig/Node/For.php b/inc/3rdparty/Twig/Node/For.php similarity index 100% rename from inc/Twig/Node/For.php rename to inc/3rdparty/Twig/Node/For.php diff --git a/inc/Twig/Node/ForLoop.php b/inc/3rdparty/Twig/Node/ForLoop.php similarity index 100% rename from inc/Twig/Node/ForLoop.php rename to inc/3rdparty/Twig/Node/ForLoop.php diff --git a/inc/Twig/Node/If.php b/inc/3rdparty/Twig/Node/If.php similarity index 100% rename from inc/Twig/Node/If.php rename to inc/3rdparty/Twig/Node/If.php diff --git a/inc/Twig/Node/Import.php b/inc/3rdparty/Twig/Node/Import.php similarity index 100% rename from inc/Twig/Node/Import.php rename to inc/3rdparty/Twig/Node/Import.php diff --git a/inc/Twig/Node/Include.php b/inc/3rdparty/Twig/Node/Include.php similarity index 100% rename from inc/Twig/Node/Include.php rename to inc/3rdparty/Twig/Node/Include.php diff --git a/inc/Twig/Node/Macro.php b/inc/3rdparty/Twig/Node/Macro.php similarity index 100% rename from inc/Twig/Node/Macro.php rename to inc/3rdparty/Twig/Node/Macro.php diff --git a/inc/Twig/Node/Module.php b/inc/3rdparty/Twig/Node/Module.php similarity index 100% rename from inc/Twig/Node/Module.php rename to inc/3rdparty/Twig/Node/Module.php diff --git a/inc/Twig/Node/Print.php b/inc/3rdparty/Twig/Node/Print.php similarity index 100% rename from inc/Twig/Node/Print.php rename to inc/3rdparty/Twig/Node/Print.php diff --git a/inc/Twig/Node/Sandbox.php b/inc/3rdparty/Twig/Node/Sandbox.php similarity index 100% rename from inc/Twig/Node/Sandbox.php rename to inc/3rdparty/Twig/Node/Sandbox.php diff --git a/inc/Twig/Node/SandboxedModule.php b/inc/3rdparty/Twig/Node/SandboxedModule.php similarity index 100% rename from inc/Twig/Node/SandboxedModule.php rename to inc/3rdparty/Twig/Node/SandboxedModule.php diff --git a/inc/Twig/Node/SandboxedPrint.php b/inc/3rdparty/Twig/Node/SandboxedPrint.php similarity index 100% rename from inc/Twig/Node/SandboxedPrint.php rename to inc/3rdparty/Twig/Node/SandboxedPrint.php diff --git a/inc/Twig/Node/Set.php b/inc/3rdparty/Twig/Node/Set.php similarity index 100% rename from inc/Twig/Node/Set.php rename to inc/3rdparty/Twig/Node/Set.php diff --git a/inc/Twig/Node/SetTemp.php b/inc/3rdparty/Twig/Node/SetTemp.php similarity index 100% rename from inc/Twig/Node/SetTemp.php rename to inc/3rdparty/Twig/Node/SetTemp.php diff --git a/inc/Twig/Node/Spaceless.php b/inc/3rdparty/Twig/Node/Spaceless.php similarity index 100% rename from inc/Twig/Node/Spaceless.php rename to inc/3rdparty/Twig/Node/Spaceless.php diff --git a/inc/Twig/Node/Text.php b/inc/3rdparty/Twig/Node/Text.php similarity index 100% rename from inc/Twig/Node/Text.php rename to inc/3rdparty/Twig/Node/Text.php diff --git a/inc/Twig/NodeInterface.php b/inc/3rdparty/Twig/NodeInterface.php similarity index 100% rename from inc/Twig/NodeInterface.php rename to inc/3rdparty/Twig/NodeInterface.php diff --git a/inc/Twig/NodeOutputInterface.php b/inc/3rdparty/Twig/NodeOutputInterface.php similarity index 100% rename from inc/Twig/NodeOutputInterface.php rename to inc/3rdparty/Twig/NodeOutputInterface.php diff --git a/inc/Twig/NodeTraverser.php b/inc/3rdparty/Twig/NodeTraverser.php similarity index 100% rename from inc/Twig/NodeTraverser.php rename to inc/3rdparty/Twig/NodeTraverser.php diff --git a/inc/Twig/NodeVisitor/Escaper.php b/inc/3rdparty/Twig/NodeVisitor/Escaper.php similarity index 100% rename from inc/Twig/NodeVisitor/Escaper.php rename to inc/3rdparty/Twig/NodeVisitor/Escaper.php diff --git a/inc/Twig/NodeVisitor/Optimizer.php b/inc/3rdparty/Twig/NodeVisitor/Optimizer.php similarity index 100% rename from inc/Twig/NodeVisitor/Optimizer.php rename to inc/3rdparty/Twig/NodeVisitor/Optimizer.php diff --git a/inc/Twig/NodeVisitor/SafeAnalysis.php b/inc/3rdparty/Twig/NodeVisitor/SafeAnalysis.php similarity index 100% rename from inc/Twig/NodeVisitor/SafeAnalysis.php rename to inc/3rdparty/Twig/NodeVisitor/SafeAnalysis.php diff --git a/inc/Twig/NodeVisitor/Sandbox.php b/inc/3rdparty/Twig/NodeVisitor/Sandbox.php similarity index 100% rename from inc/Twig/NodeVisitor/Sandbox.php rename to inc/3rdparty/Twig/NodeVisitor/Sandbox.php diff --git a/inc/Twig/NodeVisitorInterface.php b/inc/3rdparty/Twig/NodeVisitorInterface.php similarity index 100% rename from inc/Twig/NodeVisitorInterface.php rename to inc/3rdparty/Twig/NodeVisitorInterface.php diff --git a/inc/Twig/Parser.php b/inc/3rdparty/Twig/Parser.php similarity index 100% rename from inc/Twig/Parser.php rename to inc/3rdparty/Twig/Parser.php diff --git a/inc/Twig/ParserInterface.php b/inc/3rdparty/Twig/ParserInterface.php similarity index 100% rename from inc/Twig/ParserInterface.php rename to inc/3rdparty/Twig/ParserInterface.php diff --git a/inc/Twig/Sandbox/SecurityError.php b/inc/3rdparty/Twig/Sandbox/SecurityError.php similarity index 100% rename from inc/Twig/Sandbox/SecurityError.php rename to inc/3rdparty/Twig/Sandbox/SecurityError.php diff --git a/inc/Twig/Sandbox/SecurityPolicy.php b/inc/3rdparty/Twig/Sandbox/SecurityPolicy.php similarity index 100% rename from inc/Twig/Sandbox/SecurityPolicy.php rename to inc/3rdparty/Twig/Sandbox/SecurityPolicy.php diff --git a/inc/Twig/Sandbox/SecurityPolicyInterface.php b/inc/3rdparty/Twig/Sandbox/SecurityPolicyInterface.php similarity index 100% rename from inc/Twig/Sandbox/SecurityPolicyInterface.php rename to inc/3rdparty/Twig/Sandbox/SecurityPolicyInterface.php diff --git a/inc/Twig/SimpleFilter.php b/inc/3rdparty/Twig/SimpleFilter.php similarity index 100% rename from inc/Twig/SimpleFilter.php rename to inc/3rdparty/Twig/SimpleFilter.php diff --git a/inc/Twig/SimpleFunction.php b/inc/3rdparty/Twig/SimpleFunction.php similarity index 100% rename from inc/Twig/SimpleFunction.php rename to inc/3rdparty/Twig/SimpleFunction.php diff --git a/inc/Twig/SimpleTest.php b/inc/3rdparty/Twig/SimpleTest.php similarity index 100% rename from inc/Twig/SimpleTest.php rename to inc/3rdparty/Twig/SimpleTest.php diff --git a/inc/Twig/Template.php b/inc/3rdparty/Twig/Template.php similarity index 100% rename from inc/Twig/Template.php rename to inc/3rdparty/Twig/Template.php diff --git a/inc/Twig/TemplateInterface.php b/inc/3rdparty/Twig/TemplateInterface.php similarity index 100% rename from inc/Twig/TemplateInterface.php rename to inc/3rdparty/Twig/TemplateInterface.php diff --git a/inc/Twig/Test.php b/inc/3rdparty/Twig/Test.php similarity index 100% rename from inc/Twig/Test.php rename to inc/3rdparty/Twig/Test.php diff --git a/inc/Twig/Test/Function.php b/inc/3rdparty/Twig/Test/Function.php similarity index 100% rename from inc/Twig/Test/Function.php rename to inc/3rdparty/Twig/Test/Function.php diff --git a/inc/Twig/Test/IntegrationTestCase.php b/inc/3rdparty/Twig/Test/IntegrationTestCase.php similarity index 100% rename from inc/Twig/Test/IntegrationTestCase.php rename to inc/3rdparty/Twig/Test/IntegrationTestCase.php diff --git a/inc/Twig/Test/Method.php b/inc/3rdparty/Twig/Test/Method.php similarity index 100% rename from inc/Twig/Test/Method.php rename to inc/3rdparty/Twig/Test/Method.php diff --git a/inc/Twig/Test/Node.php b/inc/3rdparty/Twig/Test/Node.php similarity index 100% rename from inc/Twig/Test/Node.php rename to inc/3rdparty/Twig/Test/Node.php diff --git a/inc/Twig/Test/NodeTestCase.php b/inc/3rdparty/Twig/Test/NodeTestCase.php similarity index 100% rename from inc/Twig/Test/NodeTestCase.php rename to inc/3rdparty/Twig/Test/NodeTestCase.php diff --git a/inc/Twig/TestCallableInterface.php b/inc/3rdparty/Twig/TestCallableInterface.php similarity index 100% rename from inc/Twig/TestCallableInterface.php rename to inc/3rdparty/Twig/TestCallableInterface.php diff --git a/inc/Twig/TestInterface.php b/inc/3rdparty/Twig/TestInterface.php similarity index 100% rename from inc/Twig/TestInterface.php rename to inc/3rdparty/Twig/TestInterface.php diff --git a/inc/Twig/Token.php b/inc/3rdparty/Twig/Token.php similarity index 100% rename from inc/Twig/Token.php rename to inc/3rdparty/Twig/Token.php diff --git a/inc/Twig/TokenParser.php b/inc/3rdparty/Twig/TokenParser.php similarity index 100% rename from inc/Twig/TokenParser.php rename to inc/3rdparty/Twig/TokenParser.php diff --git a/inc/Twig/TokenParser/AutoEscape.php b/inc/3rdparty/Twig/TokenParser/AutoEscape.php similarity index 100% rename from inc/Twig/TokenParser/AutoEscape.php rename to inc/3rdparty/Twig/TokenParser/AutoEscape.php diff --git a/inc/Twig/TokenParser/Block.php b/inc/3rdparty/Twig/TokenParser/Block.php similarity index 100% rename from inc/Twig/TokenParser/Block.php rename to inc/3rdparty/Twig/TokenParser/Block.php diff --git a/inc/Twig/TokenParser/Do.php b/inc/3rdparty/Twig/TokenParser/Do.php similarity index 100% rename from inc/Twig/TokenParser/Do.php rename to inc/3rdparty/Twig/TokenParser/Do.php diff --git a/inc/Twig/TokenParser/Embed.php b/inc/3rdparty/Twig/TokenParser/Embed.php similarity index 100% rename from inc/Twig/TokenParser/Embed.php rename to inc/3rdparty/Twig/TokenParser/Embed.php diff --git a/inc/Twig/TokenParser/Extends.php b/inc/3rdparty/Twig/TokenParser/Extends.php similarity index 100% rename from inc/Twig/TokenParser/Extends.php rename to inc/3rdparty/Twig/TokenParser/Extends.php diff --git a/inc/Twig/TokenParser/Filter.php b/inc/3rdparty/Twig/TokenParser/Filter.php similarity index 100% rename from inc/Twig/TokenParser/Filter.php rename to inc/3rdparty/Twig/TokenParser/Filter.php diff --git a/inc/Twig/TokenParser/Flush.php b/inc/3rdparty/Twig/TokenParser/Flush.php similarity index 100% rename from inc/Twig/TokenParser/Flush.php rename to inc/3rdparty/Twig/TokenParser/Flush.php diff --git a/inc/Twig/TokenParser/For.php b/inc/3rdparty/Twig/TokenParser/For.php similarity index 100% rename from inc/Twig/TokenParser/For.php rename to inc/3rdparty/Twig/TokenParser/For.php diff --git a/inc/Twig/TokenParser/From.php b/inc/3rdparty/Twig/TokenParser/From.php similarity index 100% rename from inc/Twig/TokenParser/From.php rename to inc/3rdparty/Twig/TokenParser/From.php diff --git a/inc/Twig/TokenParser/If.php b/inc/3rdparty/Twig/TokenParser/If.php similarity index 100% rename from inc/Twig/TokenParser/If.php rename to inc/3rdparty/Twig/TokenParser/If.php diff --git a/inc/Twig/TokenParser/Import.php b/inc/3rdparty/Twig/TokenParser/Import.php similarity index 100% rename from inc/Twig/TokenParser/Import.php rename to inc/3rdparty/Twig/TokenParser/Import.php diff --git a/inc/Twig/TokenParser/Include.php b/inc/3rdparty/Twig/TokenParser/Include.php similarity index 100% rename from inc/Twig/TokenParser/Include.php rename to inc/3rdparty/Twig/TokenParser/Include.php diff --git a/inc/Twig/TokenParser/Macro.php b/inc/3rdparty/Twig/TokenParser/Macro.php similarity index 100% rename from inc/Twig/TokenParser/Macro.php rename to inc/3rdparty/Twig/TokenParser/Macro.php diff --git a/inc/Twig/TokenParser/Sandbox.php b/inc/3rdparty/Twig/TokenParser/Sandbox.php similarity index 100% rename from inc/Twig/TokenParser/Sandbox.php rename to inc/3rdparty/Twig/TokenParser/Sandbox.php diff --git a/inc/Twig/TokenParser/Set.php b/inc/3rdparty/Twig/TokenParser/Set.php similarity index 100% rename from inc/Twig/TokenParser/Set.php rename to inc/3rdparty/Twig/TokenParser/Set.php diff --git a/inc/Twig/TokenParser/Spaceless.php b/inc/3rdparty/Twig/TokenParser/Spaceless.php similarity index 100% rename from inc/Twig/TokenParser/Spaceless.php rename to inc/3rdparty/Twig/TokenParser/Spaceless.php diff --git a/inc/Twig/TokenParser/Use.php b/inc/3rdparty/Twig/TokenParser/Use.php similarity index 100% rename from inc/Twig/TokenParser/Use.php rename to inc/3rdparty/Twig/TokenParser/Use.php diff --git a/inc/Twig/TokenParserBroker.php b/inc/3rdparty/Twig/TokenParserBroker.php similarity index 100% rename from inc/Twig/TokenParserBroker.php rename to inc/3rdparty/Twig/TokenParserBroker.php diff --git a/inc/Twig/TokenParserBrokerInterface.php b/inc/3rdparty/Twig/TokenParserBrokerInterface.php similarity index 100% rename from inc/Twig/TokenParserBrokerInterface.php rename to inc/3rdparty/Twig/TokenParserBrokerInterface.php diff --git a/inc/Twig/TokenParserInterface.php b/inc/3rdparty/Twig/TokenParserInterface.php similarity index 100% rename from inc/Twig/TokenParserInterface.php rename to inc/3rdparty/Twig/TokenParserInterface.php diff --git a/inc/Twig/TokenStream.php b/inc/3rdparty/Twig/TokenStream.php similarity index 100% rename from inc/Twig/TokenStream.php rename to inc/3rdparty/Twig/TokenStream.php diff --git a/inc/config.php b/inc/config.php index 7470f0c3..65b2b9cc 100644 --- a/inc/config.php +++ b/inc/config.php @@ -24,17 +24,17 @@ $storage_type = 'sqlite'; # sqlite or file # /!\ Be careful if you change the lines below /!\ -require_once 'pocheCore.php'; -require_once 'Readability.php'; -require_once 'Encoding.php'; -require_once 'pocheTool.class.php'; -require_once 'Session.class.php'; -require_once 'Twig/Autoloader.php'; +require_once 'poche/pocheTool.class.php'; +require_once 'poche/pocheCore.php'; +require_once '3rdparty/Readability.php'; +require_once '3rdparty/Encoding.php'; +require_once '3rdparty/Session.class.php'; +require_once '3rdparty/Twig/Autoloader.php'; require_once 'store/store.class.php'; require_once 'store/' . $storage_type . '.class.php'; if (DOWNLOAD_PICTURES) { - require_once 'pochePicture.php'; + require_once 'poche/pochePicture.php'; } # i18n