diff --git a/composer.json b/composer.json
index afd49f7b..fd0cf204 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
 	"require": {
 		"mnapoli/php-di": "~4.0",
-		"phpcheckstyle/phpcheckstyle": "~0.14"
+		"jbrooksuk/phpcheckstyle": "dev-master"
 	}
 }
diff --git a/gruntfile.js b/gruntfile.js
index 9c41e4c2..de7205f6 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -71,12 +71,7 @@ module.exports = function(grunt) {
 
 		shell: {
 			phpcheckstyle: {
-				options: {
-					execOptions: {
-						cwd: path.join(path.resolve(), 'vendor/phpcheckstyle/phpcheckstyle'),
-					},
-				},
-				command: 'php run.php --config <%= phpCheckStyleConfigPath %> --src <%= phpSourcesDir %> --exclude di.php --format console',
+				command: 'php vendor/jbrooksuk/phpcheckstyle/run.php --config <%= phpCheckStyleConfigPath %> --src <%= phpSourcesDir %> --exclude di.php --format console',
 			},
 
 			tests: {
diff --git a/src/Dao/PostDao.php b/src/Dao/PostDao.php
index a61c899b..94681e5d 100644
--- a/src/Dao/PostDao.php
+++ b/src/Dao/PostDao.php
@@ -5,6 +5,6 @@ final class PostDao extends AbstractDao implements ICrudDao
 {
 	public function __construct(\Szurubooru\DatabaseConnection $databaseConnection)
 	{
-		parent::__construct($databaseConnection, 'posts', '\Szurubooru\Entities\Post');
+		parent::__construct($databaseConnection, 'posts', \Szurubooru\Entities\Post::class);
 	}
 }
diff --git a/src/Dao/TokenDao.php b/src/Dao/TokenDao.php
index 77ce40dc..8573306b 100644
--- a/src/Dao/TokenDao.php
+++ b/src/Dao/TokenDao.php
@@ -5,7 +5,7 @@ class TokenDao extends AbstractDao
 {
 	public function __construct(\Szurubooru\DatabaseConnection $databaseConnection)
 	{
-		parent::__construct($databaseConnection, 'tokens', '\Szurubooru\Entities\Token');
+		parent::__construct($databaseConnection, 'tokens', \Szurubooru\Entities\Token::class);
 	}
 
 	public function findByName($tokenName)
diff --git a/src/Dao/UserDao.php b/src/Dao/UserDao.php
index d141df80..5cb26e73 100644
--- a/src/Dao/UserDao.php
+++ b/src/Dao/UserDao.php
@@ -6,7 +6,7 @@ class UserDao extends AbstractDao implements ICrudDao
 	public function __construct(
 		\Szurubooru\DatabaseConnection $databaseConnection)
 	{
-		parent::__construct($databaseConnection, 'users', '\Szurubooru\Entities\User');
+		parent::__construct($databaseConnection, 'users', \Szurubooru\Entities\User::class);
 	}
 
 	public function findByName($userName)