[WIP] ORM based dynamic routing #95
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| <?php | ||
|
|
||
| namespace Symfony\Cmf\Bundle\RoutingBundle\Entity; | ||
|
|
||
| use Symfony\Cmf\Component\Routing\ContentRepositoryInterface; | ||
|
|
||
| /** | ||
| * Description of ContentRepository | ||
| * | ||
| * @author teito | ||
| */ | ||
| class ContentRepository implements ContentRepositoryInterface | ||
| { | ||
| public function __construct($orm) | ||
| { | ||
| $this->orm = $orm; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| public function findById($id) | ||
| { | ||
| $identifier = $id; | ||
|
|
||
| list($model, $id) = $this->getModelAndId($identifier); | ||
|
|
||
| return $this->orm->getRepository($model)->find($id); | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| public function getContentId($content) | ||
| { | ||
| if (! is_object($content)) { | ||
| return null; | ||
| } | ||
| try { | ||
| return implode(':', array( | ||
| get_class($content), | ||
| $content->getId() | ||
| )); | ||
| } catch (\Exception $e) { | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| public function getModelAndId($identifier) | ||
| { | ||
| $model = substr($identifier, 0, strpos($identifier, ':')); | ||
| $id = substr($identifier, strpos($identifier, ':')); | ||
|
|
||
| return array($model, $id); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| <?php | ||
|
|
||
| namespace Symfony\Cmf\Bundle\RoutingBundle\Entity; | ||
|
|
||
| use Doctrine\ORM\Mapping as ORM; | ||
| use Symfony\Cmf\Component\Routing\RedirectRouteInterface; | ||
|
|
||
| /** | ||
| * ExternalRoute | ||
| * @ORM\Entity(repositoryClass="Raindrop\RoutingBundle\Entity\ExternalRouteRepository") | ||
| * @ORM\HasLifecycleCallbacks() | ||
| * @ORM\Table(name="external_routes") | ||
| */ | ||
| class ExternalRoute implements RedirectRouteInterface | ||
|
There was a problem hiding this comment. could we call this RedirectRoute instead of ExternalRoute? it does not need to be an external redirect, could also be internal... There was a problem hiding this comment. Yes ofc. |
||
| { | ||
| /** | ||
| * @ORM\Id | ||
| * @ORM\Column(type="integer") | ||
| * @ORM\GeneratedValue(strategy="AUTO") | ||
| */ | ||
| private $id; | ||
|
|
||
| /** | ||
| * @ORM\Column(type="string", length=255) | ||
| */ | ||
| private $uri; | ||
|
|
||
| /** | ||
| * @ORM\Column(type="boolean", nullable=true) | ||
| */ | ||
| protected $permanent; | ||
|
|
||
| /** | ||
| * Get id | ||
| * | ||
| * @return integer | ||
| */ | ||
| public function getId() | ||
| { | ||
| return $this->id; | ||
| } | ||
|
|
||
| /** | ||
| * Set uri | ||
| * | ||
| * @param string $uri | ||
| * @return ExternalRoute | ||
| */ | ||
| public function setUri($uri) | ||
| { | ||
| $this->uri = $uri; | ||
|
|
||
| return $this; | ||
| } | ||
|
|
||
| /** | ||
| * Get url | ||
| * | ||
| * @return string | ||
| */ | ||
| public function getUri() | ||
| { | ||
| return $this->uri; | ||
| } | ||
|
|
||
| /** | ||
| * May come handy | ||
| * @return type | ||
| */ | ||
| public function getUrl() | ||
| { | ||
| return $this->getUri(); | ||
| } | ||
|
|
||
| /** | ||
| * Set permanent | ||
| * | ||
| * @param boolean $permanent | ||
| * @return ExternalRoute | ||
| */ | ||
| public function setPermanent($permanent = true) | ||
| { | ||
| $this->permanent = $permanent; | ||
|
|
||
| return $this; | ||
| } | ||
|
|
||
| /** | ||
| * Get permanent | ||
| * | ||
| * @return boolean | ||
| */ | ||
| public function getPermanent() | ||
| { | ||
| return $this->permanent; | ||
| } | ||
|
|
||
| public function isPermanent() | ||
| { | ||
| return $this->getPermanent(); | ||
| } | ||
|
|
||
| /** | ||
| * @TODO | ||
| */ | ||
| public function getParameters() | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| /** | ||
| * @TODO | ||
| */ | ||
| public function getRouteTarget() | ||
| { | ||
| throw new LogicException('There is no route target for an external route, ask for uri instead'); | ||
| } | ||
|
|
||
| /** | ||
| * @TODO | ||
| */ | ||
| public function getRouteName() | ||
| { | ||
| throw new LogicException('There is no name for an external route, ask for id or uri'); | ||
| } | ||
|
|
||
| /** | ||
| * The external route points to self ?? | ||
| * | ||
| * @return \Raindrop\RoutingBundle\Entity\ExternalRoute | ||
| */ | ||
| public function getRouteContent() | ||
| { | ||
| return $this; | ||
| } | ||
|
|
||
| public function getRouteKey() | ||
| { | ||
| return null; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| <?php | ||
|
|
||
| namespace Symfony\Cmf\Bundle\RoutingBundle\Entity; | ||
|
|
||
| use Symfony\Cmf\Bundle\RoutingBundle\Document\Route as BaseRoute; | ||
|
|
||
| /** | ||
| * ORM route version. | ||
| * @author matteo caberlotto [email protected] | ||
| */ | ||
| class Route extends BaseRoute | ||
| { | ||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| protected $id_prefix = ''; | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| protected $id; | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| protected $name; | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| protected $path; | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| protected $position; | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| protected $variablePattern; | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| protected $addFormatPattern; | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| protected $addTrailingSlash; | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| protected $host; | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| protected $defaults; | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| protected $requirements; | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| protected $options; | ||
|
|
||
| /** | ||
| * This property is used to order routes during ORM query and thus | ||
| * matching order. | ||
| * (Higher position wins. i.e.: ORDER BY - DESC) | ||
| */ | ||
| protected $priority; | ||
|
|
||
| /** | ||
| * Set priority | ||
| * | ||
| * @param int $priority | ||
| */ | ||
| public function setPriority($priority) | ||
| { | ||
| $this->priority = $priority; | ||
|
|
||
| return $priority; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the route priority | ||
| */ | ||
| public function getPriority() | ||
| { | ||
| return $this->priority; | ||
| } | ||
|
|
||
| /** | ||
| * Get id | ||
| * | ||
| * @return integer | ||
| */ | ||
| public function getId() | ||
| { | ||
| return $this->id; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| public function getDefaults() | ||
| { | ||
| return $this->defaults; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| public function getStaticPrefix() | ||
| { | ||
| return $this->path; | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
from the code below i understand you moved the route enhancer configuration under this node. what exactly for? to allow more than one dynamic router being configured at the same time? we could do that, but then we should move the information if its to be an orm or phpcr-odm router in there as well. how do you decide that right now? or do you have the extension load and enhance a dynamic router service defined by your application?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i think you know better how to handle this...
i added those lines as child of 'dynamic' field of 'symfony_cmf_routing' (or 'cmf_..') into app/config/config.yml
the chain -> routers_by_id tells which router and priority, they are not all dynamic one but the dynamic should be setup by the extension if i understood correct.
should another field (say 'dynamic') be added to 'routers_by_id' to mark a router as dynamic? the provider info are into xml services config and this tells which repository should the router fetch from.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
as solution for this issue, #112 is separating the route provider from the rest of the dynamic router. the configuration does not expect that you would want to run more than one dynamic router. i think that makes sense, people in most cases won't need both orm and phpcr routes at the same time. if they really do, they can still define their own dynamic router service in their application.