diff --git a/.php_cs b/.php_cs
index 50249ed7..c74eb394 100644
--- a/.php_cs
+++ b/.php_cs
@@ -10,7 +10,7 @@ return \PhpCsFixer\Config::create()
     ->setRiskyAllowed(true)
     ->setRules(array(
         '@PSR2' => true,
-//        'header_comment' => ['header' => $header, 'commentType' => 'PHPDoc', 'separate' => 'none'],
+        'header_comment' => ['header' => $header, 'commentType' => 'PHPDoc', 'separate' => 'none'],
         'array_syntax' => ['syntax' => 'short'],
         'binary_operator_spaces' => ['align_equals' => false, 'align_double_arrow' => false],
         'blank_line_after_opening_tag' => true,
@@ -21,16 +21,16 @@ return \PhpCsFixer\Config::create()
         'combine_consecutive_unsets' => true,
         'concat_space' => ['spacing' => 'one'],
         'declare_equal_normalize' => true,
-        'declare_strict_types' => false,
+        'declare_strict_types' => true,
         'dir_constant' => true,
         'ereg_to_preg' => true,
         'function_typehint_space' => true,
-        'general_phpdoc_annotation_remove' => true,
+        'general_phpdoc_annotation_remove' => ['author', 'category', 'package', 'copyright', 'version'],
         'hash_to_slash_comment' => true,
         'heredoc_to_nowdoc' => true,
         'include' => true,
         'indentation_type' => true,
-        'is_null' => ['use_yoda_style' => false],
+//        'is_null' => ['use_yoda_style' => false],
         'linebreak_after_opening_tag' => true,
         'lowercase_cast' => true,
 //        'mb_str_functions' => true,
@@ -78,7 +78,7 @@ return \PhpCsFixer\Config::create()
         'php_unit_dedicate_assert' => true,
         'php_unit_fqcn_annotation' => true,
         'php_unit_strict' => true,
-        'phpdoc_add_missing_param_annotation' => true,
+//        'phpdoc_add_missing_param_annotation' => true,
         'phpdoc_align' => true,
         'phpdoc_annotation_without_dot' => true,
         'phpdoc_indent' => true,
diff --git a/demo/01-explicit-bind.php b/demo/01-explicit-bind.php
index eb4d6dab..7216b26c 100644
--- a/demo/01-explicit-bind.php
+++ b/demo/01-explicit-bind.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Demo;
 
 require __DIR__ . '/bootstrap.php';
diff --git a/demo/02-matcher-bind.php b/demo/02-matcher-bind.php
index e398067c..70bf3357 100644
--- a/demo/02-matcher-bind.php
+++ b/demo/02-matcher-bind.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Demo;
 
 use Ray\Aop\Bind;
diff --git a/demo/03-annotation-bind.php b/demo/03-annotation-bind.php
index 7c6a9fee..68df4767 100644
--- a/demo/03-annotation-bind.php
+++ b/demo/03-annotation-bind.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Demo;
 
 use Ray\Aop\Bind;
diff --git a/demo/04-my-matcher.php b/demo/04-my-matcher.php
index 85d1b77f..00e2ec6b 100644
--- a/demo/04-my-matcher.php
+++ b/demo/04-my-matcher.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Demo;
 
 use Ray\Aop\Bind;
diff --git a/demo/05-cache.php b/demo/05-cache.php
index 02c9f6bd..1d1ed6f4 100644
--- a/demo/05-cache.php
+++ b/demo/05-cache.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Demo;
 
 require __DIR__ . '/bootstrap.php';
diff --git a/demo/bootstrap.php b/demo/bootstrap.php
index 30578416..8e0ec0d3 100644
--- a/demo/bootstrap.php
+++ b/demo/bootstrap.php
@@ -1,5 +1,11 @@
 <?php
 
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 use Doctrine\Common\Annotations\AnnotationRegistry;
 
 /** @var $loader \Composer\Autoload\ClassLoader */
diff --git a/demo/run.php b/demo/run.php
index 84cbe7bb..decbaca2 100644
--- a/demo/run.php
+++ b/demo/run.php
@@ -1,5 +1,11 @@
 <?php
 
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 passthru('php ' . __DIR__ . '/01-explicit-bind.php');
 passthru('php ' . __DIR__ . '/02-matcher-bind.php');
 passthru('php ' . __DIR__ . '/03-annotation-bind.php');
diff --git a/demo/src/AnnotationRealBillingService.php b/demo/src/AnnotationRealBillingService.php
index 5407a962..0a639b6a 100644
--- a/demo/src/AnnotationRealBillingService.php
+++ b/demo/src/AnnotationRealBillingService.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Demo;
 
 class AnnotationRealBillingService implements BillingService
diff --git a/demo/src/BillingService.php b/demo/src/BillingService.php
index f21a6900..86835924 100644
--- a/demo/src/BillingService.php
+++ b/demo/src/BillingService.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Demo;
 
 interface BillingService
diff --git a/demo/src/EmptyInterceptor.php b/demo/src/EmptyInterceptor.php
index 58f36754..cbde77f7 100644
--- a/demo/src/EmptyInterceptor.php
+++ b/demo/src/EmptyInterceptor.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Demo;
 
 use Ray\Aop\MethodInterceptor;
diff --git a/demo/src/IsContainsMatcher.php b/demo/src/IsContainsMatcher.php
index 8ea4b32d..972767b1 100644
--- a/demo/src/IsContainsMatcher.php
+++ b/demo/src/IsContainsMatcher.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Demo;
 
 use Ray\Aop\AbstractMatcher;
diff --git a/demo/src/ManualAdvice.php b/demo/src/ManualAdvice.php
index 82541595..b977ab40 100644
--- a/demo/src/ManualAdvice.php
+++ b/demo/src/ManualAdvice.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Demo;
 
 class ManualAdvice
diff --git a/demo/src/RealBillingService.php b/demo/src/RealBillingService.php
index 71225e7c..87210dc4 100644
--- a/demo/src/RealBillingService.php
+++ b/demo/src/RealBillingService.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Demo;
 
 class RealBillingService implements BillingService
diff --git a/demo/src/Timer.php b/demo/src/Timer.php
index 284a94eb..59b31255 100644
--- a/demo/src/Timer.php
+++ b/demo/src/Timer.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Demo;
 
 use Ray\Aop\MethodInterceptor;
diff --git a/demo/src/WeekendBlock.php b/demo/src/WeekendBlock.php
index f2cd2161..7f96a958 100644
--- a/demo/src/WeekendBlock.php
+++ b/demo/src/WeekendBlock.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Demo;
 
 /**
diff --git a/demo/src/WeekendBlocker.php b/demo/src/WeekendBlocker.php
index 0d83cece..6319c251 100644
--- a/demo/src/WeekendBlocker.php
+++ b/demo/src/WeekendBlocker.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Demo;
 
 use Ray\Aop\MethodInterceptor;
diff --git a/demo/src/interceptorA.php b/demo/src/interceptorA.php
index 5e2c1692..61af8a90 100644
--- a/demo/src/interceptorA.php
+++ b/demo/src/interceptorA.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Demo;
 
 use Ray\Aop\MethodInterceptor;
diff --git a/demo/src/interceptorB.php b/demo/src/interceptorB.php
index 45756671..a6f2525e 100644
--- a/demo/src/interceptorB.php
+++ b/demo/src/interceptorB.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Demo;
 
 use Ray\Aop\MethodInterceptor;
diff --git a/src/AbstractMatcher.php b/src/AbstractMatcher.php
index 7ded1f4b..d333ce3b 100644
--- a/src/AbstractMatcher.php
+++ b/src/AbstractMatcher.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/AbstractWeave.php b/src/AbstractWeave.php
index a4481b18..8ebb3e53 100644
--- a/src/AbstractWeave.php
+++ b/src/AbstractWeave.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop;
 
 abstract class AbstractWeave implements WeavedInterface
diff --git a/src/Advice.php b/src/Advice.php
index 723d0eaf..2363aa32 100644
--- a/src/Advice.php
+++ b/src/Advice.php
@@ -1,6 +1,8 @@
 <?php
+
+declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/AnnotatedMatcher.php b/src/AnnotatedMatcher.php
index e010f221..963a8591 100644
--- a/src/AnnotatedMatcher.php
+++ b/src/AnnotatedMatcher.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Annotation/AbstractAssisted.php b/src/Annotation/AbstractAssisted.php
index 8b3684a3..19644fa5 100644
--- a/src/Annotation/AbstractAssisted.php
+++ b/src/Annotation/AbstractAssisted.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * This file is part of the Ray.Aop package.
  *
diff --git a/src/Arguments.php b/src/Arguments.php
index 8e07016b..2fdccfd8 100644
--- a/src/Arguments.php
+++ b/src/Arguments.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Bind.php b/src/Bind.php
index e5c7bcff..3efc53dc 100644
--- a/src/Bind.php
+++ b/src/Bind.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/BindInterface.php b/src/BindInterface.php
index c9d7f42c..6b391eb7 100644
--- a/src/BindInterface.php
+++ b/src/BindInterface.php
@@ -1,6 +1,8 @@
 <?php
+
+declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/BuiltinMatcher.php b/src/BuiltinMatcher.php
index fa335ea9..ee395534 100644
--- a/src/BuiltinMatcher.php
+++ b/src/BuiltinMatcher.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/CodeGen.php b/src/CodeGen.php
index 6eec2468..cbcaa470 100644
--- a/src/CodeGen.php
+++ b/src/CodeGen.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/CodeGenInterface.php b/src/CodeGenInterface.php
index 00e94454..d5e412d5 100644
--- a/src/CodeGenInterface.php
+++ b/src/CodeGenInterface.php
@@ -1,6 +1,8 @@
 <?php
+
+declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/CodeGenMethod.php b/src/CodeGenMethod.php
index 91dc60ce..a3351b64 100644
--- a/src/CodeGenMethod.php
+++ b/src/CodeGenMethod.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/CodeGenVisitor.php b/src/CodeGenVisitor.php
index 41be5b7a..a3c69a5b 100644
--- a/src/CodeGenVisitor.php
+++ b/src/CodeGenVisitor.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Compiler.php b/src/Compiler.php
index 598e7083..0b8d06e7 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/CompilerInterface.php b/src/CompilerInterface.php
index baaeebb9..6db3a673 100644
--- a/src/CompilerInterface.php
+++ b/src/CompilerInterface.php
@@ -1,6 +1,8 @@
 <?php
+
+declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
index 91154b24..86876072 100644
--- a/src/Exception/ExceptionInterface.php
+++ b/src/Exception/ExceptionInterface.php
@@ -1,6 +1,8 @@
 <?php
+
+declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Exception/InvalidAnnotationException.php b/src/Exception/InvalidAnnotationException.php
index 9e159ff2..309e2bd6 100644
--- a/src/Exception/InvalidAnnotationException.php
+++ b/src/Exception/InvalidAnnotationException.php
@@ -1,6 +1,8 @@
 <?php
+
+declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index 6fa37af7..23da4446 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -1,6 +1,8 @@
 <?php
+
+declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Exception/InvalidMatcherException.php b/src/Exception/InvalidMatcherException.php
index c937c9fe..5b60d060 100644
--- a/src/Exception/InvalidMatcherException.php
+++ b/src/Exception/InvalidMatcherException.php
@@ -1,6 +1,8 @@
 <?php
+
+declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Exception/NotWritableException.php b/src/Exception/NotWritableException.php
index 709e8471..e2a23b12 100644
--- a/src/Exception/NotWritableException.php
+++ b/src/Exception/NotWritableException.php
@@ -1,6 +1,8 @@
 <?php
+
+declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Interceptor.php b/src/Interceptor.php
index d74ac071..26acbc97 100644
--- a/src/Interceptor.php
+++ b/src/Interceptor.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Invocation.php b/src/Invocation.php
index 59a8ee98..48e775ca 100644
--- a/src/Invocation.php
+++ b/src/Invocation.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Joinpoint.php b/src/Joinpoint.php
index 661e7c22..6b77c170 100644
--- a/src/Joinpoint.php
+++ b/src/Joinpoint.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Matcher.php b/src/Matcher.php
index 2b24b127..3f4617d2 100644
--- a/src/Matcher.php
+++ b/src/Matcher.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Matcher/AnnotatedWithMatcher.php b/src/Matcher/AnnotatedWithMatcher.php
index 7f5bd938..f9fc7d17 100644
--- a/src/Matcher/AnnotatedWithMatcher.php
+++ b/src/Matcher/AnnotatedWithMatcher.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Matcher/AnyMatcher.php b/src/Matcher/AnyMatcher.php
index 93a32d2b..911baf21 100644
--- a/src/Matcher/AnyMatcher.php
+++ b/src/Matcher/AnyMatcher.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Matcher/LogicalAndMatcher.php b/src/Matcher/LogicalAndMatcher.php
index 121e4f1e..b95777ad 100644
--- a/src/Matcher/LogicalAndMatcher.php
+++ b/src/Matcher/LogicalAndMatcher.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Matcher/LogicalNotMatcher.php b/src/Matcher/LogicalNotMatcher.php
index 62dae770..282d79a0 100644
--- a/src/Matcher/LogicalNotMatcher.php
+++ b/src/Matcher/LogicalNotMatcher.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Matcher/LogicalOrMatcher.php b/src/Matcher/LogicalOrMatcher.php
index a13f3018..fb0d70a1 100644
--- a/src/Matcher/LogicalOrMatcher.php
+++ b/src/Matcher/LogicalOrMatcher.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Matcher/StartsWithMatcher.php b/src/Matcher/StartsWithMatcher.php
index 253841a8..0b5bf1c2 100644
--- a/src/Matcher/StartsWithMatcher.php
+++ b/src/Matcher/StartsWithMatcher.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Matcher/SubclassesOfMatcher.php b/src/Matcher/SubclassesOfMatcher.php
index 2981de24..9fbb2762 100644
--- a/src/Matcher/SubclassesOfMatcher.php
+++ b/src/Matcher/SubclassesOfMatcher.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/MatcherInterface.php b/src/MatcherInterface.php
index 23643687..fce8fa08 100644
--- a/src/MatcherInterface.php
+++ b/src/MatcherInterface.php
@@ -1,6 +1,8 @@
 <?php
+
+declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/MethodInterceptor.php b/src/MethodInterceptor.php
index a18c40dd..02787a41 100644
--- a/src/MethodInterceptor.php
+++ b/src/MethodInterceptor.php
@@ -1,6 +1,8 @@
 <?php
+
+declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/MethodInvocation.php b/src/MethodInvocation.php
index 89143047..35fc9e1b 100644
--- a/src/MethodInvocation.php
+++ b/src/MethodInvocation.php
@@ -1,6 +1,8 @@
 <?php
+
+declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/ParserFactory.php b/src/ParserFactory.php
index 716eb581..36cd6718 100644
--- a/src/ParserFactory.php
+++ b/src/ParserFactory.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Pointcut.php b/src/Pointcut.php
index 03885cec..49348b61 100644
--- a/src/Pointcut.php
+++ b/src/Pointcut.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/PriorityPointcut.php b/src/PriorityPointcut.php
index b8ba7167..e9da6f06 100644
--- a/src/PriorityPointcut.php
+++ b/src/PriorityPointcut.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Reader.php b/src/Reader.php
index 2e071745..15756f06 100644
--- a/src/Reader.php
+++ b/src/Reader.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/ReflectionClass.php b/src/ReflectionClass.php
index 1d24e06e..47398fbd 100644
--- a/src/ReflectionClass.php
+++ b/src/ReflectionClass.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/ReflectionMethod.php b/src/ReflectionMethod.php
index 66e09509..390cfb62 100644
--- a/src/ReflectionMethod.php
+++ b/src/ReflectionMethod.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/ReflectiveMethodInvocation.php b/src/ReflectiveMethodInvocation.php
index 2974c52d..a881b067 100644
--- a/src/ReflectiveMethodInvocation.php
+++ b/src/ReflectiveMethodInvocation.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/WeavedInterface.php b/src/WeavedInterface.php
index 88479973..44ea5a5c 100644
--- a/src/WeavedInterface.php
+++ b/src/WeavedInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 /**
- * This file is part of the Ray.Aop package
+ * This file is part of the Ray.Aop package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/tests/BindTest.php b/tests/BindTest.php
index 00663fd8..c7556ddd 100644
--- a/tests/BindTest.php
+++ b/tests/BindTest.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/BuiltInMatcherTest.php b/tests/BuiltInMatcherTest.php
index f930b570..00c95375 100644
--- a/tests/BuiltInMatcherTest.php
+++ b/tests/BuiltInMatcherTest.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/CodeGenPhp71.php b/tests/CodeGenPhp71.php
index e2185390..63e5bb1e 100644
--- a/tests/CodeGenPhp71.php
+++ b/tests/CodeGenPhp71.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop;
 
 use PhpParser\BuilderFactory;
diff --git a/tests/CodeGenTest.php b/tests/CodeGenTest.php
index 6819006e..e17b80f7 100644
--- a/tests/CodeGenTest.php
+++ b/tests/CodeGenTest.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop;
 
 use PhpParser\BuilderFactory;
diff --git a/tests/CompilerTest.php b/tests/CompilerTest.php
index 20e06a2e..01cfe705 100644
--- a/tests/CompilerTest.php
+++ b/tests/CompilerTest.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop;
 
 use Doctrine\Common\Annotations\AnnotationReader;
diff --git a/tests/Matcher/AnnotatedWithMatcherTest.php b/tests/Matcher/AnnotatedWithMatcherTest.php
index 2e544d90..23ef487a 100644
--- a/tests/Matcher/AnnotatedWithMatcherTest.php
+++ b/tests/Matcher/AnnotatedWithMatcherTest.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Matcher;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Matcher/AnyMatcherTest.php b/tests/Matcher/AnyMatcherTest.php
index 26e3e348..3eb808be 100644
--- a/tests/Matcher/AnyMatcherTest.php
+++ b/tests/Matcher/AnyMatcherTest.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Matcher;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Matcher/LogicalAndMatcherTest.php b/tests/Matcher/LogicalAndMatcherTest.php
index 87198e31..facc989f 100644
--- a/tests/Matcher/LogicalAndMatcherTest.php
+++ b/tests/Matcher/LogicalAndMatcherTest.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Matcher;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Matcher/LogicalNotMatcherTest.php b/tests/Matcher/LogicalNotMatcherTest.php
index a9af6c6a..2300104a 100644
--- a/tests/Matcher/LogicalNotMatcherTest.php
+++ b/tests/Matcher/LogicalNotMatcherTest.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Matcher;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Matcher/LogicalOrMatcherTest.php b/tests/Matcher/LogicalOrMatcherTest.php
index d888d55d..8f10787d 100644
--- a/tests/Matcher/LogicalOrMatcherTest.php
+++ b/tests/Matcher/LogicalOrMatcherTest.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Matcher;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Matcher/StartsWithMatcherTest.php b/tests/Matcher/StartsWithMatcherTest.php
index d0e8a70c..540af4a3 100644
--- a/tests/Matcher/StartsWithMatcherTest.php
+++ b/tests/Matcher/StartsWithMatcherTest.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Matcher;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Matcher/SubclassesOfMatcherTest.php b/tests/Matcher/SubclassesOfMatcherTest.php
index ad1d2257..7b879965 100644
--- a/tests/Matcher/SubclassesOfMatcherTest.php
+++ b/tests/Matcher/SubclassesOfMatcherTest.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop\Matcher;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/MatcherTest.php b/tests/MatcherTest.php
index 1b33d288..cd58343a 100644
--- a/tests/MatcherTest.php
+++ b/tests/MatcherTest.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/ParserFactoryTest.php b/tests/ParserFactoryTest.php
index 3cf1502a..dc7c4a91 100644
--- a/tests/ParserFactoryTest.php
+++ b/tests/ParserFactoryTest.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/PointcutTest.php b/tests/PointcutTest.php
index 5791fe46..c2194506 100644
--- a/tests/PointcutTest.php
+++ b/tests/PointcutTest.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/ReflectiveMethodInvocationTest.php b/tests/ReflectiveMethodInvocationTest.php
index 39002fe4..d80842ab 100644
--- a/tests/ReflectiveMethodInvocationTest.php
+++ b/tests/ReflectiveMethodInvocationTest.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 13633dcf..87db3e4e 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,5 +1,11 @@
 <?php
 
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 $loader = require dirname(__DIR__) . '/vendor/autoload.php';
 /* @var $loader \Composer\Autoload\ClassLoader */
 \Doctrine\Common\Annotations\AnnotationRegistry::registerLoader([$loader, 'loadClass']);
diff --git a/tests/script/compile.php b/tests/script/compile.php
index 253ce617..a1375d6a 100644
--- a/tests/script/compile.php
+++ b/tests/script/compile.php
@@ -1,4 +1,11 @@
 <?php
+
+declare(strict_types=1);
+/**
+ * This file is part of the Ray.Aop package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\Aop;
 
 $loader = require dirname(dirname(__DIR__)) . '/vendor/autoload.php';