Merge pull request #77 from koriym/php7.0

Support PHP 7.0
ray-di · Aug 20, 2017 · e4a5965 · e4a5965
2 parents 6bbd709 + 114be80
commit e4a5965
Show file tree

Hide file tree

Showing 12 changed files with 68 additions and 48 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,9 @@ language: php
 sudo: false
 dist: trusty
 php:
+  - 7.0
   - 7.1
+  - 7.2
 cache:
   directories:
     - vendor
@@ -16,7 +18,7 @@ before_script:
   - composer update $DEPENDENCIES
 script:
   - ./vendor/bin/phpunit --coverage-clover=coverage.clover;
-  - if [ "$TRAVIS_PHP_VERSION" = "7.1" ]; then wget http://cs.sensiolabs.org/download/php-cs-fixer-v2.phar && php php-cs-fixer-v2.phar fix --config=.php_cs -v --dry-run --using-cache=no --path-mode=intersection `git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE`; fi
+  - if [ "$TRAVIS_PHP_VERSION" = "7.1" ]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.4.0/php-cs-fixer.phar && php php-cs-fixer.phar fix --config=.php_cs -v --dry-run --using-cache=no --path-mode=intersection `git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE`; fi
 
 after_script:
   - if [ "$TRAVIS_PHP_VERSION" = "7.1" ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
diff --git a/README.md b/README.md
@@ -235,7 +235,7 @@ The recommended way to install Ray.Aop is through [Composer](https://github.com/
 
 ```bash
 # Add Ray.Aop as a dependency
-$ composer require ray/aop ~2.0
+$ composer require ray/aop ^2.0
 ```
 
 ## Testing Ray.Aop

diff --git a/composer.json b/composer.json
@@ -12,8 +12,8 @@
         }
     ],
     "require": {
-        "php": ">=7.1.0",
-        "doctrine/annotations": "^1.3",
+        "php": ">=7.0.0",
+        "doctrine/annotations": "^1.2",
         "nikic/php-parser": "^3.0"
     },
     "require-dev": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -2,6 +2,7 @@
     <testsuites>
         <testsuite>
             <directory suffix="Test.php">tests</directory>
+            <file phpVersion="7.1.0" phpVersionOperator=">=">tests/CodeGenPhp71.php</file>
         </testsuite>
     </testsuites>
     <filter>

diff --git a/src/Bind.php b/src/Bind.php
@@ -87,15 +87,15 @@ public function getAnnotationPointcuts(array &$pointcuts) : array
         return $keyPointcuts;
     }
 
-    private function annotatedMethodsMatch(\ReflectionClass $class, array &$pointcuts) : void
+    private function annotatedMethodsMatch(\ReflectionClass $class, array &$pointcuts)
     {
         $methods = $class->getMethods(ReflectionMethod::IS_PUBLIC);
         foreach ($methods as $method) {
             $this->annotatedMethodMatch($class, $method, $pointcuts);
         }
     }
 
-    private function annotatedMethodMatch(\ReflectionClass $class, \ReflectionMethod $method, array $pointcuts) : void
+    private function annotatedMethodMatch(\ReflectionClass $class, \ReflectionMethod $method, array $pointcuts)
     {
         $annotations = $this->reader->getMethodAnnotations($method);
         // priority bind
@@ -113,7 +113,7 @@ private function annotatedMethodMatch(\ReflectionClass $class, \ReflectionMethod
         }
     }
 
-    private function annotatedMethodMatchBind(\ReflectionClass $class, \ReflectionMethod $method, Pointcut $pointCut) : void
+    private function annotatedMethodMatchBind(\ReflectionClass $class, \ReflectionMethod $method, Pointcut $pointCut)
     {
         $isMethodMatch = $pointCut->methodMatcher->matchesMethod($method, $pointCut->methodMatcher->getArguments());
         if (! $isMethodMatch) {

diff --git a/src/CodeGenMethod.php b/src/CodeGenMethod.php
@@ -148,7 +148,7 @@ private function getMethodInsideStatement() : array
     /**
      * @codeCoverageIgnore
      */
-    private function setTypeHint(\ReflectionParameter $param, Param $paramStmt, \ReflectionClass $typeHint = null) : void
+    private function setTypeHint(\ReflectionParameter $param, Param $paramStmt, \ReflectionClass $typeHint = null)
     {
         if ($typeHint) {
             $paramStmt->setTypeHint($typeHint->name);
@@ -161,7 +161,7 @@ private function setTypeHint(\ReflectionParameter $param, Param $paramStmt, \Ref
         }
     }
 
-    private function setDefault(\ReflectionParameter $param, Param $paramStmt) : void
+    private function setDefault(\ReflectionParameter $param, Param $paramStmt)
     {
         if ($param->isDefaultValueAvailable()) {
             $paramStmt->setDefault($param->getDefaultValue());
@@ -173,19 +173,17 @@ private function setDefault(\ReflectionParameter $param, Param $paramStmt) : voi
         }
     }
 
-    private function setParameterType(\ReflectionParameter $param, Param $paramStmt) : void
+    private function setParameterType(\ReflectionParameter $param, Param $paramStmt)
     {
         $type = $param->getType();
         if ($type) {
             $paramStmt->setTypeHint((string) $type);
         }
     }
 
-    private function setReturnType(\ReflectionType $returnType, Method $methodStmt) : void
+    private function setReturnType(\ReflectionType $returnType, Method $methodStmt)
     {
-        $type = $returnType->allowsNull() ? new NullableType($returnType->getName()) : $returnType->getName();
-        if ($returnType && method_exists($methodStmt, 'setReturnType')) {
-            $methodStmt->setReturnType($type); // @codeCoverageIgnore
-        }
+        $type = $returnType->allowsNull() ? new NullableType($returnType->getName()) : (string) $returnType;
+        $methodStmt->setReturnType($type);
     }
 }
diff --git a/src/CodeGenVisitor.php b/src/CodeGenVisitor.php
@@ -28,7 +28,7 @@ public function __invoke() : array
         return $this->selectedNodes;
     }
 
-    public function enterNode(Node $node) : void
+    public function enterNode(Node $node)
     {
         if ($node instanceof Use_ || $node instanceof Declare_) {
             $this->selectedNodes[] = $node; // @codeCoverageIgnore

diff --git a/src/Matcher/AnyMatcher.php b/src/Matcher/AnyMatcher.php
@@ -43,7 +43,7 @@ public function matchesMethod(\ReflectionMethod $method, array $arguments) : boo
         return ! ($this->isMagicMethod($method->name) || $this->isBuiltinMethod($method->name));
     }
 
-    private function setBuildInMethods() : void
+    private function setBuildInMethods()
     {
         $methods = (new \ReflectionClass('\ArrayObject'))->getMethods();
         foreach ($methods as $method) {

diff --git a/src/ReflectionClass.php b/src/ReflectionClass.php
@@ -20,7 +20,7 @@ class ReflectionClass extends \ReflectionClass implements Reader
      *
      * @param WeavedInterface $object
      */
-    public function setObject(WeavedInterface $object) : void
+    public function setObject(WeavedInterface $object)
     {
         $this->object = $object;
     }

diff --git a/src/ReflectionMethod.php b/src/ReflectionMethod.php
@@ -23,7 +23,7 @@ final class ReflectionMethod extends \ReflectionMethod implements Reader
     /**
      * Set dependencies
      */
-    public function setObject(WeavedInterface $object, \ReflectionMethod $method) : void
+    public function setObject(WeavedInterface $object, \ReflectionMethod $method)
     {
         $this->object = $object;
         $this->method = $method->name;

diff --git a/tests/CodeGenPhp71.php b/tests/CodeGenPhp71.php
@@ -0,0 +1,48 @@
+<?php
+namespace Ray\Aop;
+
+use PhpParser\BuilderFactory;
+use PhpParser\PrettyPrinter\Standard;
+use PHPUnit\Framework\TestCase;
+
+class CodeGenPhp71 extends TestCase
+{
+    /**
+     * @var CodeGen
+     */
+    private $codeGen;
+
+    public function setUp()
+    {
+        $this->codeGen = new CodeGen((new ParserFactory)->newInstance(), new BuilderFactory, new Standard);
+    }
+
+    public function testReturnTypeVoid()
+    {
+        $bind = new Bind;
+        $bind->bindInterceptors('returnTypeVoid', []);
+        $code = $this->codeGen->generate('a', new \ReflectionClass(FakePhp71ReturnTypeClass::class), $bind);
+        $expected = 'function returnTypeVoid() : void';
+        $this->assertContains($expected, $code);
+    }
+
+    public function testReturnTypeNullable()
+    {
+        $bind = new Bind;
+        $bind->bindInterceptors('returnNullable', []);
+        $code = $this->codeGen->generate('a', new \ReflectionClass(FakePhp71ReturnTypeClass::class), $bind);
+        $expected = 'function returnNullable(string $str) : ?';
+        $this->assertContains($expected, $code);
+
+        return $code;
+    }
+
+    /**
+     * @depends testReturnTypeNullable
+     */
+    public function testContainsStatement(string $code)
+    {
+        $this->assertContains("declare (strict_types=1);\n", $code);
+        $this->assertContains("use Composer\Autoload;\n", $code);
+    }
+}
diff --git a/tests/CodeGenTest.php b/tests/CodeGenTest.php
@@ -43,33 +43,4 @@ public function testReturnType()
         $expected = 'function returnTypeArray() : array';
         $this->assertContains($expected, $code);
     }
-
-    public function testReturnTypeVoid()
-    {
-        $bind = new Bind;
-        $bind->bindInterceptors('returnTypeVoid', []);
-        $code = $this->codeGen->generate('a', new \ReflectionClass(FakePhp71ReturnTypeClass::class), $bind);
-        $expected = 'function returnTypeVoid() : void';
-        $this->assertContains($expected, $code);
-    }
-
-    public function testReturnTypeNullable()
-    {
-        $bind = new Bind;
-        $bind->bindInterceptors('returnNullable', []);
-        $code = $this->codeGen->generate('a', new \ReflectionClass(FakePhp71ReturnTypeClass::class), $bind);
-        $expected = 'function returnNullable(string $str) : ?';
-        $this->assertContains($expected, $code);
-
-        return $code;
-    }
-
-    /**
-     * @depends testReturnTypeNullable
-     */
-    public function testContainsStatement(string $code)
-    {
-        $this->assertContains("declare (strict_types=1);\n", $code);
-        $this->assertContains("use Composer\Autoload;\n", $code);
-    }
 }