Commit 7baa287

author

Fady Michel

committed

improvement order

1 parent e9dfe89 commit 7baa287Copy full SHA for 7baa287

File tree

1 file changed

+23

-23

lines changed

src
- Route.php

1 file changed

+23

-23

lines changed

`‎src/Route.php`

Lines changed: 23 additions & 23 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,6 @@ class Route`
`13`	`13`	`*/`
`14`	`14`	`protected $name;`
`15`	`15`
`16`		`- /**`
`17`		`- * @var array<string>`
`18`		`- */`
`19`		`- protected $controller = [];`
`20`		`-`
`21`	`16`	`/**`
`22`	`17`	`* @var string`
`23`	`18`	`*/`
`@@ -26,13 +21,18 @@ class Route`
`26`	`21`	`/**`
`27`	`22`	`* @var array<string>`
`28`	`23`	`*/`
`29`		`- protected $vars = [];`
	`24`	`+ protected $controller = [];`
`30`	`25`
`31`	`26`	`/**`
`32`	`27`	`* @var array<string>`
`33`	`28`	`*/`
`34`	`29`	`protected $methods = [];`
`35`	`30`
	`31`	`+ /**`
	`32`	`+ * @var array<string>`
	`33`	`+ */`
	`34`	`+ protected $vars = [];`
	`35`	`+`
`36`	`36`	`public function __construct(string $name, string $path, array $controller, array $methods = ['GET', 'POST'])`
`37`	`37`	`{`
`38`	`38`	`$this->name = $name;`
`@@ -41,16 +41,11 @@ public function __construct(string $name, string $path, array $controller, array`
`41`	`41`	`$this->methods = $methods;`
`42`	`42`	`}`
`43`	`43`
`44`		`- public function hasVars(): bool`
`45`		`- {`
`46`		`- return $this->getVarsNames() !== [];`
`47`		`- }`
`48`		`-`
`49`	`44`	`public function match(string $path, string $method): bool`
`50`	`45`	`{`
`51`	`46`	`if (`
`52`	`47`	`in_array($method, $this->getMethods()) &&`
`53`		`- preg_match('#^' . $this->generateRegex() . '$#sD', $this->trimPath($path), $matches)`
	`48`	`+ preg_match('#^' . $this->generateRegex() . '$#sD', self::trimPath($path), $matches)`
`54`	`49`	`) {`
`55`	`50`
`56`	`51`	`$values = array_filter($matches, function ($key) {`
`@@ -77,12 +72,6 @@ public function getPath(): string`
`77`	`72`	`return $this->path;`
`78`	`73`	`}`
`79`	`74`
`80`		`- public function addVar(string $key, string $value): self`
`81`		`- {`
`82`		`- $this->vars[$key] = $value;`
`83`		`- return $this;`
`84`		`- }`
`85`		`-`
`86`	`75`	`public function getController(): array`
`87`	`76`	`{`
`88`	`77`	`return $this->controller;`
`@@ -104,11 +93,6 @@ public function getMethods(): array`
`104`	`93`	`return $this->methods;`
`105`	`94`	`}`
`106`	`95`
`107`		`- private function trimPath(string $path): string`
`108`		`- {`
`109`		`- return '/' . rtrim(ltrim(trim($path), '/'), '/');`
`110`		`- }`
`111`		`-`
`112`	`96`	`private function generateRegex(): string`
`113`	`97`	`{`
`114`	`98`	`$regex = $this->path;`
`@@ -118,4 +102,20 @@ private function generateRegex(): string`
`118`	`102`	`}`
`119`	`103`	`return $regex;`
`120`	`104`	`}`
	`105`	`+`
	`106`	`+ public function hasVars(): bool`
	`107`	`+ {`
	`108`	`+ return $this->getVarsNames() !== [];`
	`109`	`+ }`
	`110`	`+`
	`111`	`+ public function addVar(string $key, string $value): self`
	`112`	`+ {`
	`113`	`+ $this->vars[$key] = $value;`
	`114`	`+ return $this;`
	`115`	`+ }`
	`116`	`+`
	`117`	`+ private static function trimPath(string $path): string`
	`118`	`+ {`
	`119`	`+ return '/' . rtrim(ltrim(trim($path), '/'), '/');`
	`120`	`+ }`
`121`	`121`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 7baa287

File tree

1 file changed

1 file changed

`‎src/Route.php`

0 commit comments