rename non-empty parameter methods

Author: yceruto

CHANGELOG.md

@@ -7,7 +7,7 @@ CHANGELOG
  * Deprecate `!tagged` tag, use `!tagged_iterator` instead
  * Add a `ContainerBuilder::registerChild()` shortcut method for registering child definitions
  * Add support for `key-type` in `XmlFileLoader`
- * Enable non-empty parameters with `ParameterBag::nonEmpty()` and `ContainerBuilder::nonEmptyParameter()` methods
+ * Enable non-empty parameters with `ParameterBag::cannotBeEmpty()` and `ContainerBuilder::parameterCannotBeEmpty()` methods
 
 7.1
 ---

ContainerBuilder.php

@@ -673,7 +673,7 @@ public function merge(self $container): void
             }
 
             foreach ($otherBag->allNonEmpty() as $name => $message) {
-                $parameterBag->nonEmpty($name, $message);
+                $parameterBag->cannotBeEmpty($name, $message);
             }
         }
 
@@ -768,13 +768,13 @@ public function deprecateParameter(string $name, string $package, string $versio
         $this->parameterBag->deprecate($name, $package, $version, $message);
     }
 
-    public function nonEmptyParameter(string $name, string $message): void
+    public function parameterCannotBeEmpty(string $name, string $message): void
     {
         if (!$this->parameterBag instanceof ParameterBag) {
             throw new BadMethodCallException(\sprintf('The parameter bag must be an instance of "%s" to call "%s()".', ParameterBag::class, __METHOD__));
         }
 
-        $this->parameterBag->nonEmpty($name, $message);
+        $this->parameterBag->cannotBeEmpty($name, $message);
     }
 
     /**

ParameterBag/FrozenParameterBag.php

@@ -55,9 +55,9 @@ public function deprecate(string $name, string $package, string $version, string
         throw new LogicException('Impossible to call deprecate() on a frozen ParameterBag.');
     }
 
-    public function nonEmpty(string $name, string $message = 'A non-empty parameter "%s" is required.'): never
+    public function cannotBeEmpty(string $name, string $message = 'A non-empty parameter "%s" is required.'): never
     {
-        throw new LogicException('Impossible to call nonEmpty() on a frozen ParameterBag.');
+        throw new LogicException('Impossible to call cannotBeEmpty() on a frozen ParameterBag.');
     }
 
     public function remove(string $name): never

ParameterBag/ParameterBag.php

@@ -133,7 +133,7 @@ public function deprecate(string $name, string $package, string $version, string
         $this->deprecatedParameters[$name] = [$package, $version, $message, $name];
     }
 
-    public function nonEmpty(string $name, string $message): void
+    public function cannotBeEmpty(string $name, string $message): void
     {
         $this->nonEmptyParameters[$name] = $message;
     }

Tests/Fixtures/containers/container_nonempty_parameters.php

@@ -4,7 +4,7 @@
 use Symfony\Component\DependencyInjection\Parameter;
 
 $container = new ContainerBuilder();
-$container->nonEmptyParameter('bar', 'Did you forget to configure the "foo.bar" option?');
+$container->parameterCannotBeEmpty('bar', 'Did you forget to configure the "foo.bar" option?');
 $container->register('foo', 'stdClass')
     ->setArguments([new Parameter('bar')])
     ->setPublic(true)

Tests/ParameterBag/ParameterBagTest.php

@@ -13,8 +13,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\PhpUnit\ExpectUserDeprecationMessageTrait;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\EmptyParameterValueException;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\ParameterCircularReferenceException;
 use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
@@ -201,7 +201,7 @@ public function testGetMissingRequiredParameter()
     {
         $bag = new ParameterBag();
 
-        $bag->nonEmpty('bar', 'Did you forget to configure the "foo.bar" option?');
+        $bag->cannotBeEmpty('bar', 'Did you forget to configure the "foo.bar" option?');
 
         $this->expectException(ParameterNotFoundException::class);
         $this->expectExceptionMessage('You have requested a non-existent parameter "bar". Did you forget to configure the "foo.bar" option?');
@@ -213,7 +213,7 @@ public function testGetNonEmptyParameterThrowsWhenNullValue()
     {
         $bag = new ParameterBag();
         $bag->set('bar', null);
-        $bag->nonEmpty('bar', 'Did you forget to configure the "foo.bar" option?');
+        $bag->cannotBeEmpty('bar', 'Did you forget to configure the "foo.bar" option?');
 
         $this->expectException(EmptyParameterValueException::class);
         $this->expectExceptionMessage('Did you forget to configure the "foo.bar" option?');
@@ -225,7 +225,19 @@ public function testGetNonEmptyParameterThrowsWhenEmptyStringValue()
     {
         $bag = new ParameterBag();
         $bag->set('bar', '');
-        $bag->nonEmpty('bar', 'Did you forget to configure the "foo.bar" option?');
+        $bag->cannotBeEmpty('bar', 'Did you forget to configure the "foo.bar" option?');
+
+        $this->expectException(EmptyParameterValueException::class);
+        $this->expectExceptionMessage('Did you forget to configure the "foo.bar" option?');
+
+        $bag->get('bar');
+    }
+
+    public function testGetNonEmptyParameterThrowsWhenEmptyArrayValue()
+    {
+        $bag = new ParameterBag();
+        $bag->set('bar', []);
+        $bag->cannotBeEmpty('bar', 'Did you forget to configure the "foo.bar" option?');
 
         $this->expectException(EmptyParameterValueException::class);
         $this->expectExceptionMessage('Did you forget to configure the "foo.bar" option?');