geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-06-15 18:23:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added deprecated warning for RoutePartialGroup.

Browse Source
This commit is contained in:
Simon Sessingø
2021-03-29 21:59:30 +02:00
parent adc879bb13
commit 438193ef59
3 changed files with 15 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Pecee/SimpleRouter/Route/RouteGroup.php
View File

@@ -56,9 +56,17 @@ class RouteGroup extends Route implements IGroupRoute
return false;
}
// Parse group prefix parameters
if(count($this->originalParameters) === 0) {
$this->parseParameters($this->prefix, $url);
if ($this->prefix !== null) {
/* Parse parameters from current route */
$parameters = $this->parseParameters($this->prefix, $url);
/* If no custom regular expression or parameters was found on this route, we stop */
if ($parameters === null) {
return false;
}
/* Set the parameters */
$this->setParameters($parameters);
}
$parsedPrefix = $this->prefix;

37
src/Pecee/SimpleRouter/Route/RoutePartialGroup.php
View File

@@ -1,40 +1,11 @@
<?php
/**
* @deprecated This class is deprecated and will be removed in future versions.
* @see \Pecee\SimpleRouter\Route\RouteGroup
*/
namespace Pecee\SimpleRouter\Route;
use Pecee\Http\Request;
class RoutePartialGroup extends RouteGroup implements IPartialGroupRoute
{
protected $urlRegex = '/^%s\/?/u';
/**
* Method called to check if route matches
*
* @param string $url
* @param Request $request
* @return bool
*/
public function matchRoute(string $url, Request $request): bool
{
if ($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
return false;
}
if ($this->prefix !== null) {
/* Parse parameters from current route */
$parameters = $this->parseParameters($this->prefix, $url);
/* If no custom regular expression or parameters was found on this route, we stop */
if ($parameters === null) {
return false;
}
/* Set the parameters */
$this->setParameters($parameters);
}
return $this->matchDomain($request);
}
}