v0.10.0

.gitattributes

@@ -1,4 +1,5 @@
 /bin/coveralls.sh export-ignore
+/bin/composer-set-config.php export-ignore
 /.coveralls.yml export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore

.travis.yml

@@ -5,6 +5,7 @@ install:
   - mv .git ~.git
 
 dist: trusty
+sudo: false
 
 php:
   - 5.4
@@ -27,10 +28,30 @@ matrix:
     - php: 5.3
       dist: precise
 
+    - php: hhvm
+      env: HHVM_PHP7=1
+
+    - php: hhvm-3.12
+      env: HHVM_PHP7=1
+
+    - php: hhvm-3.15
+      env: HHVM_PHP7=1
+
+    - php: hhvm-3.18
+      env: HHVM_PHP7=1
+
+    - php: hhvm-nightly
+      env: HHVM_PHP7=1
+
+before_script:
+  - if [ ${HHVM_PHP7+x} ]; then bin/composer-set-config.php php 7.0; fi
+  - if [ ${HHVM_PHP7+x} ]; then export EXTRA_CONFIG='-d hhvm.php7.all=1'; else export EXTRA_CONFIG=''; fi
+
 script:
-  - php -r "echo phpversion() . PHP_EOL;"
-  - travis_wait composer update --prefer-lowest --no-interaction && php -d error_reporting=$(php -r "var_export(E_ALL & ~E_DEPRECATED);") vendor/bin/phpunit
-  - travis_wait composer update --no-interaction && vendor/bin/phpunit
+  - php ${EXTRA_CONFIG} -r "echo phpversion() . PHP_EOL;"
+
+  - if [ ${HHVM_PHP7+x} ]; then echo "Do not test the lowest dependencies on HHVM with PHP7 support"; else travis_wait composer update --prefer-lowest --no-interaction && php -d hhvm.jit=0 -d error_reporting=$(php -r "var_export(E_ALL & ~E_DEPRECATED);") vendor/bin/phpunit; fi
+  - travis_wait composer update --no-interaction && php -d hhvm.jit=0 ${EXTRA_CONFIG} vendor/bin/phpunit
 
 after_script:
   - mv ~.git .git

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.10.0
+
+* Removed `Awesomite\StackTrace\Arguments\Values\MultipleValues`
+* Added tests for HHVM with flag `hhvm.php7.all=1`
+* `Awesomite\StackTrace\StackTrace::unserialize` throws `Awesomite\StackTrace\Exceptions\LogicException` instead of `LogicException`
+
 ## 0.9.2
 
 * Fixed phpdoc for `Awesomite\StackTrace\Arguments\ArgumentsInterface::getIterator`

bin/composer-set-config.php

@@ -0,0 +1,21 @@
+#!/usr/bin/env php
+<?php
+
+global $argv;
+
+$handle = function ($scriptName, $key, $value) {
+    $jsonPath = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'composer.json';
+    $json = json_decode(file_get_contents($jsonPath), true);
+    if (!isset($json['config'])) {
+        $json['config'] = array();
+    }
+    $json['config'][$key] = $value;
+
+    $options = JSON_UNESCAPED_UNICODE;
+    if (defined('JSON_PRETTY_PRINT')) {
+        $options |= constant('JSON_PRETTY_PRINT');
+    }
+    file_put_contents($jsonPath, json_encode($json, $options));
+};
+
+call_user_func_array($handle, $argv);

composer.json

@@ -14,14 +14,15 @@
         }
     },
     "autoload-dev": {
+        "files": ["tests/hhvm-polyfill/exceptions.php.polyfill"],
         "psr-4": {
             "Awesomite\\StackTrace\\": "tests/"
         }
     },
     "require": {
         "php": "^5.3 || ^7.0",
         "composer/semver": "^1.4.2",
-        "awesomite/var-dumper": "^0.6.1",
+        "awesomite/var-dumper": "^0.6.1 || ^0.7.0",
         "awesomite/iterators": "^0.2.0"
     },
     "minimum-stability": "dev",
@@ -33,7 +34,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.9-dev"
+            "dev-master": "0.10-dev"
         }
     }
 }

src/Arguments/Arguments.php

@@ -3,7 +3,6 @@
 namespace Awesomite\StackTrace\Arguments;
 
 use Awesomite\StackTrace\Arguments\Declarations\Declaration;
-use Awesomite\StackTrace\Arguments\Values\MultipleValues;
 use Awesomite\StackTrace\Arguments\Values\ValueInterface;
 use Awesomite\StackTrace\Functions\FunctionInterface;
 
@@ -42,12 +41,6 @@ public function getIterator()
             foreach ($this->function->getReflection()->getParameters() as $parameter) {
                 $declaration = new Declaration($parameter);
 
-                if ($declaration->isVariadic()) {
-                    $result[] = new Argument($declaration, $arguments ? new MultipleValues($arguments) : null);
-                    $arguments = array();
-                    continue;
-                }
-
                 if ($arguments) {
                     $result[] = new Argument($declaration, array_shift($arguments));
                     continue;

src/StackTrace.php

@@ -5,6 +5,7 @@
 use Awesomite\Iterators\CallbackIterator;
 use Awesomite\StackTrace\Arguments\Values\DeserializedValue;
 use Awesomite\StackTrace\Arguments\Values\Value;
+use Awesomite\StackTrace\Exceptions\LogicException;
 use Awesomite\StackTrace\SourceCode\File;
 use Awesomite\StackTrace\Steps\Step;
 use Awesomite\StackTrace\Steps\StepInterface;
@@ -17,8 +18,8 @@
  */
 class StackTrace implements StackTraceInterface
 {
-    const VERSION = '0.9.2';
-    const CONSTRAINTS_VERSION = '>=0.1.0 <0.10.0';
+    const VERSION = '0.10.0';
+    const CONSTRAINTS_VERSION = '>=0.1.0 <0.11.0';
 
     private $arrayStackTrace;
 
@@ -92,7 +93,7 @@ public function unserialize($serialized)
         $data = unserialize($serialized);
         if (!Semver::satisfies($data['__version'], static::CONSTRAINTS_VERSION)) {
             $message = 'Cannot use incompatible version to unserialize stack trace (serialized by: %s, current: %s).';
-            throw new \LogicException(sprintf($message, $data['__version'], static::VERSION));
+            throw new LogicException(sprintf($message, $data['__version'], static::VERSION));
         }
         $this->arrayStackTrace = $data['steps'];
         $this->unserialized = true;
@@ -160,32 +161,38 @@ public function setVarDumper(VarDumperInterface $varDumper)
      */
     public function convertStep(array $step, $toSerialize = false)
     {
-        $result = array();
-        foreach ($step as $key => $value) {
-            $result[$key] = $value;
-        }
-
         if ($this->withoutArgs) {
-            $result['args'] = array();
-        } else if (empty($result[Constants::KEY_ARGS_CONVERTED]) && isset($result['args'])) {
-            $result['args'] = $this->convertArgs($result['args']);
-            $result[Constants::KEY_ARGS_CONVERTED] = true;
+            $step['args'] = array();
+        } else if (empty($step[Constants::KEY_ARGS_CONVERTED]) && isset($step['args'])) {
+            $maxArgs = null;
+            if (version_compare(PHP_VERSION, '5.6') >= 0) {
+                $fakeStep = new Step($step);
+                $reflectionFn = $fakeStep->hasCalledFunction() && $fakeStep->getCalledFunction()->hasReflection()
+                    ? $fakeStep->getCalledFunction()->getReflection()
+                    : null;
+                if (!is_null($reflectionFn) && $reflectionFn->isVariadic()) {
+                    $maxArgs = count($reflectionFn->getParameters());
+                }
+            }
+
+            $step['args'] = $this->convertArgs($step['args'], $maxArgs);
+            $step[Constants::KEY_ARGS_CONVERTED] = true;
         }
 
         if (
             !$toSerialize
-            && !isset($result[Constants::KEY_FILE_OBJECT])
-            && isset($result['file'])
-            && isset($this->files[$result['file']])
+            && !isset($step[Constants::KEY_FILE_OBJECT])
+            && isset($step['file'])
+            && isset($this->files[$step['file']])
         ) {
-            $result[Constants::KEY_FILE_OBJECT] = $this->files[$result['file']];
+            $step[Constants::KEY_FILE_OBJECT] = $this->files[$step['file']];
         }
 
-        if (isset($result['object'])) {
-            unset($result['object']);
+        if (isset($step['object'])) {
+            unset($step['object']);
         }
 
-        return $result;
+        return $step;
     }
 
     private function getVarDumper()
@@ -197,19 +204,32 @@ private function getVarDumper()
         return $this->varDumper;
     }
 
-    private function convertArgs(array $args)
+    /**
+     * @param array $inputArgs
+     * @param int|null $maxArgs
+     * @return array
+     */
+    private function convertArgs(array $inputArgs, $maxArgs)
     {
         /**
-         * input has to be copied to different array,
-         * because array $args returned by debug_backtrace function contains references from PHP 7.0
+         * debug_backtrace()[$x]['args'] can contain references
          */
-        $result = array();
+        $args = array();
+        foreach ($inputArgs as $key => $value) {
+            $args[$key] = $value;
+        }
+
+        if (!is_null($maxArgs) && $maxArgs <= count($args)) {
+            $preparedCopy = $args;
+            $args = array_slice($preparedCopy, 0, $maxArgs - 1);
+            $args[] = array_slice($preparedCopy, $maxArgs - 1);
+        }
 
         foreach ($args as $key => $value) {
-            $result[$key] = $this->convertArg($value);
+            $args[$key] = $this->convertArg($value);
         }
 
-        return $result;
+        return $args;
     }
 
     private function convertArg($value)

src/StackTraceFactory.php

@@ -6,6 +6,8 @@
 
 class StackTraceFactory
 {
+    private static $rootExceptionClass = null;
+
     /**
      * @param int $stepLimit
      * @param bool $ignoreArgs
@@ -45,14 +47,36 @@ public function create($stepLimit = 0, $ignoreArgs = false)
      */
     public function createByThrowable($exception, $stepLimit = 0, $ignoreArgs = false)
     {
-        $exceptionClass = version_compare(PHP_VERSION, '7.0') >= 0 ? '\Throwable' : '\Exception';
-        if (!$exception instanceof $exceptionClass) {
-            throw new InvalidArgumentException("Argument should be an instance of {$exceptionClass}!");
+        $exceptionClass = $this->getRootExceptionClass();
+        if (!is_object($exception) || !$exception instanceof $exceptionClass) {
+            throw new InvalidArgumentException(sprintf(
+                "Expected argument of type %s, %s given",
+                $exceptionClass,
+                is_object($exception) ? get_class($exception) : gettype($exception)
+            ));
         }
 
         return $this->createBy($exception, $stepLimit, $ignoreArgs);
     }
 
+    /**
+     * HHVM still does not support \Throwable interface
+     *
+     * @return null|string
+     */
+    private function getRootExceptionClass()
+    {
+        if (is_null(self::$rootExceptionClass)) {
+            $reflection = new \ReflectionClass('\Exception');
+            $throwableExists = interface_exists('\Throwable', false);
+            self::$rootExceptionClass = $throwableExists && $reflection->implementsInterface('\Throwable')
+                ? '\Throwable'
+                : '\Exception';
+        }
+
+        return self::$rootExceptionClass;
+    }
+
     /**
      * @param \Exception|\Throwable $exception
      * @param int $stepLimit

tests/Arguments/ArgumentsTest.php

@@ -23,6 +23,7 @@ class ArgumentsTest extends BaseTestCase
     public function testAll(Arguments $arguments, $count)
     {
         $this->assertSame($count, count($arguments));
+        $this->assertSame(count($arguments), count(iterator_to_array($arguments)));
         foreach ($arguments as $argument) {
             $this->assertTrue($argument instanceof ArgumentInterface);
         }
@@ -60,7 +61,7 @@ private function providerVariadic()
         ));
 
         return array(
-            $this->createByRawValues(array('1', '2', '3'), $function),
+            $this->createByRawValues(array(array('1', '2', '3')), $function),
             1
         );
     }