diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 3294d07..99f3be2 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -15,6 +15,7 @@ $config = new PhpCsFixer\Config();
 
 return $config->setRules(array(
     '@PSR2' => true,
+    '@PSR12' => true,
     '@PHP71Migration' => true,
     'array_syntax' => ['syntax' => 'long'],
     'class_attributes_separation' => true,
diff --git a/lib/Algorithm.php b/lib/Algorithm.php
index 82eda72..185b2d8 100644
--- a/lib/Algorithm.php
+++ b/lib/Algorithm.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth;
 
diff --git a/lib/Providers/Qr/BaconQrCodeProvider.php b/lib/Providers/Qr/BaconQrCodeProvider.php
index 5ad7ac7..00a994f 100644
--- a/lib/Providers/Qr/BaconQrCodeProvider.php
+++ b/lib/Providers/Qr/BaconQrCodeProvider.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth\Providers\Qr;
 
@@ -57,10 +59,10 @@ class BaconQrCodeProvider implements IQRCodeProvider
     {
         switch ($this->format) {
             case 'svg':
-                $backend = new SvgImageBackEnd;
+                $backend = new SvgImageBackEnd();
                 break;
             case 'eps':
-                $backend = new EpsImageBackEnd;
+                $backend = new EpsImageBackEnd();
                 break;
             default:
                 $backend = new ImagickImageBackEnd($this->format);
diff --git a/lib/Providers/Qr/BaseHTTPQRCodeProvider.php b/lib/Providers/Qr/BaseHTTPQRCodeProvider.php
index e18f131..a0c3d82 100644
--- a/lib/Providers/Qr/BaseHTTPQRCodeProvider.php
+++ b/lib/Providers/Qr/BaseHTTPQRCodeProvider.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth\Providers\Qr;
 
diff --git a/lib/Providers/Qr/EndroidQrCodeProvider.php b/lib/Providers/Qr/EndroidQrCodeProvider.php
index f9553de..982b4f9 100755
--- a/lib/Providers/Qr/EndroidQrCodeProvider.php
+++ b/lib/Providers/Qr/EndroidQrCodeProvider.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth\Providers\Qr;
 
diff --git a/lib/Providers/Qr/EndroidQrCodeWithLogoProvider.php b/lib/Providers/Qr/EndroidQrCodeWithLogoProvider.php
index a0ba41e..71a5559 100755
--- a/lib/Providers/Qr/EndroidQrCodeWithLogoProvider.php
+++ b/lib/Providers/Qr/EndroidQrCodeWithLogoProvider.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth\Providers\Qr;
 
diff --git a/lib/Providers/Qr/GoogleChartsQrCodeProvider.php b/lib/Providers/Qr/GoogleChartsQrCodeProvider.php
index fc61c1e..fd59dff 100644
--- a/lib/Providers/Qr/GoogleChartsQrCodeProvider.php
+++ b/lib/Providers/Qr/GoogleChartsQrCodeProvider.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth\Providers\Qr;
 
diff --git a/lib/Providers/Qr/HandlesDataUri.php b/lib/Providers/Qr/HandlesDataUri.php
index 8f8458e..7ca425d 100644
--- a/lib/Providers/Qr/HandlesDataUri.php
+++ b/lib/Providers/Qr/HandlesDataUri.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth\Providers\Qr;
 
diff --git a/lib/Providers/Qr/IQRCodeProvider.php b/lib/Providers/Qr/IQRCodeProvider.php
index abfe002..dc53365 100644
--- a/lib/Providers/Qr/IQRCodeProvider.php
+++ b/lib/Providers/Qr/IQRCodeProvider.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth\Providers\Qr;
 
diff --git a/lib/Providers/Qr/ImageChartsQRCodeProvider.php b/lib/Providers/Qr/ImageChartsQRCodeProvider.php
index c62ebcb..d62a96a 100644
--- a/lib/Providers/Qr/ImageChartsQRCodeProvider.php
+++ b/lib/Providers/Qr/ImageChartsQRCodeProvider.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth\Providers\Qr;
 
diff --git a/lib/Providers/Qr/QRException.php b/lib/Providers/Qr/QRException.php
index a0970c0..7a1b46d 100644
--- a/lib/Providers/Qr/QRException.php
+++ b/lib/Providers/Qr/QRException.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth\Providers\Qr;
 
diff --git a/lib/Providers/Qr/QRServerProvider.php b/lib/Providers/Qr/QRServerProvider.php
index f29e142..b223d91 100644
--- a/lib/Providers/Qr/QRServerProvider.php
+++ b/lib/Providers/Qr/QRServerProvider.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth\Providers\Qr;
 
diff --git a/lib/Providers/Qr/QRicketProvider.php b/lib/Providers/Qr/QRicketProvider.php
index 0a7504d..f72463d 100644
--- a/lib/Providers/Qr/QRicketProvider.php
+++ b/lib/Providers/Qr/QRicketProvider.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth\Providers\Qr;
 
diff --git a/lib/Providers/Rng/CSRNGProvider.php b/lib/Providers/Rng/CSRNGProvider.php
index 755c4c2..97351f3 100644
--- a/lib/Providers/Rng/CSRNGProvider.php
+++ b/lib/Providers/Rng/CSRNGProvider.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth\Providers\Rng;
 
diff --git a/lib/Providers/Rng/HashRNGProvider.php b/lib/Providers/Rng/HashRNGProvider.php
index eda98c4..6d29755 100644
--- a/lib/Providers/Rng/HashRNGProvider.php
+++ b/lib/Providers/Rng/HashRNGProvider.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth\Providers\Rng;
 
diff --git a/lib/Providers/Rng/IRNGProvider.php b/lib/Providers/Rng/IRNGProvider.php
index dee8064..ed18453 100644
--- a/lib/Providers/Rng/IRNGProvider.php
+++ b/lib/Providers/Rng/IRNGProvider.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth\Providers\Rng;
 
diff --git a/lib/Providers/Rng/OpenSSLRNGProvider.php b/lib/Providers/Rng/OpenSSLRNGProvider.php
index 97ee8cb..ef2aeb1 100644
--- a/lib/Providers/Rng/OpenSSLRNGProvider.php
+++ b/lib/Providers/Rng/OpenSSLRNGProvider.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth\Providers\Rng;
 
diff --git a/lib/Providers/Rng/RNGException.php b/lib/Providers/Rng/RNGException.php
index 8cf560f..aeb126a 100644
--- a/lib/Providers/Rng/RNGException.php
+++ b/lib/Providers/Rng/RNGException.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth\Providers\Rng;
 
diff --git a/lib/Providers/Time/HttpTimeProvider.php b/lib/Providers/Time/HttpTimeProvider.php
index 13d379d..4131fee 100644
--- a/lib/Providers/Time/HttpTimeProvider.php
+++ b/lib/Providers/Time/HttpTimeProvider.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth\Providers\Time;
 
diff --git a/lib/Providers/Time/ITimeProvider.php b/lib/Providers/Time/ITimeProvider.php
index 7917346..d303412 100644
--- a/lib/Providers/Time/ITimeProvider.php
+++ b/lib/Providers/Time/ITimeProvider.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth\Providers\Time;
 
diff --git a/lib/Providers/Time/LocalMachineTimeProvider.php b/lib/Providers/Time/LocalMachineTimeProvider.php
index 3f45f03..9acbdd9 100644
--- a/lib/Providers/Time/LocalMachineTimeProvider.php
+++ b/lib/Providers/Time/LocalMachineTimeProvider.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth\Providers\Time;
 
diff --git a/lib/Providers/Time/NTPTimeProvider.php b/lib/Providers/Time/NTPTimeProvider.php
index 6bc72c7..20db712 100644
--- a/lib/Providers/Time/NTPTimeProvider.php
+++ b/lib/Providers/Time/NTPTimeProvider.php
@@ -1,8 +1,11 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth\Providers\Time;
 
 use Exception;
+
 use function socket_create;
 
 /**
diff --git a/lib/Providers/Time/TimeException.php b/lib/Providers/Time/TimeException.php
index 9c82846..1e179f5 100644
--- a/lib/Providers/Time/TimeException.php
+++ b/lib/Providers/Time/TimeException.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth\Providers\Time;
 
diff --git a/lib/TwoFactorAuth.php b/lib/TwoFactorAuth.php
index 179ade8..ab9ee4b 100644
--- a/lib/TwoFactorAuth.php
+++ b/lib/TwoFactorAuth.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth;
 
diff --git a/lib/TwoFactorAuthException.php b/lib/TwoFactorAuthException.php
index e5740f9..cb07494 100644
--- a/lib/TwoFactorAuthException.php
+++ b/lib/TwoFactorAuthException.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace RobThree\Auth;
 
diff --git a/tests/MightNotMakeAssertions.php b/tests/MightNotMakeAssertions.php
index 6301cee..ffcf8c3 100644
--- a/tests/MightNotMakeAssertions.php
+++ b/tests/MightNotMakeAssertions.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Tests;
 
diff --git a/tests/Providers/Qr/IQRCodeProviderTest.php b/tests/Providers/Qr/IQRCodeProviderTest.php
index d31e7c6..bfab066 100644
--- a/tests/Providers/Qr/IQRCodeProviderTest.php
+++ b/tests/Providers/Qr/IQRCodeProviderTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Tests\Providers\Qr;
 
diff --git a/tests/Providers/Qr/TestQrProvider.php b/tests/Providers/Qr/TestQrProvider.php
index 428cb3c..f7b790c 100644
--- a/tests/Providers/Qr/TestQrProvider.php
+++ b/tests/Providers/Qr/TestQrProvider.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Tests\Providers\Qr;
 
diff --git a/tests/Providers/Rng/CSRNGProviderTest.php b/tests/Providers/Rng/CSRNGProviderTest.php
index 09cb41c..c60d225 100644
--- a/tests/Providers/Rng/CSRNGProviderTest.php
+++ b/tests/Providers/Rng/CSRNGProviderTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Tests\Providers\Rng;
 
@@ -8,7 +10,8 @@ use Tests\MightNotMakeAssertions;
 
 class CSRNGProviderTest extends TestCase
 {
-    use NeedsRngLengths, MightNotMakeAssertions;
+    use NeedsRngLengths;
+    use MightNotMakeAssertions;
 
     /**
      * @requires function random_bytes
diff --git a/tests/Providers/Rng/HashRNGProviderTest.php b/tests/Providers/Rng/HashRNGProviderTest.php
index 2259244..d54b9ae 100644
--- a/tests/Providers/Rng/HashRNGProviderTest.php
+++ b/tests/Providers/Rng/HashRNGProviderTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Tests\Providers\Rng;
 
diff --git a/tests/Providers/Rng/IRNGProviderTest.php b/tests/Providers/Rng/IRNGProviderTest.php
index a4d57a3..a55a56d 100644
--- a/tests/Providers/Rng/IRNGProviderTest.php
+++ b/tests/Providers/Rng/IRNGProviderTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Tests\Providers\Rng;
 
diff --git a/tests/Providers/Rng/NeedsRngLengths.php b/tests/Providers/Rng/NeedsRngLengths.php
index daefe3c..9c34c06 100644
--- a/tests/Providers/Rng/NeedsRngLengths.php
+++ b/tests/Providers/Rng/NeedsRngLengths.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Tests\Providers\Rng;
 
diff --git a/tests/Providers/Rng/OpenSSLRNGProviderTest.php b/tests/Providers/Rng/OpenSSLRNGProviderTest.php
index 9efb3be..18fdb29 100644
--- a/tests/Providers/Rng/OpenSSLRNGProviderTest.php
+++ b/tests/Providers/Rng/OpenSSLRNGProviderTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Tests\Providers\Rng;
 
diff --git a/tests/Providers/Rng/TestRNGProvider.php b/tests/Providers/Rng/TestRNGProvider.php
index 1c95240..78ceec1 100644
--- a/tests/Providers/Rng/TestRNGProvider.php
+++ b/tests/Providers/Rng/TestRNGProvider.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Tests\Providers\Rng;
 
diff --git a/tests/Providers/Time/ITimeProviderTest.php b/tests/Providers/Time/ITimeProviderTest.php
index 1bb3257..0a4f7d5 100644
--- a/tests/Providers/Time/ITimeProviderTest.php
+++ b/tests/Providers/Time/ITimeProviderTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Tests\Providers\Time;
 
diff --git a/tests/Providers/Time/TestTimeProvider.php b/tests/Providers/Time/TestTimeProvider.php
index a189fa6..226c2ee 100644
--- a/tests/Providers/Time/TestTimeProvider.php
+++ b/tests/Providers/Time/TestTimeProvider.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Tests\Providers\Time;
 
diff --git a/tests/TwoFactorAuthTest.php b/tests/TwoFactorAuthTest.php
index acc9c15..985ef61 100644
--- a/tests/TwoFactorAuthTest.php
+++ b/tests/TwoFactorAuthTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Tests;
 
diff --git a/testsDependency/BaconQRCodeTest.php b/testsDependency/BaconQRCodeTest.php
index 321378b..3c79838 100644
--- a/testsDependency/BaconQRCodeTest.php
+++ b/testsDependency/BaconQRCodeTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace TestsDependency;
 
diff --git a/testsDependency/EndroidQRCodeTest.php b/testsDependency/EndroidQRCodeTest.php
index f5f4d6b..4b84dd2 100644
--- a/testsDependency/EndroidQRCodeTest.php
+++ b/testsDependency/EndroidQRCodeTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace TestsDependency;