Refactor get cipher code to only load encryptenv config values once

Author: mrgswift

src/Action/Decrypt.php

@@ -25,20 +25,16 @@ function __construct()
      */
     public function get($name)
     {
-        $configfile = (new ConfigFile)->get();
+        $configfile = new ConfigFile;
+        $configarr = $configfile->get();
 
         if (!empty($this->configkey) && count($configfile)) {
 
-            $encenv_config = ['cipher' => ''];
-            if (file_exists(config_path('encryptenv.php'))) {
-                $encenv_config = require(config_path('encryptenv.php'));
-            }
+            $crypt = new Encrypter($this->configkey, $configfile->getEncEnvConfig()['cipher']);
 
-            $crypt = new Encrypter($this->configkey, $encenv_config['cipher']);
-
-            return !empty($configfile[$name]) && !is_array($configfile[$name]) && strpos($configfile[$name], "ENC:") === 0 ?
-                $crypt->decrypt(substr($configfile[$name], 4)) :
-                    null;
+            return !empty($configarr[$name]) && !is_array($configarr[$name]) && strpos($configarr[$name], "ENC:") === 0 ?
+                $crypt->decrypt(substr($configarr[$name], 4)) :
+                null;
         }
         return null;
     }

src/Entity/ConfigFile.php

@@ -9,6 +9,11 @@ class ConfigFile
      */
     protected $configarr;
 
+    /**
+     * @var array
+     */
+    protected $encenv_config;
+
     /**
      * @var string
      */
@@ -29,6 +34,7 @@ function __construct()
     {
         if (file_exists(config_path('encryptenv.php'))) {
             $encenv_config = require(config_path('encryptenv.php'));
+            $this->encenv_config = $encenv_config;
         }
         $this->configfile = !empty($encenv_config['custom_config_file']) ? $encenv_config['custom_config_file'] : null;
         !empty($encenv_config['custom_config_file']) && $this->configpath = config_path($encenv_config['custom_config_file']);
@@ -54,6 +60,16 @@ public function get()
         return $this->configarr;
     }
 
+    /**
+     * Get Package Config properties as array
+     *
+     * @return array
+     */
+    public function getEncEnvConfig()
+    {
+        return $this->encenv_config;
+    }
+
     /**
      * Get Config File Path
      *