bug #2502 Use class_exists instead of require (ogizanagi)

This PR was merged into the 1.x branch. Discussion ---------- Use class_exists instead of require I think this is required for symfony/symfony#23073 to pass. It's probably very similar to symfony/symfony#22657. A simple reproducer: ```php <?php use Twig\Node\Node; require_once __DIR__ . '/vendor/autoload.php'; new Node(); new \Twig_Node(); ``` [Without this patch](https://travis-ci.org/symfony/symfony/jobs/239712676#L2100): ```php PHP Fatal error: Cannot declare class Twig_Node, because the name is already in use in vendor/twig/twig/lib/Twig/Node.php on line 20 ``` With, everything works fine, whatever the two calls order. Commits ------- 2c174e4 Use class_exists instead of require
twigphp · Jun 5, 2017 · 8463178 · 8463178
2 parents 1af645d + 2c174e4
commit 8463178
Show file tree

Hide file tree

Showing 156 changed files with 156 additions and 156 deletions.
diff --git a/src/Cache/FilesystemCache.php b/src/Cache/FilesystemCache.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Cache;
 
-require __DIR__.'/../../lib/Twig/Cache/Filesystem.php';
+class_exists('Twig_Cache_Filesystem');
 
 if (\false) {
     class FilesystemCache extends \Twig_Cache_Filesystem

diff --git a/src/Cache/NullCache.php b/src/Cache/NullCache.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Cache;
 
-require __DIR__.'/../../lib/Twig/Cache/Null.php';
+class_exists('Twig_Cache_Null');
 
 if (\false) {
     class NullCache extends \Twig_Cache_Null

diff --git a/src/Compiler.php b/src/Compiler.php
@@ -2,7 +2,7 @@
 
 namespace Twig;
 
-require __DIR__.'/../lib/Twig/Compiler.php';
+class_exists('Twig_Compiler');
 
 if (\false) {
     class Compiler extends \Twig_Compiler

diff --git a/src/Environment.php b/src/Environment.php
@@ -2,7 +2,7 @@
 
 namespace Twig;
 
-require __DIR__.'/../lib/Twig/Environment.php';
+class_exists('Twig_Environment');
 
 if (\false) {
     class Environment extends \Twig_Environment

diff --git a/src/Error/Error.php b/src/Error/Error.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Error;
 
-require __DIR__.'/../../lib/Twig/Error.php';
+class_exists('Twig_Error');
 
 if (\false) {
     class Error extends \Twig_Error

diff --git a/src/Error/LoaderError.php b/src/Error/LoaderError.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Error;
 
-require __DIR__.'/../../lib/Twig/Error/Loader.php';
+class_exists('Twig_Error_Loader');
 
 if (\false) {
     class LoaderError extends \Twig_Error_Loader

diff --git a/src/Error/RuntimeError.php b/src/Error/RuntimeError.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Error;
 
-require __DIR__.'/../../lib/Twig/Error/Runtime.php';
+class_exists('Twig_Error_Runtime');
 
 if (\false) {
     class RuntimeError extends \Twig_Error_Runtime

diff --git a/src/Error/SyntaxError.php b/src/Error/SyntaxError.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Error;
 
-require __DIR__.'/../../lib/Twig/Error/Syntax.php';
+class_exists('Twig_Error_Syntax');
 
 if (\false) {
     class SyntaxError extends \Twig_Error_Syntax

diff --git a/src/ExpressionParser.php b/src/ExpressionParser.php
@@ -2,7 +2,7 @@
 
 namespace Twig;
 
-require __DIR__.'/../lib/Twig/ExpressionParser.php';
+class_exists('Twig_ExpressionParser');
 
 if (\false) {
     class ExpressionParser extends \Twig_ExpressionParser

diff --git a/src/Extension/AbstractExtension.php b/src/Extension/AbstractExtension.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Extension;
 
-require __DIR__.'/../../lib/Twig/Extension.php';
+class_exists('Twig_Extension');
 
 if (\false) {
     class AbstractExtension extends \Twig_Extension

diff --git a/src/Extension/CoreExtension.php b/src/Extension/CoreExtension.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Extension;
 
-require __DIR__.'/../../lib/Twig/Extension/Core.php';
+class_exists('Twig_Extension_Core');
 
 if (\false) {
     class CoreExtension extends \Twig_Extension_Core

diff --git a/src/Extension/DebugExtension.php b/src/Extension/DebugExtension.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Extension;
 
-require __DIR__.'/../../lib/Twig/Extension/Debug.php';
+class_exists('Twig_Extension_Debug');
 
 if (\false) {
     class DebugExtension extends \Twig_Extension_Debug

diff --git a/src/Extension/EscaperExtension.php b/src/Extension/EscaperExtension.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Extension;
 
-require __DIR__.'/../../lib/Twig/Extension/Escaper.php';
+class_exists('Twig_Extension_Escaper');
 
 if (\false) {
     class EscaperExtension extends \Twig_Extension_Escaper

diff --git a/src/Extension/OptimizerExtension.php b/src/Extension/OptimizerExtension.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Extension;
 
-require __DIR__.'/../../lib/Twig/Extension/Optimizer.php';
+class_exists('Twig_Extension_Optimizer');
 
 if (\false) {
     class OptimizerExtension extends \Twig_Extension_Optimizer

diff --git a/src/Extension/ProfilerExtension.php b/src/Extension/ProfilerExtension.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Extension;
 
-require __DIR__.'/../../lib/Twig/Extension/Profiler.php';
+class_exists('Twig_Extension_Profiler');
 
 if (\false) {
     class ProfilerExtension extends \Twig_Extension_Profiler

diff --git a/src/Extension/SandboxExtension.php b/src/Extension/SandboxExtension.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Extension;
 
-require __DIR__.'/../../lib/Twig/Extension/Sandbox.php';
+class_exists('Twig_Extension_Sandbox');
 
 if (\false) {
     class SandboxExtension extends \Twig_Extension_Sandbox

diff --git a/src/Extension/StagingExtension.php b/src/Extension/StagingExtension.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Extension;
 
-require __DIR__.'/../../lib/Twig/Extension/Staging.php';
+class_exists('Twig_Extension_Staging');
 
 if (\false) {
     class StagingExtension extends \Twig_Extension_Staging

diff --git a/src/Extension/StringLoaderExtension.php b/src/Extension/StringLoaderExtension.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Extension;
 
-require __DIR__.'/../../lib/Twig/Extension/StringLoader.php';
+class_exists('Twig_Extension_StringLoader');
 
 if (\false) {
     class StringLoaderExtension extends \Twig_Extension_StringLoader

diff --git a/src/FileExtensionEscapingStrategy.php b/src/FileExtensionEscapingStrategy.php
@@ -2,7 +2,7 @@
 
 namespace Twig;
 
-require __DIR__.'/../lib/Twig/FileExtensionEscapingStrategy.php';
+class_exists('Twig_FileExtensionEscapingStrategy');
 
 if (\false) {
     class FileExtensionEscapingStrategy extends \Twig_FileExtensionEscapingStrategy

diff --git a/src/Lexer.php b/src/Lexer.php
@@ -2,7 +2,7 @@
 
 namespace Twig;
 
-require __DIR__.'/../lib/Twig/Lexer.php';
+class_exists('Twig_Lexer');
 
 if (\false) {
     class Lexer extends \Twig_Lexer

diff --git a/src/Loader/ArrayLoader.php b/src/Loader/ArrayLoader.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Loader;
 
-require __DIR__.'/../../lib/Twig/Loader/Array.php';
+class_exists('Twig_Loader_Array');
 
 if (\false) {
     class ArrayLoader extends \Twig_Loader_Array

diff --git a/src/Loader/ChainLoader.php b/src/Loader/ChainLoader.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Loader;
 
-require __DIR__.'/../../lib/Twig/Loader/Chain.php';
+class_exists('Twig_Loader_Chain');
 
 if (\false) {
     class ChainLoader extends \Twig_Loader_Chain

diff --git a/src/Loader/FilesystemLoader.php b/src/Loader/FilesystemLoader.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Loader;
 
-require __DIR__.'/../../lib/Twig/Loader/Filesystem.php';
+class_exists('Twig_Loader_Filesystem');
 
 if (\false) {
     class FilesystemLoader extends \Twig_Loader_Filesystem

diff --git a/src/Markup.php b/src/Markup.php
@@ -2,7 +2,7 @@
 
 namespace Twig;
 
-require __DIR__.'/../lib/Twig/Markup.php';
+class_exists('Twig_Markup');
 
 if (\false) {
     class Markup extends \Twig_Markup

diff --git a/src/Node/AutoEscapeNode.php b/src/Node/AutoEscapeNode.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Node;
 
-require __DIR__.'/../../lib/Twig/Node/AutoEscape.php';
+class_exists('Twig_Node_AutoEscape');
 
 if (\false) {
     class AutoEscapeNode extends \Twig_Node_AutoEscape

diff --git a/src/Node/BlockNode.php b/src/Node/BlockNode.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Node;
 
-require __DIR__.'/../../lib/Twig/Node/Block.php';
+class_exists('Twig_Node_Block');
 
 if (\false) {
     class BlockNode extends \Twig_Node_Block

diff --git a/src/Node/BlockReferenceNode.php b/src/Node/BlockReferenceNode.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Node;
 
-require __DIR__.'/../../lib/Twig/Node/BlockReference.php';
+class_exists('Twig_Node_BlockReference');
 
 if (\false) {
     class BlockReferenceNode extends \Twig_Node_BlockReference

diff --git a/src/Node/BodyNode.php b/src/Node/BodyNode.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Node;
 
-require __DIR__.'/../../lib/Twig/Node/Body.php';
+class_exists('Twig_Node_Body');
 
 if (\false) {
     class BodyNode extends \Twig_Node_Body

diff --git a/src/Node/CheckSecurityNode.php b/src/Node/CheckSecurityNode.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Node;
 
-require __DIR__.'/../../lib/Twig/Node/CheckSecurity.php';
+class_exists('Twig_Node_CheckSecurity');
 
 if (\false) {
     class CheckSecurityNode extends \Twig_Node_CheckSecurity

diff --git a/src/Node/DoNode.php b/src/Node/DoNode.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Node;
 
-require __DIR__.'/../../lib/Twig/Node/Do.php';
+class_exists('Twig_Node_Do');
 
 if (\false) {
     class DoNode extends \Twig_Node_Do

diff --git a/src/Node/EmbedNode.php b/src/Node/EmbedNode.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Node;
 
-require __DIR__.'/../../lib/Twig/Node/Embed.php';
+class_exists('Twig_Node_Embed');
 
 if (\false) {
     class EmbedNode extends \Twig_Node_Embed

diff --git a/src/Node/Expression/AbstractExpression.php b/src/Node/Expression/AbstractExpression.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Node\Expression;
 
-require __DIR__.'/../../../lib/Twig/Node/Expression.php';
+class_exists('Twig_Node_Expression');
 
 if (\false) {
     class AbstractExpression extends \Twig_Node_Expression

diff --git a/src/Node/Expression/ArrayExpression.php b/src/Node/Expression/ArrayExpression.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Node\Expression;
 
-require __DIR__.'/../../../lib/Twig/Node/Expression/Array.php';
+class_exists('Twig_Node_Expression_Array');
 
 if (\false) {
     class ArrayExpression extends \Twig_Node_Expression_Array

diff --git a/src/Node/Expression/AssignNameExpression.php b/src/Node/Expression/AssignNameExpression.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Node\Expression;
 
-require __DIR__.'/../../../lib/Twig/Node/Expression/AssignName.php';
+class_exists('Twig_Node_Expression_AssignName');
 
 if (\false) {
     class AssignNameExpression extends \Twig_Node_Expression_AssignName

diff --git a/src/Node/Expression/Binary/AbstractBinary.php b/src/Node/Expression/Binary/AbstractBinary.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Node\Expression\Binary;
 
-require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary.php';
+class_exists('Twig_Node_Expression_Binary');
 
 if (\false) {
     class AbstractBinary extends \Twig_Node_Expression_Binary

diff --git a/src/Node/Expression/Binary/AddBinary.php b/src/Node/Expression/Binary/AddBinary.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Node\Expression\Binary;
 
-require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/Add.php';
+class_exists('Twig_Node_Expression_Binary_Add');
 
 if (\false) {
     class AddBinary extends \Twig_Node_Expression_Binary_Add

diff --git a/src/Node/Expression/Binary/AndBinary.php b/src/Node/Expression/Binary/AndBinary.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Node\Expression\Binary;
 
-require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/And.php';
+class_exists('Twig_Node_Expression_Binary_And');
 
 if (\false) {
     class AndBinary extends \Twig_Node_Expression_Binary_And

diff --git a/src/Node/Expression/Binary/BitwiseAndBinary.php b/src/Node/Expression/Binary/BitwiseAndBinary.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Node\Expression\Binary;
 
-require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/BitwiseAnd.php';
+class_exists('Twig_Node_Expression_Binary_BitwiseAnd');
 
 if (\false) {
     class BitwiseAndBinary extends \Twig_Node_Expression_Binary_BitwiseAnd

diff --git a/src/Node/Expression/Binary/BitwiseOrBinary.php b/src/Node/Expression/Binary/BitwiseOrBinary.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Node\Expression\Binary;
 
-require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/BitwiseOr.php';
+class_exists('Twig_Node_Expression_Binary_BitwiseOr');
 
 if (\false) {
     class BitwiseOrBinary extends \Twig_Node_Expression_Binary_BitwiseOr

diff --git a/src/Node/Expression/Binary/BitwiseXorBinary.php b/src/Node/Expression/Binary/BitwiseXorBinary.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Node\Expression\Binary;
 
-require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/BitwiseXor.php';
+class_exists('Twig_Node_Expression_Binary_BitwiseXor');
 
 if (\false) {
     class BitwiseXorBinary extends \Twig_Node_Expression_Binary_BitwiseXor

diff --git a/src/Node/Expression/Binary/ConcatBinary.php b/src/Node/Expression/Binary/ConcatBinary.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Node\Expression\Binary;
 
-require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/Concat.php';
+class_exists('Twig_Node_Expression_Binary_Concat');
 
 if (\false) {
     class ConcatBinary extends \Twig_Node_Expression_Binary_Concat

diff --git a/src/Node/Expression/Binary/DivBinary.php b/src/Node/Expression/Binary/DivBinary.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Node\Expression\Binary;
 
-require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/Div.php';
+class_exists('Twig_Node_Expression_Binary_Div');
 
 if (\false) {
     class DivBinary extends \Twig_Node_Expression_Binary_Div

diff --git a/src/Node/Expression/Binary/EndsWithBinary.php b/src/Node/Expression/Binary/EndsWithBinary.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Node\Expression\Binary;
 
-require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/EndsWith.php';
+class_exists('Twig_Node_Expression_Binary_EndsWith');
 
 if (\false) {
     class EndsWithBinary extends \Twig_Node_Expression_Binary_EndsWith

diff --git a/src/Node/Expression/Binary/EqualBinary.php b/src/Node/Expression/Binary/EqualBinary.php
@@ -2,7 +2,7 @@
 
 namespace Twig\Node\Expression\Binary;
 
-require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/Equal.php';
+class_exists('Twig_Node_Expression_Binary_Equal');
 
 if (\false) {
     class EqualBinary extends \Twig_Node_Expression_Binary_Equal