@ConfigArray now supports omitting the type (mixed)

TonyBogdanov · Mar 24, 2018 · 6fbb714 · 6fbb714
1 parent e79597c
commit 6fbb714
Show file tree

Hide file tree

Showing 31 changed files with 1,381 additions and 1,338 deletions.
diff --git a/classes/Annotation/ConfigArray.php b/classes/Annotation/ConfigArray.php
@@ -11,7 +11,7 @@
 class ConfigArray extends Config
 {
     /**
-     * @var null|\ClassConfig\Annotation\ConfigEntryTypeHintInterface
+     * @var \ClassConfig\Annotation\ConfigEntryTypeHintInterface
      */
     public $value;
 }
diff --git a/classes/ClassGenerator.php b/classes/ClassGenerator.php
@@ -39,7 +39,15 @@ protected static function camelCase(string $value): string
      */
     protected function getTypeHint(string $type)
     {
-        return '[]' === substr($type, -2) ? 'array' : $type;
+        if ('[]' === substr($type, -2)) {
+            return 'array';
+        }
+
+        if ('mixed' === $type) {
+            return '';
+        }
+
+        return $type;
     }
 
     /**
@@ -150,7 +158,10 @@ public function generateGet(string $name, string $type): ClassGenerator
             )->setReturnType($this->getTypeHint($type))
             ->setReturnNullable(true)
             ->setBody(
-                'return isset($this->__' . $name . '__[0]) ? $this->__' . $name . '__[0] : $this->__' . $name . '__[1];'
+                'if (isset($this->__' . $name . '__[0])) {' . PHP_EOL .
+                '    return $this->__' . $name . '__[0];' . PHP_EOL .
+                '}' . PHP_EOL .
+                'return $this->__' . $name . '__[1];'
             );
         return $this;
     }
@@ -221,11 +232,14 @@ public function generateArrayGet(string $name, string $type): ClassGenerator
         $this->class
             ->addMethod(static::camelCase('get_' . $name))
             ->addComment(
-                '@return ' . $this->getCommentTypeHint($type)
+                '@return null|' . $this->getCommentTypeHint($type)
             )->setReturnType($this->getTypeHint($type))
             ->setReturnNullable(true)
             ->setBody(
-                'return isset($this->__' . $name . '__[0]) ? $this->__' . $name . '__[0] : null;'
+                'if (isset($this->__' . $name . '__[0])) {' . PHP_EOL .
+                '    return $this->__' . $name . '__[0];' . PHP_EOL .
+                '}' . PHP_EOL .
+                'return null;'
             );
         return $this;
     }
@@ -293,11 +307,8 @@ public function generateArraySetAt(string $name, string $type): ClassGenerator
                 '@return ' . $this->class->getName()
             )->setReturnType($this->getCanonicalClassName())
             ->setBody(
-                'if (' . PHP_EOL .
-                '    0 > $index ||' . PHP_EOL .
-                '    (0 < $index && (!isset($this->__' . $name . '__[0]) || empty($this->__' . $name .
-                '__[0])) || $index > count($this->__' . $name . '__[0]))' . PHP_EOL .
-                ') {' . PHP_EOL .
+                'if (0 > $index || (0 < $index && (!isset($this->__' . $name . '__[0]) ||' . PHP_EOL .
+                '    empty($this->__' . $name . '__[0])) || $index > count($this->__' . $name . '__[0]))) {' . PHP_EOL .
                 '    return $this;' . PHP_EOL .
                 '}' . PHP_EOL . PHP_EOL .
                 'if (!isset($this->__' . $name . '__[0])) {' . PHP_EOL .

diff --git a/docs/coverage/AbstractConfig.php.html b/docs/coverage/AbstractConfig.php.html
@@ -249,7 +249,7 @@ <h4>Legend</h4>
      <span class="warning"><strong>Dead Code</strong></span>
     </p>
     <p>
-     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 12:19:14 EET 2018.</small>
+     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 14:38:47 EET 2018.</small>
     </p>
     <a title="Back to the top" id="toplink" href="#"><span class="glyphicon glyphicon-arrow-up"></span></a>
    </footer>

diff --git a/docs/coverage/Annotation/Config.php.html b/docs/coverage/Annotation/Config.php.html
@@ -103,7 +103,7 @@ <h4>Legend</h4>
      <span class="warning"><strong>Dead Code</strong></span>
     </p>
     <p>
-     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 12:19:14 EET 2018.</small>
+     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 14:38:47 EET 2018.</small>
     </p>
     <a title="Back to the top" id="toplink" href="#"><span class="glyphicon glyphicon-arrow-up"></span></a>
    </footer>

diff --git a/docs/coverage/Annotation/ConfigArray.php.html b/docs/coverage/Annotation/ConfigArray.php.html
@@ -103,7 +103,7 @@ <h4>Legend</h4>
      <span class="warning"><strong>Dead Code</strong></span>
     </p>
     <p>
-     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 12:19:14 EET 2018.</small>
+     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 14:38:47 EET 2018.</small>
     </p>
     <a title="Back to the top" id="toplink" href="#"><span class="glyphicon glyphicon-arrow-up"></span></a>
    </footer>

diff --git a/docs/coverage/Annotation/ConfigBoolean.php.html b/docs/coverage/Annotation/ConfigBoolean.php.html
@@ -162,7 +162,7 @@ <h4>Legend</h4>
      <span class="warning"><strong>Dead Code</strong></span>
     </p>
     <p>
-     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 12:19:14 EET 2018.</small>
+     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 14:38:47 EET 2018.</small>
     </p>
     <a title="Back to the top" id="toplink" href="#"><span class="glyphicon glyphicon-arrow-up"></span></a>
    </footer>

diff --git a/docs/coverage/Annotation/ConfigEntryInterface.php.html b/docs/coverage/Annotation/ConfigEntryInterface.php.html
@@ -82,7 +82,7 @@ <h4>Legend</h4>
      <span class="warning"><strong>Dead Code</strong></span>
     </p>
     <p>
-     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 12:19:14 EET 2018.</small>
+     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 14:38:47 EET 2018.</small>
     </p>
     <a title="Back to the top" id="toplink" href="#"><span class="glyphicon glyphicon-arrow-up"></span></a>
    </footer>

diff --git a/docs/coverage/Annotation/ConfigEntryTypeHintInterface.php.html b/docs/coverage/Annotation/ConfigEntryTypeHintInterface.php.html
@@ -87,7 +87,7 @@ <h4>Legend</h4>
      <span class="warning"><strong>Dead Code</strong></span>
     </p>
     <p>
-     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 12:19:14 EET 2018.</small>
+     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 14:38:47 EET 2018.</small>
     </p>
     <a title="Back to the top" id="toplink" href="#"><span class="glyphicon glyphicon-arrow-up"></span></a>
    </footer>

diff --git a/docs/coverage/Annotation/ConfigFloat.php.html b/docs/coverage/Annotation/ConfigFloat.php.html
@@ -162,7 +162,7 @@ <h4>Legend</h4>
      <span class="warning"><strong>Dead Code</strong></span>
     </p>
     <p>
-     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 12:19:14 EET 2018.</small>
+     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 14:38:47 EET 2018.</small>
     </p>
     <a title="Back to the top" id="toplink" href="#"><span class="glyphicon glyphicon-arrow-up"></span></a>
    </footer>

diff --git a/docs/coverage/Annotation/ConfigInteger.php.html b/docs/coverage/Annotation/ConfigInteger.php.html
@@ -162,7 +162,7 @@ <h4>Legend</h4>
      <span class="warning"><strong>Dead Code</strong></span>
     </p>
     <p>
-     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 12:19:14 EET 2018.</small>
+     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 14:38:47 EET 2018.</small>
     </p>
     <a title="Back to the top" id="toplink" href="#"><span class="glyphicon glyphicon-arrow-up"></span></a>
    </footer>

diff --git a/docs/coverage/Annotation/ConfigObject.php.html b/docs/coverage/Annotation/ConfigObject.php.html
@@ -162,7 +162,7 @@ <h4>Legend</h4>
      <span class="warning"><strong>Dead Code</strong></span>
     </p>
     <p>
-     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 12:19:14 EET 2018.</small>
+     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 14:38:47 EET 2018.</small>
     </p>
     <a title="Back to the top" id="toplink" href="#"><span class="glyphicon glyphicon-arrow-up"></span></a>
    </footer>

diff --git a/docs/coverage/Annotation/ConfigString.php.html b/docs/coverage/Annotation/ConfigString.php.html
@@ -162,7 +162,7 @@ <h4>Legend</h4>
      <span class="warning"><strong>Dead Code</strong></span>
     </p>
     <p>
-     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 12:19:14 EET 2018.</small>
+     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 14:38:47 EET 2018.</small>
     </p>
     <a title="Back to the top" id="toplink" href="#"><span class="glyphicon glyphicon-arrow-up"></span></a>
    </footer>

diff --git a/docs/coverage/Annotation/dashboard.html b/docs/coverage/Annotation/dashboard.html
@@ -147,7 +147,7 @@ <h3>Project Risks</h3>
    <footer>
     <hr/>
     <p>
-     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 12:19:14 EET 2018.</small>
+     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 14:38:47 EET 2018.</small>
     </p>
    </footer>
   </div>

diff --git a/docs/coverage/Annotation/index.html b/docs/coverage/Annotation/index.html
@@ -273,7 +273,7 @@ <h4>Legend</h4>
      <span class="success"><strong>High</strong>: 90% to 100%</span>
     </p>
     <p>
-     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 12:19:14 EET 2018.</small>
+     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage 5.3.0-1-g982ce79</a> using <a href="https://secure.php.net/" target="_top">PHP 7.2.2</a> with <a href="https://xdebug.org/">Xdebug 2.6.0</a> and <a href="https://phpunit.de/">PHPUnit 6.5.5</a> at Sat Mar 24 14:38:47 EET 2018.</small>
     </p>
    </footer>
   </div>