Skip to content

Commit b854d07

Browse files
committed
Move Regex classes into PHPStan\Type\Regex namespace
1 parent dff5021 commit b854d07

11 files changed

+15
-11
lines changed

conf/config.neon

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,10 +1506,10 @@ services:
15061506
class: PHPStan\Type\Php\RegexArrayShapeMatcher
15071507

15081508
-
1509-
class: PHPStan\Type\Php\RegexGroupParser
1509+
class: PHPStan\Type\Regex\RegexGroupParser
15101510

15111511
-
1512-
class: PHPStan\Type\Php\RegexExpressionHelper
1512+
class: PHPStan\Type\Regex\RegexExpressionHelper
15131513

15141514
-
15151515
class: PHPStan\Type\Php\ReflectionClassConstructorThrowTypeExtension

src/Rules/Regexp/RegularExpressionPatternRule.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use PHPStan\Analyser\Scope;
1010
use PHPStan\Rules\Rule;
1111
use PHPStan\Rules\RuleErrorBuilder;
12-
use PHPStan\Type\Php\RegexExpressionHelper;
12+
use PHPStan\Type\Regex\RegexExpressionHelper;
1313
use function in_array;
1414
use function sprintf;
1515
use function str_starts_with;

src/Rules/Regexp/RegularExpressionQuotingRule.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use PHPStan\Rules\Rule;
1616
use PHPStan\Rules\RuleErrorBuilder;
1717
use PHPStan\ShouldNotHappenException;
18-
use PHPStan\Type\Php\RegexExpressionHelper;
18+
use PHPStan\Type\Regex\RegexExpressionHelper;
1919
use function array_filter;
2020
use function array_merge;
2121
use function array_values;

src/Type/Php/RegexArrayShapeMatcher.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
use PHPStan\Type\Constant\ConstantStringType;
1515
use PHPStan\Type\IntegerRangeType;
1616
use PHPStan\Type\IntegerType;
17+
use PHPStan\Type\Regex\RegexAlternation;
18+
use PHPStan\Type\Regex\RegexCapturingGroup;
19+
use PHPStan\Type\Regex\RegexExpressionHelper;
20+
use PHPStan\Type\Regex\RegexGroupParser;
1721
use PHPStan\Type\StringType;
1822
use PHPStan\Type\Type;
1923
use PHPStan\Type\TypeCombinator;

src/Type/Php/RegexAlternation.php renamed to src/Type/Regex/RegexAlternation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php declare(strict_types = 1);
22

3-
namespace PHPStan\Type\Php;
3+
namespace PHPStan\Type\Regex;
44

55
use function array_key_exists;
66

src/Type/Php/RegexCapturingGroup.php renamed to src/Type/Regex/RegexCapturingGroup.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php declare(strict_types = 1);
22

3-
namespace PHPStan\Type\Php;
3+
namespace PHPStan\Type\Regex;
44

55
use PHPStan\Type\Type;
66

src/Type/Php/RegexExpressionHelper.php renamed to src/Type/Regex/RegexExpressionHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php declare(strict_types = 1);
22

3-
namespace PHPStan\Type\Php;
3+
namespace PHPStan\Type\Regex;
44

55
use PhpParser\Node\Expr;
66
use PhpParser\Node\Expr\BinaryOp\Concat;

src/Type/Php/RegexGroupParser.php renamed to src/Type/Regex/RegexGroupParser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php declare(strict_types = 1);
22

3-
namespace PHPStan\Type\Php;
3+
namespace PHPStan\Type\Regex;
44

55
use Hoa\Compiler\Llk\Llk;
66
use Hoa\Compiler\Llk\Parser;

src/Type/Php/RegexNonCapturingGroup.php renamed to src/Type/Regex/RegexNonCapturingGroup.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php declare(strict_types = 1);
22

3-
namespace PHPStan\Type\Php;
3+
namespace PHPStan\Type\Regex;
44

55
class RegexNonCapturingGroup
66
{

tests/PHPStan/Rules/Regexp/RegularExpressionPatternRuleTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use PHPStan\Rules\Rule;
66
use PHPStan\Testing\RuleTestCase;
7-
use PHPStan\Type\Php\RegexExpressionHelper;
7+
use PHPStan\Type\Regex\RegexExpressionHelper;
88
use function sprintf;
99
use const PHP_VERSION_ID;
1010

0 commit comments

Comments
 (0)