Release of v3.2.1-rc2

Improved the Schema Table update engine (more). Fix autoloader timing, and loading. Implement the Joomla Powers in JCB code, to move away from JClasses. Remove many of the SQL updates, to only use the Schema updates of table columns to avoid collusion.

libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/JoomlaPower/Extractor.php

@@ -12,6 +12,7 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\JoomlaPower;
 
 
+use VDM\Joomla\Utilities\JsonHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Power\ExtractorInterface;
 use VDM\Joomla\Componentbuilder\Compiler\Power\Extractor as ExtendingExtractor;
 

libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Service/Utilities.php

@@ -121,7 +121,8 @@ class Utilities implements ServiceProviderInterface
 	public function getFileInjector(Container $container): FileInjector
 	{
 		return new FileInjector(
-			$container->get('Power.Injector')
+			$container->get('Power.Injector'),
+			$container->get('Joomla.Power.Injector')
 		);
 	}
 

libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Utilities/FileInjector.php

@@ -13,6 +13,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Utilities;
 
 
 use VDM\Joomla\Componentbuilder\Compiler\Power\Injector as Power;
+use VDM\Joomla\Componentbuilder\Compiler\JoomlaPower\Injector as JoomlaPower;
 use VDM\Joomla\Utilities\MathHelper;
 
 
@@ -33,23 +34,41 @@ final class FileInjector
 	protected Power $power;
 
 	/**
-	 * The pattern to get the powers
+	 * The Joomla Injector Class.
+	 *
+	 * @var   JoomlaPower
+	 * @since 3.2.1
+	 */
+	protected JoomlaPower $joomla;
+
+	/**
+	 * The power pattern to get the powers
 	 *
 	 * @var    string
 	 * @since 3.2.0
 	 **/
-	protected string $pattern = '/Super_'.'_'.'_[a-zA-Z0-9_]+_'.'_'.'_Power/';
+	protected string $powerPattern = '/Super_'.'_'.'_[a-zA-Z0-9_]+_'.'_'.'_Power/';
+
+	/**
+	 * The Joomla power pattern to get the powers
+	 *
+	 * @var    string
+	 * @since 3.2.1
+	 **/
+	protected string $joomlaPattern = '/Joomla_'.'_'.'_[a-zA-Z0-9_]+_'.'_'.'_Power/';
 
 	/**
 	 * Constructor.
 	 *
-	 * @param Power   $power   The Injector Class.
+	 * @param Power        $power    The Injector Class.
+	 * @param JoomlaPower  $joomla   The Joomla Injector Class.
 	 *
-	 * @since 3.2.0
+	 * @since 3.2.1
 	 */
-	public function __construct(Power $power)
+	public function __construct(Power $power, JoomlaPower $joomla)
 	{
 		$this->power = $power;
+		$this->joomla = $joomla;
 	}
 
 	/**
@@ -72,7 +91,9 @@ final class FileInjector
 			throw new \InvalidArgumentException('Position cannot be negative.');
 		}
 
-		$found_super_powers = preg_match($this->pattern, $data);
+		$found_joomla_powers = preg_match($this->joomlaPattern, $data);
+		$found_super_powers = preg_match($this->powerPattern, $data);
+
 		$actual_file = $this->openFileWithLock($file);
 
 		try
@@ -85,6 +106,11 @@ final class FileInjector
 
 			$this->processFile($actual_file, $temp_file, $data, $position, $replace);
 
+			if ($found_joomla_powers)
+			{
+				$this->injectJoomlaPowers($actual_file);
+			}
+
 			if ($found_super_powers)
 			{
 				$this->injectSuperPowers($actual_file);
@@ -207,6 +233,28 @@ final class FileInjector
 		ftruncate($actual_file, 0);
 		rewind($actual_file);
 
+		fwrite($actual_file, $power_data);
+	}
+
+	/**
+	 * Injects Joomla powers into the file content, if found, and updates the file.
+	 *
+	 * @param resource  $actual_file   The file handle of the actual file.
+	 * 
+	 * @return void
+	 * @since 3.2.1
+	 */
+	private function injectJoomlaPowers($actual_file): void
+	{
+		rewind($actual_file);
+
+		$power_data = $this->joomla->power(
+			stream_get_contents($actual_file)
+		);
+
+		ftruncate($actual_file, 0);
+		rewind($actual_file);
+
 		fwrite($actual_file, $power_data);
 	}
 }