started upgrading to phpspec4

Author: cyruscollier

composer.json

@@ -13,8 +13,8 @@
     ],
     "license": "MIT",
     "require": {
-        "phpspec/phpspec": "^4.3.0",
-        "php-mock/php-mock-prophecy": "0.0.2"
+        "php-mock/php-mock-prophecy": "0.0.2",
+        "phpspec/phpspec": "^4.3"
     },
     "autoload": {
         "psr-4": {

phpspec.yml

@@ -4,4 +4,4 @@ suites:
     psr4_prefix: PhpSpec\PhpMock
 
 extensions:
-  - PhpSpec\PhpMock\Extension\PhpMockExtension
+  PhpSpec\PhpMock\Extension\PhpMockExtension: ~

spec/Extension/PhpMockExtensionSpec.php

@@ -14,12 +14,12 @@ class PhpMockExtensionSpec extends ObjectBehavior
     function it_is_initializable()
     {
         $this->shouldHaveType('PhpSpec\PhpMock\Extension\PhpMockExtension');
-        $this->shouldImplement('PhpSpec\Extension\ExtensionInterface');
+        $this->shouldImplement('PhpSpec\Extension');
     }
 
     function it_loads_the_collaborator_maintainer_into_the_container(ServiceContainer $container)
     {
-        $container->set('runner.maintainers.function_collaborator', Argument::type('Callable'))
+        $container->define('runner.maintainers.function_collaborator', Argument::type('Callable'))
                   ->shouldBeCalled();
         $this->load($container);
     }

spec/Runner/Maintainer/FunctionCollaboratorMaintainerSpec.php

@@ -2,22 +2,22 @@
 
 namespace spec\PhpSpec\PhpMock\Runner\Maintainer;
 
+use PhpSpec\Locator\Resource;
 use PhpSpec\ObjectBehavior;
+use PhpSpec\Specification;
 use Prophecy\Argument;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use PhpSpec\Loader\Node\ExampleNode;
-use PhpSpec\SpecificationInterface;
 use PhpSpec\Runner\MatcherManager;
 use PhpSpec\Runner\CollaboratorManager;
 use PhpSpec\Loader\Node\SpecificationNode;
-use PhpSpec\Locator\ResourceInterface;
 
 class FunctionCollaboratorMaintainerSpec extends ObjectBehavior
 {
     function it_is_initializable()
     {
         $this->shouldHaveType('PhpSpec\PhpMock\Runner\Maintainer\FunctionCollaboratorMaintainer');
-        $this->shouldImplement('PhpSpec\Runner\Maintainer\MaintainerInterface');
+        $this->shouldImplement('PhpSpec\Runner\Maintainer\Maintainer');
     }
 
     function let(
@@ -28,11 +28,11 @@ function let(
 
     function it_prepares_and_tears_down_an_example_with_a_function_prophecy_collaborator(
         ExampleNode $example,
-        SpecificationInterface $context,
+        Specification $context,
         MatcherManager $matchers,
         CollaboratorManager $collaborators,
         SpecificationNode $specification,
-        ResourceInterface $resource
+        Resource $resource
     ) {
         $collaborators->has('functions')->willReturn(false);
         $collaborators->set('functions', Argument::any())->shouldNotBeCalled();
@@ -41,6 +41,7 @@ function it_prepares_and_tears_down_an_example_with_a_function_prophecy_collabor
 
         $collaborators->has('functions')->willReturn(true);
         $example->getSpecification()->willReturn($specification);
+        $resource->getSrcNamespace()->willReturn('');
         $specification->getResource()->willReturn($resource);
         $collaborators->set('functions', Argument::any())->shouldBeCalled();
         $this->prepare($example, $context, $matchers, $collaborators)->shouldReturn(true);

spec/Wrapper/FunctionCollaboratorSpec.php

@@ -4,18 +4,18 @@
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
-use PhpSpec\Locator\ResourceInterface;
+use PhpSpec\Locator\Resource;
 
 class FunctionCollaboratorSpec extends ObjectBehavior
 {
 
     function it_is_initializable()
     {
         $this->shouldHaveType('PhpSpec\PhpMock\Wrapper\FunctionCollaborator');
-        $this->shouldImplement('PhpSpec\Wrapper\WrapperInterface');
+        $this->shouldImplement('PhpSpec\Wrapper\ObjectWrapper');
     }
 
-    function let(ResourceInterface $resource) {
+    function let(Resource $resource) {
         $this->beConstructedWith($resource);
         $resource->getSrcNamespace()->willReturn('TestNamespace');
     }

src/Extension/PhpMockExtension.php

@@ -2,23 +2,24 @@
 
 namespace PhpSpec\PhpMock\Extension;
 
-use PhpSpec\Extension\ExtensionInterface;
+use PhpSpec\Extension;
 use PhpSpec\ServiceContainer;
+use PhpSpec\ServiceContainer\IndexedServiceContainer;
 use PhpSpec\PhpMock\Runner\Maintainer\FunctionCollaboratorMaintainer;
 use Prophecy\Prophet;
 use phpmock\MockRegistry;
 
-class PhpMockExtension implements ExtensionInterface
+class PhpMockExtension implements Extension
 {
     /**
      * @param ServiceContainer $container
      */
-    public function load(ServiceContainer $container)
+    public function load(ServiceContainer $container, array $params = [])
     {
-        $container->set('runner.maintainers.function_collaborator', [$this, 'createMaintainer']);
+        $container->define('runner.maintainers.function_collaborator', [$this, 'createMaintainer']);
     }
 
-    public function createMaintainer(ServiceContainer $container)
+    public function createMaintainer(IndexedServiceContainer $container)
     {
         return new FunctionCollaboratorMaintainer(
             $container->get('event_dispatcher'),

src/Runner/Maintainer/FunctionCollaboratorMaintainer.php

@@ -2,18 +2,18 @@
 
 namespace PhpSpec\PhpMock\Runner\Maintainer;
 
+use PhpSpec\Runner\Maintainer\Maintainer;
 use PhpSpec\Runner\MatcherManager;
 use PhpSpec\Runner\CollaboratorManager;
 use PhpSpec\Loader\Node\ExampleNode;
-use PhpSpec\SpecificationInterface;
+use PhpSpec\Specification;
 use PhpSpec\PhpMock\Wrapper\FunctionCollaborator;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface as Dispatcher;
 use PhpSpec\Wrapper\Unwrapper;
 use PhpSpec\Loader\Transformer\TypeHintIndex;
-use PhpSpec\Runner\Maintainer\MaintainerInterface;
 use PhpSpec\Event\MethodCallEvent;
 
-class FunctionCollaboratorMaintainer implements MaintainerInterface
+class FunctionCollaboratorMaintainer implements Maintainer
 {
     const FUNCTIONS_PARAMETER = 'functions';
 
@@ -44,13 +44,14 @@ public function __construct(Dispatcher $dispatcher)
      */
     public function prepare(
         ExampleNode $example,
-        SpecificationInterface $context,
+        Specification $context,
         MatcherManager $matchers,
         CollaboratorManager $collaborators
     ) {
         if (!$collaborators->has(self::FUNCTIONS_PARAMETER)) return false;
         $this->collaborator = new FunctionCollaborator($example->getSpecification()->getResource());
         $collaborators->set(self::FUNCTIONS_PARAMETER, $this->collaborator);
+
         $this->dispatcher->addListener('beforeMethodCall', [$this, 'revealFunctionProphecy']);
         return true;
     }
@@ -63,7 +64,7 @@ public function prepare(
      */
     public function teardown(
         ExampleNode $example,
-        SpecificationInterface $context,
+        Specification $context,
         MatcherManager $matchers,
         CollaboratorManager $collaborators
     ) {
@@ -83,15 +84,15 @@ public function revealFunctionProphecy(MethodCallEvent $event)
      *
      * @return bool
      */
-    public function supports(ExampleNode $example)
+    public function supports(ExampleNode $example): bool
     {
         return true;
     }
 
     /**
      * @return int
      */
-    public function getPriority()
+    public function getPriority(): int
     {
         return 40;
     }

src/Wrapper/FunctionCollaborator.php

@@ -2,12 +2,12 @@
 
 namespace PhpSpec\PhpMock\Wrapper;
 
-use PhpSpec\Wrapper\WrapperInterface;
+use PhpSpec\Wrapper\ObjectWrapper;
 use phpmock\prophecy\PHPProphet;
 use Prophecy\Prophecy\ProphecyInterface;
-use PhpSpec\Locator\ResourceInterface;
+use PhpSpec\Locator\Resource;
 
-class FunctionCollaborator implements WrapperInterface
+class FunctionCollaborator implements ObjectWrapper
 {
     /**
      * @var ProphecyInterface
@@ -20,9 +20,9 @@ class FunctionCollaborator implements WrapperInterface
     protected $function_prophet;
 
     /**
-     * @param ResourceInterface $resource
+     * @param Resource $resource
      */
-    public function __construct(ResourceInterface $resource)
+    public function __construct(Resource $resource)
     {
         $this->function_prophet = new PHPProphet();
         $this->prophecy = $this->function_prophet->prophesize($resource->getSrcNamespace());