Merge branch '3.4' into 4.4

* 3.4: [appveyor] bump cache [DI] µfix
symfony · Apr 10, 2020 · 4be98cd · 4be98cd
2 parents ac5f45b + 8920f18
commit 4be98cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/phpunit b/phpunit
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-// Cache-Id: 2020-01-31 10:00 UTC
+// Cache-Id: 2020-04-10 20:30 UTC
 
 if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
     echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\nPlease run `composer update` before running this command.\n";

diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -345,7 +345,7 @@ private function parseDefinition(string $id, $service, string $file, array $defa
 
         if (isset($service['alias'])) {
             $this->container->setAlias($id, $alias = new Alias($service['alias']));
-            if (\array_key_exists('public', $service)) {
+            if (isset($service['public'])) {
                 $alias->setPublic($service['public']);
             } elseif (isset($defaults['public'])) {
                 $alias->setPublic($defaults['public']);