Merge branch '5.4' into 6.2

* 5.4:
  Fix deprecations on PHP 8.3
  [WebProfilerBundle] Fix error in case of 'Content-Type' set null in dev environment with no debug
  [Routing] Use vsprintf instead of sprintf + unpacking

Author: nicolas-grekas

Tests/Caster/FFICasterTest.php

@@ -40,7 +40,7 @@ public function testCastAnonymousStruct()
         FFI\CData<struct <anonymous>> size 4 align 4 {
           uint32_t x: 0
         }
-        PHP, \FFI::new('struct { uint32_t x; }'));
+        PHP, \FFI::cdef()->new('struct { uint32_t x; }'));
     }
 
     public function testCastNamedStruct()
@@ -49,7 +49,7 @@ public function testCastNamedStruct()
         FFI\CData<struct Example> size 4 align 4 {
           uint32_t x: 0
         }
-        PHP, \FFI::new('struct Example { uint32_t x; }'));
+        PHP, \FFI::cdef()->new('struct Example { uint32_t x; }'));
     }
 
     public function testCastAnonymousUnion()
@@ -59,7 +59,7 @@ public function testCastAnonymousUnion()
           uint32_t x: 0
           uint32_t y: 0
         }
-        PHP, \FFI::new('union { uint32_t x; uint32_t y; }'));
+        PHP, \FFI::cdef()->new('union { uint32_t x; uint32_t y; }'));
     }
 
     public function testCastNamedUnion()
@@ -69,7 +69,7 @@ public function testCastNamedUnion()
           uint32_t x: 0
           uint32_t y: 0
         }
-        PHP, \FFI::new('union Example { uint32_t x; uint32_t y; }'));
+        PHP, \FFI::cdef()->new('union Example { uint32_t x; uint32_t y; }'));
     }
 
     public function testCastAnonymousEnum()
@@ -78,7 +78,7 @@ public function testCastAnonymousEnum()
         FFI\CData<enum <anonymous>> size 4 align 4 {
           cdata: 0
         }
-        PHP, \FFI::new('enum { a, b }'));
+        PHP, \FFI::cdef()->new('enum { a, b }'));
     }
 
     public function testCastNamedEnum()
@@ -87,7 +87,7 @@ public function testCastNamedEnum()
         FFI\CData<enum Example> size 4 align 4 {
           cdata: 0
         }
-        PHP, \FFI::new('enum Example { a, b }'));
+        PHP, \FFI::cdef()->new('enum Example { a, b }'));
     }
 
     public static function scalarsDataProvider(): array
@@ -118,7 +118,7 @@ public function testCastScalar(string $type, string $value, int $size, int $alig
         FFI\CData<$type> size $size align $align {
           cdata: $value
         }
-        PHP, \FFI::new($type));
+        PHP, \FFI::cdef()->new($type));
     }
 
     public function testCastVoidFunction()
@@ -129,7 +129,7 @@ public function testCastVoidFunction()
         $abi callable(): void {
           returnType: FFI\CType<void> size 1 align 1 {}
         }
-        PHP, \FFI::new('void (*)(void)'));
+        PHP, \FFI::cdef()->new('void (*)(void)'));
     }
 
     public function testCastIntFunction()
@@ -140,7 +140,7 @@ public function testCastIntFunction()
         $abi callable(): uint64_t {
           returnType: FFI\CType<uint64_t> size 8 align 8 {}
         }
-        PHP, \FFI::new('unsigned long long (*)(void)'));
+        PHP, \FFI::cdef()->new('unsigned long long (*)(void)'));
     }
 
     public function testCastFunctionWithArguments()
@@ -151,14 +151,14 @@ public function testCastFunctionWithArguments()
         $abi callable(int32_t, char*): void {
           returnType: FFI\CType<void> size 1 align 1 {}
         }
-        PHP, \FFI::new('void (*)(int a, const char* b)'));
+        PHP, \FFI::cdef()->new('void (*)(int a, const char* b)'));
     }
 
     public function testCastNonCuttedPointerToChar()
     {
         $actualMessage = "Hello World!\0";
 
-        $string = \FFI::new('char[100]');
+        $string = \FFI::cdef()->new('char[100]');
         $pointer = \FFI::addr($string[0]);
         \FFI::memcpy($pointer, $actualMessage, \strlen($actualMessage));
 
@@ -180,7 +180,7 @@ public function testCastCuttedPointerToChar()
             .'World!Hello World!Hello World!Hello World!Hello World!Hello Wor'
             .'ld!Hello World!Hel';
 
-        $string = \FFI::new('char['.$actualLength.']');
+        $string = \FFI::cdef()->new('char['.$actualLength.']');
         $pointer = \FFI::addr($string[0]);
         \FFI::memcpy($pointer, $actualMessage, $actualLength);
 
@@ -207,13 +207,13 @@ public function testCastNonTrailingCharPointer()
         $actualMessage = 'Hello World!';
         $actualLength = \strlen($actualMessage);
 
-        $string = \FFI::new('char['.$actualLength.']');
+        $string = \FFI::cdef()->new('char['.$actualLength.']');
         $pointer = \FFI::addr($string[0]);
 
         \FFI::memcpy($pointer, $actualMessage, $actualLength);
 
         // Remove automatically addition of the trailing "\0" and remove trailing "\0"
-        $pointer = \FFI::cast('char*', \FFI::cast('void*', $pointer));
+        $pointer = \FFI::cdef()->cast('char*', \FFI::cast('void*', $pointer));
         $pointer[$actualLength] = "\x01";
 
         $this->assertDumpMatchesFormat(<<<PHP
@@ -328,24 +328,24 @@ public function testCastPointerToNonEmptyScalars()
         CPP);
 
         // Create values
-        $int = \FFI::new('int64_t');
+        $int = \FFI::cdef()->new('int64_t');
         $int->cdata = 42;
-        $float = \FFI::new('float');
+        $float = \FFI::cdef()->new('float');
         $float->cdata = 42.0;
-        $double = \FFI::new('double');
+        $double = \FFI::cdef()->new('double');
         $double->cdata = 42.2;
-        $bool = \FFI::new('bool');
+        $bool = \FFI::cdef()->new('bool');
         $bool->cdata = true;
 
         // Fill struct
         $struct = $ffi->new('Example');
-        $struct->a = \FFI::addr(\FFI::cast('int8_t', $int));
-        $struct->b = \FFI::addr(\FFI::cast('uint8_t', $int));
-        $struct->c = \FFI::addr(\FFI::cast('int64_t', $int));
-        $struct->d = \FFI::addr(\FFI::cast('uint64_t', $int));
-        $struct->e = \FFI::addr(\FFI::cast('float', $float));
-        $struct->f = \FFI::addr(\FFI::cast('double', $double));
-        $struct->g = \FFI::addr(\FFI::cast('bool', $bool));
+        $struct->a = \FFI::addr(\FFI::cdef()->cast('int8_t', $int));
+        $struct->b = \FFI::addr(\FFI::cdef()->cast('uint8_t', $int));
+        $struct->c = \FFI::addr(\FFI::cdef()->cast('int64_t', $int));
+        $struct->d = \FFI::addr(\FFI::cdef()->cast('uint64_t', $int));
+        $struct->e = \FFI::addr(\FFI::cdef()->cast('float', $float));
+        $struct->f = \FFI::addr(\FFI::cdef()->cast('double', $double));
+        $struct->g = \FFI::addr(\FFI::cdef()->cast('bool', $bool));
 
         $this->assertDumpEquals(<<<'OUTPUT'
         FFI\CData<struct <anonymous>> size 56 align 8 {
@@ -441,7 +441,7 @@ public function testCastComplexType()
         $var->func = (static fn (object $p) => 42);
 
         $abi = \PHP_OS_FAMILY === 'Windows' ? '[cdecl]' : '[fastcall]';
-        $longSize = \FFI::type('long')->getSize();
+        $longSize = \FFI::cdef()->type('long')->getSize();
         $longType = 8 === $longSize ? 'int64_t' : 'int32_t';
         $structSize = 56 + $longSize * 2;