diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3ded6f9..945d7f3 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -41,8 +41,8 @@ jobs:
             - name: Install Composer dependencies
               run: composer update ${{ matrix.composer-flag }} --no-interaction --no-progress
 
-#            - name: Run Code Style Check for PHP ${{ matrix.php-version }}
-#              run: composer run-script style-check
+            - name: Run Code Style Check for PHP ${{ matrix.php-version }}
+              run: composer run-script style-check
 
             - name: Run tests for PHP ${{ matrix.php-version }}
               run: composer run-script test
diff --git a/.gitignore b/.gitignore
index 64c25ee..012d502 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ phpunit.xml
 Vagrantfile
 .php_cs.dist
 /.php-cs-fixer.cache
+/.phpunit.result.cache
diff --git a/PHPUnit/Framework/BinaryTypeTestCase.php b/PHPUnit/Framework/BinaryTypeTestCase.php
index 54eb0d1..59ab157 100644
--- a/PHPUnit/Framework/BinaryTypeTestCase.php
+++ b/PHPUnit/Framework/BinaryTypeTestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\PHPUnit\Framework;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\BinaryTypeInterface;
@@ -11,7 +13,7 @@ abstract class BinaryTypeTestCase extends DataTypeTestCase
      */
     abstract protected function getBinaryType();
 
-    public function testSetLength()
+    public function testSetLength(): void
     {
         $binaryType = $this->getBinaryType();
 
@@ -21,7 +23,7 @@ public function testSetLength()
         $this->assertSame(3, $binaryType->getLength());
     }
 
-    public function testCast()
+    public function testCast(): void
     {
         $binaryType = $this->getBinaryType();
 
diff --git a/PHPUnit/Framework/CharTypeTestCase.php b/PHPUnit/Framework/CharTypeTestCase.php
index 748d27b..9fe35d0 100644
--- a/PHPUnit/Framework/CharTypeTestCase.php
+++ b/PHPUnit/Framework/CharTypeTestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\PHPUnit\Framework;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\CharTypeInterface;
@@ -18,7 +20,7 @@ abstract protected function createCharType();
 
     abstract protected function getInitialLength();
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $charType = $this->getCharType();
 
@@ -31,7 +33,7 @@ public function testInitialProperties()
         $this->assertTrue($charType->doesAllowDefault());
     }
 
-    public function testSetNewLength()
+    public function testSetNewLength(): void
     {
         $charType = $this->getCharType();
         $charType->setLength(12);
@@ -39,7 +41,7 @@ public function testSetNewLength()
         $this->assertSame(12, $charType->getLength());
     }
 
-    public function testSetCollation()
+    public function testSetCollation(): void
     {
         $collation = 'utf8mb4_general_ci';
         $charType = $this->getCharType();
@@ -49,7 +51,7 @@ public function testSetCollation()
         $this->assertSame($collation, $charType->getCollation());
     }
 
-    public function testCast()
+    public function testCast(): void
     {
         $charType = $this->getCharType();
 
@@ -68,12 +70,12 @@ public function DDLProvider()
         return [
             [
                 strtoupper($charType->getType()) . "($length)",
-                $charType
+                $charType,
             ],
             [
                 strtoupper($charType->getType()) . "($length) COLLATE '$collation'",
-                $charTypeCollate
-            ]
+                $charTypeCollate,
+            ],
         ];
     }
 }
diff --git a/PHPUnit/Framework/ConstraintTestCase.php b/PHPUnit/Framework/ConstraintTestCase.php
index 08c628b..4641148 100644
--- a/PHPUnit/Framework/ConstraintTestCase.php
+++ b/PHPUnit/Framework/ConstraintTestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\PHPUnit\Framework;
 
 use MilesAsylum\SchnoopSchema\MySQL\Constraint\ConstraintInterface;
@@ -15,7 +17,7 @@ abstract protected function getConstraintName();
 
     abstract protected function getConstraintType();
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $constraint = $this->getConstraint();
 
@@ -33,7 +35,7 @@ public function testInitialProperties()
         $this->assertNull($constraint->getDatabaseName(), 'Assertion on ' . get_class($constraint));
     }
 
-    public function testSetTableName()
+    public function testSetTableName(): void
     {
         $tableName = 'schnoop_tbl';
         $constraint = $this->getConstraint();
@@ -43,7 +45,7 @@ public function testSetTableName()
         $this->assertSame($tableName, $constraint->getTableName(), 'Assertion on ' . get_class($constraint));
     }
 
-    public function testSetDatabaseName()
+    public function testSetDatabaseName(): void
     {
         $databaseName = 'schnoop_db';
         $constraint = $this->getConstraint();
diff --git a/PHPUnit/Framework/DataTypeTestCase.php b/PHPUnit/Framework/DataTypeTestCase.php
index 7ce5f57..17d110f 100644
--- a/PHPUnit/Framework/DataTypeTestCase.php
+++ b/PHPUnit/Framework/DataTypeTestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\PHPUnit\Framework;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
@@ -8,17 +10,18 @@ abstract class DataTypeTestCase extends SchnoopSchemaTestCase
 {
     /**
      * @see testDDL
+     *
      * @return array
      */
     abstract public function DDLProvider();
 
     /**
      * @dataProvider DDLProvider
+     *
      * @param $expectedDDL
-     * @param DataTypeInterface $intType
      */
-    public function testDDL($expectedDDL, DataTypeInterface $intType)
+    public function testDDL($expectedDDL, DataTypeInterface $intType): void
     {
-        $this->assertSame($expectedDDL, (string)$intType);
+        $this->assertSame($expectedDDL, (string) $intType);
     }
 }
diff --git a/PHPUnit/Framework/IndexTestCase.php b/PHPUnit/Framework/IndexTestCase.php
index c407c87..d631d89 100644
--- a/PHPUnit/Framework/IndexTestCase.php
+++ b/PHPUnit/Framework/IndexTestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\PHPUnit\Framework;
 
 use MilesAsylum\SchnoopSchema\MySQL\Constraint\IndexedColumn;
@@ -19,7 +21,7 @@ protected function getConstraint()
         return $this->getIndex();
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
 
@@ -34,7 +36,7 @@ public function testInitialProperties()
         $this->assertNull($index->getComment(), 'Assertion on ' . get_class($index));
     }
 
-    public function testSetIndexedColumns()
+    public function testSetIndexedColumns(): void
     {
         $indexedColumnA = $this->createMock(IndexedColumn::class);
         $indexedColumnA->method('getColumnName')->willReturn('col_a');
@@ -43,7 +45,7 @@ public function testSetIndexedColumns()
 
         $indexedColumns = [
             $indexedColumnA,
-            $indexedColumnB
+            $indexedColumnB,
         ];
 
         $index = $this->getConstraint();
@@ -53,7 +55,7 @@ public function testSetIndexedColumns()
         $this->assertSame($indexedColumns, $index->getIndexedColumns());
     }
 
-    public function testSetIndexedColumnsReplacesPreviouslySetColumns()
+    public function testSetIndexedColumnsReplacesPreviouslySetColumns(): void
     {
         $indexedColumnA = $this->createMock(IndexedColumn::class);
         $indexedColumnA->method('getColumnName')->willReturn('col_a');
@@ -64,12 +66,12 @@ public function testSetIndexedColumnsReplacesPreviouslySetColumns()
 
         $indexedColumnsFirstSet = [
             $indexedColumnA,
-            $indexedColumnB
+            $indexedColumnB,
         ];
 
         $indexedColumnsSecondSet = [
             $indexedColumnB,
-            $indexedColumnC
+            $indexedColumnC,
         ];
 
         $index = $this->getConstraint();
@@ -79,7 +81,7 @@ public function testSetIndexedColumnsReplacesPreviouslySetColumns()
         $this->assertSame($indexedColumnsSecondSet, $index->getIndexedColumns());
     }
 
-    public function testAddIndexedColumns()
+    public function testAddIndexedColumns(): void
     {
         $indexedColumnA = $this->createMock(IndexedColumn::class);
         $indexedColumnA->method('getColumnName')->willReturn('col_a');
@@ -88,7 +90,7 @@ public function testAddIndexedColumns()
 
         $indexedColumns = [
             $indexedColumnA,
-            $indexedColumnB
+            $indexedColumnB,
         ];
 
         $index = $this->getConstraint();
@@ -99,7 +101,7 @@ public function testAddIndexedColumns()
         $this->assertSame($indexedColumns, $index->getIndexedColumns());
     }
 
-    public function testGetIndexedColumnNames()
+    public function testGetIndexedColumnNames(): void
     {
         $indexedColumnA = $this->createMock(IndexedColumn::class);
         $indexedColumnA->method('getColumnName')->willReturn('col_a');
@@ -108,7 +110,7 @@ public function testGetIndexedColumnNames()
 
         $indexedColumns = [
             $indexedColumnA,
-            $indexedColumnB
+            $indexedColumnB,
         ];
 
         $index = $this->getConstraint();
@@ -117,7 +119,7 @@ public function testGetIndexedColumnNames()
         $this->assertSame(['col_a', 'col_b'], $index->getIndexedColumnNames());
     }
 
-    public function testSetComment()
+    public function testSetComment(): void
     {
         $comment = 'Schnoop comment';
         $index = $this->getIndex();
@@ -127,7 +129,7 @@ public function testSetComment()
         $this->assertSame($comment, $index->getComment(), 'Assertion on ' . get_class($index));
     }
 
-    protected function indexDDLAsserts($ddlPrefix)
+    protected function indexDDLAsserts($ddlPrefix): void
     {
         $index = $this->getIndex();
 
@@ -138,7 +140,7 @@ protected function indexDDLAsserts($ddlPrefix)
 
         $indexedColumns = [
             $indexedColumnA,
-            $indexedColumnB
+            $indexedColumnB,
         ];
 
         $index->setIndexedColumns($indexedColumns);
@@ -150,7 +152,6 @@ protected function indexDDLAsserts($ddlPrefix)
 {$ddlPrefix} (`col_a`,`col_b`) COMMENT '$comment'
 SQL;
 
-
-        $this->assertSame($expectedDDL, (string)$index);
+        $this->assertSame($expectedDDL, (string) $index);
     }
 }
diff --git a/PHPUnit/Framework/IntTypeTestCase.php b/PHPUnit/Framework/IntTypeTestCase.php
index 7062c58..516322b 100644
--- a/PHPUnit/Framework/IntTypeTestCase.php
+++ b/PHPUnit/Framework/IntTypeTestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\PHPUnit\Framework;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\IntTypeInterface;
@@ -11,7 +13,7 @@ abstract class IntTypeTestCase extends DataTypeTestCase
      */
     abstract protected function getIntType();
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $intType = $this->getIntType();
 
@@ -22,7 +24,7 @@ public function testInitialProperties()
         $this->assertFalse($intType->isZeroFill());
     }
 
-    public function testSetDisplayWidth()
+    public function testSetDisplayWidth(): void
     {
         $displayWidth = 2;
         $intType = $this->getIntType();
@@ -32,7 +34,7 @@ public function testSetDisplayWidth()
         $this->assertSame($displayWidth, $intType->getDisplayWidth());
     }
 
-    public function testZeroFill()
+    public function testZeroFill(): void
     {
         $intType = $this->getIntType();
         $intType->setZeroFill(true);
@@ -40,7 +42,7 @@ public function testZeroFill()
         $this->assertTrue($intType->isZeroFill());
     }
 
-    public function testCast()
+    public function testCast(): void
     {
         $intType = $this->getIntType();
 
diff --git a/PHPUnit/Framework/NumericPointTypeTestCase.php b/PHPUnit/Framework/NumericPointTypeTestCase.php
index 135ee10..5bd4d38 100644
--- a/PHPUnit/Framework/NumericPointTypeTestCase.php
+++ b/PHPUnit/Framework/NumericPointTypeTestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\PHPUnit\Framework;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\NumericPointTypeInterface;
@@ -16,7 +18,7 @@ abstract protected function getNumericPointType();
      */
     abstract protected function createNumericPointType();
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $numericPointType = $this->getNumericPointType();
 
@@ -31,7 +33,7 @@ public function testInitialProperties()
         $this->assertFalse($numericPointType->isZeroFill());
     }
 
-    public function testSetSigned()
+    public function testSetSigned(): void
     {
         $numericPointType = $this->getNumericPointType();
         $numericPointType->setSigned(false);
@@ -39,7 +41,7 @@ public function testSetSigned()
         $this->assertFalse($numericPointType->isSigned());
     }
 
-    public function testSetPrecision()
+    public function testSetPrecision(): void
     {
         $numericPointType = $this->getNumericPointType();
 
@@ -53,7 +55,7 @@ public function testSetPrecision()
         $this->assertSame(0, $numericPointType->getScale());
     }
 
-    public function testSetPrecisionScale()
+    public function testSetPrecisionScale(): void
     {
         $numericPointType = $this->getNumericPointType();
 
@@ -69,7 +71,7 @@ public function testSetPrecisionScale()
         $this->assertSame($scale, $numericPointType->getScale());
     }
 
-    public function testSetZeroFill()
+    public function testSetZeroFill(): void
     {
         $numericPointType = $this->getNumericPointType();
         $numericPointType->setZeroFill(true);
@@ -77,7 +79,7 @@ public function testSetZeroFill()
         $this->assertTrue($numericPointType->isZeroFill());
     }
 
-    public function testMinRangeSigned()
+    public function testMinRangeSigned(): void
     {
         $numericPointType = $this->getNumericPointType();
         $numericPointType->setPrecisionScale(6, 2);
@@ -85,7 +87,7 @@ public function testMinRangeSigned()
         $this->assertSame('-9999.99', $numericPointType->getMinRange());
     }
 
-    public function testMinRangeUnsigned()
+    public function testMinRangeUnsigned(): void
     {
         $numericPointType = $this->getNumericPointType();
         $numericPointType->setPrecisionScale(6, 2);
@@ -94,7 +96,7 @@ public function testMinRangeUnsigned()
         $this->assertSame(0, $numericPointType->getMinRange());
     }
 
-    public function testMaxRange()
+    public function testMaxRange(): void
     {
         $numericPointType = $this->getNumericPointType();
         $numericPointType->setPrecisionScale(6, 2);
@@ -122,24 +124,24 @@ public function DDLProvider()
         return [
             [
                 strtoupper($numericPointType->getType()),
-                $numericPointType
+                $numericPointType,
             ],
             [
                 strtoupper($numericPointTypeUnsigned->getType()) . ' UNSIGNED',
-                $numericPointTypeUnsigned
+                $numericPointTypeUnsigned,
             ],
             [
                 strtoupper($numericPointTypePrecision->getType()) . '(6)',
-                $numericPointTypePrecision
+                $numericPointTypePrecision,
             ],
             [
                 strtoupper($numericPointTypePrecisionScale->getType()) . '(6,2)',
-                $numericPointTypePrecisionScale
+                $numericPointTypePrecisionScale,
             ],
             [
                 strtoupper($numericPointTypeUnsignedPrecisionScale->getType()) . '(6,2) UNSIGNED',
-                $numericPointTypeUnsignedPrecisionScale
-            ]
+                $numericPointTypeUnsignedPrecisionScale,
+            ],
         ];
     }
 }
diff --git a/PHPUnit/Framework/OptionsTypeTestCase.php b/PHPUnit/Framework/OptionsTypeTestCase.php
index bbc01ec..4b4d7fd 100644
--- a/PHPUnit/Framework/OptionsTypeTestCase.php
+++ b/PHPUnit/Framework/OptionsTypeTestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\PHPUnit\Framework;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\OptionsTypeInterface;
@@ -16,7 +18,7 @@ abstract protected function getOptionsType();
      */
     abstract protected function createOptionsType();
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $optionsType = $this->getOptionsType();
 
@@ -48,9 +50,8 @@ public function testSetOptions()
 
     /**
      * @depends testSetOptions
-     * @param array $testData
      */
-    public function testAddOption(array $testData)
+    public function testAddOption(array $testData): void
     {
         /** @var OptionsTypeInterface $optionsType */
         list($optionsType, $presetOptions) = $testData;
@@ -68,7 +69,7 @@ public function testAddOption(array $testData)
         }
     }
 
-    public function testSetCollation()
+    public function testSetCollation(): void
     {
         $collation = 'utf8mb4_general_ci';
         $optionsType = $this->getOptionsType();
@@ -78,7 +79,7 @@ public function testSetCollation()
         $this->assertSame($collation, $optionsType->getCollation());
     }
 
-    public function testCast()
+    public function testCast(): void
     {
         $optionsType = $this->getOptionsType();
 
@@ -87,7 +88,7 @@ public function testCast()
 
     public function DDLProvider()
     {
-        $simpleOptions = array('abc', '123');
+        $simpleOptions = ['abc', '123'];
 
         $optionsType = $this->createOptionsType();
         $optionsType->setOptions($simpleOptions);
@@ -95,8 +96,8 @@ public function DDLProvider()
         return [
             [
                 strtoupper($optionsType->getType()) . "('abc','123')",
-                $optionsType
-            ]
+                $optionsType,
+            ],
         ];
     }
 }
diff --git a/PHPUnit/Framework/RoutineParameterTestCase.php b/PHPUnit/Framework/RoutineParameterTestCase.php
index 9e5035f..839715a 100644
--- a/PHPUnit/Framework/RoutineParameterTestCase.php
+++ b/PHPUnit/Framework/RoutineParameterTestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\PHPUnit\Framework;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
@@ -20,13 +22,13 @@ abstract protected function getExpectedParameterName();
      */
     abstract protected function getExpectedParameterDataType();
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $this->assertSame($this->getExpectedParameterName(), $this->getRoutineParameter()->getName());
         $this->assertSame($this->getExpectedParameterDataType(), $this->getRoutineParameter()->getDataType());
     }
 
-    public function testSetName()
+    public function testSetName(): void
     {
         $newName = 'neo_name';
         $this->getRoutineParameter()->setName($newName);
@@ -34,7 +36,7 @@ public function testSetName()
         $this->assertSame($newName, $this->getRoutineParameter()->getName());
     }
 
-    public function testSetDataType()
+    public function testSetDataType(): void
     {
         $newMockDataType = $this->createMock(DataTypeInterface::class);
         $this->getRoutineParameter()->setDataType($newMockDataType);
diff --git a/PHPUnit/Framework/RoutineTestCase.php b/PHPUnit/Framework/RoutineTestCase.php
index ae4af61..72e46e3 100644
--- a/PHPUnit/Framework/RoutineTestCase.php
+++ b/PHPUnit/Framework/RoutineTestCase.php
@@ -1,10 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\PHPUnit\Framework;
 
 use MilesAsylum\SchnoopSchema\MySQL\DroppableInterface;
 use MilesAsylum\SchnoopSchema\MySQL\HasDelimiterInterface;
-use MilesAsylum\SchnoopSchema\MySQL\MySQLInterface;
 use MilesAsylum\SchnoopSchema\MySQL\Routine\RoutineInterface;
 use MilesAsylum\SchnoopSchema\MySQL\SetVar\SqlMode;
 use PHPUnit\Framework\TestCase;
@@ -23,7 +24,7 @@ abstract protected function createRoutine();
 
     abstract protected function getExpectedName();
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $routine = $this->getRoutine();
 
@@ -45,7 +46,7 @@ public function testInitialProperties()
         $this->assertSame(DroppableInterface::DDL_DROP_POLICY_DO_NOT_DROP, $routine->getDropPolicy());
     }
 
-    public function testSetDatabaseName()
+    public function testSetDatabaseName(): void
     {
         $databaseName = 'schnoop_db';
         $this->getRoutine()->setDatabaseName($databaseName);
@@ -54,7 +55,7 @@ public function testSetDatabaseName()
         $this->assertSame($databaseName, $this->getRoutine()->getDatabaseName());
     }
 
-    public function testSetDefiner()
+    public function testSetDefiner(): void
     {
         $definer = 'me@example';
         $routine = $this->getRoutine();
@@ -63,7 +64,7 @@ public function testSetDefiner()
         $this->assertSame($definer, $routine->getDefiner());
     }
 
-    public function testSetComment()
+    public function testSetComment(): void
     {
         $comment = 'Routine comment.';
         $routine = $this->getRoutine();
@@ -73,7 +74,7 @@ public function testSetComment()
         $this->assertSame($comment, $routine->getComment());
     }
 
-    public function testSetDeterministic()
+    public function testSetDeterministic(): void
     {
         $routine = $this->getRoutine();
         $routine->setDeterministic(true);
@@ -81,7 +82,7 @@ public function testSetDeterministic()
         $this->assertTrue($routine->isDeterministic());
     }
 
-    public function testSetContains()
+    public function testSetContains(): void
     {
         $routine = $this->getRoutine();
         $routine->setDataAccess(RoutineInterface::DATA_ACCESS_MODIFIES_SQL_DATA);
@@ -89,7 +90,7 @@ public function testSetContains()
         $this->assertSame(RoutineInterface::DATA_ACCESS_MODIFIES_SQL_DATA, $routine->getDataAccess());
     }
 
-    public function testSetSqlSecurity()
+    public function testSetSqlSecurity(): void
     {
         $routine = $this->getRoutine();
         $routine->setSqlSecurity(RoutineInterface::SECURITY_INVOKER);
@@ -97,9 +98,9 @@ public function testSetSqlSecurity()
         $this->assertSame(RoutineInterface::SECURITY_INVOKER, $routine->getSqlSecurity());
     }
 
-    public function testSetBody()
+    public function testSetBody(): void
     {
-        $body = "Hello world.";
+        $body = 'Hello world.';
         $routine = $this->getRoutine();
         $routine->setBody($body);
 
@@ -120,9 +121,8 @@ public function testSetSQLMode()
 
     /**
      * @depends testSetSQLMode
-     * @param RoutineInterface $routineWithSqlMode
      */
-    public function testUnsetSqlMode(RoutineInterface $routineWithSqlMode)
+    public function testUnsetSqlMode(RoutineInterface $routineWithSqlMode): void
     {
         $routineWithSqlMode->unsetSqlMode();
 
@@ -130,7 +130,7 @@ public function testUnsetSqlMode(RoutineInterface $routineWithSqlMode)
         $this->assertNull($routineWithSqlMode->getSqlMode());
     }
 
-    public function testSetUseFullyQualifiedName()
+    public function testSetUseFullyQualifiedName(): void
     {
         $routine = $this->getRoutine();
         $routine->setUseFullyQualifiedName(true);
@@ -138,7 +138,7 @@ public function testSetUseFullyQualifiedName()
         $this->assertTrue($routine->useFullyQualifiedName());
     }
 
-    public function testSetDDLDelimiter()
+    public function testSetDDLDelimiter(): void
     {
         $routine = $this->getRoutine();
         $routine->setDelimiter('@@');
@@ -146,7 +146,7 @@ public function testSetDDLDelimiter()
         $this->assertSame('@@', $routine->getDelimiter());
     }
 
-    public function testSetDDLDropPolicy()
+    public function testSetDDLDropPolicy(): void
     {
         $routine = $this->getRoutine();
         $routine->setDropPolicy(RoutineInterface::DDL_DROP_POLICY_DROP_IF_EXISTS);
diff --git a/PHPUnit/Framework/SchnoopSchemaTestCase.php b/PHPUnit/Framework/SchnoopSchemaTestCase.php
index f915fb7..7d0f14b 100644
--- a/PHPUnit/Framework/SchnoopSchemaTestCase.php
+++ b/PHPUnit/Framework/SchnoopSchemaTestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\PHPUnit\Framework;
 
 use MilesAsylum\SchnoopSchema\MySQL\Column\ColumnInterface;
@@ -12,6 +14,7 @@ class SchnoopSchemaTestCase extends TestCase
     /**
      * @param string $columnName
      * @param string $columnDDL
+     *
      * @return ColumnInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected function createMockColumn($columnName, $columnDDL)
@@ -26,6 +29,7 @@ protected function createMockColumn($columnName, $columnDDL)
     /**
      * @param $indexName
      * @param $indexDDL
+     *
      * @return IndexInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected function createMockIndex($indexName, $indexDDL)
@@ -42,6 +46,7 @@ protected function createMockIndex($indexName, $indexDDL)
     /**
      * @param $foreignKeyName
      * @param $foreignKeyDDL
+     *
      * @return ForeignKeyInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected function createMockForeignKey($foreignKeyName, $foreignKeyDDL)
diff --git a/PHPUnit/Framework/TextTypeTestCase.php b/PHPUnit/Framework/TextTypeTestCase.php
index 6dd5cdc..8eea178 100644
--- a/PHPUnit/Framework/TextTypeTestCase.php
+++ b/PHPUnit/Framework/TextTypeTestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\PHPUnit\Framework;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\TextTypeInterface;
@@ -16,7 +18,7 @@ abstract protected function getTextType();
      */
     abstract protected function createTextType();
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $textType = $this->getTextType();
 
@@ -26,7 +28,7 @@ public function testInitialProperties()
         $this->assertFalse($textType->doesAllowDefault());
     }
 
-    public function testSetCollation()
+    public function testSetCollation(): void
     {
         $collation = 'utf8mb4_general_ci';
         $textType = $this->getTextType();
@@ -36,7 +38,7 @@ public function testSetCollation()
         $this->assertSame($collation, $textType->getCollation());
     }
 
-    public function testCast()
+    public function testCast(): void
     {
         $textType = $this->getTextType();
 
@@ -45,6 +47,7 @@ public function testCast()
 
     /**
      * @see testDDL
+     *
      * @return array
      */
     public function DDLProvider()
@@ -57,12 +60,12 @@ public function DDLProvider()
         return [
             [
                 strtoupper($textType->getType()),
-                $textType
+                $textType,
             ],
             [
                 strtoupper($textTypeCollate->getType()) . " COLLATE '$collation'",
-                $textTypeCollate
-            ]
+                $textTypeCollate,
+            ],
         ];
     }
 }
diff --git a/PHPUnit/Framework/TimeTypeTestCase.php b/PHPUnit/Framework/TimeTypeTestCase.php
index 22694f0..b6ad86b 100644
--- a/PHPUnit/Framework/TimeTypeTestCase.php
+++ b/PHPUnit/Framework/TimeTypeTestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\PHPUnit\Framework;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\TimeTypeInterface;
@@ -16,7 +18,7 @@ abstract protected function getTimeType();
      */
     abstract protected function createTimeType();
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $timeType = $this->getTimeType();
 
@@ -25,7 +27,7 @@ public function testInitialProperties()
         $this->assertTrue($timeType->doesAllowDefault());
     }
 
-    public function testSetPrecision()
+    public function testSetPrecision(): void
     {
         $precision = 2;
         $timeType = $this->getTimeType();
@@ -35,7 +37,7 @@ public function testSetPrecision()
         $this->assertSame($precision, $timeType->getPrecision());
     }
 
-    public function testCast()
+    public function testCast(): void
     {
         $timeType = $this->getTimeType();
 
@@ -53,12 +55,12 @@ public function DDLProvider()
         return [
             [
                 strtoupper($timeType->getType()),
-                $timeType
+                $timeType,
             ],
             [
                 strtoupper($timeType->getType()) . "($precision)",
-                $timeTypePrecision
-            ]
+                $timeTypePrecision,
+            ],
         ];
     }
 }
diff --git a/PHPUnit/bootstrap.php b/PHPUnit/bootstrap.php
index c55fb89..a075e1e 100644
--- a/PHPUnit/bootstrap.php
+++ b/PHPUnit/bootstrap.php
@@ -1,3 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../vendor/autoload.php';
\ No newline at end of file
+declare(strict_types=1);
+
+require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index f96e2a7..6b3a596 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,18 +1,20 @@
 <?xml version="1.0" ?>
-<phpunit bootstrap="./PHPUnit/bootstrap.php">
+<phpunit bootstrap="./PHPUnit/bootstrap.php"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
     <testsuites>
         <testsuite name="unit_tests">
             <directory>./tests/SchnoopSchema/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+    <coverage processUncoveredFiles="true">
+        <include>
             <directory suffix=".php">./src/</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
     <php>
         <ini name="display_errors" value="On" />
         <ini name="error_reporting" value="E_ALL" />
         <ini name="xdebug.mode" value="coverage" />
     </php>
-</phpunit>
\ No newline at end of file
+</phpunit>
diff --git a/src/MySQL/Column/Column.php b/src/MySQL/Column/Column.php
index 0c3fca8..baaa49d 100644
--- a/src/MySQL/Column/Column.php
+++ b/src/MySQL/Column/Column.php
@@ -1,58 +1,68 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Column;
 
-use MilesAsylum\SchnoopSchema\MySQL\Exception\LogicException;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\NumericTypeInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\TimeTypeInterface;
+use MilesAsylum\SchnoopSchema\MySQL\Exception\LogicException;
 
 class Column implements ColumnInterface
 {
     /**
      * The name of the column.
+     *
      * @var string
      */
     protected $name;
 
     /**
      * The data type of the column.
+     *
      * @var DataTypeInterface
      */
     protected $dataType;
 
     /**
      * The name of the table the column belongs to.
+     *
      * @var
      */
     protected $tableName;
 
     /**
      * The name of the database the column belongs to.
+     *
      * @var string
      */
     protected $databaseName;
 
     /**
      * Indicates if the column accepts NULL values.
+     *
      * @var bool
      */
     protected $nullable = false;
 
     /**
      * The default value for the column.
+     *
      * @var mixed
      */
     protected $default;
 
     /**
      * Indicates if the column value should be set to the current time on update.
+     *
      * @var bool
      */
     protected $onUpdateCurrentTimestamp = false;
 
     /**
      * The comment for the column.
+     *
      * @var string
      */
     protected $comment;
@@ -64,8 +74,9 @@ class Column implements ColumnInterface
 
     /**
      * Column constructor.
-     * @param string $name The name of the column.
-     * @param DataTypeInterface $dataType The data type of the column.
+     *
+     * @param string $name the name of the column
+     * @param DataTypeInterface $dataType the data type of the column
      */
     public function __construct($name, DataTypeInterface $dataType)
     {
@@ -96,7 +107,7 @@ public function getTableName()
     /**
      * {@inheritdoc}
      */
-    public function setTableName($tableName)
+    public function setTableName($tableName): void
     {
         $this->tableName = $tableName;
     }
@@ -120,7 +131,7 @@ public function getDatabaseName()
     /**
      * {@inheritdoc}
      */
-    public function setDatabaseName($databaseName)
+    public function setDatabaseName($databaseName): void
     {
         $this->databaseName = $databaseName;
     }
@@ -152,7 +163,7 @@ public function isNullable()
     /**
      * {@inheritdoc}
      */
-    public function setNullable($nullable)
+    public function setNullable($nullable): void
     {
         $this->nullable = $nullable;
     }
@@ -166,7 +177,7 @@ public function hasDefault()
             return false;
         }
 
-        return $this->default !== null || $this->isNullable();
+        return null !== $this->default || $this->isNullable();
     }
 
     /**
@@ -179,25 +190,21 @@ public function getDefault()
 
     /**
      * {@inheritdoc}
-     * @throws LogicException Exception when setting a default value when the
-     * data type does not support it.
+     *
+     * @throws LogicException exception when setting a default value when the
+     *                        data type does not support it
      */
-    public function setDefault($default)
+    public function setDefault($default): void
     {
-        if ($default !== null && !$this->getDataType()->doesAllowDefault()) {
-            throw new LogicException(
-                sprintf(
-                    'Unable to set default value for the column. The data-type "%s" does not support a default.',
-                    $this->getDataType()->getType()
-                )
-            );
+        if (null !== $default && !$this->getDataType()->doesAllowDefault()) {
+            throw new LogicException(sprintf('Unable to set default value for the column. The data-type "%s" does not support a default.', $this->getDataType()->getType()));
         }
 
         if (is_array($default)) {
             foreach ($default as $k => $v) {
                 $default[$k] = $this->getDataType()->cast($v);
             }
-        } elseif ($default !== null) {
+        } elseif (null !== $default) {
             if (!($this->getDataType() instanceof TimeTypeInterface)) {
                 $default = $this->getDataType()->cast($default);
             }
@@ -209,7 +216,7 @@ public function setDefault($default)
     /**
      * {@inheritdoc}
      */
-    public function unsetDefault()
+    public function unsetDefault(): void
     {
         $this->default = null;
     }
@@ -224,19 +231,14 @@ public function isOnUpdateCurrentTimestamp()
 
     /**
      * {@inheritdoc}
-     * @throws LogicException Exception when setting this property when the
-     * data type does not support it.
+     *
+     * @throws LogicException exception when setting this property when the
+     *                        data type does not support it
      */
-    public function setOnUpdateCurrentTimestamp($onUpdateCurrentTimestamp)
+    public function setOnUpdateCurrentTimestamp($onUpdateCurrentTimestamp): void
     {
         if (!empty($onUpdateCurrentTimestamp) && !($this->dataType instanceof TimeTypeInterface)) {
-            throw new LogicException(
-                sprintf(
-                    'Data type "%s" for column "%s" does not support setting current time on update.',
-                    $this->dataType->getType(),
-                    $this->name
-                )
-            );
+            throw new LogicException(sprintf('Data type "%s" for column "%s" does not support setting current time on update.', $this->dataType->getType(), $this->name));
         }
 
         $this->onUpdateCurrentTimestamp = $onUpdateCurrentTimestamp;
@@ -255,21 +257,21 @@ public function getComment()
      */
     public function hasComment()
     {
-        return (bool)strlen($this->comment);
+        return null !== $this->comment && '' !== $this->comment;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function setComment($comment)
+    public function setComment($comment): void
     {
-        $this->comment = strlen($comment) ? (string)$comment : null;
+        $this->comment = null !== $comment && '' !== $comment ? $comment : null;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function unsetComment()
+    public function unsetComment(): void
     {
         $this->comment = '';
     }
@@ -284,18 +286,14 @@ public function isAutoIncrement()
 
     /**
      * {@inheritdoc}
-     * @throws LogicException Exception when setting this property when the
-     * data type does not support it.
+     *
+     * @throws LogicException exception when setting this property when the
+     *                        data type does not support it
      */
-    public function setAutoIncrement($autoIncrement)
+    public function setAutoIncrement($autoIncrement): void
     {
         if ($autoIncrement && !($this->dataType instanceof NumericTypeInterface)) {
-            throw new LogicException(
-                sprintf(
-                    'Unable to set auto-increment property on the column. Data-type "%s" does not support an auto-incrementing value.',
-                    $this->getDataType()->getType()
-                )
-            );
+            throw new LogicException(sprintf('Unable to set auto-increment property on the column. Data-type "%s" does not support an auto-incrementing value.', $this->getDataType()->getType()));
         }
 
         $this->autoIncrement = $autoIncrement;
@@ -317,12 +315,12 @@ public function getDDL()
             array_filter(
                 [
                     '`' . $this->getName() . '`',
-                    (string)$this->getDataType(),
+                    (string) $this->getDataType(),
                     $this->nullable ? 'NULL' : 'NOT NULL',
                     $this->hasDefault() ? 'DEFAULT ' . $default : null,
                     $this->isOnUpdateCurrentTimestamp() ? $this->createOnUpdateCurrentTimestampDDL() : null,
                     $this->isAutoIncrement() ? 'AUTO_INCREMENT' : null,
-                    $this->hasComment() ? sprintf("COMMENT '%s'", addslashes($this->getComment())) : null
+                    $this->hasComment() ? sprintf("COMMENT '%s'", addslashes($this->getComment())) : null,
                 ]
             )
         );
@@ -338,8 +336,10 @@ public function __toString()
 
     /**
      * Creates the portion of DDL for the column default value.
+     *
      * @param mixed $default
-     * @return string DDL portion for the column default.
+     *
+     * @return string DDL portion for the column default
      */
     protected function createDefaultDDL($default)
     {
@@ -351,12 +351,12 @@ protected function createDefaultDDL($default)
             }
             $default = '(' . implode(',', $default) . ')';
         } elseif ($dataType instanceof TimeTypeInterface
-            && $this->getDefault() == self::DEFAULT_CURRENT_TIMESTAMP
+            && self::DEFAULT_CURRENT_TIMESTAMP == $this->getDefault()
         ) {
             $precision = $dataType->hasPrecision() ? '(' . $dataType->getPrecision() . ')' : null;
             $default = self::DEFAULT_CURRENT_TIMESTAMP . $precision;
         } else {
-            $default = $this->getDefault() === null ? 'NULL' : $this->getDataType()->quote($default);
+            $default = null === $this->getDefault() ? 'NULL' : $this->getDataType()->quote($default);
         }
 
         return $default;
@@ -365,8 +365,9 @@ protected function createDefaultDDL($default)
     /**
      * Creates the portion of DDL for setting column value to the current
      * time on update.
-     * @return null|string DDL portion for setting column value to the current
-     * time. NULL if the column is not set to have the value set on update.
+     *
+     * @return string|null DDL portion for setting column value to the current
+     *                     time. NULL if the column is not set to have the value set on update.
      */
     protected function createOnUpdateCurrentTimestampDDL()
     {
diff --git a/src/MySQL/Column/ColumnInterface.php b/src/MySQL/Column/ColumnInterface.php
index 633b0b6..6106d1e 100644
--- a/src/MySQL/Column/ColumnInterface.php
+++ b/src/MySQL/Column/ColumnInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Column;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
@@ -9,73 +11,85 @@ interface ColumnInterface extends MySQLInterface
 {
     /**
      * MySQL keyword for the current time.
+     *
      * @see http://dev.mysql.com/doc/refman/5.7/en/date-and-time-functions.html#function_current-timestamp
      */
-    const DEFAULT_CURRENT_TIMESTAMP = 'CURRENT_TIMESTAMP';
+    public const DEFAULT_CURRENT_TIMESTAMP = 'CURRENT_TIMESTAMP';
 
     /**
      * Get the column name.
-     * @return string The column name.
+     *
+     * @return string the column name
      */
     public function getName();
 
     /**
-     * Get the data type for the column
-     * @return DataTypeInterface The data type.
+     * Get the data type for the column.
+     *
+     * @return DataTypeInterface the data type
      */
     public function getDataType();
 
     /**
      * Get the name of the table the column belongs to.
-     * @return string The table name.
+     *
+     * @return string the table name
      */
     public function getTableName();
 
     /**
      * Set the name of the table the column belongs to.
+     *
      * @param string $tableName
      */
     public function setTableName($tableName);
 
     /**
-     * Identify if a table name has been set for the column
-     * @return bool Returns true if the table name has been set.
+     * Identify if a table name has been set for the column.
+     *
+     * @return bool returns true if the table name has been set
      */
     public function hasTableName();
 
     /**
      * Get the name of the database the column belongs to.
-     * @return string The database name.
+     *
+     * @return string the database name
      */
     public function getDatabaseName();
 
     /**
      * Set the name of the database the column belongs to.
+     *
      * @param string $databaseName
      */
     public function setDatabaseName($databaseName);
 
     /**
      * Identify if a database name has been set for the column.
-     * @return bool Returns true if the database name has been set.
+     *
+     * @return bool returns true if the database name has been set
      */
     public function hasDatabaseName();
 
     /**
      * Indicates if the column will accept a NULL value.
-     * @return bool Returns true if the column accepts a NULL value.
+     *
+     * @return bool returns true if the column accepts a NULL value
      */
     public function isNullable();
 
     /**
      * Set if the column will accept a NULL value.
-     * @param bool $nullable Set to true to allow a NULL value.
+     *
+     * @param bool $nullable set to true to allow a NULL value
      */
     public function setNullable($nullable);
 
     /**
      * Indicates if the column has a default value.
-     * @return bool True if the column has a default value.
+     *
+     * @return bool true if the column has a default value
      */
     public function hasDefault();
 
@@ -84,12 +98,14 @@ public function hasDefault();
      * column is not nullable, then this means there is no default value. If
      * the column is nullable and the return value is null, then the default
      * value is NULL.
-     * @return mixed The default value.
+     *
+     * @return mixed the default value
      */
     public function getDefault();
 
     /**
      * Set the default value for the column.
+     *
      * @param mixed $default
      */
     public function setDefault($default);
@@ -104,64 +120,73 @@ public function unsetDefault();
      * Indicates if the column value will be set to the current time on an
      * update. This only applies if the column has an appropriate date/time
      * data type.
-     * @return bool True if the the column will be set to the current time on
-     * an update.
+     *
+     * @return bool true if the the column will be set to the current time on
+     *              an update
      */
     public function isOnUpdateCurrentTimestamp();
 
     /**
      * Set if the column value should be set to the current time on an update.
      * This applies only if the column has an appropriate date/time data type.
+     *
      * @param bool $onUpdateCurrentTimestamp
      */
     public function setOnUpdateCurrentTimestamp($onUpdateCurrentTimestamp);
 
     /**
      * Get the column comment.
-     * @return string The comment, or null if a comment is not set.
+     *
+     * @return string the comment, or null if a comment is not set
      */
     public function getComment();
 
     /**
      * Indicates if the column has a comment.
-     * @return bool True if the column has a comment.
+     *
+     * @return bool true if the column has a comment
      */
     public function hasComment();
 
     /**
      * Set a comment for the column.
+     *
      * @param string $comment
      */
     public function setComment($comment);
 
     /**
-     * Remove the comment for the column;
+     * Remove the comment for the column;.
      */
     public function unsetComment();
 
     /**
      * Identify if the column has an auto-incrementing value.
-     * @return bool|null Returns a boolean if the column is for a numeric
-     * data-type, otherwise null for types that do not support this property.
+     *
+     * @return bool|null returns a boolean if the column is for a numeric
+     *                   data-type, otherwise null for types that do not support this property
      */
     public function isAutoIncrement();
 
     /**
      * Set if the column value should auto-increment. This applies only if the
      * column has a numeric data type that support auto-incrementing.
+     *
      * @param bool $autoIncrement
      */
     public function setAutoIncrement($autoIncrement);
 
     /**
      * Get the DDL descriptor for the column.
-     * @return string DDL descriptor for the column.
+     *
+     * @return string DDL descriptor for the column
      */
     public function getDDL();
 
     /**
      * @uses ColumnInterface::getDDL()
-     * @return string DDL descriptor for the column.
+     *
+     * @return string DDL descriptor for the column
      */
     public function __toString();
 }
diff --git a/src/MySQL/Constraint/AbstractConstraint.php b/src/MySQL/Constraint/AbstractConstraint.php
index 208f75b..3640664 100644
--- a/src/MySQL/Constraint/AbstractConstraint.php
+++ b/src/MySQL/Constraint/AbstractConstraint.php
@@ -1,35 +1,42 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Constraint;
 
 abstract class AbstractConstraint implements ConstraintInterface
 {
     /**
      * Constraint name.
+     *
      * @var string
      */
     protected $name;
 
     /**
      * Constraint type.
+     *
      * @var string
      */
     protected $constraintType;
 
     /**
      * Name of the table the constraint belongs to.
+     *
      * @var string
      */
     protected $tableName;
 
     /**
      * Name of the database the constraint belongs to.
+     *
      * @var string
      */
     protected $databaseName;
 
     /**
      * AbstractConstraint constructor.
+     *
      * @param string $name Constraint name
      * @param string $constraintType Constraint type.  One of self::CONSTRAINT_* constants.
      */
@@ -66,7 +73,7 @@ public function getTableName()
     /**
      * {@inheritdoc}
      */
-    public function setTableName($tableName)
+    public function setTableName($tableName): void
     {
         $this->tableName = $tableName;
     }
@@ -98,7 +105,7 @@ public function hasDatabaseName()
     /**
      * {@inheritdoc}
      */
-    public function setDatabaseName($databaseName)
+    public function setDatabaseName($databaseName): void
     {
         $this->databaseName = $databaseName;
     }
diff --git a/src/MySQL/Constraint/AbstractIndex.php b/src/MySQL/Constraint/AbstractIndex.php
index 8d83de0..b8e740a 100644
--- a/src/MySQL/Constraint/AbstractIndex.php
+++ b/src/MySQL/Constraint/AbstractIndex.php
@@ -1,29 +1,35 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Constraint;
 
 abstract class AbstractIndex extends AbstractConstraint implements IndexInterface
 {
     /**
      * Indexed columns.
+     *
      * @var IndexedColumnInterface[]
      */
     protected $indexedColumns = [];
 
     /**
      * Index type.
+     *
      * @var string
      */
     protected $indexType;
 
     /**
      * Index comment.
+     *
      * @var string
      */
     protected $comment;
 
     /**
      * AbstractIndex constructor.
+     *
      * @param string $name Index name
      * @param string $constraintType Constraint type. One of self::CONSTRAINT_* constants.
      * @param null $indexType Index type. Either self::INDEX_TYPE_BTREE or self::INDEX_TYPE_HASH.
@@ -46,7 +52,7 @@ public function getIndexedColumns()
     /**
      * {@inheritdoc}
      */
-    public function setIndexedColumns(array $indexedColumns)
+    public function setIndexedColumns(array $indexedColumns): void
     {
         $this->indexedColumns = [];
 
@@ -66,7 +72,7 @@ public function hasIndexedColumns()
     /**
      * {@inheritdoc}
      */
-    public function addIndexedColumn(IndexedColumnInterface $indexedColumn)
+    public function addIndexedColumn(IndexedColumnInterface $indexedColumn): void
     {
         $this->indexedColumns[$indexedColumn->getColumnName()] = $indexedColumn;
     }
@@ -100,21 +106,23 @@ public function getComment()
      */
     public function hasComment()
     {
-        return (bool)strlen($this->comment);
+        return null !== $this->comment && '' !== $this->comment;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function setComment($comment)
+    public function setComment($comment): void
     {
         $this->comment = $comment;
     }
 
     /**
      * Makes the DDL statement for the index.
+     *
      * @param string $type Index type
      * @param string|null $name Index name
+     *
      * @return string Index DDL
      */
     protected function makeIndexDDL($type, $name = null)
@@ -124,9 +132,9 @@ protected function makeIndexDDL($type, $name = null)
             array_filter(
                 [
                     strtoupper($type),
-                    $name !== null ? '`' . $name . '`' : null,
+                    null !== $name ? '`' . $name . '`' : null,
                     $this->makeIndexedColumnsDDL(),
-                    $this->hasComment() ? "COMMENT '" . addslashes($this->getComment()) . "'" : null
+                    $this->hasComment() ? "COMMENT '" . addslashes($this->getComment()) . "'" : null,
                 ]
             )
         );
@@ -134,7 +142,8 @@ protected function makeIndexDDL($type, $name = null)
 
     /**
      * Makes the column portion of the index DDL statement.
-     * @return string Column portion of index DDL statement.
+     *
+     * @return string column portion of index DDL statement
      */
     protected function makeIndexedColumnsDDL()
     {
@@ -151,9 +160,10 @@ protected function makeIndexedColumnsDDL()
 
     /**
      * Set the index type.
+     *
      * @param $indexType Index type. One of self::INDEX_TYPE_* constants.
      */
-    protected function setIndexType($indexType)
+    protected function setIndexType($indexType): void
     {
         $this->indexType = $indexType;
     }
diff --git a/src/MySQL/Constraint/ConstraintColumnInterface.php b/src/MySQL/Constraint/ConstraintColumnInterface.php
index 82377a5..85d439c 100644
--- a/src/MySQL/Constraint/ConstraintColumnInterface.php
+++ b/src/MySQL/Constraint/ConstraintColumnInterface.php
@@ -1,18 +1,22 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Constraint;
 
 use MilesAsylum\SchnoopSchema\MySQL\MySQLInterface;
 
 /**
- * Interface ConstraintColumnInterface
+ * Interface ConstraintColumnInterface.
+ *
  * @package MilesAsylum\SchnoopSchema\MySQL\Constraint
  */
 interface ConstraintColumnInterface extends MySQLInterface
 {
     /**
      * Get the name of the indexed column.
-     * @return string Column name.
+     *
+     * @return string column name
      */
     public function getColumnName();
 }
diff --git a/src/MySQL/Constraint/ConstraintInterface.php b/src/MySQL/Constraint/ConstraintInterface.php
index 3a24572..3b50e1e 100644
--- a/src/MySQL/Constraint/ConstraintInterface.php
+++ b/src/MySQL/Constraint/ConstraintInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Constraint;
 
 use MilesAsylum\SchnoopSchema\MySQL\MySQLInterface;
@@ -9,86 +11,97 @@ interface ConstraintInterface extends MySQLInterface
     /**
      * MySQL keyword for index.
      */
-    const CONSTRAINT_INDEX = 'INDEX';
+    public const CONSTRAINT_INDEX = 'INDEX';
 
     /**
      * MySQL keyword for unique index.
      */
-    const CONSTRAINT_INDEX_UNIQUE = 'UNIQUE INDEX';
+    public const CONSTRAINT_INDEX_UNIQUE = 'UNIQUE INDEX';
 
     /**
      * MySQL keyword for fulltext index.
      */
-    const CONSTRAINT_INDEX_FULLTEXT = 'FULLTEXT INDEX';
+    public const CONSTRAINT_INDEX_FULLTEXT = 'FULLTEXT INDEX';
 
     /**
      * MySQL keyword for spatial index.
      */
-    const CONSTRAINT_INDEX_SPATIAL = 'SPATIAL INDEX';
+    public const CONSTRAINT_INDEX_SPATIAL = 'SPATIAL INDEX';
 
     /**
      * MySQL keyword for foreign key.
      */
-    const CONSTRAINT_FOREIGN_KEY = 'FOREIGN KEY';
+    public const CONSTRAINT_FOREIGN_KEY = 'FOREIGN KEY';
 
     /**
      * Get the index name.
-     * @return string Index name.
+     *
+     * @return string index name
      */
     public function getName();
 
     /**
      * Get the table name for the index.
-     * @return string Table name.
+     *
+     * @return string table name
      */
     public function getTableName();
 
     /**
      * Set the table name for the index.
-     * @param string $tableName Table Name.
+     *
+     * @param string $tableName table Name
      */
     public function setTableName($tableName);
 
     /**
      * Identify if a table name is set for the index.
-     * @return bool True if a table name is set.
+     *
+     * @return bool true if a table name is set
      */
     public function hasTableName();
 
     /**
      * Get the database name for the index.
-     * @return string Database name.
+     *
+     * @return string database name
      */
     public function getDatabaseName();
 
     /**
      * Identify if a database name is set for the index.
-     * @return bool True if a database name is set.
+     *
+     * @return bool true if a database name is set
      */
     public function hasDatabaseName();
 
     /**
      * Set the database name for the index.
-     * @param string $databaseName Database name.
+     *
+     * @param string $databaseName database name
      */
     public function setDatabaseName($databaseName);
 
     /**
      * Get the constraint type.
-     * @return mixed One of self::CONSTRAINT_* constants.
+     *
+     * @return mixed one of self::CONSTRAINT_* constants
      */
     public function getConstraintType();
 
     /**
      * Get the DDL descriptor for the index.
-     * @return string DDL descriptor for the index.
+     *
+     * @return string DDL descriptor for the index
      */
     public function getDDL();
 
     /**
      * DDL descriptor for the index.
+     *
      * @uses ConstraintInterface::getDDL()
-     * @return string DDL descriptor for the index.
+     *
+     * @return string DDL descriptor for the index
      */
     public function __toString();
 }
diff --git a/src/MySQL/Constraint/ForeignKey.php b/src/MySQL/Constraint/ForeignKey.php
index d8f95e3..64dcf63 100644
--- a/src/MySQL/Constraint/ForeignKey.php
+++ b/src/MySQL/Constraint/ForeignKey.php
@@ -1,35 +1,42 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Constraint;
 
 class ForeignKey extends AbstractConstraint implements ForeignKeyInterface
 {
     /**
      * Reference table name.
+     *
      * @var string
      */
     protected $referenceTableName;
 
     /**
      * Foreign key columns.
+     *
      * @var ForeignKeyColumnInterface[]
      */
     protected $foreignKeyColumns = [];
 
     /**
      * Action on deletion.
+     *
      * @var string
      */
     protected $onDeleteAction;
 
     /**
      * Action on update.
+     *
      * @var string
      */
     protected $onUpdateAction;
 
     /**
      * ForeignKey constructor.
+     *
      * @param string $name Trigger name
      */
     public function __construct($name)
@@ -50,7 +57,7 @@ public function getOnDeleteAction()
     /**
      * {@inheritdoc}
      */
-    public function setOnDeleteAction($onDeleteAction)
+    public function setOnDeleteAction($onDeleteAction): void
     {
         $this->onDeleteAction = $onDeleteAction;
     }
@@ -66,7 +73,7 @@ public function getOnUpdateAction()
     /**
      * {@inheritdoc}
      */
-    public function setOnUpdateAction($onUpdateAction)
+    public function setOnUpdateAction($onUpdateAction): void
     {
         $this->onUpdateAction = $onUpdateAction;
     }
@@ -90,7 +97,7 @@ public function hasReferenceTableName()
     /**
      * {@inheritdoc}
      */
-    public function setReferenceTableName($referenceTableName)
+    public function setReferenceTableName($referenceTableName): void
     {
         $this->referenceTableName = $referenceTableName;
     }
@@ -168,7 +175,7 @@ public function hasForeignKeyColumn($columnName)
     /**
      * {@inheritdoc}
      */
-    public function setForeignKeyColumns(array $foreignKeyColumns)
+    public function setForeignKeyColumns(array $foreignKeyColumns): void
     {
         $this->foreignKeyColumns = [];
 
@@ -180,7 +187,7 @@ public function setForeignKeyColumns(array $foreignKeyColumns)
     /**
      * {@inheritdoc}
      */
-    public function addForeignKeyColumn(ForeignKeyColumnInterface $foreignKeyColumn)
+    public function addForeignKeyColumn(ForeignKeyColumnInterface $foreignKeyColumn): void
     {
         $this->foreignKeyColumns[$foreignKeyColumn->getColumnName()] = $foreignKeyColumn;
     }
@@ -222,7 +229,7 @@ public function getDDL()
                     'REFERENCES',
                     $this->makeReferenceColumnDDL(),
                     'ON DELETE ' . $this->getOnDeleteAction(),
-                    'ON UPDATE ' . $this->getOnUpdateAction()
+                    'ON UPDATE ' . $this->getOnUpdateAction(),
                 ]
             )
         );
diff --git a/src/MySQL/Constraint/ForeignKeyColumn.php b/src/MySQL/Constraint/ForeignKeyColumn.php
index 6a1be96..141db1f 100644
--- a/src/MySQL/Constraint/ForeignKeyColumn.php
+++ b/src/MySQL/Constraint/ForeignKeyColumn.php
@@ -1,25 +1,30 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Constraint;
 
 class ForeignKeyColumn implements ForeignKeyColumnInterface
 {
     /**
-     * Column name
+     * Column name.
+     *
      * @var
      */
     protected $columnName;
 
     /**
      * Reference column name.
+     *
      * @var
      */
     protected $referenceColumnName;
 
     /**
      * ForeignKeyColumn constructor.
-     * @param string $columnName Name of indexed column.
-     * @param string $referenceColumnName Name of reference column.
+     *
+     * @param string $columnName name of indexed column
+     * @param string $referenceColumnName name of reference column
      */
     public function __construct($columnName, $referenceColumnName)
     {
diff --git a/src/MySQL/Constraint/ForeignKeyColumnInterface.php b/src/MySQL/Constraint/ForeignKeyColumnInterface.php
index ece0740..5af9fd3 100644
--- a/src/MySQL/Constraint/ForeignKeyColumnInterface.php
+++ b/src/MySQL/Constraint/ForeignKeyColumnInterface.php
@@ -1,12 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Constraint;
 
 interface ForeignKeyColumnInterface extends ConstraintColumnInterface
 {
     /**
      * Get the reference column name for the foreign key column.
-     * @return string Reference column name.
+     *
+     * @return string reference column name
      */
     public function getReferenceColumnName();
 }
diff --git a/src/MySQL/Constraint/ForeignKeyInterface.php b/src/MySQL/Constraint/ForeignKeyInterface.php
index 0901b07..0cea335 100644
--- a/src/MySQL/Constraint/ForeignKeyInterface.php
+++ b/src/MySQL/Constraint/ForeignKeyInterface.php
@@ -1,103 +1,122 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Constraint;
 
 interface ForeignKeyInterface extends ConstraintInterface
 {
-    const REFERENCE_ACTION_RESTRICT = 'RESTRICT';
-    const REFERENCE_ACTION_CASCADE = 'CASCADE';
-    const REFERENCE_ACTION_SET_NULL = 'SET NULL';
-    const REFERENCE_ACTION_NO_ACTION = 'NO ACTION';
+    public const REFERENCE_ACTION_RESTRICT = 'RESTRICT';
+    public const REFERENCE_ACTION_CASCADE = 'CASCADE';
+    public const REFERENCE_ACTION_SET_NULL = 'SET NULL';
+    public const REFERENCE_ACTION_NO_ACTION = 'NO ACTION';
 
     /**
      * Get the reference table for the foreign key.
-     * @return string Reference table name.
+     *
+     * @return string reference table name
      */
     public function getReferenceTableName();
 
     /**
      * Identify if the name of the reference table has been set for the foreign key.
+     *
      * @return bool
      */
     public function hasReferenceTableName();
 
     /**
      * Set the name of the reference table for the foreign key.
-     * @param string $tableName Reference table name.
+     *
+     * @param string $tableName reference table name
      */
     public function setReferenceTableName($tableName);
 
     /**
      * Get the foreign key columns.
-     * @return ForeignKeyColumnInterface[] Foreign key columns.
+     *
+     * @return ForeignKeyColumnInterface[] foreign key columns
      */
     public function getForeignKeyColumns();
 
     /**
      * Identify if any foreign key columns have been set.
-     * @return bool True if at least one column has been set for the foreign key.
+     *
+     * @return bool true if at least one column has been set for the foreign key
      */
     public function hasForeignKeyColumns();
 
     /**
      * Identifies if the foreign key includes the specified column.
+     *
      * @param $columnName
-     * @return bool True if the column exists in the foreign key.
+     *
+     * @return bool true if the column exists in the foreign key
      */
     public function hasForeignKeyColumn($columnName);
 
     /**
      * Set the foreign key columns.
-     * @param ForeignKeyColumnInterface[] $foreignKeyColumns Foreign key columns.
+     *
+     * @param ForeignKeyColumnInterface[] $foreignKeyColumns foreign key columns
      */
     public function setForeignKeyColumns(array $foreignKeyColumns);
 
     /**
      * Add a foreign key column.
-     * @param ForeignKeyColumnInterface $foreignKeyColumn Foreign key column.
+     *
+     * @param ForeignKeyColumnInterface $foreignKeyColumn foreign key column
      */
     public function addForeignKeyColumn(ForeignKeyColumnInterface $foreignKeyColumn);
 
     /**
      * Get the names of the columns for the foreign key.
-     * @return array Column names.
+     *
+     * @return array column names
      */
     public function getColumnNames();
 
     /**
      * Get reference column names for the foreign key.
-     * @return array Reference column names.
+     *
+     * @return array reference column names
      */
     public function getReferenceColumnNames();
 
     /**
      * Identify if the supplied column name is one of the reference columns for the foreign key.
+     *
      * @param string $columnName
-     * @param string|null $tableName Optionally include the table name with the check.
+     * @param string|null $tableName optionally include the table name with the check
+     *
      * @return bool
      */
     public function hasReferenceColumnName($columnName, $tableName = null);
 
     /**
      * Get the action to perform against the reference table when a row is deleted.
+     *
      * @return string Deletion action. One of self::REFERENCE_ACTION_* constants.
      */
     public function getOnDeleteAction();
 
     /**
      * Set the action against the reference table when a row is deleted.
+     *
      * @param string $onDeleteAction Deletion action. One of self::REFERENCE_ACTION_* constants.
      */
     public function setOnDeleteAction($onDeleteAction);
 
     /**
      * Get the action to perform against the reference table when the foreign key columns are updated.
+     *
      * @return string Update action. One of self::REFERENCE_ACTION_* constants.
      */
     public function getOnUpdateAction();
 
     /**
      * Set the action to perform against the reference table when the foreign key columns are updated.
+     *
      * @param string $onUpdateAction Update action. One of self::REFERENCE_ACTION_* constants.
      */
     public function setOnUpdateAction($onUpdateAction);
diff --git a/src/MySQL/Constraint/FullTextIndex.php b/src/MySQL/Constraint/FullTextIndex.php
index f231f08..4f195f7 100644
--- a/src/MySQL/Constraint/FullTextIndex.php
+++ b/src/MySQL/Constraint/FullTextIndex.php
@@ -1,12 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Constraint;
 
 class FullTextIndex extends AbstractIndex
 {
     /**
      * FullTextIndex constructor.
-     * @param string $name Index name.
+     *
+     * @param string $name index name
      */
     public function __construct($name)
     {
diff --git a/src/MySQL/Constraint/Index.php b/src/MySQL/Constraint/Index.php
index c3659cd..936202e 100644
--- a/src/MySQL/Constraint/Index.php
+++ b/src/MySQL/Constraint/Index.php
@@ -1,12 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Constraint;
 
 class Index extends AbstractIndex
 {
     /**
      * Index constructor.
-     * @param string $name Index name.
+     *
+     * @param string $name index name
      */
     public function __construct($name)
     {
diff --git a/src/MySQL/Constraint/IndexInterface.php b/src/MySQL/Constraint/IndexInterface.php
index 810176e..540ca49 100644
--- a/src/MySQL/Constraint/IndexInterface.php
+++ b/src/MySQL/Constraint/IndexInterface.php
@@ -1,64 +1,73 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Constraint;
 
 interface IndexInterface extends ConstraintInterface
 {
-    const INDEX_TYPE_BTREE = 'BTREE';
-    const INDEX_TYPE_HASH = 'HASH';
-    const INDEX_TYPE_FULLTEXT = 'FULLTEXT';
-    const INDEX_TYPE_RTREE = 'RTREE';
+    public const INDEX_TYPE_BTREE = 'BTREE';
+    public const INDEX_TYPE_HASH = 'HASH';
+    public const INDEX_TYPE_FULLTEXT = 'FULLTEXT';
+    public const INDEX_TYPE_RTREE = 'RTREE';
 
     /**
      * Get indexed columns.
+     *
      * @return IndexedColumnInterface[]
      */
     public function getIndexedColumns();
 
     /**
      * Identify if the index has any columns set.
+     *
      * @return bool
      */
     public function hasIndexedColumns();
 
     /**
-     * Set the columns for the index
+     * Set the columns for the index.
+     *
      * @param IndexedColumnInterface[] $indexedColumns
      */
     public function setIndexedColumns(array $indexedColumns);
 
     /**
      * Add a column to the index.
-     * @param IndexedColumnInterface $indexedColumn
      */
     public function addIndexedColumn(IndexedColumnInterface $indexedColumn);
 
     /**
      * Get the name of columns in the index.
-     * @return array Column names.
+     *
+     * @return array column names
      */
     public function getIndexedColumnNames();
 
     /**
      * Get the index type.
+     *
      * @return string Index type. One of self::INDEX_TYPE_* constants.
      */
     public function getIndexType();
 
     /**
      * Set a comment for the index.
+     *
      * @param $comment
      */
     public function setComment($comment);
 
     /**
      * Get the comment for the index.
+     *
      * @return string
      */
     public function getComment();
 
     /**
      * Identify if a comment is set for the index.
+     *
      * @return bool
      */
     public function hasComment();
diff --git a/src/MySQL/Constraint/IndexedColumn.php b/src/MySQL/Constraint/IndexedColumn.php
index 71cae00..7ef4009 100644
--- a/src/MySQL/Constraint/IndexedColumn.php
+++ b/src/MySQL/Constraint/IndexedColumn.php
@@ -1,30 +1,36 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Constraint;
 
 class IndexedColumn implements IndexedColumnInterface
 {
     /**
      * Column name.
+     *
      * @var string
      */
     protected $columnName;
 
     /**
      * Index prefix length.
+     *
      * @var int
      */
     protected $length;
 
     /**
      * Index collation.
+     *
      * @var string
      */
     protected $collation;
 
     /**
      * IndexedColumn constructor.
-     * @param string $columnName Column name.
+     *
+     * @param string $columnName column name
      */
     public function __construct($columnName)
     {
@@ -74,7 +80,7 @@ public function getCollation()
     /**
      * {@inheritdoc}
      */
-    public function setCollation($collation)
+    public function setCollation($collation): void
     {
         $this->collation = $collation;
     }
diff --git a/src/MySQL/Constraint/IndexedColumnInterface.php b/src/MySQL/Constraint/IndexedColumnInterface.php
index 8bb2fb4..2f7f4d0 100644
--- a/src/MySQL/Constraint/IndexedColumnInterface.php
+++ b/src/MySQL/Constraint/IndexedColumnInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Constraint;
 
 interface IndexedColumnInterface extends ConstraintColumnInterface
@@ -7,40 +9,46 @@ interface IndexedColumnInterface extends ConstraintColumnInterface
     /**
      * MySQL keyword for ascending index collation.
      */
-    const COLLATION_ASC = 'ASC';
+    public const COLLATION_ASC = 'ASC';
 
     /**
      * Get the index prefix length.
-     * @return int Index prefix length.
+     *
+     * @return int index prefix length
      */
     public function getLength();
 
     /**
      * Identify if length is set for the index.
+     *
      * @return bool
      */
     public function hasLength();
 
     /**
      * Set the prefix length for the index.
-     * @param int $length Prefix length.
+     *
+     * @param int $length prefix length
      */
     public function setLength($length);
 
     /**
      * Get the collation for the index.
-     * @return string One of self::COLLATION_* constants.
+     *
+     * @return string one of self::COLLATION_* constants
      */
     public function getCollation();
 
     /**
      * Set the collation for the index.
-     * @param string $collation One of self::COLLATION_* constants.
+     *
+     * @param string $collation one of self::COLLATION_* constants
      */
     public function setCollation($collation);
 
     /**
      * Identify if collation is set for the index.
+     *
      * @return bool
      */
     public function hasCollation();
diff --git a/src/MySQL/Constraint/PrimaryKey.php b/src/MySQL/Constraint/PrimaryKey.php
index e4fc445..6ae3a22 100644
--- a/src/MySQL/Constraint/PrimaryKey.php
+++ b/src/MySQL/Constraint/PrimaryKey.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Constraint;
 
 class PrimaryKey extends UniqueIndex
diff --git a/src/MySQL/Constraint/SpatialIndex.php b/src/MySQL/Constraint/SpatialIndex.php
index 34e32e2..3156d64 100644
--- a/src/MySQL/Constraint/SpatialIndex.php
+++ b/src/MySQL/Constraint/SpatialIndex.php
@@ -1,12 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Constraint;
 
 class SpatialIndex extends AbstractIndex
 {
     /**
      * SpatialIndex constructor.
-     * @param string $name Index name.
+     *
+     * @param string $name index name
      */
     public function __construct($name)
     {
diff --git a/src/MySQL/Constraint/UniqueIndex.php b/src/MySQL/Constraint/UniqueIndex.php
index c0333e1..9bc5680 100644
--- a/src/MySQL/Constraint/UniqueIndex.php
+++ b/src/MySQL/Constraint/UniqueIndex.php
@@ -1,12 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Constraint;
 
 class UniqueIndex extends AbstractIndex
 {
     /**
      * UniqueIndex constructor.
-     * @param string $name Index name.
+     *
+     * @param string $name index name
      */
     public function __construct($name)
     {
@@ -16,7 +19,7 @@ public function __construct($name)
     /**
      * {@inheritdoc}
      */
-    public function setIndexType($indexType)
+    public function setIndexType($indexType): void
     {
         parent::setIndexType($indexType);
     }
@@ -26,7 +29,7 @@ public function setIndexType($indexType)
      */
     public function getDDL()
     {
-        if (strcasecmp('primary', $this->getName()) == 0) {
+        if (0 == strcasecmp('primary', $this->getName())) {
             return $this->makeIndexDDL('PRIMARY KEY', null);
         }
 
diff --git a/src/MySQL/CreateStatementInterface.php b/src/MySQL/CreateStatementInterface.php
index 4520893..43e71d9 100644
--- a/src/MySQL/CreateStatementInterface.php
+++ b/src/MySQL/CreateStatementInterface.php
@@ -1,11 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL;
 
 interface CreateStatementInterface
 {
     /**
      * Get the DDL statement/s to create the resource.
+     *
      * @return mixed
      */
     public function getCreateStatement();
diff --git a/src/MySQL/DataType/AbstractBinaryType.php b/src/MySQL/DataType/AbstractBinaryType.php
index 4f14195..65bf09e 100644
--- a/src/MySQL/DataType/AbstractBinaryType.php
+++ b/src/MySQL/DataType/AbstractBinaryType.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: courtney
  * Date: 26/06/16
- * Time: 5:05 PM
+ * Time: 5:05 PM.
  */
 
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
@@ -38,9 +40,9 @@ public function hasLength()
     /**
      * {@inheritdoc}
      */
-    public function setLength($length)
+    public function setLength($length): void
     {
-        $this->length = (int)$length;
+        $this->length = (int) $length;
     }
 
     /**
@@ -56,7 +58,7 @@ public function doesAllowDefault()
      */
     public function cast($value)
     {
-        return (string)$value;
+        return (string) $value;
     }
 
     public function getDDL()
diff --git a/src/MySQL/DataType/AbstractBlobType.php b/src/MySQL/DataType/AbstractBlobType.php
index ddea6ef..1bbb769 100644
--- a/src/MySQL/DataType/AbstractBlobType.php
+++ b/src/MySQL/DataType/AbstractBlobType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\Option\QuoteTrait;
@@ -21,7 +23,7 @@ public function doesAllowDefault()
      */
     public function cast($value)
     {
-        return (string)$value;
+        return (string) $value;
     }
 
     /**
diff --git a/src/MySQL/DataType/AbstractCharType.php b/src/MySQL/DataType/AbstractCharType.php
index 5adad8f..2f8bfa4 100644
--- a/src/MySQL/DataType/AbstractCharType.php
+++ b/src/MySQL/DataType/AbstractCharType.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: courtney
  * Date: 20/06/16
- * Time: 4:29 PM
+ * Time: 4:29 PM.
  */
 
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
@@ -20,7 +22,8 @@ abstract class AbstractCharType implements CharTypeInterface
 
     /**
      * AbstractCharType constructor.
-     * @param int $length Character length.
+     *
+     * @param int $length character length
      */
     public function __construct($length)
     {
@@ -32,7 +35,7 @@ public function __construct($length)
      */
     public function cast($value)
     {
-        return (string)$value;
+        return (string) $value;
     }
 
     /**
@@ -53,7 +56,7 @@ public function getDDL()
             array_filter(
                 [
                     strtoupper($this->getType()) . ($this->hasLength() ? '(' . $this->getLength() . ')' : null),
-                    $this->hasCollation() ? "COLLATE '" . addslashes($this->getCollation()) . "'" : null
+                    $this->hasCollation() ? "COLLATE '" . addslashes($this->getCollation()) . "'" : null,
                 ]
             )
         );
diff --git a/src/MySQL/DataType/AbstractIntType.php b/src/MySQL/DataType/AbstractIntType.php
index 35f0145..060ef44 100644
--- a/src/MySQL/DataType/AbstractIntType.php
+++ b/src/MySQL/DataType/AbstractIntType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\Option\DisplayWidthTrait;
@@ -35,7 +37,7 @@ public function doesAllowDefault()
      */
     public function cast($value)
     {
-        return (int)$value;
+        return (int) $value;
     }
 
     /**
@@ -47,8 +49,8 @@ public function getDDL()
             ' ',
             array_filter(
                 [
-                    strtoupper($this->getType()) . ($this->displayWidth > 0 ? '(' . $this->displayWidth .')' : null),
-                    !$this->isSigned() ? 'UNSIGNED' : null
+                    strtoupper($this->getType()) . ($this->displayWidth > 0 ? '(' . $this->displayWidth . ')' : null),
+                    !$this->isSigned() ? 'UNSIGNED' : null,
                 ]
             )
         );
diff --git a/src/MySQL/DataType/AbstractNumericPointType.php b/src/MySQL/DataType/AbstractNumericPointType.php
index e3a0f18..69d0131 100644
--- a/src/MySQL/DataType/AbstractNumericPointType.php
+++ b/src/MySQL/DataType/AbstractNumericPointType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\Option\PrecisionScaleTrait;
@@ -84,7 +86,7 @@ public function getDDL()
             array_filter(
                 [
                     $typeDDL,
-                    !$this->isSigned() ? 'UNSIGNED' : null
+                    !$this->isSigned() ? 'UNSIGNED' : null,
                 ]
             )
         );
diff --git a/src/MySQL/DataType/AbstractOptionsType.php b/src/MySQL/DataType/AbstractOptionsType.php
index 0d1af51..ba27e82 100644
--- a/src/MySQL/DataType/AbstractOptionsType.php
+++ b/src/MySQL/DataType/AbstractOptionsType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\Option\CollationTrait;
@@ -36,13 +38,13 @@ public function hasOptions()
      */
     public function hasOption($option)
     {
-        return in_array($option, $this->options);
+        return in_array($option, $this->options, true);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function setOptions(array $options)
+    public function setOptions(array $options): void
     {
         $this->options = array_values($options);
     }
@@ -50,7 +52,7 @@ public function setOptions(array $options)
     /**
      * {@inheritdoc}
      */
-    public function addOption($option)
+    public function addOption($option): void
     {
         $this->options[] = $option;
     }
@@ -68,7 +70,7 @@ public function doesAllowDefault()
      */
     public function cast($value)
     {
-        return (string)$value;
+        return (string) $value;
     }
 
     /**
@@ -80,8 +82,8 @@ public function getDDL()
             ' ',
             array_filter(
                 [
-                    strtoupper($this->getType()) . "(" . $this->makeOptionsDDL($this->getOptions()) . ")",
-                    $this->hasCollation() ? 'COLLATE ' . $this->getCollation() : null
+                    strtoupper($this->getType()) . '(' . $this->makeOptionsDDL($this->getOptions()) . ')',
+                    $this->hasCollation() ? 'COLLATE ' . $this->getCollation() : null,
                 ]
             )
         );
@@ -96,16 +98,16 @@ public function __toString()
     }
 
     /**
-     * Make just the portion of the DDL that describes the options
-     * @param array $options
-     * @return string Portion of DDL for options.
+     * Make just the portion of the DDL that describes the options.
+     *
+     * @return string portion of DDL for options
      */
     protected function makeOptionsDDL(array $options)
     {
         $escapedOptions = [];
 
         foreach ($options as $option) {
-            $escapedOptions[] = $this->quote((string)$option);
+            $escapedOptions[] = $this->quote((string) $option);
         }
 
         return implode(',', $escapedOptions);
diff --git a/src/MySQL/DataType/AbstractTextType.php b/src/MySQL/DataType/AbstractTextType.php
index e28738e..e05e948 100644
--- a/src/MySQL/DataType/AbstractTextType.php
+++ b/src/MySQL/DataType/AbstractTextType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\Option\CollationTrait;
@@ -23,7 +25,7 @@ public function doesAllowDefault()
      */
     public function cast($value)
     {
-        return (string)$value;
+        return (string) $value;
     }
 
     /**
@@ -36,7 +38,7 @@ public function getDDL()
             array_filter(
                 [
                     strtoupper($this->getType()),
-                    $this->hasCollation() ? "COLLATE '" . addslashes($this->getCollation()) . "'" : null
+                    $this->hasCollation() ? "COLLATE '" . addslashes($this->getCollation()) . "'" : null,
                 ]
             )
         );
diff --git a/src/MySQL/DataType/AbstractTimeType.php b/src/MySQL/DataType/AbstractTimeType.php
index dfe78b5..aa98479 100644
--- a/src/MySQL/DataType/AbstractTimeType.php
+++ b/src/MySQL/DataType/AbstractTimeType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\Option\QuoteTrait;
@@ -15,7 +17,8 @@ abstract class AbstractTimeType implements TimeTypeInterface
 
     /**
      * AbstractTimeType constructor.
-     * @param int $precision Decimal precision.
+     *
+     * @param int $precision decimal precision
      */
     public function __construct($precision = 0)
     {
@@ -41,7 +44,7 @@ public function hasPrecision()
     /**
      * {@inheritdoc}
      */
-    public function setPrecision($precision)
+    public function setPrecision($precision): void
     {
         $this->precision = $precision;
     }
diff --git a/src/MySQL/DataType/BigIntType.php b/src/MySQL/DataType/BigIntType.php
index 61a6314..4d6b7f7 100644
--- a/src/MySQL/DataType/BigIntType.php
+++ b/src/MySQL/DataType/BigIntType.php
@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class BigIntType extends AbstractIntType
 {
-    const MIN_SIGNED = -9223372036854775808;
-    const MAX_SIGNED = 9223372036854775807;
-    const MIN_UNSIGNED = 0;
-    const MAX_UNSIGNED = 18446744073709551615;
+    public const MIN_SIGNED = -9223372036854775808;
+    public const MAX_SIGNED = 9223372036854775807;
+    public const MIN_UNSIGNED = 0;
+    public const MAX_UNSIGNED = 18446744073709551615;
 
     /**
      * {@inheritdoc}
diff --git a/src/MySQL/DataType/BinaryType.php b/src/MySQL/DataType/BinaryType.php
index 851cb64..083b4ff 100644
--- a/src/MySQL/DataType/BinaryType.php
+++ b/src/MySQL/DataType/BinaryType.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class BinaryType extends AbstractBinaryType
 {
-    const MAX_LENGTH = 255;
+    public const MAX_LENGTH = 255;
 
     /**
      * {@inheritdoc}
diff --git a/src/MySQL/DataType/BinaryTypeInterface.php b/src/MySQL/DataType/BinaryTypeInterface.php
index 4839a00..227e57c 100644
--- a/src/MySQL/DataType/BinaryTypeInterface.php
+++ b/src/MySQL/DataType/BinaryTypeInterface.php
@@ -1,10 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\Option\LengthInterface;
 
 interface BinaryTypeInterface extends DataTypeInterface, LengthInterface
 {
-
 }
diff --git a/src/MySQL/DataType/BitType.php b/src/MySQL/DataType/BitType.php
index 979d92d..0d067f2 100644
--- a/src/MySQL/DataType/BitType.php
+++ b/src/MySQL/DataType/BitType.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: courtney
  * Date: 28/06/16
- * Time: 4:53 PM
+ * Time: 4:53 PM.
  */
 
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
@@ -16,11 +18,12 @@ class BitType implements BitTypeInterface
     use LengthTrait;
     use QuoteTrait;
 
-    const MAX_LENGTH = 64;
+    public const MAX_LENGTH = 64;
 
     /**
      * BitType constructor.
-     * @param int $length Number of bits.
+     *
+     * @param int $length number of bits
      */
     public function __construct($length = 1)
     {
@@ -56,7 +59,7 @@ public function getMinRange()
      */
     public function getMaxRange()
     {
-        return pow(2, $this->length)-1;
+        return pow(2, $this->length) - 1;
     }
 
     /**
@@ -64,7 +67,7 @@ public function getMaxRange()
      */
     public function cast($value)
     {
-        return (int)$value;
+        return (int) $value;
     }
 
     /**
diff --git a/src/MySQL/DataType/BitTypeInterface.php b/src/MySQL/DataType/BitTypeInterface.php
index ec02f64..24ca53e 100644
--- a/src/MySQL/DataType/BitTypeInterface.php
+++ b/src/MySQL/DataType/BitTypeInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\Option\LengthInterface;
diff --git a/src/MySQL/DataType/BlobType.php b/src/MySQL/DataType/BlobType.php
index 523a9de..f8eff6b 100644
--- a/src/MySQL/DataType/BlobType.php
+++ b/src/MySQL/DataType/BlobType.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class BlobType extends AbstractBlobType
 {
-    const LENGTH = 65535;
+    public const LENGTH = 65535;
 
     /**
      * {@inheritdoc}
diff --git a/src/MySQL/DataType/BlobTypeInterface.php b/src/MySQL/DataType/BlobTypeInterface.php
index 47621f3..51cf267 100644
--- a/src/MySQL/DataType/BlobTypeInterface.php
+++ b/src/MySQL/DataType/BlobTypeInterface.php
@@ -1,8 +1,9 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 interface BlobTypeInterface extends DataTypeInterface
 {
-
 }
diff --git a/src/MySQL/DataType/CharType.php b/src/MySQL/DataType/CharType.php
index a024898..b41ed68 100644
--- a/src/MySQL/DataType/CharType.php
+++ b/src/MySQL/DataType/CharType.php
@@ -1,14 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class CharType extends AbstractCharType
 {
-    const MAX_LENGTH = 255;
+    public const MAX_LENGTH = 255;
 
     /**
      * CharType constructor.
-     * @param int $length Number of characters.
+     *
+     * @param int $length number of characters
      */
     public function __construct($length = 1)
     {
diff --git a/src/MySQL/DataType/CharTypeInterface.php b/src/MySQL/DataType/CharTypeInterface.php
index 409b0e9..0b0f9fa 100644
--- a/src/MySQL/DataType/CharTypeInterface.php
+++ b/src/MySQL/DataType/CharTypeInterface.php
@@ -1,9 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
-use MilesAsylum\SchnoopSchema\MySQL\DataType\Option\LengthInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\Option\CollationInterface;
+use MilesAsylum\SchnoopSchema\MySQL\DataType\Option\LengthInterface;
 
 interface CharTypeInterface extends DataTypeInterface, CollationInterface, LengthInterface
 {
diff --git a/src/MySQL/DataType/DataTypeInterface.php b/src/MySQL/DataType/DataTypeInterface.php
index 17b4b4f..d1b5815 100644
--- a/src/MySQL/DataType/DataTypeInterface.php
+++ b/src/MySQL/DataType/DataTypeInterface.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: courtney
  * Date: 19/06/16
- * Time: 4:01 PM
+ * Time: 4:01 PM.
  */
 
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
@@ -12,62 +14,66 @@
 
 interface DataTypeInterface extends MySQLInterface
 {
-    const TYPE_BIT = 'bit';
+    public const TYPE_BIT = 'bit';
 
-    const TYPE_INT = 'int';
-    const TYPE_TINYINT = 'tinyint';
-    const TYPE_SMALLINT = 'smallint';
-    const TYPE_MEDIUMINT = 'mediumint';
-    const TYPE_BIGINT = 'bigint';
+    public const TYPE_INT = 'int';
+    public const TYPE_TINYINT = 'tinyint';
+    public const TYPE_SMALLINT = 'smallint';
+    public const TYPE_MEDIUMINT = 'mediumint';
+    public const TYPE_BIGINT = 'bigint';
 
-    const TYPE_DECIMAL = 'decimal';
-    const TYPE_NUMERIC = 'numeric';
+    public const TYPE_DECIMAL = 'decimal';
+    public const TYPE_NUMERIC = 'numeric';
 
-    const TYPE_FLOAT = 'float';
-    const TYPE_DOUBLE = 'double';
+    public const TYPE_FLOAT = 'float';
+    public const TYPE_DOUBLE = 'double';
 
-    const TYPE_CHAR = 'char';
-    const TYPE_VARCHAR = 'varchar';
+    public const TYPE_CHAR = 'char';
+    public const TYPE_VARCHAR = 'varchar';
 
-    const TYPE_TEXT = 'text';
-    const TYPE_TINYTEXT = 'tinytext';
-    const TYPE_MEDIUMTEXT = 'mediumtext';
-    const TYPE_LONGTEXT = 'longtext';
+    public const TYPE_TEXT = 'text';
+    public const TYPE_TINYTEXT = 'tinytext';
+    public const TYPE_MEDIUMTEXT = 'mediumtext';
+    public const TYPE_LONGTEXT = 'longtext';
 
-    const TYPE_JSON = 'json';
+    public const TYPE_JSON = 'json';
 
-    const TYPE_BINARY = 'binary';
-    const TYPE_VARBINARY = 'varbinary';
+    public const TYPE_BINARY = 'binary';
+    public const TYPE_VARBINARY = 'varbinary';
 
-    const TYPE_BLOB = 'blob';
-    const TYPE_TINYBLOB = 'tinyblob';
-    const TYPE_MEDIUMBLOB = 'mediumblob';
-    const TYPE_LONGBLOB = 'longblob';
+    public const TYPE_BLOB = 'blob';
+    public const TYPE_TINYBLOB = 'tinyblob';
+    public const TYPE_MEDIUMBLOB = 'mediumblob';
+    public const TYPE_LONGBLOB = 'longblob';
 
-    const TYPE_ENUM = 'enum';
-    const TYPE_SET = 'set';
+    public const TYPE_ENUM = 'enum';
+    public const TYPE_SET = 'set';
 
-    const TYPE_DATE = 'date';
-    const TYPE_DATETIME = 'datetime';
-    const TYPE_TIMESTAMP = 'timestamp';
-    const TYPE_TIME = 'time';
-    const TYPE_YEAR = 'year';
+    public const TYPE_DATE = 'date';
+    public const TYPE_DATETIME = 'datetime';
+    public const TYPE_TIMESTAMP = 'timestamp';
+    public const TYPE_TIME = 'time';
+    public const TYPE_YEAR = 'year';
 
     /**
-     * Get the data type name
+     * Get the data type name.
+     *
      * @return string Data type name.  One of the self::TYPE_* constants.
      */
     public function getType();
 
     /**
      * Identify if the type allows a default value.
-     * @return bool True if the type allows a default.
+     *
+     * @return bool true if the type allows a default
      */
     public function doesAllowDefault();
 
     /**
      * Cast a value from MySQL to a suitable PHP type.
+     *
      * @param mixed $value
+     *
      * @return mixed
      */
     public function cast($value);
@@ -76,21 +82,26 @@ public function cast($value);
      * Quotes a value, based on the type, for use in a DDL statement. Do not
      * believe for a second that this will make your queries safe from
      * injection exploits.
+     *
      * @param string|float|int $value The value to quote. If you are passing
-     * a number and you need it quoted, cast it to a string.
+     *                                a number and you need it quoted, cast it to a string.
+     *
      * @return mixed
      */
     public function quote($value);
 
     /**
      * Get the portion of DDL for describing the data type.
+     *
      * @return string
      */
     public function getDDL();
 
     /**
      * The portion of DDL for describing the data type.
+     *
      * @uses DataTypeInterface::getDDL()
+     *
      * @return string
      */
     public function __toString();
diff --git a/src/MySQL/DataType/DateTimeType.php b/src/MySQL/DataType/DateTimeType.php
index 86b5d09..3b833c9 100644
--- a/src/MySQL/DataType/DateTimeType.php
+++ b/src/MySQL/DataType/DateTimeType.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: courtney
  * Date: 11/07/16
- * Time: 4:23 PM
+ * Time: 4:23 PM.
  */
 
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
diff --git a/src/MySQL/DataType/DateType.php b/src/MySQL/DataType/DateType.php
index 2caa77c..f6cf064 100644
--- a/src/MySQL/DataType/DateType.php
+++ b/src/MySQL/DataType/DateType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\Option\QuoteTrait;
diff --git a/src/MySQL/DataType/DecimalType.php b/src/MySQL/DataType/DecimalType.php
index 37663f9..ff73a44 100644
--- a/src/MySQL/DataType/DecimalType.php
+++ b/src/MySQL/DataType/DecimalType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class DecimalType extends AbstractNumericPointType
@@ -17,6 +19,6 @@ public function getType()
      */
     public function cast($value)
     {
-        return (string)$value;
+        return (string) $value;
     }
 }
diff --git a/src/MySQL/DataType/DoubleType.php b/src/MySQL/DataType/DoubleType.php
index 0d08949..ebc7dfd 100644
--- a/src/MySQL/DataType/DoubleType.php
+++ b/src/MySQL/DataType/DoubleType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class DoubleType extends AbstractNumericPointType
@@ -17,6 +19,6 @@ public function getType()
      */
     public function cast($value)
     {
-        return (double)$value;
+        return (float) $value;
     }
 }
diff --git a/src/MySQL/DataType/EnumType.php b/src/MySQL/DataType/EnumType.php
index 01fce36..f4f0621 100644
--- a/src/MySQL/DataType/EnumType.php
+++ b/src/MySQL/DataType/EnumType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class EnumType extends AbstractOptionsType
diff --git a/src/MySQL/DataType/FloatType.php b/src/MySQL/DataType/FloatType.php
index 9b4b339..c783ce1 100644
--- a/src/MySQL/DataType/FloatType.php
+++ b/src/MySQL/DataType/FloatType.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: courtney
  * Date: 19/06/16
- * Time: 10:25 AM
+ * Time: 10:25 AM.
  */
 
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
@@ -23,6 +25,6 @@ public function getType()
      */
     public function cast($value)
     {
-        return (float)$value;
+        return (float) $value;
     }
 }
diff --git a/src/MySQL/DataType/IntType.php b/src/MySQL/DataType/IntType.php
index 11e8bcc..42571f0 100644
--- a/src/MySQL/DataType/IntType.php
+++ b/src/MySQL/DataType/IntType.php
@@ -1,19 +1,21 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: courtney
  * Date: 18/06/16
- * Time: 11:25 AM
+ * Time: 11:25 AM.
  */
 
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class IntType extends AbstractIntType
 {
-    const MIN_SIGNED = -2147483648;
-    const MIN_UNSIGNED = 0;
-    const MAX_SIGNED = 2147483647;
-    const MAX_UNSIGNED = 4294967295;
+    public const MIN_SIGNED = -2147483648;
+    public const MIN_UNSIGNED = 0;
+    public const MAX_SIGNED = 2147483647;
+    public const MAX_UNSIGNED = 4294967295;
 
     /**
      * {@inheritdoc}
diff --git a/src/MySQL/DataType/IntTypeInterface.php b/src/MySQL/DataType/IntTypeInterface.php
index 7241b51..335c2d2 100644
--- a/src/MySQL/DataType/IntTypeInterface.php
+++ b/src/MySQL/DataType/IntTypeInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\Option\DisplayWidthInterface;
diff --git a/src/MySQL/DataType/JsonType.php b/src/MySQL/DataType/JsonType.php
index c5252a4..4f2b0e0 100644
--- a/src/MySQL/DataType/JsonType.php
+++ b/src/MySQL/DataType/JsonType.php
@@ -24,7 +24,7 @@ public function cast($value)
     {
         $json = json_encode($value);
 
-        if ($json === false) {
+        if (false === $json) {
             throw new \InvalidArgumentException('Supplied value could not be converted to JSON.');
         }
 
diff --git a/src/MySQL/DataType/LongBlobType.php b/src/MySQL/DataType/LongBlobType.php
index d5090cd..9b250e3 100644
--- a/src/MySQL/DataType/LongBlobType.php
+++ b/src/MySQL/DataType/LongBlobType.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class LongBlobType extends AbstractBlobType
 {
-    const LENGTH = 4294967295;
+    public const LENGTH = 4294967295;
 
     /**
      * {@inheritdoc}
diff --git a/src/MySQL/DataType/LongTextType.php b/src/MySQL/DataType/LongTextType.php
index b7bcb87..ada870e 100644
--- a/src/MySQL/DataType/LongTextType.php
+++ b/src/MySQL/DataType/LongTextType.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class LongTextType extends AbstractTextType
 {
-    const LENGTH = 4294967295;
+    public const LENGTH = 4294967295;
 
     /**
      * {@inheritdoc}
diff --git a/src/MySQL/DataType/MediumBlobType.php b/src/MySQL/DataType/MediumBlobType.php
index a5228de..664ca44 100644
--- a/src/MySQL/DataType/MediumBlobType.php
+++ b/src/MySQL/DataType/MediumBlobType.php
@@ -1,16 +1,18 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: courtney
  * Date: 23/06/16
- * Time: 7:33 AM
+ * Time: 7:33 AM.
  */
 
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class MediumBlobType extends AbstractBlobType
 {
-    const LENGTH = 16777215;
+    public const LENGTH = 16777215;
 
     /**
      * {@inheritdoc}
diff --git a/src/MySQL/DataType/MediumIntType.php b/src/MySQL/DataType/MediumIntType.php
index d5fbb88..c234e70 100644
--- a/src/MySQL/DataType/MediumIntType.php
+++ b/src/MySQL/DataType/MediumIntType.php
@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class MediumIntType extends AbstractIntType
 {
-    const MIN_SIGNED = -8388608;
-    const MAX_SIGNED = 8388607;
-    const MIN_UNSIGNED = 0;
-    const MAX_UNSIGNED = 16777215;
+    public const MIN_SIGNED = -8388608;
+    public const MAX_SIGNED = 8388607;
+    public const MIN_UNSIGNED = 0;
+    public const MAX_UNSIGNED = 16777215;
 
     /**
      * {@inheritdoc}
diff --git a/src/MySQL/DataType/MediumTextType.php b/src/MySQL/DataType/MediumTextType.php
index 042f4e9..a5856dd 100644
--- a/src/MySQL/DataType/MediumTextType.php
+++ b/src/MySQL/DataType/MediumTextType.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class MediumTextType extends AbstractTextType
 {
-    const LENGTH = 16777215;
+    public const LENGTH = 16777215;
 
     /**
      * {@inheritdoc}
diff --git a/src/MySQL/DataType/NumericPointTypeInterface.php b/src/MySQL/DataType/NumericPointTypeInterface.php
index 64ce064..2b08631 100644
--- a/src/MySQL/DataType/NumericPointTypeInterface.php
+++ b/src/MySQL/DataType/NumericPointTypeInterface.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: courtney
  * Date: 21/06/16
- * Time: 7:15 AM
+ * Time: 7:15 AM.
  */
 
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
diff --git a/src/MySQL/DataType/NumericTypeInterface.php b/src/MySQL/DataType/NumericTypeInterface.php
index c491a1d..c1905df 100644
--- a/src/MySQL/DataType/NumericTypeInterface.php
+++ b/src/MySQL/DataType/NumericTypeInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\Option\NumericRangeInterface;
diff --git a/src/MySQL/DataType/Option/CollationInterface.php b/src/MySQL/DataType/Option/CollationInterface.php
index 023430d..ad0eb50 100644
--- a/src/MySQL/DataType/Option/CollationInterface.php
+++ b/src/MySQL/DataType/Option/CollationInterface.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: courtney
  * Date: 8/07/16
- * Time: 7:23 AM
+ * Time: 7:23 AM.
  */
 
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType\Option;
@@ -12,19 +14,22 @@ interface CollationInterface
 {
     /**
      * Get the collation for the type.
-     * @return string Collation.
+     *
+     * @return string collation
      */
     public function getCollation();
 
     /**
      * Identify if the collation is set for the type.
+     *
      * @return bool
      */
     public function hasCollation();
 
     /**
      * Set the collation for the type.
-     * @param string $collation Collation.
+     *
+     * @param string $collation collation
      */
     public function setCollation($collation);
 }
diff --git a/src/MySQL/DataType/Option/CollationTrait.php b/src/MySQL/DataType/Option/CollationTrait.php
index 0ac45b5..0f8a0bb 100644
--- a/src/MySQL/DataType/Option/CollationTrait.php
+++ b/src/MySQL/DataType/Option/CollationTrait.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: courtney
  * Date: 8/07/16
- * Time: 7:26 AM
+ * Time: 7:26 AM.
  */
 
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType\Option;
@@ -12,6 +14,7 @@ trait CollationTrait
 {
     /**
      * Collation.
+     *
      * @var string
      */
     protected $collation;
@@ -35,7 +38,7 @@ public function hasCollation()
     /**
      * @see CollationInterface::setCollation()
      */
-    public function setCollation($collation)
+    public function setCollation($collation): void
     {
         $this->collation = $collation;
     }
diff --git a/src/MySQL/DataType/Option/DisplayWidthInterface.php b/src/MySQL/DataType/Option/DisplayWidthInterface.php
index 8f16db5..fd8ca83 100644
--- a/src/MySQL/DataType/Option/DisplayWidthInterface.php
+++ b/src/MySQL/DataType/Option/DisplayWidthInterface.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: courtney
  * Date: 18/06/16
- * Time: 6:34 PM
+ * Time: 6:34 PM.
  */
 
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType\Option;
@@ -12,18 +14,21 @@ interface DisplayWidthInterface
 {
     /**
      * Get the display width.
-     * @return int Display width.
+     *
+     * @return int display width
      */
     public function getDisplayWidth();
 
     /**
      * Identify if the display width is set.
+     *
      * @return bool
      */
     public function hasDisplayWidth();
 
     /**
      * Set the display width.
+     *
      * @param int $displayWidth Display width
      */
     public function setDisplayWidth($displayWidth);
diff --git a/src/MySQL/DataType/Option/DisplayWidthTrait.php b/src/MySQL/DataType/Option/DisplayWidthTrait.php
index a6cefe4..7285a02 100644
--- a/src/MySQL/DataType/Option/DisplayWidthTrait.php
+++ b/src/MySQL/DataType/Option/DisplayWidthTrait.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: courtney
  * Date: 18/06/16
- * Time: 11:35 AM
+ * Time: 11:35 AM.
  */
 
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType\Option;
@@ -11,7 +13,8 @@
 trait DisplayWidthTrait
 {
     /**
-     * Display width
+     * Display width.
+     *
      * @var int
      */
     protected $displayWidth;
@@ -35,8 +38,8 @@ public function hasDisplayWidth()
     /**
      * @see DisplayWidthInterface::setDisplayWidth()
      */
-    public function setDisplayWidth($displayWidth)
+    public function setDisplayWidth($displayWidth): void
     {
-        $this->displayWidth = (int)$displayWidth;
+        $this->displayWidth = (int) $displayWidth;
     }
 }
diff --git a/src/MySQL/DataType/Option/LengthInterface.php b/src/MySQL/DataType/Option/LengthInterface.php
index 0171fe1..4cedb81 100644
--- a/src/MySQL/DataType/Option/LengthInterface.php
+++ b/src/MySQL/DataType/Option/LengthInterface.php
@@ -1,24 +1,29 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType\Option;
 
 interface LengthInterface
 {
     /**
      * Get the length of the type.
-     * @return int Character length.
+     *
+     * @return int character length
      */
     public function getLength();
 
     /**
      * Identify if a length has been set.
-     * @return bool True if a length has been set.
+     *
+     * @return bool true if a length has been set
      */
     public function hasLength();
 
     /**
      * Set the length for the type.
-     * @param int $length Character length.
+     *
+     * @param int $length character length
      */
     public function setLength($length);
 }
diff --git a/src/MySQL/DataType/Option/LengthTrait.php b/src/MySQL/DataType/Option/LengthTrait.php
index d344b41..2026b57 100644
--- a/src/MySQL/DataType/Option/LengthTrait.php
+++ b/src/MySQL/DataType/Option/LengthTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType\Option;
 
 trait LengthTrait
@@ -28,8 +30,8 @@ public function hasLength()
     /**
      * @see LengthInterface::setLength()
      */
-    public function setLength($length)
+    public function setLength($length): void
     {
-        $this->length = (int)$length;
+        $this->length = (int) $length;
     }
 }
diff --git a/src/MySQL/DataType/Option/NumericRangeInterface.php b/src/MySQL/DataType/Option/NumericRangeInterface.php
index 86d4d55..856c680 100644
--- a/src/MySQL/DataType/Option/NumericRangeInterface.php
+++ b/src/MySQL/DataType/Option/NumericRangeInterface.php
@@ -1,18 +1,22 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType\Option;
 
 interface NumericRangeInterface
 {
     /**
      * Get the minimum value the type accepts.
-     * @return int Minimum value.
+     *
+     * @return int minimum value
      */
     public function getMinRange();
 
     /**
      * Get the maximum value the type accepts.
-     * @return int Maximum value.
+     *
+     * @return int maximum value
      */
     public function getMaxRange();
 }
diff --git a/src/MySQL/DataType/Option/OptionsInterface.php b/src/MySQL/DataType/Option/OptionsInterface.php
index d3104a3..c642ca2 100644
--- a/src/MySQL/DataType/Option/OptionsInterface.php
+++ b/src/MySQL/DataType/Option/OptionsInterface.php
@@ -1,36 +1,44 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType\Option;
 
 interface OptionsInterface
 {
     /**
      * Get the options for the type.
-     * @return array Options.
+     *
+     * @return array options
      */
     public function getOptions();
 
     /**
      * Identify if any options are set.
-     * @return bool True if options are set.
+     *
+     * @return bool true if options are set
      */
     public function hasOptions();
 
     /**
      * Identify if the specified value exists as an option.
-     * @param string $option Option value.
-     * @return bool True if the option value exists.
+     *
+     * @param string $option option value
+     *
+     * @return bool true if the option value exists
      */
     public function hasOption($option);
 
     /**
      * Set the options.
+     *
      * @param array $options Options
      */
     public function setOptions(array $options);
 
     /**
      * Add an value to the options.
+     *
      * @param string $option
      */
     public function addOption($option);
diff --git a/src/MySQL/DataType/Option/PrecisionScaleInterface.php b/src/MySQL/DataType/Option/PrecisionScaleInterface.php
index 6a8c4a6..523d23f 100644
--- a/src/MySQL/DataType/Option/PrecisionScaleInterface.php
+++ b/src/MySQL/DataType/Option/PrecisionScaleInterface.php
@@ -1,36 +1,43 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType\Option;
 
 interface PrecisionScaleInterface
 {
     /**
      * Get the precision (number of significant digits) that are stored for values.
-     * @return int Precision.
+     *
+     * @return int precision
      */
     public function getPrecision();
 
     /**
      * Identify if the precision (number of significant digits) is set.
-     * @return bool True if precision is set.
+     *
+     * @return bool true if precision is set
      */
     public function hasPrecision();
 
     /**
      * Get the scale (number of decimal places) used to store the value.
+     *
      * @return int Scale (decimal places.)
      */
     public function getScale();
 
     /**
      * Identify if a scale (number of decimal places) is set, or not zero.
-     * @return bool True if the scale is set and is not zero.
+     *
+     * @return bool true if the scale is set and is not zero
      */
     public function hasScale();
 
     /**
      * Set the precision (number of significant digits) and scale (number of decimal places).
-     * @param int $precision Number of significant digits.
+     *
+     * @param int $precision number of significant digits
      * @param int $scale Number of decimal places
      */
     public function setPrecisionScale($precision, $scale = 0);
diff --git a/src/MySQL/DataType/Option/PrecisionScaleTrait.php b/src/MySQL/DataType/Option/PrecisionScaleTrait.php
index 2443216..7ade5b1 100644
--- a/src/MySQL/DataType/Option/PrecisionScaleTrait.php
+++ b/src/MySQL/DataType/Option/PrecisionScaleTrait.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: courtney
  * Date: 19/06/16
- * Time: 9:17 AM
+ * Time: 9:17 AM.
  */
 
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType\Option;
@@ -33,7 +35,7 @@ public function getPrecision()
      */
     public function hasPrecision()
     {
-        return $this->precision !== null;
+        return null !== $this->precision;
     }
 
     /**
@@ -55,9 +57,9 @@ public function hasScale()
     /**
      * @see PrecisionScaleInterface::setPrecisionScale()
      */
-    public function setPrecisionScale($precision, $scale = 0)
+    public function setPrecisionScale($precision, $scale = 0): void
     {
-        $this->precision = $precision !== null ? (int)$precision : null;
-        $this->scale = $scale === null ? 0 : $scale;
+        $this->precision = null !== $precision ? (int) $precision : null;
+        $this->scale = null === $scale ? 0 : $scale;
     }
 }
diff --git a/src/MySQL/DataType/Option/QuoteTrait.php b/src/MySQL/DataType/Option/QuoteTrait.php
index 9e6023a..3ba058f 100644
--- a/src/MySQL/DataType/Option/QuoteTrait.php
+++ b/src/MySQL/DataType/Option/QuoteTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType\Option;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
@@ -11,6 +13,6 @@ trait QuoteTrait
      */
     public function quote($value)
     {
-        return !is_string($value) ? (string)$value : "'" . addslashes($value) . "'";
+        return !is_string($value) ? (string) $value : "'" . addslashes($value) . "'";
     }
 }
diff --git a/src/MySQL/DataType/Option/SignedInterface.php b/src/MySQL/DataType/Option/SignedInterface.php
index 93b3b11..77e5108 100644
--- a/src/MySQL/DataType/Option/SignedInterface.php
+++ b/src/MySQL/DataType/Option/SignedInterface.php
@@ -1,18 +1,22 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType\Option;
 
 interface SignedInterface
 {
     /**
-     * Identify if the type allows signed values (i.e. negative values.)
+     * Identify if the type allows signed values (i.e. negative values.).
+     *
      * @return mixed
      */
     public function isSigned();
 
     /**
-     * Set if the type allows signed values
-     * @param bool $signed Set to true to allow signed values, false otherwise.
+     * Set if the type allows signed values.
+     *
+     * @param bool $signed set to true to allow signed values, false otherwise
      */
     public function setSigned($signed);
 }
diff --git a/src/MySQL/DataType/Option/SignedTrait.php b/src/MySQL/DataType/Option/SignedTrait.php
index aee6d4b..d16b0b3 100644
--- a/src/MySQL/DataType/Option/SignedTrait.php
+++ b/src/MySQL/DataType/Option/SignedTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType\Option;
 
 trait SignedTrait
@@ -20,8 +22,8 @@ public function isSigned()
     /**
      * @see SignedInterface::setSigned()
      */
-    public function setSigned($signed)
+    public function setSigned($signed): void
     {
-        $this->signed = (bool)$signed;
+        $this->signed = (bool) $signed;
     }
 }
diff --git a/src/MySQL/DataType/Option/ZeroFillInterface.php b/src/MySQL/DataType/Option/ZeroFillInterface.php
index 3017f09..dd60bc9 100644
--- a/src/MySQL/DataType/Option/ZeroFillInterface.php
+++ b/src/MySQL/DataType/Option/ZeroFillInterface.php
@@ -1,18 +1,22 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType\Option;
 
 interface ZeroFillInterface
 {
     /**
      * Identify if values will be zero-filled on display.
-     * @return bool True if values will be zero-filled.
+     *
+     * @return bool true if values will be zero-filled
      */
     public function isZeroFill();
 
     /**
      * Set if values should be zero-filled on display.
-     * @param bool $zeroFill Set to true to zero-fill values, otherwise false.
+     *
+     * @param bool $zeroFill set to true to zero-fill values, otherwise false
      */
     public function setZeroFill($zeroFill);
 }
diff --git a/src/MySQL/DataType/Option/ZeroFillTrait.php b/src/MySQL/DataType/Option/ZeroFillTrait.php
index 055b44e..63c9a28 100644
--- a/src/MySQL/DataType/Option/ZeroFillTrait.php
+++ b/src/MySQL/DataType/Option/ZeroFillTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType\Option;
 
 trait ZeroFillTrait
@@ -17,7 +19,7 @@ public function isZeroFill()
     /**
      * @see ZeroFillInterface::setZeroFill()
      */
-    public function setZeroFill($zeroFill)
+    public function setZeroFill($zeroFill): void
     {
         $this->zeroFill = $zeroFill;
     }
diff --git a/src/MySQL/DataType/OptionsTypeInterface.php b/src/MySQL/DataType/OptionsTypeInterface.php
index 2f5925e..51490a5 100644
--- a/src/MySQL/DataType/OptionsTypeInterface.php
+++ b/src/MySQL/DataType/OptionsTypeInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\Option\CollationInterface;
diff --git a/src/MySQL/DataType/SetType.php b/src/MySQL/DataType/SetType.php
index 248d611..bd27444 100644
--- a/src/MySQL/DataType/SetType.php
+++ b/src/MySQL/DataType/SetType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class SetType extends AbstractOptionsType
diff --git a/src/MySQL/DataType/SmallIntType.php b/src/MySQL/DataType/SmallIntType.php
index b82141d..70b5a3b 100644
--- a/src/MySQL/DataType/SmallIntType.php
+++ b/src/MySQL/DataType/SmallIntType.php
@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class SmallIntType extends AbstractIntType
 {
-    const MIN_SIGNED = -32768;
-    const MAX_SIGNED = 32767;
-    const MIN_UNSIGNED = 0;
-    const MAX_UNSIGNED = 65535;
+    public const MIN_SIGNED = -32768;
+    public const MAX_SIGNED = 32767;
+    public const MIN_UNSIGNED = 0;
+    public const MAX_UNSIGNED = 65535;
 
     /**
      * {@inheritdoc}
diff --git a/src/MySQL/DataType/TextType.php b/src/MySQL/DataType/TextType.php
index 4c304ec..7f57f84 100644
--- a/src/MySQL/DataType/TextType.php
+++ b/src/MySQL/DataType/TextType.php
@@ -1,16 +1,18 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: courtney
  * Date: 20/06/16
- * Time: 8:58 PM
+ * Time: 8:58 PM.
  */
 
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class TextType extends AbstractTextType
 {
-    const LENGTH = 65535;
+    public const LENGTH = 65535;
 
     /**
      * {@inheritdoc}
diff --git a/src/MySQL/DataType/TextTypeInterface.php b/src/MySQL/DataType/TextTypeInterface.php
index 27fd3c0..d5ae76a 100644
--- a/src/MySQL/DataType/TextTypeInterface.php
+++ b/src/MySQL/DataType/TextTypeInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\Option\CollationInterface;
@@ -8,7 +10,8 @@ interface TextTypeInterface extends DataTypeInterface, CollationInterface
 {
     /**
      * Get the character length of the text type.
-     * @return int Character length.
+     *
+     * @return int character length
      */
     public function getLength();
 }
diff --git a/src/MySQL/DataType/TimeType.php b/src/MySQL/DataType/TimeType.php
index abf2bc9..0c2c71a 100644
--- a/src/MySQL/DataType/TimeType.php
+++ b/src/MySQL/DataType/TimeType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class TimeType extends AbstractTimeType
diff --git a/src/MySQL/DataType/TimeTypeInterface.php b/src/MySQL/DataType/TimeTypeInterface.php
index 0b949b3..412edb6 100644
--- a/src/MySQL/DataType/TimeTypeInterface.php
+++ b/src/MySQL/DataType/TimeTypeInterface.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: courtney
  * Date: 11/07/16
- * Time: 4:12 PM
+ * Time: 4:12 PM.
  */
 
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
@@ -12,19 +14,23 @@ interface TimeTypeInterface extends DataTypeInterface
 {
     /**
      * The number of decimal places used to represent the fractional seconds precision.
+     *
      * @return int Precision
      */
     public function getPrecision();
 
     /**
      * Identify if the type has a precision value set.
-     * @return bool True if a precision value is set.
+     *
+     * @return bool true if a precision value is set
      */
     public function hasPrecision();
 
     /**
      * Set the number of decimal places used to represent fractional seconds.
+     *
      * @param $precision
+     *
      * @return mixed
      */
     public function setPrecision($precision);
diff --git a/src/MySQL/DataType/TimestampType.php b/src/MySQL/DataType/TimestampType.php
index 1170d88..fe6f220 100644
--- a/src/MySQL/DataType/TimestampType.php
+++ b/src/MySQL/DataType/TimestampType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class TimestampType extends AbstractTimeType
diff --git a/src/MySQL/DataType/TinyBlobType.php b/src/MySQL/DataType/TinyBlobType.php
index ba05566..395c272 100644
--- a/src/MySQL/DataType/TinyBlobType.php
+++ b/src/MySQL/DataType/TinyBlobType.php
@@ -1,16 +1,18 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: courtney
  * Date: 23/06/16
- * Time: 7:32 AM
+ * Time: 7:32 AM.
  */
 
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class TinyBlobType extends AbstractBlobType
 {
-    const LENGTH = 255;
+    public const LENGTH = 255;
 
     /**
      * {@inheritdoc}
diff --git a/src/MySQL/DataType/TinyIntType.php b/src/MySQL/DataType/TinyIntType.php
index b2a4f46..e843e2f 100644
--- a/src/MySQL/DataType/TinyIntType.php
+++ b/src/MySQL/DataType/TinyIntType.php
@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class TinyIntType extends AbstractIntType
 {
-    const MIN_SIGNED = -128;
-    const MAX_SIGNED = 127;
-    const MIN_UNSIGNED = 0;
-    const MAX_UNSIGNED = 255;
+    public const MIN_SIGNED = -128;
+    public const MAX_SIGNED = 127;
+    public const MIN_UNSIGNED = 0;
+    public const MAX_UNSIGNED = 255;
 
     /**
      * {@inheritdoc}
diff --git a/src/MySQL/DataType/TinyTextType.php b/src/MySQL/DataType/TinyTextType.php
index bb418ba..dcb065b 100644
--- a/src/MySQL/DataType/TinyTextType.php
+++ b/src/MySQL/DataType/TinyTextType.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class TinyTextType extends AbstractTextType
 {
-    const LENGTH = 255;
+    public const LENGTH = 255;
 
     /**
      * {@inheritdoc}
diff --git a/src/MySQL/DataType/VarBinaryType.php b/src/MySQL/DataType/VarBinaryType.php
index e809e2a..46d4dbb 100644
--- a/src/MySQL/DataType/VarBinaryType.php
+++ b/src/MySQL/DataType/VarBinaryType.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class VarBinaryType extends AbstractBinaryType
 {
-    const MAX_LENGTH = 65535;
+    public const MAX_LENGTH = 65535;
 
     /**
      * {@inheritdoc}
diff --git a/src/MySQL/DataType/VarCharType.php b/src/MySQL/DataType/VarCharType.php
index b3c578f..1fc67a2 100644
--- a/src/MySQL/DataType/VarCharType.php
+++ b/src/MySQL/DataType/VarCharType.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
 
 class VarCharType extends AbstractCharType
 {
-    const MAX_LENGTH = 65535;
+    public const MAX_LENGTH = 65535;
 
     /**
      * {@inheritdoc}
diff --git a/src/MySQL/DataType/YearType.php b/src/MySQL/DataType/YearType.php
index 9d911e6..12dbf36 100644
--- a/src/MySQL/DataType/YearType.php
+++ b/src/MySQL/DataType/YearType.php
@@ -1,9 +1,11 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: courtney
  * Date: 11/07/16
- * Time: 4:33 PM
+ * Time: 4:33 PM.
  */
 
 namespace MilesAsylum\SchnoopSchema\MySQL\DataType;
@@ -35,7 +37,7 @@ public function doesAllowDefault()
      */
     public function cast($value)
     {
-        return (int)$value;
+        return (int) $value;
     }
 
     /**
diff --git a/src/MySQL/Database/Database.php b/src/MySQL/Database/Database.php
index e39dfad..c9dd49d 100644
--- a/src/MySQL/Database/Database.php
+++ b/src/MySQL/Database/Database.php
@@ -1,36 +1,43 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Database;
 
 class Database implements DatabaseInterface
 {
     /**
      * The database name.
+     *
      * @var string
      */
     protected $name;
 
     /**
      * The default collation for the database.
+     *
      * @var string
      */
     protected $defaultCollation;
 
     /**
      * The delimiter to use between statements.
+     *
      * @var string
      */
     protected $ddlDelimiter = self::DEFAULT_DELIMITER;
 
     /**
      * Whether to include a drop statement with the create statement.
+     *
      * @var bool
      */
     protected $ddlDropPolicy = self::DDL_DROP_POLICY_DO_NOT_DROP;
 
     /**
      * Database constructor.
-     * @param string $name The database name.
+     *
+     * @param string $name the database name
      */
     public function __construct($name)
     {
@@ -64,7 +71,7 @@ public function hasDefaultCollation()
     /**
      * {@inheritdoc}
      */
-    public function setDefaultCollation($defaultCollation)
+    public function setDefaultCollation($defaultCollation): void
     {
         $this->defaultCollation = $defaultCollation;
     }
@@ -80,7 +87,7 @@ public function getDelimiter()
     /**
      * {@inheritdoc}
      */
-    public function setDelimiter($delimiter)
+    public function setDelimiter($delimiter): void
     {
         $this->ddlDelimiter = $delimiter;
     }
@@ -96,7 +103,7 @@ public function getDropPolicy()
     /**
      * {@inheritdoc}
      */
-    public function setDropPolicy($ddlDropPolicyPolicy)
+    public function setDropPolicy($ddlDropPolicyPolicy): void
     {
         $this->ddlDropPolicy = $ddlDropPolicyPolicy;
     }
@@ -132,7 +139,7 @@ public function getCreateStatement()
             array_filter(
                 [
                     $dropDDL,
-                    $createDDL
+                    $createDDL,
                 ]
             )
         );
diff --git a/src/MySQL/Database/DatabaseInterface.php b/src/MySQL/Database/DatabaseInterface.php
index 187d0cc..7c67794 100644
--- a/src/MySQL/Database/DatabaseInterface.php
+++ b/src/MySQL/Database/DatabaseInterface.php
@@ -1,42 +1,50 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Database;
 
 use MilesAsylum\SchnoopSchema\MySQL\CreateStatementInterface;
-use MilesAsylum\SchnoopSchema\MySQL\HasDelimiterInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DroppableInterface;
+use MilesAsylum\SchnoopSchema\MySQL\HasDelimiterInterface;
 use MilesAsylum\SchnoopSchema\MySQL\MySQLInterface;
 
 interface DatabaseInterface extends MySQLInterface, HasDelimiterInterface, DroppableInterface, CreateStatementInterface
 {
     /**
      * Get the database name.
-     * @return string The database name.
+     *
+     * @return string the database name
      */
     public function getName();
 
     /**
-     * Get the default collation for the database;
-     * @return string The default collation.
+     * Get the default collation for the database;.
+     *
+     * @return string the default collation
      */
     public function getDefaultCollation();
 
     /**
      * Identify if a default collation has been set.
-     * @return bool True if the default collation is set.
+     *
+     * @return bool true if the default collation is set
      */
     public function hasDefaultCollation();
 
     /**
      * Set the default collation for the database.
+     *
      * @param string $defaultCollation
      */
     public function setDefaultCollation($defaultCollation);
 
     /**
-     * The DDL statement for the database;
+     * The DDL statement for the database;.
+     *
      * @uses DatabaseInterface::getCreateStatement();
-     * @return string Create DDL statement for the database.
+     *
+     * @return string create DDL statement for the database
      */
     public function __toString();
 }
diff --git a/src/MySQL/DroppableInterface.php b/src/MySQL/DroppableInterface.php
index 752f134..ada7bad 100644
--- a/src/MySQL/DroppableInterface.php
+++ b/src/MySQL/DroppableInterface.php
@@ -1,23 +1,25 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL;
 
 interface DroppableInterface
 {
     /**
-     * Indicates that the DDL for a resource will not include a drop statement
+     * Indicates that the DDL for a resource will not include a drop statement.
      */
-    const DDL_DROP_POLICY_DO_NOT_DROP = 0;
+    public const DDL_DROP_POLICY_DO_NOT_DROP = 0;
 
     /**
      * Indicates that the DDL for a resource will include a statement to first drop it if it exists.
      */
-    const DDL_DROP_POLICY_DROP_IF_EXISTS = 1;
+    public const DDL_DROP_POLICY_DROP_IF_EXISTS = 1;
 
     /**
      * Indicates that the DDL for a resource will include a statement to drop it with expectation that it will exist.
      */
-    const DDL_DROP_POLICY_DROP = 2;
+    public const DDL_DROP_POLICY_DROP = 2;
 
     public function getDropPolicy();
 
diff --git a/src/MySQL/Exception/DDLException.php b/src/MySQL/Exception/DDLException.php
index 72613cb..2bf1e35 100644
--- a/src/MySQL/Exception/DDLException.php
+++ b/src/MySQL/Exception/DDLException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Exception;
 
 class DDLException extends \LogicException implements ExceptionInterface
diff --git a/src/MySQL/Exception/ExceptionInterface.php b/src/MySQL/Exception/ExceptionInterface.php
index 9371aa5..ac120a8 100644
--- a/src/MySQL/Exception/ExceptionInterface.php
+++ b/src/MySQL/Exception/ExceptionInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Exception;
 
 interface ExceptionInterface
diff --git a/src/MySQL/Exception/FQNException.php b/src/MySQL/Exception/FQNException.php
index 651d408..ac1d075 100644
--- a/src/MySQL/Exception/FQNException.php
+++ b/src/MySQL/Exception/FQNException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Exception;
 
 class FQNException extends DDLException
diff --git a/src/MySQL/Exception/LogicException.php b/src/MySQL/Exception/LogicException.php
index ac6fa31..f20f480 100644
--- a/src/MySQL/Exception/LogicException.php
+++ b/src/MySQL/Exception/LogicException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Exception;
 
 class LogicException extends \LogicException implements ExceptionInterface
diff --git a/src/MySQL/Exception/UnknownColumnException.php b/src/MySQL/Exception/UnknownColumnException.php
index 05effe5..9b40526 100644
--- a/src/MySQL/Exception/UnknownColumnException.php
+++ b/src/MySQL/Exception/UnknownColumnException.php
@@ -1,8 +1,9 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Exception;
 
 class UnknownColumnException extends \LogicException implements ExceptionInterface
 {
-
 }
diff --git a/src/MySQL/Exception/UnrecognisedTypeException.php b/src/MySQL/Exception/UnrecognisedTypeException.php
index 0830a4d..7768d65 100644
--- a/src/MySQL/Exception/UnrecognisedTypeException.php
+++ b/src/MySQL/Exception/UnrecognisedTypeException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Exception;
 
 class UnrecognisedTypeException extends \Exception implements ExceptionInterface
diff --git a/src/MySQL/FullyQualifiedNameInterface.php b/src/MySQL/FullyQualifiedNameInterface.php
index 795c694..aa4acd4 100644
--- a/src/MySQL/FullyQualifiedNameInterface.php
+++ b/src/MySQL/FullyQualifiedNameInterface.php
@@ -1,17 +1,21 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL;
 
 interface FullyQualifiedNameInterface
 {
     /**
      * Indicates if the DDL will use the fully qualified name for the table.
+     *
      * @return bool
      */
     public function useFullyQualifiedName();
 
     /**
      * Set if the DDL should use the fully qualified name for the table.
+     *
      * @param bool $useFullyQualifiedName
      */
     public function setUseFullyQualifiedName($useFullyQualifiedName);
diff --git a/src/MySQL/HasDefinerInterface.php b/src/MySQL/HasDefinerInterface.php
index 6d2d1a3..05a0800 100644
--- a/src/MySQL/HasDefinerInterface.php
+++ b/src/MySQL/HasDefinerInterface.php
@@ -1,23 +1,28 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL;
 
 interface HasDefinerInterface
 {
     /**
      * Get the resource definer.
+     *
      * @return string
      */
     public function getDefiner();
 
     /**
      * Identify if a definer is set for the resource.
-     * @return mixed True if a definer is set.
+     *
+     * @return mixed true if a definer is set
      */
     public function hasDefiner();
 
     /**
      * Set the definer for resource.
+     *
      * @param string $definer
      */
     public function setDefiner($definer);
diff --git a/src/MySQL/HasDelimiterInterface.php b/src/MySQL/HasDelimiterInterface.php
index b533629..e5b8783 100644
--- a/src/MySQL/HasDelimiterInterface.php
+++ b/src/MySQL/HasDelimiterInterface.php
@@ -1,19 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL;
 
 interface HasDelimiterInterface
 {
-    const DEFAULT_DELIMITER = ';';
+    public const DEFAULT_DELIMITER = ';';
 
     /**
      * Get the delimiter to use between statements.
+     *
      * @return string
      */
     public function getDelimiter();
 
     /**
      * Set the delimiter to use between statements.
+     *
      * @param string $delimiter
      */
     public function setDelimiter($delimiter);
diff --git a/src/MySQL/HasSqlModeInterface.php b/src/MySQL/HasSqlModeInterface.php
index a1fccb7..7d07202 100644
--- a/src/MySQL/HasSqlModeInterface.php
+++ b/src/MySQL/HasSqlModeInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL;
 
 use MilesAsylum\SchnoopSchema\MySQL\SetVar\SqlMode;
@@ -8,19 +10,20 @@ interface HasSqlModeInterface
 {
     /**
      * Gets the SQL mode for the resource.
+     *
      * @return SqlMode
      */
     public function getSqlMode();
 
     /**
      * Set the SQL mode for the resource.
-     * @param SqlMode $sqlMode
      */
     public function setSqlMode(SqlMode $sqlMode);
 
     /**
      * Identify if an SQL mode has been set for the resource.
-     * @return bool True if a mode has been set.
+     *
+     * @return bool true if a mode has been set
      */
     public function hasSqlMode();
 
diff --git a/src/MySQL/MySQLInterface.php b/src/MySQL/MySQLInterface.php
index 1871ab2..2302417 100644
--- a/src/MySQL/MySQLInterface.php
+++ b/src/MySQL/MySQLInterface.php
@@ -1,8 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL;
 
 interface MySQLInterface
 {
-    const DEFINER_CURRENT_USER = 'CURRENT_USER';
+    public const DEFINER_CURRENT_USER = 'CURRENT_USER';
 }
diff --git a/src/MySQL/Routine/AbstractRoutine.php b/src/MySQL/Routine/AbstractRoutine.php
index c934d3e..bf72ceb 100644
--- a/src/MySQL/Routine/AbstractRoutine.php
+++ b/src/MySQL/Routine/AbstractRoutine.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Routine;
 
 use MilesAsylum\SchnoopSchema\MySQL\Exception\FQNException;
@@ -9,48 +11,56 @@ abstract class AbstractRoutine implements RoutineInterface
 {
     /**
      * Routine name.
+     *
      * @var string
      */
     protected $name;
 
     /**
      * Database name.
+     *
      * @var string
      */
     protected $databaseName;
 
     /**
      * Routine definer.
+     *
      * @var string
      */
     protected $definer = self::DEFINER_CURRENT_USER;
 
     /**
      * Routine comment.
+     *
      * @var string
      */
     protected $comment;
 
     /**
-     * If the routine is deterministic
+     * If the routine is deterministic.
+     *
      * @var bool
      */
     protected $deterministic = false;
 
     /**
      * Data access.
+     *
      * @var string
      */
     protected $dataAccess = self::DATA_ACCESS_CONTAINS_SQL;
 
     /**
-     * SQL security
+     * SQL security.
+     *
      * @var string
      */
     protected $sqlSecurity = self::SECURITY_DEFINER;
 
     /**
      * Routine body.
+     *
      * @var string
      */
     protected $body = '';
@@ -62,26 +72,29 @@ abstract class AbstractRoutine implements RoutineInterface
 
     /**
      * The delimiter to use between statements.
+     *
      * @var string
      */
     protected $delimiter = self::DEFAULT_DELIMITER;
 
     /**
      * Whether to include a drop statement with the create statement.
+     *
      * @var bool
      */
     protected $dropPolicy = self::DDL_DROP_POLICY_DO_NOT_DROP;
 
     /**
      * Whether the DDL will use the fully qualified name for resources.
+     *
      * @var bool
      */
     protected $useFullyQualifiedName = false;
 
-
     /**
      * AbstractRoutine constructor.
-     * @param string $name Routine name.
+     *
+     * @param string $name routine name
      */
     public function __construct($name)
     {
@@ -116,7 +129,7 @@ public function hasDatabaseName()
     /**
      * {@inheritdoc}
      */
-    public function setDatabaseName($databaseName)
+    public function setDatabaseName($databaseName): void
     {
         $this->databaseName = $databaseName;
     }
@@ -132,7 +145,7 @@ public function getDefiner()
     /**
      * {@inheritdoc}
      */
-    public function setDefiner($definer)
+    public function setDefiner($definer): void
     {
         $this->definer = $definer;
     }
@@ -156,7 +169,7 @@ public function getComment()
     /**
      * {@inheritdoc}
      */
-    public function setComment($comment)
+    public function setComment($comment): void
     {
         $this->comment = $comment;
     }
@@ -180,7 +193,7 @@ public function isDeterministic()
     /**
      * {@inheritdoc}
      */
-    public function setDeterministic($deterministic)
+    public function setDeterministic($deterministic): void
     {
         $this->deterministic = $deterministic;
     }
@@ -196,7 +209,7 @@ public function getDataAccess()
     /**
      * {@inheritdoc}
      */
-    public function setDataAccess($dataAccess)
+    public function setDataAccess($dataAccess): void
     {
         $this->dataAccess = $dataAccess;
     }
@@ -212,7 +225,7 @@ public function getSqlSecurity()
     /**
      * {@inheritdoc}
      */
-    public function setSqlSecurity($sqlSecurity)
+    public function setSqlSecurity($sqlSecurity): void
     {
         $this->sqlSecurity = $sqlSecurity;
     }
@@ -228,7 +241,7 @@ public function getBody()
     /**
      * {@inheritdoc}
      */
-    public function setBody($body)
+    public function setBody($body): void
     {
         $this->body = $body;
     }
@@ -252,12 +265,12 @@ public function hasSqlMode()
     /**
      * {@inheritdoc}
      */
-    public function setSqlMode(SqlMode $sqlMode)
+    public function setSqlMode(SqlMode $sqlMode): void
     {
         $this->sqlMode = $sqlMode;
     }
 
-    public function unsetSqlMode()
+    public function unsetSqlMode(): void
     {
         $this->sqlMode = null;
     }
@@ -273,7 +286,7 @@ public function getDelimiter()
     /**
      * {@inheritdoc}
      */
-    public function setDelimiter($delimiter)
+    public function setDelimiter($delimiter): void
     {
         $this->delimiter = $delimiter;
     }
@@ -289,7 +302,7 @@ public function getDropPolicy()
     /**
      * {@inheritdoc}
      */
-    public function setDropPolicy($ddlDropPolicy)
+    public function setDropPolicy($ddlDropPolicy): void
     {
         $this->dropPolicy = $ddlDropPolicy;
     }
@@ -305,22 +318,21 @@ public function useFullyQualifiedName()
     /**
      * {@inheritdoc}
      */
-    public function setUseFullyQualifiedName($useFullyQualifiedName)
+    public function setUseFullyQualifiedName($useFullyQualifiedName): void
     {
         $this->useFullyQualifiedName = $useFullyQualifiedName;
     }
 
     /**
      * Resolve the routine name to an enclosed name.
+     *
      * @return string Routine name
      */
     protected function makeRoutineName()
     {
         if ($this->useFullyQualifiedName()) {
             if (!$this->hasDatabaseName()) {
-                throw new FQNException(
-                    'Unable to create DDL with fully-qualified-name because the database name has not been set.'
-                );
+                throw new FQNException('Unable to create DDL with fully-qualified-name because the database name has not been set.');
             }
 
             $routineName = "`{$this->getDatabaseName()}`.`{$this->getName()}`";
@@ -333,18 +345,19 @@ protected function makeRoutineName()
 
     /**
      * Make the portion of the routine DDL statement that describes deterministic, sql security and comment.
-     * @return string Characteristics DDL.
+     *
+     * @return string characteristics DDL
      */
     protected function makeCharacteristicsDDL()
     {
         return implode(
-            " ",
+            ' ',
             array_filter(
                 [
                     $this->deterministic ? 'DETERMINISTIC' : 'NOT DETERMINISTIC',
                     $this->dataAccess,
                     !empty($this->sqlSecurity) ? 'SQL SECURITY ' . $this->sqlSecurity : null,
-                    !empty($this->comment) ? "\nCOMMENT '" . addslashes($this->comment) . "'" : null
+                    !empty($this->comment) ? "\nCOMMENT '" . addslashes($this->comment) . "'" : null,
                 ]
             )
         );
diff --git a/src/MySQL/Routine/AbstractRoutineParameter.php b/src/MySQL/Routine/AbstractRoutineParameter.php
index 682249e..8172c58 100644
--- a/src/MySQL/Routine/AbstractRoutineParameter.php
+++ b/src/MySQL/Routine/AbstractRoutineParameter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Routine;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
@@ -7,21 +9,24 @@
 abstract class AbstractRoutineParameter implements RoutineParameterInterface
 {
     /**
-     * Parameter name
+     * Parameter name.
+     *
      * @var string
      */
     protected $name;
 
     /**
      * Parameter data type.
+     *
      * @var DataTypeInterface
      */
     protected $dataType;
 
     /**
      * AbstractRoutineParameter constructor.
+     *
      * @param string $name Parameter name
-     * @param DataTypeInterface $dataType Parameter data type.
+     * @param DataTypeInterface $dataType parameter data type
      */
     public function __construct($name, DataTypeInterface $dataType)
     {
@@ -40,7 +45,7 @@ public function getName()
     /**
      * {@inheritdoc}
      */
-    public function setName($name)
+    public function setName($name): void
     {
         $this->name = $name;
     }
@@ -56,7 +61,7 @@ public function getDataType()
     /**
      * {@inheritdoc}
      */
-    public function setDataType(DataTypeInterface $dataType)
+    public function setDataType(DataTypeInterface $dataType): void
     {
         $this->dataType = $dataType;
     }
diff --git a/src/MySQL/Routine/FunctionParameter.php b/src/MySQL/Routine/FunctionParameter.php
index 7b82891..1db5cbc 100644
--- a/src/MySQL/Routine/FunctionParameter.php
+++ b/src/MySQL/Routine/FunctionParameter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Routine;
 
 class FunctionParameter extends AbstractRoutineParameter implements FunctionParameterInterface
@@ -12,7 +14,7 @@ public function getDDL()
         return sprintf(
             '`%s` %s',
             $this->getName(),
-            (string)$this->getDataType()
+            (string) $this->getDataType()
         );
     }
 
diff --git a/src/MySQL/Routine/FunctionParameterInterface.php b/src/MySQL/Routine/FunctionParameterInterface.php
index 1f1cc14..db5d29d 100644
--- a/src/MySQL/Routine/FunctionParameterInterface.php
+++ b/src/MySQL/Routine/FunctionParameterInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Routine;
 
 interface FunctionParameterInterface extends RoutineParameterInterface
diff --git a/src/MySQL/Routine/ProcedureParameter.php b/src/MySQL/Routine/ProcedureParameter.php
index 3d90f13..48aecd8 100644
--- a/src/MySQL/Routine/ProcedureParameter.php
+++ b/src/MySQL/Routine/ProcedureParameter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Routine;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
@@ -8,15 +10,17 @@ class ProcedureParameter extends AbstractRoutineParameter implements ProcedurePa
 {
     /**
      * Parameter value direction.
+     *
      * @var string
      */
     protected $direction = self::DIRECTION_IN;
 
     /**
      * ProcedureParameter constructor.
-     * @param string $name Parameter name.
-     * @param DataTypeInterface $dataType Parameter data type.
-     * @param string $direction Parameter value direction.
+     *
+     * @param string $name parameter name
+     * @param DataTypeInterface $dataType parameter data type
+     * @param string $direction parameter value direction
      */
     public function __construct($name, DataTypeInterface $dataType, $direction = self::DIRECTION_IN)
     {
@@ -36,7 +40,7 @@ public function getDirection()
     /**
      * {@inheritdoc}
      */
-    public function setDirection($direction)
+    public function setDirection($direction): void
     {
         $this->direction = $direction;
     }
@@ -50,7 +54,7 @@ public function getDDL()
             '%s `%s` %s',
             $this->direction,
             $this->getName(),
-            (string)$this->getDataType()
+            (string) $this->getDataType()
         );
     }
 
diff --git a/src/MySQL/Routine/ProcedureParameterInterface.php b/src/MySQL/Routine/ProcedureParameterInterface.php
index 1dd1c57..58b4881 100644
--- a/src/MySQL/Routine/ProcedureParameterInterface.php
+++ b/src/MySQL/Routine/ProcedureParameterInterface.php
@@ -1,16 +1,19 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Routine;
 
 interface ProcedureParameterInterface extends RoutineParameterInterface
 {
-    const DIRECTION_IN = 'IN';
-    const DIRECTION_OUT = 'OUT';
-    const DIRECTION_INOUT = 'INOUT';
+    public const DIRECTION_IN = 'IN';
+    public const DIRECTION_OUT = 'OUT';
+    public const DIRECTION_INOUT = 'INOUT';
 
     /**
      * Get the direction for parameter.
-     * @return string One of ProcedureParameterInterface::DIRECTION_* constants.
+     *
+     * @return string one of ProcedureParameterInterface::DIRECTION_* constants
      */
     public function getDirection();
 }
diff --git a/src/MySQL/Routine/RoutineFunction.php b/src/MySQL/Routine/RoutineFunction.php
index 48d864d..7a6ad39 100644
--- a/src/MySQL/Routine/RoutineFunction.php
+++ b/src/MySQL/Routine/RoutineFunction.php
@@ -1,28 +1,32 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Routine;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
-use MilesAsylum\SchnoopSchema\MySQL\Exception\FQNException;
 
 class RoutineFunction extends AbstractRoutine implements RoutineFunctionInterface
 {
     /**
      * Function parameters.
+     *
      * @var FunctionParameterInterface[]
      */
     protected $parameters = [];
 
     /**
      * Function return type.
+     *
      * @var DataTypeInterface
      */
     protected $returns;
 
     /**
      * RoutineFunction constructor.
-     * @param string $name Function name.
-     * @param DataTypeInterface $return Function return type.
+     *
+     * @param string $name function name
+     * @param DataTypeInterface $return function return type
      */
     public function __construct($name, DataTypeInterface $return)
     {
@@ -50,7 +54,7 @@ public function hasParameters()
     /**
      * {@inheritdoc}
      */
-    public function setParameters(array $parameters)
+    public function setParameters(array $parameters): void
     {
         $this->parameters = $parameters;
     }
@@ -58,7 +62,7 @@ public function setParameters(array $parameters)
     /**
      * {@inheritdoc}
      */
-    public function addParameter(FunctionParameterInterface $parameter)
+    public function addParameter(FunctionParameterInterface $parameter): void
     {
         $this->parameters[] = $parameter;
     }
@@ -74,7 +78,7 @@ public function getReturnType()
     /**
      * {@inheritdoc}
      */
-    public function setReturnType(DataTypeInterface $returns)
+    public function setReturnType(DataTypeInterface $returns): void
     {
         $this->returns = $returns;
     }
@@ -128,7 +132,7 @@ public function getCreateStatement()
                     $this->makeCharacteristicsDDL(),
                     'BEGIN',
                     $this->body,
-                    'END' . $this->delimiter
+                    'END' . $this->delimiter,
                 ]
             )
         );
@@ -140,7 +144,7 @@ public function getCreateStatement()
                     $setSqlMode,
                     $dropDDL,
                     $createDDL,
-                    $revertSqlMode
+                    $revertSqlMode,
                 ]
             )
         );
@@ -155,10 +159,12 @@ public function __toString()
 
     /**
      * Make the portion of DDL for describing the parameters.
-     * @param string $separator String to apply between parameters.
-     * @return string Parameters DDL.
+     *
+     * @param string $separator string to apply between parameters
+     *
+     * @return string parameters DDL
      */
-    protected function makeParametersDDL($separator = " ")
+    protected function makeParametersDDL($separator = ' ')
     {
         $params = [];
 
diff --git a/src/MySQL/Routine/RoutineFunctionInterface.php b/src/MySQL/Routine/RoutineFunctionInterface.php
index 6a6922a..f93c0f0 100644
--- a/src/MySQL/Routine/RoutineFunctionInterface.php
+++ b/src/MySQL/Routine/RoutineFunctionInterface.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Routine;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
@@ -7,38 +10,41 @@ interface RoutineFunctionInterface extends RoutineInterface
 {
     /**
      * Get The parameters for the function.
+     *
      * @return FunctionParameterInterface[]
      */
     public function getParameters();
 
     /**
-     * Identify if the function has any parameters
-     * @return bool True if the function has at least one parameter.
+     * Identify if the function has any parameters.
+     *
+     * @return bool true if the function has at least one parameter
      */
     public function hasParameters();
 
     /**
      * Set the parameters for the function.
+     *
      * @param FunctionParameterInterface[] $parameters
      */
     public function setParameters(array $parameters);
 
     /**
      * Add a parameter to the function.
-     * @param FunctionParameterInterface $parameter
+     *
      * @return mixed
      */
     public function addParameter(FunctionParameterInterface $parameter);
 
     /**
-     * Get the return type for the function
-     * @return DataTypeInterface Data type.
+     * Get the return type for the function.
+     *
+     * @return DataTypeInterface data type
      */
     public function getReturnType();
 
     /**
      * Sets the return type for the function.
-     * @param DataTypeInterface $return
      */
     public function setReturnType(DataTypeInterface $return);
 }
diff --git a/src/MySQL/Routine/RoutineInterface.php b/src/MySQL/Routine/RoutineInterface.php
index f08be48..8ba7ca5 100644
--- a/src/MySQL/Routine/RoutineInterface.php
+++ b/src/MySQL/Routine/RoutineInterface.php
@@ -1,123 +1,134 @@
 <?php
+
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Routine;
 
 use MilesAsylum\SchnoopSchema\MySQL\CreateStatementInterface;
-use MilesAsylum\SchnoopSchema\MySQL\HasDefinerInterface;
-use MilesAsylum\SchnoopSchema\MySQL\HasDelimiterInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DroppableInterface;
 use MilesAsylum\SchnoopSchema\MySQL\FullyQualifiedNameInterface;
+use MilesAsylum\SchnoopSchema\MySQL\HasDefinerInterface;
+use MilesAsylum\SchnoopSchema\MySQL\HasDelimiterInterface;
 use MilesAsylum\SchnoopSchema\MySQL\HasSqlModeInterface;
 use MilesAsylum\SchnoopSchema\MySQL\MySQLInterface;
-use MilesAsylum\SchnoopSchema\MySQL\SetVar\SqlMode;
-
-interface RoutineInterface extends
-    MySQLInterface,
-    HasDelimiterInterface,
-    DroppableInterface,
-    CreateStatementInterface,
-    FullyQualifiedNameInterface,
-    HasSqlModeInterface,
-    HasDefinerInterface
+
+interface RoutineInterface extends MySQLInterface, HasDelimiterInterface, DroppableInterface, CreateStatementInterface, FullyQualifiedNameInterface, HasSqlModeInterface, HasDefinerInterface
 {
-    const DATA_ACCESS_CONTAINS_SQL = 'CONTAINS SQL';
-    const DATA_ACCESS_NO_SQL = 'NO SQL';
-    const DATA_ACCESS_READS_SQL_DATA = 'READS SQL DATA';
-    const DATA_ACCESS_MODIFIES_SQL_DATA = 'MODIFIES SQL DATA';
-    const SECURITY_DEFINER = 'DEFINER';
-    const SECURITY_INVOKER = 'INVOKER';
+    public const DATA_ACCESS_CONTAINS_SQL = 'CONTAINS SQL';
+    public const DATA_ACCESS_NO_SQL = 'NO SQL';
+    public const DATA_ACCESS_READS_SQL_DATA = 'READS SQL DATA';
+    public const DATA_ACCESS_MODIFIES_SQL_DATA = 'MODIFIES SQL DATA';
+    public const SECURITY_DEFINER = 'DEFINER';
+    public const SECURITY_INVOKER = 'INVOKER';
 
     /**
      * Get the routine name.
+     *
      * @return string
      */
     public function getName();
 
     /**
      * Get the database name.
+     *
      * @return string
      */
     public function getDatabaseName();
 
     /**
      * Identify if a database name is set for the routine.
+     *
      * @return bool
      */
     public function hasDatabaseName();
 
     /**
      * Set the database name.
+     *
      * @param string $databaseName
      */
     public function setDatabaseName($databaseName);
 
     /**
      * Get the routine comment.
+     *
      * @return string
      */
     public function getComment();
 
     /**
      * Set the routine comment.
+     *
      * @param string $comment
      */
     public function setComment($comment);
 
     /**
      * Identify if the routine has a comment.
-     * @return bool True if a comment is set.
+     *
+     * @return bool true if a comment is set
      */
     public function hasComment();
 
     /**
      * Identify if the routine is deterministic.
-     * @return boolean True if the routine is deterministic.
+     *
+     * @return bool true if the routine is deterministic
      */
     public function isDeterministic();
 
     /**
      * Set if the routine is deterministic.
-     * @param boolean $deterministic Set to true for if the routine is deterministic.
+     *
+     * @param bool $deterministic set to true for if the routine is deterministic
      */
     public function setDeterministic($deterministic);
 
     /**
      * Get the data access for the routine.
-     * @return string One of RoutineInterface::DATA_ACCESS_* constants.
+     *
+     * @return string one of RoutineInterface::DATA_ACCESS_* constants
      */
     public function getDataAccess();
 
     /**
      * Set the data access for the routine.
-     * @param string $contains One of RoutineInterface::DATA_ACCESS_* constants.
+     *
+     * @param string $contains one of RoutineInterface::DATA_ACCESS_* constants
      */
     public function setDataAccess($contains);
 
     /**
      * Get the SQL security for the routine.
-     * @return string One of RoutineInterface::SECURITY_* constants.
+     *
+     * @return string one of RoutineInterface::SECURITY_* constants
      */
     public function getSqlSecurity();
 
     /**
      * Set the SQL security for the routine.
-     * @param mixed $sqlSecurity One of RoutineInterface::SECURITY_* constants.
+     *
+     * @param mixed $sqlSecurity one of RoutineInterface::SECURITY_* constants
      */
     public function setSqlSecurity($sqlSecurity);
 
     /**
      * Get the routine body.
+     *
      * @return string
      */
     public function getBody();
 
     /**
      * Set the routine body.
+     *
      * @param string $body
      */
     public function setBody($body);
 
     /**
      * DDL statement for the routine.
+     *
      * @return string
      */
     public function __toString();
diff --git a/src/MySQL/Routine/RoutineParameterInterface.php b/src/MySQL/Routine/RoutineParameterInterface.php
index 643922d..df5338e 100644
--- a/src/MySQL/Routine/RoutineParameterInterface.php
+++ b/src/MySQL/Routine/RoutineParameterInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Routine;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
@@ -8,37 +10,42 @@ interface RoutineParameterInterface
 {
     /**
      * Get the parameter name.
+     *
      * @return string
      */
     public function getName();
 
     /**
      * Set the parameter name.
+     *
      * @param $name
      */
     public function setName($name);
 
     /**
      * Get the parameter data type.
+     *
      * @return DataTypeInterface
      */
     public function getDataType();
 
     /**
      * Set the parameter data type.
-     * @param DataTypeInterface $dataType
      */
     public function setDataType(DataTypeInterface $dataType);
 
     /**
      * Get the DDL for the parameter.
+     *
      * @return string
      */
     public function getDDL();
 
     /**
      * DDL for the parameter.
+     *
      * @uses RoutineParameterInterface::getDDL();
+     *
      * @return string
      */
     public function __toString();
diff --git a/src/MySQL/Routine/RoutineProcedure.php b/src/MySQL/Routine/RoutineProcedure.php
index 5c476d2..e97497a 100644
--- a/src/MySQL/Routine/RoutineProcedure.php
+++ b/src/MySQL/Routine/RoutineProcedure.php
@@ -1,13 +1,14 @@
 <?php
 
-namespace MilesAsylum\SchnoopSchema\MySQL\Routine;
+declare(strict_types=1);
 
-use MilesAsylum\SchnoopSchema\MySQL\Exception\FQNException;
+namespace MilesAsylum\SchnoopSchema\MySQL\Routine;
 
 class RoutineProcedure extends AbstractRoutine implements RoutineProcedureInterface
 {
     /**
      * Routine parameters.
+     *
      * @var ProcedureParameterInterface[]
      */
     protected $parameters = [];
@@ -31,7 +32,7 @@ public function hasParameters()
     /**
      * {@inheritdoc}
      */
-    public function setParameters(array $parameters)
+    public function setParameters(array $parameters): void
     {
         $this->parameters = $parameters;
     }
@@ -39,7 +40,7 @@ public function setParameters(array $parameters)
     /**
      * {@inheritdoc}
      */
-    public function addParameter(ProcedureParameterInterface $parameter)
+    public function addParameter(ProcedureParameterInterface $parameter): void
     {
         $this->parameters[] = $parameter;
     }
@@ -93,7 +94,7 @@ public function getCreateStatement()
                         $this->makeCharacteristicsDDL(),
                         'BEGIN',
                         $this->body,
-                        'END' . $this->delimiter
+                        'END' . $this->delimiter,
                     ]
                 )
             );
@@ -105,7 +106,7 @@ public function getCreateStatement()
                     $setSqlMode,
                     $dropDDL,
                     $createDDL,
-                    $revertSqlMode
+                    $revertSqlMode,
                 ]
             )
         );
@@ -123,10 +124,12 @@ public function __toString()
 
     /**
      * Make the portion of DDL for describing the parameters.
-     * @param string $separator String to apply between parameters.
-     * @return string Parameters DDL.
+     *
+     * @param string $separator string to apply between parameters
+     *
+     * @return string parameters DDL
      */
-    protected function makeParametersDDL($separator = " ")
+    protected function makeParametersDDL($separator = ' ')
     {
         $params = [];
 
diff --git a/src/MySQL/Routine/RoutineProcedureInterface.php b/src/MySQL/Routine/RoutineProcedureInterface.php
index 3c37b40..89b67d2 100644
--- a/src/MySQL/Routine/RoutineProcedureInterface.php
+++ b/src/MySQL/Routine/RoutineProcedureInterface.php
@@ -1,29 +1,34 @@
 <?php
+
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Routine;
 
 interface RoutineProcedureInterface extends RoutineInterface
 {
     /**
      * Get the procedure parameters.
+     *
      * @return ProcedureParameterInterface[]
      */
     public function getParameters();
 
     /**
-     * Identify if the procedure has any parameters
-     * @return bool True if the procedure has at least one parameter.
+     * Identify if the procedure has any parameters.
+     *
+     * @return bool true if the procedure has at least one parameter
      */
     public function hasParameters();
 
     /**
      * Set the parameters for the procedure.
+     *
      * @param ProcedureParameterInterface[] $parameters
      */
     public function setParameters(array $parameters);
 
     /**
      * Add a parameter to the procedure.
-     * @param ProcedureParameterInterface $parameter
      */
     public function addParameter(ProcedureParameterInterface $parameter);
 }
diff --git a/src/MySQL/SetVar/SqlMode.php b/src/MySQL/SetVar/SqlMode.php
index a59ae6b..c2e97e1 100644
--- a/src/MySQL/SetVar/SqlMode.php
+++ b/src/MySQL/SetVar/SqlMode.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\SetVar;
 
 use MilesAsylum\SchnoopSchema\MySQL\HasDelimiterInterface;
@@ -13,6 +15,7 @@ class SqlMode implements MySQLInterface, HasDelimiterInterface
 
     /**
      * SqlMode constructor.
+     *
      * @param string $mode SQL Mode
      */
     public function __construct($mode)
@@ -22,6 +25,7 @@ public function __construct($mode)
 
     /**
      * Get the SQL mode.
+     *
      * @return string
      */
     public function getMode()
@@ -31,15 +35,17 @@ public function getMode()
 
     /**
      * Set the SQL mode.
+     *
      * @param mixed $mode
      */
-    public function setMode($mode)
+    public function setMode($mode): void
     {
         $this->mode = $mode;
     }
 
     /**
      * Get the delimiter to use between statements.
+     *
      * @return string
      */
     public function getDelimiter()
@@ -49,15 +55,17 @@ public function getDelimiter()
 
     /**
      * Set the delimiter to use between statements.
+     *
      * @param $delimiter
      */
-    public function setDelimiter($delimiter)
+    public function setDelimiter($delimiter): void
     {
         $this->delimiter = $delimiter;
     }
 
     /**
      * Get the DDL statements for setting the SQL mode whilst preserving the original SQL mode.
+     *
      * @return string
      */
     public function getSetStatements()
@@ -70,6 +78,7 @@ public function getSetStatements()
 
     /**
      * Get the DDL statements for restoring the previously changed SQL mode.
+     *
      * @return string
      */
     public function getRestoreStatements()
diff --git a/src/MySQL/Table/Table.php b/src/MySQL/Table/Table.php
index 53917b4..d8c975d 100644
--- a/src/MySQL/Table/Table.php
+++ b/src/MySQL/Table/Table.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Table;
 
 use MilesAsylum\SchnoopSchema\MySQL\Column\ColumnInterface;
@@ -11,79 +13,92 @@ class Table implements TableInterface
 {
     /**
      * Table name.
+     *
      * @var string
      */
     protected $name;
 
     /**
      * Database name.
+     *
      * @var string
      */
     protected $databaseName;
 
     /**
      * Columns.
+     *
      * @var ColumnInterface[]
      */
-    protected $columns = array();
+    protected $columns = [];
 
     /**
      * Indexes.
+     *
      * @var ConstraintInterface[]
      */
     protected $indexes = [];
 
     /**
      * Foreign keys.
+     *
      * @var ForeignKeyInterface[]
      */
     protected $foreignKeys = [];
 
     /**
      * Table engine.
+     *
      * @var string
      */
     protected $engine;
 
     /**
      * Default collation.
+     *
      * @var
      */
     protected $defaultCollation;
 
     /**
      * Table row format.
+     *
      * @var string
      */
     protected $rowFormat;
 
     /**
      * Table comment.
+     *
      * @var string
      */
     protected $comment;
 
     /**
      * The delimiter to use between statements.
+     *
      * @var string
      */
     protected $ddlDelimiter = self::DEFAULT_DELIMITER;
 
     /**
      * Whether to include a drop statement with the create statement.
+     *
      * @var bool
      */
     protected $ddlDropPolicy = self::DDL_DROP_POLICY_DO_NOT_DROP;
 
     /**
      * Whether the DDL will use the fully qualified name for resources.
+     *
      * @var bool
      */
     protected $ddlUseFullyQualifiedName = false;
 
     /**
      * Table constructor.
-     * @param $name string The table name.
+     *
+     * @param $name string The table name
      */
     public function __construct($name)
     {
@@ -101,7 +116,7 @@ public function getName()
     /**
      * {@inheritdoc}
      */
-    public function setName($name)
+    public function setName($name): void
     {
         $this->name = $name;
     }
@@ -125,7 +140,7 @@ public function hasDatabaseName()
     /**
      * {@inheritdoc}
      */
-    public function setDatabaseName($databaseName)
+    public function setDatabaseName($databaseName): void
     {
         $this->databaseName = $databaseName;
     }
@@ -165,7 +180,7 @@ public function getColumn($columnName)
     /**
      * {@inheritdoc}
      */
-    public function setColumns(array $columns)
+    public function setColumns(array $columns): void
     {
         $this->columns = [];
 
@@ -177,7 +192,7 @@ public function setColumns(array $columns)
     /**
      * {@inheritdoc}
      */
-    public function addColumn(ColumnInterface $column)
+    public function addColumn(ColumnInterface $column): void
     {
         $column->setTableName($this->name);
         $this->columns[$column->getName()] = $column;
@@ -218,7 +233,7 @@ public function getIndex($indexName)
     /**
      * {@inheritdoc}
      */
-    public function setIndexes(array $indexes)
+    public function setIndexes(array $indexes): void
     {
         $this->indexes = [];
 
@@ -230,11 +245,11 @@ public function setIndexes(array $indexes)
     /**
      * {@inheritdoc}
      */
-    public function addIndex(ConstraintInterface $index)
+    public function addIndex(ConstraintInterface $index): void
     {
         $name = $index->getName();
 
-        if (strtoupper($name) == 'PRIMARY') {
+        if ('PRIMARY' == strtoupper($name)) {
             $name = strtoupper($name);
         }
 
@@ -293,7 +308,7 @@ public function hasForeignKey($foreignKeyName)
     /**
      * {@inheritdoc}
      */
-    public function setForeignKeys(array $foreignKeys)
+    public function setForeignKeys(array $foreignKeys): void
     {
         $this->foreignKeys = [];
 
@@ -305,7 +320,7 @@ public function setForeignKeys(array $foreignKeys)
     /**
      * {@inheritdoc}
      */
-    public function addForeignKey(ForeignKeyInterface $foreignKey)
+    public function addForeignKey(ForeignKeyInterface $foreignKey): void
     {
         $this->foreignKeys[$foreignKey->getName()] = $foreignKey;
         $foreignKey->setTableName($this->getName());
@@ -330,7 +345,7 @@ public function hasEngine()
     /**
      * {@inheritdoc}
      */
-    public function setEngine($engine)
+    public function setEngine($engine): void
     {
         $this->engine = strtoupper($engine);
     }
@@ -354,7 +369,7 @@ public function hasDefaultCollation()
     /**
      * {@inheritdoc}
      */
-    public function setDefaultCollation($defaultCollation)
+    public function setDefaultCollation($defaultCollation): void
     {
         $this->defaultCollation = $defaultCollation;
     }
@@ -378,7 +393,7 @@ public function hasRowFormat()
     /**
      * {@inheritdoc}
      */
-    public function setRowFormat($rowFormat)
+    public function setRowFormat($rowFormat): void
     {
         $this->rowFormat = strtoupper($rowFormat);
     }
@@ -396,13 +411,13 @@ public function getComment()
      */
     public function hasComment()
     {
-        return (bool)strlen($this->comment);
+        return null !== $this->comment && '' !== $this->comment;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function setComment($comment)
+    public function setComment($comment): void
     {
         $this->comment = $comment;
     }
@@ -418,7 +433,7 @@ public function getDelimiter()
     /**
      * {@inheritdoc}
      */
-    public function setDelimiter($delimiter)
+    public function setDelimiter($delimiter): void
     {
         $this->ddlDelimiter = $delimiter;
     }
@@ -434,7 +449,7 @@ public function getDropPolicy()
     /**
      * {@inheritdoc}
      */
-    public function setDropPolicy($ddlDropPolicy)
+    public function setDropPolicy($ddlDropPolicy): void
     {
         $this->ddlDropPolicy = $ddlDropPolicy;
     }
@@ -450,7 +465,7 @@ public function useFullyQualifiedName()
     /**
      * {@inheritdoc}
      */
-    public function setUseFullyQualifiedName($useFullyQualifiedName)
+    public function setUseFullyQualifiedName($useFullyQualifiedName): void
     {
         $this->ddlUseFullyQualifiedName = $useFullyQualifiedName;
     }
@@ -464,9 +479,7 @@ public function getCreateStatement()
 
         if ($this->ddlUseFullyQualifiedName) {
             if (!$this->hasDatabaseName()) {
-                throw new FQNException(
-                    'Unable to create DDL with fully-qualified-name because the database name has not been set.'
-                );
+                throw new FQNException('Unable to create DDL with fully-qualified-name because the database name has not been set.');
             }
 
             $tableName = "`{$this->getDatabaseName()}`.`{$this->getName()}`";
@@ -491,17 +504,17 @@ public function getCreateStatement()
 
         $columnDefinitions = [];
         foreach ($this->getColumns() as $column) {
-            $columnDefinitions[] = '  '.(string)$column;
+            $columnDefinitions[] = '  ' . (string) $column;
         }
 
         $indexDefinitions = [];
         foreach ($this->getIndexes() as $index) {
-            $indexDefinitions[] = '  '.(string)$index;
+            $indexDefinitions[] = '  ' . (string) $index;
         }
 
         $foreignKeyDefinitions = [];
         foreach ($this->getForeignKeys() as $foreignKey) {
-            $foreignKeyDefinitions[] = '  ' . (string)$foreignKey;
+            $foreignKeyDefinitions[] = '  ' . (string) $foreignKey;
         }
 
         $tableOptions = array_filter(
@@ -509,7 +522,7 @@ public function getCreateStatement()
                 $this->hasEngine() ? 'ENGINE = ' . strtoupper($this->getEngine()) : null,
                 $this->hasDefaultCollation() ? "DEFAULT COLLATE = '" . $this->getDefaultCollation() . "'" : null,
                 $this->hasRowFormat() ? 'ROW_FORMAT = ' . strtoupper($this->getRowFormat()) : null,
-                $this->hasComment() ? "COMMENT = '" . addslashes($this->getComment()) . "'" : null
+                $this->hasComment() ? "COMMENT = '" . addslashes($this->getComment()) . "'" : null,
             ]
         );
 
@@ -537,7 +550,7 @@ public function getCreateStatement()
             array_filter(
                 [
                     $dropDDL,
-                    $createDDL
+                    $createDDL,
                 ]
             )
         );
diff --git a/src/MySQL/Table/TableInterface.php b/src/MySQL/Table/TableInterface.php
index 48cd34e..6223b7e 100644
--- a/src/MySQL/Table/TableInterface.php
+++ b/src/MySQL/Table/TableInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Table;
 
 use MilesAsylum\SchnoopSchema\MySQL\Column\ColumnInterface;
@@ -8,289 +10,330 @@
 use MilesAsylum\SchnoopSchema\MySQL\Constraint\IndexInterface;
 use MilesAsylum\SchnoopSchema\MySQL\Constraint\PrimaryKey;
 use MilesAsylum\SchnoopSchema\MySQL\CreateStatementInterface;
-use MilesAsylum\SchnoopSchema\MySQL\HasDelimiterInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DroppableInterface;
+use MilesAsylum\SchnoopSchema\MySQL\HasDelimiterInterface;
 use MilesAsylum\SchnoopSchema\MySQL\MySQLInterface;
 
-interface TableInterface extends
-    MySQLInterface,
-    HasDelimiterInterface,
-    DroppableInterface,
-    CreateStatementInterface
+interface TableInterface extends MySQLInterface, HasDelimiterInterface, DroppableInterface, CreateStatementInterface
 {
     /**
      * MySQL keyword for the InnoDB table engine.
      */
-    const ENGINE_INNODB = 'INNODB';
+    public const ENGINE_INNODB = 'INNODB';
 
     /**
      * MySQL keyword for the Memory table engine.
      */
-    const ENGINE_MEMORY = 'MEMORY';
+    public const ENGINE_MEMORY = 'MEMORY';
 
     /**
      * MySQL keyword for the table default row format.
      */
-    const ROW_FORMAT_DEFAULT = 'DEFAULT';
+    public const ROW_FORMAT_DEFAULT = 'DEFAULT';
 
     /**
      * MySQL keyword for the table dynamic row format.
      */
-    const ROW_FORMAT_DYNAMIC = 'DYNAMIC';
+    public const ROW_FORMAT_DYNAMIC = 'DYNAMIC';
 
     /**
      * MySQL keyword for the table fixed row format.
      */
-    const ROW_FORMAT_FIXED = 'FIXED';
+    public const ROW_FORMAT_FIXED = 'FIXED';
 
     /**
      * MySQL keyword for the table compressed row format.
      */
-    const ROW_FORMAT_COMPRESSED = 'COMPRESSED';
+    public const ROW_FORMAT_COMPRESSED = 'COMPRESSED';
 
     /**
      * MySQL keyword for the table redundant row format.
      */
-    const ROW_FORMAT_REDUNDANT = 'REDUNDANT';
+    public const ROW_FORMAT_REDUNDANT = 'REDUNDANT';
 
     /**
      * MySQL keyword for the table compact row format.
      */
-    const ROW_FORMAT_COMPACT = 'COMPACT';
+    public const ROW_FORMAT_COMPACT = 'COMPACT';
 
     /**
      * Get the table name.
-     * @return string Table name.
+     *
+     * @return string table name
      */
     public function getName();
 
     /**
      * Set the table name.
-     * @param string $name Table name.
+     *
+     * @param string $name table name
      */
     public function setName($name);
 
     /**
      * Get the database name.
-     * @return string Database name.
+     *
+     * @return string database name
      */
     public function getDatabaseName();
 
     /**
      * Indicates if a database name is set for the table.
-     * @return bool Returns true if table has a database name set.
+     *
+     * @return bool returns true if table has a database name set
      */
     public function hasDatabaseName();
 
     /**
      * Set the database name for the table.
-     * @param string $databaseName Database name.
+     *
+     * @param string $databaseName database name
      */
     public function setDatabaseName($databaseName);
 
     /**
      * Get the names of all columns in the table.
-     * @return array Column names.
+     *
+     * @return array column names
      */
     public function getColumnList();
 
     /**
      * Get all the columns for the table.
+     *
      * @return ColumnInterface[] Columns
      */
     public function getColumns();
 
     /**
      * Identify if a column with the supplied name exists in the table.
-     * @param string $columnName Column name.
-     * @return bool Returns true if the a column exists with the supplied name.
+     *
+     * @param string $columnName column name
+     *
+     * @return bool returns true if the a column exists with the supplied name
      */
     public function hasColumn($columnName);
 
     /**
      * Get a column by its name.
+     *
      * @param string $columnName Column name
-     * @return ColumnInterface Returns the column for the supplied name, or
-     * NULL if the column does not exist.
+     *
+     * @return ColumnInterface returns the column for the supplied name, or
+     *                         NULL if the column does not exist
      */
     public function getColumn($columnName);
 
     /**
      * Set the columns for the table.
-     * @param ColumnInterface[] $columns Array of columns for the table.
+     *
+     * @param ColumnInterface[] $columns array of columns for the table
      */
     public function setColumns(array $columns);
 
     /**
      * Add a column to the table.
-     * @param ColumnInterface $column Column to add.
+     *
+     * @param ColumnInterface $column column to add
      */
     public function addColumn(ColumnInterface $column);
 
     /**
      * Get the names of all indexes on the table.
-     * @return array Index names.
+     *
+     * @return array index names
      */
     public function getIndexList();
 
     /**
      * Get the indexes on the table.
-     * @return IndexInterface[] Array of indexes.
+     *
+     * @return IndexInterface[] array of indexes
      */
     public function getIndexes();
 
     /**
      * Identify if the table has an index with the given name.
-     * @param string $indexName The name of the index to look for.
-     * @return bool mixed True if the named index is found.
+     *
+     * @param string $indexName the name of the index to look for
+     *
+     * @return bool mixed True if the named index is found
      */
     public function hasIndex($indexName);
 
     /**
      * Gets an index by it's name.
-     * @param string $indexName The index name.
-     * @return IndexInterface The index.
+     *
+     * @param string $indexName the index name
+     *
+     * @return IndexInterface the index
      */
     public function getIndex($indexName);
 
     /**
      * Set all indexes on the table.
-     * @param ConstraintInterface[] $indexes Array of indexes to set.
+     *
+     * @param ConstraintInterface[] $indexes array of indexes to set
      */
     public function setIndexes(array $indexes);
 
     /**
      * Add an index on the table.
-     * @param ConstraintInterface $index The index to add.
+     *
+     * @param ConstraintInterface $index the index to add
      */
     public function addIndex(ConstraintInterface $index);
 
     /**
      * Indicates if the table has a primary key.
-     * @return bool True if a primary key exists.
+     *
+     * @return bool true if a primary key exists
      */
     public function hasPrimaryKey();
 
     /**
      * Gets the primary key for the table.
+     *
      * @return PrimaryKey The primary key.  Null if a primary key does not exists.
      */
     public function getPrimaryKey();
 
     /**
      * Returns the names of the foreign keys on the table.
-     * @return array Foreign key names.
+     *
+     * @return array foreign key names
      */
     public function getForeignKeyList();
 
     /**
      * Get all the foreign keys on the table.
-     * @return ForeignKeyInterface[] Array of foreign keys.
+     *
+     * @return ForeignKeyInterface[] array of foreign keys
      */
     public function getForeignKeys();
 
     /**
      * Get a foreign key by its name.
-     * @param string $foreignKeyName The name of the foreign key to get.
+     *
+     * @param string $foreignKeyName the name of the foreign key to get
+     *
      * @return ForeignKeyInterface
      */
     public function getForeignKey($foreignKeyName);
 
     /**
      * Identify if the table has a foreign key with the supplied name.
-     * @param string $foreignKeyName The name of the foreign key to check for.
-     * @return bool True if the named foreign key exists.
+     *
+     * @param string $foreignKeyName the name of the foreign key to check for
+     *
+     * @return bool true if the named foreign key exists
      */
     public function hasForeignKey($foreignKeyName);
 
     /**
      * Set the foreign keys on the table.
-     * @param ForeignKeyInterface[] $foreignKeys Foreign keys to set.
+     *
+     * @param ForeignKeyInterface[] $foreignKeys foreign keys to set
      */
     public function setForeignKeys(array $foreignKeys);
 
     /**
      * Add a foreign key to the table.
-     * @param ForeignKeyInterface $foreignKey Foreign key to add.
+     *
+     * @param ForeignKeyInterface $foreignKey foreign key to add
      */
     public function addForeignKey(ForeignKeyInterface $foreignKey);
 
     /**
      * Get the table engine.
-     * @return string The table engine, or NULL if it has not been set.
+     *
+     * @return string the table engine, or NULL if it has not been set
      */
     public function getEngine();
 
     /**
      * Indicates if the table has an engine specified.
-     * @return bool True if an engine is specified.
+     *
+     * @return bool true if an engine is specified
      */
     public function hasEngine();
 
     /**
      * Set the table engine.
-     * @param string $engine The table engine.
+     *
+     * @param string $engine the table engine
      */
     public function setEngine($engine);
 
     /**
      * Get the default collation for the table.
-     * @return string The default collation, or null if a collation is not set.
+     *
+     * @return string the default collation, or null if a collation is not set
      */
     public function getDefaultCollation();
 
     /**
      * Indicates if the default collation is set for the table.
-     * @return bool True if the collation is set.
+     *
+     * @return bool true if the collation is set
      */
     public function hasDefaultCollation();
 
     /**
      * Set the default collation for the table.
-     * @param string $defaultCollation The default collation.
+     *
+     * @param string $defaultCollation the default collation
      */
     public function setDefaultCollation($defaultCollation);
 
     /**
      * Get the row format for the table.
-     * @return string The row format, null if the row format is not set.
+     *
+     * @return string the row format, null if the row format is not set
      */
     public function getRowFormat();
 
     /**
      * Indicates if the table has the row format specified.
-     * @return bool True if the row format is set.
+     *
+     * @return bool true if the row format is set
      */
     public function hasRowFormat();
 
     /**
      * Set the row format on the table.
-     * @param string $rowFormat The row format.
+     *
+     * @param string $rowFormat the row format
      */
     public function setRowFormat($rowFormat);
 
     /**
-     * Get the comment for the table
-     * @return string The comment, or null if a comment is not set.
+     * Get the comment for the table.
+     *
+     * @return string the comment, or null if a comment is not set
      */
     public function getComment();
 
     /**
      * Indicates if a comment is set for the table.
-     * @return bool True if a comment is set.
+     *
+     * @return bool true if a comment is set
      */
     public function hasComment();
 
     /**
-     * Set a comment for the table
-     * @param string $comment The comment.
+     * Set a comment for the table.
+     *
+     * @param string $comment the comment
      */
     public function setComment($comment);
 
     /**
      * The table DDL create statement.
+     *
      * @uses TableInterface::getCreateStatement()
-     * @return string The DDL create statement.
+     *
+     * @return string the DDL create statement
      */
     public function __toString();
 }
diff --git a/src/MySQL/Trigger/Trigger.php b/src/MySQL/Trigger/Trigger.php
index 8c28d66..502b5af 100644
--- a/src/MySQL/Trigger/Trigger.php
+++ b/src/MySQL/Trigger/Trigger.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Trigger;
 
 use MilesAsylum\SchnoopSchema\MySQL\Exception\FQNException;
@@ -9,88 +11,102 @@ class Trigger implements TriggerInterface
 {
     /**
      * Trigger Name.
+     *
      * @var string
      */
     protected $name;
 
     /**
      * Table name.
+     *
      * @var string
      */
     protected $tableName;
 
     /**
      * Database name.
+     *
      * @var string
      */
     protected $databaseName;
 
     /**
      * Trigger definer.
+     *
      * @var string
      */
     protected $definer;
 
     /**
      * Trigger event.
+     *
      * @var string
      */
     protected $event;
 
     /**
      * Trigger timing.
+     *
      * @var string
      */
     protected $timing;
 
     /**
      * Trigger logic.
+     *
      * @var string
      */
     protected $body;
 
     /**
      * Position context. One of self::POSITION_* constants.
+     *
      * @var string
      */
     protected $positionContext;
 
     /**
      * Name of trigger this trigger position is relative to.
+     *
      * @var string
      */
     protected $positionRelativeTo;
 
     /**
      * The delimiter to use between statements.
+     *
      * @var string
      */
     protected $delimiter = self::DEFAULT_DELIMITER;
 
     /**
      * Whether to include a drop statement with the create statement.
+     *
      * @var bool
      */
     protected $dropPolicy = self::DDL_DROP_POLICY_DO_NOT_DROP;
 
     /**
      * Whether the DDL will use the fully qualified name for resources.
+     *
      * @var bool
      */
     protected $useFullyQualifiedName = false;
 
     /**
      * Trigger SQL mode.
+     *
      * @var SqlMode
      */
     protected $sqlMode;
 
     /**
      * Trigger constructor.
+     *
      * @param string $name Trigger name
      * @param string $timing Trigger timing.  One of self::TIMING_* constants.
      * @param string $event Trigger event. One of self::EVENT_* constants.
-     * @param string $tableName Name of table the trigger is for.
+     * @param string $tableName name of table the trigger is for
      */
     public function __construct($name, $timing, $event, $tableName)
     {
@@ -111,7 +127,7 @@ public function getName()
     /**
      * {@inheritdoc}
      */
-    public function setName($name)
+    public function setName($name): void
     {
         $this->name = $name;
     }
@@ -127,7 +143,7 @@ public function getTableName()
     /**
      * {@inheritdoc}
      */
-    public function setTableName($tableName)
+    public function setTableName($tableName): void
     {
         $this->tableName = $tableName;
     }
@@ -151,7 +167,7 @@ public function hasDatabaseName()
     /**
      * {@inheritdoc}
      */
-    public function setDatabaseName($databaseName)
+    public function setDatabaseName($databaseName): void
     {
         $this->databaseName = $databaseName;
     }
@@ -175,7 +191,7 @@ public function hasDefiner()
     /**
      * {@inheritdoc}
      */
-    public function setDefiner($definer)
+    public function setDefiner($definer): void
     {
         $this->definer = $definer;
     }
@@ -191,7 +207,7 @@ public function getEvent()
     /**
      * {@inheritdoc}
      */
-    public function setEvent($event)
+    public function setEvent($event): void
     {
         $this->event = $event;
     }
@@ -207,7 +223,7 @@ public function getTiming()
     /**
      * {@inheritdoc}
      */
-    public function setTiming($timing)
+    public function setTiming($timing): void
     {
         $this->timing = $timing;
     }
@@ -225,13 +241,13 @@ public function getBody()
      */
     public function hasBody()
     {
-        return (bool)strlen($this->body);
+        return null !== $this->body && '' !== $this->body;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function setBody($body)
+    public function setBody($body): void
     {
         $this->body = $body;
     }
@@ -263,7 +279,7 @@ public function hasPosition()
     /**
      * {@inheritdoc}
      */
-    public function setPosition($positionContext, $relativeTo)
+    public function setPosition($positionContext, $relativeTo): void
     {
         $this->positionContext = $positionContext;
         $this->positionRelativeTo = $relativeTo;
@@ -288,12 +304,12 @@ public function hasSqlMode()
     /**
      * {@inheritdoc}
      */
-    public function setSqlMode(SqlMode $sqlMode)
+    public function setSqlMode(SqlMode $sqlMode): void
     {
         $this->sqlMode = $sqlMode;
     }
 
-    public function unsetSqlMode()
+    public function unsetSqlMode(): void
     {
         $this->sqlMode = null;
     }
@@ -309,7 +325,7 @@ public function getDelimiter()
     /**
      * {@inheritdoc}
      */
-    public function setDelimiter($delimiter)
+    public function setDelimiter($delimiter): void
     {
         $this->delimiter = $delimiter;
     }
@@ -325,7 +341,7 @@ public function getDropPolicy()
     /**
      * {@inheritdoc}
      */
-    public function setDropPolicy($ddlDropPolicy)
+    public function setDropPolicy($ddlDropPolicy): void
     {
         $this->dropPolicy = $ddlDropPolicy;
     }
@@ -341,7 +357,7 @@ public function useFullyQualifiedName()
     /**
      * {@inheritdoc}
      */
-    public function setUseFullyQualifiedName($useFullyQualifiedName)
+    public function setUseFullyQualifiedName($useFullyQualifiedName): void
     {
         $this->useFullyQualifiedName = $useFullyQualifiedName;
     }
@@ -355,9 +371,7 @@ public function getCreateStatement()
 
         if ($this->useFullyQualifiedName) {
             if (!$this->hasDatabaseName()) {
-                throw new FQNException(
-                    'Unable to create DDL with fully-qualified-name because the database name has not been set.'
-                );
+                throw new FQNException('Unable to create DDL with fully-qualified-name because the database name has not been set.');
             }
 
             $tableName = "`{$this->getDatabaseName()}`.`{$this->getTableName()}`";
@@ -409,7 +423,7 @@ public function getCreateStatement()
                         $triggerOrder,
                         'BEGIN',
                         $this->getBody(),
-                        'END' . $this->delimiter
+                        'END' . $this->delimiter,
                     ]
                 )
             );
@@ -421,7 +435,7 @@ public function getCreateStatement()
                     $setSqlMode,
                     $dropDDL,
                     $createDDL,
-                    $revertSqlMode
+                    $revertSqlMode,
                 ]
             )
         );
diff --git a/src/MySQL/Trigger/TriggerInterface.php b/src/MySQL/Trigger/TriggerInterface.php
index 27129fa..8ab5569 100644
--- a/src/MySQL/Trigger/TriggerInterface.php
+++ b/src/MySQL/Trigger/TriggerInterface.php
@@ -1,171 +1,186 @@
 <?php
+
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\MySQL\Trigger;
 
 use MilesAsylum\SchnoopSchema\MySQL\CreateStatementInterface;
+use MilesAsylum\SchnoopSchema\MySQL\DroppableInterface;
 use MilesAsylum\SchnoopSchema\MySQL\FullyQualifiedNameInterface;
 use MilesAsylum\SchnoopSchema\MySQL\HasDefinerInterface;
 use MilesAsylum\SchnoopSchema\MySQL\HasDelimiterInterface;
-use MilesAsylum\SchnoopSchema\MySQL\DroppableInterface;
 use MilesAsylum\SchnoopSchema\MySQL\HasSqlModeInterface;
 use MilesAsylum\SchnoopSchema\MySQL\MySQLInterface;
-use MilesAsylum\SchnoopSchema\MySQL\SetVar\SqlMode;
-
-interface TriggerInterface extends
-    MySQLInterface,
-    HasDelimiterInterface,
-    DroppableInterface,
-    CreateStatementInterface,
-    FullyQualifiedNameInterface,
-    HasSqlModeInterface,
-    HasDefinerInterface
+
+interface TriggerInterface extends MySQLInterface, HasDelimiterInterface, DroppableInterface, CreateStatementInterface, FullyQualifiedNameInterface, HasSqlModeInterface, HasDefinerInterface
 {
     /**
      * MySQL keyword for insert event.
      */
-    const EVENT_INSERT = 'INSERT';
+    public const EVENT_INSERT = 'INSERT';
 
     /**
      * MySQL keyword for update event.
      */
-    const EVENT_UPDATE = 'UPDATE';
+    public const EVENT_UPDATE = 'UPDATE';
 
     /**
      * MySQL keyword for delete event.
      */
-    const EVENT_DELETE = 'DELETE';
+    public const EVENT_DELETE = 'DELETE';
 
     /**
      * MySQL keyword for before timing event.
      */
-    const TIMING_BEFORE = 'BEFORE';
+    public const TIMING_BEFORE = 'BEFORE';
 
     /**
      * MySQL keyword for after timing event.
      */
-    const TIMING_AFTER = 'AFTER';
+    public const TIMING_AFTER = 'AFTER';
 
     /**
      * MySQL keyword for trigger position proceeding another trigger.
      */
-    const POSITION_PRECEDES = 'PRECEDES';
+    public const POSITION_PRECEDES = 'PRECEDES';
 
     /**
      * MySQL keyword for trigger position following another trigger.
      */
-    const POSITION_FOLLOWS = 'FOLLOWS';
+    public const POSITION_FOLLOWS = 'FOLLOWS';
 
     /**
      * Get the trigger name.
+     *
      * @return string
      */
     public function getName();
 
     /**
      * Set the trigger name.
-     * @param string $name The trigger name.
+     *
+     * @param string $name the trigger name
      */
     public function setName($name);
 
     /**
      * Get the table name for the trigger.
-     * @return string Table name.
+     *
+     * @return string table name
      */
     public function getTableName();
 
     /**
      * Set the table name for the trigger.
-     * @param string $tableName Table name.
+     *
+     * @param string $tableName table name
      */
     public function setTableName($tableName);
 
     /**
      * Get the database name for the trigger.
-     * @return string Database name.
+     *
+     * @return string database name
      */
     public function getDatabaseName();
 
     /**
      * Identify if a database name is set for the trigger.
-     * @return true True if a database name is set.
+     *
+     * @return true true if a database name is set
      */
     public function hasDatabaseName();
 
     /**
      * Set the database name for the trigger.
-     * @param string $databaseName Database name.
+     *
+     * @param string $databaseName database name
      */
     public function setDatabaseName($databaseName);
 
     /**
      * Get event for the trigger.
-     * @return string One of the self::EVENT_* constants.
+     *
+     * @return string one of the self::EVENT_* constants
      */
     public function getEvent();
 
     /**
      * Set the event for trigger.
-     * @param string $event One of the self::EVENT_* constants.
+     *
+     * @param string $event one of the self::EVENT_* constants
      */
     public function setEvent($event);
 
     /**
      * Get the timing for the trigger.
-     * @return string One of the self::TIMING_* constants.
+     *
+     * @return string one of the self::TIMING_* constants
      */
     public function getTiming();
 
     /**
      * Set the timing for the trigger.
-     * @param string $timing One of the self::TIMING_* constants.
+     *
+     * @param string $timing one of the self::TIMING_* constants
      */
     public function setTiming($timing);
 
     /**
      * Get the logic for the body of trigger.
-     * @return string Trigger body.
+     *
+     * @return string trigger body
      */
     public function getBody();
 
     /**
      * Identify if the trigger has a body defined.
-     * @return bool True if trigger has a body.
+     *
+     * @return bool true if trigger has a body
      */
     public function hasBody();
 
     /**
      * SEt the logic for the body of the trigger.
-     * @param string $body Trigger body.
+     *
+     * @param string $body trigger body
      */
     public function setBody($body);
 
     /**
      * Get the context for the position of the trigger.
-     * @return string One of the self::POSITION_* constants.
+     *
+     * @return string one of the self::POSITION_* constants
      */
     public function getPositionContext();
 
     /**
      * Get the name of the trigger this trigger is positioned relative to.
-     * @return string Other trigger name.
+     *
+     * @return string other trigger name
      */
     public function getPositionRelativeTo();
 
     /**
      * Identify if the trigger has a specified position.
-     * @return bool True if a position is set.
+     *
+     * @return bool true if a position is set
      */
     public function hasPosition();
 
     /**
      * Set the position of the trigger relative to another trigger.
-     * @param string $positionContext One of the self::POSITION_* constants.
-     * @param string $relativeTo Other trigger name.
+     *
+     * @param string $positionContext one of the self::POSITION_* constants
+     * @param string $relativeTo other trigger name
      */
     public function setPosition($positionContext, $relativeTo);
 
     /**
      * The DDL create statement for the trigger.
+     *
      * @uses TriggerInterface::getCreateStatement()
+     *
      * @return string
      */
     public function __toString();
diff --git a/tests/SchnoopSchema/MySQL/Column/ColumnTest.php b/tests/SchnoopSchema/MySQL/Column/ColumnTest.php
index 1ce4e8a..50bb0a5 100644
--- a/tests/SchnoopSchema/MySQL/Column/ColumnTest.php
+++ b/tests/SchnoopSchema/MySQL/Column/ColumnTest.php
@@ -1,16 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\Column;
 
+use MilesAsylum\SchnoopSchema\MySQL\Column\Column;
 use MilesAsylum\SchnoopSchema\MySQL\Column\ColumnInterface;
+use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
+use MilesAsylum\SchnoopSchema\MySQL\DataType\NumericTypeInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\SetType;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\TimestampType;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\TimeTypeInterface;
 use MilesAsylum\SchnoopSchema\MySQL\Exception\LogicException;
 use MilesAsylum\SchnoopSchema\PHPUnit\Framework\SchnoopSchemaTestCase;
-use MilesAsylum\SchnoopSchema\MySQL\Column\Column;
-use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
-use MilesAsylum\SchnoopSchema\MySQL\DataType\NumericTypeInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 
 class ColumnTest extends SchnoopSchemaTestCase
@@ -37,7 +39,7 @@ public function setUp(): void
         $this->column = new Column($this->name, $this->dataType);
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $this->assertSame($this->name, $this->column->getName());
         $this->assertSame($this->dataType, $this->column->getDataType());
@@ -60,7 +62,7 @@ public function testInitialProperties()
         $this->assertNull($this->column->isAutoIncrement());
     }
 
-    public function testInitialPropertiesWithNumericDataType()
+    public function testInitialPropertiesWithNumericDataType(): void
     {
         $dataType = $this->createMock(NumericTypeInterface::class);
         $dataType->method('doesAllowDefault')->willReturn(true);
@@ -69,7 +71,7 @@ public function testInitialPropertiesWithNumericDataType()
         $this->assertFalse($column->isAutoIncrement());
     }
 
-    public function testSetTableName()
+    public function testSetTableName(): void
     {
         $tableName = 'schnoop_tbl';
         $this->column->setTableName($tableName);
@@ -78,7 +80,7 @@ public function testSetTableName()
         $this->assertSame($tableName, $this->column->getTableName());
     }
 
-    public function testSetDatabaseName()
+    public function testSetDatabaseName(): void
     {
         $databaseName = 'schnoop_db';
         $this->column->setDatabaseName($databaseName);
@@ -87,7 +89,7 @@ public function testSetDatabaseName()
         $this->assertSame($databaseName, $this->column->getDatabaseName());
     }
 
-    public function testSetNullable()
+    public function testSetNullable(): void
     {
         $this->column->setNullable(true);
         $this->assertTrue($this->column->hasDefault());
@@ -112,11 +114,11 @@ public function testSetDefault()
         return $this->column;
     }
 
-    public function testSetDefaultArray()
+    public function testSetDefaultArray(): void
     {
         $defaultArray = [
             'foo',
-            'bar'
+            'bar',
         ];
 
         $this->dataType->method('cast')
@@ -129,9 +131,8 @@ public function testSetDefaultArray()
 
     /**
      * @depends testSetDefault
-     * @param Column $columnWithDefault
      */
-    public function testUnsetDefault(Column $columnWithDefault)
+    public function testUnsetDefault(Column $columnWithDefault): void
     {
         $columnWithDefault->unsetDefault();
 
@@ -139,7 +140,7 @@ public function testUnsetDefault(Column $columnWithDefault)
         $this->assertNull($columnWithDefault->getDefault());
     }
 
-    public function testNotHasDefaultWhenNotAllowDefaultAndAllowNull()
+    public function testNotHasDefaultWhenNotAllowDefaultAndAllowNull(): void
     {
         $dataType = $this->createMock(DataTypeInterface::class);
         $dataType->method('doesAllowDefault')->willReturn(false);
@@ -150,9 +151,9 @@ public function testNotHasDefaultWhenNotAllowDefaultAndAllowNull()
         $this->assertNull($this->column->getDefault());
     }
 
-    public function testExceptionWhenSetDefaultWhenNotAllowed()
+    public function testExceptionWhenSetDefaultWhenNotAllowed(): void
     {
-        $this->expectExceptionMessage("Unable to set default value for the column. The data-type \"FOO\" does not support a default.");
+        $this->expectExceptionMessage('Unable to set default value for the column. The data-type "FOO" does not support a default.');
         $this->expectException(LogicException::class);
 
         /** @var DataTypeInterface|PHPUnit_Framework_MockObject_MockObject $mockDataType */
@@ -164,7 +165,6 @@ public function testExceptionWhenSetDefaultWhenNotAllowed()
         $mockDataType->method('getType')
             ->willReturn('FOO');
 
-
         $column = new Column(
             'foo',
             $mockDataType
@@ -173,7 +173,7 @@ public function testExceptionWhenSetDefaultWhenNotAllowed()
         $column->setDefault('foo');
     }
 
-    public function testExceptionWhenSetOnUpdateCurrentTimestapForUnsupportedDataType()
+    public function testExceptionWhenSetOnUpdateCurrentTimestapForUnsupportedDataType(): void
     {
         $this->expectExceptionMessage(
             'Data type "FOOTYPE" for column "schnoop_col" does not support setting current time on update.'
@@ -197,7 +197,7 @@ public function testExceptionWhenSetOnUpdateCurrentTimestapForUnsupportedDataTyp
      * Testing that no warning is triggered when setting default to null when a default is not allowed.
      * This is allowed to reduce the conditions in a column mapper.
      */
-    public function testSetDefaultNullOkWhenDefaultNotAllowed()
+    public function testSetDefaultNullOkWhenDefaultNotAllowed(): void
     {
         /** @var DataTypeInterface|PHPUnit_Framework_MockObject_MockObject $mockDataType */
         $mockDataType = $this->createMock(DataTypeInterface::class);
@@ -216,7 +216,7 @@ public function testSetDefaultNullOkWhenDefaultNotAllowed()
         $this->assertNull($this->column->getDefault());
     }
 
-    public function testSetOnUpdateCurrentTimestamp()
+    public function testSetOnUpdateCurrentTimestamp(): void
     {
         $mockTimeStamp = $this->createMock(TimestampType::class);
         $mockTimeStamp->method('doesAllowDefault')
@@ -227,7 +227,7 @@ public function testSetOnUpdateCurrentTimestamp()
         $this->assertTrue($column->isOnUpdateCurrentTimestamp());
     }
 
-    public function testSetAutoIncrement()
+    public function testSetAutoIncrement(): void
     {
         $dataType = $this->createMock(NumericTypeInterface::class);
         $dataType->method('doesAllowDefault')->willReturn(true);
@@ -237,7 +237,7 @@ public function testSetAutoIncrement()
         $this->assertTrue($column->isAutoIncrement());
     }
 
-    public function testExceptionSetAutoIncrementOnUnsupportedType()
+    public function testExceptionSetAutoIncrementOnUnsupportedType(): void
     {
         $this->expectExceptionMessage(
             'Unable to set auto-increment property on the column. Data-type "FOO" does not support an auto-incrementing value.'
@@ -254,7 +254,7 @@ public function testExceptionSetAutoIncrementOnUnsupportedType()
      * Specifically testing that no problem is reported when setting ZeroFill
      * to false even when the type does not support it.
      */
-    public function testNoWarningUnsetAutoIncrementOnUnsupportedType()
+    public function testNoWarningUnsetAutoIncrementOnUnsupportedType(): void
     {
         $this->column->setAutoIncrement(false);
         $this->assertFalse($this->column->isAutoIncrement());
@@ -272,9 +272,8 @@ public function testSetComment()
 
     /**
      * @depends testSetComment
-     * @param Column $columnWithComment
      */
-    public function testUnsetComment(Column $columnWithComment)
+    public function testUnsetComment(Column $columnWithComment): void
     {
         $columnWithComment->unsetComment();
 
@@ -284,15 +283,16 @@ public function testUnsetComment(Column $columnWithComment)
 
     /**
      * @dataProvider DDLProvider
+     *
      * @param $column
      * @param $expectedDDL
      */
-    public function testDDL(Column $column, $expectedDDL)
+    public function testDDL(Column $column, $expectedDDL): void
     {
         $this->assertSame($expectedDDL, $column->getDDL());
     }
 
-    public function testToStringAliasesGetDDL()
+    public function testToStringAliasesGetDDL(): void
     {
         $ddl = '__dll__';
 
@@ -300,7 +300,7 @@ public function testToStringAliasesGetDDL()
             ->setConstructorArgs(
                 [
                     $this->name,
-                    $this->dataType
+                    $this->dataType,
                 ]
             )->setMethods(
                 ['getDDL']
@@ -310,11 +310,12 @@ public function testToStringAliasesGetDDL()
             ->method('getDDL')
             ->willReturn($ddl);
 
-        $this->assertSame($ddl, (string)$mockColumn);
+        $this->assertSame($ddl, (string) $mockColumn);
     }
 
     /**
      * @see testDDL
+     *
      * @return array
      */
     public function DDLProvider()
@@ -330,7 +331,7 @@ public function DDLProvider()
 
         $defaultArray = [
             'foo',
-            'bar'
+            'bar',
         ];
 
         $mockSetDataType = $this->createMock(SetType::class);
@@ -339,16 +340,16 @@ public function DDLProvider()
         $mockSetDataType->method('cast')
             ->will($this->onConsecutiveCalls($defaultArray[0], $defaultArray[1]));
         $mockSetDataType->method('quote')
-            ->will($this->onConsecutiveCalls("'" . $defaultArray[0] . "'", "'". $defaultArray[1] . "'"));
+            ->will($this->onConsecutiveCalls("'" . $defaultArray[0] . "'", "'" . $defaultArray[1] . "'"));
 
-        $mockTimeType =  $this->createMock(TimeTypeInterface::class);
+        $mockTimeType = $this->createMock(TimeTypeInterface::class);
         $mockTimeType->method('doesAllowDefault')->willReturn(true);
         $mockTimeType->method('__toString')->willReturn('_DATATYPE_DDL_');
         $mockTimeType->method('cast')
             ->willReturn($default);
         $mockTimeType->method('quote')->willReturn($default);
 
-        $mockTimeTypeWithPrecision =  $this->createMock(TimeTypeInterface::class);
+        $mockTimeTypeWithPrecision = $this->createMock(TimeTypeInterface::class);
         $mockTimeTypeWithPrecision->method('doesAllowDefault')->willReturn(true);
         $mockTimeTypeWithPrecision->method('hasPrecision')->willReturn(true);
         $mockTimeTypeWithPrecision->method('getPrecision')->willReturn($timePrecision);
@@ -441,19 +442,20 @@ public function DDLProvider()
                 <<< SQL
 `{$this->name}` _DATATYPE_DDL_ NOT NULL DEFAULT CURRENT_TIMESTAMP({$timePrecision}) ON UPDATE CURRENT_TIMESTAMP({$timePrecision})
 SQL
-            ]
+            ],
         ];
     }
 
     /**
      * @param string $name
-     * @param DataTypeInterface $dataType
      * @param bool $nullable
      * @param mixed $default
      * @param $onUpdateCurrentTimestamp
      * @param bool|null $autoIncrement
      * @param string $comment
+     *
      * @return Column
+     *
      * @internal param bool|null $zeroFill
      */
     protected function createColumn(
@@ -470,7 +472,7 @@ protected function createColumn(
         $column->setDefault($default);
         $column->setOnUpdateCurrentTimestamp($onUpdateCurrentTimestamp);
 
-        if ($autoIncrement !== null) {
+        if (null !== $autoIncrement) {
             $column->setAutoIncrement($autoIncrement);
         }
 
diff --git a/tests/SchnoopSchema/MySQL/Constraint/AbstractConstraintTest.php b/tests/SchnoopSchema/MySQL/Constraint/AbstractConstraintTest.php
index e05118f..7bcfb00 100644
--- a/tests/SchnoopSchema/MySQL/Constraint/AbstractConstraintTest.php
+++ b/tests/SchnoopSchema/MySQL/Constraint/AbstractConstraintTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\Constraint;
 
 use MilesAsylum\SchnoopSchema\MySQL\Constraint\AbstractConstraint;
diff --git a/tests/SchnoopSchema/MySQL/Constraint/AbstractIndexTest.php b/tests/SchnoopSchema/MySQL/Constraint/AbstractIndexTest.php
index e80b38b..a4f2d65 100644
--- a/tests/SchnoopSchema/MySQL/Constraint/AbstractIndexTest.php
+++ b/tests/SchnoopSchema/MySQL/Constraint/AbstractIndexTest.php
@@ -1,11 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\Constraint;
 
+use MilesAsylum\SchnoopSchema\MySQL\Constraint\AbstractIndex;
 use MilesAsylum\SchnoopSchema\MySQL\Constraint\ConstraintInterface;
 use MilesAsylum\SchnoopSchema\MySQL\Constraint\IndexInterface;
 use MilesAsylum\SchnoopSchema\PHPUnit\Framework\IndexTestCase;
-use MilesAsylum\SchnoopSchema\MySQL\Constraint\AbstractIndex;
 
 class AbstractIndexTest extends IndexTestCase
 {
diff --git a/tests/SchnoopSchema/MySQL/Constraint/ForeignKeyColumnTest.php b/tests/SchnoopSchema/MySQL/Constraint/ForeignKeyColumnTest.php
index 3905b3f..e7f72e6 100644
--- a/tests/SchnoopSchema/MySQL/Constraint/ForeignKeyColumnTest.php
+++ b/tests/SchnoopSchema/MySQL/Constraint/ForeignKeyColumnTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\Constraint;
 
 use MilesAsylum\SchnoopSchema\MySQL\Constraint\ForeignKeyColumn;
@@ -23,7 +25,7 @@ public function setUp(): void
         $this->foreignKeyColumn = new ForeignKeyColumn($this->columnName, $this->referenceColumnName);
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $this->assertSame($this->columnName, $this->foreignKeyColumn->getColumnName());
         $this->assertSame($this->referenceColumnName, $this->foreignKeyColumn->getReferenceColumnName());
diff --git a/tests/SchnoopSchema/MySQL/Constraint/ForeignKeyTest.php b/tests/SchnoopSchema/MySQL/Constraint/ForeignKeyTest.php
index c9ab08b..84782dd 100644
--- a/tests/SchnoopSchema/MySQL/Constraint/ForeignKeyTest.php
+++ b/tests/SchnoopSchema/MySQL/Constraint/ForeignKeyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\Constraint;
 
 use MilesAsylum\SchnoopSchema\MySQL\Constraint\ConstraintInterface;
@@ -41,7 +43,7 @@ protected function getConstraintType()
         return ConstraintInterface::CONSTRAINT_FOREIGN_KEY;
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
 
@@ -61,19 +63,19 @@ public function testInitialProperties()
         $this->assertFalse($this->foreignKey->hasReferenceColumnName('bogus'));
     }
 
-    public function testSetOnDeleteAction()
+    public function testSetOnDeleteAction(): void
     {
         $this->foreignKey->setOnDeleteAction(ForeignKey::REFERENCE_ACTION_CASCADE);
         $this->assertSame(ForeignKey::REFERENCE_ACTION_CASCADE, $this->foreignKey->getOnDeleteAction());
     }
 
-    public function testSetOnUpdateAction()
+    public function testSetOnUpdateAction(): void
     {
         $this->foreignKey->setOnUpdateAction(ForeignKey::REFERENCE_ACTION_CASCADE);
         $this->assertSame(ForeignKey::REFERENCE_ACTION_CASCADE, $this->foreignKey->getOnUpdateAction());
     }
 
-    public function testSetReferenceTableName()
+    public function testSetReferenceTableName(): void
     {
         $referenceTableName = 'ref_tbl';
         $this->foreignKey->setReferenceTableName($referenceTableName);
@@ -81,10 +83,10 @@ public function testSetReferenceTableName()
         $this->assertSame($referenceTableName, $this->foreignKey->getReferenceTableName());
     }
 
-    public function testSetForeignKeyColumns()
+    public function testSetForeignKeyColumns(): void
     {
-        $columnNames = ['col_a','col_b'];
-        $refColumnNames = ['ref_col_a','ref_col_b'];
+        $columnNames = ['col_a', 'col_b'];
+        $refColumnNames = ['ref_col_a', 'ref_col_b'];
 
         $fkColumnA = $this->createMock(ForeignKeyColumn::class);
         $fkColumnA->method('getColumnName')->willReturn($columnNames[0]);
@@ -95,7 +97,7 @@ public function testSetForeignKeyColumns()
 
         $foreignKeyColumns = [
             $fkColumnA,
-            $fkColumnB
+            $fkColumnB,
         ];
 
         $this->foreignKey->setForeignKeyColumns($foreignKeyColumns);
@@ -113,7 +115,7 @@ public function testSetForeignKeyColumns()
         }
     }
 
-    public function testHasReferenceColumnNameWithRefTable()
+    public function testHasReferenceColumnNameWithRefTable(): void
     {
         $refTableName = 'ref_tbl';
         $refColumnName = 'ref_col';
@@ -127,7 +129,7 @@ public function testHasReferenceColumnNameWithRefTable()
         $this->assertFalse($this->foreignKey->hasReferenceColumnName($refColumnName, 'bogus'));
     }
 
-    public function testDDL()
+    public function testDDL(): void
     {
         $expectedDDL = <<<SQL
 CONSTRAINT `{$this->constraintName}` FOREIGN KEY (`col_a`,`col_b`) REFERENCES `ref_tbl` (`ref_col_a`,`ref_col_b`) ON DELETE RESTRICT ON UPDATE RESTRICT
@@ -141,12 +143,12 @@ public function testDDL()
 
         $foreignKeyColumns = [
             $fkColumnA,
-            $fkColumnB
+            $fkColumnB,
         ];
         $this->foreignKey->setForeignKeyColumns($foreignKeyColumns);
 
         $this->foreignKey->setReferenceTableName('ref_tbl');
 
-        $this->assertSame($expectedDDL, (string)$this->foreignKey);
+        $this->assertSame($expectedDDL, (string) $this->foreignKey);
     }
 }
diff --git a/tests/SchnoopSchema/MySQL/Constraint/FullTextIndexTest.php b/tests/SchnoopSchema/MySQL/Constraint/FullTextIndexTest.php
index 92b2801..7555d61 100644
--- a/tests/SchnoopSchema/MySQL/Constraint/FullTextIndexTest.php
+++ b/tests/SchnoopSchema/MySQL/Constraint/FullTextIndexTest.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\Constraint;
 
+use MilesAsylum\SchnoopSchema\MySQL\Constraint\FullTextIndex;
 use MilesAsylum\SchnoopSchema\MySQL\Constraint\IndexInterface;
 use MilesAsylum\SchnoopSchema\PHPUnit\Framework\IndexTestCase;
-use MilesAsylum\SchnoopSchema\MySQL\Constraint\FullTextIndex;
 
 class FullTextIndexTest extends IndexTestCase
 {
@@ -19,7 +21,7 @@ public function setUp(): void
         parent::setUp();
     }
 
-    public function testDDL()
+    public function testDDL(): void
     {
         $this->indexDDLAsserts("FULLTEXT INDEX `{$this->constraintName}`");
     }
diff --git a/tests/SchnoopSchema/MySQL/Constraint/IndexTest.php b/tests/SchnoopSchema/MySQL/Constraint/IndexTest.php
index 2ca233c..cab54f5 100644
--- a/tests/SchnoopSchema/MySQL/Constraint/IndexTest.php
+++ b/tests/SchnoopSchema/MySQL/Constraint/IndexTest.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\Constraint;
 
+use MilesAsylum\SchnoopSchema\MySQL\Constraint\Index;
 use MilesAsylum\SchnoopSchema\MySQL\Constraint\IndexInterface;
 use MilesAsylum\SchnoopSchema\PHPUnit\Framework\IndexTestCase;
-use MilesAsylum\SchnoopSchema\MySQL\Constraint\Index;
 
 class IndexTest extends IndexTestCase
 {
@@ -24,7 +26,7 @@ public function setUp(): void
         $this->index = new Index($this->constraintName);
     }
 
-    public function testDDL()
+    public function testDDL(): void
     {
         $this->indexDDLAsserts("INDEX `{$this->constraintName}`");
     }
diff --git a/tests/SchnoopSchema/MySQL/Constraint/IndexedColumnTest.php b/tests/SchnoopSchema/MySQL/Constraint/IndexedColumnTest.php
index 81663fb..747f769 100644
--- a/tests/SchnoopSchema/MySQL/Constraint/IndexedColumnTest.php
+++ b/tests/SchnoopSchema/MySQL/Constraint/IndexedColumnTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\Constraint;
 
 use MilesAsylum\SchnoopSchema\MySQL\Constraint\IndexedColumn;
@@ -21,7 +23,7 @@ public function setUp(): void
         $this->indexedColumn = new IndexedColumn($this->columnName);
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $this->assertSame($this->columnName, $this->indexedColumn->getColumnName());
 
@@ -32,7 +34,7 @@ public function testInitialProperties()
         $this->assertNull($this->indexedColumn->getLength());
     }
 
-    public function testSetCollation()
+    public function testSetCollation(): void
     {
         $collation = IndexedColumn::COLLATION_ASC;
         $this->indexedColumn->setCollation($collation);
@@ -40,7 +42,7 @@ public function testSetCollation()
         $this->assertTrue($this->indexedColumn->hasCollation());
     }
 
-    public function testSetLength()
+    public function testSetLength(): void
     {
         $length = 123;
         $this->indexedColumn->setLength($length);
diff --git a/tests/SchnoopSchema/MySQL/Constraint/PrimaryKeyTest.php b/tests/SchnoopSchema/MySQL/Constraint/PrimaryKeyTest.php
index 9655dad..e2cbf77 100644
--- a/tests/SchnoopSchema/MySQL/Constraint/PrimaryKeyTest.php
+++ b/tests/SchnoopSchema/MySQL/Constraint/PrimaryKeyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\Constraint;
 
 use MilesAsylum\SchnoopSchema\MySQL\Constraint\PrimaryKey;
@@ -7,7 +9,7 @@
 
 class PrimaryKeyTest extends SchnoopSchemaTestCase
 {
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $primaryKey = new PrimaryKey();
 
diff --git a/tests/SchnoopSchema/MySQL/Constraint/SpatialIndexTest.php b/tests/SchnoopSchema/MySQL/Constraint/SpatialIndexTest.php
index 44e204a..cf6e6f9 100644
--- a/tests/SchnoopSchema/MySQL/Constraint/SpatialIndexTest.php
+++ b/tests/SchnoopSchema/MySQL/Constraint/SpatialIndexTest.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\Constraint;
 
 use MilesAsylum\SchnoopSchema\MySQL\Constraint\IndexInterface;
-use MilesAsylum\SchnoopSchema\PHPUnit\Framework\IndexTestCase;
 use MilesAsylum\SchnoopSchema\MySQL\Constraint\SpatialIndex;
+use MilesAsylum\SchnoopSchema\PHPUnit\Framework\IndexTestCase;
 
 class SpatialIndexTest extends IndexTestCase
 {
@@ -24,7 +26,7 @@ public function setUp(): void
         $this->spatialIndex = new SpatialIndex($this->constraintName);
     }
 
-    public function testDDL()
+    public function testDDL(): void
     {
         $this->indexDDLAsserts("SPATIAL INDEX `{$this->constraintName}`");
     }
diff --git a/tests/SchnoopSchema/MySQL/Constraint/UniqueIndexTest.php b/tests/SchnoopSchema/MySQL/Constraint/UniqueIndexTest.php
index e7ed11f..fbb85ae 100644
--- a/tests/SchnoopSchema/MySQL/Constraint/UniqueIndexTest.php
+++ b/tests/SchnoopSchema/MySQL/Constraint/UniqueIndexTest.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\Constraint;
 
 use MilesAsylum\SchnoopSchema\MySQL\Constraint\IndexInterface;
-use MilesAsylum\SchnoopSchema\PHPUnit\Framework\IndexTestCase;
 use MilesAsylum\SchnoopSchema\MySQL\Constraint\UniqueIndex;
+use MilesAsylum\SchnoopSchema\PHPUnit\Framework\IndexTestCase;
 
 class UniqueIndexTest extends IndexTestCase
 {
@@ -24,16 +26,16 @@ public function setUp(): void
         $this->uniqueIndex = new UniqueIndex($this->constraintName);
     }
 
-    public function testDDL()
+    public function testDDL(): void
     {
         $this->indexDDLAsserts("UNIQUE INDEX `{$this->constraintName}`");
     }
 
-    public function testPublicKeyDDL()
+    public function testPublicKeyDDL(): void
     {
         $this->uniqueIndex = new UniqueIndex('primary');
 
-        $this->indexDDLAsserts("PRIMARY KEY");
+        $this->indexDDLAsserts('PRIMARY KEY');
     }
 
     protected function getConstraintName()
diff --git a/tests/SchnoopSchema/MySQL/DataType/AbstractBinaryTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/AbstractBinaryTypeTest.php
index b2bd504..35a4d16 100644
--- a/tests/SchnoopSchema/MySQL/DataType/AbstractBinaryTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/AbstractBinaryTypeTest.php
@@ -1,16 +1,18 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: courtney
  * Date: 28/06/16
- * Time: 8:09 PM
+ * Time: 8:09 PM.
  */
 
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
+use MilesAsylum\SchnoopSchema\MySQL\DataType\AbstractBinaryType;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\BinaryTypeInterface;
 use MilesAsylum\SchnoopSchema\PHPUnit\Framework\BinaryTypeTestCase;
-use MilesAsylum\SchnoopSchema\MySQL\DataType\AbstractBinaryType;
 
 class AbstractBinaryTypeTest extends BinaryTypeTestCase
 {
@@ -38,20 +40,21 @@ protected function getBinaryType()
         return $this->abstractBinaryType;
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $this->assertFalse($this->abstractBinaryType->hasLength());
         $this->assertNull($this->abstractBinaryType->getLength());
         $this->assertTrue($this->abstractBinaryType->doesAllowDefault());
     }
 
-    public function testCast()
+    public function testCast(): void
     {
         $this->assertSame('123', $this->abstractBinaryType->cast(123));
     }
 
     /**
      * @see testDDL
+     *
      * @return array
      */
     public function DDLProvider()
@@ -64,17 +67,18 @@ public function DDLProvider()
         return [
             [
                 'FOO',
-                $abstractBinaryType
+                $abstractBinaryType,
             ],
             [
                 'FOO(3)',
-                $abstractBinaryTypeExtra
-            ]
+                $abstractBinaryTypeExtra,
+            ],
         ];
     }
 
     /**
      * @param $type
+     *
      * @return AbstractBinaryType|\PHPUnit_Framework_MockObject_MockObject
      */
     protected function createMockAbstractBinaryType($type)
diff --git a/tests/SchnoopSchema/MySQL/DataType/AbstractBlobTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/AbstractBlobTypeTest.php
index f7beddc..7c5156c 100644
--- a/tests/SchnoopSchema/MySQL/DataType/AbstractBlobTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/AbstractBlobTypeTest.php
@@ -1,9 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
-use MilesAsylum\SchnoopSchema\PHPUnit\Framework\DataTypeTestCase;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\AbstractBlobType;
+use MilesAsylum\SchnoopSchema\PHPUnit\Framework\DataTypeTestCase;
 
 class AbstractBlobTypeTest extends DataTypeTestCase
 {
@@ -23,18 +25,19 @@ public function setUp(): void
         $this->abstractBlobType = $this->createMockAbstractBlobType($this->type);
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $this->assertFalse($this->abstractBlobType->doesAllowDefault());
     }
 
-    public function testCast()
+    public function testCast(): void
     {
         $this->assertSame('123', $this->abstractBlobType->cast(123));
     }
 
     /**
      * @see testDDL
+     *
      * @return array
      */
     public function DDLProvider()
@@ -42,13 +45,14 @@ public function DDLProvider()
         return [
             [
                 'FOO',
-                $this->createMockAbstractBlobType('foo')
-            ]
+                $this->createMockAbstractBlobType('foo'),
+            ],
         ];
     }
 
     /**
      * @param $type
+     *
      * @return AbstractBlobType|\PHPUnit_Framework_MockObject_MockObject
      */
     protected function createMockAbstractBlobType($type)
diff --git a/tests/SchnoopSchema/MySQL/DataType/AbstractCharTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/AbstractCharTypeTest.php
index 40e7a50..e761f5f 100644
--- a/tests/SchnoopSchema/MySQL/DataType/AbstractCharTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/AbstractCharTypeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\AbstractCharType;
@@ -39,7 +41,7 @@ protected function getInitialLength()
         return $this->length;
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
         $this->assertSame($this->type, $this->abstractCharType->getType());
@@ -47,6 +49,7 @@ public function testInitialProperties()
 
     /**
      * @param $type
+     *
      * @return AbstractCharType|MockObject
      */
     protected function createMockAbstractCharType($type)
diff --git a/tests/SchnoopSchema/MySQL/DataType/AbstractIntTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/AbstractIntTypeTest.php
index e2ba5ba..1b1c039 100644
--- a/tests/SchnoopSchema/MySQL/DataType/AbstractIntTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/AbstractIntTypeTest.php
@@ -1,9 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
-use MilesAsylum\SchnoopSchema\PHPUnit\Framework\IntTypeTestCase;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\AbstractIntType;
+use MilesAsylum\SchnoopSchema\PHPUnit\Framework\IntTypeTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 
 class AbstractIntTypeTest extends IntTypeTestCase
@@ -27,7 +29,7 @@ protected function getIntType()
         return $this->abstractIntType;
     }
 
-    public function testSetUnsigned()
+    public function testSetUnsigned(): void
     {
         $this->abstractIntType->setSigned(false);
 
@@ -36,6 +38,7 @@ public function testSetUnsigned()
 
     /**
      * @see testDDL
+     *
      * @return array
      */
     public function DDLProvider()
@@ -49,17 +52,18 @@ public function DDLProvider()
         return [
             [
                 'FOO',
-                $abstractIntType
+                $abstractIntType,
             ],
             [
                 'FOO(3) UNSIGNED',
-                $abstractIntTypeExtra
-            ]
+                $abstractIntTypeExtra,
+            ],
         ];
     }
 
     /**
      * @param string $type
+     *
      * @return AbstractIntType|MockObject
      */
     protected function createMockAbstractIntType($type)
diff --git a/tests/SchnoopSchema/MySQL/DataType/AbstractNumericPointTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/AbstractNumericPointTypeTest.php
index 528f960..4f73d30 100644
--- a/tests/SchnoopSchema/MySQL/DataType/AbstractNumericPointTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/AbstractNumericPointTypeTest.php
@@ -1,9 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
-use MilesAsylum\SchnoopSchema\PHPUnit\Framework\NumericPointTypeTestCase;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\AbstractNumericPointType;
+use MilesAsylum\SchnoopSchema\PHPUnit\Framework\NumericPointTypeTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 
 class AbstractNumericPointTypeTest extends NumericPointTypeTestCase
@@ -32,7 +34,7 @@ protected function createNumericPointType()
         return $this->createMockAbstractNumericPointType('foo');
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
         $this->assertSame($this->type, $this->abstractNumericPointType->getType());
@@ -40,6 +42,7 @@ public function testInitialProperties()
 
     /**
      * @param $type
+     *
      * @return AbstractNumericPointType|MockObject
      */
     protected function createMockAbstractNumericPointType($type)
diff --git a/tests/SchnoopSchema/MySQL/DataType/AbstractOptionsTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/AbstractOptionsTypeTest.php
index ce38028..af9822b 100644
--- a/tests/SchnoopSchema/MySQL/DataType/AbstractOptionsTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/AbstractOptionsTypeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\AbstractOptionsType;
@@ -31,7 +33,7 @@ public function createOptionsType()
         return $this->createAbstractOptionsType($this->type);
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
         $this->assertSame($this->type, $this->abstractOptionsType->getType());
diff --git a/tests/SchnoopSchema/MySQL/DataType/AbstractTextTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/AbstractTextTypeTest.php
index d29e7c0..576ed32 100644
--- a/tests/SchnoopSchema/MySQL/DataType/AbstractTextTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/AbstractTextTypeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\AbstractBlobType;
@@ -33,7 +35,7 @@ protected function createTextType()
         return $this->createMockAbstractTextType($this->type);
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
         $this->assertSame($this->type, $this->abstractTextType->getType());
@@ -41,6 +43,7 @@ public function testInitialProperties()
 
     /**
      * @param string $type
+     *
      * @return AbstractTextType|MockObject
      */
     protected function createMockAbstractTextType($type)
diff --git a/tests/SchnoopSchema/MySQL/DataType/AbstractTimeTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/AbstractTimeTypeTest.php
index 17b0bad..1c09860 100644
--- a/tests/SchnoopSchema/MySQL/DataType/AbstractTimeTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/AbstractTimeTypeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\AbstractTimeType;
@@ -30,6 +32,7 @@ protected function createTimeType()
 
     /**
      * @param $type
+     *
      * @return AbstractTimeType|PHPUnit_Framework_MockObject_MockObject
      */
     protected function createMockAbstractTimeType($type)
diff --git a/tests/SchnoopSchema/MySQL/DataType/BigIntTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/BigIntTypeTest.php
index f5534cf..8e06dfd 100644
--- a/tests/SchnoopSchema/MySQL/DataType/BigIntTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/BigIntTypeTest.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
+use MilesAsylum\SchnoopSchema\MySQL\DataType\BigIntType;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
 use MilesAsylum\SchnoopSchema\PHPUnit\Framework\IntTypeTestCase;
-use MilesAsylum\SchnoopSchema\MySQL\DataType\BigIntType;
 
 class BigIntTypeTest extends IntTypeTestCase
 {
@@ -30,7 +32,7 @@ protected function newIntType()
         return new BigIntType();
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
         $this->assertSame(DataTypeInterface::TYPE_BIGINT, $this->bigIntType->getType());
@@ -38,7 +40,7 @@ public function testInitialProperties()
         $this->assertSame(BigIntType::MAX_SIGNED, $this->bigIntType->getMaxRange());
     }
 
-    public function testSetUnsigned()
+    public function testSetUnsigned(): void
     {
         $this->bigIntType->setSigned(false);
 
@@ -49,6 +51,7 @@ public function testSetUnsigned()
 
     /**
      * @see testDDL
+     *
      * @return array
      */
     public function DDLProvider()
@@ -62,12 +65,12 @@ public function DDLProvider()
         return [
             [
                 'BIGINT',
-                $bigIntTypeDefault
+                $bigIntTypeDefault,
             ],
             [
                 'BIGINT(3) UNSIGNED',
-                $BigIntTypeExtra
-            ]
+                $BigIntTypeExtra,
+            ],
         ];
     }
 }
diff --git a/tests/SchnoopSchema/MySQL/DataType/BinaryTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/BinaryTypeTest.php
index b0403d9..4b03e06 100644
--- a/tests/SchnoopSchema/MySQL/DataType/BinaryTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/BinaryTypeTest.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
-use MilesAsylum\SchnoopSchema\PHPUnit\Framework\BinaryTypeTestCase;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\BinaryType;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
+use MilesAsylum\SchnoopSchema\PHPUnit\Framework\BinaryTypeTestCase;
 
 class BinaryTypeTest extends BinaryTypeTestCase
 {
@@ -25,7 +27,7 @@ protected function getBinaryType()
         return $this->binaryType;
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $this->assertSame(DataTypeInterface::TYPE_BINARY, $this->binaryType->getType());
         $this->assertFalse($this->binaryType->hasLength());
@@ -35,6 +37,7 @@ public function testInitialProperties()
 
     /**
      * @see testDDL
+     *
      * @return array
      */
     public function DDLProvider()
@@ -47,12 +50,12 @@ public function DDLProvider()
         return [
             [
                 'BINARY',
-                $binaryType
+                $binaryType,
             ],
             [
                 'BINARY(3)',
-                $binaryTypeExtra
-            ]
+                $binaryTypeExtra,
+            ],
         ];
     }
 }
diff --git a/tests/SchnoopSchema/MySQL/DataType/BitTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/BitTypeTest.php
index 7253007..b3777f2 100644
--- a/tests/SchnoopSchema/MySQL/DataType/BitTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/BitTypeTest.php
@@ -1,16 +1,18 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: courtney
  * Date: 28/06/16
- * Time: 9:46 PM
+ * Time: 9:46 PM.
  */
 
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
-use MilesAsylum\SchnoopSchema\PHPUnit\Framework\SchnoopSchemaTestCase;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\BitType;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
+use MilesAsylum\SchnoopSchema\PHPUnit\Framework\SchnoopSchemaTestCase;
 
 class BitTypeTest extends SchnoopSchemaTestCase
 {
@@ -26,7 +28,7 @@ public function setUp(): void
         $this->bitType = new BitType();
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $this->assertSame(DataTypeInterface::TYPE_BIT, $this->bitType->getType());
         $this->assertTrue($this->bitType->hasLength());
@@ -34,10 +36,10 @@ public function testInitialProperties()
         $this->assertSame(0, $this->bitType->getMinRange());
         $this->assertSame(1, $this->bitType->getMaxRange());
         $this->assertTrue($this->bitType->doesAllowDefault());
-        $this->assertSame("BIT(1)", (string)$this->bitType);
+        $this->assertSame('BIT(1)', (string) $this->bitType);
     }
 
-    public function testSetLength()
+    public function testSetLength(): void
     {
         $length = 4;
         $this->bitType->setLength($length);
@@ -47,7 +49,7 @@ public function testSetLength()
         $this->assertSame(15, $this->bitType->getMaxRange());
     }
 
-    public function testCast()
+    public function testCast(): void
     {
         $this->assertSame(123, $this->bitType->cast('123'));
     }
diff --git a/tests/SchnoopSchema/MySQL/DataType/BlobTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/BlobTypeTest.php
index 16f77f9..4b11ef0 100644
--- a/tests/SchnoopSchema/MySQL/DataType/BlobTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/BlobTypeTest.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
-use MilesAsylum\SchnoopSchema\PHPUnit\Framework\DataTypeTestCase;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\BlobType;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
+use MilesAsylum\SchnoopSchema\PHPUnit\Framework\DataTypeTestCase;
 
 class BlobTypeTest extends DataTypeTestCase
 {
@@ -20,13 +22,13 @@ public function setUp(): void
         $this->blobType = new BlobType();
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $this->assertSame(DataTypeInterface::TYPE_BLOB, $this->blobType->getType());
         $this->assertFalse($this->blobType->doesAllowDefault());
     }
 
-    public function testCast()
+    public function testCast(): void
     {
         $this->assertSame('123', $this->blobType->cast(123));
     }
@@ -38,8 +40,8 @@ public function DDLProvider()
         return [
             [
                 'BLOB',
-                $blobType
-            ]
+                $blobType,
+            ],
         ];
     }
 }
diff --git a/tests/SchnoopSchema/MySQL/DataType/CharTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/CharTypeTest.php
index 23059e2..25d2c27 100644
--- a/tests/SchnoopSchema/MySQL/DataType/CharTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/CharTypeTest.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
-use MilesAsylum\SchnoopSchema\PHPUnit\Framework\CharTypeTestCase;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\CharType;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
+use MilesAsylum\SchnoopSchema\PHPUnit\Framework\CharTypeTestCase;
 
 class CharTypeTest extends CharTypeTestCase
 {
@@ -36,7 +38,7 @@ protected function getInitialLength()
         return $this->length;
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
         $this->assertSame(DataTypeInterface::TYPE_CHAR, $this->charType->getType());
diff --git a/tests/SchnoopSchema/MySQL/DataType/DateTimeTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/DateTimeTypeTest.php
index 1144947..ae782f6 100644
--- a/tests/SchnoopSchema/MySQL/DataType/DateTimeTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/DateTimeTypeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
@@ -30,7 +32,7 @@ protected function createTimeType()
         return new DateTimeType();
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
         $this->assertSame(DataTypeInterface::TYPE_DATETIME, $this->dateTimeType->getType());
diff --git a/tests/SchnoopSchema/MySQL/DataType/DateTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/DateTypeTest.php
index 0fd0ab7..2ffb15d 100644
--- a/tests/SchnoopSchema/MySQL/DataType/DateTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/DateTypeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
@@ -8,7 +10,7 @@
 
 class DateTypeTest extends SchnoopSchemaTestCase
 {
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $dateType = new DateType();
         $dateStr = '2016-01-01';
@@ -16,6 +18,6 @@ public function testInitialProperties()
         $this->assertSame(DataTypeInterface::TYPE_DATE, $dateType->getType());
         $this->assertTrue($dateType->doesAllowDefault());
         $this->assertSame($dateStr, $dateType->cast($dateStr));
-        $this->assertSame('DATE', (string)$dateType);
+        $this->assertSame('DATE', (string) $dateType);
     }
 }
diff --git a/tests/SchnoopSchema/MySQL/DataType/DecimalTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/DecimalTypeTest.php
index 0cd11c3..6e05823 100644
--- a/tests/SchnoopSchema/MySQL/DataType/DecimalTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/DecimalTypeTest.php
@@ -1,9 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
-use MilesAsylum\SchnoopSchema\PHPUnit\Framework\NumericPointTypeTestCase;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DecimalType;
+use MilesAsylum\SchnoopSchema\PHPUnit\Framework\NumericPointTypeTestCase;
 
 class DecimalTypeTest extends NumericPointTypeTestCase
 {
@@ -29,7 +31,7 @@ protected function createNumericPointType()
         return new DecimalType();
     }
 
-    public function testCast()
+    public function testCast(): void
     {
         $decimalType = new DecimalType();
 
diff --git a/tests/SchnoopSchema/MySQL/DataType/DoubleTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/DoubleTypeTest.php
index ab56f10..b91b002 100644
--- a/tests/SchnoopSchema/MySQL/DataType/DoubleTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/DoubleTypeTest.php
@@ -1,9 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
-use MilesAsylum\SchnoopSchema\PHPUnit\Framework\NumericPointTypeTestCase;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DoubleType;
+use MilesAsylum\SchnoopSchema\PHPUnit\Framework\NumericPointTypeTestCase;
 
 class DoubleTypeTest extends NumericPointTypeTestCase
 {
@@ -29,7 +31,7 @@ protected function createNumericPointType()
         return new DoubleType();
     }
 
-    public function testCast()
+    public function testCast(): void
     {
         $doubleType = new DoubleType();
 
diff --git a/tests/SchnoopSchema/MySQL/DataType/EnumTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/EnumTypeTest.php
index cf086b9..533b8d8 100644
--- a/tests/SchnoopSchema/MySQL/DataType/EnumTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/EnumTypeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
@@ -30,7 +32,7 @@ public function createOptionsType()
         return new EnumType();
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
         $this->assertSame(DataTypeInterface::TYPE_ENUM, $this->enumType->getType());
diff --git a/tests/SchnoopSchema/MySQL/DataType/FloatTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/FloatTypeTest.php
index 0ce1f35..c05b227 100644
--- a/tests/SchnoopSchema/MySQL/DataType/FloatTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/FloatTypeTest.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
-use MilesAsylum\SchnoopSchema\PHPUnit\Framework\NumericPointTypeTestCase;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\FloatType;
+use MilesAsylum\SchnoopSchema\PHPUnit\Framework\NumericPointTypeTestCase;
 
 class FloatTypeTest extends NumericPointTypeTestCase
 {
@@ -30,13 +32,13 @@ protected function createNumericPointType()
         return new FloatType();
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
         $this->assertSame(DataTypeInterface::TYPE_FLOAT, $this->floatType->getType());
     }
 
-    public function testCast()
+    public function testCast(): void
     {
         $floatType = new FloatType();
 
diff --git a/tests/SchnoopSchema/MySQL/DataType/IntTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/IntTypeTest.php
index d101544..4add927 100644
--- a/tests/SchnoopSchema/MySQL/DataType/IntTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/IntTypeTest.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
-use MilesAsylum\SchnoopSchema\PHPUnit\Framework\IntTypeTestCase;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\IntType;
+use MilesAsylum\SchnoopSchema\PHPUnit\Framework\IntTypeTestCase;
 
 class IntTypeTest extends IntTypeTestCase
 {
@@ -25,7 +27,7 @@ protected function getIntType()
         return $this->intType;
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
         $this->assertSame(DataTypeInterface::TYPE_INT, $this->intType->getType());
@@ -33,7 +35,7 @@ public function testInitialProperties()
         $this->assertSame(IntType::MAX_SIGNED, $this->intType->getMaxRange());
     }
 
-    public function testSetUnsigned()
+    public function testSetUnsigned(): void
     {
         $this->intType->setSigned(false);
 
@@ -44,6 +46,7 @@ public function testSetUnsigned()
 
     /**
      * @see testDDL
+     *
      * @return array
      */
     public function DDLProvider()
@@ -57,12 +60,12 @@ public function DDLProvider()
         return [
             [
                 'INT',
-                $intTypeDefault
+                $intTypeDefault,
             ],
             [
                 'INT(3) UNSIGNED',
-                $intTypeExtra
-            ]
+                $intTypeExtra,
+            ],
         ];
     }
 }
diff --git a/tests/SchnoopSchema/MySQL/DataType/JsonTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/JsonTypeTest.php
index 4c8edd7..2ab1f50 100644
--- a/tests/SchnoopSchema/MySQL/DataType/JsonTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/JsonTypeTest.php
@@ -31,7 +31,7 @@ public function testCast(): void
     public function DDLProvider()
     {
         return [
-            ['JSON', new JsonType()]
+            ['JSON', new JsonType()],
         ];
     }
 }
diff --git a/tests/SchnoopSchema/MySQL/DataType/LongBlobTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/LongBlobTypeTest.php
index 60635d3..84681e3 100644
--- a/tests/SchnoopSchema/MySQL/DataType/LongBlobTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/LongBlobTypeTest.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
-use MilesAsylum\SchnoopSchema\PHPUnit\Framework\DataTypeTestCase;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\LongBlobType;
+use MilesAsylum\SchnoopSchema\PHPUnit\Framework\DataTypeTestCase;
 
 class LongBlobTypeTest extends DataTypeTestCase
 {
@@ -20,13 +22,13 @@ public function setUp(): void
         $this->longBlobType = new LongBlobType();
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $this->assertSame(DataTypeInterface::TYPE_LONGBLOB, $this->longBlobType->getType());
         $this->assertFalse($this->longBlobType->doesAllowDefault());
     }
 
-    public function testCast()
+    public function testCast(): void
     {
         $this->assertSame('123', $this->longBlobType->cast(123));
     }
@@ -38,8 +40,8 @@ public function DDLProvider()
         return [
             [
                 'LONGBLOB',
-                $longBlobType
-            ]
+                $longBlobType,
+            ],
         ];
     }
 }
diff --git a/tests/SchnoopSchema/MySQL/DataType/LongTextTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/LongTextTypeTest.php
index 43aa77a..089e262 100644
--- a/tests/SchnoopSchema/MySQL/DataType/LongTextTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/LongTextTypeTest.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
-use MilesAsylum\SchnoopSchema\MySQL\DataType\TextTypeInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\LongTextType;
+use MilesAsylum\SchnoopSchema\MySQL\DataType\TextTypeInterface;
 use MilesAsylum\SchnoopSchema\PHPUnit\Framework\TextTypeTestCase;
 
 class LongTextTypeTest extends TextTypeTestCase
@@ -37,7 +39,7 @@ protected function createTextType()
         return new LongTextType();
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
         $this->assertSame(DataTypeInterface::TYPE_LONGTEXT, $this->longTextType->getType());
diff --git a/tests/SchnoopSchema/MySQL/DataType/MediumBlobTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/MediumBlobTypeTest.php
index 9728415..1e78a66 100644
--- a/tests/SchnoopSchema/MySQL/DataType/MediumBlobTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/MediumBlobTypeTest.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
-use MilesAsylum\SchnoopSchema\PHPUnit\Framework\DataTypeTestCase;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\MediumBlobType;
+use MilesAsylum\SchnoopSchema\PHPUnit\Framework\DataTypeTestCase;
 
 class MediumBlobTypeTest extends DataTypeTestCase
 {
@@ -20,19 +22,20 @@ public function setUp(): void
         $this->mediumBlobType = new MediumBlobType();
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $this->assertSame(DataTypeInterface::TYPE_MEDIUMBLOB, $this->mediumBlobType->getType());
         $this->assertFalse($this->mediumBlobType->doesAllowDefault());
     }
 
-    public function testCast()
+    public function testCast(): void
     {
         $this->assertSame('123', $this->mediumBlobType->cast(123));
     }
 
     /**
      * @see testDDL
+     *
      * @return array
      */
     public function DDLProvider()
@@ -42,8 +45,8 @@ public function DDLProvider()
         return [
             [
                 'MEDIUMBLOB',
-                $mediumBlobType
-            ]
+                $mediumBlobType,
+            ],
         ];
     }
 }
diff --git a/tests/SchnoopSchema/MySQL/DataType/MediumIntTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/MediumIntTypeTest.php
index e5eba5b..f2dcefb 100644
--- a/tests/SchnoopSchema/MySQL/DataType/MediumIntTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/MediumIntTypeTest.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
+use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\MediumIntType;
 use MilesAsylum\SchnoopSchema\PHPUnit\Framework\IntTypeTestCase;
-use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
 
 class MediumIntTypeTest extends IntTypeTestCase
 {
@@ -25,7 +27,7 @@ protected function getIntType()
         return $this->mediumIntType;
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
         $this->assertSame(DataTypeInterface::TYPE_MEDIUMINT, $this->mediumIntType->getType());
@@ -33,7 +35,7 @@ public function testInitialProperties()
         $this->assertSame(MediumIntType::MAX_SIGNED, $this->mediumIntType->getMaxRange());
     }
 
-    public function testSetUnsigned()
+    public function testSetUnsigned(): void
     {
         $this->mediumIntType->setSigned(false);
 
@@ -44,6 +46,7 @@ public function testSetUnsigned()
 
     /**
      * @see testDDL
+     *
      * @return array
      */
     public function DDLProvider()
@@ -57,12 +60,12 @@ public function DDLProvider()
         return [
             [
                 'MEDIUMINT',
-                $intTypeDefault
+                $intTypeDefault,
             ],
             [
                 'MEDIUMINT(3) UNSIGNED',
-                $intTypeExtra
-            ]
+                $intTypeExtra,
+            ],
         ];
     }
 }
diff --git a/tests/SchnoopSchema/MySQL/DataType/MediumTextTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/MediumTextTypeTest.php
index 57c80cc..adbd7a5 100644
--- a/tests/SchnoopSchema/MySQL/DataType/MediumTextTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/MediumTextTypeTest.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
-use MilesAsylum\SchnoopSchema\MySQL\DataType\TextTypeInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\MediumTextType;
+use MilesAsylum\SchnoopSchema\MySQL\DataType\TextTypeInterface;
 use MilesAsylum\SchnoopSchema\PHPUnit\Framework\TextTypeTestCase;
 
 class MediumTextTypeTest extends TextTypeTestCase
@@ -37,7 +39,7 @@ protected function createTextType()
         return new MediumTextType();
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
         $this->assertSame(DataTypeInterface::TYPE_MEDIUMTEXT, $this->mediumTextType->getType());
diff --git a/tests/SchnoopSchema/MySQL/DataType/Option/QuoteTraitTest.php b/tests/SchnoopSchema/MySQL/DataType/Option/QuoteTraitTest.php
index 496fadc..d415f84 100644
--- a/tests/SchnoopSchema/MySQL/DataType/Option/QuoteTraitTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/Option/QuoteTraitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType\Option;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\Option\QuoteTrait;
@@ -19,12 +21,12 @@ public function setUp(): void
         $this->quoteTrait = $this->getMockForTrait(QuoteTrait::class);
     }
 
-    public function testQuoteNumeric()
+    public function testQuoteNumeric(): void
     {
         $this->assertSame('123', $this->quoteTrait->quote(123));
     }
 
-    public function testQuoteString()
+    public function testQuoteString(): void
     {
         $this->assertSame("'Ja\'mie'", $this->quoteTrait->quote("Ja'mie"));
     }
diff --git a/tests/SchnoopSchema/MySQL/DataType/SetTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/SetTypeTest.php
index e7d360c..aaa275d 100644
--- a/tests/SchnoopSchema/MySQL/DataType/SetTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/SetTypeTest.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
-use MilesAsylum\SchnoopSchema\PHPUnit\Framework\OptionsTypeTestCase;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\SetType;
+use MilesAsylum\SchnoopSchema\PHPUnit\Framework\OptionsTypeTestCase;
 
 class SetTypeTest extends OptionsTypeTestCase
 {
@@ -30,13 +32,13 @@ public function createOptionsType()
         return new SetType();
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
         $this->assertSame(DataTypeInterface::TYPE_SET, $this->setType->getType());
     }
 
-    public function testCast()
+    public function testCast(): void
     {
         $value = [123];
         $expectedValue = ['123'];
diff --git a/tests/SchnoopSchema/MySQL/DataType/SmallIntTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/SmallIntTypeTest.php
index 60a9733..ffeca19 100644
--- a/tests/SchnoopSchema/MySQL/DataType/SmallIntTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/SmallIntTypeTest.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
-use MilesAsylum\SchnoopSchema\PHPUnit\Framework\IntTypeTestCase;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\SmallIntType;
+use MilesAsylum\SchnoopSchema\PHPUnit\Framework\IntTypeTestCase;
 
 class SmallIntTypeTest extends IntTypeTestCase
 {
@@ -25,7 +27,7 @@ protected function getIntType()
         return $this->smallIntType;
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
         $this->assertSame(DataTypeInterface::TYPE_SMALLINT, $this->smallIntType->getType());
@@ -33,7 +35,7 @@ public function testInitialProperties()
         $this->assertSame(SmallIntType::MAX_SIGNED, $this->smallIntType->getMaxRange());
     }
 
-    public function testSetUnsigned()
+    public function testSetUnsigned(): void
     {
         $this->smallIntType->setSigned(false);
 
@@ -44,6 +46,7 @@ public function testSetUnsigned()
 
     /**
      * @see testDDL
+     *
      * @return array
      */
     public function DDLProvider()
@@ -57,12 +60,12 @@ public function DDLProvider()
         return [
             [
                 'SMALLINT',
-                $tinyIntTypeDefault
+                $tinyIntTypeDefault,
             ],
             [
                 'SMALLINT(3) UNSIGNED',
-                $tinyIntTypeExtra
-            ]
+                $tinyIntTypeExtra,
+            ],
         ];
     }
 }
diff --git a/tests/SchnoopSchema/MySQL/DataType/TextTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/TextTypeTest.php
index a331c1b..37711fc 100644
--- a/tests/SchnoopSchema/MySQL/DataType/TextTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/TextTypeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
@@ -37,7 +39,7 @@ protected function createTextType()
         return new TextType();
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
         $this->assertSame(DataTypeInterface::TYPE_TEXT, $this->textType->getType());
diff --git a/tests/SchnoopSchema/MySQL/DataType/TimeTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/TimeTypeTest.php
index bc0b932..35afcab 100644
--- a/tests/SchnoopSchema/MySQL/DataType/TimeTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/TimeTypeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
@@ -30,7 +32,7 @@ protected function createTimeType()
         return new TimeType();
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
         $this->assertSame(DataTypeInterface::TYPE_TIME, $this->timeType->getType());
diff --git a/tests/SchnoopSchema/MySQL/DataType/TimestampTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/TimestampTypeTest.php
index b57ab01..8bc8324 100644
--- a/tests/SchnoopSchema/MySQL/DataType/TimestampTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/TimestampTypeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
@@ -30,7 +32,7 @@ protected function createTimeType()
         return new TimestampType();
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
         $this->assertSame(DataTypeInterface::TYPE_TIMESTAMP, $this->timestampType->getType());
diff --git a/tests/SchnoopSchema/MySQL/DataType/TinyBlobTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/TinyBlobTypeTest.php
index ee0a8e5..f7e2b42 100644
--- a/tests/SchnoopSchema/MySQL/DataType/TinyBlobTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/TinyBlobTypeTest.php
@@ -1,16 +1,18 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Created by PhpStorm.
  * User: courtney
  * Date: 26/06/16
- * Time: 6:19 PM
+ * Time: 6:19 PM.
  */
 
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
-use MilesAsylum\SchnoopSchema\PHPUnit\Framework\DataTypeTestCase;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\TinyBlobType;
+use MilesAsylum\SchnoopSchema\PHPUnit\Framework\DataTypeTestCase;
 
 class TinyBlobTypeTest extends DataTypeTestCase
 {
@@ -26,19 +28,20 @@ public function setUp(): void
         $this->tinyBlobType = new TinyBlobType();
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $this->assertSame(DataTypeInterface::TYPE_TINYBLOB, $this->tinyBlobType->getType());
         $this->assertFalse($this->tinyBlobType->doesAllowDefault());
     }
 
-    public function testCast()
+    public function testCast(): void
     {
         $this->assertSame('123', $this->tinyBlobType->cast(123));
     }
 
     /**
      * @see testDDL
+     *
      * @return array
      */
     public function DDLProvider()
@@ -48,8 +51,8 @@ public function DDLProvider()
         return [
             [
                 'TINYBLOB',
-                $tinyBlobType
-            ]
+                $tinyBlobType,
+            ],
         ];
     }
 }
diff --git a/tests/SchnoopSchema/MySQL/DataType/TinyIntTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/TinyIntTypeTest.php
index 6e71968..55ba769 100644
--- a/tests/SchnoopSchema/MySQL/DataType/TinyIntTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/TinyIntTypeTest.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
-use MilesAsylum\SchnoopSchema\PHPUnit\Framework\IntTypeTestCase;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\TinyIntType;
+use MilesAsylum\SchnoopSchema\PHPUnit\Framework\IntTypeTestCase;
 
 class TinyIntTypeTest extends IntTypeTestCase
 {
@@ -25,7 +27,7 @@ protected function getIntType()
         return $this->tinyIntType;
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
         $this->assertSame(DataTypeInterface::TYPE_TINYINT, $this->tinyIntType->getType());
@@ -33,7 +35,7 @@ public function testInitialProperties()
         $this->assertSame(TinyIntType::MAX_SIGNED, $this->tinyIntType->getMaxRange());
     }
 
-    public function testSetUnsigned()
+    public function testSetUnsigned(): void
     {
         $this->tinyIntType->setSigned(false);
 
@@ -44,6 +46,7 @@ public function testSetUnsigned()
 
     /**
      * @see testDDL
+     *
      * @return array
      */
     public function DDLProvider()
@@ -57,12 +60,12 @@ public function DDLProvider()
         return [
             [
                 'TINYINT',
-                $tinyIntTypeDefault
+                $tinyIntTypeDefault,
             ],
             [
                 'TINYINT(3) UNSIGNED',
-                $tinyIntTypeExtra
-            ]
+                $tinyIntTypeExtra,
+            ],
         ];
     }
 }
diff --git a/tests/SchnoopSchema/MySQL/DataType/TinyTextTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/TinyTextTypeTest.php
index e130575..9d89182 100644
--- a/tests/SchnoopSchema/MySQL/DataType/TinyTextTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/TinyTextTypeTest.php
@@ -1,9 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
-use MilesAsylum\SchnoopSchema\MySQL\DataType\TextTypeInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
+use MilesAsylum\SchnoopSchema\MySQL\DataType\TextTypeInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\TinyTextType;
 use MilesAsylum\SchnoopSchema\PHPUnit\Framework\TextTypeTestCase;
 
@@ -37,7 +39,7 @@ protected function createTextType()
         return new TinyTextType();
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
         $this->assertSame(DataTypeInterface::TYPE_TINYTEXT, $this->tinyTextType->getType());
diff --git a/tests/SchnoopSchema/MySQL/DataType/VarBinaryTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/VarBinaryTypeTest.php
index d1c0e83..c0a4ac8 100644
--- a/tests/SchnoopSchema/MySQL/DataType/VarBinaryTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/VarBinaryTypeTest.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
-use MilesAsylum\SchnoopSchema\PHPUnit\Framework\BinaryTypeTestCase;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DataType\VarBinaryType;
+use MilesAsylum\SchnoopSchema\PHPUnit\Framework\BinaryTypeTestCase;
 
 class VarBinaryTypeTest extends BinaryTypeTestCase
 {
@@ -27,7 +29,7 @@ protected function getBinaryType()
         return $this->varBinaryType;
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $this->assertSame(DataTypeInterface::TYPE_VARBINARY, $this->varBinaryType->getType());
         $this->assertTrue($this->varBinaryType->hasLength());
@@ -37,6 +39,7 @@ public function testInitialProperties()
 
     /**
      * @see testDDL
+     *
      * @return array
      */
     public function DDLProvider()
@@ -46,7 +49,7 @@ public function DDLProvider()
         return [
             [
                 'VARBINARY(5)',
-                $binaryType
+                $binaryType,
             ],
         ];
     }
diff --git a/tests/SchnoopSchema/MySQL/DataType/VarCharTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/VarCharTypeTest.php
index 8ca35da..8437e2e 100644
--- a/tests/SchnoopSchema/MySQL/DataType/VarCharTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/VarCharTypeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
@@ -36,7 +38,7 @@ protected function getInitialLength()
         return $this->length;
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
         $this->assertSame(DataTypeInterface::TYPE_VARCHAR, $this->varCharType->getType());
diff --git a/tests/SchnoopSchema/MySQL/DataType/YearTypeTest.php b/tests/SchnoopSchema/MySQL/DataType/YearTypeTest.php
index 330209c..a70e639 100644
--- a/tests/SchnoopSchema/MySQL/DataType/YearTypeTest.php
+++ b/tests/SchnoopSchema/MySQL/DataType/YearTypeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\DataType;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
@@ -8,14 +10,14 @@
 
 class YearTypeTest extends SchnoopSchemaTestCase
 {
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $yearType = new YearType();
         $yearStr = '2016';
 
         $this->assertSame(DataTypeInterface::TYPE_YEAR, $yearType->getType());
         $this->assertTrue($yearType->doesAllowDefault());
-        $this->assertSame((int)$yearStr, $yearType->cast($yearStr));
-        $this->assertSame('YEAR', (string)$yearType);
+        $this->assertSame((int) $yearStr, $yearType->cast($yearStr));
+        $this->assertSame('YEAR', (string) $yearType);
     }
 }
diff --git a/tests/SchnoopSchema/MySQL/Database/DatabaseTest.php b/tests/SchnoopSchema/MySQL/Database/DatabaseTest.php
index 1328eea..8a5fb32 100644
--- a/tests/SchnoopSchema/MySQL/Database/DatabaseTest.php
+++ b/tests/SchnoopSchema/MySQL/Database/DatabaseTest.php
@@ -1,11 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\Database;
 
+use MilesAsylum\SchnoopSchema\MySQL\Database\Database;
 use MilesAsylum\SchnoopSchema\MySQL\DroppableInterface;
 use MilesAsylum\SchnoopSchema\MySQL\HasDelimiterInterface;
 use MilesAsylum\SchnoopSchema\PHPUnit\Framework\SchnoopSchemaTestCase;
-use MilesAsylum\SchnoopSchema\MySQL\Database\Database;
 
 class DatabaseTest extends SchnoopSchemaTestCase
 {
@@ -20,7 +22,7 @@ class DatabaseTest extends SchnoopSchemaTestCase
 
     protected $tableList = [
         'schnoop_table_one',
-        'schnoop_table_two'
+        'schnoop_table_two',
     ];
 
     protected function setUp(): void
@@ -30,12 +32,12 @@ protected function setUp(): void
         $this->database = new Database($this->name);
     }
 
-    public function testName()
+    public function testName(): void
     {
         $this->assertSame($this->name, $this->database->getName());
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $this->assertFalse($this->database->hasDefaultCollation());
         $this->assertNull($this->database->getDefaultCollation());
@@ -43,13 +45,13 @@ public function testInitialProperties()
         $this->assertSame(DroppableInterface::DDL_DROP_POLICY_DO_NOT_DROP, $this->database->getDropPolicy());
     }
 
-    public function testDefaultCollationUndefined()
+    public function testDefaultCollationUndefined(): void
     {
         $this->assertFalse($this->database->hasDefaultCollation());
         $this->assertNull($this->database->getDefaultCollation());
     }
 
-    public function testSetDefaultCollation()
+    public function testSetDefaultCollation(): void
     {
         $collation = 'utf8_general_ci';
         $this->database->setDefaultCollation($collation);
@@ -58,14 +60,14 @@ public function testSetDefaultCollation()
         $this->assertSame($collation, $this->database->getDefaultCollation());
     }
 
-    public function testSetDDLDropPolicy()
+    public function testSetDDLDropPolicy(): void
     {
         $this->database->setDropPolicy(Database::DDL_DROP_POLICY_DROP_IF_EXISTS);
 
         $this->assertSame(Database::DDL_DROP_POLICY_DROP_IF_EXISTS, $this->database->getDropPolicy());
     }
 
-    public function testSetDDLDelimiter()
+    public function testSetDDLDelimiter(): void
     {
         $this->database->setDelimiter('@@');
 
@@ -74,15 +76,16 @@ public function testSetDDLDelimiter()
 
     /**
      * @dataProvider DDLProvider
+     *
      * @param Database $database
      * @param $expectedDDL
      */
-    public function testDDL($database, $expectedDDL)
+    public function testDDL($database, $expectedDDL): void
     {
         $this->assertSame($expectedDDL, $database->getCreateStatement());
     }
 
-    public function testToStringAliasesGetDDL()
+    public function testToStringAliasesGetDDL(): void
     {
         $ddl = '__ddl__';
 
@@ -97,11 +100,12 @@ public function testToStringAliasesGetDDL()
             ->method('getCreateStatement')
             ->willReturn($ddl);
 
-        $this->assertSame($ddl, (string)$mockDatabase);
+        $this->assertSame($ddl, (string) $mockDatabase);
     }
 
     /**
      * @see testDDL
+     *
      * @return array
      */
     public function DDLProvider()
diff --git a/tests/SchnoopSchema/MySQL/Routine/AbstractRoutineParameterTest.php b/tests/SchnoopSchema/MySQL/Routine/AbstractRoutineParameterTest.php
index df5d11d..a6c733e 100644
--- a/tests/SchnoopSchema/MySQL/Routine/AbstractRoutineParameterTest.php
+++ b/tests/SchnoopSchema/MySQL/Routine/AbstractRoutineParameterTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\Routine;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
@@ -41,7 +43,7 @@ protected function getExpectedParameterName()
     {
         return $this->name;
     }
-    
+
     protected function getExpectedParameterDataType()
     {
         return $this->mockDataType;
diff --git a/tests/SchnoopSchema/MySQL/Routine/AbstractRoutineTest.php b/tests/SchnoopSchema/MySQL/Routine/AbstractRoutineTest.php
index 4b0d7ff..cbf7448 100644
--- a/tests/SchnoopSchema/MySQL/Routine/AbstractRoutineTest.php
+++ b/tests/SchnoopSchema/MySQL/Routine/AbstractRoutineTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\Routine;
 
 use MilesAsylum\SchnoopSchema\MySQL\Routine\AbstractRoutine;
diff --git a/tests/SchnoopSchema/MySQL/Routine/FunctionParameterTest.php b/tests/SchnoopSchema/MySQL/Routine/FunctionParameterTest.php
index 54a4b80..ce795aa 100644
--- a/tests/SchnoopSchema/MySQL/Routine/FunctionParameterTest.php
+++ b/tests/SchnoopSchema/MySQL/Routine/FunctionParameterTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\Routine;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
@@ -53,8 +55,8 @@ protected function getExpectedParameterDataType()
         return $this->mockDataType;
     }
 
-    public function testDDL()
+    public function testDDL(): void
     {
-        $this->assertSame("`param_name` DT_DDL", (string)$this->functionParameter);
+        $this->assertSame('`param_name` DT_DDL', (string) $this->functionParameter);
     }
 }
diff --git a/tests/SchnoopSchema/MySQL/Routine/ProcedureParameterTest.php b/tests/SchnoopSchema/MySQL/Routine/ProcedureParameterTest.php
index 2b3969c..cc5fa7d 100644
--- a/tests/SchnoopSchema/MySQL/Routine/ProcedureParameterTest.php
+++ b/tests/SchnoopSchema/MySQL/Routine/ProcedureParameterTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\Routine;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
@@ -54,22 +56,22 @@ protected function getExpectedParameterDataType()
         return $this->mockDataType;
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
 
         $this->assertSame(ProcedureParameterInterface::DIRECTION_IN, $this->procedureParameter->getDirection());
     }
 
-    public function testSetDirection()
+    public function testSetDirection(): void
     {
         $this->procedureParameter->setDirection(ProcedureParameterInterface::DIRECTION_INOUT);
 
         $this->assertSame(ProcedureParameterInterface::DIRECTION_INOUT, $this->procedureParameter->getDirection());
     }
 
-    public function testDDL()
+    public function testDDL(): void
     {
-        $this->assertSame("IN `param_name` DT_DDL", (string)$this->procedureParameter);
+        $this->assertSame('IN `param_name` DT_DDL', (string) $this->procedureParameter);
     }
 }
diff --git a/tests/SchnoopSchema/MySQL/Routine/RoutineFunctionTest.php b/tests/SchnoopSchema/MySQL/Routine/RoutineFunctionTest.php
index dc5e6d2..8e23ae8 100644
--- a/tests/SchnoopSchema/MySQL/Routine/RoutineFunctionTest.php
+++ b/tests/SchnoopSchema/MySQL/Routine/RoutineFunctionTest.php
@@ -1,12 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\Routine;
 
 use MilesAsylum\SchnoopSchema\MySQL\DataType\DataTypeInterface;
 use MilesAsylum\SchnoopSchema\MySQL\DroppableInterface;
 use MilesAsylum\SchnoopSchema\MySQL\Exception\FQNException;
 use MilesAsylum\SchnoopSchema\MySQL\HasDelimiterInterface;
-use MilesAsylum\SchnoopSchema\MySQL\MySQLInterface;
 use MilesAsylum\SchnoopSchema\MySQL\Routine\FunctionParameterInterface;
 use MilesAsylum\SchnoopSchema\MySQL\Routine\ProcedureParameterInterface;
 use MilesAsylum\SchnoopSchema\MySQL\Routine\RoutineFunction;
@@ -61,7 +62,7 @@ protected function getExpectedName()
         return $this->name;
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
 
@@ -70,7 +71,7 @@ public function testInitialProperties()
         $this->assertSame($this->returns, $this->function->getReturnType());
     }
 
-    public function testSetReturns()
+    public function testSetReturns(): void
     {
         $mockReturns = $this->createMock(DataTypeInterface::class);
 
@@ -79,12 +80,12 @@ public function testSetReturns()
         $this->assertSame($mockReturns, $this->function->getReturnType());
     }
 
-    public function testSetParameters()
+    public function testSetParameters(): void
     {
         /** @var FunctionParameterInterface[]|PHPUnit_Framework_MockObject_MockObject[] $parameters */
         $parameters = [
             $this->createMock(FunctionParameterInterface::class),
-            $this->createMock(FunctionParameterInterface::class)
+            $this->createMock(FunctionParameterInterface::class),
         ];
 
         $parameters[0]->method('getName')
@@ -98,12 +99,12 @@ public function testSetParameters()
         $this->assertSame($parameters, $this->function->getParameters());
     }
 
-    public function testAddParameter()
+    public function testAddParameter(): void
     {
         /** @var FunctionParameterInterface[]|PHPUnit_Framework_MockObject_MockObject[] $parameters */
         $parameters = [
             $this->createMock(FunctionParameterInterface::class),
-            $this->createMock(FunctionParameterInterface::class)
+            $this->createMock(FunctionParameterInterface::class),
         ];
 
         $parameters[0]->method('getName')
@@ -119,11 +120,11 @@ public function testAddParameter()
 
     /**
      * @dataProvider getDDLTestData
-     * @param RoutineFunction $function
+     *
      * @param bool $doMockSqlMode
      * @param $expectedDDL
      */
-    public function testGetDDL(RoutineFunction $function, $doMockSqlMode, $expectedDDL)
+    public function testGetDDL(RoutineFunction $function, $doMockSqlMode, $expectedDDL): void
     {
         if ($doMockSqlMode) {
             $mockSqlMode = $this->createMock(SqlMode::class);
@@ -135,7 +136,7 @@ public function testGetDDL(RoutineFunction $function, $doMockSqlMode, $expectedD
         $this->assertSame($expectedDDL, $function->getCreateStatement());
     }
 
-    public function testToStringAliasesGetDDL()
+    public function testToStringAliasesGetDDL(): void
     {
         $ddl = '__ddl__';
         $mockFunction = $this->getMockBuilder(RoutineFunction::class)
@@ -148,11 +149,12 @@ public function testToStringAliasesGetDDL()
             ->method('getCreateStatement')
             ->willReturn($ddl);
 
-        $this->assertSame($ddl, (string)$mockFunction);
+        $this->assertSame($ddl, (string) $mockFunction);
     }
 
     /**
      * @see testGetDDL
+     *
      * @return array
      */
     public function getDDLTestData()
@@ -166,7 +168,7 @@ public function getDDLTestData()
 
         $mockParameters = [
             $this->createMock(ProcedureParameterInterface::class),
-            $this->createMock(ProcedureParameterInterface::class)
+            $this->createMock(ProcedureParameterInterface::class),
         ];
 
         $mockParameters[0]->method('getDDL')->willReturn('__param_1__');
@@ -243,11 +245,11 @@ public function getDDLTestData()
 END@@
 __sql_mode_restore__
 SQL
-            ]
+            ],
         ];
     }
 
-    public function testExceptionOnUseFQNWhenDatabaseNameNotSet()
+    public function testExceptionOnUseFQNWhenDatabaseNameNotSet(): void
     {
         $this->expectExceptionMessage(
             'Unable to create DDL with fully-qualified-name because the database name has not been set.'
@@ -262,12 +264,12 @@ public function testExceptionOnUseFQNWhenDatabaseNameNotSet()
     /**
      * @param $name
      * @param $databaseName
-     * @param DataTypeInterface $returnType
      * @param $body
      * @param ProcedureParameterInterface[] $parameters
      * @param $useFQN
      * @param $ddlDelimiter
      * @param $ddlDropPolicy
+     *
      * @return RoutineFunction
      */
     protected function createFunction(
diff --git a/tests/SchnoopSchema/MySQL/Routine/RoutineProcedureTest.php b/tests/SchnoopSchema/MySQL/Routine/RoutineProcedureTest.php
index e010ee4..c73d686 100644
--- a/tests/SchnoopSchema/MySQL/Routine/RoutineProcedureTest.php
+++ b/tests/SchnoopSchema/MySQL/Routine/RoutineProcedureTest.php
@@ -1,14 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\Routine;
 
 use MilesAsylum\SchnoopSchema\MySQL\DroppableInterface;
 use MilesAsylum\SchnoopSchema\MySQL\Exception\FQNException;
 use MilesAsylum\SchnoopSchema\MySQL\HasDelimiterInterface;
-use MilesAsylum\SchnoopSchema\MySQL\MySQLInterface;
 use MilesAsylum\SchnoopSchema\MySQL\Routine\ProcedureParameterInterface;
-use MilesAsylum\SchnoopSchema\MySQL\Routine\RoutineProcedure;
 use MilesAsylum\SchnoopSchema\MySQL\Routine\RoutineInterface;
+use MilesAsylum\SchnoopSchema\MySQL\Routine\RoutineProcedure;
 use MilesAsylum\SchnoopSchema\MySQL\SetVar\SqlMode;
 use MilesAsylum\SchnoopSchema\PHPUnit\Framework\RoutineTestCase;
 use PHPUnit_Framework_MockObject_MockObject;
@@ -50,7 +51,7 @@ protected function getExpectedName()
         return $this->name;
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         parent::testInitialProperties();
 
@@ -58,12 +59,12 @@ public function testInitialProperties()
         $this->assertSame([], $this->procedure->getParameters());
     }
 
-    public function testSetParameters()
+    public function testSetParameters(): void
     {
         /** @var ProcedureParameterInterface[]|PHPUnit_Framework_MockObject_MockObject[] $parameters */
         $parameters = [
             $this->createMock(ProcedureParameterInterface::class),
-            $this->createMock(ProcedureParameterInterface::class)
+            $this->createMock(ProcedureParameterInterface::class),
         ];
 
         $parameters[0]->method('getName')
@@ -77,12 +78,12 @@ public function testSetParameters()
         $this->assertSame($parameters, $this->procedure->getParameters());
     }
 
-    public function testAddParameter()
+    public function testAddParameter(): void
     {
         /** @var ProcedureParameterInterface[]|PHPUnit_Framework_MockObject_MockObject[] $parameters */
         $parameters = [
             $this->createMock(ProcedureParameterInterface::class),
-            $this->createMock(ProcedureParameterInterface::class)
+            $this->createMock(ProcedureParameterInterface::class),
         ];
 
         $parameters[0]->method('getName')
@@ -98,11 +99,11 @@ public function testAddParameter()
 
     /**
      * @dataProvider getDDLTestData
-     * @param RoutineProcedure $procedure
+     *
      * @param $doMockSqlMode
      * @param $expectedDDL
      */
-    public function testDDL(RoutineProcedure $procedure, $doMockSqlMode, $expectedDDL)
+    public function testDDL(RoutineProcedure $procedure, $doMockSqlMode, $expectedDDL): void
     {
         if ($doMockSqlMode) {
             $mockSqlMode = $this->createMock(SqlMode::class);
@@ -114,7 +115,7 @@ public function testDDL(RoutineProcedure $procedure, $doMockSqlMode, $expectedDD
         $this->assertSame($expectedDDL, $procedure->getCreateStatement());
     }
 
-    public function testToStringAliasesGetDDL()
+    public function testToStringAliasesGetDDL(): void
     {
         $ddl = '__ddl__';
         $mockProcedure = $this->getMockBuilder(RoutineProcedure::class)
@@ -127,7 +128,7 @@ public function testToStringAliasesGetDDL()
             ->method('getCreateStatement')
             ->willReturn($ddl);
 
-        $this->assertSame($ddl, (string)$mockProcedure);
+        $this->assertSame($ddl, (string) $mockProcedure);
     }
 
     public function getDDLTestData()
@@ -137,7 +138,7 @@ public function getDDLTestData()
         /** @var ProcedureParameterInterface[]|PHPUnit_Framework_MockObject_MockObject[] $mockParameters */
         $mockParameters = [
             $this->createMock(ProcedureParameterInterface::class),
-            $this->createMock(ProcedureParameterInterface::class)
+            $this->createMock(ProcedureParameterInterface::class),
         ];
 
         $mockParameters[0]->method('getDDL')->willReturn('__param_1__');
@@ -205,11 +206,11 @@ public function getDDLTestData()
 END@@
 __sql_mode_restore__
 SQL
-            ]
+            ],
         ];
     }
 
-    public function testExceptionOnUseFQNWhenDatabaseNameNotSet()
+    public function testExceptionOnUseFQNWhenDatabaseNameNotSet(): void
     {
         $this->expectExceptionMessage(
             'Unable to create DDL with fully-qualified-name because the database name has not been set.'
diff --git a/tests/SchnoopSchema/MySQL/SetVar/SqlModeTest.php b/tests/SchnoopSchema/MySQL/SetVar/SqlModeTest.php
index 1a3a953..afdd5ce 100644
--- a/tests/SchnoopSchema/MySQL/SetVar/SqlModeTest.php
+++ b/tests/SchnoopSchema/MySQL/SetVar/SqlModeTest.php
@@ -1,9 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\SetVar;
 
 use MilesAsylum\SchnoopSchema\MySQL\HasDelimiterInterface;
-use MilesAsylum\SchnoopSchema\MySQL\MySQLInterface;
 use MilesAsylum\SchnoopSchema\MySQL\SetVar\SqlMode;
 use PHPUnit\Framework\TestCase;
 
@@ -22,13 +23,13 @@ public function setUp(): void
         $this->sqlMode = new SqlMode($this->mode);
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $this->assertSame($this->mode, $this->sqlMode->getMode());
         $this->assertSame(HasDelimiterInterface::DEFAULT_DELIMITER, $this->sqlMode->getDelimiter());
     }
 
-    public function testSetMode()
+    public function testSetMode(): void
     {
         $newMode = 'BAR';
         $this->sqlMode->setMode($newMode);
@@ -36,7 +37,7 @@ public function testSetMode()
         $this->assertSame($newMode, $this->sqlMode->getMode());
     }
 
-    public function testSetDelimiter()
+    public function testSetDelimiter(): void
     {
         $delimiter = '@@';
         $this->sqlMode->setDelimiter($delimiter);
@@ -44,7 +45,7 @@ public function testSetDelimiter()
         $this->assertSame($delimiter, $this->sqlMode->getDelimiter());
     }
 
-    public function testGetSetStatements()
+    public function testGetSetStatements(): void
     {
         $expectedStatements = <<<SQL
 SET @_schnoop_sql_mode = @@session.sql_mode;
@@ -54,7 +55,7 @@ public function testGetSetStatements()
         $this->assertSame($expectedStatements, $this->sqlMode->getSetStatements());
     }
 
-    public function testGetRestoreStatements()
+    public function testGetRestoreStatements(): void
     {
         $expectedStatements = <<<SQL
 SET @@session.sql_mode = @_schnoop_sql_mode;
diff --git a/tests/SchnoopSchema/MySQL/Table/TableTest.php b/tests/SchnoopSchema/MySQL/Table/TableTest.php
index 03eb85c..5108be5 100644
--- a/tests/SchnoopSchema/MySQL/Table/TableTest.php
+++ b/tests/SchnoopSchema/MySQL/Table/TableTest.php
@@ -1,16 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\Table;
 
+use MilesAsylum\SchnoopSchema\MySQL\Column\ColumnInterface;
 use MilesAsylum\SchnoopSchema\MySQL\Constraint\ForeignKeyInterface;
 use MilesAsylum\SchnoopSchema\MySQL\Constraint\IndexInterface;
 use MilesAsylum\SchnoopSchema\MySQL\Constraint\UniqueIndex;
 use MilesAsylum\SchnoopSchema\MySQL\DroppableInterface;
 use MilesAsylum\SchnoopSchema\MySQL\HasDelimiterInterface;
+use MilesAsylum\SchnoopSchema\MySQL\Table\Table;
 use MilesAsylum\SchnoopSchema\MySQL\Table\TableInterface;
 use MilesAsylum\SchnoopSchema\PHPUnit\Framework\SchnoopSchemaTestCase;
-use MilesAsylum\SchnoopSchema\MySQL\Column\ColumnInterface;
-use MilesAsylum\SchnoopSchema\MySQL\Table\Table;
 
 class TableTest extends SchnoopSchemaTestCase
 {
@@ -30,7 +32,7 @@ public function setUp(): void
         );
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $this->assertSame($this->name, $this->table->getName());
 
@@ -60,7 +62,7 @@ public function testInitialProperties()
         $this->assertSame(DroppableInterface::DDL_DROP_POLICY_DO_NOT_DROP, $this->table->getDropPolicy());
     }
 
-    public function testSetNewName()
+    public function testSetNewName(): void
     {
         $newName = 'new_table_name';
         $this->table->setName($newName);
@@ -68,7 +70,7 @@ public function testSetNewName()
         $this->assertSame($newName, $this->table->getName());
     }
 
-    public function testSetDatabaseName()
+    public function testSetDatabaseName(): void
     {
         $databaseName = 'schnoop_db';
         $this->table->setDatabaseName($databaseName);
@@ -77,7 +79,7 @@ public function testSetDatabaseName()
         $this->assertSame($databaseName, $this->table->getDatabaseName());
     }
 
-    public function testSetEngine()
+    public function testSetEngine(): void
     {
         $this->table->setEngine(Table::ENGINE_INNODB);
 
@@ -85,14 +87,14 @@ public function testSetEngine()
         $this->assertSame(Table::ENGINE_INNODB, $this->table->getEngine());
     }
 
-    public function testSetEngineForcesCase()
+    public function testSetEngineForcesCase(): void
     {
         $this->table->setEngine('InnoDB');
 
         $this->assertSame(Table::ENGINE_INNODB, $this->table->getEngine());
     }
 
-    public function testSetDefaultCollation()
+    public function testSetDefaultCollation(): void
     {
         $defaultCollation = 'utf8mb4_general_ci';
 
@@ -102,7 +104,7 @@ public function testSetDefaultCollation()
         $this->assertSame($defaultCollation, $this->table->getDefaultCollation());
     }
 
-    public function testSetRowFormat()
+    public function testSetRowFormat(): void
     {
         $this->table->setRowFormat(Table::ROW_FORMAT_COMPACT);
 
@@ -110,14 +112,14 @@ public function testSetRowFormat()
         $this->assertSame(Table::ROW_FORMAT_COMPACT, $this->table->getRowFormat());
     }
 
-    public function testSetRowFormatForcesCase()
+    public function testSetRowFormatForcesCase(): void
     {
         $this->table->setRowFormat('ComPacT');
 
         $this->assertSame(Table::ROW_FORMAT_COMPACT, $this->table->getRowFormat());
     }
 
-    public function testSetComment()
+    public function testSetComment(): void
     {
         $comment = 'Schnoop comment';
         $this->table->setComment($comment);
@@ -126,7 +128,7 @@ public function testSetComment()
         $this->assertSame($comment, $this->table->getComment());
     }
 
-    public function testUndefinedColumn()
+    public function testUndefinedColumn(): void
     {
         $columnName = 'schnoop_col';
 
@@ -134,7 +136,7 @@ public function testUndefinedColumn()
         $this->assertNull($this->table->getColumn($columnName));
     }
 
-    public function testAddColumn()
+    public function testAddColumn(): void
     {
         $columnName = 'schnoop_col';
         $columnDDL = '_COL_DDL_';
@@ -155,21 +157,21 @@ public function testAddColumn()
     /**
      * @depends testAddColumn
      */
-    public function testSetColumns()
+    public function testSetColumns(): void
     {
         $columnNames = [
             'schnoop_col1',
-            'schnoop_col2'
+            'schnoop_col2',
         ];
 
         $columnDDLs = [
             '_COL_DDL_1_',
-            '_COL_DDL_2_'
+            '_COL_DDL_2_',
         ];
 
         $mockColumns = [
             $this->createMockColumn($columnNames[0], $columnDDLs[0]),
-            $this->createMockColumn($columnNames[1], $columnDDLs[1])
+            $this->createMockColumn($columnNames[1], $columnDDLs[1]),
         ];
 
         $this->table->setColumns($mockColumns);
@@ -178,7 +180,7 @@ public function testSetColumns()
         $this->assertSame($columnNames, $this->table->getColumnList());
     }
 
-    public function testUndefinedConstraint()
+    public function testUndefinedConstraint(): void
     {
         $constraintName = 'schnoop_idx';
 
@@ -186,7 +188,7 @@ public function testUndefinedConstraint()
         $this->assertNull($this->table->getIndex($constraintName));
     }
 
-    public function testAddIndex()
+    public function testAddIndex(): void
     {
         $indexName = 'schnoop_idx';
         $indexDDL = '_IDX_DDL_';
@@ -207,21 +209,21 @@ public function testAddIndex()
     /**
      * @depends testAddIndex
      */
-    public function testSetIndexes()
+    public function testSetIndexes(): void
     {
         $indexNames = [
             'schnoop_idx1',
-            'schnoop_idx2'
+            'schnoop_idx2',
         ];
 
         $indexDDLs = [
             '_IDX_DDL_1_',
-            '_IDX_DDL_2_'
+            '_IDX_DDL_2_',
         ];
 
         $mockIndexes = [
             $this->createMockIndex($indexNames[0], $indexDDLs[0]),
-            $this->createMockIndex($indexNames[1], $indexDDLs[1])
+            $this->createMockIndex($indexNames[1], $indexDDLs[1]),
         ];
 
         $this->table->setIndexes($mockIndexes);
@@ -230,7 +232,7 @@ public function testSetIndexes()
         $this->assertSame($indexNames, $this->table->getIndexList());
     }
 
-    public function testAddPrimaryKey()
+    public function testAddPrimaryKey(): void
     {
         $mockPrimaryKey = $this->createMock(UniqueIndex::class);
         $mockPrimaryKey->method('getName')->willReturn('primary');
@@ -240,7 +242,7 @@ public function testAddPrimaryKey()
         $this->assertSame($mockPrimaryKey, $this->table->getPrimaryKey());
     }
 
-    public function testAddForeignKey()
+    public function testAddForeignKey(): void
     {
         $foreignKeyName = 'schnoop_fk';
         $foreignKeyDDL = '_FK_DDL_';
@@ -261,21 +263,21 @@ public function testAddForeignKey()
     /**
      * @depends testAddForeignKey
      */
-    public function testSetForeignKey()
+    public function testSetForeignKey(): void
     {
         $foreignKeyNames = [
             'schnoop_fk1',
-            'schnoop_fk2'
+            'schnoop_fk2',
         ];
 
         $foreignKeyDDLs = [
             '_FK_DDL_1_',
-            '_FK_DDL_2_'
+            '_FK_DDL_2_',
         ];
 
         $mockForeignKeys = [
             $this->createMockForeignKey($foreignKeyNames[0], $foreignKeyDDLs[0]),
-            $this->createMockForeignKey($foreignKeyNames[1], $foreignKeyDDLs[1])
+            $this->createMockForeignKey($foreignKeyNames[1], $foreignKeyDDLs[1]),
         ];
 
         $this->table->setForeignKeys($mockForeignKeys);
@@ -284,14 +286,14 @@ public function testSetForeignKey()
         $this->assertSame($foreignKeyNames, $this->table->getForeignKeyList());
     }
 
-    public function testSetUseFullyQualifiedName()
+    public function testSetUseFullyQualifiedName(): void
     {
         $this->table->setUseFullyQualifiedName(true);
 
         $this->assertTrue($this->table->useFullyQualifiedName());
     }
 
-    public function testSetDelimiter()
+    public function testSetDelimiter(): void
     {
         $newDelimiter = '$$';
         $this->table->setDelimiter($newDelimiter);
@@ -299,7 +301,7 @@ public function testSetDelimiter()
         $this->assertSame($newDelimiter, $this->table->getDelimiter());
     }
 
-    public function testSetDropPolicy()
+    public function testSetDropPolicy(): void
     {
         $this->table->setDropPolicy(DroppableInterface::DDL_DROP_POLICY_DROP_IF_EXISTS);
 
@@ -308,15 +310,15 @@ public function testSetDropPolicy()
 
     /**
      * @dataProvider getDDLTestData
-     * @param Table $table
+     *
      * @param string $expectedDDL
      */
-    public function testDDL(Table $table, $expectedDDL)
+    public function testDDL(Table $table, $expectedDDL): void
     {
         $this->assertSame($expectedDDL, $table->getCreateStatement());
     }
 
-    public function testToStringAliasesGetDDL()
+    public function testToStringAliasesGetDDL(): void
     {
         $ddl = '__ddl__';
         $mockTable = $this->getMockBuilder(Table::class)
@@ -329,10 +331,10 @@ public function testToStringAliasesGetDDL()
             ->method('getCreateStatement')
             ->willReturn($ddl);
 
-        $this->assertSame($ddl, (string)$mockTable);
+        $this->assertSame($ddl, (string) $mockTable);
     }
 
-    public function testExceptionOnUseFQNWhenDatabaseNameNotSet()
+    public function testExceptionOnUseFQNWhenDatabaseNameNotSet(): void
     {
         $this->expectExceptionMessage(
             'Unable to create DDL with fully-qualified-name because the database name has not been set.'
@@ -346,6 +348,7 @@ public function testExceptionOnUseFQNWhenDatabaseNameNotSet()
 
     /**
      * @see testDDL
+     *
      * @return array
      */
     public function getDDLTestData()
@@ -354,17 +357,17 @@ public function getDDLTestData()
 
         $mockColumns = [
             $this->createMockColumn('schnoop_col1', '_COL_DDL_1_'),
-            $this->createMockColumn('schnoop_col2', '_COL_DDL_2_')
+            $this->createMockColumn('schnoop_col2', '_COL_DDL_2_'),
         ];
 
         $mockIndexes = [
             $this->createMockIndex('schnoop_idx1', '_IDX_DDL_1_'),
-            $this->createMockIndex('schnoop_idx2', '_IDX_DDL_2_')
+            $this->createMockIndex('schnoop_idx2', '_IDX_DDL_2_'),
         ];
 
         $mockForeignKeys = [
             $this->createMockForeignKey('schnoop_fk1', '_FK_DDL_1_'),
-            $this->createMockForeignKey('schnoop_fk2', '_FK_DDL_2_')
+            $this->createMockForeignKey('schnoop_fk2', '_FK_DDL_2_'),
         ];
 
         return [
@@ -471,6 +474,7 @@ public function getDDLTestData()
      * @param bool $useFQN
      * @param string $delimiter
      * @param string $dropPolicy
+     *
      * @return Table
      */
     protected function createTable(
diff --git a/tests/SchnoopSchema/MySQL/Trigger/TriggerTest.php b/tests/SchnoopSchema/MySQL/Trigger/TriggerTest.php
index 0331d95..a578dfc 100644
--- a/tests/SchnoopSchema/MySQL/Trigger/TriggerTest.php
+++ b/tests/SchnoopSchema/MySQL/Trigger/TriggerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MilesAsylum\SchnoopSchema\Tests\SchnoopSchema\MySQL\Trigger;
 
 use MilesAsylum\SchnoopSchema\MySQL\DroppableInterface;
@@ -37,7 +39,7 @@ public function setUp(): void
         );
     }
 
-    public function testInitialProperties()
+    public function testInitialProperties(): void
     {
         $this->assertSame($this->name, $this->trigger->getName());
         $this->assertSame($this->timing, $this->trigger->getTiming());
@@ -46,7 +48,7 @@ public function testInitialProperties()
 
         $this->assertFalse($this->trigger->hasDatabaseName());
         $this->assertNull($this->trigger->getDatabaseName());
-        
+
         $this->assertFalse($this->trigger->hasDefiner());
         $this->assertNull($this->trigger->getDefiner());
 
@@ -65,7 +67,7 @@ public function testInitialProperties()
         $this->assertSame(DroppableInterface::DDL_DROP_POLICY_DO_NOT_DROP, $this->trigger->getDropPolicy());
     }
 
-    public function testConstants()
+    public function testConstants(): void
     {
         $this->assertSame('CURRENT_USER', TriggerInterface::DEFINER_CURRENT_USER);
         $this->assertSame('BEFORE', TriggerInterface::TIMING_BEFORE);
@@ -76,26 +78,26 @@ public function testConstants()
         $this->assertSame('FOLLOWS', TriggerInterface::POSITION_FOLLOWS);
         $this->assertSame('PRECEDES', TriggerInterface::POSITION_PRECEDES);
     }
-    
-    public function testSetDatabaseName()
+
+    public function testSetDatabaseName(): void
     {
         $databaseName = 'schnoop_db';
         $this->trigger->setDatabaseName($databaseName);
-        
+
         $this->assertTrue($this->trigger->hasDatabaseName());
         $this->assertSame($databaseName, $this->trigger->getDatabaseName());
     }
 
-    public function testSetDefiner()
+    public function testSetDefiner(): void
     {
         $definer = 'root@localhost';
         $this->trigger->setDefiner($definer);
-        
+
         $this->assertTrue($this->trigger->hasDefiner());
         $this->assertSame($definer, $this->trigger->getDefiner());
     }
 
-    public function testSetPosition()
+    public function testSetPosition(): void
     {
         $relation = 'FOLLOWS';
         $relativeTo = 'schnoop_other_trigger';
@@ -106,7 +108,7 @@ public function testSetPosition()
         $this->assertSame($relativeTo, $this->trigger->getPositionRelativeTo());
     }
 
-    public function testSetStatement()
+    public function testSetStatement(): void
     {
         $statement = 'SELECT 1;';
         $this->trigger->setBody($statement);
@@ -128,9 +130,8 @@ public function testSetSqlMode()
 
     /**
      * @depends testSetSqlMode
-     * @param Trigger $triggerWithSetSqlMode
      */
-    public function testUnsetSqlMode(Trigger $triggerWithSetSqlMode)
+    public function testUnsetSqlMode(Trigger $triggerWithSetSqlMode): void
     {
         $triggerWithSetSqlMode->unsetSqlMode();
 
@@ -138,14 +139,14 @@ public function testUnsetSqlMode(Trigger $triggerWithSetSqlMode)
         $this->assertNull($triggerWithSetSqlMode->getSqlMode());
     }
 
-    public function testSetUseFullyQualifiedName()
+    public function testSetUseFullyQualifiedName(): void
     {
         $this->trigger->setUseFullyQualifiedName(true);
 
         $this->assertTrue($this->trigger->useFullyQualifiedName());
     }
 
-    public function testSetDelimiter()
+    public function testSetDelimiter(): void
     {
         $newDelimiter = '$$';
         $this->trigger->setDelimiter($newDelimiter);
@@ -153,7 +154,7 @@ public function testSetDelimiter()
         $this->assertSame($newDelimiter, $this->trigger->getDelimiter());
     }
 
-    public function testSetDropPolicy()
+    public function testSetDropPolicy(): void
     {
         $this->trigger->setDropPolicy(DroppableInterface::DDL_DROP_POLICY_DROP_IF_EXISTS);
 
@@ -162,11 +163,11 @@ public function testSetDropPolicy()
 
     /**
      * @dataProvider getDDLTestData
-     * @param Trigger $trigger
+     *
      * @param $doMockSqlMode
      * @param $expectedDDL
      */
-    public function testDDL(Trigger $trigger, $doMockSqlMode, $expectedDDL)
+    public function testDDL(Trigger $trigger, $doMockSqlMode, $expectedDDL): void
     {
         if ($doMockSqlMode) {
             $mockSqlMode = $this->createMock(SqlMode::class);
@@ -178,7 +179,7 @@ public function testDDL(Trigger $trigger, $doMockSqlMode, $expectedDDL)
         $this->assertSame($expectedDDL, $trigger->getCreateStatement());
     }
 
-    public function testToStringAliasesGetDDL()
+    public function testToStringAliasesGetDDL(): void
     {
         $ddl = '__ddl__';
         $mockTrigger = $this->getMockBuilder(Trigger::class)
@@ -191,10 +192,10 @@ public function testToStringAliasesGetDDL()
             ->method('getCreateStatement')
             ->willReturn($ddl);
 
-        $this->assertSame($ddl, (string)$mockTrigger);
+        $this->assertSame($ddl, (string) $mockTrigger);
     }
 
-    public function testExceptionOnUseFQNWhenDatabaseNameNotSet()
+    public function testExceptionOnUseFQNWhenDatabaseNameNotSet(): void
     {
         $this->expectExceptionMessage(
             'Unable to create DDL with fully-qualified-name because the database name has not been set.'
@@ -208,11 +209,13 @@ public function testExceptionOnUseFQNWhenDatabaseNameNotSet()
 
     /**
      * @see testDDL
+     *
      * @return array
      */
     public function getDDLTestData()
     {
         $databaseName = 'schnoop_db';
+
         return [
             [
                 $this->createTrigger(
@@ -306,6 +309,7 @@ public function getDDLTestData()
      * @param bool $useFQN
      * @param string $delimiter
      * @param string $dropPolicy
+     *
      * @return Trigger
      */
     public function createTrigger(