From 7486c70e74cf1dec661d25ea70305db457f28076 Mon Sep 17 00:00:00 2001 From: Giovanni G <19211824+alar77@users.noreply.github.com> Date: Tue, 8 Jan 2019 23:01:07 +0100 Subject: [PATCH 1/5] Use clause can now be aliased --- src/Model/UseClassModel.php | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/src/Model/UseClassModel.php b/src/Model/UseClassModel.php index 09a91f1..a08f164 100644 --- a/src/Model/UseClassModel.php +++ b/src/Model/UseClassModel.php @@ -14,22 +14,32 @@ class UseClassModel extends RenderableModel * @var string */ protected $name; + /** + * @var string + */ + protected $alias=null; /** * PHPClassUse constructor. * @param string $name */ - public function __construct($name) + public function __construct($name,$alias=null) { $this->name = $name; + if ($alias) $this->alias=$alias; } /** * {@inheritDoc} */ public function toLines() - { - return sprintf('use %s;', $this->name); + { + if (is_null($this->alias) { + return sprintf('use %s;', $this->name); + } + else { + return sprintf('use %s as %s;', $this->name,$this->alias); + } } /** @@ -39,6 +49,14 @@ public function getName() { return $this->name; } + + /** + * @return string + */ + public function getAlias() + { + return $this->alias; + } /** * @param string $name @@ -51,4 +69,16 @@ public function setName($name) return $this; } + + /** + * @param string $alias + * + * @return $this + */ + public function setAlias($alias) + { + $this->alias = $alias; + + return $this; + } } From 5ba2fc80aa136c7a9ee0979a3d813afa1f505bab Mon Sep 17 00:00:00 2001 From: Giovanni G <19211824+alar77@users.noreply.github.com> Date: Thu, 28 Feb 2019 01:15:20 +0100 Subject: [PATCH 2/5] Update ArgumentModel.php Now actually uses default --- src/Model/ArgumentModel.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Model/ArgumentModel.php b/src/Model/ArgumentModel.php index b9ab551..7e19b02 100644 --- a/src/Model/ArgumentModel.php +++ b/src/Model/ArgumentModel.php @@ -29,7 +29,7 @@ class ArgumentModel extends RenderableModel * ArgumentModel constructor. * @param string $name * @param string|null $type - * @param mixed|null $default + * @param mixed|null $default used "as is" */ public function __construct($name, $type = null, $default = null) { @@ -43,11 +43,12 @@ public function __construct($name, $type = null, $default = null) */ public function toLines() { - if ($this->type !== null) { - return $this->type . ' $' . $this->name; - } else { + if ($this->default !== null) { + return ltrim($this->type?:'' . ' $' . $this->name. ' = ' .$this->default); + } else { return '$' . $this->name; - } + return ltrim($this->type?:'' . ' $' . $this->name); + } } /** From 5e7b1a4587bb42505d739acf660b404934b7c606 Mon Sep 17 00:00:00 2001 From: Giovanni G Date: Thu, 28 Feb 2019 01:31:13 +0100 Subject: [PATCH 3/5] Fixed typo --- src/Model/UseClassModel.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Model/UseClassModel.php b/src/Model/UseClassModel.php index a08f164..7ec4dc1 100644 --- a/src/Model/UseClassModel.php +++ b/src/Model/UseClassModel.php @@ -33,8 +33,8 @@ public function __construct($name,$alias=null) * {@inheritDoc} */ public function toLines() - { - if (is_null($this->alias) { + { + if (is_null($this->alias)) { return sprintf('use %s;', $this->name); } else { @@ -49,7 +49,7 @@ public function getName() { return $this->name; } - + /** * @return string */ From 0730ac30e964e032953e9dad7c33120fdb1659e4 Mon Sep 17 00:00:00 2001 From: Giovanni G <19211824+alar77@users.noreply.github.com> Date: Sun, 6 Oct 2019 15:49:47 +0200 Subject: [PATCH 4/5] Update composer.json --- composer.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1ec62f4..ce04643 100644 --- a/composer.json +++ b/composer.json @@ -7,4 +7,9 @@ "Krlove\\CodeGenerator\\": "src/" } } -} \ No newline at end of file + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + } +} From 2cf81a467edcfad6a88d6b40cc4879e9393ee567 Mon Sep 17 00:00:00 2001 From: Giovanni G <19211824+alar77@users.noreply.github.com> Date: Sun, 6 Oct 2019 15:50:34 +0200 Subject: [PATCH 5/5] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ce04643..7c2e4e9 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "psr-4": { "Krlove\\CodeGenerator\\": "src/" } - } + }, "extra": { "branch-alias": { "dev-master": "1.0.x-dev"