Implement custom node visitors with spec collaborator and custom matcher resolver

* Some experiments with anaon classes

* Implement custom parser with spec collaborator and custom matcher resolver

Author: akondas

extension.neon

@@ -5,16 +5,27 @@ services:
     -
         class: Proget\PHPStan\PhpSpec\Reflection\DuringCallMethodsClassReflectionExtension
         tags: [phpstan.broker.methodsClassReflectionExtension]
+    -
+        class: Proget\PHPStan\PhpSpec\Reflection\DelayedCallMethodsClassReflectionExtension
+        tags: [phpstan.broker.methodsClassReflectionExtension]
+    -
+        class: Proget\PHPStan\PhpSpec\Reflection\SpoofedCollaboratorMethodsClassReflectionExtension
+        tags: [phpstan.broker.methodsClassReflectionExtension]
     -
         class: Proget\PHPStan\PhpSpec\Reflection\ObjectBehaviorPropertiesClassReflectionExtension
         tags: [phpstan.broker.propertiesClassReflectionExtension]
     -
         class: Proget\PHPStan\PhpSpec\Type\ObjectBehaviorDynamicMethodReturnTypeExtension
         tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
+    -
+        class: Proget\PHPStan\PhpSpec\Type\ObjectBehaviorDynamicStaticMethodReturnTypeExtension
+        tags: [phpstan.broker.dynamicStaticMethodReturnTypeExtension]
 
-extensions:
-    phpspec: Proget\PHPStan\PhpSpec\DependencyInjection\CollaboratorExtension
+    directParser:
+        class: Proget\PHPStan\PhpSpec\Parser\SpecAwareDirectParser
+        arguments:
+            specDir: %currentWorkingDirectory%/%specDir%
+        autowired: no
 
 parameters:
-    specDirs:
-        - 'spec/'
+    specDir: 'spec/'

spec/PhpSpec/CodeAnalysis/MagicAwareAccessInspectorSpec.php

@@ -31,7 +31,7 @@ public function it_should_detect_a_magic_setter_if_a_value_is_given()
 
     public function it_should_detect_a_magic_call_method()
     {
-        $this->isMethodCallable(new ObjectWithMagicCall, 'method')->shouldreturn(true);
+        $this->isMethodCallable(new ObjectWithMagicCall, 'method')->shouldReturn(true);
     }
 
     public function it_should_not_detect_a_getter_if_there_is_no_magic_getter_and_wrapped_inspector_finds_none(AccessInspector $accessInspector)

spec/PhpSpec/Event/ExampleEventSpec.php

@@ -45,7 +45,7 @@ public function it_provides_a_link_to_suite($suite)
 
     public function it_provides_a_link_to_time()
     {
-        $this->getTime()->shouldReturn((double) 10.0);
+        $this->getTime()->shouldReturn(10.0);
     }
 
     public function it_provides_a_link_to_result()
@@ -69,6 +69,6 @@ public function it_initializes_a_default_time(ExampleNode $example)
     {
         $this->beConstructedWith($example);
 
-        $this->getTime()->shouldReturn((double) 0.0);
+        $this->getTime()->shouldReturn(0.0);
     }
 }

spec/PhpSpec/Event/SpecificationEventSpec.php

@@ -56,6 +56,6 @@ public function it_initializes_a_default_time(SpecificationNode $specification)
     {
         $this->beConstructedWith($specification);
 
-        $this->getTime()->shouldReturn((double) 0.0);
+        $this->getTime()->shouldReturn(0.0);
     }
 }

spec/PhpSpec/Event/SuiteEventSpec.php

@@ -67,6 +67,6 @@ public function it_initializes_a_default_time(Suite $suite)
     {
         $this->beConstructedWith($suite);
 
-        $this->getTime()->shouldReturn((double) 0.0);
+        $this->getTime()->shouldReturn(0.0);
     }
 }

spec/PhpSpec/Locator/PSR0/PSR0LocatorSpec.php

@@ -181,7 +181,7 @@ public function it_supports_file_queries_in_srcPath(Filesystem $fs)
         $this->beConstructedWith($fs, 'PhpSpec', 'spec', $this->srcPath, $this->specPath);
 
         $this->supportsQuery(
-            realpath($this->srcPath.'/PhpSpec/Locator/PSR0/PSR0Locator.php')
+            (string) realpath($this->srcPath.'/PhpSpec/Locator/PSR0/PSR0Locator.php')
         )->shouldReturn(true);
     }
 
@@ -204,7 +204,7 @@ public function it_supports_file_queries_in_specPath(Filesystem $fs)
         $this->beConstructedWith($fs, 'PhpSpec', 'spec', $this->srcPath, $this->specPath);
 
         $this->supportsQuery(
-            realpath($this->specPath.'/spec/PhpSpec/Locator/PSR0/PSR0LocatorSpec.php')
+            (string) realpath($this->specPath.'/spec/PhpSpec/Locator/PSR0/PSR0LocatorSpec.php')
         )->shouldReturn(true);
     }
 

spec/PhpSpec/Matcher/ScalarMatcherSpec.php

@@ -406,7 +406,9 @@ public function it_matches_a_resource()
     {
         $fp = fopen(__FILE__, 'r');
         $this->shouldNotThrow()->duringPositiveMatch('beResource', $fp, ['']);
-        fclose($fp);
+        if (is_resource($fp)) {
+            fclose($fp);
+        }
     }
 
     public function it_does_not_match_not_resource()
@@ -423,7 +425,9 @@ public function it_does_not_mismatches_resource()
     {
         $fp = fopen(__FILE__, 'r');
         $this->shouldThrow()->duringNegativeMatch('beResource', $fp, ['']);
-        fclose($fp);
+        if (is_resource($fp)) {
+            fclose($fp);
+        }
     }
 
     public function it_responds_to_be_scalar()

spec/PhpSpec/Process/Shutdown/UpdateConsoleActionSpec.php

@@ -20,7 +20,7 @@ public function it_should_update_the_console(FatalPresenter $currentExampleWrite
     {
         $currentExample = new CurrentExampleTracker();
         $error = ['type' => 1, 'message' => 'Hello'];
-        $currentExample->getCurrentExample('Hello');
+        $currentExample->getCurrentExample();
         $currentExampleWriter->displayFatal($currentExample, $error)->shouldBeCalled();
         $this->runAction($error);
     }

spec/PhpSpec/Runner/CollaboratorManagerSpec.php

@@ -45,30 +45,30 @@ public function it_creates_function_arguments_for_ReflectionFunction(
         ReflectionParameter $param1,
         ReflectionParameter $param2
     ) {
-        $this->set('arg1', '123');
-        $this->set('arg2', '456');
-        $this->set('arg3', '789');
+        $this->set('arg1', $arg1 = new \stdClass());
+        $this->set('arg2', $arg2 = new \stdClass());
+        $this->set('arg3', $arg3 = new \stdClass());
 
         $function->getParameters()->willReturn([$param1, $param2]);
         $param1->getName()->willReturn('arg1');
         $param2->getName()->willReturn('arg3');
 
-        $this->getArgumentsFor($function)->shouldReturn(['123', '789']);
+        $this->getArgumentsFor($function)->shouldReturn([$arg1, $arg3]);
     }
 
     public function it_creates_null_function_arguments_for_ReflectionFunction_if_no_collaborator_found(
         ReflectionFunction $function,
         ReflectionParameter $param1,
         ReflectionParameter $param2
     ) {
-        $this->set('arg1', '123');
-        $this->set('arg2', '456');
-        $this->set('arg3', '789');
+        $this->set('arg1', $arg1 = new \stdClass());
+        $this->set('arg2', $arg2 = new \stdClass());
+        $this->set('arg3', $arg3 = new \stdClass());
 
         $function->getParameters()->willReturn([$param1, $param2]);
         $param1->getName()->willReturn('arg4');
         $param2->getName()->willReturn('arg3');
 
-        $this->getArgumentsFor($function)->shouldReturn([null, '789']);
+        $this->getArgumentsFor($function)->shouldReturn([null, $arg3]);
     }
 }

spec/PhpSpec/ServiceContainer/IndexedServiceContainerSpec.php

@@ -93,13 +93,16 @@ public function it_uses_new_definition_when_a_service_is_redefined()
         $this->get('some_service')->shouldBe(2);
     }
 
-    public function it_does_not_evaluate_callables_that_are_set()
-    {
-        $this->set('some_service', function () {
-            return 100;
-        });
-        $this->get('some_service')->shouldNotBe(100);
-    }
+    /**
+     * invalid docblock - callable is an object XD
+     */
+//    public function it_does_not_evaluate_callables_that_are_set()
+//    {
+//        $this->set('some_service', function () {
+//            return 100;
+//        });
+//        $this->get('some_service')->shouldNotBe(100);
+//    }
 
     public function it_provides_a_way_to_remove_service_by_key($service)
     {