diff --git a/SymfonyCustom/Sniffs/Arrays/ArrayDeclarationSniff.php b/SymfonyCustom/Sniffs/Arrays/ArrayDeclarationSniff.php
index 21911c5..f2d1489 100644
--- a/SymfonyCustom/Sniffs/Arrays/ArrayDeclarationSniff.php
+++ b/SymfonyCustom/Sniffs/Arrays/ArrayDeclarationSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\Arrays;
 
 use PHP_CodeSniffer\Files\File;
@@ -64,7 +66,7 @@ public function process(File $phpcsFile, $stackPtr): void
 
             $arrayEnd = $tokens[$arrayStart]['parenthesis_closer'];
 
-            if (($stackPtr + 1) !== $arrayStart) {
+            if ($stackPtr + 1 !== $arrayStart) {
                 $fix = $phpcsFile->addFixableError(
                     'There must be no space between the "array" keyword and the opening parenthesis',
                     $stackPtr,
@@ -73,7 +75,7 @@ public function process(File $phpcsFile, $stackPtr): void
 
                 if ($fix) {
                     $phpcsFile->fixer->beginChangeset();
-                    for ($i = ($stackPtr + 1); $i < $arrayStart; $i++) {
+                    for ($i = $stackPtr + 1; $i < $arrayStart; $i++) {
                         $phpcsFile->fixer->replaceToken($i, '');
                     }
 
@@ -83,14 +85,14 @@ public function process(File $phpcsFile, $stackPtr): void
         } else {
             $phpcsFile->recordMetric($stackPtr, 'Short array syntax used', 'yes');
             $arrayStart = $stackPtr;
-            $arrayEnd   = $tokens[$stackPtr]['bracket_closer'];
+            $arrayEnd = $tokens[$stackPtr]['bracket_closer'];
         }
 
         // Check for empty arrays.
-        $content = $phpcsFile->findNext(T_WHITESPACE, ($arrayStart + 1), ($arrayEnd + 1), true);
+        $content = $phpcsFile->findNext(T_WHITESPACE, $arrayStart + 1, $arrayEnd + 1, true);
         if ($content === $arrayEnd) {
             // Empty array, but if the brackets aren't together, there's a problem.
-            if (($arrayEnd - $arrayStart) !== 1) {
+            if (1 !== $arrayEnd - $arrayStart) {
                 $fix = $phpcsFile->addFixableError(
                     'Empty array declaration must have no space between the parentheses',
                     $stackPtr,
@@ -99,7 +101,7 @@ public function process(File $phpcsFile, $stackPtr): void
 
                 if ($fix) {
                     $phpcsFile->fixer->beginChangeset();
-                    for ($i = ($arrayStart + 1); $i < $arrayEnd; $i++) {
+                    for ($i = $arrayStart + 1; $i < $arrayEnd; $i++) {
                         $phpcsFile->fixer->replaceToken($i, '');
                     }
 
@@ -132,8 +134,8 @@ public function processSingleLineArray(File $phpcsFile, int $stackPtr, int $star
         // Check if there are multiple values. If so, then it has to be multiple lines
         // unless it is contained inside a function call or condition.
         $valueCount = 0;
-        $commas     = [];
-        for ($i = ($start + 1); $i < $end; $i++) {
+        $commas = [];
+        for ($i = $start + 1; $i < $end; $i++) {
             // Skip bracketed statements, like function calls.
             if (T_OPEN_PARENTHESIS === $tokens[$i]['code']) {
                 $i = $tokens[$i]['parenthesis_closer'];
@@ -142,7 +144,7 @@ public function processSingleLineArray(File $phpcsFile, int $stackPtr, int $star
 
             if (T_COMMA === $tokens[$i]['code']) {
                 // Before counting this comma, make sure we are not at the end of the array.
-                $next = $phpcsFile->findNext(T_WHITESPACE, ($i + 1), $end, true);
+                $next = $phpcsFile->findNext(T_WHITESPACE, $i + 1, $end, true);
                 if (false !== $next) {
                     $valueCount++;
                     $commas[] = $i;
@@ -162,105 +164,105 @@ public function processSingleLineArray(File $phpcsFile, int $stackPtr, int $star
         }
 
         // Now check each of the double arrows (if any).
-        $nextArrow = $phpcsFile->findNext(T_DOUBLE_ARROW, ($start + 1), $end);
+        $nextArrow = $phpcsFile->findNext(T_DOUBLE_ARROW, $start + 1, $end);
         while (false !== $nextArrow) {
-            if (T_WHITESPACE !== $tokens[($nextArrow - 1)]['code']) {
+            if (T_WHITESPACE !== $tokens[$nextArrow - 1]['code']) {
                 $fix = $phpcsFile->addFixableError(
                     'Expected 1 space between "%s" and double arrow; 0 found',
                     $nextArrow,
                     'NoSpaceBeforeDoubleArrow',
-                    [$tokens[($nextArrow - 1)]['content']]
+                    [$tokens[$nextArrow - 1]['content']]
                 );
 
                 if ($fix) {
                     $phpcsFile->fixer->addContentBefore($nextArrow, ' ');
                 }
             } else {
-                $spaceLength = $tokens[($nextArrow - 1)]['length'];
+                $spaceLength = $tokens[$nextArrow - 1]['length'];
                 if (1 !== $spaceLength) {
                     $fix = $phpcsFile->addFixableError(
                         'Expected 1 space between "%s" and double arrow; %s found',
                         $nextArrow,
                         'SpaceBeforeDoubleArrow',
-                        [$tokens[($nextArrow - 2)]['content'], $spaceLength]
+                        [$tokens[$nextArrow - 2]['content'], $spaceLength]
                     );
 
                     if ($fix) {
-                        $phpcsFile->fixer->replaceToken(($nextArrow - 1), ' ');
+                        $phpcsFile->fixer->replaceToken($nextArrow - 1, ' ');
                     }
                 }
             }
 
-            if (T_WHITESPACE !== $tokens[($nextArrow + 1)]['code']) {
+            if (T_WHITESPACE !== $tokens[$nextArrow + 1]['code']) {
                 $fix = $phpcsFile->addFixableError(
                     'Expected 1 space between double arrow and "%s"; 0 found',
                     $nextArrow,
                     'NoSpaceAfterDoubleArrow',
-                    [$tokens[($nextArrow + 1)]['content']]
+                    [$tokens[$nextArrow + 1]['content']]
                 );
 
                 if ($fix) {
                     $phpcsFile->fixer->addContent($nextArrow, ' ');
                 }
             } else {
-                $spaceLength = $tokens[($nextArrow + 1)]['length'];
+                $spaceLength = $tokens[$nextArrow + 1]['length'];
                 if (1 !== $spaceLength) {
                     $fix = $phpcsFile->addFixableError(
                         'Expected 1 space between double arrow and "%s"; %s found',
                         $nextArrow,
                         'SpaceAfterDoubleArrow',
-                        [$tokens[($nextArrow + 2)]['content'], $spaceLength]
+                        [$tokens[$nextArrow + 2]['content'], $spaceLength]
                     );
 
                     if ($fix) {
-                        $phpcsFile->fixer->replaceToken(($nextArrow + 1), ' ');
+                        $phpcsFile->fixer->replaceToken($nextArrow + 1, ' ');
                     }
                 }
             }
 
-            $nextArrow = $phpcsFile->findNext(T_DOUBLE_ARROW, ($nextArrow + 1), $end);
+            $nextArrow = $phpcsFile->findNext(T_DOUBLE_ARROW, $nextArrow + 1, $end);
         }
 
         if ($valueCount > 0) {
             // We have a multiple value array
             foreach ($commas as $comma) {
-                if (T_WHITESPACE !== $tokens[($comma + 1)]['code']) {
+                if (T_WHITESPACE !== $tokens[$comma + 1]['code']) {
                     $fix = $phpcsFile->addFixableError(
                         'Expected 1 space between comma and "%s"; 0 found',
                         $comma,
                         'NoSpaceAfterComma',
-                        [$tokens[($comma + 1)]['content']]
+                        [$tokens[$comma + 1]['content']]
                     );
 
                     if ($fix) {
                         $phpcsFile->fixer->addContent($comma, ' ');
                     }
                 } else {
-                    $spaceLength = $tokens[($comma + 1)]['length'];
+                    $spaceLength = $tokens[$comma + 1]['length'];
                     if (1 !== $spaceLength) {
                         $fix = $phpcsFile->addFixableError(
                             'Expected 1 space between comma and "%s"; %s found',
                             $comma,
                             'SpaceAfterComma',
-                            [$tokens[($comma + 2)]['content'], $spaceLength]
+                            [$tokens[$comma + 2]['content'], $spaceLength]
                         );
 
                         if ($fix) {
-                            $phpcsFile->fixer->replaceToken(($comma + 1), ' ');
+                            $phpcsFile->fixer->replaceToken($comma + 1, ' ');
                         }
                     }
                 }
 
-                if (T_WHITESPACE === $tokens[($comma - 1)]['code']) {
+                if (T_WHITESPACE === $tokens[$comma - 1]['code']) {
                     $fix = $phpcsFile->addFixableError(
                         'Expected 0 spaces between "%s" and comma; %s found',
                         $comma,
                         'SpaceBeforeComma',
-                        [$tokens[($comma - 2)]['content'], $tokens[($comma - 1)]['length']]
+                        [$tokens[$comma - 2]['content'], $tokens[$comma - 1]['length']]
                     );
 
                     if ($fix) {
-                        $phpcsFile->fixer->replaceToken(($comma - 1), '');
+                        $phpcsFile->fixer->replaceToken($comma - 1, '');
                     }
                 }
             }
@@ -285,7 +287,7 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
         }
 
         // Check the closing bracket is on a new line.
-        $lastContent = $phpcsFile->findPrevious(T_WHITESPACE, ($end - 1), $start, true);
+        $lastContent = $phpcsFile->findPrevious(T_WHITESPACE, $end - 1, $start, true);
         if ($tokens[$lastContent]['line'] === $tokens[$end]['line']) {
             $fix = $phpcsFile->addFixableError(
                 'Closing parenthesis of array declaration must be on a new line',
@@ -299,7 +301,7 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
         } elseif ($tokens[$end]['column'] !== $currentIndent + 1) {
             // Check the closing bracket is lined up under the "a" in array.
             $expected = $currentIndent;
-            $found = ($tokens[$end]['column'] - 1);
+            $found = $tokens[$end]['column'] - 1;
 
             $fix = $phpcsFile->addFixableError(
                 'Closing parenthesis not aligned correctly; expected %s space(s) but found %s',
@@ -309,17 +311,17 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
             );
             if ($fix) {
                 if (0 === $found) {
-                    $phpcsFile->fixer->addContent(($end - 1), str_repeat(' ', $expected));
+                    $phpcsFile->fixer->addContent($end - 1, str_repeat(' ', $expected));
                 } else {
-                    $phpcsFile->fixer->replaceToken(($end - 1), str_repeat(' ', $expected));
+                    $phpcsFile->fixer->replaceToken($end - 1, str_repeat(' ', $expected));
                 }
             }
         }
 
-        $keyUsed    = false;
+        $keyUsed = false;
         $singleUsed = false;
-        $indices    = [];
-        $maxLength  = 0;
+        $indices = [];
+        $maxLength = 0;
 
         if (T_ARRAY === $tokens[$stackPtr]['code']) {
             $lastToken = $tokens[$stackPtr]['parenthesis_opener'];
@@ -328,7 +330,7 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
         }
 
         // Find all the double arrows that reside in this scope.
-        for ($nextToken = ($stackPtr + 1); $nextToken < $end; $nextToken++) {
+        for ($nextToken = $stackPtr + 1; $nextToken < $end; $nextToken++) {
             // Skip array or function calls
             switch ($tokens[$nextToken]['code']) {
                 case T_ARRAY:
@@ -382,7 +384,7 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
 
                 $valueContent = $phpcsFile->findNext(
                     Tokens::$emptyTokens,
-                    ($lastToken + 1),
+                    $lastToken + 1,
                     $nextToken,
                     true
                 );
@@ -402,22 +404,22 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
                 }
 
                 if (T_COMMA === $tokens[$nextToken]['code']
-                    && T_WHITESPACE === $tokens[($nextToken - 1)]['code']
+                    && T_WHITESPACE === $tokens[$nextToken - 1]['code']
                 ) {
-                    if ($tokens[($nextToken - 1)]['content'] === $phpcsFile->eolChar) {
+                    if ($tokens[$nextToken - 1]['content'] === $phpcsFile->eolChar) {
                         $spaceLength = 'newline';
                     } else {
-                        $spaceLength = $tokens[($nextToken - 1)]['length'];
+                        $spaceLength = $tokens[$nextToken - 1]['length'];
                     }
 
                     $fix = $phpcsFile->addFixableError(
                         'Expected 0 spaces between "%s" and comma; %s found',
                         $nextToken,
                         'SpaceBeforeComma',
-                        [$tokens[($nextToken - 2)]['content'], $spaceLength]
+                        [$tokens[$nextToken - 2]['content'], $spaceLength]
                     );
                     if ($fix) {
-                        $phpcsFile->fixer->replaceToken(($nextToken - 1), '');
+                        $phpcsFile->fixer->replaceToken($nextToken - 1, '');
                     }
                 }
 
@@ -439,17 +441,17 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
                 $currentEntry['arrow'] = $nextToken;
 
                 // Find the start of index that uses this double arrow.
-                $indexEnd = $phpcsFile->findPrevious(T_WHITESPACE, ($nextToken - 1), $start, true);
+                $indexEnd = $phpcsFile->findPrevious(T_WHITESPACE, $nextToken - 1, $start, true);
                 $indexStart = $phpcsFile->findStartOfStatement($indexEnd);
 
                 if ($indexStart === $indexEnd) {
-                    $currentEntry['index']         = $indexEnd;
+                    $currentEntry['index'] = $indexEnd;
                     $currentEntry['index_content'] = $tokens[$indexEnd]['content'];
                 } else {
-                    $currentEntry['index']         = $indexStart;
+                    $currentEntry['index'] = $indexStart;
                     $currentEntry['index_content'] = $phpcsFile->getTokensAsString(
                         $indexStart,
-                        ($indexEnd - $indexStart + 1)
+                        $indexEnd - $indexStart + 1
                     );
                 }
 
@@ -461,7 +463,7 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
                 // Find the value of this index.
                 $nextContent = $phpcsFile->findNext(
                     Tokens::$emptyTokens,
-                    ($nextToken + 1),
+                    $nextToken + 1,
                     $end,
                     true
                 );
@@ -474,11 +476,11 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
 
         $count = count($indices);
         if ($count > 0) {
-            $lastIndex = $indices[($count - 1)]['value'];
+            $lastIndex = $indices[$count - 1]['value'];
 
             $trailingContent = $phpcsFile->findPrevious(
                 Tokens::$emptyTokens,
-                ($end - 1),
+                $end - 1,
                 $lastIndex,
                 true
             );
@@ -520,17 +522,17 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
                         'ValueNoNewline'
                     );
                     if ($fix) {
-                        if (T_WHITESPACE === $tokens[($value['value'] - 1)]['code']) {
-                            $phpcsFile->fixer->replaceToken(($value['value'] - 1), '');
+                        if (T_WHITESPACE === $tokens[$value['value'] - 1]['code']) {
+                            $phpcsFile->fixer->replaceToken($value['value'] - 1, '');
                         }
 
                         $phpcsFile->fixer->addNewlineBefore($value['value']);
                     }
-                } elseif (T_WHITESPACE === $tokens[($value['value'] - 1)]['code']) {
+                } elseif (T_WHITESPACE === $tokens[$value['value'] - 1]['code']) {
                     $expected = $currentIndent + $this->indent;
 
                     $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $value['value'], true);
-                    $found = ($tokens[$first]['column'] - 1);
+                    $found = $tokens[$first]['column'] - 1;
                     if ($found !== $expected) {
                         $fix = $phpcsFile->addFixableError(
                             'Array value not aligned correctly; expected %s spaces but found %s',
@@ -541,9 +543,9 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
 
                         if ($fix) {
                             if (0 === $found) {
-                                $phpcsFile->fixer->addContent(($value['value'] - 1), str_repeat(' ', $expected));
+                                $phpcsFile->fixer->addContent($value['value'] - 1, str_repeat(' ', $expected));
                             } else {
-                                $phpcsFile->fixer->replaceToken(($value['value'] - 1), str_repeat(' ', $expected));
+                                $phpcsFile->fixer->replaceToken($value['value'] - 1, str_repeat(' ', $expected));
                             }
                         }
                     }
@@ -579,9 +581,9 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
         */
         $numValues = count($indices);
 
-        $indicesStart  = ($currentIndent + $this->indent + 1);
-        $arrowStart    = ($indicesStart + $maxLength + 1);
-        $valueStart    = ($arrowStart + 3);
+        $indicesStart = $currentIndent + $this->indent + 1;
+        $arrowStart = $indicesStart + $maxLength + 1;
+        $valueStart = $arrowStart + 3;
         $lastIndexLine = $tokens[$stackPtr]['line'];
         foreach ($indices as $index) {
             if (!isset($index['index'])) {
@@ -603,7 +605,7 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
 
             $lastIndex = $phpcsFile->findPrevious(T_COMMA, $index['index'] - 1, $lastIndexLine);
             $lastIndexLine = $lastIndex ? $tokens[$lastIndex]['line'] : false;
-            $indexLine     = $tokens[$index['index']]['line'];
+            $indexLine = $tokens[$index['index']]['line'];
 
             if ($indexLine === $tokens[$stackPtr]['line']) {
                 $fix = $phpcsFile->addFixableError(
@@ -627,8 +629,8 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
                 );
 
                 if ($fix) {
-                    if (T_WHITESPACE === $tokens[($index['index'] - 1)]['code']) {
-                        $phpcsFile->fixer->replaceToken(($index['index'] - 1), '');
+                    if (T_WHITESPACE === $tokens[$index['index'] - 1]['code']) {
+                        $phpcsFile->fixer->replaceToken($index['index'] - 1, '');
                     }
 
                     $phpcsFile->fixer->addNewlineBefore($index['index']);
@@ -650,9 +652,9 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
 
                 if ($fix) {
                     if (0 === $found) {
-                        $phpcsFile->fixer->addContent(($index['index'] - 1), str_repeat(' ', $expected));
+                        $phpcsFile->fixer->addContent($index['index'] - 1, str_repeat(' ', $expected));
                     } else {
-                        $phpcsFile->fixer->replaceToken(($index['index'] - 1), str_repeat(' ', $expected));
+                        $phpcsFile->fixer->replaceToken($index['index'] - 1, str_repeat(' ', $expected));
                     }
                 }
 
@@ -678,18 +680,18 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
 
                 if ($fix) {
                     if ('newline' === $found) {
-                        $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($index['value'] - 1), null, true);
+                        $prev = $phpcsFile->findPrevious(T_WHITESPACE, $index['value'] - 1, null, true);
                         $phpcsFile->fixer->beginChangeset();
-                        for ($i = ($prev + 1); $i < $index['value']; $i++) {
+                        for ($i = $prev + 1; $i < $index['value']; $i++) {
                             $phpcsFile->fixer->replaceToken($i, '');
                         }
 
-                        $phpcsFile->fixer->replaceToken(($index['value'] - 1), str_repeat(' ', $expected));
+                        $phpcsFile->fixer->replaceToken($index['value'] - 1, str_repeat(' ', $expected));
                         $phpcsFile->fixer->endChangeset();
                     } elseif (0 === $found) {
-                        $phpcsFile->fixer->addContent(($index['arrow'] - 1), str_repeat(' ', $expected));
+                        $phpcsFile->fixer->addContent($index['arrow'] - 1, str_repeat(' ', $expected));
                     } else {
-                        $phpcsFile->fixer->replaceToken(($index['arrow'] - 1), str_repeat(' ', $expected));
+                        $phpcsFile->fixer->replaceToken($index['arrow'] - 1, str_repeat(' ', $expected));
                     }
                 }
 
@@ -697,8 +699,8 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
             }
 
             if ($tokens[$index['value']]['column'] !== $valueStart) {
-                $expected = ($valueStart - ($tokens[$index['arrow']]['length'] + $tokens[$index['arrow']]['column']));
-                $found    = $tokens[$index['value']]['column']
+                $expected = $valueStart - ($tokens[$index['arrow']]['length'] + $tokens[$index['arrow']]['column']);
+                $found = $tokens[$index['value']]['column']
                     - ($tokens[$index['arrow']]['length'] + $tokens[$index['arrow']]['column']);
 
                 if ($found < 0) {
@@ -714,18 +716,18 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
 
                 if ($fix) {
                     if ('newline' === $found) {
-                        $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($index['value'] - 1), null, true);
+                        $prev = $phpcsFile->findPrevious(T_WHITESPACE, $index['value'] - 1, null, true);
                         $phpcsFile->fixer->beginChangeset();
-                        for ($i = ($prev + 1); $i < $index['value']; $i++) {
+                        for ($i = $prev + 1; $i < $index['value']; $i++) {
                             $phpcsFile->fixer->replaceToken($i, '');
                         }
 
-                        $phpcsFile->fixer->replaceToken(($index['value'] - 1), str_repeat(' ', $expected));
+                        $phpcsFile->fixer->replaceToken($index['value'] - 1, str_repeat(' ', $expected));
                         $phpcsFile->fixer->endChangeset();
                     } elseif (0 === $found) {
-                        $phpcsFile->fixer->addContent(($index['value'] - 1), str_repeat(' ', $expected));
+                        $phpcsFile->fixer->addContent($index['value'] - 1, str_repeat(' ', $expected));
                     } else {
-                        $phpcsFile->fixer->replaceToken(($index['value'] - 1), str_repeat(' ', $expected));
+                        $phpcsFile->fixer->replaceToken($index['value'] - 1, str_repeat(' ', $expected));
                     }
                 }
             }
diff --git a/SymfonyCustom/Sniffs/Classes/ClassDeclarationSniff.php b/SymfonyCustom/Sniffs/Classes/ClassDeclarationSniff.php
index 09eda36..6c30077 100644
--- a/SymfonyCustom/Sniffs/Classes/ClassDeclarationSniff.php
+++ b/SymfonyCustom/Sniffs/Classes/ClassDeclarationSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\Classes;
 
 use PHP_CodeSniffer\Files\File;
diff --git a/SymfonyCustom/Sniffs/Classes/PropertyDeclarationSniff.php b/SymfonyCustom/Sniffs/Classes/PropertyDeclarationSniff.php
index abf4904..edf2f5c 100644
--- a/SymfonyCustom/Sniffs/Classes/PropertyDeclarationSniff.php
+++ b/SymfonyCustom/Sniffs/Classes/PropertyDeclarationSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\Classes;
 
 use PHP_CodeSniffer\Files\File;
diff --git a/SymfonyCustom/Sniffs/Commenting/ClassCommentSniff.php b/SymfonyCustom/Sniffs/Commenting/ClassCommentSniff.php
index 2b51488..380f19b 100644
--- a/SymfonyCustom/Sniffs/Commenting/ClassCommentSniff.php
+++ b/SymfonyCustom/Sniffs/Commenting/ClassCommentSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\Commenting;
 
 use PHP_CodeSniffer\Standards\PEAR\Sniffs\Commenting\ClassCommentSniff as PEARClassCommentSniff;
diff --git a/SymfonyCustom/Sniffs/Commenting/DocCommentForbiddenTagsSniff.php b/SymfonyCustom/Sniffs/Commenting/DocCommentForbiddenTagsSniff.php
index 188d886..c3bd4f0 100644
--- a/SymfonyCustom/Sniffs/Commenting/DocCommentForbiddenTagsSniff.php
+++ b/SymfonyCustom/Sniffs/Commenting/DocCommentForbiddenTagsSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\Commenting;
 
 use PHP_CodeSniffer\Files\File;
diff --git a/SymfonyCustom/Sniffs/Commenting/DocCommentGroupSameTypeSniff.php b/SymfonyCustom/Sniffs/Commenting/DocCommentGroupSameTypeSniff.php
index 3d3bbc8..bf02197 100644
--- a/SymfonyCustom/Sniffs/Commenting/DocCommentGroupSameTypeSniff.php
+++ b/SymfonyCustom/Sniffs/Commenting/DocCommentGroupSameTypeSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\Commenting;
 
 use PHP_CodeSniffer\Files\File;
diff --git a/SymfonyCustom/Sniffs/Commenting/DocCommentSniff.php b/SymfonyCustom/Sniffs/Commenting/DocCommentSniff.php
index 406ec68..ca7c114 100644
--- a/SymfonyCustom/Sniffs/Commenting/DocCommentSniff.php
+++ b/SymfonyCustom/Sniffs/Commenting/DocCommentSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\Commenting;
 
 use PHP_CodeSniffer\Files\File;
@@ -28,7 +30,7 @@ public function process(File $phpcsFile, $stackPtr): void
 
         if (!isset($tokens[$stackPtr]['comment_closer'])
             || ('' === $tokens[$tokens[$stackPtr]['comment_closer']]['content']
-            && ($phpcsFile->numTokens - 1) === $tokens[$stackPtr]['comment_closer'])
+                && $phpcsFile->numTokens - 1 === $tokens[$stackPtr]['comment_closer'])
         ) {
             // Don't process an unfinished comment during live coding.
             return;
@@ -41,7 +43,7 @@ public function process(File $phpcsFile, $stackPtr): void
             T_DOC_COMMENT_STAR,
         ];
 
-        $short = $phpcsFile->findNext($empty, ($stackPtr + 1), $commentEnd, true);
+        $short = $phpcsFile->findNext($empty, $stackPtr + 1, $commentEnd, true);
         if (false === $short) {
             // No content at all.
             $next = $phpcsFile->findNext(T_WHITESPACE, $commentEnd + 1, null, true);
@@ -87,7 +89,7 @@ public function process(File $phpcsFile, $stackPtr): void
 
             if ($fix) {
                 $phpcsFile->fixer->beginChangeset();
-                for ($i = ($stackPtr + 1); $i < $short; $i++) {
+                for ($i = $stackPtr + 1; $i < $short; $i++) {
                     $phpcsFile->fixer->replaceToken($i, '');
                 }
                 $phpcsFile->fixer->addNewline($stackPtr);
@@ -104,7 +106,7 @@ public function process(File $phpcsFile, $stackPtr): void
         }
 
         // Check for additional blank lines at the beginning of the comment.
-        if ($tokens[$stackPtr]['line'] < ($tokens[$short]['line'] - 1)) {
+        if ($tokens[$stackPtr]['line'] < $tokens[$short]['line'] - 1) {
             $fix = $phpcsFile->addFixableError(
                 'Additional blank lines found at beginning of doc comment',
                 $stackPtr,
@@ -113,8 +115,8 @@ public function process(File $phpcsFile, $stackPtr): void
 
             if ($fix) {
                 $phpcsFile->fixer->beginChangeset();
-                for ($i = ($stackPtr + 1); $i < $short; $i++) {
-                    if ($tokens[($i + 1)]['line'] === $tokens[$short]['line']) {
+                for ($i = $stackPtr + 1; $i < $short; $i++) {
+                    if ($tokens[$i + 1]['line'] === $tokens[$short]['line']) {
                         break;
                     }
 
@@ -126,7 +128,7 @@ public function process(File $phpcsFile, $stackPtr): void
         }
 
         // The last line of the comment should just be the */ code.
-        $prev = $phpcsFile->findPrevious($empty, ($commentEnd - 1), $stackPtr, true);
+        $prev = $phpcsFile->findPrevious($empty, $commentEnd - 1, $stackPtr, true);
         if (!$isSingleLine && $tokens[$prev]['line'] === $tokens[$commentEnd]['line']) {
             $fix = $phpcsFile->addFixableError(
                 'The close comment tag must be the only content on the line',
@@ -136,7 +138,7 @@ public function process(File $phpcsFile, $stackPtr): void
 
             if ($fix) {
                 $phpcsFile->fixer->beginChangeset();
-                for ($i = ($prev + 1); $i < $commentEnd; $i++) {
+                for ($i = $prev + 1; $i < $commentEnd; $i++) {
                     $phpcsFile->fixer->replaceToken($i, '');
                 }
                 $phpcsFile->fixer->replaceToken(
@@ -153,7 +155,7 @@ public function process(File $phpcsFile, $stackPtr): void
         }
 
         // Check for additional blank lines at the end of the comment.
-        if ($tokens[$prev]['line'] < ($tokens[$commentEnd]['line'] - 1)) {
+        if ($tokens[$prev]['line'] < $tokens[$commentEnd]['line'] - 1) {
             $fix = $phpcsFile->addFixableError(
                 'Additional blank lines found at end of doc comment',
                 $commentEnd,
@@ -162,8 +164,8 @@ public function process(File $phpcsFile, $stackPtr): void
 
             if ($fix) {
                 $phpcsFile->fixer->beginChangeset();
-                for ($i = ($prev + 1); $i < $commentEnd; $i++) {
-                    if ($tokens[($i + 1)]['line'] === $tokens[$commentEnd]['line']) {
+                for ($i = $prev + 1; $i < $commentEnd; $i++) {
+                    if ($tokens[$i + 1]['line'] === $tokens[$commentEnd]['line']) {
                         break;
                     }
 
diff --git a/SymfonyCustom/Sniffs/Commenting/FunctionCommentSniff.php b/SymfonyCustom/Sniffs/Commenting/FunctionCommentSniff.php
index fefbad4..a0b2232 100644
--- a/SymfonyCustom/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/SymfonyCustom/Sniffs/Commenting/FunctionCommentSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\Commenting;
 
 use PHP_CodeSniffer\Files\File;
@@ -18,15 +20,15 @@ class FunctionCommentSniff extends PEARFunctionCommentSniff
     public function process(File $phpcsFile, $stackPtr): void
     {
         $tokens = $phpcsFile->getTokens();
-        $find   = Tokens::$methodPrefixes;
+        $find = Tokens::$methodPrefixes;
         $find[] = T_WHITESPACE;
 
-        $commentEnd = $phpcsFile->findPrevious($find, ($stackPtr - 1), null, true);
+        $commentEnd = $phpcsFile->findPrevious($find, $stackPtr - 1, null, true);
         if (T_COMMENT === $tokens[$commentEnd]['code']) {
             // Inline comments might just be closing comments for control structures or functions
             // instead of function comments using the wrong comment type.
             // If there is other code on the line, assume they relate to that code.
-            $prev = $phpcsFile->findPrevious($find, ($commentEnd - 1), null, true);
+            $prev = $phpcsFile->findPrevious($find, $commentEnd - 1, null, true);
             if (false !== $prev && $tokens[$prev]['line'] === $tokens[$commentEnd]['line']) {
                 $commentEnd = $prev;
             }
@@ -46,7 +48,7 @@ public function process(File $phpcsFile, $stackPtr): void
                 return;
             }
 
-            if (($tokens[$stackPtr]['line'] - 1) !== $tokens[$commentEnd]['line']) {
+            if ($tokens[$stackPtr]['line'] - 1 !== $tokens[$commentEnd]['line']) {
                 $phpcsFile->addError(
                     'There must be no blank lines after the function comment',
                     $commentEnd,
@@ -183,9 +185,9 @@ protected function processThrows(File $phpcsFile, $stackPtr, $commentStart): voi
 
         if (null !== $throw) {
             $exception = null;
-            if (T_DOC_COMMENT_STRING === $tokens[($throw + 2)]['code']) {
+            if (T_DOC_COMMENT_STRING === $tokens[$throw + 2]['code']) {
                 $matches = [];
-                preg_match('/([^\s]+)(?:\s+(.*))?/', $tokens[($throw + 2)]['content'], $matches);
+                preg_match('/([^\s]+)(?:\s+(.*))?/', $tokens[$throw + 2]['content'], $matches);
                 $exception = $matches[1];
             }
 
@@ -221,7 +223,7 @@ protected function processParams(File $phpcsFile, $stackPtr, $commentStart): voi
     private function processWhitespace(File $phpcsFile, int $commentStart, bool $hasComment = true): void
     {
         $tokens = $phpcsFile->getTokens();
-        $before = $phpcsFile->findPrevious(T_WHITESPACE, ($commentStart - 1), null, true);
+        $before = $phpcsFile->findPrevious(T_WHITESPACE, $commentStart - 1, null, true);
 
         $startLine = $tokens[$commentStart]['line'];
         $prevLine = $tokens[$before]['line'];
@@ -248,14 +250,14 @@ private function processWhitespace(File $phpcsFile, int $commentStart, bool $has
                 if ($found > 1) {
                     $phpcsFile->fixer->beginChangeset();
 
-                    for ($i = ($before + 1); $i < ($commentStart - 1); $i++) {
+                    for ($i = $before + 1; $i < $commentStart - 1; $i++) {
                         $phpcsFile->fixer->replaceToken($i, '');
                     }
 
                     $phpcsFile->fixer->endChangeset();
                 } else {
                     // Try and maintain indentation.
-                    if (T_WHITESPACE === $tokens[($commentStart - 1)]['code']) {
+                    if (T_WHITESPACE === $tokens[$commentStart - 1]['code']) {
                         $phpcsFile->fixer->addNewlineBefore($commentStart - 1);
                     } else {
                         $phpcsFile->fixer->addNewlineBefore($commentStart);
diff --git a/SymfonyCustom/Sniffs/Commenting/VariableCommentSniff.php b/SymfonyCustom/Sniffs/Commenting/VariableCommentSniff.php
index 3ae9f29..7dac343 100644
--- a/SymfonyCustom/Sniffs/Commenting/VariableCommentSniff.php
+++ b/SymfonyCustom/Sniffs/Commenting/VariableCommentSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\Commenting;
 
 use PHP_CodeSniffer\Files\File;
@@ -26,7 +28,7 @@ public function processMemberVar(File $phpcsFile, $stackPtr): void
             T_WHITESPACE,
         ];
 
-        $commentEnd = $phpcsFile->findPrevious($ignore, ($stackPtr - 1), null, true);
+        $commentEnd = $phpcsFile->findPrevious($ignore, $stackPtr - 1, null, true);
         if (false === $commentEnd
             || (T_DOC_COMMENT_CLOSE_TAG !== $tokens[$commentEnd]['code']
             && T_COMMENT !== $tokens[$commentEnd]['code'])
@@ -135,7 +137,7 @@ protected function processVariableInString(File $phpcsFile, $stackPtr): void
     private function processWhitespace(File $phpcsFile, int $commentStart): void
     {
         $tokens = $phpcsFile->getTokens();
-        $before = $phpcsFile->findPrevious(T_WHITESPACE, ($commentStart - 1), null, true);
+        $before = $phpcsFile->findPrevious(T_WHITESPACE, $commentStart - 1, null, true);
 
         $startLine = $tokens[$commentStart]['line'];
         $prevLine = $tokens[$before]['line'];
@@ -159,14 +161,14 @@ private function processWhitespace(File $phpcsFile, int $commentStart): void
                 if ($found > 1) {
                     $phpcsFile->fixer->beginChangeset();
 
-                    for ($i = ($before + 1); $i < ($commentStart - 1); $i++) {
+                    for ($i = $before + 1; $i < $commentStart - 1; $i++) {
                         $phpcsFile->fixer->replaceToken($i, '');
                     }
 
                     $phpcsFile->fixer->endChangeset();
                 } else {
                     // Try and maintain indentation.
-                    if (T_WHITESPACE === $tokens[($commentStart - 1)]['code']) {
+                    if (T_WHITESPACE === $tokens[$commentStart - 1]['code']) {
                         $phpcsFile->fixer->addNewlineBefore($commentStart - 1);
                     } else {
                         $phpcsFile->fixer->addNewlineBefore($commentStart);
diff --git a/SymfonyCustom/Sniffs/Errors/ExceptionMessageSniff.php b/SymfonyCustom/Sniffs/Errors/ExceptionMessageSniff.php
index 0fc5b5c..63d83c8 100644
--- a/SymfonyCustom/Sniffs/Errors/ExceptionMessageSniff.php
+++ b/SymfonyCustom/Sniffs/Errors/ExceptionMessageSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\Errors;
 
 use PHP_CodeSniffer\Files\File;
diff --git a/SymfonyCustom/Sniffs/Errors/UserDeprecatedSniff.php b/SymfonyCustom/Sniffs/Errors/UserDeprecatedSniff.php
index e485a50..fa0c62e 100644
--- a/SymfonyCustom/Sniffs/Errors/UserDeprecatedSniff.php
+++ b/SymfonyCustom/Sniffs/Errors/UserDeprecatedSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\Errors;
 
 use PHP_CodeSniffer\Files\File;
diff --git a/SymfonyCustom/Sniffs/Formatting/BlankLineBeforeReturnSniff.php b/SymfonyCustom/Sniffs/Formatting/BlankLineBeforeReturnSniff.php
index 7f5d5fa..78c81ed 100644
--- a/SymfonyCustom/Sniffs/Formatting/BlankLineBeforeReturnSniff.php
+++ b/SymfonyCustom/Sniffs/Formatting/BlankLineBeforeReturnSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\Formatting;
 
 use PHP_CodeSniffer\Files\File;
diff --git a/SymfonyCustom/Sniffs/Formatting/ConditionalReturnOrThrowSniff.php b/SymfonyCustom/Sniffs/Formatting/ConditionalReturnOrThrowSniff.php
index e3278d9..52e13ef 100644
--- a/SymfonyCustom/Sniffs/Formatting/ConditionalReturnOrThrowSniff.php
+++ b/SymfonyCustom/Sniffs/Formatting/ConditionalReturnOrThrowSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\Formatting;
 
 use PHP_CodeSniffer\Files\File;
diff --git a/SymfonyCustom/Sniffs/Formatting/StrictComparisonSniff.php b/SymfonyCustom/Sniffs/Formatting/StrictComparisonSniff.php
index aed93ed..939ff85 100644
--- a/SymfonyCustom/Sniffs/Formatting/StrictComparisonSniff.php
+++ b/SymfonyCustom/Sniffs/Formatting/StrictComparisonSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\Formatting;
 
 use PHP_CodeSniffer\Files\File;
diff --git a/SymfonyCustom/Sniffs/Formatting/YodaConditionSniff.php b/SymfonyCustom/Sniffs/Formatting/YodaConditionSniff.php
index 33c1655..5300c37 100644
--- a/SymfonyCustom/Sniffs/Formatting/YodaConditionSniff.php
+++ b/SymfonyCustom/Sniffs/Formatting/YodaConditionSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\Formatting;
 
 use PHP_CodeSniffer\Files\File;
@@ -27,7 +29,7 @@ public function process(File $phpcsFile, $stackPtr): void
     {
         $tokens = $phpcsFile->getTokens();
 
-        $beginners   = Tokens::$booleanOperators;
+        $beginners = Tokens::$booleanOperators;
         $beginners[] = T_IF;
         $beginners[] = T_ELSEIF;
         $beginners[] = T_EQUAL;
@@ -65,12 +67,12 @@ public function process(File $phpcsFile, $stackPtr): void
         }
 
         // Check if this is a var to var comparison, e.g.: if ( $var1 == $var2 ).
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true);
 
         if (isset(Tokens::$castTokens[$tokens[$nextNonEmpty]['code']])) {
             $nextNonEmpty = $phpcsFile->findNext(
                 Tokens::$emptyTokens,
-                ($nextNonEmpty + 1),
+                $nextNonEmpty + 1,
                 null,
                 true
             );
@@ -79,7 +81,7 @@ public function process(File $phpcsFile, $stackPtr): void
         if (in_array($tokens[$nextNonEmpty]['code'], [T_SELF, T_PARENT, T_STATIC], true)) {
             $nextNonEmpty = $phpcsFile->findNext(
                 array_merge(Tokens::$emptyTokens, [T_DOUBLE_COLON]),
-                ($nextNonEmpty + 1),
+                $nextNonEmpty + 1,
                 null,
                 true
             );
diff --git a/SymfonyCustom/Sniffs/Functions/ScopeOrderSniff.php b/SymfonyCustom/Sniffs/Functions/ScopeOrderSniff.php
index 2a9d79a..cc1c630 100644
--- a/SymfonyCustom/Sniffs/Functions/ScopeOrderSniff.php
+++ b/SymfonyCustom/Sniffs/Functions/ScopeOrderSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\Functions;
 
 use PHP_CodeSniffer\Files\File;
diff --git a/SymfonyCustom/Sniffs/Namespaces/AlphabeticallySortedUseSniff.php b/SymfonyCustom/Sniffs/Namespaces/AlphabeticallySortedUseSniff.php
index 2d291b3..3348424 100644
--- a/SymfonyCustom/Sniffs/Namespaces/AlphabeticallySortedUseSniff.php
+++ b/SymfonyCustom/Sniffs/Namespaces/AlphabeticallySortedUseSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\Namespaces;
 
 use PHP_CodeSniffer\Files\File;
diff --git a/SymfonyCustom/Sniffs/Namespaces/NamespaceDeclarationSniff.php b/SymfonyCustom/Sniffs/Namespaces/NamespaceDeclarationSniff.php
index f93fb9d..03c9a6a 100644
--- a/SymfonyCustom/Sniffs/Namespaces/NamespaceDeclarationSniff.php
+++ b/SymfonyCustom/Sniffs/Namespaces/NamespaceDeclarationSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\Namespaces;
 
 use PHP_CodeSniffer\Files\File;
diff --git a/SymfonyCustom/Sniffs/Namespaces/UnusedUseSniff.php b/SymfonyCustom/Sniffs/Namespaces/UnusedUseSniff.php
index 6ac312f..86b45b6 100644
--- a/SymfonyCustom/Sniffs/Namespaces/UnusedUseSniff.php
+++ b/SymfonyCustom/Sniffs/Namespaces/UnusedUseSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\Namespaces;
 
 use PHP_CodeSniffer\Files\File;
diff --git a/SymfonyCustom/Sniffs/Namespaces/UseWithoutStartingBackslashSniff.php b/SymfonyCustom/Sniffs/Namespaces/UseWithoutStartingBackslashSniff.php
deleted file mode 100644
index 839ac90..0000000
--- a/SymfonyCustom/Sniffs/Namespaces/UseWithoutStartingBackslashSniff.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-namespace SymfonyCustom\Sniffs\Namespaces;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Util\Tokens;
-use SymfonyCustom\Sniffs\SniffHelper;
-
-/**
- * Class UseWithoutStartingBackslashSniff
- */
-class UseWithoutStartingBackslashSniff implements Sniff
-{
-    /**
-     * @return int[]
-     */
-    public function register(): array
-    {
-        return [T_USE];
-    }
-
-    /**
-     * @param File $phpcsFile
-     * @param int  $stackPtr
-     */
-    public function process(File $phpcsFile, $stackPtr): void
-    {
-        if (!SniffHelper::isGlobalUse($phpcsFile, $stackPtr)) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-        $classPtr = $phpcsFile->findNext(
-            Tokens::$emptyTokens,
-            $stackPtr + 1,
-            null,
-            true
-        );
-
-        $lowerContent = strtolower($tokens[$classPtr]['content']);
-        if ('function' === $lowerContent || 'const' === $lowerContent) {
-            $classPtr = $phpcsFile->findNext(
-                Tokens::$emptyTokens,
-                $classPtr + 1,
-                null,
-                true
-            );
-        }
-
-        if (T_NS_SEPARATOR === $tokens[$classPtr]['code']
-            || (T_STRING === $tokens[$classPtr]['code']
-                && '\\' === $tokens[$classPtr]['content'])
-        ) {
-            $fix = $phpcsFile->addFixableError(
-                'Use statement cannot start with a backslash',
-                $classPtr,
-                'BackslashAtStart'
-            );
-
-            if ($fix) {
-                if (T_WHITESPACE !== $tokens[$classPtr - 1]['code']) {
-                    $phpcsFile->fixer->replaceToken($classPtr, ' ');
-                } else {
-                    $phpcsFile->fixer->replaceToken($classPtr, '');
-                }
-            }
-        }
-    }
-}
diff --git a/SymfonyCustom/Sniffs/NamingConventions/ValidClassNameSniff.php b/SymfonyCustom/Sniffs/NamingConventions/ValidClassNameSniff.php
index 33bc67b..02386d8 100644
--- a/SymfonyCustom/Sniffs/NamingConventions/ValidClassNameSniff.php
+++ b/SymfonyCustom/Sniffs/NamingConventions/ValidClassNameSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\NamingConventions;
 
 use PHP_CodeSniffer\Files\File;
diff --git a/SymfonyCustom/Sniffs/NamingConventions/ValidFileNameSniff.php b/SymfonyCustom/Sniffs/NamingConventions/ValidFileNameSniff.php
index 807a5b5..557f11e 100644
--- a/SymfonyCustom/Sniffs/NamingConventions/ValidFileNameSniff.php
+++ b/SymfonyCustom/Sniffs/NamingConventions/ValidFileNameSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\NamingConventions;
 
 use PHP_CodeSniffer\Files\File;
diff --git a/SymfonyCustom/Sniffs/NamingConventions/ValidScalarTypeNameSniff.php b/SymfonyCustom/Sniffs/NamingConventions/ValidScalarTypeNameSniff.php
index 6c54b22..a0cf850 100644
--- a/SymfonyCustom/Sniffs/NamingConventions/ValidScalarTypeNameSniff.php
+++ b/SymfonyCustom/Sniffs/NamingConventions/ValidScalarTypeNameSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\NamingConventions;
 
 use PHP_CodeSniffer\Files\File;
diff --git a/SymfonyCustom/Sniffs/Objects/ObjectInstantiationSniff.php b/SymfonyCustom/Sniffs/Objects/ObjectInstantiationSniff.php
deleted file mode 100644
index da9577a..0000000
--- a/SymfonyCustom/Sniffs/Objects/ObjectInstantiationSniff.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace SymfonyCustom\Sniffs\Objects;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
-
-/**
- * Throws an error if an object isn't instantiated using parenthesis.
- */
-class ObjectInstantiationSniff implements Sniff
-{
-    /**
-     * @return int[]
-     */
-    public function register(): array
-    {
-        return [T_NEW];
-    }
-
-    /**
-     * @param File $phpcsFile
-     * @param int  $stackPtr
-     */
-    public function process(File $phpcsFile, $stackPtr): void
-    {
-        $tokens = $phpcsFile->getTokens();
-        $allowed = [
-            T_STRING,
-            T_NS_SEPARATOR,
-            T_VARIABLE,
-            T_STATIC,
-            T_SELF,
-            T_OPEN_SQUARE_BRACKET,
-            T_CLOSE_SQUARE_BRACKET,
-        ];
-
-        $object = $stackPtr;
-        $line = $tokens[$object]['line'];
-
-        while ($object && $tokens[$object]['line'] === $line) {
-            $object = $phpcsFile->findNext($allowed, $object + 1);
-
-            if ($tokens[$object]['line'] === $line && !in_array($tokens[$object + 1]['code'], $allowed)) {
-                if (T_OPEN_PARENTHESIS !== $tokens[$object + 1]['code']) {
-                    $phpcsFile->addError('Use parentheses when instantiating classes', $stackPtr, 'Invalid');
-                }
-
-                break;
-            }
-        }
-    }
-}
diff --git a/SymfonyCustom/Sniffs/PHP/DiscourageEmptySniff.php b/SymfonyCustom/Sniffs/PHP/DiscourageEmptySniff.php
index 5150026..b9ec6bc 100644
--- a/SymfonyCustom/Sniffs/PHP/DiscourageEmptySniff.php
+++ b/SymfonyCustom/Sniffs/PHP/DiscourageEmptySniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\PHP;
 
 use PHP_CodeSniffer\Standards\Generic\Sniffs\PHP\ForbiddenFunctionsSniff;
diff --git a/SymfonyCustom/Sniffs/SniffHelper.php b/SymfonyCustom/Sniffs/SniffHelper.php
index 1335c1e..22d78f2 100644
--- a/SymfonyCustom/Sniffs/SniffHelper.php
+++ b/SymfonyCustom/Sniffs/SniffHelper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs;
 
 use PHP_CodeSniffer\Files\File;
@@ -70,7 +72,7 @@ public static function isNamespace(File $phpcsFile, int $stackPtr): bool
             return false;
         }
 
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true);
 
         return !$nextNonEmpty || T_NS_SEPARATOR !== $tokens[$nextNonEmpty]['code'];
     }
diff --git a/SymfonyCustom/Sniffs/WhiteSpace/CloseBracketSpacingSniff.php b/SymfonyCustom/Sniffs/WhiteSpace/CloseBracketSpacingSniff.php
index 41d4a36..a59582f 100644
--- a/SymfonyCustom/Sniffs/WhiteSpace/CloseBracketSpacingSniff.php
+++ b/SymfonyCustom/Sniffs/WhiteSpace/CloseBracketSpacingSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\WhiteSpace;
 
 use PHP_CodeSniffer\Files\File;
@@ -28,13 +30,13 @@ public function process(File $phpcsFile, $stackPtr): void
     {
         $tokens = $phpcsFile->getTokens();
 
-        if (isset($tokens[($stackPtr - 1)]) && T_WHITESPACE === $tokens[($stackPtr - 1)]['code']) {
-            $before = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+        if (isset($tokens[$stackPtr - 1]) && T_WHITESPACE === $tokens[$stackPtr - 1]['code']) {
+            $before = $phpcsFile->findPrevious(Tokens::$emptyTokens, $stackPtr - 1, null, true);
             if (false !== $before && $tokens[$stackPtr]['line'] === $tokens[$before]['line']) {
                 $error = 'There should be no space before a closing "%s"';
                 $fix = $phpcsFile->addFixableError(
                     $error,
-                    ($stackPtr - 1),
+                    $stackPtr - 1,
                     'ClosingWhitespace',
                     [$tokens[$stackPtr]['content']]
                 );
diff --git a/SymfonyCustom/Sniffs/WhiteSpace/DocCommentTagSpacingSniff.php b/SymfonyCustom/Sniffs/WhiteSpace/DocCommentTagSpacingSniff.php
index b0c156c..4c1e9d3 100644
--- a/SymfonyCustom/Sniffs/WhiteSpace/DocCommentTagSpacingSniff.php
+++ b/SymfonyCustom/Sniffs/WhiteSpace/DocCommentTagSpacingSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\WhiteSpace;
 
 use PHP_CodeSniffer\Files\File;
@@ -27,14 +29,14 @@ public function process(File $phpcsFile, $stackPtr): void
     {
         $tokens = $phpcsFile->getTokens();
 
-        if (isset($tokens[($stackPtr - 1)])
-            && $tokens[$stackPtr]['line'] === $tokens[($stackPtr - 1)]['line']
+        if (isset($tokens[$stackPtr - 1])
+            && $tokens[$stackPtr]['line'] === $tokens[$stackPtr - 1]['line']
         ) {
-            if (T_DOC_COMMENT_WHITESPACE !== $tokens[($stackPtr - 1)]['code']) {
+            if (T_DOC_COMMENT_WHITESPACE !== $tokens[$stackPtr - 1]['code']) {
                 $error = 'There should be a space before a doc comment tag "%s"';
                 $fix = $phpcsFile->addFixableError(
                     $error,
-                    ($stackPtr - 1),
+                    $stackPtr - 1,
                     'DocCommentTagSpacing',
                     [$tokens[$stackPtr]['content']]
                 );
@@ -42,7 +44,7 @@ public function process(File $phpcsFile, $stackPtr): void
                 if ($fix) {
                     $phpcsFile->fixer->addContentBefore($stackPtr, ' ');
                 }
-            } elseif (1 < $tokens[($stackPtr - 1)]['length']) {
+            } elseif (1 < $tokens[$stackPtr - 1]['length']) {
                 $isCustomTag = !in_array($tokens[$stackPtr]['content'], SniffHelper::TAGS);
 
                 // Custom tags are not checked cause there is annotation with array params
@@ -50,7 +52,7 @@ public function process(File $phpcsFile, $stackPtr): void
                     $error = 'There should be only one space before a doc comment tag "%s"';
                     $fix = $phpcsFile->addFixableError(
                         $error,
-                        ($stackPtr + 1),
+                        $stackPtr + 1,
                         'DocCommentTagSpacing',
                         [$tokens[$stackPtr]['content']]
                     );
@@ -62,15 +64,15 @@ public function process(File $phpcsFile, $stackPtr): void
             }
         }
 
-        if (isset($tokens[($stackPtr + 1)])
-            && $tokens[$stackPtr]['line'] === $tokens[($stackPtr + 1)]['line']
-            && T_DOC_COMMENT_WHITESPACE === $tokens[($stackPtr + 1)]['code']
-            && 1 < $tokens[($stackPtr + 1)]['length']
+        if (isset($tokens[$stackPtr + 1])
+            && $tokens[$stackPtr]['line'] === $tokens[$stackPtr + 1]['line']
+            && T_DOC_COMMENT_WHITESPACE === $tokens[$stackPtr + 1]['code']
+            && 1 < $tokens[$stackPtr + 1]['length']
         ) {
             $error = 'There should be only one space after a doc comment tag "%s"';
             $fix = $phpcsFile->addFixableError(
                 $error,
-                ($stackPtr + 1),
+                $stackPtr + 1,
                 'DocCommentTagSpacing',
                 [$tokens[$stackPtr]['content']]
             );
diff --git a/SymfonyCustom/Sniffs/WhiteSpace/EmptyLinesSniff.php b/SymfonyCustom/Sniffs/WhiteSpace/EmptyLinesSniff.php
index 892ef69..0654cc4 100644
--- a/SymfonyCustom/Sniffs/WhiteSpace/EmptyLinesSniff.php
+++ b/SymfonyCustom/Sniffs/WhiteSpace/EmptyLinesSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\WhiteSpace;
 
 use PHP_CodeSniffer\Files\File;
diff --git a/SymfonyCustom/Sniffs/WhiteSpace/OpenBracketSpacingSniff.php b/SymfonyCustom/Sniffs/WhiteSpace/OpenBracketSpacingSniff.php
index f33e194..638458b 100644
--- a/SymfonyCustom/Sniffs/WhiteSpace/OpenBracketSpacingSniff.php
+++ b/SymfonyCustom/Sniffs/WhiteSpace/OpenBracketSpacingSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\WhiteSpace;
 
 use PHP_CodeSniffer\Files\File;
@@ -27,14 +29,14 @@ public function process(File $phpcsFile, $stackPtr): void
     {
         $tokens = $phpcsFile->getTokens();
 
-        if (isset($tokens[($stackPtr + 1)])
-            && T_WHITESPACE === $tokens[($stackPtr + 1)]['code']
-            && false === strpos($tokens[($stackPtr + 1)]['content'], $phpcsFile->eolChar)
+        if (isset($tokens[$stackPtr + 1])
+            && T_WHITESPACE === $tokens[$stackPtr + 1]['code']
+            && false === strpos($tokens[$stackPtr + 1]['content'], $phpcsFile->eolChar)
         ) {
             $error = 'There should be no space after an opening "%s"';
             $fix = $phpcsFile->addFixableError(
                 $error,
-                ($stackPtr + 1),
+                $stackPtr + 1,
                 'OpeningWhitespace',
                 [$tokens[$stackPtr]['content']]
             );
diff --git a/SymfonyCustom/Sniffs/WhiteSpace/UnaryOperatorSpacingSniff.php b/SymfonyCustom/Sniffs/WhiteSpace/UnaryOperatorSpacingSniff.php
index 670d675..35384d5 100644
--- a/SymfonyCustom/Sniffs/WhiteSpace/UnaryOperatorSpacingSniff.php
+++ b/SymfonyCustom/Sniffs/WhiteSpace/UnaryOperatorSpacingSniff.php
@@ -1,12 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\WhiteSpace;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
- * Ensures there are no spaces on ++/-- or on +/- sign operators or "!" boolean negators.
+ * Ensures there are no spaces +/- sign operators or "!" boolean negators.
  */
 class UnaryOperatorSpacingSniff implements Sniff
 {
@@ -15,7 +17,7 @@ class UnaryOperatorSpacingSniff implements Sniff
      */
     public function register(): array
     {
-        return [T_DEC, T_INC, T_MINUS, T_PLUS, T_BOOLEAN_NOT];
+        return [T_MINUS, T_PLUS, T_BOOLEAN_NOT];
     }
 
     /**
@@ -26,40 +28,6 @@ public function process(File $phpcsFile, $stackPtr): void
     {
         $tokens = $phpcsFile->getTokens();
 
-        // Check decrement / increment.
-        if (T_DEC === $tokens[$stackPtr]['code'] || T_INC === $tokens[$stackPtr]['code']) {
-            $modifyLeft = substr($tokens[($stackPtr - 1)]['content'], 0, 1) === '$'
-                || ';' === $tokens[($stackPtr + 1)]['content'];
-
-            if ($modifyLeft && T_WHITESPACE === $tokens[($stackPtr - 1)]['code']) {
-                $fix = $phpcsFile->addFixableError(
-                    'There must not be a single space before a unary operator statement',
-                    $stackPtr,
-                    'IncDecLeft'
-                );
-
-                if ($fix) {
-                    $phpcsFile->fixer->replaceToken($stackPtr - 1, '');
-                }
-
-                return;
-            }
-
-            if (!$modifyLeft && substr($tokens[($stackPtr + 1)]['content'], 0, 1) !== '$') {
-                $fix = $phpcsFile->addFixableError(
-                    'A unary operator statement must not be followed by a single space',
-                    $stackPtr,
-                    'IncDecRight'
-                );
-
-                if ($fix) {
-                    $phpcsFile->fixer->replaceToken($stackPtr + 1, '');
-                }
-
-                return;
-            }
-        }
-
         // Check "!" operator.
         if (T_BOOLEAN_NOT === $tokens[$stackPtr]['code'] && T_WHITESPACE === $tokens[$stackPtr + 1]['code']) {
             $fix = $phpcsFile->addFixableError(
@@ -99,7 +67,7 @@ public function process(File $phpcsFile, $stackPtr): void
 
         // Check plus / minus value assignments or comparisons.
         if (T_MINUS === $tokens[$stackPtr]['code'] || T_PLUS === $tokens[$stackPtr]['code']) {
-            if (!$operatorSuffixAllowed && T_WHITESPACE === $tokens[($stackPtr + 1)]['code']) {
+            if (!$operatorSuffixAllowed && T_WHITESPACE === $tokens[$stackPtr + 1]['code']) {
                 $fix = $phpcsFile->addFixableError(
                     'A unary operator statement must not be followed by a space',
                     $stackPtr,
diff --git a/SymfonyCustom/Tests/Arrays/ArrayDeclarationUnitTest.php b/SymfonyCustom/Tests/Arrays/ArrayDeclarationUnitTest.php
index 0b01c7c..b7757c0 100644
--- a/SymfonyCustom/Tests/Arrays/ArrayDeclarationUnitTest.php
+++ b/SymfonyCustom/Tests/Arrays/ArrayDeclarationUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\Arrays;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/Classes/ClassDeclarationUnitTest.php b/SymfonyCustom/Tests/Classes/ClassDeclarationUnitTest.php
index f8784aa..3c5cd67 100644
--- a/SymfonyCustom/Tests/Classes/ClassDeclarationUnitTest.php
+++ b/SymfonyCustom/Tests/Classes/ClassDeclarationUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\Classes;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/Classes/PropertyDeclarationUnitTest.php b/SymfonyCustom/Tests/Classes/PropertyDeclarationUnitTest.php
index 73fa477..163eeb9 100644
--- a/SymfonyCustom/Tests/Classes/PropertyDeclarationUnitTest.php
+++ b/SymfonyCustom/Tests/Classes/PropertyDeclarationUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\Classes;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/Commenting/ClassCommentUnitTest.php b/SymfonyCustom/Tests/Commenting/ClassCommentUnitTest.php
index eb92b4f..ad2b7b0 100644
--- a/SymfonyCustom/Tests/Commenting/ClassCommentUnitTest.php
+++ b/SymfonyCustom/Tests/Commenting/ClassCommentUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\Commenting;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/Commenting/DocCommentForbiddenTagsUnitTest.php b/SymfonyCustom/Tests/Commenting/DocCommentForbiddenTagsUnitTest.php
index 952abc0..4d9a21a 100644
--- a/SymfonyCustom/Tests/Commenting/DocCommentForbiddenTagsUnitTest.php
+++ b/SymfonyCustom/Tests/Commenting/DocCommentForbiddenTagsUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\Commenting;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/Commenting/DocCommentGroupSameTypeUnitTest.php b/SymfonyCustom/Tests/Commenting/DocCommentGroupSameTypeUnitTest.php
index 39259bb..c4c9d14 100644
--- a/SymfonyCustom/Tests/Commenting/DocCommentGroupSameTypeUnitTest.php
+++ b/SymfonyCustom/Tests/Commenting/DocCommentGroupSameTypeUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\Commenting;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/Commenting/DocCommentUnitTest.php b/SymfonyCustom/Tests/Commenting/DocCommentUnitTest.php
index 102a048..bb07184 100644
--- a/SymfonyCustom/Tests/Commenting/DocCommentUnitTest.php
+++ b/SymfonyCustom/Tests/Commenting/DocCommentUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\Commenting;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/Commenting/FunctionCommentUnitTest.php b/SymfonyCustom/Tests/Commenting/FunctionCommentUnitTest.php
index 8773ba7..c117f7d 100644
--- a/SymfonyCustom/Tests/Commenting/FunctionCommentUnitTest.php
+++ b/SymfonyCustom/Tests/Commenting/FunctionCommentUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\Commenting;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/Commenting/VariableCommentUnitTest.php b/SymfonyCustom/Tests/Commenting/VariableCommentUnitTest.php
index 561d57f..af0ef67 100644
--- a/SymfonyCustom/Tests/Commenting/VariableCommentUnitTest.php
+++ b/SymfonyCustom/Tests/Commenting/VariableCommentUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\Commenting;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/Errors/ExceptionMessageUnitTest.php b/SymfonyCustom/Tests/Errors/ExceptionMessageUnitTest.php
index 8360ead..d3a1b1b 100644
--- a/SymfonyCustom/Tests/Errors/ExceptionMessageUnitTest.php
+++ b/SymfonyCustom/Tests/Errors/ExceptionMessageUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\Errors;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/Errors/UserDeprecatedUnitTest.php b/SymfonyCustom/Tests/Errors/UserDeprecatedUnitTest.php
index f6cba2b..e2031e2 100644
--- a/SymfonyCustom/Tests/Errors/UserDeprecatedUnitTest.php
+++ b/SymfonyCustom/Tests/Errors/UserDeprecatedUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\Errors;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/Formatting/BlankLineBeforeReturnUnitTest.php b/SymfonyCustom/Tests/Formatting/BlankLineBeforeReturnUnitTest.php
index 7e8ccce..066cc42 100644
--- a/SymfonyCustom/Tests/Formatting/BlankLineBeforeReturnUnitTest.php
+++ b/SymfonyCustom/Tests/Formatting/BlankLineBeforeReturnUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\Formatting;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/Formatting/ConditionalReturnOrThrowUnitTest.php b/SymfonyCustom/Tests/Formatting/ConditionalReturnOrThrowUnitTest.php
index aafdb1b..8746197 100644
--- a/SymfonyCustom/Tests/Formatting/ConditionalReturnOrThrowUnitTest.php
+++ b/SymfonyCustom/Tests/Formatting/ConditionalReturnOrThrowUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\Formatting;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/Formatting/StrictComparisonUnitTest.php b/SymfonyCustom/Tests/Formatting/StrictComparisonUnitTest.php
index 826b13b..bb46457 100644
--- a/SymfonyCustom/Tests/Formatting/StrictComparisonUnitTest.php
+++ b/SymfonyCustom/Tests/Formatting/StrictComparisonUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\Formatting;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/Formatting/YodaConditionUnitTest.php b/SymfonyCustom/Tests/Formatting/YodaConditionUnitTest.php
index 8b0c700..85ddf8e 100644
--- a/SymfonyCustom/Tests/Formatting/YodaConditionUnitTest.php
+++ b/SymfonyCustom/Tests/Formatting/YodaConditionUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\Formatting;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/Functions/ScopeOrderUnitTest.php b/SymfonyCustom/Tests/Functions/ScopeOrderUnitTest.php
index dc33be5..8b89c24 100644
--- a/SymfonyCustom/Tests/Functions/ScopeOrderUnitTest.php
+++ b/SymfonyCustom/Tests/Functions/ScopeOrderUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Sniffs\Functions;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/Namespaces/AlphabeticallySortedUseUnitTest.php b/SymfonyCustom/Tests/Namespaces/AlphabeticallySortedUseUnitTest.php
index 9927b9f..08ac990 100644
--- a/SymfonyCustom/Tests/Namespaces/AlphabeticallySortedUseUnitTest.php
+++ b/SymfonyCustom/Tests/Namespaces/AlphabeticallySortedUseUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\Namespaces;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/Namespaces/NamespaceDeclarationUnitTest.php b/SymfonyCustom/Tests/Namespaces/NamespaceDeclarationUnitTest.php
index 9bef92a..7a1e725 100644
--- a/SymfonyCustom/Tests/Namespaces/NamespaceDeclarationUnitTest.php
+++ b/SymfonyCustom/Tests/Namespaces/NamespaceDeclarationUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\Namespaces;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/Namespaces/UnusedUseUnitTest.php b/SymfonyCustom/Tests/Namespaces/UnusedUseUnitTest.php
index a840285..2d70b8f 100644
--- a/SymfonyCustom/Tests/Namespaces/UnusedUseUnitTest.php
+++ b/SymfonyCustom/Tests/Namespaces/UnusedUseUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\Namespaces;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/Namespaces/UseWithoutStartingBackslashUnitTest.inc b/SymfonyCustom/Tests/Namespaces/UseWithoutStartingBackslashUnitTest.inc
deleted file mode 100644
index 2c7c391..0000000
--- a/SymfonyCustom/Tests/Namespaces/UseWithoutStartingBackslashUnitTest.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Foo;
-
-use \DateTime;
-use const \E_COMPILE_ERROR as ECE;
-use FUNCTION\array_combine as ac;
-
-class Bar
-{
-    use MyTrait;
-
-    public function __construct($foo)
-    {
-        $closure = function ($x) use ($foo) {
-        };
-    }
-}
diff --git a/SymfonyCustom/Tests/Namespaces/UseWithoutStartingBackslashUnitTest.inc.fixed b/SymfonyCustom/Tests/Namespaces/UseWithoutStartingBackslashUnitTest.inc.fixed
deleted file mode 100644
index 859ccc4..0000000
--- a/SymfonyCustom/Tests/Namespaces/UseWithoutStartingBackslashUnitTest.inc.fixed
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Foo;
-
-use DateTime;
-use const E_COMPILE_ERROR as ECE;
-use FUNCTION array_combine as ac;
-
-class Bar
-{
-    use MyTrait;
-
-    public function __construct($foo)
-    {
-        $closure = function ($x) use ($foo) {
-        };
-    }
-}
diff --git a/SymfonyCustom/Tests/Namespaces/UseWithoutStartingBackslashUnitTest.php b/SymfonyCustom/Tests/Namespaces/UseWithoutStartingBackslashUnitTest.php
deleted file mode 100644
index 8bb7397..0000000
--- a/SymfonyCustom/Tests/Namespaces/UseWithoutStartingBackslashUnitTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace SymfonyCustom\Tests\Namespaces;
-
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-
-/**
- * Unit test class for the UseWithoutStartingBackslash sniff.
- *
- * @group SymfonyCustom
- */
-class UseWithoutStartingBackslashUnitTest extends AbstractSniffUnitTest
-{
-    /**
-     * @return array
-     */
-    protected function getErrorList(): array
-    {
-        return [
-            5 => 1,
-            6 => 1,
-            7 => 1,
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function getWarningList(): array
-    {
-        return [];
-    }
-}
diff --git a/SymfonyCustom/Tests/NamingConventions/ValidClassNameUnitTest.php b/SymfonyCustom/Tests/NamingConventions/ValidClassNameUnitTest.php
index dfe5436..2e9f9a2 100644
--- a/SymfonyCustom/Tests/NamingConventions/ValidClassNameUnitTest.php
+++ b/SymfonyCustom/Tests/NamingConventions/ValidClassNameUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\NamingConventions;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/NamingConventions/ValidFileNameUnitTest.php b/SymfonyCustom/Tests/NamingConventions/ValidFileNameUnitTest.php
index a5217a1..20d5894 100644
--- a/SymfonyCustom/Tests/NamingConventions/ValidFileNameUnitTest.php
+++ b/SymfonyCustom/Tests/NamingConventions/ValidFileNameUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\NamingConventions;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/NamingConventions/ValidScalarTypeNameUnitTest.php b/SymfonyCustom/Tests/NamingConventions/ValidScalarTypeNameUnitTest.php
index 988d384..d929624 100644
--- a/SymfonyCustom/Tests/NamingConventions/ValidScalarTypeNameUnitTest.php
+++ b/SymfonyCustom/Tests/NamingConventions/ValidScalarTypeNameUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\NamingConventions;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/Objects/ObjectInstantiationUnitTest.inc b/SymfonyCustom/Tests/Objects/ObjectInstantiationUnitTest.inc
deleted file mode 100644
index d2453bb..0000000
--- a/SymfonyCustom/Tests/Objects/ObjectInstantiationUnitTest.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-// bad
-new Foo;
-new Foo\Bar;
-new \Foo\Bar;
-new $foo;
-new Foo ();
-new static;
-new self;
-
-// good
-new Foo();
-new foo();
-new Foo(true);
-new Foo($this->foo);
-new Foo\Bar();
-new Foo\Bar(true);
-new Foo\Bar($this->foo);
-new \Foo\Bar();
-new \Foo\Bar(true);
-new \Foo\Bar($this->foo);
-new $foo();
-new $foo(true);
-new $foo($this->foo);
-new static();
-new static(true);
-new static($this->foo);
-new self();
-new self(true);
-new self($this->foo);
diff --git a/SymfonyCustom/Tests/Objects/ObjectInstantiationUnitTest.php b/SymfonyCustom/Tests/Objects/ObjectInstantiationUnitTest.php
deleted file mode 100644
index fa7712b..0000000
--- a/SymfonyCustom/Tests/Objects/ObjectInstantiationUnitTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace SymfonyCustom\Tests\Objects;
-
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-
-/**
- * Unit test class for the ObjectInstantiation sniff.
- *
- * @group SymfonyCustom
- */
-class ObjectInstantiationUnitTest extends AbstractSniffUnitTest
-{
-    /**
-     * @return array
-     */
-    protected function getErrorList(): array
-    {
-        return [
-            4  => 1,
-            5  => 1,
-            6  => 1,
-            7  => 1,
-            8  => 1,
-            9  => 1,
-            10 => 1,
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function getWarningList(): array
-    {
-        return [];
-    }
-}
diff --git a/SymfonyCustom/Tests/PHP/DiscourageEmptyUnitTest.php b/SymfonyCustom/Tests/PHP/DiscourageEmptyUnitTest.php
index cac7e3a..2cec178 100644
--- a/SymfonyCustom/Tests/PHP/DiscourageEmptyUnitTest.php
+++ b/SymfonyCustom/Tests/PHP/DiscourageEmptyUnitTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace SymfonyCustom\Tests\Objects;
+declare(strict_types=1);
+
+namespace SymfonyCustom\Tests\PHP;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/SymfonyCustom/Tests/WhiteSpace/CloseBracketSpacingUnitTest.php b/SymfonyCustom/Tests/WhiteSpace/CloseBracketSpacingUnitTest.php
index 8289df1..c0fc415 100644
--- a/SymfonyCustom/Tests/WhiteSpace/CloseBracketSpacingUnitTest.php
+++ b/SymfonyCustom/Tests/WhiteSpace/CloseBracketSpacingUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\WhiteSpace;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/WhiteSpace/DocCommentTagSpacingUnitTest.php b/SymfonyCustom/Tests/WhiteSpace/DocCommentTagSpacingUnitTest.php
index 34b1fc3..4d4653c 100644
--- a/SymfonyCustom/Tests/WhiteSpace/DocCommentTagSpacingUnitTest.php
+++ b/SymfonyCustom/Tests/WhiteSpace/DocCommentTagSpacingUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\WhiteSpace;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/WhiteSpace/EmptyLinesUnitTest.php b/SymfonyCustom/Tests/WhiteSpace/EmptyLinesUnitTest.php
index 7c69803..1e97723 100644
--- a/SymfonyCustom/Tests/WhiteSpace/EmptyLinesUnitTest.php
+++ b/SymfonyCustom/Tests/WhiteSpace/EmptyLinesUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\WhiteSpace;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/WhiteSpace/OpenBracketSpacingUnitTest.php b/SymfonyCustom/Tests/WhiteSpace/OpenBracketSpacingUnitTest.php
index 958b775..a02048d 100644
--- a/SymfonyCustom/Tests/WhiteSpace/OpenBracketSpacingUnitTest.php
+++ b/SymfonyCustom/Tests/WhiteSpace/OpenBracketSpacingUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\WhiteSpace;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
diff --git a/SymfonyCustom/Tests/WhiteSpace/UnaryOperatorSpacingUnitTest.inc b/SymfonyCustom/Tests/WhiteSpace/UnaryOperatorSpacingUnitTest.inc
index 0378e5b..ffe2aa1 100644
--- a/SymfonyCustom/Tests/WhiteSpace/UnaryOperatorSpacingUnitTest.inc
+++ b/SymfonyCustom/Tests/WhiteSpace/UnaryOperatorSpacingUnitTest.inc
@@ -3,11 +3,6 @@
 $a = !$b;
 $a = ! $b;
 
-$a++;
-$a ++;
-++$a;
-++ $a;
-
 1+-2;
 1+- 2;
 1+ -2;
diff --git a/SymfonyCustom/Tests/WhiteSpace/UnaryOperatorSpacingUnitTest.inc.fixed b/SymfonyCustom/Tests/WhiteSpace/UnaryOperatorSpacingUnitTest.inc.fixed
index 18efa57..fecdd2a 100644
--- a/SymfonyCustom/Tests/WhiteSpace/UnaryOperatorSpacingUnitTest.inc.fixed
+++ b/SymfonyCustom/Tests/WhiteSpace/UnaryOperatorSpacingUnitTest.inc.fixed
@@ -3,11 +3,6 @@
 $a = !$b;
 $a = !$b;
 
-$a++;
-$a++;
-++$a;
-++$a;
-
 1+-2;
 1+-2;
 1+ -2;
diff --git a/SymfonyCustom/Tests/WhiteSpace/UnaryOperatorSpacingUnitTest.php b/SymfonyCustom/Tests/WhiteSpace/UnaryOperatorSpacingUnitTest.php
index 458b323..9145bdc 100644
--- a/SymfonyCustom/Tests/WhiteSpace/UnaryOperatorSpacingUnitTest.php
+++ b/SymfonyCustom/Tests/WhiteSpace/UnaryOperatorSpacingUnitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SymfonyCustom\Tests\WhiteSpace;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
@@ -21,9 +23,7 @@ protected function getErrorList(): array
             7  => 1,
             9  => 1,
             12 => 1,
-            14 => 1,
-            17 => 1,
-            18 => 1,
+            13 => 1,
         ];
     }
 
diff --git a/SymfonyCustom/ruleset.xml b/SymfonyCustom/ruleset.xml
index 28c09ed..f4072b2 100755
--- a/SymfonyCustom/ruleset.xml
+++ b/SymfonyCustom/ruleset.xml
@@ -25,11 +25,6 @@
         </properties>
     </rule>
 
-    <!-- Override FunctionDeclaration to check space after type hinting -->
-    <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterHint">
-        <severity>5</severity>
-    </rule>
-
     <!-- Override ScopeIndent to check phpDoc comments indent-->
     <rule ref="Generic.WhiteSpace.ScopeIndent">
         <properties>
@@ -52,7 +47,6 @@
             <property name="ignoreNewlines" value="true" />
         </properties>
     </rule>
-    <rule ref="Squiz.WhiteSpace.CastSpacing"/>
     <rule ref="Squiz.WhiteSpace.FunctionOpeningBraceSpace"/>
     <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
     <rule ref="Squiz.WhiteSpace.OperatorSpacing">
@@ -110,6 +104,25 @@
     </rule>
     <rule ref="Squiz.Strings.EchoedStrings"/>
 
+    <!-- Starting PSR12 integration -->
+    <rule ref="Generic.WhiteSpace.IncrementDecrementSpacing"/>
+    <rule ref="PSR12.Classes.AnonClassDeclaration"/>
+    <rule ref="PSR12.Classes.ClassInstantiation"/>
+    <rule ref="PSR12.Classes.ClosingBrace"/>
+    <rule ref="PSR12.ControlStructures.BooleanOperatorPlacement"/>
+    <!--<rule ref="PSR12.ControlStructures.ControlStructureSpacing"/>-->
+    <rule ref="PSR12.Files.DeclareStatement"/>
+    <rule ref="PSR12.Files.ImportStatement"/>
+    <rule ref="PSR12.Functions.NullableTypeDeclaration"/>
+    <rule ref="PSR12.Functions.ReturnTypeDeclaration"/>
+    <!--<rule ref="PSR12.Operators.OperatorSpacing"/>-->
+    <rule ref="PSR12.Traits.UseDeclaration"/>
+    <!--<rule ref="Squiz.ControlStructures.ControlSignature"/>-->
+    <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterHint">
+        <severity>5</severity>
+    </rule>
+    <rule ref="Squiz.WhiteSpace.CastSpacing"/>
+
     <!-- Custom -->
     <rule ref="SymfonyCustom.Commenting.FunctionComment">
         <exclude name="SymfonyCustom.Commenting.FunctionComment.MissingParamComment"/>
diff --git a/TwigCS/Command/TwigCSCommand.php b/TwigCS/Command/TwigCSCommand.php
index d94646c..c7df70e 100644
--- a/TwigCS/Command/TwigCSCommand.php
+++ b/TwigCS/Command/TwigCSCommand.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Command;
 
 use Exception;
diff --git a/TwigCS/Config/Config.php b/TwigCS/Config/Config.php
index 365de0e..cc68459 100644
--- a/TwigCS/Config/Config.php
+++ b/TwigCS/Config/Config.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Config;
 
 use Exception;
@@ -23,7 +25,7 @@ class Config
     /**
      * @var array
      */
-    protected $config;
+    protected $config = [];
 
     /**
      * @param array $config
diff --git a/TwigCS/Environment/StubbedEnvironment.php b/TwigCS/Environment/StubbedEnvironment.php
index 3870fbb..44531b8 100644
--- a/TwigCS/Environment/StubbedEnvironment.php
+++ b/TwigCS/Environment/StubbedEnvironment.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Environment;
 
 use Symfony\Bridge\Twig\TokenParser\DumpTokenParser;
diff --git a/TwigCS/Report/Report.php b/TwigCS/Report/Report.php
index 468b94c..20684e6 100644
--- a/TwigCS/Report/Report.php
+++ b/TwigCS/Report/Report.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Report;
 
 /**
@@ -7,49 +9,40 @@
  */
 class Report
 {
-    const MESSAGE_TYPE_NOTICE  = 0;
-    const MESSAGE_TYPE_WARNING = 1;
-    const MESSAGE_TYPE_ERROR   = 2;
-    const MESSAGE_TYPE_FATAL   = 3;
+    public const MESSAGE_TYPE_NOTICE  = 0;
+    public const MESSAGE_TYPE_WARNING = 1;
+    public const MESSAGE_TYPE_ERROR   = 2;
+    public const MESSAGE_TYPE_FATAL   = 3;
 
     /**
      * @var SniffViolation[]
      */
-    protected $messages;
+    protected $messages = [];
 
     /**
      * @var string[]
      */
-    protected $files;
+    protected $files = [];
 
     /**
      * @var int
      */
-    protected $totalNotices;
+    protected $totalNotices = 0;
 
     /**
      * @var int
      */
-    protected $totalWarnings;
+    protected $totalWarnings = 0;
 
     /**
      * @var int
      */
-    protected $totalErrors;
-
-    public function __construct()
-    {
-        $this->messages = [];
-        $this->files = [];
-        $this->totalNotices = 0;
-        $this->totalWarnings = 0;
-        $this->totalErrors = 0;
-    }
+    protected $totalErrors = 0;
 
     /**
      * @param SniffViolation $sniffViolation
      *
-     * @return $this
+     * @return self
      */
     public function addMessage(SniffViolation $sniffViolation): Report
     {
diff --git a/TwigCS/Report/SniffViolation.php b/TwigCS/Report/SniffViolation.php
index 39fcf6a..0f9040b 100644
--- a/TwigCS/Report/SniffViolation.php
+++ b/TwigCS/Report/SniffViolation.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Report;
 
 use LogicException;
@@ -10,10 +12,10 @@
  */
 class SniffViolation
 {
-    const LEVEL_NOTICE  = 'NOTICE';
-    const LEVEL_WARNING = 'WARNING';
-    const LEVEL_ERROR   = 'ERROR';
-    const LEVEL_FATAL   = 'FATAL';
+    private const LEVEL_NOTICE  = 'NOTICE';
+    private const LEVEL_WARNING = 'WARNING';
+    private const LEVEL_ERROR   = 'ERROR';
+    private const LEVEL_FATAL   = 'FATAL';
 
     /**
      * @var int
@@ -53,13 +55,10 @@ class SniffViolation
      */
     public function __construct(int $level, string $message, string $filename, int $line = null)
     {
-        $this->level        = $level;
-        $this->message      = $message;
-        $this->line         = $line;
-        $this->filename     = $filename;
-
-        $this->sniff        = null;
-        $this->linePosition = null;
+        $this->level = $level;
+        $this->message = $message;
+        $this->line = $line;
+        $this->filename = $filename;
     }
 
     /**
diff --git a/TwigCS/Report/TextFormatter.php b/TwigCS/Report/TextFormatter.php
index 842f73f..3b0a70d 100644
--- a/TwigCS/Report/TextFormatter.php
+++ b/TwigCS/Report/TextFormatter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Report;
 
 use Symfony\Component\Console\Helper\TableCell;
@@ -13,10 +15,10 @@
  */
 class TextFormatter
 {
-    const ERROR_CURSOR_CHAR   = '>>';
-    const ERROR_LINE_FORMAT   = '%-5s| %s';
-    const ERROR_CONTEXT_LIMIT = 2;
-    const ERROR_LINE_WIDTH    = 120;
+    private const ERROR_CURSOR_CHAR   = '>>';
+    private const ERROR_LINE_FORMAT   = '%-5s| %s';
+    private const ERROR_CONTEXT_LIMIT = 2;
+    private const ERROR_LINE_WIDTH    = 120;
 
     /**
      * @var SymfonyStyle
@@ -50,7 +52,7 @@ public function display(Report $report, string $level = null): void
 
             $rows = [];
             foreach ($fileMessages as $message) {
-                $lines = $this->getContext(file_get_contents($file), $message->getLine(), $this::ERROR_CONTEXT_LIMIT);
+                $lines = $this->getContext(file_get_contents($file), $message->getLine(), self::ERROR_CONTEXT_LIMIT);
 
                 $formattedText = [];
                 if (!$message->getLine()) {
@@ -58,7 +60,7 @@ public function display(Report $report, string $level = null): void
                 }
 
                 foreach ($lines as $no => $code) {
-                    $formattedText[] = sprintf($this::ERROR_LINE_FORMAT, $no, wordwrap($code, $this::ERROR_LINE_WIDTH));
+                    $formattedText[] = sprintf(self::ERROR_LINE_FORMAT, $no, wordwrap($code, self::ERROR_LINE_WIDTH));
 
                     if ($no === $message->getLine()) {
                         $formattedText[] = $this->formatErrorMessage($message);
@@ -145,9 +147,9 @@ protected function getContext(string $template, int $line, int $context): array
     protected function formatErrorMessage(SniffViolation $message): string
     {
         return sprintf(
-            '<fg=red>'.$this::ERROR_LINE_FORMAT.'</fg=red>',
-            $this::ERROR_CURSOR_CHAR,
-            wordwrap($message->getMessage(), $this::ERROR_LINE_WIDTH)
+            '<fg=red>'.self::ERROR_LINE_FORMAT.'</fg=red>',
+            self::ERROR_CURSOR_CHAR,
+            wordwrap($message->getMessage(), self::ERROR_LINE_WIDTH)
         );
     }
 }
diff --git a/TwigCS/Ruleset/Generic/BlankEOFSniff.php b/TwigCS/Ruleset/Generic/BlankEOFSniff.php
index debc7f6..0ecb29b 100644
--- a/TwigCS/Ruleset/Generic/BlankEOFSniff.php
+++ b/TwigCS/Ruleset/Generic/BlankEOFSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Ruleset\Generic;
 
 use Exception;
diff --git a/TwigCS/Ruleset/Generic/DelimiterSpacingSniff.php b/TwigCS/Ruleset/Generic/DelimiterSpacingSniff.php
index f35ecc5..6e32365 100644
--- a/TwigCS/Ruleset/Generic/DelimiterSpacingSniff.php
+++ b/TwigCS/Ruleset/Generic/DelimiterSpacingSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Ruleset\Generic;
 
 use TwigCS\Sniff\AbstractSpacingSniff;
diff --git a/TwigCS/Ruleset/Generic/DisallowCommentedCodeSniff.php b/TwigCS/Ruleset/Generic/DisallowCommentedCodeSniff.php
index 7b6f04e..5113d5d 100644
--- a/TwigCS/Ruleset/Generic/DisallowCommentedCodeSniff.php
+++ b/TwigCS/Ruleset/Generic/DisallowCommentedCodeSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Ruleset\Generic;
 
 use Exception;
diff --git a/TwigCS/Ruleset/Generic/EmptyLinesSniff.php b/TwigCS/Ruleset/Generic/EmptyLinesSniff.php
index 37818af..0ebaffa 100644
--- a/TwigCS/Ruleset/Generic/EmptyLinesSniff.php
+++ b/TwigCS/Ruleset/Generic/EmptyLinesSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Ruleset\Generic;
 
 use Exception;
diff --git a/TwigCS/Ruleset/Generic/OperatorSpacingSniff.php b/TwigCS/Ruleset/Generic/OperatorSpacingSniff.php
index 8dcf867..5624226 100644
--- a/TwigCS/Ruleset/Generic/OperatorSpacingSniff.php
+++ b/TwigCS/Ruleset/Generic/OperatorSpacingSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Ruleset\Generic;
 
 use TwigCS\Sniff\AbstractSpacingSniff;
diff --git a/TwigCS/Ruleset/Ruleset.php b/TwigCS/Ruleset/Ruleset.php
index 1f04061..2e1a6cd 100644
--- a/TwigCS/Ruleset/Ruleset.php
+++ b/TwigCS/Ruleset/Ruleset.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Ruleset;
 
 use Exception;
diff --git a/TwigCS/Runner/Fixer.php b/TwigCS/Runner/Fixer.php
index 9d33549..3ac9c83 100644
--- a/TwigCS/Runner/Fixer.php
+++ b/TwigCS/Runner/Fixer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Runner;
 
 use Exception;
@@ -24,14 +26,14 @@ class Fixer
     protected $eolChar = "\n";
 
     /**
-     * @var Ruleset
+     * @var Ruleset|null
      */
-    protected $ruleset = null;
+    protected $ruleset;
 
     /**
-     * @var Tokenizer
+     * @var Tokenizer|null
      */
-    protected $tokenizer = null;
+    protected $tokenizer;
 
     /**
      * The list of tokens that make up the file contents.
@@ -186,14 +188,14 @@ public function generateDiff(string $filePath): string
 
         $contents = $this->getContents();
 
-        $tempName  = tempnam(sys_get_temp_dir(), 'phpcs-fixer');
+        $tempName = tempnam(sys_get_temp_dir(), 'phpcs-fixer');
         $fixedFile = fopen($tempName, 'w');
         fwrite($fixedFile, $contents);
 
         // We must use something like shell_exec() because whitespace at the end
         // of lines is critical to diff files.
         $filename = escapeshellarg($filename);
-        $cmd      = "diff -u -L$filename -LPHP_CodeSniffer $filename \"$tempName\"";
+        $cmd = "diff -u -L$filename -LPHP_CodeSniffer $filename \"$tempName\"";
 
         $diff = shell_exec($cmd);
 
@@ -202,7 +204,7 @@ public function generateDiff(string $filePath): string
             unlink($tempName);
         }
 
-        $diffLines = explode(PHP_EOL, $diff);
+        $diffLines = null !== $diff ? explode(PHP_EOL, $diff) : [];
         if (count($diffLines) === 1) {
             // Seems to be required for cygwin.
             $diffLines = explode("\n", $diff);
@@ -265,7 +267,7 @@ public function beginChangeset(): void
             return;
         }
 
-        $this->changeset   = [];
+        $this->changeset = [];
         $this->inChangeset = true;
     }
 
diff --git a/TwigCS/Runner/Linter.php b/TwigCS/Runner/Linter.php
index 050c7c1..ff5d2a4 100644
--- a/TwigCS/Runner/Linter.php
+++ b/TwigCS/Runner/Linter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Runner;
 
 use Exception;
diff --git a/TwigCS/Sniff/AbstractSniff.php b/TwigCS/Sniff/AbstractSniff.php
index 4154cc2..d67b680 100644
--- a/TwigCS/Sniff/AbstractSniff.php
+++ b/TwigCS/Sniff/AbstractSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Sniff;
 
 use Exception;
@@ -14,14 +16,14 @@
 abstract class AbstractSniff implements SniffInterface
 {
     /**
-     * @var Report
+     * @var Report|null
      */
-    protected $report = null;
+    protected $report;
 
     /**
-     * @var Fixer
+     * @var Fixer|null
      */
-    protected $fixer = null;
+    protected $fixer;
 
     /**
      * @param Report $report
diff --git a/TwigCS/Sniff/AbstractSpacingSniff.php b/TwigCS/Sniff/AbstractSpacingSniff.php
index ea47fb5..20e0820 100644
--- a/TwigCS/Sniff/AbstractSpacingSniff.php
+++ b/TwigCS/Sniff/AbstractSpacingSniff.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Sniff;
 
 use Exception;
diff --git a/TwigCS/Sniff/SniffInterface.php b/TwigCS/Sniff/SniffInterface.php
index 4e23877..4d4b5a9 100644
--- a/TwigCS/Sniff/SniffInterface.php
+++ b/TwigCS/Sniff/SniffInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Sniff;
 
 use TwigCS\Report\Report;
diff --git a/TwigCS/Tests/AbstractSniffTest.php b/TwigCS/Tests/AbstractSniffTest.php
index 2661377..80b0ccd 100644
--- a/TwigCS/Tests/AbstractSniffTest.php
+++ b/TwigCS/Tests/AbstractSniffTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Tests;
 
 use Exception;
diff --git a/TwigCS/Tests/Ruleset/Generic/BlankEOFTest.php b/TwigCS/Tests/Ruleset/Generic/BlankEOFTest.php
index 674c030..a6fd61c 100644
--- a/TwigCS/Tests/Ruleset/Generic/BlankEOFTest.php
+++ b/TwigCS/Tests/Ruleset/Generic/BlankEOFTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Tests\Ruleset\Generic;
 
 use TwigCS\Ruleset\Generic\BlankEOFSniff;
diff --git a/TwigCS/Tests/Ruleset/Generic/DelimiterSpacingTest.php b/TwigCS/Tests/Ruleset/Generic/DelimiterSpacingTest.php
index 00bedca..24b8c54 100644
--- a/TwigCS/Tests/Ruleset/Generic/DelimiterSpacingTest.php
+++ b/TwigCS/Tests/Ruleset/Generic/DelimiterSpacingTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Tests\Ruleset\Generic;
 
 use TwigCS\Ruleset\Generic\DelimiterSpacingSniff;
diff --git a/TwigCS/Tests/Ruleset/Generic/DisallowCommentedCodeTest.php b/TwigCS/Tests/Ruleset/Generic/DisallowCommentedCodeTest.php
index bdaa3cc..f30f55d 100644
--- a/TwigCS/Tests/Ruleset/Generic/DisallowCommentedCodeTest.php
+++ b/TwigCS/Tests/Ruleset/Generic/DisallowCommentedCodeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Tests\Ruleset\Generic;
 
 use TwigCS\Ruleset\Generic\DisallowCommentedCodeSniff;
diff --git a/TwigCS/Tests/Ruleset/Generic/EmptyLinesTest.php b/TwigCS/Tests/Ruleset/Generic/EmptyLinesTest.php
index a21b589..49d0e8b 100644
--- a/TwigCS/Tests/Ruleset/Generic/EmptyLinesTest.php
+++ b/TwigCS/Tests/Ruleset/Generic/EmptyLinesTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Tests\Ruleset\Generic;
 
 use TwigCS\Ruleset\Generic\EmptyLinesSniff;
diff --git a/TwigCS/Tests/Ruleset/Generic/OperatorSpacingTest.php b/TwigCS/Tests/Ruleset/Generic/OperatorSpacingTest.php
index 914299e..dc0dc5d 100644
--- a/TwigCS/Tests/Ruleset/Generic/OperatorSpacingTest.php
+++ b/TwigCS/Tests/Ruleset/Generic/OperatorSpacingTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Tests\Ruleset\Generic;
 
 use TwigCS\Ruleset\Generic\OperatorSpacingSniff;
diff --git a/TwigCS/Token/Token.php b/TwigCS/Token/Token.php
index a53c4e9..68cfdd5 100644
--- a/TwigCS/Token/Token.php
+++ b/TwigCS/Token/Token.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Token;
 
 /**
@@ -8,26 +10,26 @@
 class Token
 {
     // From Twig\Token
-    const EOF_TYPE                 = -1;
-    const TEXT_TYPE                = 0;
-    const BLOCK_START_TYPE         = 1;
-    const VAR_START_TYPE           = 2;
-    const BLOCK_END_TYPE           = 3;
-    const VAR_END_TYPE             = 4;
-    const NAME_TYPE                = 5;
-    const NUMBER_TYPE              = 6;
-    const STRING_TYPE              = 7;
-    const OPERATOR_TYPE            = 8;
-    const PUNCTUATION_TYPE         = 9;
-    const INTERPOLATION_START_TYPE = 10;
-    const INTERPOLATION_END_TYPE   = 11;
-    const ARROW_TYPE               = 12;
+    public const EOF_TYPE                 = -1;
+    public const TEXT_TYPE                = 0;
+    public const BLOCK_START_TYPE         = 1;
+    public const VAR_START_TYPE           = 2;
+    public const BLOCK_END_TYPE           = 3;
+    public const VAR_END_TYPE             = 4;
+    public const NAME_TYPE                = 5;
+    public const NUMBER_TYPE              = 6;
+    public const STRING_TYPE              = 7;
+    public const OPERATOR_TYPE            = 8;
+    public const PUNCTUATION_TYPE         = 9;
+    public const INTERPOLATION_START_TYPE = 10;
+    public const INTERPOLATION_END_TYPE   = 11;
+    public const ARROW_TYPE               = 12;
     // New constants
-    const WHITESPACE_TYPE          = 13;
-    const TAB_TYPE                 = 14;
-    const EOL_TYPE                 = 15;
-    const COMMENT_START_TYPE       = 16;
-    const COMMENT_END_TYPE         = 17;
+    public const WHITESPACE_TYPE          = 13;
+    public const TAB_TYPE                 = 14;
+    public const EOL_TYPE                 = 15;
+    public const COMMENT_START_TYPE       = 16;
+    public const COMMENT_END_TYPE         = 17;
 
     /**
      * @var int
diff --git a/TwigCS/Token/TokenParser.php b/TwigCS/Token/TokenParser.php
index 8de3cc6..90b50af 100644
--- a/TwigCS/Token/TokenParser.php
+++ b/TwigCS/Token/TokenParser.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Token;
 
 use Exception;
diff --git a/TwigCS/Token/Tokenizer.php b/TwigCS/Token/Tokenizer.php
index 0c8276b..474f149 100644
--- a/TwigCS/Token/Tokenizer.php
+++ b/TwigCS/Token/Tokenizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Token;
 
 use Exception;
@@ -11,77 +13,77 @@
  */
 class Tokenizer
 {
-    const STATE_DATA          = 0;
-    const STATE_BLOCK         = 1;
-    const STATE_VAR           = 2;
-    const STATE_STRING        = 3;
-    const STATE_INTERPOLATION = 4;
-    const STATE_COMMENT       = 5;
-
-    const REGEX_NAME            = '/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A';
-    const REGEX_NUMBER          = '/[0-9]+(?:\.[0-9]+)?/A';
-    const REGEX_STRING          = '/"([^#"\\\\]*(?:\\\\.[^#"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'/As';
-    const REGEX_DQ_STRING_DELIM = '/"/A';
-    const REGEX_DQ_STRING_PART  = '/[^#"\\\\]*(?:(?:\\\\.|#(?!\{))[^#"\\\\]*)*/As';
-    const PUNCTUATION           = '()[]{}:.,|';
+    private const STATE_DATA          = 0;
+    private const STATE_BLOCK         = 1;
+    private const STATE_VAR           = 2;
+    private const STATE_STRING        = 3;
+    private const STATE_INTERPOLATION = 4;
+    private const STATE_COMMENT       = 5;
+
+    private const REGEX_NAME            = '/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A';
+    private const REGEX_NUMBER          = '/[0-9]+(?:\.[0-9]+)?/A';
+    private const REGEX_STRING          = '/"([^#"\\\\]*(?:\\\\.[^#"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'/As';
+    private const REGEX_DQ_STRING_DELIM = '/"/A';
+    private const REGEX_DQ_STRING_PART  = '/[^#"\\\\]*(?:(?:\\\\.|#(?!\{))[^#"\\\\]*)*/As';
+    private const PUNCTUATION           = '()[]{}:.,|';
 
     /**
      * @var array
      */
-    private $options;
+    private $options = [];
 
     /**
      * @var string[]
      */
-    private $regexes;
+    private $regexes = [];
 
     /**
      * @var int
      */
-    protected $cursor;
+    protected $cursor = 0;
 
     /**
-     * @var int
+     * @var int|null
      */
     protected $end;
 
     /**
      * @var int
      */
-    protected $line;
+    protected $line = 1;
 
     /**
      * @var int
      */
-    protected $currentPosition;
+    protected $currentPosition = 0;
 
     /**
      * @var Token[]
      */
-    protected $tokens;
+    protected $tokens = [];
 
     /**
      * @var array
      */
-    protected $tokenPositions;
+    protected $tokenPositions = [];
 
     /**
      * @var int[]
      */
-    protected $state;
+    protected $state = [];
 
     /**
      * @var array
      */
-    protected $bracketsAndTernary;
+    protected $bracketsAndTernary = [];
 
     /**
-     * @var string
+     * @var string|null
      */
     protected $code;
 
     /**
-     * @var string
+     * @var string|null
      */
     protected $filename;
 
@@ -172,6 +174,7 @@ protected function resetState(Source $source): void
         $this->currentPosition = 0;
         $this->tokens = [];
         $this->state = [];
+        $this->bracketsAndTernary = [];
 
         $this->code = str_replace(["\r\n", "\r"], "\n", $source->getCode());
         $this->end = strlen($this->code);
@@ -281,23 +284,23 @@ protected function lexExpression(): void
             $this->lexWhitespace();
         } elseif (PHP_EOL === $currentToken) {
             $this->lexEOL();
-        } elseif (preg_match($this->regexes['operator'], $this->code, $match, null, $this->cursor)) {
+        } elseif (preg_match($this->regexes['operator'], $this->code, $match, 0, $this->cursor)) {
             $this->lexOperator($match[0]);
-        } elseif (preg_match(self::REGEX_NAME, $this->code, $match, null, $this->cursor)) {
+        } elseif (preg_match(self::REGEX_NAME, $this->code, $match, 0, $this->cursor)) {
             // names
             $this->pushToken(Token::NAME_TYPE, $match[0]);
             $this->moveCursor($match[0]);
-        } elseif (preg_match(self::REGEX_NUMBER, $this->code, $match, null, $this->cursor)) {
+        } elseif (preg_match(self::REGEX_NUMBER, $this->code, $match, 0, $this->cursor)) {
             // numbers
             $number = (float) $match[0];  // floats
             if (ctype_digit($match[0]) && $number <= PHP_INT_MAX) {
                 $number = (int) $match[0]; // integers lower than the maximum
             }
-            $this->pushToken(Token::NUMBER_TYPE, $number);
+            $this->pushToken(Token::NUMBER_TYPE, (string) $number);
             $this->moveCursor($match[0]);
         } elseif (false !== strpos(self::PUNCTUATION, $this->code[$this->cursor])) {
             $this->lexPunctuation();
-        } elseif (preg_match(self::REGEX_STRING, $this->code, $match, null, $this->cursor)) {
+        } elseif (preg_match(self::REGEX_STRING, $this->code, $match, 0, $this->cursor)) {
             // strings
             $this->pushToken(Token::STRING_TYPE, addcslashes(stripcslashes($match[0]), '\\'));
             $this->moveCursor($match[0]);
@@ -382,7 +385,7 @@ protected function lexData(int $limit = 0): void
             $this->lexWhitespace();
         } elseif (PHP_EOL === $currentToken) {
             $this->lexEOL();
-        } elseif (preg_match('/\S+/', $this->code, $match, null, $this->cursor)) {
+        } elseif (preg_match('/\S+/', $this->code, $match, 0, $this->cursor)) {
             $value = $match[0];
             // Stop if cursor reaches the next token start.
             if (0 !== $limit && $limit <= ($this->cursor + strlen($value))) {
diff --git a/TwigCS/Token/TokenizerHelper.php b/TwigCS/Token/TokenizerHelper.php
index 7b40f03..6cab9c8 100644
--- a/TwigCS/Token/TokenizerHelper.php
+++ b/TwigCS/Token/TokenizerHelper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TwigCS\Token;
 
 use Twig\Environment;
@@ -17,7 +19,7 @@ class TokenizerHelper
     /**
      * @var array
      */
-    private $options;
+    private $options = [];
 
     /**
      * @param Environment $env
diff --git a/bootstrap.php b/bootstrap.php
index c7b21f0..ca328ee 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -12,7 +12,7 @@
 );
 
 // Ignore all other Standards in tests
-$standards   = PHP_CodeSniffer\Util\Standards::getInstalledStandards();
+$standards = PHP_CodeSniffer\Util\Standards::getInstalledStandards();
 $standards[] = 'Generic';
 
 $ignoredStandardsStr = implode(