Skip to content

Commit

Permalink
Merge pull request #662 from eric-chau/fix-metadata-helper
Browse files Browse the repository at this point in the history
[Renderer] fixed metadata helper use statement conflict
  • Loading branch information
eric-chau committed Feb 3, 2016
2 parents 2c3d7f8 + 0a0c91c commit 9d7f587
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions Renderer/Helper/metadata.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

namespace BackBee\Renderer\Helper;

use BackBee\DependencyInjection\Container;
use BackBee\MetaData\MetaData as bbMetaData;
use BackBee\NestedNode\Page;
use BackBee\Renderer\AbstractRenderer;
Expand All @@ -42,8 +41,8 @@ class metadata extends AbstractHelper

/**
* The current dependency injection container.
*
* @var Container
*
* @var \BackBee\DependencyInjection\Container
*/
private $container;

Expand Down Expand Up @@ -85,17 +84,17 @@ public function __invoke()

/**
* Compute and save metadata if $page has no one.
*
*
* @param Page $page
*
*
* @return Page
*/
private function saveIfEmpty(Page $page)
{
$metadata = $this->container
->get('nestednode.metadata.resolver')
->resolve($page);

$page->setMetaData($metadata);
if ($this->container->get('em')->contains($page)) {
$this->container->get('em')->flush($page);
Expand All @@ -106,9 +105,9 @@ private function saveIfEmpty(Page $page)

/**
* Generates HTML tag according to the metadata.
*
*
* @param bbMetaData $meta
*
*
* @return string
*/
private function generateMeta(bbMetaData $meta)
Expand All @@ -133,7 +132,7 @@ private function generateMeta(bbMetaData $meta)

$result .= $attribute . '="' . html_entity_decode($value, ENT_COMPAT, 'UTF-8') . '" ';
}

return empty($result) ? $result : $result.'/>'.PHP_EOL;
}

Expand Down

0 comments on commit 9d7f587

Please sign in to comment.