Skip to content

Commit

Permalink
Merge branch '2.8' into 3.4
Browse files Browse the repository at this point in the history
* 2.8:
  Alpha-ordering for "use" statements
  • Loading branch information
nicolas-grekas committed Jul 26, 2018
2 parents 8be8838 + ac1d7f8 commit ec2e33f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Tests/PackageTest.php
Expand Up @@ -13,8 +13,8 @@

use PHPUnit\Framework\TestCase;
use Symfony\Component\Asset\Package;
use Symfony\Component\Asset\VersionStrategy\StaticVersionStrategy;
use Symfony\Component\Asset\VersionStrategy\EmptyVersionStrategy;
use Symfony\Component\Asset\VersionStrategy\StaticVersionStrategy;

class PackageTest extends TestCase
{
Expand Down
2 changes: 1 addition & 1 deletion Tests/UrlPackageTest.php
Expand Up @@ -13,8 +13,8 @@

use PHPUnit\Framework\TestCase;
use Symfony\Component\Asset\UrlPackage;
use Symfony\Component\Asset\VersionStrategy\StaticVersionStrategy;
use Symfony\Component\Asset\VersionStrategy\EmptyVersionStrategy;
use Symfony\Component\Asset\VersionStrategy\StaticVersionStrategy;

class UrlPackageTest extends TestCase
{
Expand Down
2 changes: 1 addition & 1 deletion UrlPackage.php
Expand Up @@ -12,9 +12,9 @@
namespace Symfony\Component\Asset;

use Symfony\Component\Asset\Context\ContextInterface;
use Symfony\Component\Asset\VersionStrategy\VersionStrategyInterface;
use Symfony\Component\Asset\Exception\InvalidArgumentException;
use Symfony\Component\Asset\Exception\LogicException;
use Symfony\Component\Asset\VersionStrategy\VersionStrategyInterface;

/**
* Package that adds a base URL to asset URLs in addition to a version.
Expand Down

0 comments on commit ec2e33f

Please sign in to comment.