Merge 9cd95a2 into 4371fbb

nulldevelopmenthr · Jan 4, 2018 · 8363df1 · 8363df1
2 parents 4371fbb + 9cd95a2
commit 8363df1
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/src/NullDevelopment/Skeleton/Command/GenerateAllFilesFromDefinitionCliCommand.php b/src/NullDevelopment/Skeleton/Command/GenerateAllFilesFromDefinitionCliCommand.php
@@ -4,10 +4,10 @@
 
 namespace NullDevelopment\Skeleton\Command;
 
-use Exception;
 use NullDevelopment\Skeleton\SourceCode;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Throwable;
 
 /**
  * @codeCoverageIgnore
@@ -32,7 +32,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 foreach ($results as $result) {
                     $this->fileSystem->dumpFile($result->getFileName(), $result->getOutput());
                 }
-            } catch (Exception $e) {
+            } catch (Throwable $e) {
                 $this->io->writeln($e->getMessage());
             }
         }

diff --git a/src/NullDevelopment/Skeleton/Command/GenerateMissingFilesFromDefinitionCliCommand.php b/src/NullDevelopment/Skeleton/Command/GenerateMissingFilesFromDefinitionCliCommand.php
@@ -4,10 +4,10 @@
 
 namespace NullDevelopment\Skeleton\Command;
 
-use Exception;
 use NullDevelopment\Skeleton\SourceCode;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Throwable;
 
 /**
  * @codeCoverageIgnore
@@ -36,7 +36,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                         $this->io->writeln('Skipping '.$result->getFileName().' as it already exists');
                     }
                 }
-            } catch (Exception $e) {
+            } catch (Throwable $e) {
                 $this->io->writeln($e->getMessage());
             }
         }

diff --git a/src/NullDevelopment/Skeleton/ExampleMaker/ArrayExample.php b/src/NullDevelopment/Skeleton/ExampleMaker/ArrayExample.php
@@ -23,7 +23,13 @@ public function __toString(): string
         $results = [];
 
         foreach ($this->values as $value) {
-            $results[] = $value->__toString();
+            if (true === is_string($value)) {
+                $results[] = '"'.$value.'"';
+            } elseif ($value instanceof Example) {
+                $results[] = $value->__toString();
+            } else {
+                $results[] = $value;
+            }
         }
 
         return '['.implode(', ', $results).']';
@@ -34,7 +40,9 @@ public function classesToImport(): array
         $result = [];
 
         foreach ($this->values as $value) {
-            $result = array_merge($result, $value->classesToImport());
+            if ($value instanceof Example) {
+                $result = array_merge($result, $value->classesToImport());
+            }
         }
 
         return $result;

diff --git a/...lopment/SkeletonSourceCodeExtension/DefinitionLoader/Factory/ConstructorMethodFactory.php b/...lopment/SkeletonSourceCodeExtension/DefinitionLoader/Factory/ConstructorMethodFactory.php
@@ -7,6 +7,7 @@
 use NullDevelopment\PhpStructure\DataType\Property;
 use NullDevelopment\PhpStructure\DataType\Visibility;
 use NullDevelopment\PhpStructure\DataTypeName\ClassName;
+use NullDevelopment\Skeleton\ExampleMaker\ArrayExample;
 use NullDevelopment\Skeleton\ExampleMaker\SimpleExample;
 use NullDevelopment\SkeletonSourceCodeExtension\Method\ConstructorMethod;
 
@@ -30,7 +31,11 @@ public function create(?array $input): ?ConstructorMethod
             $examples = [];
 
             foreach ($parameter['examples'] as $example) {
-                $examples[] = new SimpleExample($example);
+                if (true === is_array($example)) {
+                    $examples[] = new ArrayExample($example);
+                } else {
+                    $examples[] = new SimpleExample($example);
+                }
             }
 
             $parameters[] = new Property(

diff --git a/...opment/SkeletonSourceCodeExtension/DefinitionLoader/Factory/PropertyCollectionFactory.php b/...opment/SkeletonSourceCodeExtension/DefinitionLoader/Factory/PropertyCollectionFactory.php
@@ -7,6 +7,7 @@
 use NullDevelopment\PhpStructure\DataType\Property;
 use NullDevelopment\PhpStructure\DataType\Visibility;
 use NullDevelopment\PhpStructure\DataTypeName\ClassName;
+use NullDevelopment\Skeleton\ExampleMaker\ArrayExample;
 use NullDevelopment\Skeleton\ExampleMaker\SimpleExample;
 
 /**
@@ -30,7 +31,11 @@ public function create(?array $input): array
             $examples = [];
 
             foreach ($data['examples'] as $example) {
-                $examples[] = new SimpleExample($example);
+                if (true === is_array($example)) {
+                    $examples[] = new ArrayExample($example);
+                } else {
+                    $examples[] = new SimpleExample($example);
+                }
             }
 
             $result[] = new Property(