Skip to content

Commit 70d9e16

Browse files
Merge remote-tracking branch 'upstream/2.15.x' into 1.x
* upstream/2.15.x: Make property private in final class Update actions/checkout action to v3 Update actions/cache action to v3 Enable installation of PHPCS plugins that setup CS rulesets Add renovate.json Remove codelicia/xulieta as a dev dependencies Raise awareness of current Russia-Ukraine situation, targeting Russian 🇷🇺 readers
2 parents a527c9d + 04e124d commit 70d9e16

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/phpunit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
steps:
3232
- name: "Checkout"
33-
uses: "actions/checkout@v2"
33+
uses: "actions/checkout@v3"
3434

3535
- name: "Install PHP"
3636
uses: "shivammathur/setup-php@v2"
@@ -41,7 +41,7 @@ jobs:
4141
tools: composer:v2, cs2pr
4242

4343
- name: "Cache dependencies"
44-
uses: "actions/cache@v2"
44+
uses: "actions/cache@v3"
4545
with:
4646
path: |
4747
~/.composer/cache

src/ProxyManager/Inflector/ClassNameInflector.php

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

1515
final class ClassNameInflector implements ClassNameInflectorInterface
1616
{
17-
protected $proxyNamespace;
17+
private $proxyNamespace;
1818
/** @var int @TODO annotation still needed for phpstan to understand this */
1919
private $proxyMarkerLength;
2020
private $proxyMarker;

0 commit comments

Comments
 (0)