8000 [WIP] Kernel refactor by fabpot · Pull Request #6459 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[WIP] Kernel refactor #6459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jan 11, 2013
Merged

[WIP] Kernel refactor #6459

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9aaceb1
moved the logic from HttpKernel in FrameworkBundle to the HttpKernel …
fabpot Dec 19, 2012
a0c49c3
[TwigBridge] added a render_* function to ease usage of custom render…
fabpot Jan 3, 2013
892f00f
[HttpKernel] added a URL signer mechanism for hincludes
fabpot Jan 3, 2013
403bb06
[HttpKernel] added missing phpdoc and tweaked existing ones
fabpot Jan 4, 2013
1f1392d
[HttpKernel] simplified and enhanced code managing the hinclude strategy
fabpot Jan 4, 2013
adc067e
[FrameworkBundle] made some services private
fabpot Jan 5, 2013
1240690
[HttpKernel] made the strategy a regular parameter in HttpContentRend…
fabpot Jan 6, 2013
a8ea4e4
[FrameworkBundle] deprecated HttpKernel::forward() (it is only used o…
fabpot Jan 6, 2013
bd102c5
made the content renderer work even when ESI is disabled or when no t…
fabpot Jan 6, 2013
2eea768
moved the deprecation logic calls outside the new HttpContentRenderer…
fabpot Jan 6, 2013
f17f586
moved the container aware HTTP kernel to the HttpKernel component
fabpot Jan 6, 2013
f7da1f0
added some unit tests (and fixed some bugs)
fabpot Jan 10, 2013
76fefe3
updated CHANGELOG and UPGRADE files
fabpot Jan 10, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[HttpKernel] simplified and enhanced code managing the hinclude strategy
  • Loading branch information
@fabpot
fabpot committed Jan 10, 2013
commit 1f1392dc8bce232a3111a08e1627884d77c69901
35 changes: 11 additions & 24 deletions src/Symfony/Component/HttpKernel/RenderingStrategy/HIncludeRenderingStrategy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class HIncludeRenderingStrategy extends GeneratorAwareRenderingStrategy
*
* @param EngineInterface|\Twig_Environment $templating An EngineInterface or a \Twig_Environment instance
* @param UriSigner $signer A UriSigner instance
* @param string $globalDefaultTemplate The content of the global default template
* @param string $globalDefaultTemplate The global default content (it can be a template name or the content)
*/
public function __construct($templating, UriSigner $signer = null, $globalDefaultTemplate = null)
{
Expand All @@ -47,6 +47,10 @@ public function __construct($templating, UriSigner $signer = null, $globalDefaul

/**
* {@inheritdoc}
*
* Additional available options:
*
* * default: The default content (it can be a template name or the content)
*/
public function render($uri, Request $request = null, array $options = array())
{
Expand All @@ -58,31 +62,14 @@ public function render($uri, Request $request = null, array $options = array())
$uri = $this->signer->sign($this->generateProxyUri($uri, $request));
}

$defaultTemplate = isset($options['default']) ? $options['default'] : null;
$defaultContent = null;

if (null !== $defaultTemplate) {
if ($this->templateExists($defaultTemplate)) {
$defaultContent = $this->templating->render($defaultContent);
} else {
$defaultContent = $defaultTemplate;
}
} elseif ($this->globalDefaultTemplate) {
$defaultContent = $this->templating->render($this->globalDefaultTemplate);
$template = isset($options['default']) ? $options['default'] : $this->globalDefaultTemplate;
if ($this->templateExists($template)) {
$content = $this->templating->render($template);
} else {
$content = $template;
}

return $this->renderHIncludeTag($uri, $defaultContent);
}

/**
* Renders an HInclude tag.
*
* @param string $uri A URI
* @param string $defaultContent Default content
*/
protected function renderHIncludeTag($uri, $defaultContent = null)
{
return sprintf('<hx:include src="%s">%s</hx:include>', $uri, $defaultContent);
return sprintf('<hx:include src="%s">%s</hx:include>', $uri, $content);
}

private function templateExists($template)
Expand Down
0