Skip to content

Commit 24ca731

Browse files
Merge branch '2.8' into 3.4
* 2.8: Alpha-ordering for "use" statements
2 parents 91f18ae + 94bbf07 commit 24ca731

16 files changed

+19
-19
lines changed

BinaryFileResponse.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Symfony\Component\HttpFoundation;
1313

14-
use Symfony\Component\HttpFoundation\File\File;
1514
use Symfony\Component\HttpFoundation\File\Exception\FileException;
15+
use Symfony\Component\HttpFoundation\File\File;
1616

1717
/**
1818
* BinaryFileResponse represents an HTTP response delivering a file.

File/File.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
use Symfony\Component\HttpFoundation\File\Exception\FileException;
1515
use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
16-
use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
1716
use Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesser;
17+
use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
1818

1919
/**
2020
* A file in the file system.

File/MimeType/FileBinaryMimeTypeGuesser.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Symfony\Component\HttpFoundation\File\MimeType;
1313

14-
use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
1514
use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
15+
use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
1616

1717
/**
1818
* Guesses the mime type with the binary "file" (only available on *nix).

File/MimeType/FileinfoMimeTypeGuesser.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Symfony\Component\HttpFoundation\File\MimeType;
1313

14-
use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
1514
use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
15+
use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
1616

1717
/**
1818
* Guesses the mime type using the PECL extension FileInfo.

File/MimeType/MimeTypeGuesser.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Symfony\Component\HttpFoundation\File\MimeType;
1313

14-
use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
1514
use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
15+
use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
1616

1717
/**
1818
* A singleton mime type guesser.

File/MimeType/MimeTypeGuesserInterface.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Symfony\Component\HttpFoundation\File\MimeType;
1313

14-
use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
1514
use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
15+
use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
1616

1717
/**
1818
* Guesses the mime type of a file.

Session/Session.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111

1212
namespace Symfony\Component\HttpFoundation\Session;
1313

14-
use Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface;
1514
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
1615
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBagInterface;
1716
use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
1817
use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
1918
use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
19+
use Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface;
2020

2121
/**
2222
* @author Fabien Potencier <[email protected]>

Tests/File/MimeType/MimeTypeTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
namespace Symfony\Component\HttpFoundation\Tests\File\MimeType;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
1615
use Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser;
16+
use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
1717

1818
/**
1919
* @requires extension fileinfo

Tests/RequestMatcherTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
namespace Symfony\Component\HttpFoundation\Tests;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Component\HttpFoundation\RequestMatcher;
1615
use Symfony\Component\HttpFoundation\Request;
16+
use Symfony\Component\HttpFoundation\RequestMatcher;
1717

1818
class RequestMatcherTest extends TestCase
1919
{

Tests/RequestTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
16-
use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
17-
use Symfony\Component\HttpFoundation\Session\Session;
1816
use Symfony\Component\HttpFoundation\Request;
17+
use Symfony\Component\HttpFoundation\Session\Session;
18+
use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
1919

2020
class RequestTest extends TestCase
2121
{

Tests/ResponseHeaderBagTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
namespace Symfony\Component\HttpFoundation\Tests;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Component\HttpFoundation\ResponseHeaderBag;
1615
use Symfony\Component\HttpFoundation\Cookie;
16+
use Symfony\Component\HttpFoundation\ResponseHeaderBag;
1717

1818
/**
1919
* @group time-sensitive

Tests/Session/SessionTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
namespace Symfony\Component\HttpFoundation\Tests\Session;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Component\HttpFoundation\Session\Session;
16-
use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
1715
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
16+
use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
17+
use Symfony\Component\HttpFoundation\Session\Session;
1818
use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
1919

2020
/**

Tests/Session/Storage/Handler/NullSessionHandlerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
1313

1414
use PHPUnit\Framework\TestCase;
15+
use Symfony\Component\HttpFoundation\Session\Session;
1516
use Symfony\Component\HttpFoundation\Session\Storage\Handler\NullSessionHandler;
1617
use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
17-
use Symfony\Component\HttpFoundation\Session\Session;
1818

1919
/**
2020
* Test class for NullSessionHandler.

Tests/Session/Storage/MockArraySessionStorageTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
namespace Symfony\Component\HttpFoundation\Tests\Session\Storage;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
1615
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
1716
use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
17+
use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
1818

1919
/**
2020
* Test class for MockArraySessionStorage.

Tests/Session/Storage/MockFileSessionStorageTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
namespace Symfony\Component\HttpFoundation\Tests\Session\Storage;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Component\HttpFoundation\Session\Storage\MockFileSessionStorage;
16-
use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
1715
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
16+
use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
17+
use Symfony\Component\HttpFoundation\Session\Storage\MockFileSessionStorage;
1818

1919
/**
2020
* Test class for MockFileSessionStorage.

Tests/Session/Storage/PhpBridgeSessionStorageTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
namespace Symfony\Component\HttpFoundation\Tests\Session\Storage;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Component\HttpFoundation\Session\Storage\PhpBridgeSessionStorage;
1615
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
16+
use Symfony\Component\HttpFoundation\Session\Storage\PhpBridgeSessionStorage;
1717

1818
/**
1919
* Test class for PhpSessionStorage.

0 commit comments

Comments
 (0)