Feature - #241 - support scalar type hints

.travis.coverage.sh

@@ -1,5 +1,5 @@
 set -x
-if [ "$TRAVIS_PHP_VERSION" = '5.6' ] ; then
+if [ "$TRAVIS_PHP_VERSION" = '7.0' ] ; then
     wget https://scrutinizer-ci.com/ocular.phar
     php ocular.phar code-coverage:upload --format=php-clover ./clover.xml
 fi

.travis.yml

@@ -3,8 +3,7 @@ language: php
 sudo: false
 
 php:
-  - 5.6
-  - 7
+  - 7.0
   - hhvm
 
 env:
@@ -29,4 +28,4 @@ matrix:
 
 after_script:
   - sh .travis.coverage.sh
-  - ./vendor/bin/couscous travis-auto-deploy --php-version=5.6
+  - ./vendor/bin/couscous travis-auto-deploy --php-version=7.0

composer.json

@@ -19,8 +19,8 @@
         }
     ],
     "require": {
-        "php":                     "~5.6|~7.0",
-        "zendframework/zend-code": "^2.6.1"
+        "php":                     "~7.0",
+        "zendframework/zend-code": "dev-feature/php7-compliance@DEV"
     },
     "require-dev": {
         "ext-phar":                    "*",

src/ProxyManager/Generator/MethodGenerator.php

@@ -31,131 +31,14 @@
 class MethodGenerator extends ZendMethodGenerator
 {
     /**
-     * @var bool
-     */
-    protected $returnsReference = false;
-
-    /**
-     * @param boolean $returnsReference
-     */
-    public function setReturnsReference($returnsReference)
-    {
-        $this->returnsReference = (bool) $returnsReference;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function returnsReference()
-    {
-        return $this->returnsReference;
-    }
-
-    /**
-     * @override enforces generation of \ProxyManager\Generator\MethodGenerator
-     *
      * {@inheritDoc}
      */
     public static function fromReflection(MethodReflection $reflectionMethod)
     {
-        /* @var $method self */
-        $method = new static();
+        $method = parent::fromReflection($reflectionMethod);
 
-        $method->setSourceContent($reflectionMethod->getContents(false));
-        $method->setSourceDirty(false);
-
-        if ($reflectionMethod->getDocComment() != '') {
-            $method->setDocBlock(DocBlockGenerator::fromReflection($reflectionMethod->getDocBlock()));
-        }
-
-        $method->setFinal($reflectionMethod->isFinal());
-        $method->setVisibility(self::extractVisibility($reflectionMethod));
-
-        foreach ($reflectionMethod->getParameters() as $reflectionParameter) {
-            $method->setParameter(ParameterGenerator::fromReflection($reflectionParameter));
-        }
-
-        $method->setStatic($reflectionMethod->isStatic());
-        $method->setName($reflectionMethod->getName());
-        $method->setBody($reflectionMethod->getBody());
-        $method->setReturnsReference($reflectionMethod->returnsReference());
+        $method->setInterface(false);
 
         return $method;
     }
-
-    /**
-     * Retrieves the visibility for the given method reflection
-     *
-     * @param MethodReflection $reflectionMethod
-     *
-     * @return string
-     */
-    private static function extractVisibility(MethodReflection $reflectionMethod)
-    {
-        if ($reflectionMethod->isPrivate()) {
-            return static::VISIBILITY_PRIVATE;
-        }
-
-        if ($reflectionMethod->isProtected()) {
-            return static::VISIBILITY_PROTECTED;
-        }
-
-        return static::VISIBILITY_PUBLIC;
-    }
-
-    /**
-     * @override fixes by-reference return value in zf2's method generator
-     *
-     * {@inheritDoc}
-     */
-    public function generate()
-    {
-        $output = '';
-        $indent = $this->getIndentation();
-
-        if (null !== ($docBlock = $this->getDocBlock())) {
-            $docBlock->setIndentation($indent);
-
-            $output .= $docBlock->generate();
-        }
-
-        $output .= $indent . $this->generateMethodDeclaration() . self::LINE_FEED . $indent . '{' . self::LINE_FEED;
-
-        if ($this->body) {
-            $output .= preg_replace('#^(.+?)$#m', $indent . $indent . '$1', trim($this->body))
-                . self::LINE_FEED;
-        }
-
-        $output .= $indent . '}' . self::LINE_FEED;
-
-        return $output;
-    }
-
-    /**
-     * @return string
-     */
-    private function generateMethodDeclaration()
-    {
-        $output = $this->generateVisibility()
-            . ' function '
-            . (($this->returnsReference()) ? '& ' : '')
-            . $this->getName() . '(';
-
-        $parameterOutput = [];
-
-        foreach ($this->getParameters() as $parameter) {
-            $parameterOutput[] = $parameter->generate();
-        }
-
-        return $output . implode(', ', $parameterOutput) . ')';
-    }
-
-    /**
-     * @return string
-     */
-    private function generateVisibility()
-    {
-        return $this->isAbstract() ? 'abstract ' : (($this->isFinal()) ? 'final ' : '')
-            . ($this->getVisibility() . (($this->isStatic()) ? ' static' : ''));
-    }
 }

src/ProxyManager/ProxyGenerator/AccessInterceptor/MethodGenerator/SetMethodPrefixInterceptor.php

@@ -20,7 +20,7 @@
 
 use Closure;
 use ProxyManager\Generator\MethodGenerator;
-use ProxyManager\Generator\ParameterGenerator;
+use Zend\Code\Generator\ParameterGenerator;
 use Zend\Code\Generator\PropertyGenerator;
 
 /**

src/ProxyManager/ProxyGenerator/AccessInterceptor/MethodGenerator/SetMethodSuffixInterceptor.php

@@ -20,7 +20,7 @@
 
 use Closure;
 use ProxyManager\Generator\MethodGenerator;
-use ProxyManager\Generator\ParameterGenerator;
+use Zend\Code\Generator\ParameterGenerator;
 use Zend\Code\Generator\PropertyGenerator;
 
 /**

src/ProxyManager/ProxyGenerator/AccessInterceptorScopeLocalizer/MethodGenerator/BindProxyProperties.php

@@ -19,7 +19,7 @@
 namespace ProxyManager\ProxyGenerator\AccessInterceptorScopeLocalizer\MethodGenerator;
 
 use ProxyManager\Generator\MethodGenerator;
-use ProxyManager\Generator\ParameterGenerator;
+use Zend\Code\Generator\ParameterGenerator;
 use ProxyManager\ProxyGenerator\Util\Properties;
 use ReflectionClass;
 use Zend\Code\Generator\PropertyGenerator;

src/ProxyManager/ProxyGenerator/AccessInterceptorScopeLocalizer/MethodGenerator/MagicGet.php

@@ -19,7 +19,7 @@
 namespace ProxyManager\ProxyGenerator\AccessInterceptorScopeLocalizer\MethodGenerator;
 
 use ProxyManager\Generator\MagicMethodGenerator;
-use ProxyManager\Generator\ParameterGenerator;
+use Zend\Code\Generator\ParameterGenerator;
 use ProxyManager\ProxyGenerator\AccessInterceptorScopeLocalizer\MethodGenerator\Util\InterceptorGenerator;
 use ProxyManager\ProxyGenerator\Util\PublicScopeSimulator;
 use ReflectionClass;