Issue #132 - add support to autoload shared library classes

libs/class-oik-autoload.php

@@ -1,6 +1,6 @@
-<?php // (C) Copyright Bobbing Wide 2015, 2016
+<?php // (C) Copyright Bobbing Wide 2016-2021
 if ( !defined( "CLASS_OIK_AUTOLOAD_INCLUDED" ) ) {
-define( "CLASS_OIK_AUTOLOAD_INCLUDED", "0.1.0" );
+define( "CLASS_OIK_AUTOLOAD_INCLUDED", "1.0.0" );
 
 /**
  * Implement autoloading for shared libraries
@@ -33,7 +33,11 @@ class OIK_Autoload {
 	 * @var OIK_autoload - the true instance
 	 */
 	private static $instance;
-
+
+	/**
+	 * @var bool True to autoload shared library classes. False initially.
+	 */
+	private $autoload_shared_library;
 	/**
 	 * Return a single instance of this class
 	 *
@@ -50,6 +54,7 @@ public static function instance() {
 	 * Constructor for the OIK_autoload class
 	 */
 	function __construct() {
+		$this->autoload_shared_library = false;
 		self::$loads = array();
 		$loads_more = apply_filters( "oik_query_autoload_classes", self::$loads );
 		self::$loads = $loads_more;
@@ -68,12 +73,25 @@ function __construct() {
 	 * What if we can't?
 	 */
 	function autoload( $class ) {
+		if ( $this->autoload_shared_library ) {
+			$library_file = $this->load_shared_library_class_file( $class );
+			if ( $library_file && !is_wp_error( $library_file)) {
+				return;
+			}
+		}
+
 		$class_file = $this->locate_class( $class );
 		if ( $class_file ) {
 			$file = $this->file( $class_file );
 			oik_require( $file, $class_file->plugin );
+		} else {
+			// Perhaps it's a shared library file
+			// or perhaps it's in classes
+			$this->load_shared_library_class_file( $class );
 		}
 	}
+
+
 
 	/**
 	 * Determine the file name from the class and path
@@ -164,6 +182,32 @@ function nortoload( $loads_more ) {
 		return( $loads_more );
 	}
 
+	/**
+	 * Enables / disables  the autoload shared library logic.
+	 *
+	 * @param bool $autoload_shared_library
+	 */
+	function set_autoload_shared_library( $autoload_shared_library ) {
+		if ( $autoload_shared_library ) {
+			$this->autoload_shared_library=$autoload_shared_library;
+		}
+	}
+
+	/**
+	 * Try loading a shared library class.
+	 *
+	 * @param $class
+	 * @return object/bool the library loaded or a simple bool if oik_libs is not loaded, so we used the fallback
+	 */
+	function load_shared_library_class_file( $class ) {
+		$lib = 'class-';
+		$file = str_replace( "_", "-", $class );
+		$file = strtolower( $file );
+		$lib .= $file;
+		$library_file = oik_require_lib( $lib );
+		return $library_file;
+	}
+
 
 }
 

libs/oik-autoload.php

@@ -1,8 +1,11 @@
-<?php // (C) Copyright Bobbing Wide 2015-2019
+<?php
 if ( !defined( "OIK_AUTOLOAD_INCLUDED" ) ) {
-define( "OIK_AUTOLOAD_INCLUDED", "0.1.0" );
+define( "OIK_AUTOLOAD_INCLUDED", "1.0.0" );
 
 /**
+ * @copyright (C) Copyright Bobbing Wide 2015-2021
+ * @package oik-libs
+ *
  * Autoload library functions
  *
  * Library: oik-autoload
@@ -36,14 +39,17 @@ function oik_require_class( $class, $args=null ) {
  * But I think it's better to implicitely invoke either oik_require_class() or oik_autoload() to instantiate the
  * autoloading logic when you know that OO code will be used.
  * 
- * Notice we use oik_require_file() to load a class file manually
+ * Notice we use oik_require_file() to load a class file manually.
+ *
+ * @param bool $autoload_shared_library True if we want autoloading of shared library classes.
  */
-function oik_autoload() {
+function oik_autoload( $autoload_shared_library=false ) {
 	if ( !class_exists( "OIK_Autoload" ) ) {
 		oik_require_file( "class-oik-autoload.php", "oik-autoload" );
 	}
 	if ( class_exists( "OIK_Autoload" ) ) {
 		$oik_autoload = OIK_Autoload::instance();
+		$oik_autoload->set_autoload_shared_library( $autoload_shared_library );
 	} else {
 		bw_trace2( "Class OIK_Autoload does not exist", null, false, BW_TRACE_ERROR );
 		die();