[ACC-3464] fix(deprecations): PHP 8.2 ${var} & 8.4 implicit-nullable params (#648)

Makefile

@@ -282,8 +282,16 @@ php-scoper-dump-autoload:
 php-scoper-fix-autoload:
 	php fix-autoload.php
 
+# segmentio/analytics-php is a non-scoped (psr0) lib shipped as-is: rewrite the
+# deprecated "${var}" string interpolation (deprecated PHP 8.2, fatal PHP 9.0)
+# into "{$var}". Runs on the freshly installed vendor, before bundling.
+vendor-patch-segmentio:
+	@echo "patching segmentio interpolation deprecations (PHP 8.2+/9.0)..."
+	find ./vendor/segmentio/analytics-php/lib -type f -name '*.php' -exec \
+		sed -i -E 's/\$$\{([a-zA-Z_][a-zA-Z0-9_]*)\}/{$$\1}/g' {} \;
+
 #php-scoper: php-scoper-add-prefix php-scoper-update-prefix php-scoper-dump-autoload php-scoper-fix-autoload
-php-scoper: php-scoper-add-prefix php-scoper-dump-autoload php-scoper-fix-autoload
+php-scoper: php-scoper-add-prefix vendor-patch-segmentio php-scoper-dump-autoload php-scoper-fix-autoload
 
 ##########
 # BUNDLING

src/Account/Session/ShopSession.php

@@ -76,22 +76,22 @@ public function __construct(
     /**
      * @param bool $forceRefresh
      * @param bool $throw
-     * @param array|null $scope
-     * @param array|null $audience
+     * @param array $scope
+     * @param array $audience
      *
      * @return Token
      *
      * @throws RefreshTokenException
      */
-    public function getValidToken($forceRefresh = false, $throw = true, array $scope = null, array $audience = null)
+    public function getValidToken($forceRefresh = false, $throw = true, array $scope = [], array $audience = [])
     {
-        if ($scope === null) {
+        if (empty($scope)) {
             $scope = ($this->getStatusManager()->identityVerified() ? [
                 'shop.verified',
             ] : []);
         }
 
-        if ($audience === null) {
+        if (empty($audience)) {
             $audience = [
                 'store/' . $this->getStatusManager()->getCloudShopId(),
                 $this->tokenAudience,

src/Account/StatusManager.php

@@ -188,7 +188,7 @@ public function invalidateCache()
      *
      * @return bool
      */
-    public function cacheInvalidated(CachedShopStatus $cachedStatus = null)
+    public function cacheInvalidated($cachedStatus = null)
     {
         try {
             $cachedStatus = $cachedStatus ?: $this->getCachedStatus();
@@ -206,7 +206,7 @@ public function cacheInvalidated(CachedShopStatus $cachedStatus = null)
      *
      * @return bool
      */
-    public function cacheExpired(CachedShopStatus $cachedStatus = null, $cacheTtl = self::CACHE_TTL)
+    public function cacheExpired($cachedStatus = null, $cacheTtl = self::CACHE_TTL)
     {
         try {
             //$dateUpd = $this->getCacheDateUpd();

src/Adapter/Link.php

@@ -45,7 +45,7 @@ class Link
      */
     public function __construct(
         ShopContext $shopContext,
-        \Link $link = null
+        $link = null
     ) {
         if (null === $link) {
             $link = new \Link();

src/Repository/ConfigurationRepository.php

@@ -37,7 +37,7 @@ class ConfigurationRepository
      *
      * @throws \Exception
      */
-    public function __construct(Configuration $configuration = null)
+    public function __construct($configuration = null)
     {
         $this->configuration = $configuration;
     }