9.1.2 (#427)

* updating libs to accommodate caching path from the method and global constant

Author: iruzevic

CHANGELOG.md

@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
 
 This projects adheres to [Semantic Versioning](https://semver.org/) and [Keep a CHANGELOG](https://keepachangelog.com/).
 
+## [9.1.2]
+
+### Added
+- Updates on DI container to support caching and better performance.
+
 ## [9.1.1]
 
 ### Added
@@ -638,6 +643,7 @@ Init setup
 
 [Unreleased]: https://github.com/infinum/eightshift-libs/compare/main...HEAD
 
+[9.1.2]: https://github.com/infinum/eightshift-libs/compare/9.1.1...9.1.2
 [9.1.1]: https://github.com/infinum/eightshift-libs/compare/9.1.0...9.1.1
 [9.1.0]: https://github.com/infinum/eightshift-libs/compare/9.0.2...9.1.0
 [9.0.2]: https://github.com/infinum/eightshift-libs/compare/9.0.1...9.0.2

src/Main/AbstractMain.php

@@ -99,6 +99,23 @@ public function buildDiContainer(): Container
 		return $this->container;
 	}
 
+	/**
+	 * Get the path to the cache folder.
+	 *
+	 * @return string
+	 */
+	public function getCachedFolderPath(): string
+	{
+		$sep = \DIRECTORY_SEPARATOR;
+		$cacheFolder = __DIR__ . "{$sep}Cache";
+
+		if (\defined('EIGHTSHIFT_DI_CACHE_FOLDER')) {
+			$cacheFolder = \trim(\EIGHTSHIFT_DI_CACHE_FOLDER, $sep);
+		}
+
+		return $cacheFolder;
+	}
+
 	/**
 	 * Merges the autowired definition list with custom user-defined definition list.
 	 *
@@ -187,17 +204,18 @@ private function getDiContainer(array $services): Container
 
 		$builder = new ContainerBuilder();
 
-		if ((\defined('WP_ENVIRONMENT_TYPE') && \WP_ENVIRONMENT_TYPE !== 'development') && !\defined('WP_CLI')) {
+		if (
+			(\defined('WP_ENVIRONMENT_TYPE') &&
+			(\WP_ENVIRONMENT_TYPE !== 'development')) &&
+			!\defined('WP_CLI')
+		) {
 			$file = \explode('\\', $this->namespace);
 
-			$sep = \DIRECTORY_SEPARATOR;
-			$cacheFolder = __DIR__ . "{$sep}Cache";
+			$cacheFolder = $this->getCachedFolderPath();
 
-			if (\defined('EIGHTSHIFT_DI_CACHE_FOLDER')) {
-				$cacheFolder = \trim(\EIGHTSHIFT_DI_CACHE_FOLDER, $sep);
+			if (!$cacheFolder) {
+				$builder->enableCompilation($cacheFolder, "{$file[0]}CompiledContainer");
 			}
-
-			$builder->enableCompilation($cacheFolder, "{$file[0]}CompiledContainer");
 		}
 
 		return $builder->addDefinitions($definitions)->build();