Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit a296611f599d · 2022-03-02T13:58:14.000+01:00
* 5.4:
  Fix merge
  [HttpKernel] Guard against bad profile data
  Fix deprecations on PHP 8.2
diff --git a/Tests/Fixtures/includes/classes.php b/Tests/Fixtures/includes/classes.php
@@ -56,6 +56,7 @@ public static function configureStatic1()
 
 class BarUserClass
 {
+    public $foo;
     public $bar;
 
     public function __construct(BarClass $bar)
diff --git a/Tests/Fixtures/includes/foo.php b/Tests/Fixtures/includes/foo.php
@@ -4,6 +4,7 @@
 
 class FooClass
 {
+    public $qux;
     public $foo;
     public $moo;
 

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ public static function configureStatic1()`
`56`	`56`
`57`	`57`	`class BarUserClass`
`58`	`58`	`{`
	`59`	`+ public $foo;`
`59`	`60`	`public $bar;`
`60`	`61`
`61`	`62`	`public function __construct(BarClass $bar)`