Fixed tests and improved error messages

Author: peldax

src/Command/SqlGeneratorCommand.php

@@ -239,10 +239,10 @@ private static function getDefault(\ReflectionProperty $property, \ReflectionCla
         if (!$property->hasDefaultValue()) {
             $primaryKeys = self::getPrimaryKeyColumns($bean);
 
-            if (\count($primaryKeys) === 1 && $property->getName() === $primaryKeys[0]) {
-                if (\in_array($type->getName(), ['int', \CoolBeans\PrimaryKey\IntPrimaryKey::class], true)) {
-                    return ' AUTO_INCREMENT';
-                }
+            if (\count($primaryKeys) === 1 &&
+                $property->getName() === $primaryKeys[0] &&
+                \in_array($type->getName(), ['int', \CoolBeans\PrimaryKey\IntPrimaryKey::class], true)) {
+                return ' AUTO_INCREMENT';
             }
 
             return '';
@@ -467,11 +467,8 @@ private static function getPrimaryKeyColumns(\ReflectionClass $bean) : array
 
         if (\count($attributes) > 0) {
             $primaryColumns = $attributes[0]->newInstance()->columns;
-
-            if (\count($primaryColumns) === 0) {
-                throw new \CoolBeans\Exception\MissingPrimaryKey('Bean ' . $bean->getShortName() . ' has no primary key.');
-            }
         } else {
+            // default
             $primaryColumns = ['id'];
         }
 
@@ -489,15 +486,19 @@ private static function printPrimaryKey(\ReflectionClass $bean) : string
 
     private static function validateColumnsExists(\ReflectionClass $bean, array $columns) : void
     {
+        if (\count($columns) === 0) {
+            throw new \CoolBeans\Exception\EmptyColumnArray($bean->getShortName());
+        }
+
         if (\count($columns) !== \count(\array_flip($columns))) {
-            throw new \RuntimeException('Column array has duplicates in Bean ' . $bean->getShortName() . '.');
+            throw new \CoolBeans\Exception\DuplicateInColumnArray($bean->getShortName());
         }
 
         foreach ($columns as $column) {
             try {
                 $property = $bean->getProperty($column);
             } catch (\ReflectionException) {
-                throw new \RuntimeException('Column [' . $column . '] given in column array doesnt exist in Bean ' . $bean->getShortName() . '.');
+                throw new \CoolBeans\Exception\UnknownColumnInColumnArray($column, $bean->getShortName());
             }
         }
     }

src/Exception/BeanHasNoPrimaryKey.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace CoolBeans\Exception;
+
+final class DuplicateInColumnArray extends \Exception
+{
+    public function __construct(string $beanName)
+    {
+        parent::__construct('Column array has duplicates in Bean ' . $beanName . '.');
+    }
+}

src/Exception/ClassUniqueConstraintDuplicateColumns.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace CoolBeans\Exception;
+
+final class EmptyColumnArray extends \Exception
+{
+    public function __construct(string $beanName)
+    {
+        parent::__construct('Column array cannot be empty in Bean ' . $beanName . '.');
+    }
+}

src/Exception/DuplicateInColumnArray.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace CoolBeans\Exception;
+
+final class UnknownColumnInColumnArray extends \Exception
+{
+    public function __construct(string $column, string $beanName)
+    {
+        parent::__construct('Column [' . $column . '] given in column array doesnt exist in Bean ' . $beanName . '.');
+    }
+}

src/Exception/EmptyColumnArray.php

@@ -167,23 +167,6 @@ public function testSettings() : void
         self::assertSame('sqlGenerator', $command->getName());
     }
 
-    public function testDuplicateColumns() : void
-    {
-        $application = new \Symfony\Component\Console\Application();
-        $application->addCommands([new \CoolBeans\Command\SqlGeneratorCommand()]);
-
-        $command = $application->find('sqlGenerator');
-        $commandTester = new \Symfony\Component\Console\Tester\CommandTester($command);
-
-        $this->expectException(\CoolBeans\Exception\ClassUniqueConstraintDuplicateColumns::class);
-        $this->expectExceptionMessage('Found duplicate columns defined in ClassUniqueConstraint attribute.');
-
-        $commandTester->execute([
-            'command' => 'sqlGenerator',
-            'source' => __DIR__ . '/../InvalidBean/DuplicateColumns/',
-        ]);
-    }
-
     public function testUndefinedProperty() : void
     {
         $application = new \Symfony\Component\Console\Application();
@@ -192,8 +175,8 @@ public function testUndefinedProperty() : void
         $command = $application->find('sqlGenerator');
         $commandTester = new \Symfony\Component\Console\Tester\CommandTester($command);
 
-        $this->expectException(\CoolBeans\Exception\ClassUniqueConstraintUndefinedProperty::class);
-        $this->expectExceptionMessage('Property with name "invalid" given in ClassUniqueConstraint is not defined.');
+        $this->expectException(\CoolBeans\Exception\UnknownColumnInColumnArray::class);
+        $this->expectExceptionMessage('Column [invalid] given in column array doesnt exist in Bean InvalidBean.');
 
         $commandTester->execute([
             'command' => 'sqlGenerator',
@@ -209,32 +192,15 @@ public function testMissingPrimaryKey() : void
         $command = $application->find('sqlGenerator');
         $commandTester = new \Symfony\Component\Console\Tester\CommandTester($command);
 
-        $this->expectException(\CoolBeans\Exception\MissingPrimaryKey::class);
-        $this->expectExceptionMessage('Bean InvalidBean has no primary key.');
+        $this->expectException(\CoolBeans\Exception\UnknownColumnInColumnArray::class);
+        $this->expectExceptionMessage('Column [id] given in column array doesnt exist in Bean InvalidBean.');
 
         $commandTester->execute([
             'command' => 'sqlGenerator',
             'source' => __DIR__ . '/../InvalidBean/MissingPrimaryKey/',
         ]);
     }
 
-    public function testPrimaryKeyAttributeMultipleColumns() : void
-    {
-        $application = new \Symfony\Component\Console\Application();
-        $application->addCommands([new \CoolBeans\Command\SqlGeneratorCommand()]);
-
-        $command = $application->find('sqlGenerator');
-        $commandTester = new \Symfony\Component\Console\Tester\CommandTester($command);
-
-        $this->expectException(\CoolBeans\Exception\PrimaryKeyMultipleColumnsNotImplemented::class);
-        $this->expectExceptionMessage('Multiple column PrimaryKey is not implemented yet.');
-
-        $commandTester->execute([
-            'command' => 'sqlGenerator',
-            'source' => __DIR__ . '/../InvalidBean/PrimaryKeyAttributeMultipleColumns/',
-        ]);
-    }
-
     public function testPrimaryKeyAttributeMissingColumn() : void
     {
         $application = new \Symfony\Component\Console\Application();
@@ -243,8 +209,8 @@ public function testPrimaryKeyAttributeMissingColumn() : void
         $command = $application->find('sqlGenerator');
         $commandTester = new \Symfony\Component\Console\Tester\CommandTester($command);
 
-        $this->expectException(\CoolBeans\Exception\PrimaryKeyColumnDoesntExist::class);
-        $this->expectExceptionMessage('PrimaryKey attribute column(s) unknown doesn\'t exist in Bean InvalidBean.');
+        $this->expectException(\CoolBeans\Exception\UnknownColumnInColumnArray::class);
+        $this->expectExceptionMessage('Column [unknown] given in column array doesnt exist in Bean InvalidBean.');
 
         $commandTester->execute([
             'command' => 'sqlGenerator',