Feature/contorion feature set

.php_cs

@@ -0,0 +1,28 @@
+<?php
+
+$finder = Symfony\CS\Finder\DefaultFinder::create()
+    ->in(__DIR__ . '/src')
+    ->exclude('Generated')
+;
+return Symfony\CS\Config\Config::create()
+    ->fixers(
+        array(
+            'controls-spaces',
+            'braces',
+            'elseif',
+            'eof_ending',
+            'extra_empty_lines',
+            'function_declaration',
+            'include',
+            'indentation',
+            'linefeed',
+            'php_closing_tag',
+            'psr0',
+            'short_tag',
+            'trailing_spaces',
+            'unused_use',
+            'visibility'
+        )
+    )
+    ->finder($finder)
+;

composer.json

@@ -1,18 +1,22 @@
 {
-  "name": "tomaszdurka/codegenerator",
-  "authors": [
-    {
-      "name": "Tomasz Durka",
-      "email": "[email protected]"
+    "name": "tomaszdurka/codegenerator",
+    "authors": [
+        {
+            "name": "Tomasz Durka",
+            "email": "[email protected]"
+        }
+    ],
+    "require": {
+        "php": ">=5.4"
+    },
+    "require-dev": {
+        "fabpot/php-cs-fixer": "^1.9",
+        "phpunit/phpunit": "~3.7.10",
+        "satooshi/php-coveralls": "~0.6.1"
+    },
+    "autoload": {
+        "psr-0": {
+            "CodeGenerator\\": "source/"
+        }
     }
-  ],
-  "require-dev": {
-    "phpunit/phpunit": "~3.7.10",
-    "satooshi/php-coveralls": "~0.6.1"
-  },
-  "autoload": {
-    "psr-0": {
-      "CodeGenerator\\": "source/"
-    }
-  }
 }

source/CodeGenerator/ArrayBlock.php

@@ -2,47 +2,51 @@
 
 namespace CodeGenerator;
 
-class ArrayBlock extends Block {
-
+class ArrayBlock extends Block
+{
     /** @var array */
-    private $_value;
+    private $value;
 
     /**
      * @param array $value
      */
-    public function __construct(array $value = null) {
-        $this->_value = (array) $value;
+    public function __construct(array $value = null)
+    {
+        $this->value = (array)$value;
     }
 
     /**
      * @return string
      */
-    public function dump() {
-        $entries = array();
+    protected function dumpContent()
+    {
+        $entries = [];
         $isAssociative = $this->isAssociative();
-        foreach ($this->_value as $key => $value) {
+        foreach ($this->value as $key => $value) {
             $line = '';
             if ($isAssociative) {
-                $line .= $key . ' => ';
+                    $line .= '\'' . $key . '\' => ';
             }
             $value = new ValueBlock($value);
             $line .= $value->dump();
             $entries[] = $line;
         }
         $content = implode(', ', $entries);
         if (strlen($content) < 100) {
-            return 'array(' . $content . ')';
+            return '[' . $content . ']';
         } else {
             $content = implode(",\n", $entries);
-            return $this->_dumpLine(
-                'array(',
-                $this->_indent($content),
-                ')'
+
+            return $this->dumpLine(
+                '[',
+                $this->indent($content),
+                ']'
             );
         }
     }
 
-    public function isAssociative() {
-        return (bool) count(array_filter(array_keys($this->_value), 'is_string'));
+    public function isAssociative()
+    {
+        return (bool)count(array_filter(array_keys($this->value), 'is_string'));
     }
 }

source/CodeGenerator/Block.php

@@ -2,94 +2,166 @@
 
 namespace CodeGenerator;
 
-abstract class Block {
-
+abstract class Block implements GeneratorConstants
+{
     /** @var string */
-    protected static $_indentation = '    ';
+    protected static $indentation = '    ';
+    /** @var  DocBlock */
+    protected $docBlock;
 
     /**
+     * @param string $indentation
+     */
+    public static function setIndentation($indentation)
+    {
+        self::$indentation = (string)$indentation;
+    }
+
+    /**
+     * @param string $className
+     *
      * @return string
      */
-    abstract public function dump();
+    protected static function normalizeClassName($className)
+    {
+        if (strpos($className, '\\') !== 0) {
+            $className = '\\' . $className;
+        }
+
+        return $className;
+    }
 
-    public function __toString() {
+    /**
+     * @param DocBlock $docBlock
+     *
+     * @return $this
+     */
+    public function setDocBlock($docBlock)
+    {
+        $this->docBlock = $docBlock;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
         return $this->dump();
     }
 
+    /**
+     * @return string
+     */
+    public function dump()
+    {
+        if ($this->docBlock) {
+            $docBlockText = $this->docBlock->dump();
+            if ($docBlockText) {
+                $docBlockText .= PHP_EOL;
+            }
+
+            return $docBlockText . '' . $this->dumpContent();
+        }
+
+        return $this->dumpContent();
+    }
+
+    /**
+     * @return string
+     */
+    abstract protected function dumpContent();
+
     /**
      * @param string $content
+     *
      * @return string
      */
-    protected function _indent($content) {
-        return preg_replace('/(:?^|[\n])/', '$1' . self::$_indentation, $content);
+    protected function indent($content)
+    {
+        return preg_replace('/(:?^|[\n])/', '$1' . self::$indentation, $content);
     }
 
     /**
-     * @param string       $content
-     * @param boolean|null $untilUnsafe
+     * @param string $content
+     * @param bool|null $untilUnsafe
+     *
      * @return string
      */
-    protected function _outdent($content, $untilUnsafe = null) {
-        $indentation = self::$_indentation;
+    protected function outdent($content, $untilUnsafe = null)
+    {
+        $indentation = self::$indentation;
         if (!$indentation) {
             return $content;
         }
         $lines = explode(PHP_EOL, $content);
         if ($untilUnsafe) {
-            $nonemptyLines = array_filter($lines, function ($line) {
-                return (bool) trim($line);
-            });
-            $unsafeLines = array_filter($nonemptyLines, function ($line) use ($indentation) {
-                return strpos($line, $indentation) !== 0;
-            });
+            $nonemptyLines = array_filter(
+                $lines,
+                function ($line) {
+                    return (bool)trim($line);
+                }
+            );
+            $unsafeLines = array_filter(
+                $nonemptyLines,
+                function ($line) use ($indentation) {
+                    return strpos($line, $indentation) !== 0;
+                }
+            );
             if (count($unsafeLines) || !count($nonemptyLines)) {
                 return $content;
             }
         }
         foreach ($lines as $key => $line) {
-            $lines[$key] = preg_replace('/^' . preg_quote(self::$_indentation) . '/', '$1', $line);
+            $lines[$key] = preg_replace('/^' . preg_quote(self::$indentation) . '/', '$1', $line);
         }
         $content = implode(PHP_EOL, $lines);
         if ($untilUnsafe) {
-            $content = $this->_outdent($content, $untilUnsafe);
+            $content = $this->outdent($content, $untilUnsafe);
         }
+
         return $content;
     }
 
     /**
      * @param string $line , $line, $line
+     *
      * @return string
      */
-    protected function _dumpLine($line) {
+    protected function dumpLine($line)
+    {
         $lines = func_get_args();
-        return $this->_dumpLines($lines);
-    }
 
-    /**
-     * @param string[] $lines
-     * @return string
-     */
-    protected function _dumpLines(array $lines) {
-        return implode(PHP_EOL, array_filter($lines, function ($element) {
-            return !is_null($element);
-        }));
+        return $this->dumpLines($lines);
     }
 
     /**
-     * @param string $indentation
+     * @param \Reflector $reflection
      */
-    public static function setIndentation($indentation) {
-        self::$_indentation = (string) $indentation;
+    protected function setDocBlockFromReflection(\Reflector $reflection)
+    {
+        $block = DocBlock::createMethodDocBlockFromReflection($reflection);
+        if ($block) {
+            $this->setDocBlock($block);
+        }
     }
 
     /**
-     * @param string $className
+     * @param string[] $lines
+     *
      * @return string
      */
-    protected static function _normalizeClassName($className) {
-        if (strpos($className, '\\') !== 0) {
-            $className = '\\' . $className;
-        }
-        return $className;
+    protected function dumpLines(array $lines)
+    {
+        return implode(
+            PHP_EOL,
+            array_filter(
+                $lines,
+                function ($element) {
+                    return !is_null($element);
+                }
+            )
+        );
     }
 }