IBX-5827: Replaced deprecated string interpolation (PHP 8.2+)

ezsystems · Oct 3, 2023 · b65e02d · b65e02d
1 parent c225702
commit b65e02d
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/eZ/Bundle/EzPublishCoreBundle/Features/Context/UserContext.php b/eZ/Bundle/EzPublishCoreBundle/Features/Context/UserContext.php
@@ -544,7 +544,7 @@ public function assertUserWithNameExistsWithFields($username, TableNode $table)
      */
     private function findNonExistingUserEmail($username = 'User')
     {
-        $email = "${username}@ez.no";
+        $email = "{$username}@ez.no";
         if ($this->checkUserExistenceByEmail($email)) {
             return $email;
         }

diff --git a/eZ/Publish/API/Repository/Tests/BaseTest.php b/eZ/Publish/API/Repository/Tests/BaseTest.php
@@ -171,7 +171,7 @@ protected function getSetupFactory(): SetupFactory
         if (null === $this->setupFactory) {
             if (false === ($setupClass = getenv('setupFactory'))) {
                 $setupClass = LegacySetupFactory::class;
-                putenv("setupFactory=${setupClass}");
+                putenv("setupFactory={$setupClass}");
             }
 
             if (false === getenv('fixtureDir')) {

diff --git a/eZ/Publish/API/Repository/Tests/ContentTypeServiceTest.php b/eZ/Publish/API/Repository/Tests/ContentTypeServiceTest.php
@@ -841,7 +841,7 @@ public function testCreateContentTypeStructValues(array $data)
                     $this->assertEquals(
                         $typeCreate->$propertyName,
                         $contentType->$propertyName,
-                        "Did not assert that property '${propertyName}' is equal on struct and resulting value object"
+                        "Did not assert that property '{$propertyName}' is equal on struct and resulting value object"
                     );
                     break;
             }

diff --git a/eZ/Publish/Core/FieldType/GatewayBasedStorage.php b/eZ/Publish/Core/FieldType/GatewayBasedStorage.php
@@ -87,7 +87,7 @@ protected function getGateway(array $context)
         );
 
         if (!isset($this->gateways[$context['identifier']])) {
-            throw new \OutOfBoundsException("No gateway for ${context['identifier']} available.");
+            throw new \OutOfBoundsException("No gateway for {$context['identifier']} available.");
         }
 
         $gateway = $this->gateways[$context['identifier']];

diff --git a/eZ/Publish/Core/Persistence/Cache/AbstractHandler.php b/eZ/Publish/Core/Persistence/Cache/AbstractHandler.php
@@ -66,11 +66,11 @@ public function __construct(
     /**
      * Helper for getting multiple cache items in one call and do the id extraction for you.
      *
-     * Cache items must be stored with a key in the following format "${keyPrefix}${id}", like "ez-content-info-${id}",
+     * Cache items must be stored with a key in the following format "{$keyPrefix}{$id}", like "ez-content-info-{$id}",
      * in order for this method to be able to prefix key on id's and also extract key prefix afterwards.
      *
      * It also optionally supports a key suffixs, for use on a variable argument that affects all lookups,
-     * like translations, i.e. "ez-content-${id}-${translationKey}" where $keySuffixes = [$id => "-${translationKey}"].
+     * like translations, i.e. "ez-content-{$id}-{$translationKey}" where $keySuffixes = [$id => "-{$translationKey}"].
      *
      * @param array $ids
      * @param string $keyPrefix E.g "ez-content-"

diff --git a/eZ/Publish/Core/Persistence/Cache/AbstractInMemoryHandler.php b/eZ/Publish/Core/Persistence/Cache/AbstractInMemoryHandler.php
@@ -183,7 +183,7 @@ final protected function getListCacheValue(
      * Load items from in-memory cache, symfony cache pool or backend in that order.
      * If not cached the returned objects will be placed in cache.
      *
-     * Cache items must be stored with a key in the following format "${keyPrefix}${id}", like "ez-content-info-${id}",
+     * Cache items must be stored with a key in the following format "{$keyPrefix}{$id}", like "ez-content-info-{$id}",
      * in order for this method to be able to prefix key on id's and also extract key prefix afterwards.
      *
      * @param array $ids

diff --git a/eZ/Publish/Core/Persistence/Cache/ContentHandler.php b/eZ/Publish/Core/Persistence/Cache/ContentHandler.php
@@ -128,7 +128,7 @@ public function copy($contentId, $versionNo = null, $newOwnerId = null)
      */
     public function load($contentId, $versionNo = null, array $translations = null)
     {
-        $keySuffix = $versionNo ? "-${versionNo}-" : '-';
+        $keySuffix = $versionNo ? "-{$versionNo}-" : '-';
         $keySuffix .= empty($translations) ? self::ALL_TRANSLATIONS_KEY : implode('|', $translations);
 
         return $this->getCacheValue(
@@ -235,7 +235,7 @@ function () use ($remoteId) {
      */
     public function loadVersionInfo($contentId, $versionNo = null)
     {
-        $keySuffix = $versionNo ? "-${versionNo}" : '';
+        $keySuffix = $versionNo ? "-{$versionNo}" : '';
         $cacheItem = $this->cache->getItem(
             $this->cacheIdentifierGenerator->generateKey(
                 self::CONTENT_VERSION_INFO_IDENTIFIER,