fix merge

nicolas-grekas · nicolas-grekas · commit 06c86bab261e · 2019-08-26T18:50:55.000+02:00
diff --git a/Tests/Loader/ObjectLoaderTest.php b/Tests/Loader/ObjectLoaderTest.php
@@ -106,7 +106,7 @@ public function supports($resource, string $type = null): bool
         return 'service';
     }
 
-    protected function getObject(string $id): object
+    protected function getObject(string $id)
     {
         return $this->loaderMap[$id] ?? null;
     }

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public function supports($resource, string $type = null): bool`
`106`	`106`	`return 'service';`
`107`	`107`	`}`
`108`	`108`
`109`		`- protected function getObject(string $id): object`
	`109`	`+ protected function getObject(string $id)`
`110`	`110`	`{`
`111`	`111`	`return $this->loaderMap[$id] ?? null;`
`112`	`112`	`}`