Merge pull request #82 from koriym/strict

declare(strict_types=1)
ray-di · Mar 2, 2018 · 38822b0 · 38822b0
2 parents f908124 + 9b9667c
commit 38822b0
Show file tree

Hide file tree

Showing 79 changed files with 327 additions and 45 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
  */