Merge branch '2.3.0-qwerty-perf' of github.com:magento-performance/magento2ce into 2.3.0-qwerty-perf

Author: melnikovi

app/code/Magento/Config/App/Config/Type/System.php

@@ -74,7 +74,7 @@ class System implements ConfigTypeInterface
     /**
      * @var \Magento\Framework\Filter\Encrypt\AdapterInterface
      */
-    private $encriptFilter;
+    private $encryptorFilter;
 
     /**
      * @param ConfigSourceInterface $source
@@ -108,7 +108,7 @@ public function __construct(
         $this->serializer = $serializer;
         $this->configType = $configType;
         $this->reader = $reader ?: ObjectManager::getInstance()->get(Reader::class);
-        $this->encriptFilter = ObjectManager::getInstance()->get(\Magento\Framework\Encryption\Encryptor::class);
+        $this->encryptorFilter = ObjectManager::getInstance()->get(\Magento\Framework\Encryption\Encryptor::class);
     }
 
     /**
@@ -198,7 +198,7 @@ private function loadAllData()
         if ($cachedData === false) {
             $data = $this->readData();
         } else {
-            $data = $this->serializer->unserialize($this->encriptFilter->decrypt($cachedData));
+            $data = $this->serializer->unserialize($this->encryptorFilter->decrypt($cachedData));
         }
 
         return $data;
@@ -218,7 +218,7 @@ private function loadDefaultScopeData($scopeType)
             $data = $this->readData();
             $this->cacheData($data);
         } else {
-            $data = [$scopeType => $this->serializer->unserialize($this->encriptFilter->decrypt($cachedData))];
+            $data = [$scopeType => $this->serializer->unserialize($this->encryptorFilter->decrypt($cachedData))];
         }
 
         return $data;
@@ -239,7 +239,7 @@ private function loadScopeData($scopeType, $scopeId)
             if ($this->availableDataScopes === null) {
                 $cachedScopeData = $this->cache->load($this->configType . '_scopes');
                 if ($cachedScopeData !== false) {
-                    $serializedCachedData = $this->encriptFilter->decrypt($cachedScopeData);
+                    $serializedCachedData = $this->encryptorFilter->decrypt($cachedScopeData);
                     $this->availableDataScopes = $this->serializer->unserialize($serializedCachedData);
                 }
             }
@@ -249,7 +249,7 @@ private function loadScopeData($scopeType, $scopeId)
             $data = $this->readData();
             $this->cacheData($data);
         } else {
-            $serializedCachedData = $this->encriptFilter->decrypt($cachedData);
+            $serializedCachedData = $this->encryptorFilter->decrypt($cachedData);
             $data = [$scopeType => [$scopeId => $this->serializer->unserialize($serializedCachedData)]];
         }
 
@@ -267,12 +267,12 @@ private function loadScopeData($scopeType, $scopeId)
     private function cacheData(array $data)
     {
         $this->cache->save(
-            $this->encriptFilter->encryptWithFastestAlgorithm($this->serializer->serialize($data)),
+            $this->encryptorFilter->encryptWithFastestAlgorithm($this->serializer->serialize($data)),
             $this->configType,
             [self::CACHE_TAG]
         );
         $this->cache->save(
-            $this->encriptFilter->encryptWithFastestAlgorithm($this->serializer->serialize($data['default'])),
+            $this->encryptorFilter->encryptWithFastestAlgorithm($this->serializer->serialize($data['default'])),
             $this->configType . '_default',
             [self::CACHE_TAG]
         );
@@ -281,14 +281,14 @@ private function cacheData(array $data)
             foreach ($data[$curScopeType] ?? [] as $curScopeId => $curScopeData) {
                 $scopes[$curScopeType][$curScopeId] = 1;
                 $this->cache->save(
-                    $this->encriptFilter->encryptWithFastestAlgorithm($this->serializer->serialize($curScopeData)),
+                    $this->encryptorFilter->encryptWithFastestAlgorithm($this->serializer->serialize($curScopeData)),
                     $this->configType . '_' . $curScopeType . '_' . $curScopeId,
                     [self::CACHE_TAG]
                 );
             }
         }
         $this->cache->save(
-            $this->encriptFilter->encryptWithFastestAlgorithm($this->serializer->serialize($scopes)),
+            $this->encryptorFilter->encryptWithFastestAlgorithm($this->serializer->serialize($scopes)),
             $this->configType . '_scopes',
             [self::CACHE_TAG]
         );

dev/tests/integration/testsuite/Magento/EncryptionKey/Setup/Patch/Data/SodiumChachaPatchTest.php

@@ -93,19 +93,6 @@ private function legacyEncrypt(string $data): string
         @mcrypt_module_close($handle);
         // @codingStandardsIgnoreEnd
 
-        return '0:' . $this->getCipherVersion() . ':' . base64_encode($encrpted);
-    }
-
-    /**
-     * Get cipher version
-     *
-     * @return int
-     */
-    private function getCipherVersion()
-    {
-        if (extension_loaded('sodium')) {
-            return Encryptor::CIPHER_LATEST;
-        }
-        return Encryptor::CIPHER_RIJNDAEL_256;
+        return '0:' . Encryptor::CIPHER_RIJNDAEL_256 . ':' . base64_encode($encrpted);
     }
 }

lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php

@@ -266,4 +266,3 @@ public function testGetHashMustUseSpecifiedHashingAlgo($password, $salt, $hashAl
         $this->assertEquals($expected, $hash);
     }
 }
-