Merge remote-tracking branch 'origin/main' into Make_Php_5.3_Compatible

jack-worman · jack-worman · commit 055c4def0cf5 · 2022-01-19T08:21:47.000-06:00
# Conflicts:
#	.gitignore
#	Php81.php
#	README.md
#	bootstrap.php
#	composer.json
diff --git a/Resources/stubs/ReturnTypeWillChange.php b/Resources/stubs/ReturnTypeWillChange.php
@@ -1,7 +1,7 @@
 <?php
 
 if (\PHP_VERSION_ID < 80100) {
-    #[Attribute(Attribute::TARGET_METHOD)]
+    #[\Attribute(\Attribute::TARGET_METHOD)]
     final class ReturnTypeWillChange
     {
         public function __construct()

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`if (\PHP_VERSION_ID < 80100) {`
`4`		`- #[Attribute(Attribute::TARGET_METHOD)]`
	`4`	`+ #[\Attribute(\Attribute::TARGET_METHOD)]`
`5`	`5`	`final class ReturnTypeWillChange`
`6`	`6`	`{`
`7`	`7`	`public function __construct()`