test: Improve test coverage

+ Remove checks for dbal v2

Author: aszenz

tests/FluidColumnTest.php

@@ -80,36 +80,31 @@ public function testTypes()
         $column->object();
         $this->assertSame(Type::getType(Types::OBJECT), $dbalColumn->getType());
 
-        if (defined('Doctrine\\DBAL\\Types\\Types::BINARY')) {
-            $column->binary(43);
-            $this->assertSame(Type::getType(Types::BINARY), $dbalColumn->getType());
-            $this->assertSame(43, $dbalColumn->getLength());
-            $this->assertSame(false, $dbalColumn->getFixed());
-        }
+        $column->binary(43);
+        $this->assertSame(Type::getType(Types::BINARY), $dbalColumn->getType());
+        $this->assertSame(43, $dbalColumn->getLength());
+        $this->assertSame(false, $dbalColumn->getFixed());
 
-        if (defined('Doctrine\\DBAL\\Types\\Types::DATE_IMMUTABLE')) {
-            // Doctrine DBAL 2.6+
-            $column->dateImmutable();
-            $this->assertSame(Type::getType('date_immutable'), $dbalColumn->getType());
+        $column->dateImmutable();
+        $this->assertSame(Type::getType('date_immutable'), $dbalColumn->getType());
 
-            $column->datetimeImmutable();
-            $this->assertSame(Type::getType(Types::DATETIME_IMMUTABLE), $dbalColumn->getType());
+        $column->datetimeImmutable();
+        $this->assertSame(Type::getType(Types::DATETIME_IMMUTABLE), $dbalColumn->getType());
 
-            $column->datetimeTzImmutable();
-            $this->assertSame(Type::getType(Types::DATETIMETZ_IMMUTABLE), $dbalColumn->getType());
+        $column->datetimeTzImmutable();
+        $this->assertSame(Type::getType(Types::DATETIMETZ_IMMUTABLE), $dbalColumn->getType());
 
-            $column->time();
-            $this->assertSame(Type::getType(Types::TIME_MUTABLE), $dbalColumn->getType());
+        $column->time();
+        $this->assertSame(Type::getType(Types::TIME_MUTABLE), $dbalColumn->getType());
 
-            $column->timeImmutable();
-            $this->assertSame(Type::getType(Types::TIME_IMMUTABLE), $dbalColumn->getType());
+        $column->timeImmutable();
+        $this->assertSame(Type::getType(Types::TIME_IMMUTABLE), $dbalColumn->getType());
 
-            $column->dateInterval();
-            $this->assertSame(Type::getType(Types::DATEINTERVAL), $dbalColumn->getType());
+        $column->dateInterval();
+        $this->assertSame(Type::getType(Types::DATEINTERVAL), $dbalColumn->getType());
 
-            $column->json();
-            $this->assertSame(Type::getType(Types::JSON), $dbalColumn->getType());
-        }
+        $column->json();
+        $this->assertSame(Type::getType(Types::JSON), $dbalColumn->getType());
 
         $this->assertSame('foo', $column->getDbalColumn()->getName());
     }

tests/FluidTableTest.php

@@ -102,19 +102,15 @@ public function testUuid()
 
     public function testTimestamps()
     {
-        if (defined('Doctrine\\DBAL\\Types\\Types::DATE_IMMUTABLE')) {
-            $schema = new Schema();
-            $fluid = new FluidSchema($schema);
+        $schema = new Schema();
+        $fluid = new FluidSchema($schema);
 
-            $posts = $fluid->table('posts');
+        $posts = $fluid->table('posts');
 
-            $posts->timestamps();
+        $posts->timestamps();
 
-            $this->assertTrue($schema->getTable('posts')->hasColumn('created_at'));
-            $this->assertTrue($schema->getTable('posts')->hasColumn('updated_at'));
-        } else {
-            $this->markTestSkipped("Only available from Doctrine DBAL 2.6");
-        }
+        $this->assertTrue($schema->getTable('posts')->hasColumn('created_at'));
+        $this->assertTrue($schema->getTable('posts')->hasColumn('updated_at'));
     }
 
     public function testInherits()
@@ -138,6 +134,21 @@ public function testInherits()
         $this->assertSame(['id'], $fk->getLocalColumns());
     }
 
+    public function testCannotInheritFromATableWithMultiplePrimaryKeys()
+    {
+        $schema = new Schema();
+        $fluid = new FluidSchema($schema);
+
+        $contacts = $fluid->table('contacts');
+        $contacts->column('foo')->string();
+        $contacts->column('bar')->string();
+        $contacts->primaryKey(['foo', 'bar']);
+
+        $this->expectException(FluidSchemaException::class);
+
+        $fluid->table('users')->extends('contacts');
+    }
+
     public function testGetDbalTable()
     {
         $schema = new Schema();