Merge branch '2.7' into 2.8

* 2.7: [2.7] Fix issues found by PHPStan Add php_unit_dedicate_assert to PHPCS [Intl] Update ICU data to 60.2 [Console] fix a bug when you are passing a default value and passing -n would ouput the index

Author: nicolas-grekas

.php_cs.dist

@@ -10,6 +10,7 @@ return PhpCsFixer\Config::create()
  '@Symfony:risky' => true,
  'array_syntax' => array('syntax' => 'long'),
  'protected_to_private' => false,
+ 'php_unit_dedicate_assert' => array('target' => '3.5'),
  ))
  ->setRiskyAllowed(true)
  ->setFinder(

src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php

@@ -31,7 +31,6 @@
 use Symfony\Component\Form\Forms;
 use Symfony\Component\Form\Tests\Extension\Core\Type\BaseTypeTest;
 use Symfony\Component\Form\Tests\Extension\Core\Type\FormTypeTest;
-use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleAssociationToIntIdEntity;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdNoToStringEntity;
 
@@ -1133,10 +1132,7 @@ public function testLoaderCaching()
 
  $repo = $this->em->getRepository(self::SINGLE_IDENT_CLASS);
 
- $entityType = new EntityType(
- $this->emRegistry,
- PropertyAccess::createPropertyAccessor()
- );
+ $entityType = new EntityType($this->emRegistry);
 
  $entityTypeGuesser = new DoctrineOrmTypeGuesser($this->emRegistry);
 
@@ -1196,10 +1192,7 @@ public function testLoaderCachingWithParameters()
 
  $repo = $this->em->getRepository(self::SINGLE_IDENT_CLASS);
 
- $entityType = new EntityType(
- $this->emRegistry,
- PropertyAccess::createPropertyAccessor()
- );
+ $entityType = new EntityType($this->emRegistry);
 
  $entityTypeGuesser = new DoctrineOrmTypeGuesser($this->emRegistry);
 

src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bridge\Doctrine\PropertyInfo\Tests;
+namespace Symfony\Bridge\Doctrine\Tests\PropertyInfo;
 
 use Doctrine\DBAL\Types\Type as DBALType;
 use Doctrine\ORM\EntityManager;

src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php

@@ -115,7 +115,7 @@ public function fileExcerpt($file, $line)
  {
  if (is_readable($file)) {
  if (extension_loaded('fileinfo')) {
- $finfo = new \Finfo();
+ $finfo = new \finfo();
 
  // Check if the file is an application/octet-stream (eg. Phar file) because highlight_file cannot parse these files
  if ('application/octet-stream' === $finfo->file($file, FILEINFO_MIME_TYPE)) {

src/Symfony/Bundle/TwigBundle/Tests/Functional/CacheWarmingTest.php

@@ -9,12 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\TwigBundle\Tests;
+namespace Symfony\Bundle\TwigBundle\Tests\Functional;
 
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\TwigBundle\Tests\TestCase;
 use Symfony\Bundle\TwigBundle\TwigBundle;
 
 class CacheWarmingTest extends TestCase

src/Symfony/Bundle/TwigBundle/Tests/Functional/NoTemplatingEntryTest.php

@@ -9,12 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\TwigBundle\Tests;
+namespace Symfony\Bundle\TwigBundle\Tests\Functional;
 
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\TwigBundle\Tests\TestCase;
 use Symfony\Bundle\TwigBundle\TwigBundle;
 
 class NoTemplatingEntryTest extends TestCase

src/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php

@@ -12,13 +12,9 @@
 namespace Symfony\Component\Config\Tests\Definition\Builder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Config\Tests\Definition\Builder\NodeBuilder as CustomNodeBuilder;
+use Symfony\Component\Config\Tests\Fixtures\Builder\NodeBuilder as CustomNodeBuilder;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 
-require __DIR__.'/../../Fixtures/Builder/NodeBuilder.php';
-require __DIR__.'/../../Fixtures/Builder/BarNodeDefinition.php';
-require __DIR__.'/../../Fixtures/Builder/VariableNodeDefinition.php';
-
 class TreeBuilderTest extends TestCase
 {
  public function testUsingACustomNodeBuilder()
@@ -28,11 +24,11 @@ public function testUsingACustomNodeBuilder()
 
  $nodeBuilder = $root->children();
 
- $this->assertInstanceOf('Symfony\Component\Config\Tests\Definition\Builder\NodeBuilder', $nodeBuilder);
+ $this->assertInstanceOf('Symfony\Component\Config\Tests\Fixtures\Builder\NodeBuilder', $nodeBuilder);
 
  $nodeBuilder = $nodeBuilder->arrayNode('deeper')->children();
 
- $this->assertInstanceOf('Symfony\Component\Config\Tests\Definition\Builder\NodeBuilder', $nodeBuilder);
+ $this->assertInstanceOf('Symfony\Component\Config\Tests\Fixtures\Builder\NodeBuilder', $nodeBuilder);
  }
 
  public function testOverrideABuiltInNodeType()
@@ -42,7 +38,7 @@ public function testOverrideABuiltInNodeType()
 
  $definition = $root->children()->variableNode('variable');
 
- $this->assertInstanceOf('Symfony\Component\Config\Tests\Definition\Builder\VariableNodeDefinition', $definition);
+ $this->assertInstanceOf('Symfony\Component\Config\Tests\Fixtures\Builder\VariableNodeDefinition', $definition);
  }
 
  public function testAddANodeType()
@@ -52,7 +48,7 @@ public function testAddANodeType()
 
  $definition = $root->children()->barNode('variable');
 
- $this->assertInstanceOf('Symfony\Component\Config\Tests\Definition\Builder\BarNodeDefinition', $definition);
+ $this->assertInstanceOf('Symfony\Component\Config\Tests\Fixtures\Builder\BarNodeDefinition', $definition);
  }
 
  public function testCreateABuiltInNodeTypeWithACustomNodeBuilder()

src/Symfony/Component/Config/Tests/Fixtures/Builder/BarNodeDefinition.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Config\Tests\Definition\Builder;
+namespace Symfony\Component\Config\Tests\Fixtures\Builder;
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\Config\Tests\Fixtures\BarNode;

src/Symfony/Component/Config/Tests/Fixtures/Builder/NodeBuilder.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Config\Tests\Definition\Builder;
+namespace Symfony\Component\Config\Tests\Fixtures\Builder;
 
 use Symfony\Component\Config\Definition\Builder\NodeBuilder as BaseNodeBuilder;
 

src/Symfony/Component/Config/Tests/Fixtures/Builder/VariableNodeDefinition.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Config\Tests\Definition\Builder;
+namespace Symfony\Component\Config\Tests\Fixtures\Builder;
 
 use Symfony\Component\Config\Definition\Builder\VariableNodeDefinition as BaseVariableNodeDefinition;