-: Post-merge fixes

Author: Mariano Custiel

README.md

@@ -71,6 +71,7 @@ modules:
         - Phiremock:
             host: 127.0.0.1
             port: 18080
+            resetBeforeEachTest: false # if set to true, executes `$I->haveACleanSetupInRemoteService` before each test.
 ```
 
 #### Use
@@ -90,7 +91,7 @@ Allows you to setup an expectation in Phiremock, specifying the expected request
 ```
 
 #### haveACleanSetupInRemoteService
-Cleans the server of all configured expectations, scenarios and requests history.
+Cleans the server of all configured expectations, scenarios and requests history, and reloads expectation files.
 
 ```php
     $I->haveACleanSetupInRemoteService();
@@ -124,7 +125,6 @@ Resets the requests counter for the verifier in Phiremock.
     $I->didNotReceiveRequestsInRemoteService();
 ```
 
-
 ## Use case
 
 ### Yii2-Curl

composer.json

@@ -29,7 +29,7 @@
     "require" : {
         "php" : ">=5.6",
         "mcustiel/phiremock": "^1.3",
-        "codeception/codeception" : "^2.0",
+        "codeception/codeception" : "^2.2",
         "symfony/process": "^3.3"
     }
 }

src/Extension/Phiremock.php

@@ -101,6 +101,6 @@ private function executeDelay()
      */
     private function initProcess($process)
     {
-        $this->process = $process === null ? new PhiremockProcess() : $process;
+        $this->process = null === $process ? new PhiremockProcess() : $process;
     }
 }

src/Extension/PhiremockProcess.php

@@ -82,7 +82,7 @@ private function initProcess($ip, $port, $debug, $expectationsPath, $phiremockPa
             '-i',
             $ip,
             '-p',
-            $port
+            $port,
         ];
         if ($debug) {
             $commandline[] = '-d';

src/Module/Phiremock.php

@@ -19,6 +19,7 @@
 namespace Codeception\Module;
 
 use Codeception\Module as CodeceptionModule;
+use Codeception\TestInterface;
 use Mcustiel\Phiremock\Client\Phiremock as PhiremockClient;
 use Mcustiel\Phiremock\Client\Utils\RequestBuilder;
 use Mcustiel\Phiremock\Domain\Expectation;
@@ -29,9 +30,9 @@ class Phiremock extends CodeceptionModule
      * @var array
      */
     protected $config = [
-        'host' => 'localhost',
-        'port' => '8086',
-        'cleanup' => false,
+        'host'                => 'localhost',
+        'port'                => '8086',
+        'resetBeforeEachTest' => false,
     ];
 
     /**
@@ -47,8 +48,8 @@ public function _beforeSuite($settings = [])
 
     public function _before(TestInterface $test)
     {
-        if ($this->config['cleanup']) {
-            $this->haveInitialSetupRestored();
+        if ($this->config['resetBeforeEachTest']) {
+            $this->haveACleanSetupInRemoteService();
         }
         parent::_before($test);
     }
@@ -60,14 +61,7 @@ public function expectARequestToRemoteServiceWithAResponse(Expectation $expectat
 
     public function haveACleanSetupInRemoteService()
     {
-        $this->phiremock->clearExpectations();
-        $this->phiremock->resetRequestsCounter();
-        $this->phiremock->resetScenarios();
-    }
-
-    public function haveInitialSetupRestored()
-    {
-        $this->phiremock->restoreExpectations();
+        $this->phiremock->reset();
     }
 
     public function dontExpectRequestsInRemoteService()
@@ -86,6 +80,12 @@ public function didNotReceiveRequestsInRemoteService()
         $this->phiremock->resetRequestsCounter();
     }
 
+    /**
+     * @param int            $times
+     * @param RequestBuilder $builder
+     *
+     * @throws \Exception
+     */
     public function seeRemoteServiceReceived($times, RequestBuilder $builder)
     {
         $requests = $this->phiremock->countExecutions($builder);