Skip to content

Commit

Permalink
Merge branch '4.4'
Browse files Browse the repository at this point in the history
* 4.4: (33 commits)
  [DI] fix processing of regular parameter bags by MergeExtensionConfigurationPass
  [FrameworkBundle] reset cache pools between requests
  [HttpFoundation] Accept must take the lead for Request::getPreferredFormat()
  [FrameworkBundle] Allow to use the BrowserKit assertions with Panther and API Platform's test client
  Use ConnectionRegistry instead of RegistryInterface.
  Fixes windows error
  Improving the request/response format autodetection
  [Messager] Simplified MessageBus::__construct()
  [WIP][Mailer] Overwrite envelope sender and recipients from config
  [Messenger] Added more test for MessageBus
  [Mime] Updated some PHPDoc contents
  [PropertyAccess] Adds entries to CHANGELOG and UPGRADE
  fixed typo
  [FrameworkBundle] Simplified some code in the DI configuration
  [Filesystem] added missing deprecations to UPGRADE-4.3.md
  [Filesystem] depreacte calling isAbsolutePath with a null
  Fix authentication for redis transport
  only decorate when an event dispatcher was passed
  [Messenger] Added support for auto trimming of redis streams
  [FrmaeworkBundle] More simplifications in the DI configuration
  ...
  • Loading branch information
nicolas-grekas committed Jul 4, 2019
2 parents 4edbbc4 + 86ad8cd commit 3bf771c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
1 change: 0 additions & 1 deletion Compiler/AnalyzeServiceReferencesPass.php
Expand Up @@ -34,7 +34,6 @@ class AnalyzeServiceReferencesPass extends AbstractRecursivePass
private $onlyConstructorArguments;
private $hasProxyDumper;
private $lazy;
private $expressionLanguage;
private $byConstructor;
private $definitions;
private $aliases;
Expand Down
4 changes: 4 additions & 0 deletions Compiler/MergeExtensionConfigurationPass.php
Expand Up @@ -200,6 +200,10 @@ public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs
$bag = $this->getParameterBag();
$value = $bag->resolveValue($value);

if (!$bag instanceof EnvPlaceholderParameterBag) {
return parent::resolveEnvPlaceholders($value, $format, $usedEnvs);
}

foreach ($bag->getEnvPlaceholders() as $env => $placeholders) {
if (false === strpos($env, ':')) {
continue;
Expand Down
4 changes: 2 additions & 2 deletions Compiler/ServiceReferenceGraphNode.php
Expand Up @@ -81,7 +81,7 @@ public function getId()
/**
* Returns the in edges.
*
* @return array The in ServiceReferenceGraphEdge array
* @return ServiceReferenceGraphEdge[]
*/
public function getInEdges()
{
Expand All @@ -91,7 +91,7 @@ public function getInEdges()
/**
* Returns the out edges.
*
* @return array The out ServiceReferenceGraphEdge array
* @return ServiceReferenceGraphEdge[]
*/
public function getOutEdges()
{
Expand Down

0 comments on commit 3bf771c

Please sign in to comment.