Skip to content

Commit bb42f37

Browse files
authored
Merge branch 'main' into OAuth2
2 parents 6668603 + a1f0cf1 commit bb42f37

File tree

5,247 files changed

+7562
-1789
lines changed

Some content is hidden

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

5,247 files changed

+7562
-1789
lines changed

.phpstan.dist.baseline.neon

Lines changed: 13 additions & 1183 deletions
Large diffs are not rendered by default.

.rector.php

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,23 @@
3939
DeadCode\ClassMethod\RemoveUselessReturnTagRector::class,
4040
DeadCode\Property\RemoveUselessVarTagRector::class,
4141
TypeDeclaration\ClassMethod\ReturnNeverTypeRector::class,
42-
]);
42+
])
43+
->withPreparedSets(
44+
false,
45+
false,
46+
false,
47+
false,
48+
false,
49+
false,
50+
false,
51+
false,
52+
false,
53+
false,
54+
false,
55+
true,
56+
false,
57+
false,
58+
false,
59+
false,
60+
true,
61+
);

app/code/core/Mage/Admin/Helper/Block.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* OpenMage
45
*

app/code/core/Mage/Admin/Helper/Data.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* OpenMage
45
*

app/code/core/Mage/Admin/Helper/Rules/Fallback.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* OpenMage
45
*

app/code/core/Mage/Admin/Helper/Variable.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* OpenMage
45
*

app/code/core/Mage/Admin/Model/Acl.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* OpenMage
45
*

app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* OpenMage
45
*

app/code/core/Mage/Admin/Model/Acl/Assert/Time.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* OpenMage
45
*

app/code/core/Mage/Admin/Model/Acl/Resource.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* OpenMage
45
*

0 commit comments

Comments
 (0)