#117. Remove null assignment from props + 2 images

SoliDry · Nov 16, 2018 · c4fb73b · c4fb73b
1 parent 5e9b2e9
commit c4fb73b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/blocks/ContentManager.php b/src/blocks/ContentManager.php
@@ -144,9 +144,14 @@ private function setArrayProperty($key, array $value) : void
      */
     protected function createProperty(string $prop, string $modifier, $value = PhpInterface::PHP_TYPES_NULL, bool $isString = false) : void
     {
-        $this->sourceCode .= PhpInterface::TAB_PSR4 . $modifier . PhpInterface::SPACE . PhpInterface::DOLLAR_SIGN .
-            $prop . PhpInterface::SPACE . PhpInterface::EQUALS . PhpInterface::SPACE
-            . (($isString === false) ? $value : PhpInterface::QUOTES . $value . PhpInterface::QUOTES) . PhpInterface::SEMICOLON . PHP_EOL;
+        if ($value === PhpInterface::PHP_TYPES_NULL) { // drop null assignments as they are already nullable by default
+            $this->sourceCode .= PhpInterface::TAB_PSR4 . $modifier . PhpInterface::SPACE . PhpInterface::DOLLAR_SIGN .
+                $prop . PhpInterface::SEMICOLON . PHP_EOL;
+        } else {
+            $this->sourceCode .= PhpInterface::TAB_PSR4 . $modifier . PhpInterface::SPACE . PhpInterface::DOLLAR_SIGN .
+                $prop . PhpInterface::SPACE . PhpInterface::EQUALS . PhpInterface::SPACE
+                . (($isString === false) ? $value : PhpInterface::QUOTES . $value . PhpInterface::QUOTES) . PhpInterface::SEMICOLON . PHP_EOL;
+        }
     }
 
     /**

diff --git a/tests/images/Console_generator_output.png b/tests/images/Console_generator_output.png
diff --git a/tests/images/Dirs_and_files_module_structure.png b/tests/images/Dirs_and_files_module_structure.png