Massive updates due to feedback. Travis stuff should work now as well.

.scrutinizer.yml

@@ -0,0 +1,20 @@
+filter:
+    paths:
+        - src/
+
+before_commands:
+    - 'composer install --no-interaction --prefer-source --dev'
+    - 'cp phpunit.xml.dist phpunit.xml'
+
+tools:
+    sensiolabs_security_checker: true
+    php_code_coverage:
+        test_command: vendor/bin/phpunit
+        config_path: phpunit.xml
+    php_hhvm:
+        config:
+            unknown_class: true
+            unknown_base_class: true
+            unknown_function: true
+            unknown_object_method: true
+            unknown_trait: true

.travis.yml

@@ -1,10 +1,20 @@
 language: php
+
 php:
   - 5.3
   - 5.4
   - 5.5
+  - hhvm
+
 before_script:
-- sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
-- cp phpunit.xml.dist phpunit.xml
-- composer install --dev
-script: vendor/bin/phpunit --coverage-text
+  - composer self-update
+  - composer install --no-interaction --prefer-source --dev
+  - cp phpunit.xml.dist phpunit.xml
+
+script:
+  - vendor/bin/phpunit
+
+matrix:
+  allow_failures:
+    - php: hhvm
+  fast_finish: true

README.md

@@ -19,7 +19,7 @@ I'm not joking, *you really can serialize a PHP closure*!
 
 require 'vendor/autoload.php';
 
-use Jeremeamia\SuperClosure\SerializableClosure;
+use SuperClosure\SerializableClosure;
 
 $greeting = 'Hello';
 $helloWorld = new SerializableClosure(function ($name = 'World') use ($greeting) {

composer.json

@@ -21,9 +21,7 @@
         "phpunit/phpunit": "~3.7"
     },
     "autoload": {
-        "files": [
-            "autoload.php",
-            "src/functions.php"
-        ]
+        "psr-4": {"SuperClosure\\": "src/SuperClosure/"},
+        "files": ["src/functions.php"]
     }
 }

demo/factorial.php

@@ -6,7 +6,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-use Jeremeamia\SuperClosure\SerializableClosure;
+use SuperClosure\SerializableClosure;
 
 $factorial = new SerializableClosure(function ($n) use (&$factorial) {
     return ($n <= 1) ? 1 : $n * $factorial($n - 1);

demo/hello-world.php

@@ -12,7 +12,7 @@
 $helloWorld('Jeremy');
 //> Hello, Jeremy!
 
-$serialized = serialize_closure($helloWorld);
+$serialized = SuperClosure\serialize($helloWorld);
 $unserialized = unserialize($serialized);
 
 $unserialized();

src/ClosureBinding.php → src/SuperClosure/ClosureBinding.php

@@ -1,7 +1,16 @@
 <?php
 
-namespace Jeremeamia\SuperClosure;
+namespace SuperClosure;
 
+/**
+ * A value object representing the binding of a PHP Closure.
+ *
+ * Closures, as of 5.4+, are bound to an object and a scope depending on where they are declared, or if they were
+ * created via `Closure::bind` or `Closure::bindTo`. The binding information is especially important if the closure
+ * references `$this` or `self` inside the function body.
+ *
+ * @package SuperClosure
+ */
 class ClosureBinding
 {
     /**
@@ -36,17 +45,17 @@ public static function fromReflection(\ReflectionFunction $reflection)
             throw new \InvalidArgumentException('Please provide the reflection of a closure.');
         }
 
+        // Only closures in PHP 5.4+ have bindings
         if (PHP_VERSION_ID < 50400) {
-            // Only closures in PHP 5.4+ have bindings
             return new self(null, null);
-        } else {
-            /** @var \ReflectionFunction $scope */
-            if ($scope = $reflection->getClosureScopeClass()) {
-                $scope = $scope->getName();
-            }
+        }
 
-            return new self($reflection->getClosureThis(), $scope);
+        /** @var \ReflectionFunction $scope */
+        if ($scope = $reflection->getClosureScopeClass()) {
+            $scope = $scope->getName();
         }
+
+        return new self($reflection->getClosureThis(), $scope);
     }
 
     /**

src/ClosureParser/AbstractClosureContext.php → src/SuperClosure/ClosureParser/AbstractClosureContext.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Jeremeamia\SuperClosure\ClosureParser;
+namespace SuperClosure\ClosureParser;
 
-use Jeremeamia\SuperClosure\ClosureBinding;
+use SuperClosure\ClosureBinding;
 
 abstract class AbstractClosureContext implements ClosureContextInterface
 {

src/ClosureParser/AbstractClosureParser.php → src/SuperClosure/ClosureParser/AbstractClosureParser.php

@@ -1,22 +1,25 @@
 <?php
 
-namespace Jeremeamia\SuperClosure\ClosureParser;
+namespace SuperClosure\ClosureParser;
 
-use Jeremeamia\SuperClosure\SuperClosure;
+use SuperClosure\SuperClosure;
 
 abstract class AbstractClosureParser implements ClosureParserInterface
 {
     /**
-     * @var array
+     * @var Options
      */
     protected $options;
 
     /**
-     * @param array $options
+     * @param Options $options
      */
-    public function __construct(array $options = array())
+    public function __construct(Options $options = null)
     {
-        $this->options = $options + $this->getDefaultOptions();
+        $this->options = $this->getDefaultOptions();
+        if ($options) {
+            $this->options->merge($options);
+        }
     }
 
     /**
@@ -28,7 +31,7 @@ public function __construct(array $options = array())
     protected function prepareClosure($closure)
     {
         if ($closure instanceof \Closure) {
-            $closure = new SuperClosure($closure);
+            return new SuperClosure($closure);
         }
 
         if ($closure instanceof SuperClosure) {
@@ -39,7 +42,7 @@ protected function prepareClosure($closure)
     }
 
     /**
-     * @return array
+     * @return Options
      */
     abstract protected function getDefaultOptions();
 }

src/ClosureParser/Ast/AstClosureContext.php → src/SuperClosure/ClosureParser/Ast/AstClosureContext.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Jeremeamia\SuperClosure\ClosureParser\Ast;
+namespace SuperClosure\ClosureParser\Ast;
 
-use Jeremeamia\SuperClosure\ClosureBinding;
-use Jeremeamia\SuperClosure\ClosureParser\AbstractClosureContext;
-use Jeremeamia\SuperClosure\ClosureParser\ClosureLocation;
+use SuperClosure\ClosureBinding;
+use SuperClosure\ClosureParser\AbstractClosureContext;
+use SuperClosure\ClosureParser\ClosureLocation;
 use PHPParser_Node_Expr_Closure as ClosureAst;
 
 class AstClosureContext extends AbstractClosureContext