From 1952519ebee85b8a3395be9b0e6a89b17c39afe5 Mon Sep 17 00:00:00 2001 From: zeusakm Date: Sun, 28 May 2017 19:26:59 +0300 Subject: [PATCH] * #hot-fix. clean up duplications, ConfigTrait->abstract setTabs() --- src/blocks/Config.php | 45 +++----------------------------------- src/blocks/ConfigTrait.php | 6 +++++ 2 files changed, 9 insertions(+), 42 deletions(-) diff --git a/src/blocks/Config.php b/src/blocks/Config.php index bc0b672..7c9befc 100644 --- a/src/blocks/Config.php +++ b/src/blocks/Config.php @@ -52,48 +52,6 @@ public function create() } } - /** - * @param string $entity - */ - private function setTable(string $entity) - { - $this->setTabs(2); - $this->sourceCode .= PhpInterface::QUOTES . ModelsInterface::MIGRATION_TABLE . PhpInterface::QUOTES - . PhpInterface::SPACE . PhpInterface::DOUBLE_ARROW - . PhpInterface::SPACE . PhpInterface::QUOTES . MigrationsHelper::getTableName($entity) - . PhpInterface::QUOTES . PhpInterface::COMMA . PHP_EOL; - } - - private function setEnabled() - { - $this->setTabs(2); - $this->sourceCode .= PhpInterface::QUOTES . ConfigInterface::ENABLED . PhpInterface::QUOTES - . PhpInterface::SPACE . PhpInterface::DOUBLE_ARROW . - PhpInterface::SPACE . PhpInterface::PHP_TYPES_BOOL_TRUE . PhpInterface::COMMA . PHP_EOL; - } - - /** - * @param int $time - */ - private function setActivate(int $time) - { - $this->setTabs(2); - $this->sourceCode .= PhpInterface::QUOTES . ConfigInterface::ACTIVATE . PhpInterface::QUOTES - . PhpInterface::SPACE . PhpInterface::DOUBLE_ARROW . - PhpInterface::SPACE . $time . PhpInterface::COMMA . PHP_EOL; - } - - /** - * @param int $time - */ - private function setExpires(int $time) - { - $this->setTabs(2); - $this->sourceCode .= PhpInterface::QUOTES . ConfigInterface::EXPIRES . PhpInterface::QUOTES - . PhpInterface::SPACE . PhpInterface::DOUBLE_ARROW . - PhpInterface::SPACE . $time . PhpInterface::COMMA . PHP_EOL; - } - /** * Constructs the config structure */ @@ -221,6 +179,9 @@ private function setSpellCheck() $this->closeEntity(); } + /** + * @param string $objName + */ private function setSpellOptions(string $objName) { if(empty($this->generator->types[$objName . CustomsInterface::CUSTOM_TYPES_ATTRIBUTES][RamlInterface::RAML_PROPS]) === false) { diff --git a/src/blocks/ConfigTrait.php b/src/blocks/ConfigTrait.php index 2cc850f..544bcfc 100644 --- a/src/blocks/ConfigTrait.php +++ b/src/blocks/ConfigTrait.php @@ -81,6 +81,12 @@ private function openSpellCheck() . PhpInterface::OPEN_BRACKET . PHP_EOL; } + /** + * @param int $amount + * @return mixed + */ + protected abstract function setTabs(int $amount = 1); + /** * Opens finite state machine * @param string $entity