minor #20870 Minor fixes for 3.2 (ogizanagi)

nicolas-grekas · nicolas-grekas · commit d93024b6a566 · 2016-12-12T12:53:05.000+01:00
This PR was merged into the 3.2 branch. Discussion ---------- Minor fixes for 3.2 | Q | A | ------------- | --- | Branch? | 3.2 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | N/A | License | MIT | Doc PR | N/A This only fix minor issues in the codebase introduced in 3.2. Refs: - YamlEncoder 9366a7d - File helper: d9a8499 - VarDumper ClassStub: 788f7e8 - Cache tag based invalidation 19764af - CacheWarmer for Serializer: 810f469 - SymfonyStyle simplified test: 85e5060 - Workflow Definition builder: ffaeba3 --- There are other issues in older branches, but I guess it's not worth it for them, as it'll only add more conflicts. But for 3.2, it should be feasible. Commits ------- 7bdfc84 Minor fixes for 3.2
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php
@@ -17,7 +17,6 @@
 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>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
@@ -137,7 +137,7 @@ protected function json($data, $status = 200, $headers = array(), $context = arr
     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;
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -20,7 +20,6 @@
 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;
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
@@ -30,7 +30,7 @@ public static function tearDownAfterClass()
     }
 
     /**
-     * @expectedException Psr\Cache\InvalidArgumentException
+     * @expectedException \Psr\Cache\InvalidArgumentException
      */
     public function testInvalidTag()
     {
diff --git a/src/Symfony/Component/Cache/Tests/CacheItemTest.php b/src/Symfony/Component/Cache/Tests/CacheItemTest.php
@@ -65,7 +65,7 @@ public function testTag()
 
     /**
      * @dataProvider provideInvalidKey
-     * @expectedException Symfony\Component\Cache\Exception\InvalidArgumentException
+     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
      * @expectedExceptionMessage Cache tag
      */
     public function testInvalidTag($tag)
diff --git a/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php b/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php
@@ -13,7 +13,6 @@
 
 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
diff --git a/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php b/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php
@@ -13,7 +13,6 @@
 
 use Symfony\Component\Yaml\Dumper;
 use Symfony\Component\Yaml\Parser;
-use Symfony\Component\Yaml\Yaml;
 
 /**
  * Encodes YAML data.
diff --git a/src/Symfony/Component/VarDumper/Caster/StubCaster.php b/src/Symfony/Component/VarDumper/Caster/StubCaster.php
@@ -31,8 +31,8 @@ public static function castStub(Stub $c, array $a, Stub $stub, $isNested)
             $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();
diff --git a/src/Symfony/Component/Workflow/Tests/StateMachineTest.php b/src/Symfony/Component/Workflow/Tests/StateMachineTest.php
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ protected function json($data, $status = 200, $headers = array(), $context = arr`
`137`	`137`	`protected function file($file, $fileName = null, $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT)`
`138`	`138`	`{`
`139`	`139`	`$response = new BinaryFileResponse($file);`
`140`		`- $response->setContentDisposition($disposition, $fileName === null ? $response->getFile()->getFileName() : $fileName);`
	`140`	`+ $response->setContentDisposition($disposition, $fileName === null ? $response->getFile()->getFilename() : $fileName);`
`141`	`141`
`142`	`142`	`return $response;`
`143`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public static function tearDownAfterClass()`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`/**`
`33`		`- * @expectedException Psr\Cache\InvalidArgumentException`
	`33`	`+ * @expectedException \Psr\Cache\InvalidArgumentException`
`34`	`34`	`*/`
`35`	`35`	`public function testInvalidTag()`
`36`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ public static function castStub(Stub $c, array $a, Stub $stub, $isNested)`
`31`	`31`	`$stub->attr = $c->attr;`
`32`	`32`
`33`	`33`	`if (Stub::TYPE_REF === $c->type && !$c->class && is_string($c->value) && !preg_match('//u', $c->value)) {`
`34`		`- $stub->type = self::TYPE_STRING;`
`35`		`- $stub->class = self::STRING_BINARY;`
	`34`	`+ $stub->type = Stub::TYPE_STRING;`
	`35`	`+ $stub->class = Stub::STRING_BINARY;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`return array();`