8000 Merge branch '3.4' into 4.4 · symfony/symfony@4be98cd · GitHub
[go: up one dir, main page]

Skip to content

Commit 4be98cd

Browse files
Merge branch '3.4' into 4.4
* 3.4: [appveyor] bump cache [DI] µfix
2 parents ac5f45b + 8920f18 commit 4be98cd

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

phpunit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env php
22
<?php
33

4-
// Cache-Id: 2020-01-31 10:00 UTC
4+
// Cache-Id: 2020-04-10 20:30 UTC
55

66
if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
77
echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\nPlease run `composer update` before running this command.\n";

src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ private function parseDefinition(string $id, $service, string $file, array $defa
345345

346346
if (isset($service['alias'])) {
347347
$this->container->setAlias($id, $alias = new Alias($service['alias']));
348-
if (\array_key_exists('public', $service)) {
348+
if (isset($service['public'])) {
349349
$alias->setPublic($service['public']);
350350
} elseif (isset($defaults['public'])) {
351351
$alias->setPublic($defaults['public']);

0 commit comments

Comments
 (0)
0