add classAttributes in ClassCreator

Author: jcheron

src/Ubiquity/scaffolding/creators/ClassCreator.php

@@ -4,41 +4,46 @@
 namespace Ubiquity\scaffolding\creators;
 
 
+use Ubiquity\creator\HasUsesTrait;
 use Ubiquity\utils\base\UFileSystem;
 use Ubiquity\utils\base\UString;
 
 class ClassCreator {
+	use HasUsesTrait;
+	
 	private string $template;
 	private string $classname;
 	private string $namespace;
-	private string $uses;
 	private string $extendsOrImplements;
 	private string $classContent;
+	private array $classAttributes;
 
 	private function getTemplateDir() {
 		return \dirname(__DIR__) . "/templates/";
 	}
 
-	public function __construct($classname,$uses,$namespace,$extendsOrImplements='',$classContent=''){
+	public function __construct($classname, $namespace, $extendsOrImplements='', $classContent='') {
 		$this->classname=$classname;
-		$this->uses=$uses;
 		$this->namespace=$namespace;
 		$this->extendsOrImplements=$extendsOrImplements;
 		$this->classContent=$classContent;
 		$this->template='class.tpl';
+		$this->classAttributes=[];
+		$this->uses=[];
 	}
 
-	public function generate():bool{
+	public function generate(): bool {
 		$namespaceVar = '';
 		if (UString::isNotNull($this->namespace)) {
 			$namespaceVar = "namespace {$this->namespace};";
 		}
 		$variables = [
 			'%classname%' => $this->classname,
 			'%namespace%' => $namespaceVar,
-			'%uses%' => $this->uses,
+			'%uses%' => $this->getUsesStr(),
 			'%extendsOrImplements%' => $this->extendsOrImplements,
-			'%classContent%' => $this->classContent
+			'%classContent%' => $this->classContent,
+			'%classAttributes%'=>\implode("\n", $this->classAttributes)
 		];
 		$templateDir = $this->getTemplateDir();
 		$directory = UFileSystem::getDirFromNamespace($this->namespace);
@@ -64,4 +69,8 @@ public function getTemplate(): string {
 	public function setTemplate(string $template): void {
 		$this->template = $template;
 	}
+	
+	public function addClassAttribute($attribute) {
+		$this->classAttributes[]=$attribute;
+	}
 }

src/Ubiquity/scaffolding/templates/action.tpl

@@ -1,4 +1,4 @@
 %route%
-	public function %actionName%(%parameters%){
+	public function %actionName%(%parameters%) {
 %content%
 	}

src/Ubiquity/scaffolding/templates/authController.tpl

@@ -1,9 +1,10 @@
 <?php
 %namespace%
+
 %uses%
 
 %route%
-class %controllerName% extends %baseClass%{
+class %controllerName% extends %baseClass% {
 
 	protected function onConnect($connected) {
 		$urlParts=$this->getOriginalURL();

src/Ubiquity/scaffolding/templates/authController_.tpl

@@ -1,9 +1,10 @@
 <?php
 %namespace%
+
 %uses%
 
 %route%
-class %controllerName% extends %baseClass%{
+class %controllerName% extends %baseClass% {
 
 	public function _getBaseRoute(): string {
 		return '%routePath%';

src/Ubiquity/scaffolding/templates/class.tpl

@@ -1,9 +1,12 @@
 <?php
 %namespace%
+
 %uses%
- /**
-  * Class %classname%
-  */
-class %classname% %extendsOrImplements%{
+
+/**
+ * Class %classname%
+ */
+%classAttributes%
+class %classname% %extendsOrImplements% {
 %classContent%
 }

src/Ubiquity/scaffolding/templates/controller.tpl

@@ -5,7 +5,7 @@
  * Controller %controllerName%
  */
 
-class %controllerName% extends %baseClass%{
+class %controllerName% extends %baseClass% {
 %initialize%
 	public function index(){
 	    //TODO index action implementation

src/Ubiquity/scaffolding/templates/crudController.tpl

@@ -1,9 +1,10 @@
 <?php
 %namespace%
+
 %uses%
 
 %route%
-class %controllerName% extends %baseClass%{
+class %controllerName% extends %baseClass% {
 
 	public function __construct(){
 		parent::__construct();

src/Ubiquity/scaffolding/templates/indexCrudController.tpl

@@ -1,9 +1,10 @@
 <?php
 %namespace%
+
 %uses%
 
 %route%
-class %controllerName% extends %baseClass%{
+class %controllerName% extends %baseClass% {
 
 	%indexRoute%
 	public function index() {
@@ -12,7 +13,7 @@ class %controllerName% extends %baseClass%{
 
 
 	%homeRoute%
-	public function home(){
+	public function home() {
 		parent::home();
 	}
 

src/Ubiquity/scaffolding/templates/method.tpl

@@ -1,4 +1,4 @@
-%comment%	%access% function %name%(%parameters%)%return%{
+%comment%	%access% function %name%(%parameters%)%return% {
 %content%
 	}
 

src/Ubiquity/scaffolding/templates/oauthController.tpl

@@ -3,10 +3,11 @@
 
 %uses%
 use Hybridauth\Adapter\AdapterInterface;
+
  /**
   * Controller %controllerName%
   */
-class %controllerName% extends %baseClass%{
+class %controllerName% extends %baseClass% {
 
 	public function index(){
 	}