Alex Pott
--- a/core/lib/Drupal/Core/DependencyInjection/DeprecatedServicePropertyTrait.php
+++ b/core/lib/Drupal/Core/DependencyInjection/DeprecatedServicePropertyTrait.php
    }

    if (isset($this->deprecatedProperties[$name])) {
-      $service_name = $this->deprecatedProperties[$name];
-      $class_name = static::class;
+      if (is_string($this->deprecatedProperties[$name])) {
+        $service_name = $this->deprecatedProperties[$name];
+        $class_name = static::class;
+        $next_major_version = intval(ceil((float) \Drupal::VERSION)) . '.0.0';
-        $next_major_version = intval(ceil((float) \Drupal::VERSION)) . '.0.0';
+        $next_major_version = intval(\Drupal::VERSION) + 1 . '.0.0';