Fixed bug with config registry scope

Author: dmhendricks

core/Helpers/StringHelper.php

@@ -44,7 +44,7 @@ public function get_const( $const, $filter_validate = null ) {
     */
   public static function encrypt( $str ) {
     $salt = defined( 'WP_ENCRYPT_KEY' ) && WP_ENCRYPT_KEY ? WP_ENCRYPT_KEY : SECURE_AUTH_KEY;
-    return openssl_encrypt($str, self::$config->get( 'encrypt_method' ), $salt);
+    return openssl_encrypt($str, self::$registry->get( 'encrypt_method' ), $salt);
   }
 
   /**
@@ -57,7 +57,7 @@ public static function encrypt( $str ) {
     */
   public static function decrypt( $str ) {
     $salt = defined( 'WP_ENCRYPT_KEY' ) && WP_ENCRYPT_KEY ? WP_ENCRYPT_KEY : SECURE_AUTH_KEY;
-    return openssl_decrypt($str, self::$config->get( 'encrypt_method' ), $salt);
+    return openssl_decrypt($str, self::$registry->get( 'encrypt_method' ), $salt);
   }
 
   /**

core/ObjectCache.php

@@ -20,9 +20,9 @@ class ObjectCache extends ToolKit {
     */
   public function get_object( $key = null, $callback, $cache_disabled = false ) {
 
-    $object_cache_group = self::$config->get( 'object_cache/group' ) ? self::$config->get( 'object_cache/group' ) : sanitize_title( self::$config->get( 'data/Name' ) );
+    $object_cache_group = self::$registry->get( 'object_cache/group' ) ? self::$registry->get( 'object_cache/group' ) : sanitize_title( self::$registry->get( 'data/Name' ) );
     if( is_multisite() ) $object_cache_group .= '_' . get_current_blog_id();
-    $object_cache_expire = ( is_int( self::$config->get( 'object_cache/expire_hours' ) ) ? self::$config->get( 'object_cache/expire_hours' ) : 24 ) * 86400; // Default to 24 hours
+    $object_cache_expire = ( is_int( self::$registry->get( 'object_cache/expire_hours' ) ) ? self::$registry->get( 'object_cache/expire_hours' ) : 24 ) * 86400; // Default to 24 hours
 
     $result = null;
 

core/ScriptObject.php

@@ -28,9 +28,9 @@ public function __construct( $values ) {
       'css_media'     => null,
       'dependencies'  => array(),
       'localize'      => null,
-      'variable_name' => $this->prefix( self::$config->get( 'js_object' ) ?: 'js_object' ),
+      'variable_name' => $this->prefix( self::$registry->get( 'js_object' ) ?: 'js_object' ),
       'handle'        => $this->prefix( 'dynamic_script' ),
-      'script_dir'    => $this->prefix( self::$config->get( 'dynamic_scripts_directory' ) ?: 'dynamic' ),
+      'script_dir'    => $this->prefix( self::$registry->get( 'dynamic_scripts_directory' ) ?: 'dynamic' ),
       'filename'      => null
     );
 

core/ToolKit.php

@@ -8,8 +8,8 @@
  */
 class ToolKit {
 
-  protected static $config;
   protected static $cache;
+  protected static $registry;
 
   protected function init( $base_dir = null, $args = null ) {
 
@@ -34,13 +34,14 @@ protected function init( $base_dir = null, $args = null ) {
     // Define toolkit version
     if ( !defined( __NAMESPACE__ . '\VERSION' ) ) define( __NAMESPACE__ . '\VERSION', $config->get( 'toolkit-version' ) );
 
-    self::$config = $config;
-
     // Initialize ObjectCache
     self::$cache = new ObjectCache( $config );
 
     // Load Environmental Variables
-    $this->load_env_vars( [ $base_dir, self::$config->get( 'wordpress/root_dir' ) ] );
+    $this->load_env_vars( [ $base_dir, $config->get( 'wordpress/root_dir' ) ] );
+
+    self::$registry = $config;
+    return $config;
 
   }
 
@@ -55,7 +56,7 @@ protected function init( $base_dir = null, $args = null ) {
     */
   public static function prefix( $field_name = null, $before = '', $after = '_' ) {
 
-    $prefix = $before . self::$config->get( 'prefix' ) . $after;
+    $prefix = $before . self::$registry->get( 'prefix' ) . $after;
     return $field_name !== null ? $prefix . $field_name : $prefix;
 
   }
@@ -69,7 +70,7 @@ public static function prefix( $field_name = null, $before = '', $after = '_' )
     * @since 0.1.4
     */
   protected function get_config( $key = null) {
-    return self::$config->get( $key );
+    return self::$registry->get( $key );
   }
 
   /**
@@ -80,11 +81,11 @@ protected function get_config( $key = null) {
     * @since 0.2.0
     */
   protected function get_current_plugin_meta( $type = ConfigRegistry ) {
-    if( !self::$config->get( 'base_dir' ) ) return [];
+    if( !self::$registry->get( 'base_dir' ) ) return [];
 
-    $plugin_data['slug'] = current( explode( DIRECTORY_SEPARATOR, plugin_basename( self::$config->get( 'base_dir' ) ) ) );
-    $plugin_data['path'] = trailingslashit( str_replace( plugin_basename( self::$config->get( 'base_dir' ) ), '', rtrim( self::$config->get( 'base_dir' ), '/' ) ) . $plugin_data['slug'] );
-    $plugin_data['url'] = current( explode( $plugin_data['slug'] . '/', plugin_dir_url( self::$config->get( 'base_dir' ) ) ) ) . $plugin_data['slug'] . '/';
+    $plugin_data['slug'] = current( explode( DIRECTORY_SEPARATOR, plugin_basename( self::$registry->get( 'base_dir' ) ) ) );
+    $plugin_data['path'] = trailingslashit( str_replace( plugin_basename( self::$registry->get( 'base_dir' ) ), '', rtrim( self::$registry->get( 'base_dir' ), '/' ) ) . $plugin_data['slug'] );
+    $plugin_data['url'] = current( explode( $plugin_data['slug'] . '/', plugin_dir_url( self::$registry->get( 'base_dir' ) ) ) ) . $plugin_data['slug'] . '/';
 
     // Get plugin path/file identifier
     foreach( get_plugins() as $key => $plugin ) {