Merge branch '4.4' into 5.2

* 4.4:
  cs fix
  [DependencyInjection][Console] tighten types
  [Lock] fix derivating semaphore from key

Author: nicolas-grekas

Container.php

@@ -107,7 +107,7 @@ public function getParameterBag()
     /**
      * Gets a parameter.
      *
-     * @return mixed
+     * @return array|bool|string|int|float|null
      *
      * @throws InvalidArgumentException if the parameter is not defined
      */
@@ -127,8 +127,8 @@ public function hasParameter(string $name)
     /**
      * Sets a parameter.
      *
-     * @param string $name  The parameter name
-     * @param mixed  $value The parameter value
+     * @param string                           $name  The parameter name
+     * @param array|bool|string|int|float|null $value The parameter value
      */
     public function setParameter(string $name, $value)
     {

ContainerInterface.php

@@ -65,7 +65,7 @@ public function has($id);
     public function initialized(string $id);
 
     /**
-     * @return mixed
+     * @return array|bool|string|int|float|null
      *
      * @throws InvalidArgumentException if the parameter is not defined
      */
@@ -79,8 +79,8 @@ public function hasParameter(string $name);
     /**
      * Sets a parameter.
      *
-     * @param string $name  The parameter name
-     * @param mixed  $value The parameter value
+     * @param string                           $name  The parameter name
+     * @param array|bool|string|int|float|null $value The parameter value
      */
     public function setParameter(string $name, $value);
 }

ParameterBag/ContainerBag.php

@@ -36,7 +36,7 @@ public function all()
     /**
      * {@inheritdoc}
      *
-     * @return mixed
+     * @return array|bool|string|int|float|null
      */
     public function get($name)
     {

ParameterBag/ParameterBagInterface.php

@@ -45,7 +45,7 @@ public function all();
     /**
      * Gets a service container parameter.
      *
-     * @return mixed The parameter value
+     * @return array|bool|string|int|float|null
      *
      * @throws ParameterNotFoundException if the parameter is not defined
      */
@@ -59,7 +59,7 @@ public function remove(string $name);
     /**
      * Sets a service container parameter.
      *
-     * @param mixed $value The parameter value
+     * @param array|bool|string|int|float|null $value The parameter value
      *
      * @throws LogicException if the parameter can not be set
      */

Tests/Dumper/PhpDumperTest.php

@@ -51,7 +51,6 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\WitherStaticReturnType;
 use Symfony\Component\DependencyInjection\TypedReference;
-use Symfony\Component\DependencyInjection\Variable;
 use Symfony\Component\ExpressionLanguage\Expression;
 
 require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
@@ -170,28 +169,6 @@ public function testDumpCustomContainerClassWithMandatoryArgumentLessConstructor
         $this->assertStringEqualsFile(self::$fixturesPath.'/php/custom_container_class_with_mandatory_constructor_arguments.php', $dumper->dump(['base_class' => 'ConstructorWithMandatoryArgumentsContainer', 'namespace' => 'Symfony\Component\DependencyInjection\Tests\Fixtures\Container']));
     }
 
-    /**
-     * @dataProvider provideInvalidParameters
-     */
-    public function testExportParameters($parameters)
-    {
-        $this->expectException(\InvalidArgumentException::class);
-        $container = new ContainerBuilder(new ParameterBag($parameters));
-        $container->compile();
-        $dumper = new PhpDumper($container);
-        $dumper->dump();
-    }
-
-    public function provideInvalidParameters()
-    {
-        return [
-            [['foo' => new Definition('stdClass')]],
-            [['foo' => new Expression('service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")')]],
-            [['foo' => new Reference('foo')]],
-            [['foo' => new Variable('foo')]],
-        ];
-    }
-
     public function testAddParameters()
     {
         $container = include self::$fixturesPath.'/containers/container8.php';