Merge branch '4.3' into 4.4

* 4.3:
  cs fix
This commit is contained in:
Nicolas Grekas 2019-09-06 16:51:38 +02:00
commit 388f28f726
6 changed files with 10 additions and 13 deletions

View File

@ -12,13 +12,10 @@
namespace Symfony\Component\BrowserKit\Tests; namespace Symfony\Component\BrowserKit\Tests;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use Symfony\Component\BrowserKit\AbstractBrowser;
use Symfony\Component\BrowserKit\Client; use Symfony\Component\BrowserKit\Client;
use Symfony\Component\BrowserKit\CookieJar; use Symfony\Component\BrowserKit\CookieJar;
use Symfony\Component\BrowserKit\History; use Symfony\Component\BrowserKit\History;
use Symfony\Component\BrowserKit\Response; use Symfony\Component\BrowserKit\Response;
use Symfony\Component\DomCrawler\Crawler;
use Symfony\Component\DomCrawler\Form as DomCrawlerForm;
class AbstractBrowserTest extends TestCase class AbstractBrowserTest extends TestCase
{ {

View File

@ -15,8 +15,8 @@ use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use Symfony\Component\Form\CallbackTransformer; use Symfony\Component\Form\CallbackTransformer;
use Symfony\Component\Form\Exception\TransformationFailedException; use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Extension\DataCollector\FormDataExtractor;
use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\Extension\Core\Type\HiddenType;
use Symfony\Component\Form\Extension\DataCollector\FormDataExtractor;
use Symfony\Component\Form\FormBuilder; use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\FormError; use Symfony\Component\Form\FormError;
use Symfony\Component\Form\FormView; use Symfony\Component\Form\FormView;

View File

@ -171,12 +171,12 @@ class AbstractObjectNormalizerTest extends TestCase
); );
} }
throw new InvalidArgumentException; throw new InvalidArgumentException();
} }
public function hasMetadataFor($value): bool public function hasMetadataFor($value): bool
{ {
return $value === AbstractDummy::class; return AbstractDummy::class === $value;
} }
}; };

View File

@ -401,7 +401,7 @@ class SerializerTest extends TestCase
public function hasMetadataFor($value): bool public function hasMetadataFor($value): bool
{ {
return $value === AbstractDummy::class; return AbstractDummy::class === $value;
} }
}; };

View File

@ -27,7 +27,7 @@ abstract class AbstractFileExtractor
*/ */
protected function extractFiles($resource) protected function extractFiles($resource)
{ {
if (\is_iterable($resource)) { if (is_iterable($resource)) {
$files = []; $files = [];
foreach ($resource as $file) { foreach ($resource as $file) {
if ($this->canBeExtracted($file)) { if ($this->canBeExtracted($file)) {

View File

@ -35,15 +35,15 @@ class ConstraintViolation implements ConstraintViolationInterface
* @param string|object $message The violation message as a string or a stringable object * @param string|object $message The violation message as a string or a stringable object
* @param string $messageTemplate The raw violation message * @param string $messageTemplate The raw violation message
* @param array $parameters The parameters to substitute in the * @param array $parameters The parameters to substitute in the
* raw violation message * raw violation message
* @param mixed $root The value originally passed to the * @param mixed $root The value originally passed to the
* validator * validator
* @param string $propertyPath The property path from the root * @param string $propertyPath The property path from the root
* value to the invalid value * value to the invalid value
* @param mixed $invalidValue The invalid value that caused this * @param mixed $invalidValue The invalid value that caused this
* violation * violation
* @param int|null $plural The number for determining the plural * @param int|null $plural The number for determining the plural
* form when translating the message * form when translating the message
* @param string|null $code The error code of the violation * @param string|null $code The error code of the violation
* @param mixed $cause The cause of the violation * @param mixed $cause The cause of the violation
*/ */