Merge branch 'master' into iterable

# Conflicts:
#	src/Container.php
#	tests/Unit/ContainerTest.php

src/Container.php

@@ -7,6 +7,8 @@
 use Closure;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
+use Psr\Container\NotFoundExceptionInterface;
+use Throwable;
 use Traversable;
 use Yiisoft\Definitions\ArrayDefinition;
 use Yiisoft\Definitions\DefinitionStorage;
@@ -397,15 +399,15 @@ private function setTags(iterable $tags): void
  throw new InvalidConfigException(
  sprintf(
  'Invalid tags configuration: tag should be string, %s given.',
- $this->getVariableType($tag)
+ get_debug_type($services)
  )
  );
  }
  if (!is_iterable($services)) {
  throw new InvalidConfigException(
  sprintf(
  'Invalid tags configuration: tag should be either iterable or array of service IDs, %s given.',
- $this->getVariableType($services)
+ get_debug_type($services)
  )
  );
  }

tests/Unit/ContainerTest.php

@@ -1944,7 +1944,7 @@ public function testNonArrayTags(): void
 
  $this->expectException(InvalidConfigException::class);
  $this->expectExceptionMessage(
- 'Invalid definition: tags should be either iterable or array of strings, integer given.'
+ 'Invalid definition: tags should be either iterable or array of strings, string given.'
  );
  new Container($config);
  }
@@ -1970,7 +1970,7 @@ public function dataInvalidTags(): array
  {
  return [
  [
- 'Invalid tags configuration: tag should be string, integer given.',
+ '/^Invalid tags configuration: tag should be string, 42 given\.$/',
  [42 => [EngineMarkTwo::class]],
  ],
  [