Fixing TypeError and deprecated message (#778)

balagan73 · web-flow · commit 928492b227b8 · 2024-08-07T15:45:40.000-05:00
* Fixed TypeError.

* Use isset, empty() not allowed.

* Fixing deprecated message.
diff --git a/src/Drupal/ServiceMap.php b/src/Drupal/ServiceMap.php
@@ -55,6 +55,13 @@ public function setDrupalServices(array $drupalServices): void
             );
             $deprecated = $serviceDefinition['deprecated'] ?? null;
             if ($deprecated) {
+                if (is_array($deprecated) && isset($deprecated['message'])) {
+                    $deprecated = $deprecated['message'];
+                }
+                $deprecated = str_replace('%service_id%', $serviceId, $deprecated);
+                if (isset($serviceDefinition['alias'])) {
+                    $deprecated = str_replace('%alias_id%', $serviceDefinition['alias'], $deprecated);
+                }
                 self::$services[$serviceId]->setDeprecated(true, $deprecated);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,13 @@ public function setDrupalServices(array $drupalServices): void`
`55`	`55`	`);`
`56`	`56`	`$deprecated = $serviceDefinition['deprecated'] ?? null;`
`57`	`57`	`if ($deprecated) {`
	`58`	`+ if (is_array($deprecated) && isset($deprecated['message'])) {`
	`59`	`+ $deprecated = $deprecated['message'];`
	`60`	`+ }`
	`61`	`+ $deprecated = str_replace('%service_id%', $serviceId, $deprecated);`
	`62`	`+ if (isset($serviceDefinition['alias'])) {`
	`63`	`+ $deprecated = str_replace('%alias_id%', $serviceDefinition['alias'], $deprecated);`
	`64`	`+ }`
`58`	`65`	`self::$services[$serviceId]->setDeprecated(true, $deprecated);`
`59`	`66`	`}`
`60`	`67`	`}`