Merge pull request #3 from tweakers/arjenm-doc-updates

Update README.md to reflect changed method names and fix method name

Author: arjenm

README.md

@@ -82,7 +82,7 @@ class TestServiceTest extends KernelTestCase
         parent::tearDown();
 
         // Make sure the original version is restored inside the proxy
-        self::$container->get(TestService::class)->reset();
+        self::$container->get(TestService::class)->restoreOriginalService();
     }
 
     public function testServiceBehaviorCanBeChanged(): void
@@ -97,19 +97,19 @@ class TestServiceTest extends KernelTestCase
         $mock = $this->createMock(TestService::class);
         $mock->method('getStuff')->willReturn(42);
 
-        $service->setAlternative($mock);
+        $service->setAlternativeService($mock);
 
         $this->assertSame(42, $service->getStuff());
 
         // Revert to original service
-        $service->reset();
+        $service->restoreOriginalService();
         $this->assertSame(39, $service->getStuff());
     }
 }
 ``` 
 
 ## Compatibility
-This code has only been tested with Symfony 3.4 and 4.1, although it should work with 4.0 and older versions.
-In Symfony 4.1 a [TestContainer](https://symfony.com/blog/new-in-symfony-4-1-simpler-service-testing) was introduced that gives access to private services.
+This code has only been tested with Symfony 3.4, 4.1 and 4.2, although it should work with 4.0 and older versions.
+In Symfony 4.1 a [TestContainer](https://symfony.com/blog/new-in-symfony-4-1-simpler-service-testing) was introduced that gives access to private services. So it may not be necessary to define a service as public with Symfony 4.1 and higher.
 Symfony however does 'inline' or completely remove unused private services (even in 4.1), so tests may fail due to missing services if you define everything private.
-To prevent inlining, the example above creates the proxies with public=true, but it may also be necessary to redefine specific services as well.
+To prevent inlining, the example above creates the proxies with public=true, but it may also be necessary to redefine specific services as well.

src/MockableService/MockableService.php

@@ -24,5 +24,5 @@ public function setOriginalService(object $original): void;
     /**
      * Remove the 'alternative' service and revert to 'original' service.
      */
-    public function restoreOriginalServices(): void;
+    public function restoreOriginalService(): void;
 }

src/MockableService/MockableServiceProxyGenerator.php

@@ -26,7 +26,7 @@
  * It also adds these methods to allow modifying the state:
  * 'setOriginalService' @see SetOriginalGenerator
  * 'setAlternativeService' @see SetAlternativeGenerator
- * 'restoreOriginalServices' @see RestoreOriginalsGenerator
+ * 'restoreOriginalService' @see RestoreOriginalsGenerator
  *
  * @author Arjen
  */

src/MockableService/RestoreOriginalsGenerator.php

@@ -10,7 +10,7 @@
  *
  * It generates this method:
  *
- * public function restoreOriginalServices(object $original) : void
+ * public function restoreOriginalService(object $original) : void
  * {
  *   $this->originalService = $original;
  *   $this->valueHolder = $original;
@@ -22,7 +22,7 @@ class RestoreOriginalsGenerator extends MethodGenerator
 {
     public function __construct(PropertyGenerator $original, PropertyGenerator $valueHolder)
     {
-        parent::__construct('restoreOriginalServices');
+        parent::__construct('restoreOriginalService');
 
         $this->setDocBlock('{@inheritDoc}');
         $this->setReturnType('void');

test/MockableService/MockableServiceProxyFactoryTest.php

@@ -51,7 +51,7 @@ public function it_should_generate_a_working_set_alternative(): void
     public function it_should_generate_a_working_reset(): void
     {
         $this->proxy->setAlternativeService($this->alternative);
-        $this->proxy->restoreOriginalServices();
+        $this->proxy->restoreOriginalService();
 
         $this->assertEquals($this->original->getValue(), $this->proxy->getValue());
     }

test/MockableService/RestoreOriginalsGeneratorTest.php

@@ -21,7 +21,7 @@ public function it_should_generate_the_reset_method(): void
     /**
      * {@inheritDoc}
      */
-    public function restoreOriginalServices() : void
+    public function restoreOriginalService() : void
     {
         $this->valueHolder = $this->original;
     }