Skip to content

Commit a86bb1f

Browse files
dgdg
committed
private constants are PascalCase
1 parent b969ab5 commit a86bb1f

File tree

4 files changed

+37
-37
lines changed

4 files changed

+37
-37
lines changed

‎src/Application/Routers/CliRouter.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ final class CliRouter implements Nette\Routing\Router
1919
{
2020
use Nette\SmartObject;
2121

22-
private const PRESENTER_KEY = 'action';
22+
private const PresenterKey = 'action';
2323

2424
/** @var array */
2525
private $defaults;
@@ -40,7 +40,7 @@ public function match(Nette\Http\IRequest $httpRequest): ?array
4040
return null;
4141
}
4242

43-
$names = [self::PRESENTER_KEY];
43+
$names = [self::PresenterKey];
4444
$params = $this->defaults;
4545
$args = $_SERVER['argv'];
4646
array_shift($args);
@@ -76,13 +76,13 @@ public function match(Nette\Http\IRequest $httpRequest): ?array
7676
}
7777
}
7878

79-
if (!isset($params[self::PRESENTER_KEY])) {
79+
if (!isset($params[self::PresenterKey])) {
8080
throw new Nette\InvalidStateException('Missing presenter & action in route definition.');
8181
}
8282

83-
[$module, $presenter] = Nette\Application\Helpers::splitName($params[self::PRESENTER_KEY]);
83+
[$module, $presenter] = Nette\Application\Helpers::splitName($params[self::PresenterKey]);
8484
if ($module !== '') {
85-
$params[self::PRESENTER_KEY] = $presenter;
85+
$params[self::PresenterKey] = $presenter;
8686
$presenter = $module;
8787
}
8888

‎src/Application/Routers/Route.php‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
class Route extends Nette\Routing\Route implements Nette\Routing\Router
2020
{
2121
private const
22-
PRESENTER_KEY = 'presenter',
23-
MODULE_KEY = 'module';
22+
PresenterKey = 'presenter',
23+
ModuleKey = 'module';
2424

25-
private const UI_META = [
25+
private const UIMeta = [
2626
'module' => [
2727
self::PATTERN => '[a-z][a-z0-9.-]*',
2828
self::FILTER_IN => [self::class, 'path2presenter'],
@@ -56,13 +56,13 @@ public function __construct(string $mask, $metadata = [], int $flags = 0)
5656
throw new Nette\InvalidArgumentException("Second argument must be array or string in format Presenter:action, '$metadata' given.");
5757
}
5858

59-
$metadata = [self::PRESENTER_KEY => $presenter];
59+
$metadata = [self::PresenterKey => $presenter];
6060
if ($action !== '') {
6161
$metadata['action'] = $action;
6262
}
6363
} elseif ($metadata instanceof \Closure) {
6464
$metadata = [
65-
self::PRESENTER_KEY => 'Nette:Micro',
65+
self::PresenterKey => 'Nette:Micro',
6666
'callback' => $metadata,
6767
];
6868
}
@@ -71,7 +71,7 @@ public function __construct(string $mask, $metadata = [], int $flags = 0)
7171
trigger_error(__METHOD__ . '() parameter $flags is deprecated, use RouteList::addRoute(..., ..., $flags) instead.', E_USER_DEPRECATED);
7272
}
7373

74-
$this->defaultMeta += self::UI_META;
74+
$this->defaultMeta += self::UIMeta;
7575
$this->flags = $flags;
7676
parent::__construct($mask, $metadata);
7777
}
@@ -86,18 +86,18 @@ public function match(Nette\Http\IRequest $httpRequest): ?array
8686

8787
if ($params === null) {
8888
return null;
89-
} elseif (!isset($params[self::PRESENTER_KEY])) {
89+
} elseif (!isset($params[self::PresenterKey])) {
9090
throw new Nette\InvalidStateException('Missing presenter in route definition.');
91-
} elseif (!is_string($params[self::PRESENTER_KEY])) {
91+
} elseif (!is_string($params[self::PresenterKey])) {
9292
return null;
9393
}
9494

95-
$presenter = $params[self::PRESENTER_KEY] ?? null;
96-
if (isset($this->getMetadata()[self::MODULE_KEY], $params[self::MODULE_KEY]) && is_string($presenter)) {
97-
$params[self::PRESENTER_KEY] = $params[self::MODULE_KEY] . ':' . $params[self::PRESENTER_KEY];
95+
$presenter = $params[self::PresenterKey] ?? null;
96+
if (isset($this->getMetadata()[self::ModuleKey], $params[self::ModuleKey]) && is_string($presenter)) {
97+
$params[self::PresenterKey] = $params[self::ModuleKey] . ':' . $params[self::PresenterKey];
9898
}
9999

100-
unset($params[self::MODULE_KEY]);
100+
unset($params[self::ModuleKey]);
101101

102102
return $params;
103103
}
@@ -113,18 +113,18 @@ public function constructUrl(array $params, Nette\Http\UrlScript $refUrl): ?stri
113113
}
114114

115115
$metadata = $this->getMetadata();
116-
if (isset($metadata[self::MODULE_KEY])) { // try split into module and [submodule:]presenter parts
117-
$presenter = $params[self::PRESENTER_KEY];
118-
$module = $metadata[self::MODULE_KEY];
116+
if (isset($metadata[self::ModuleKey])) { // try split into module and [submodule:]presenter parts
117+
$presenter = $params[self::PresenterKey];
118+
$module = $metadata[self::ModuleKey];
119119
$a = isset($module['fixity'], $module[self::VALUE])
120120
&& strncmp($presenter, $module[self::VALUE] . ':', strlen($module[self::VALUE]) + 1) === 0
121121
? strlen($module[self::VALUE])
122122
: strrpos($presenter, ':');
123123
if ($a === false) {
124-
$params[self::MODULE_KEY] = isset($module[self::VALUE]) ? '' : null;
124+
$params[self::ModuleKey] = isset($module[self::VALUE]) ? '' : null;
125125
} else {
126-
$params[self::MODULE_KEY] = substr($presenter, 0, $a);
127-
$params[self::PRESENTER_KEY] = substr($presenter, $a + 1);
126+
$params[self::ModuleKey] = substr($presenter, 0, $a);
127+
$params[self::PresenterKey] = substr($presenter, $a + 1);
128128
}
129129
}
130130

@@ -136,13 +136,13 @@ public function constructUrl(array $params, Nette\Http\UrlScript $refUrl): ?stri
136136
public function getConstantParameters(): array
137137
{
138138
$res = parent::getConstantParameters();
139-
if (isset($res[self::MODULE_KEY], $res[self::PRESENTER_KEY])) {
140-
$res[self::PRESENTER_KEY] = $res[self::MODULE_KEY] . ':' . $res[self::PRESENTER_KEY];
141-
} elseif (isset($this->getMetadata()[self::MODULE_KEY])) {
142-
unset($res[self::PRESENTER_KEY]);
139+
if (isset($res[self::ModuleKey], $res[self::PresenterKey])) {
140+
$res[self::PresenterKey] = $res[self::ModuleKey] . ':' . $res[self::PresenterKey];
141+
} elseif (isset($this->getMetadata()[self::ModuleKey])) {
142+
unset($res[self::PresenterKey]);
143143
}
144144

145-
unset($res[self::MODULE_KEY]);
145+
unset($res[self::ModuleKey]);
146146
return $res;
147147
}
148148

‎src/Application/Routers/RouteList.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
class RouteList extends Nette\Routing\RouteList implements Nette\Routing\Router, \ArrayAccess, \Countable, \IteratorAggregate
1919
{
20-
private const PRESENTER_KEY = 'presenter';
20+
private const PresenterKey = 'presenter';
2121

2222
/** @var string|null */
2323
private $module;
@@ -37,9 +37,9 @@ public function match(Nette\Http\IRequest $httpRequest): ?array
3737
{
3838
$params = parent::match($httpRequest);
3939

40-
$presenter = $params[self::PRESENTER_KEY] ?? null;
40+
$presenter = $params[self::PresenterKey] ?? null;
4141
if (is_string($presenter) && strncmp($presenter, 'Nette:', 6)) {
42-
$params[self::PRESENTER_KEY] = $this->module . $presenter;
42+
$params[self::PresenterKey] = $this->module . $presenter;
4343
}
4444

4545
return $params;
@@ -52,11 +52,11 @@ public function match(Nette\Http\IRequest $httpRequest): ?array
5252
public function constructUrl(array $params, Nette\Http\UrlScript $refUrl): ?string
5353
{
5454
if ($this->module) {
55-
if (strncmp($params[self::PRESENTER_KEY], $this->module, strlen($this->module)) !== 0) {
55+
if (strncmp($params[self::PresenterKey], $this->module, strlen($this->module)) !== 0) {
5656
return null;
5757
}
5858

59-
$params[self::PRESENTER_KEY] = substr($params[self::PRESENTER_KEY], strlen($this->module));
59+
$params[self::PresenterKey] = substr($params[self::PresenterKey], strlen($this->module));
6060
}
6161

6262
return parent::constructUrl($params, $refUrl);

‎src/Application/Routers/SimpleRouter.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
final class SimpleRouter extends Nette\Routing\SimpleRouter implements Nette\Routing\Router
2020
{
2121
private const
22-
PRESENTER_KEY = 'presenter',
23-
MODULE_KEY = 'module';
22+
PresenterKey = 'presenter',
23+
ModuleKey = 'module';
2424

2525
/** @var int */
2626
private $flags;
@@ -35,12 +35,12 @@ public function __construct($defaults = [], int $flags = 0)
3535
}
3636

3737
$defaults = [
38-
self::PRESENTER_KEY => $presenter,
38+
self::PresenterKey => $presenter,
3939
'action' => $action === '' ? Application\UI\Presenter::DEFAULT_ACTION : $action,
4040
];
4141
}
4242

43-
if (isset($defaults[self::MODULE_KEY])) {
43+
if (isset($defaults[self::ModuleKey])) {
4444
throw new Nette\DeprecatedException(__METHOD__ . '() parameter module is deprecated, use RouteList::withModule() instead.');
4545
} elseif ($flags) {
4646
trigger_error(__METHOD__ . '() parameter $flags is deprecated, use RouteList::add(..., $flags) instead.', E_USER_DEPRECATED);

0 commit comments

Comments
 (0)