Skip to content

Commit

Permalink
Merge Twig global scope with Laravel Globals
Browse files Browse the repository at this point in the history
  • Loading branch information
astoltz committed Jul 5, 2015
1 parent 0e2693d commit 543b59d
Showing 1 changed file with 22 additions and 0 deletions.
22 changes: 22 additions & 0 deletions src/Bridge.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,28 @@ public function mergeShared(array $context)
return $context;
}

/**
* Merges a context with the defined globals.
*
* @param array $context An array representing the context
*
* @return array The context merged with the globals
*/
public function mergeGlobals(array $context)
{
$context = parent::mergeGlobals($context);

// we don't use array_merge as the context being generally
// bigger than globals, this code is faster.
foreach ($this->app['view']->getShared() as $key => $value) {
if (!array_key_exists($key, $context)) {
$context[$key] = $value;
}
}

return $context;
}

/**
* Normalize a view name.
*
Expand Down

0 comments on commit 543b59d

Please sign in to comment.