Added changelog for 2.3.1 (#102)

Nyholm · web-flow · commit 19efe31b6432 · 2018-03-06T09:34:50.000+01:00
* Added changelog for 2.3.1

* StyleCI fixes

* StyleCI fixes
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.3.1
+
+- Added conflicts with PHPUnit < 6.0
+
 ## v2.3.0
 
 - Testing on Symfony 4 and make sure test passes
diff --git a/Loader/ExtensionConfigurationBuilder.php b/Loader/ExtensionConfigurationBuilder.php
@@ -8,7 +8,7 @@
 class ExtensionConfigurationBuilder
 {
     private $extension;
-    private $sources = array();
+    private $sources = [];
     private $loaderFactory;
 
     public function __construct(LoaderFactoryInterface $loaderFactory)
diff --git a/Loader/LoaderFactoryInterface.php b/Loader/LoaderFactoryInterface.php
@@ -9,7 +9,8 @@ interface LoaderFactoryInterface
 {
     /**
      * @param ContainerBuilder $container
-     * @param $source
+     * @param                  $source
+     *
      * @return LoaderInterface
      */
     public function createLoaderForSource(ContainerBuilder $container, $source);
diff --git a/PhpUnit/AbstractCompilerPassTestCase.php b/PhpUnit/AbstractCompilerPassTestCase.php
@@ -8,14 +8,14 @@ abstract class AbstractCompilerPassTestCase extends AbstractContainerBuilderTest
 {
     /**
      * Register the compiler pass under test, just like you would do inside a bundle's load()
-     * method:
+     * method.
      *
      *   $container->addCompilerPass(new MyCompilerPass());
      */
     abstract protected function registerCompilerPass(ContainerBuilder $container);
 
     /**
-     * This test will run the compile method
+     * This test will run the compile method.
      *
      * @test
      */
diff --git a/PhpUnit/AbstractContainerBuilderTestCase.php b/PhpUnit/AbstractContainerBuilderTestCase.php
@@ -17,8 +17,8 @@ abstract class AbstractContainerBuilderTestCase extends TestCase
     protected function setUp()
     {
         $this->container = new ContainerBuilder();
-        $this->container->getCompilerPassConfig()->setOptimizationPasses(array());
-        $this->container->getCompilerPassConfig()->setRemovingPasses(array());
+        $this->container->getCompilerPassConfig()->setOptimizationPasses([]);
+        $this->container->getCompilerPassConfig()->setRemovingPasses([]);
     }
 
     protected function tearDown()
@@ -31,6 +31,7 @@ protected function tearDown()
      *
      * @param $serviceId
      * @param $class
+     *
      * @return Definition
      */
     protected function registerService($serviceId, $class)
@@ -101,7 +102,6 @@ protected function assertContainerBuilderNotHasService($serviceId)
         );
     }
 
-
     /**
      * Assert that the ContainerBuilder for this test has a synthetic service with the given id.
      *
@@ -171,15 +171,15 @@ protected function assertContainerBuilderHasServiceDefinitionWithArgument(
      * Assert that the ContainerBuilder for this test has a service definition with the given id, which has a method
      * call to the given method with the given arguments.
      *
-     * @param string $serviceId
-     * @param string $method
-     * @param array $arguments
+     * @param string   $serviceId
+     * @param string   $method
+     * @param array    $arguments
      * @param int|null $index
      */
     protected function assertContainerBuilderHasServiceDefinitionWithMethodCall(
         $serviceId,
         $method,
-        array $arguments = array(),
+        array $arguments = [],
         $index = null
     ) {
         $definition = $this->container->findDefinition($serviceId);
@@ -198,7 +198,7 @@ protected function assertContainerBuilderHasServiceDefinitionWithMethodCall(
     protected function assertContainerBuilderHasServiceDefinitionWithTag(
         $serviceId,
         $tag,
-        array $attributes = array()
+        array $attributes = []
     ) {
         $definition = $this->container->findDefinition($serviceId);
 
diff --git a/PhpUnit/AbstractExtensionTestCase.php b/PhpUnit/AbstractExtensionTestCase.php
@@ -22,13 +22,13 @@ abstract protected function getContainerExtensions();
      */
     protected function getMinimalConfiguration()
     {
-        return array();
+        return [];
     }
 
     /**
      * Setup for each test: creates a new ContainerBuilder,
      * registers the ValidateServiceDefinitionsPass which will validate all defined services when
-     * the container is compiled
+     * the container is compiled.
      *
      * @see AbstractExtensionTestCase::tearDown()
      */
@@ -47,9 +47,9 @@ protected function setUp()
      *
      * @param array $configurationValues
      */
-    protected function load(array $configurationValues = array())
+    protected function load(array $configurationValues = [])
     {
-        $configs = array($this->getMinimalConfiguration(), $configurationValues);
+        $configs = [$this->getMinimalConfiguration(), $configurationValues];
 
         foreach ($this->container->getExtensions() as $extension) {
             if ($extension instanceof PrependExtensionInterface) {
diff --git a/PhpUnit/ContainerBuilderHasAliasConstraint.php b/PhpUnit/ContainerBuilderHasAliasConstraint.php
@@ -29,7 +29,7 @@ public function __construct($aliasId, $expectedServiceId = null)
 
     public function toString()
     {
-        return 'has an alias "' . $this->aliasId . '" for service "' . $this->expectedServiceId . '"';
+        return 'has an alias "'.$this->aliasId.'" for service "'.$this->expectedServiceId.'"';
     }
 
     public function evaluate($other, $description = '', $returnResult = false)
diff --git a/PhpUnit/DefinitionHasArgumentConstraint.php b/PhpUnit/DefinitionHasArgumentConstraint.php
@@ -9,7 +9,6 @@
 
 class DefinitionHasArgumentConstraint extends Constraint
 {
-
     /**
      * @var int|string
      */
diff --git a/PhpUnit/DefinitionHasMethodCallConstraint.php b/PhpUnit/DefinitionHasMethodCallConstraint.php
@@ -12,7 +12,7 @@ class DefinitionHasMethodCallConstraint extends Constraint
     private $arguments;
     private $index;
 
-    public function __construct($methodName, array $arguments = array(), $index = null)
+    public function __construct($methodName, array $arguments = [], $index = null)
     {
         if ($index !== null && !is_int($index)) {
             throw new \InvalidArgumentException(sprintf('Expected value of integer type for method call index, "%s" given.', is_object($index) ? get_class($index) : gettype($index)));
diff --git a/PhpUnit/DefinitionHasTagConstraint.php b/PhpUnit/DefinitionHasTagConstraint.php
@@ -11,7 +11,7 @@ class DefinitionHasTagConstraint extends Constraint
     private $name;
     private $attributes;
 
-    public function __construct($name, array $attributes = array())
+    public function __construct($name, array $attributes = [])
     {
         parent::__construct();
         $this->name = $name;
diff --git a/Tests/Fixtures/CollectServicesAndAddThemWithMethodCallsCompilerPass.php b/Tests/Fixtures/CollectServicesAndAddThemWithMethodCallsCompilerPass.php
@@ -17,7 +17,7 @@ public function process(ContainerBuilder $container)
         $service = $container->getDefinition('collecting_service_id');
 
         foreach ($container->findTaggedServiceIds('collect_with_method_calls') as $serviceId => $tags) {
-            $service->addMethodCall('add', array(new Reference($serviceId)));
+            $service->addMethodCall('add', [new Reference($serviceId)]);
         }
     }
 }
diff --git a/Tests/Fixtures/CollectServicesAndSetThemAsArgumentCompilerPass.php b/Tests/Fixtures/CollectServicesAndSetThemAsArgumentCompilerPass.php
@@ -16,11 +16,11 @@ public function process(ContainerBuilder $container)
 
         $service = $container->getDefinition('collecting_service_id');
 
-        $collectedServices = array();
+        $collectedServices = [];
         foreach ($container->findTaggedServiceIds('collect_with_argument') as $serviceId => $tags) {
             $collectedServices[] = new Reference($serviceId);
         }
 
-        $service->setArguments(array($collectedServices));
+        $service->setArguments([$collectedServices]);
     }
 }
diff --git a/Tests/Fixtures/MatthiasDependencyInjectionTestExtension.php b/Tests/Fixtures/MatthiasDependencyInjectionTestExtension.php
@@ -2,11 +2,11 @@
 
 namespace Matthias\SymfonyDependencyInjectionTest\Tests\Fixtures;
 
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\Config\FileLocator;
 
 class MatthiasDependencyInjectionTestExtension implements ExtensionInterface
 {
@@ -21,7 +21,7 @@ public function load(array $config, ContainerBuilder $container)
 
         // manually add a service definition
         $definition = new Definition('stdClass');
-        $definition->setArguments(array('first', 'second'));
+        $definition->setArguments(['first', 'second']);
         $container->setDefinition('manual_service_id', $definition);
 
         // replace an argument of a previously defined service definition
diff --git a/Tests/Fixtures/SimpleConfiguration.php b/Tests/Fixtures/SimpleConfiguration.php
@@ -2,8 +2,8 @@
 
 namespace Matthias\SymfonyDependencyInjectionTest\Tests\Fixtures;
 
-use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 class SimpleConfiguration implements ConfigurationInterface
 {
diff --git a/Tests/Fixtures/simple.php b/Tests/Fixtures/simple.php
@@ -1,9 +1,10 @@
 <?php
+
 /* @var $container \Symfony\Component\DependencyInjection\ContainerBuilder */
 
 $container->loadFromExtension(
     'simple',
-    array(
-        'types' => array('php')
-    )
+    [
+        'types' => ['php'],
+    ]
 );
diff --git a/Tests/Loader/LoaderFactoryTest.php b/Tests/Loader/LoaderFactoryTest.php
@@ -24,7 +24,8 @@ public function it_creates_the_appropriate_file_loader_based_on_the_extension($f
      */
     public function it_creates_a_closure_loader_when_source_is_a_closure()
     {
-        $source = function() {};
+        $source = function () {
+        };
         $factory = new LoaderFactory();
 
         $loader = $factory->createLoaderForSource($this->createMockContainerBuilder(), $source);
@@ -33,11 +34,11 @@ public function it_creates_a_closure_loader_when_source_is_a_closure()
 
     public function fileProvider()
     {
-        return array(
-            array('file.xml', 'Symfony\Component\DependencyInjection\Loader\XmlFileLoader'),
-            array('file.yml', 'Symfony\Component\DependencyInjection\Loader\YamlFileLoader'),
-            array('file.php', 'Symfony\Component\DependencyInjection\Loader\PhpFileLoader')
-        );
+        return [
+            ['file.xml', 'Symfony\Component\DependencyInjection\Loader\XmlFileLoader'],
+            ['file.yml', 'Symfony\Component\DependencyInjection\Loader\YamlFileLoader'],
+            ['file.php', 'Symfony\Component\DependencyInjection\Loader\PhpFileLoader'],
+        ];
     }
 
     private function createMockContainerBuilder()
diff --git a/Tests/PhpUnit/AbstractCompilerPassTestCaseTest.php b/Tests/PhpUnit/AbstractCompilerPassTestCaseTest.php
@@ -38,17 +38,17 @@ public function if_compiler_pass_collects_services_by_adding_method_calls_these_
         $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
             'collecting_service_id',
             'add',
-            array(
-                new Reference('collected_service_1')
-            )
+            [
+                new Reference('collected_service_1'),
+            ]
         );
 
         $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
             'collecting_service_id',
             'add',
-            array(
-                new Reference('collected_service_2')
-            )
+            [
+                new Reference('collected_service_2'),
+            ]
         );
     }
 
@@ -70,10 +70,10 @@ public function if_compiler_pass_collects_services_by_setting_constructor_argume
 
         $this->compile();
 
-        $expectedReferences = array(
+        $expectedReferences = [
             new Reference('collected_service_1'),
-            new Reference('collected_service_2')
-        );
+            new Reference('collected_service_2'),
+        ];
 
         $this->assertContainerBuilderHasServiceDefinitionWithArgument('collecting_service_id', 0, $expectedReferences);
     }
diff --git a/Tests/PhpUnit/AbstractExtensionConfigurationTestCaseTest.php b/Tests/PhpUnit/AbstractExtensionConfigurationTestCaseTest.php
@@ -2,9 +2,9 @@
 
 namespace Matthias\SymfonyDependencyInjectionTest\Tests\PhpUnit;
 
-use Matthias\SymfonyDependencyInjectionTest\Tests\Fixtures\SimpleExtension;
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionConfigurationTestCase;
 use Matthias\SymfonyDependencyInjectionTest\Tests\Fixtures\SimpleConfiguration;
+use Matthias\SymfonyDependencyInjectionTest\Tests\Fixtures\SimpleExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class AbstractExtensionConfigurationTestCaseTest extends AbstractExtensionConfigurationTestCase
@@ -24,21 +24,21 @@ protected function getConfiguration()
      */
     public function it_compares_expected_configuration_values_with_values_loaded_from_files()
     {
-        $sources = array(
-            __DIR__ . '/../Fixtures/simple.php',
+        $sources = [
+            __DIR__.'/../Fixtures/simple.php',
             function (ContainerBuilder $container) {
                 $container->loadFromExtension(
                     'simple',
-                    array(
-                        'types' => array('closure')
-                    )
+                    [
+                        'types' => ['closure'],
+                    ]
                 );
             },
-            __DIR__ . '/../Fixtures/simple.yml',
-            __DIR__ . '/../Fixtures/simple.xml',
-        );
+            __DIR__.'/../Fixtures/simple.yml',
+            __DIR__.'/../Fixtures/simple.xml',
+        ];
 
-        $expectedConfiguration = array('types' => array('php', 'closure', 'yml', 'xml'));
+        $expectedConfiguration = ['types' => ['php', 'closure', 'yml', 'xml']];
 
         $this->assertProcessedConfigurationEquals($expectedConfiguration, $sources);
     }
diff --git a/Tests/PhpUnit/AbstractExtensionTestCaseTest.php b/Tests/PhpUnit/AbstractExtensionTestCaseTest.php
@@ -10,9 +10,9 @@ class AbstractExtensionTestCaseTest extends AbstractExtensionTestCase
 {
     protected function getContainerExtensions()
     {
-        return array(
-            new MatthiasDependencyInjectionTestExtension()
-        );
+        return [
+            new MatthiasDependencyInjectionTestExtension(),
+        ];
     }
 
     /**
@@ -230,7 +230,7 @@ public function if_definition_should_have_a_method_call_and_it_has_not_it_fails(
         $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
             'service_with_method_calls_id',
             'wrongMethodName',
-            array('some argument')
+            ['some argument']
         );
     }
 
@@ -247,7 +247,7 @@ public function if_definition_should_have_a_certain_arguments_for_a_method_call_
         $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
             'service_with_method_calls_id',
             'theRightMethodName',
-            array('a wrong argument')
+            ['a wrong argument']
         );
     }
 
diff --git a/Tests/PhpUnit/AbstractPrependExtensionTestCaseTest.php b/Tests/PhpUnit/AbstractPrependExtensionTestCaseTest.php
@@ -11,10 +11,10 @@ class AbstractPrependExtensionTestCaseTest extends AbstractExtensionTestCase
 {
     protected function getContainerExtensions()
     {
-        return array(
+        return [
             new PrependableTestExtension(),
-            new NonPrependableTestExtension()
-        );
+            new NonPrependableTestExtension(),
+        ];
     }
 
     /**
diff --git a/Tests/PhpUnit/ContainerBuilderHasAliasConstraintTest.php b/Tests/PhpUnit/ContainerBuilderHasAliasConstraintTest.php
diff --git a/Tests/PhpUnit/ContainerBuilderHasServiceDefinitionConstraintTest.php b/Tests/PhpUnit/ContainerBuilderHasServiceDefinitionConstraintTest.php
diff --git a/Tests/PhpUnit/ContainerHasParameterConstraintTest.php b/Tests/PhpUnit/ContainerHasParameterConstraintTest.php
diff --git a/Tests/PhpUnit/DefinitionHasArgumentConstraintTest.php b/Tests/PhpUnit/DefinitionHasArgumentConstraintTest.php
diff --git a/Tests/PhpUnit/DefinitionHasMethodCallConstraintTest.php b/Tests/PhpUnit/DefinitionHasMethodCallConstraintTest.php
diff --git a/Tests/PhpUnit/DefinitionHasTagConstraintTest.php b/Tests/PhpUnit/DefinitionHasTagConstraintTest.php
diff --git a/Tests/PhpUnit/DefinitionIsChildOfConstraintTest.php b/Tests/PhpUnit/DefinitionIsChildOfConstraintTest.php

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`class ExtensionConfigurationBuilder`
`9`	`9`	`{`
`10`	`10`	`private $extension;`
`11`		`- private $sources = array();`
	`11`	`+ private $sources = [];`
`12`	`12`	`private $loaderFactory;`
`13`	`13`
`14`	`14`	`public function __construct(LoaderFactoryInterface $loaderFactory)`
Original file line number	Diff line number	Diff line change
`@@ -8,14 +8,14 @@ abstract class AbstractCompilerPassTestCase extends AbstractContainerBuilderTest`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* Register the compiler pass under test, just like you would do inside a bundle's load()`
`11`		`- * method:`
	`11`	`+ * method.`
`12`	`12`	`*`
`13`	`13`	`* $container->addCompilerPass(new MyCompilerPass());`
`14`	`14`	`*/`
`15`	`15`	`abstract protected function registerCompilerPass(ContainerBuilder $container);`
`16`	`16`
`17`	`17`	`/**`
`18`		`- * This test will run the compile method`
	`18`	`+ * This test will run the compile method.`
`19`	`19`	`*`
`20`	`20`	`* @test`
`21`	`21`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,13 @@ abstract protected function getContainerExtensions();`
`22`	`22`	`*/`
`23`	`23`	`protected function getMinimalConfiguration()`
`24`	`24`	`{`
`25`		`- return array();`
	`25`	`+ return [];`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/**`
`29`	`29`	`* Setup for each test: creates a new ContainerBuilder,`
`30`	`30`	`* registers the ValidateServiceDefinitionsPass which will validate all defined services when`
`31`		`- * the container is compiled`
	`31`	`+ * the container is compiled.`
`32`	`32`	`*`
`33`	`33`	`* @see AbstractExtensionTestCase::tearDown()`
`34`	`34`	`*/`
`@@ -47,9 +47,9 @@ protected function setUp()`
`47`	`47`	`*`
`48`	`48`	`* @param array $configurationValues`
`49`	`49`	`*/`
`50`		`- protected function load(array $configurationValues = array())`
	`50`	`+ protected function load(array $configurationValues = [])`
`51`	`51`	`{`
`52`		`- $configs = array($this->getMinimalConfiguration(), $configurationValues);`
	`52`	`+ $configs = [$this->getMinimalConfiguration(), $configurationValues];`
`53`	`53`
`54`	`54`	`foreach ($this->container->getExtensions() as $extension) {`
`55`	`55`	`if ($extension instanceof PrependExtensionInterface) {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function __construct($aliasId, $expectedServiceId = null)`
`29`	`29`
`30`	`30`	`public function toString()`
`31`	`31`	`{`
`32`		`- return 'has an alias "' . $this->aliasId . '" for service "' . $this->expectedServiceId . '"';`
	`32`	`+ return 'has an alias "'.$this->aliasId.'" for service "'.$this->expectedServiceId.'"';`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public function evaluate($other, $description = '', $returnResult = false)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`
`10`	`10`	`class DefinitionHasArgumentConstraint extends Constraint`
`11`	`11`	`{`
`12`		`-`
`13`	`12`	`/**`
`14`	`13`	`* @var int\|string`
`15`	`14`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class DefinitionHasMethodCallConstraint extends Constraint`
`12`	`12`	`private $arguments;`
`13`	`13`	`private $index;`
`14`	`14`
`15`		`- public function __construct($methodName, array $arguments = array(), $index = null)`
	`15`	`+ public function __construct($methodName, array $arguments = [], $index = null)`
`16`	`16`	`{`
`17`	`17`	`if ($index !== null && !is_int($index)) {`
`18`	`18`	`throw new \InvalidArgumentException(sprintf('Expected value of integer type for method call index, "%s" given.', is_object($index) ? get_class($index) : gettype($index)));`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class DefinitionHasTagConstraint extends Constraint`
`11`	`11`	`private $name;`
`12`	`12`	`private $attributes;`
`13`	`13`
`14`		`- public function __construct($name, array $attributes = array())`
	`14`	`+ public function __construct($name, array $attributes = [])`
`15`	`15`	`{`
`16`	`16`	`parent::__construct();`
`17`	`17`	`$this->name = $name;`