Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit c9882bf4e75a · 2021-08-11T16:16:25.000+02:00
* 5.4:
  More return type fixes
  [EventDispatcher] fix getSubscribedEvents() event yielding instead or returning array
  Update Tagalog translations
diff --git a/Tests/KernelTest.php b/Tests/KernelTest.php
@@ -516,7 +516,7 @@ public function load(array $configs, ContainerBuilder $container)
                 $container->setParameter('test.extension-registered', true);
             }
 
-            public function getNamespace()
+            public function getNamespace(): string
             {
                 return '';
             }
@@ -526,7 +526,7 @@ public function getXsdValidationBasePath(): string|false
                 return false;
             }
 
-            public function getAlias()
+            public function getAlias(): string
             {
                 return 'test-extension';
             }

Original file line number	Diff line number	Diff line change
`@@ -516,7 +516,7 @@ public function load(array $configs, ContainerBuilder $container)`
`516`	`516`	`$container->setParameter('test.extension-registered', true);`
`517`	`517`	`}`
`518`	`518`
`519`		`- public function getNamespace()`
	`519`	`+ public function getNamespace(): string`
`520`	`520`	`{`
`521`	`521`	`return '';`
`522`	`522`	`}`
`@@ -526,7 +526,7 @@ public function getXsdValidationBasePath(): string\|false`
`526`	`526`	`return false;`
`527`	`527`	`}`
`528`	`528`
`529`		`- public function getAlias()`
	`529`	`+ public function getAlias(): string`
`530`	`530`	`{`
`531`	`531`	`return 'test-extension';`
`532`	`532`	`}`