Merge branch '4.x-dev' into 5.x-dev

Author: sgiehl

CachedEntry.php

@@ -39,11 +39,13 @@ public function __construct(string $userAgent, $clientHints, array $values)
         // We use some special parsers, which use the cached user agent result and parses it again using client hints
         if (!empty($clientHints) && $values['client']['type'] === 'browser') {
             $browserParser = new CachedBrowserParser($userAgent, $clientHints);
+            $browserParser->setCachedResult($this->client);
             $this->client = $browserParser->parse();
         }
 
         if (!empty($clientHints)) {
             $osParser = new CachedOperatingSystemParser($userAgent, $clientHints);
+            $osParser->setCachedResult($this->os);
             $this->os = $osParser->parse();
         }
     }

lang/sq.json

@@ -1,5 +1,5 @@
 {
     "DeviceDetectorCache": {
-        "PluginDescription": "E bën më të shpejtë gjurmimin, duke pikasur prej një fshehtine shumë pajisje, sisteme operativë, robotë dhe shfletues."
+        "PluginDescription": "E bën më të shpejtë ndjekjen, duke pikasur prej një fshehtine shumë pajisje, sisteme operativë, robotë dhe shfletues."
     }
 }

tests/Unit/DeviceDetectorCacheFactoryTest.php

@@ -122,8 +122,9 @@ public function testGetInstanceFromCacheWithClientHints()
             'name' => 'Microsoft Edge',
             'version' => '98.0',
             'short_name' => 'PS',
-            'engine' => 'Blink',
-            'engine_version' => '97.0.4692.71',
+            // empty because cached result doesn't contain it and engine won't be detected through client hints only
+            'engine' => '',
+            'engine_version' => '',
             'family' => 'Internet Explorer',
         ];