Skip to content

Commit cf5fbdf

Browse files
committed
Helpers::isNamespace() -> isNamespaceIdentifier()
1 parent 347895d commit cf5fbdf

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

src/PhpGenerator/Helpers.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public static function isIdentifier($value)
244244
/**
245245
* @return bool
246246
*/
247-
public static function isNamespace($value)
247+
public static function isNamespaceIdentifier($value)
248248
{
249249
return is_string($value) && preg_match('#^' . Helpers::PHP_IDENT . '(\\\\' . Helpers::PHP_IDENT . ')*\z#', $value);
250250
}

src/PhpGenerator/PhpNamespace.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class PhpNamespace
4747
*/
4848
public function __construct($name = NULL)
4949
{
50-
if ($name && !Helpers::isNamespace($name)) {
50+
if ($name && !Helpers::isNamespaceIdentifier($name)) {
5151
throw new Nette\InvalidArgumentException("Value '$name' is not valid name.");
5252
}
5353
$this->name = (string) $name;

tests/PhpGenerator/Helpers.isNamespace.phpt

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
3+
use Nette\PhpGenerator\Helpers;
4+
use Tester\Assert;
5+
6+
7+
require __DIR__ . '/../bootstrap.php';
8+
9+
10+
Assert::true(Helpers::isNamespaceIdentifier('Item'));
11+
Assert::true(Helpers::isNamespaceIdentifier("\x7F"));
12+
Assert::true(Helpers::isNamespaceIdentifier("\x7F\\\x7F"));
13+
Assert::false(Helpers::isNamespaceIdentifier('0Item'));
14+
Assert::true(Helpers::isNamespaceIdentifier('Item\Item'));
15+
Assert::false(Helpers::isNamespaceIdentifier('Item\\\\Item'));
16+
Assert::false(Helpers::isNamespaceIdentifier('\\Item'));
17+
Assert::false(Helpers::isNamespaceIdentifier('Item\\'));

0 commit comments

Comments
 (0)