Skip to content

Commit d7ef536

Browse files
committed
Merge remote-tracking branch 'origin/2.2.x' into 2.3.x
# Conflicts: # src/Turbo/TurboExtensionEnabler.php
2 parents a23e7a6 + 947fe92 commit d7ef536

83 files changed

Lines changed: 1447 additions & 47 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/e2e-tests.yml‎

Lines changed: 244 additions & 1 deletion
Large diffs are not rendered by default.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/vendor
2+
/composer.lock
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- other/Dep.php
2+
+++ other/Dep.php
3+
@@ -7,6 +7,6 @@
4+
5+
public const EXISTING = 'existing';
6+
7+
- public const CON = 1;
8+
+ public const = 1;
9+
10+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name": "phpstan/result-cache-autoloaded-constant-e2e",
3+
"autoload": {
4+
"psr-4": {
5+
"ResultCacheE2EAutoloadedConstant\\": ["src/", "other/"]
6+
}
7+
}
8+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- other/Dep.php
2+
+++ other/Dep.php
3+
@@ -7,6 +7,6 @@
4+
5+
public const EXISTING = 'existing';
6+
7+
- public const CON = 1;
8+
+ public const EXISTING = 1;
9+
10+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?php
2+
3+
namespace ResultCacheE2EAutoloadedConstant;
4+
5+
class Dep
6+
{
7+
8+
public const EXISTING = 'existing';
9+
10+
public const CON = 1;
11+
12+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
parameters:
2+
level: 8
3+
tmpDir: tmp
4+
paths:
5+
- src
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- other/Dep.php
2+
+++ other/Dep.php
3+
@@ -7,6 +7,6 @@
4+
5+
public const EXISTING = 'existing';
6+
7+
- public const CON = 1;
8+
+ public const RENAMED = 1;
9+
10+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
3+
namespace ResultCacheE2EAutoloadedConstant;
4+
5+
class Foo
6+
{
7+
8+
public function doFoo(): void
9+
{
10+
\PHPStan\dumpType(Dep::CON);
11+
}
12+
13+
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.*

0 commit comments

Comments
 (0)