Merge pull request #10 from jakzal/wrapper-fix

Provided a custom implementation of Wrapper

Author: MarcelloDuarte

Bossa/PhpSpec/Expect/Wrapper.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Bossa\PhpSpec\Expect;
+
+use PhpSpec\Exception\ExceptionFactory;
+use PhpSpec\Runner\MatcherManager;
+use PhpSpec\Formatter\Presenter\PresenterInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use PhpSpec\Loader\Node\ExampleNode;
+
+use PhpSpec\Wrapper\Subject\WrappedObject;
+use PhpSpec\Wrapper\Subject\Caller;
+use PhpSpec\Wrapper\Subject\SubjectWithArrayAccess;
+use PhpSpec\Wrapper\Subject\ExpectationFactory;
+use PhpSpec\Wrapper\Wrapper as BaseWrapper;
+
+class Wrapper extends BaseWrapper
+{
+    private $matchers;
+    private $presenter;
+    private $dispatcher;
+    private $example;
+
+    public function __construct(MatcherManager $matchers, PresenterInterface $presenter,
+        EventDispatcherInterface $dispatcher, ExampleNode $example)
+    {
+        $this->matchers = $matchers;
+        $this->presenter = $presenter;
+        $this->dispatcher = $dispatcher;
+        $this->example = $example;
+    }
+
+    public function wrap($value = null)
+    {
+        $exceptionFactory   = new ExceptionFactory($this->presenter);
+        $wrappedObject      = new WrappedObject($value, $this->presenter);
+        $caller             = new Caller($wrappedObject, $this->example, $this->dispatcher, $exceptionFactory, $this);
+        $arrayAccess        = new SubjectWithArrayAccess($caller, $this->presenter, $this->dispatcher);
+        $expectationFactory = new ExpectationFactory($this->example, $this->dispatcher, $this->matchers);
+
+        return new Subject(
+            $value, $this, $wrappedObject, $caller, $arrayAccess, $expectationFactory
+        );
+    }
+}
+

expect.php

@@ -15,6 +15,7 @@
 }
 
 use Bossa\PhpSpec\Expect\Subject;
+use Bossa\PhpSpec\Expect\Wrapper;
 use PhpSpec\Exception\ExceptionFactory;
 use PhpSpec\Formatter\Presenter\Differ\Differ;
 use PhpSpec\Formatter\Presenter\TaggedPresenter;
@@ -40,10 +41,10 @@
 use PhpSpec\Wrapper\Subject\SubjectWithArrayAccess;
 use PhpSpec\Wrapper\Subject\WrappedObject;
 use PhpSpec\Wrapper\Unwrapper;
-use PhpSpec\Wrapper\Wrapper;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
 require_once 'Bossa/PhpSpec/Expect/Subject.php';
+require_once 'Bossa/PhpSpec/Expect/Wrapper.php';
 
 if (!function_exists('expect')) {
     function expect($sus)