Merge branch 'feature/php-di-7-compiler-optimize-string-definitions' into mod7-merged

# Conflicts:
#	src/CompiledContainer.php

Author: partikus

src/CompiledContainer.php

@@ -16,6 +16,7 @@
 use Invoker\ParameterResolver\DefaultValueResolver;
 use Invoker\ParameterResolver\NumericArrayResolver;
 use Invoker\ParameterResolver\ResolverChain;
+use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Compiled version of the dependency injection container.
@@ -132,4 +133,21 @@ protected function resolveServiceLocator(string $requestingName, string $reposit
 
         return $repository->create($requestingName, $services);
     }
+
+    /**
+     * Resolve a placeholder in string definition
+     * - wrap possible NotFound exception to conform to the one from StringDefinition::resolveExpression.
+     */
+    protected function resolveStringPlaceholder(string $placeholder, string $entryName) : mixed
+    {
+        try {
+            return $this->delegateContainer->get($placeholder);
+        } catch (NotFoundExceptionInterface $e) {
+            throw new DependencyException(sprintf(
+                "Error while parsing string expression for entry '%s': %s",
+                $entryName,
+                $e->getMessage()
+            ), 0, $e);
+        }
+    }
 }