20240410#7

README.md

@@ -10,12 +10,12 @@ Stable version
 composer require rmphp/content
 ```
 ```bash
-composer require rmphp/content:"^2.0"
+composer require rmphp/content:"^3.0"
 ```
 
 
 Dev version contains the latest changes
 
 ```bash
-composer require rmphp/content:"2.x-dev"
+composer require rmphp/content:"3.x-dev"
 ```

composer.json

@@ -9,7 +9,7 @@
 	],
 	"require": {
 		"php": "^8.1",
-		"rmphp/foundation": "^1.0"
+		"rmphp/foundation": "^2.0"
 	},
 	"autoload": {
 		"psr-4": {

src/Content.php

@@ -3,7 +3,6 @@
 namespace Rmphp\Content;
 
 use Rmphp\Foundation\Exceptions\AppError;
-use Rmphp\Foundation\Exceptions\AppException;
 use Rmphp\Foundation\TemplateInterface;
 
 class Content implements TemplateInterface {
@@ -16,51 +15,38 @@ class Content implements TemplateInterface {
 		if(!empty($template)) $this->setTemplate($template);
 	}
 
-	/**
-	 * @param string $template
-	 * @param array $resource
-	 * @return TemplateInterface
-	 */
+	/** @inheritDoc */
 	public function setTemplate(string $template, array $resource = []) : TemplateInterface {
 		foreach ($resource as $resKey => $resVal){
 			$this->{$resKey} = $resVal;
 		}
 		ContentData::$basePath = dirname(__DIR__, 4);
-		ContentData::$template = ContentData::$basePath.'/'.$template;
+		ContentData::$template = ContentData::$basePath.$template;
 		return $this;
 	}
 
-	/**
-	 * @param string $subtemplatePath
-	 * @return TemplateInterface
-	 */
-	public function setSubtemplePath(string $subtemplatePath) : TemplateInterface {
-		ContentData::$subtemplatePath = ContentData::$basePath.'/'.$subtemplatePath;
+	/** @inheritDoc */
+	public function setSubtemplatePath(string $subtemplatePath = "") : TemplateInterface {
+		ContentData::$subtemplatePath = ContentData::$basePath.rtrim($subtemplatePath, '/');
 		return $this;
 	}
 
-	/**
-	 * @return string
-	 */
-	public function getSubtemplePath(): string {
+	/** @inheritDoc */
+	public function getSubtemplatePath(): string {
 		return ContentData::$subtemplatePath;
 	}
 
 	/**
-	 * @param string $point
-	 * @param string $string
-	 * @throws AppException
+	 * @inheritDoc
 	 */
 	public function addValue(string $point, string $string) : void {
-		if (empty($point)) throw new AppException("Empty point");
-		if (empty(ContentData::$subtemplatePath))throw new AppException("SubtemplatePath is not defined");
+		if (empty($point)) throw new AppError("Empty point");
+		if (empty(ContentData::$subtemplatePath))throw new AppError("SubtemplatePath is not defined");
 		ContentData::$content[$point][] = $string;
 	}
 
 	/**
-	 * @param string $point
-	 * @param string $string
-	 * @throws AppException
+	 * @inheritDoc
 	 */
 	public function setValue(string $point, string $string) : void {
 		unset(ContentData::$content[$point]);
@@ -68,60 +54,45 @@ class Content implements TemplateInterface {
 	}
 
 	/**
-	 * @param string $point
-	 * @param string $subTempl
-	 * @param array $resource
-	 * @throws AppException
+	 * @inheritDoc
 	 */
-	public function addSubtemple(string $point, string $subTempl, array $resource = []) : void {
-		if (empty(ContentData::$subtemplatePath))throw new AppException("SubtemplatePath is not defined");
-		if (empty($point)) throw new AppException("Empty point");
-		if (empty($subTempl) || !file_exists(ContentData::$subtemplatePath."/".$subTempl)) throw new AppException(ContentData::$subtemplatePath."/".$subTempl. " is not found");
+	public function addSubtemplate(string $point, string $subtemplate, array $resource = []) : void {
+		if (empty(ContentData::$subtemplatePath))throw new AppError("SubtemplatePath is not defined");
+		if (empty($point)) throw new AppError("Empty point");
+		if (empty($subtemplate) || !file_exists(ContentData::$subtemplatePath.$subtemplate)) throw new AppError(ContentData::$subtemplatePath.$subtemplate. " is not found");
 		foreach ($resource as $resKey => $resVal){
 			$this->{$resKey} = $resVal;
 		}
-		ob_start(); include ContentData::$subtemplatePath."/".$subTempl; ContentData::$content[$point][] = ob_get_contents(); ob_end_clean();
+		ob_start(); include ContentData::$subtemplatePath.$subtemplate; ContentData::$content[$point][] = ob_get_contents(); ob_end_clean();
 	}
 
 	/**
-	 * @param string $point
-	 * @param string $subTempl
-	 * @param array $resource
-	 * @throws AppException
+	 * @inheritDoc
 	 */
-	public function setSubtemple(string $point, string $subTempl, array $resource = []) : void {
+	public function setSubtemplate(string $point, string $subtemplate, array $resource = []) : void {
 		unset(ContentData::$content[$point]);
-		$this->addSubtemple($point, $subTempl, $resource);
+		$this->addSubtemplate($point, $subtemplate, $resource);
 	}
 
 	/**
-	 * @param string $incFile
-	 * @param array $resource
-	 * @return string
-	 * @throws AppException
+	 * @inheritDoc
 	 */
 	public function inc(string $incFile, array $resource = []) : string {
 		foreach ($resource as $resKey => $resVal){
 			$this->{$resKey} = $resVal;
 		}
-		if(empty($incFile) || !file_exists(ContentData::$subtemplatePath."/".$incFile)) throw new AppException("Empty inc file");
-		ob_start(); include ContentData::$subtemplatePath."/".$incFile; $out = ob_get_contents(); ob_end_clean();
+		if(empty($incFile) || !file_exists(ContentData::$subtemplatePath.$incFile)) throw new AppError("Empty inc file");
+		ob_start(); include ContentData::$subtemplatePath.$incFile; $out = ob_get_contents(); ob_end_clean();
 		return $out;
 	}
 
-	/**
-	 * @param string $point
-	 * @return string
-	 */
+	/** @inheritDoc */
 	public function getPoint(string $point) : string {
 		if (empty($point) || empty(ContentData::$content[$point])) return "";
 		return implode("", ContentData::$content[$point]);
 	}
 
-	/**
-	 * @return string
-	 * @throws AppException
-	 */
+	/** @inheritDoc */
 	public function getResponse(): string {
 		if (empty(ContentData::$template) || !file_exists(ContentData::$template)) throw new AppError("Invalid template file");
 		ob_start(); include ContentData::$template; $out = ob_get_contents(); ob_end_clean();