Minor fixes for 3.2

This commit is contained in:
Maxime Steinhausser 2016-12-11 15:34:22 +01:00
parent aae26d9fb7
commit 7bdfc84ef8
9 changed files with 5 additions and 10 deletions

View File

@ -17,7 +17,6 @@ use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Workflow\Dumper\GraphvizDumper;
use Symfony\Component\Workflow\Dumper\StateMachineGraphvizDumper;
use Symfony\Component\Workflow\Marking;
use Symfony\Component\Workflow\Workflow;
/**
* @author Grégoire Pineau <lyrixx@lyrixx.info>

View File

@ -137,7 +137,7 @@ abstract class Controller implements ContainerAwareInterface
protected function file($file, $fileName = null, $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT)
{
$response = new BinaryFileResponse($file);
$response->setContentDisposition($disposition, $fileName === null ? $response->getFile()->getFileName() : $fileName);
$response->setContentDisposition($disposition, $fileName === null ? $response->getFile()->getFilename() : $fileName);
return $response;
}

View File

@ -20,7 +20,6 @@ use Symfony\Component\Cache\Adapter\FilesystemAdapter;
use Symfony\Component\Cache\Adapter\ProxyAdapter;
use Symfony\Component\Cache\Adapter\RedisAdapter;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\DefinitionDecorator;
use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;

View File

@ -30,7 +30,7 @@ class TagAwareAdapterTest extends AdapterTestCase
}
/**
* @expectedException Psr\Cache\InvalidArgumentException
* @expectedException \Psr\Cache\InvalidArgumentException
*/
public function testInvalidTag()
{

View File

@ -65,7 +65,7 @@ class CacheItemTest extends \PHPUnit_Framework_TestCase
/**
* @dataProvider provideInvalidKey
* @expectedException Symfony\Component\Cache\Exception\InvalidArgumentException
* @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
* @expectedExceptionMessage Cache tag
*/
public function testInvalidTag($tag)

View File

@ -13,7 +13,6 @@ namespace Symfony\Component\Console\Tests\Style;
use PHPUnit_Framework_TestCase;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Style\SymfonyStyle;
use Symfony\Component\Console\Tester\CommandTester;
class SymfonyStyleTest extends PHPUnit_Framework_TestCase

View File

@ -13,7 +13,6 @@ namespace Symfony\Component\Serializer\Encoder;
use Symfony\Component\Yaml\Dumper;
use Symfony\Component\Yaml\Parser;
use Symfony\Component\Yaml\Yaml;
/**
* Encodes YAML data.

View File

@ -31,8 +31,8 @@ class StubCaster
$stub->attr = $c->attr;
if (Stub::TYPE_REF === $c->type && !$c->class && is_string($c->value) && !preg_match('//u', $c->value)) {
$stub->type = self::TYPE_STRING;
$stub->class = self::STRING_BINARY;
$stub->type = Stub::TYPE_STRING;
$stub->class = Stub::STRING_BINARY;
}
return array();

View File

@ -2,7 +2,6 @@
namespace Symfony\Component\Workflow\Tests;
use Symfony\Component\Workflow\Marking;
use Symfony\Component\Workflow\StateMachine;
class StateMachineTest extends \PHPUnit_Framework_TestCase