Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions Doctrine/Phpcr/Page.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishTimePeriodInterface;
use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishableInterface;
use Symfony\Cmf\Bundle\CoreBundle\Translatable\TranslatableInterface;
use Symfony\Cmf\Bundle\MenuBundle\Model\MenuOptionsInterface;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this interface does not exist .. is this the correct namespace?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is being added in symfony-cmf/menu-bundle#197 , i added that info to the PR description

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

then we also need to bump the MenuBundle version in the composer.json

use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route;
use Symfony\Cmf\Component\Routing\RouteReferrersReadInterface;
use PHPCR\NodeInterface as PHPCRNodeInterface;
Expand All @@ -40,6 +41,7 @@ class Page extends Route implements
RouteReferrersReadInterface, // this must not be the write interface, it would make no sense
PublishTimePeriodInterface,
PublishableInterface,
MenuOptionsInterface,
TranslatableInterface
{
/**
Expand Down Expand Up @@ -670,7 +672,7 @@ public function setRouteOptions(array $options)
{
parent::setOptions($options);
}

/**
* Retrieve UUID of Node or null if not present
*
Expand All @@ -679,7 +681,7 @@ public function setRouteOptions(array $options)
public function getUUID()
{
$node = $this->getNode();

return $node instanceof PHPCRNodeInterface ? $node->getIdentifier() : null;
}
}
}
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"symfony/framework-bundle": "~2.3",
"symfony-cmf/core-bundle": ">=1.1.0,<1.3-dev",
"symfony-cmf/routing-bundle": ">=1.2.0,<1.4-dev",
"symfony-cmf/menu-bundle": ">=1.0.0,<1.3-dev",
"symfony-cmf/menu-bundle": ">=1.2.0,<1.3-dev",
"symfony-cmf/content-bundle": ">=1.0.0,<1.3-dev",
"doctrine/phpcr-bundle": ">=1.1.0,<1.3-dev",
"doctrine/phpcr-odm": ">=1.1.0,<1.3-dev"
Expand Down