Merge branch '4.4' into 5.0

* 4.4: Fix failures on PHP 7.4 Fix tests [Console] fix typos [Console] fix tests

Author: nicolas-grekas

src/Symfony/Component/Config/Resource/ClassExistenceResource.php

@@ -72,7 +72,7 @@ public function isFresh(int $timestamp): bool
  spl_autoload_register(__CLASS__.'::throwOnRequiredClass');
  }
  $autoloadedClass = self::$autoloadedClass;
- self::$autoloadedClass = $this->resource;
+ self::$autoloadedClass = ltrim($this->resource, '\\');
 
  try {
  $exists = class_exists($this->resource) || interface_exists($this->resource, false) || trait_exists($this->resource, false);
@@ -153,7 +153,7 @@ public static function throwOnRequiredClass(string $class, \Exception $previous
  throw $e;
  }
 
- $trace = $e->getTrace();
+ $trace = debug_backtrace();
  $autoloadFrame = [
  'function' => 'spl_autoload_call',
  'args' => [$class],

src/Symfony/Component/Console/Helper/QuestionHelper.php

@@ -230,7 +230,7 @@ private function autocomplete(OutputInterface $output, Question $question, $inpu
  } elseif ("\177" === $c) { // Backspace Character
  if (0 === $numMatches && 0 !== $i) {
  --$i;
- $fullChoice = self::substr($fullChoice, 0, -1);
+ $fullChoice = self::substr($fullChoice, 0, $i);
  // Move cursor backwards
  $output->write("\033[1D");
  }
@@ -286,6 +286,8 @@ function ($match) use ($ret) {
  $output->write($c);
  break;
  }
+
+ $numMatches = 0;
  }
 
  continue;

src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php

@@ -194,7 +194,7 @@ public function testAskWithAutocomplete()
  // <DOWN ARROW><NEWLINE>
  // S<BACKSPACE><BACKSPACE><DOWN ARROW><DOWN ARROW><NEWLINE>
  // F00<BACKSPACE><BACKSPACE>oo<TAB><NEWLINE>
- // F⭐<TAB><BACKSPACE><BACKSPACE>⭐<TAB><NEWLINE>
+ // F⭐<TAB><BACKSPACE><BACKSPACE>⭐<TAB><NEWLINE>
  $inputStream = $this->getInputStream("Acm\nAc\177\177s\tTest\n\n\033[A\033[A\033[A\n\033[A\033[A\033[A\033[A\033[A\033[A\033[A\tTest\n\033[B\nS\177\177\033[B\033[B\nF00\177\177oo\t\nF⭐\t\177\177⭐\t\n");
 
  $dialog = new QuestionHelper();
@@ -774,7 +774,7 @@ public function testTraversableMultiselectAutocomplete()
  // F00<BACKSPACE><BACKSPACE>o<TAB>,A<DOWN ARROW>,<SPACE>SecurityBundle<NEWLINE>
  // Acme<TAB>,<SPACE>As<TAB><29x BACKSPACE>S<TAB><NEWLINE>
  // Ac<TAB>,As<TAB><3x BACKSPACE>d<TAB><NEWLINE>
- $inputStream = $this->getInputStream("\nF\t\nA\033[A\033[A\033[A\t,F\t\nF00\177\177o\t,A\033[B\t, SecurityBundle\nSecurityBundle\nAcme\t, As\t\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177S\t\nAc\t,As\t\177\177\177d\t\n");
+ $inputStream = $this->getInputStream("\nF\t\nA\033[A\033[A\033[A\t,F\t\nF00\177\177o\t,A\033[B\t, SecurityBundle\nAcme\t, As\t\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177\177S\t\nAc\t,As\t\177\177\177d\t\n");
 
  $dialog = new QuestionHelper();
  $helperSet = new HelperSet([new FormatterHelper()]);

src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_bindings.yml

@@ -12,7 +12,7 @@ services:
  bind:
  Symfony\Component\DependencyInjection\Tests\Fixtures\BarInterface: '@Symfony\Component\DependencyInjection\Tests\Fixtures\Bar'
  $foo: [ ~ ]
- iterable $baz: !tagged_iterator bar
+ iterable $baz: !tagged_iterator { tag: bar }
 
  Symfony\Component\DependencyInjection\Tests\Fixtures\Bar:
  factory: [ ~, 'create' ]

src/Symfony/Component/Messenger/Tests/Command/FailedMessagesShowCommandTest.php

@@ -113,7 +113,7 @@ public function testReceiverShouldBeListable()
  public function testListMessages()
  {
  $sentToFailureStamp = new SentToFailureTransportStamp('async');
- $redeliveryStamp = new RedeliveryStamp(0, 'failure_receiver', 'Things are bad!');
+ $redeliveryStamp = new RedeliveryStamp(0, 'Things are bad!');
  $envelope = new Envelope(new \stdClass(), [
  new TransportMessageIdStamp(15),
  $sentToFailureStamp,
@@ -158,7 +158,7 @@ public function testListMessagesReturnsPaginatedMessages()
  $envelope = new Envelope(new \stdClass(), [
  new TransportMessageIdStamp(15),
  $sentToFailureStamp,
- new RedeliveryStamp(0, 'failure_receiver', 'Things are bad!'),
+ new RedeliveryStamp(0, 'Things are bad!'),
  ]);
  $receiver = $this->createMock(ListableReceiverInterface::class);
  $receiver->expects($this->once())->method('all')->with()->willReturn([$envelope]);

src/Symfony/Component/PropertyAccess/PropertyAccessor.php

@@ -188,13 +188,14 @@ private static function throwInvalidArgumentException(string $message, array $tr
  return;
  }
 
- if (isset($trace[$i]['file']) && __FILE__ === $trace[$i]['file'] && \array_key_exists(0, $trace[$i]['args'])) {
+ if (isset($trace[$i]['file']) && __FILE__ === $trace[$i]['file']) {
  $pos = strpos($message, $delim = 'must be of the type ') ?: (strpos($message, $delim = 'must be an instance of ') ?: strpos($message, $delim = 'must implement interface '));
  $pos += \strlen($delim);
- $type = $trace[$i]['args'][0];
- $type = \is_object($type) ? \get_class($type) : \gettype($type);
+ $j = strpos($message, ',', $pos);
+ $type = substr($message, 2 + $j, strpos($message, ' given', $j) - $j - 2);
+ $message = substr($message, $pos, $j - $pos);
 
- throw new InvalidArgumentException(sprintf('Expected argument of type "%s", "%s" given at property path "%s".', substr($message, $pos, strpos($message, ',', $pos) - $pos), $type, $propertyPath));
+ throw new InvalidArgumentException(sprintf('Expected argument of type "%s", "%s" given at property path "%s".', $message, 'NULL' === $type ? 'null' : $type, $propertyPath));
  }
  }
 

src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php

@@ -546,7 +546,7 @@ public function testThrowTypeError()
  public function testThrowTypeErrorWithNullArgument()
  {
  $this->expectException('Symfony\Component\PropertyAccess\Exception\InvalidArgumentException');
- $this->expectExceptionMessage('Expected argument of type "DateTime", "NULL" given');
+ $this->expectExceptionMessage('Expected argument of type "DateTime", "null" given');
  $object = new TypeHinted();
 
  $this->propertyAccessor->setValue($object, 'date', null);