This repository has been archived by the owner on Jan 8, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
fix getHref strategy in PageMvc #4282
Closed
vnagara
wants to merge
5
commits into
zendframework:master
from
vnagara:fix-getHref-strategy-in-PageMvc
Closed
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
39865fd
Remake. Instead removing RouteMatch, add insert them only if 'useRout…
vnagara 4b15a8c
typo Fix. Add quotes.
vnagara 71268a6
Add option to property. Add and fix tests.
vnagara 1722247
Set params unrequired in Segment route
vnagara 383d9a0
Fix, add clear cache.
vnagara File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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 |
---|---|---|
|
@@ -75,6 +75,13 @@ class Mvc extends AbstractPage | |
*/ | ||
protected $routeMatch; | ||
|
||
/** | ||
* If true and set routeMatch than getHref will use routeMatch params | ||
* to assemble uri | ||
* @var bool | ||
*/ | ||
protected $useRouteMatch = false; | ||
|
||
/** | ||
* Router for assembling URLs | ||
* | ||
|
@@ -190,7 +197,7 @@ public function getHref() | |
); | ||
} | ||
|
||
if ($this->getRouteMatch() !== null) { | ||
if ($this->getUseRouteMatch() && $this->getRouteMatch() !== null) { | ||
$rmParams = $this->getRouteMatch()->getParams(); | ||
|
||
if (isset($rmParams[ModuleRouteListener::ORIGINAL_CONTROLLER])) { | ||
|
@@ -427,6 +434,30 @@ public function setRouteMatch(RouteMatch $matches) | |
return $this; | ||
} | ||
|
||
/** | ||
* Get the useRouteMatch | ||
* | ||
* @return bool | ||
*/ | ||
public function getUseRouteMatch() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For boolean getters like this, we can drop the |
||
{ | ||
return $this->useRouteMatch; | ||
} | ||
|
||
/** | ||
* Set whether the page should use route match params for assembling link uri | ||
* | ||
* @see getHref() | ||
* @param bool $useRoteMatch [optional] | ||
* @return Mvc | ||
*/ | ||
public function setUseRouteMatch($useRoteMatch = true) | ||
{ | ||
$this->useRouteMatch = (bool) $useRoteMatch; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
$this->hrefCache = null; | ||
return $this; | ||
} | ||
|
||
/** | ||
* Get the router. | ||
* | ||
|
This file contains 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
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.
It looks like a null value would be highly unlikely here; I think you can omit the extra condition.