Skip to content

Commit d60e37a

Browse files
Merge branch '2.8' into 3.4
* 2.8: Alpha-ordering for "use" statements
2 parents 8a67175 + aa8931b commit d60e37a

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

Tests/ExpressionLanguageTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Symfony\Component\ExpressionLanguage\Tests;
1313

14-
use Symfony\Component\ExpressionLanguage\ExpressionFunction;
1514
use PHPUnit\Framework\TestCase;
15+
use Symfony\Component\ExpressionLanguage\ExpressionFunction;
1616
use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
1717
use Symfony\Component\ExpressionLanguage\ParsedExpression;
1818
use Symfony\Component\ExpressionLanguage\Tests\Fixtures\TestProvider;

Tests/Node/BinaryNodeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Symfony\Component\ExpressionLanguage\Tests\Node;
1313

14-
use Symfony\Component\ExpressionLanguage\Node\BinaryNode;
1514
use Symfony\Component\ExpressionLanguage\Node\ArrayNode;
15+
use Symfony\Component\ExpressionLanguage\Node\BinaryNode;
1616
use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
1717

1818
class BinaryNodeTest extends AbstractNodeTest

Tests/Node/FunctionNodeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Symfony\Component\ExpressionLanguage\Tests\Node;
1313

14-
use Symfony\Component\ExpressionLanguage\Node\FunctionNode;
1514
use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
15+
use Symfony\Component\ExpressionLanguage\Node\FunctionNode;
1616
use Symfony\Component\ExpressionLanguage\Node\Node;
1717

1818
class FunctionNodeTest extends AbstractNodeTest

Tests/Node/GetAttrNodeTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
namespace Symfony\Component\ExpressionLanguage\Tests\Node;
1313

1414
use Symfony\Component\ExpressionLanguage\Node\ArrayNode;
15-
use Symfony\Component\ExpressionLanguage\Node\NameNode;
16-
use Symfony\Component\ExpressionLanguage\Node\GetAttrNode;
1715
use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
16+
use Symfony\Component\ExpressionLanguage\Node\GetAttrNode;
17+
use Symfony\Component\ExpressionLanguage\Node\NameNode;
1818

1919
class GetAttrNodeTest extends AbstractNodeTest
2020
{

Tests/Node/NodeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
namespace Symfony\Component\ExpressionLanguage\Tests\Node;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Component\ExpressionLanguage\Node\Node;
1615
use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
16+
use Symfony\Component\ExpressionLanguage\Node\Node;
1717

1818
class NodeTest extends TestCase
1919
{

Tests/Node/UnaryNodeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Symfony\Component\ExpressionLanguage\Tests\Node;
1313

14-
use Symfony\Component\ExpressionLanguage\Node\UnaryNode;
1514
use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
15+
use Symfony\Component\ExpressionLanguage\Node\UnaryNode;
1616

1717
class UnaryNodeTest extends AbstractNodeTest
1818
{

Tests/ParserCache/ParserCacheAdapterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
namespace Symfony\Component\ExpressionLanguage\Tests;
1313

1414
use PHPUnit\Framework\TestCase;
15+
use Symfony\Component\ExpressionLanguage\Node\Node;
1516
use Symfony\Component\ExpressionLanguage\ParsedExpression;
1617
use Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheAdapter;
17-
use Symfony\Component\ExpressionLanguage\Node\Node;
1818

1919
/**
2020
* @group legacy

Tests/ParserTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
namespace Symfony\Component\ExpressionLanguage\Tests;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Component\ExpressionLanguage\Parser;
1615
use Symfony\Component\ExpressionLanguage\Lexer;
1716
use Symfony\Component\ExpressionLanguage\Node;
17+
use Symfony\Component\ExpressionLanguage\Parser;
1818

1919
class ParserTest extends TestCase
2020
{

0 commit comments

Comments
 (0)