Merge pull request #5 from Codeception/php8

Naktibalda · web-flow · commit 49d081cb0c45 · 2020-11-07T22:09:59.000+02:00
Support PHP 8
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
+        php: [5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0]
 
     steps:
     - name: Checkout code
@@ -24,9 +24,7 @@ jobs:
       run: composer validate
 
     - name: Install dependencies
-      run: |
-        composer require phpunit/phpunit "<=8.5.2" --no-update --ignore-platform-reqs
-        composer install --prefer-dist --no-progress --no-interaction --no-suggest
+      run: composer install --prefer-dist --no-progress --no-interaction --no-suggest
 
     - name: Run test suite
       run: php vendor/bin/codecept run
diff --git a/Robofile.php b/Robofile.php
diff --git a/composer.json b/composer.json
@@ -12,14 +12,13 @@
     ],
     "minimum-stability": "RC",
     "require": {
-        "php": ">=5.6.0 <8.0",
+        "php": ">=5.6.0 <9.0",
         "ext-dom": "*",
         "codeception/codeception": "^4.0",
         "codeception/lib-innerbrowser": "^1.0"
     },
     "require-dev": {
-      "codeception/util-robohelpers": "dev-master",
-      "codeception/util-universalframework": "dev-master"
+      "codeception/util-universalframework": "^1.0"
     },
     "autoload":{
         "classmap": ["src/"]
diff --git a/documentation.md b/documentation.md
diff --git a/readme.md b/readme.md
@@ -10,4 +10,4 @@ composer require --dev "codeception/module-soap"
 
 ## Documentation
 
-<a href="documentation.md">Look at documentation.md file</a>
+[Module documentation](https://codeception.com/docs/modules/SOAP)
diff --git a/src/Codeception/Module/SOAP.php b/src/Codeception/Module/SOAP.php
@@ -1,9 +1,7 @@
 <?php
 namespace Codeception\Module;
 
-use Codeception\Lib\Interfaces\API;
 use Codeception\Lib\Interfaces\DependsOnModule;
-use Codeception\Lib\Notification;
 use Codeception\Module as CodeceptionModule;
 use Codeception\TestInterface;
 use Codeception\Exception\ModuleException;
diff --git a/tests/unit/Codeception/Module/SoapTest.php b/tests/unit/Codeception/Module/SoapTest.php
@@ -37,7 +37,6 @@ public function testXmlIsBuilt()
     {
         $dom = new \DOMDocument();
         $dom->load($this->layout);
-        $this->assertEqualXMLStructure($this->module->xmlRequest->documentElement, $dom->documentElement);
         $this->assertXmlStringEqualsXmlString($dom->saveXML(), $this->module->xmlRequest->saveXML());
     }
     
@@ -50,7 +49,7 @@ public function testBuildHeaders()
         $header->appendChild($dom->createElement('username', 'davert'));
         $header->appendChild($dom->createElement('password', '123456'));
         $dom->documentElement->getElementsByTagName('Header')->item(0)->appendChild($header);
-        $this->assertEqualXMLStructure($this->module->xmlRequest->documentElement, $dom->documentElement);
+        $this->assertXmlStringEqualsXmlString($dom->saveXML(), $this->module->xmlRequest->saveXML());
     }
 
     public function testBuildRequest()
@@ -65,7 +64,7 @@ public function testBuildRequest()
         $request = $dom->createElement('ns:KillHumans');
         $request->appendChild($body);
         $dom->documentElement->getElementsByTagName('Body')->item(0)->appendChild($request);
-        $this->assertEqualXMLStructure($this->module->xmlRequest->documentElement, $dom->documentElement);
+        $this->assertXmlStringEqualsXmlString($dom->saveXML(), $this->module->xmlRequest->saveXML());
     }
 
     public function testBuildRequestWithDomNode()
@@ -80,7 +79,7 @@ public function testBuildRequestWithDomNode()
         $dom->documentElement->getElementsByTagName('Body')->item(0)->appendChild($request);
 
         $this->module->sendSoapRequest('KillHumans', $body);
-        $this->assertEqualXMLStructure($this->module->xmlRequest->documentElement, $dom->documentElement);
+        $this->assertXmlStringEqualsXmlString($dom->saveXML(), $this->module->xmlRequest->saveXML());
     }
     
     public function testSeeXmlIncludes()

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,4 @@ composer require --dev "codeception/module-soap"`
`10`	`10`
`11`	`11`	`## Documentation`
`12`	`12`
`13`		`-<a href="documentation.md">Look at documentation.md file</a>`
	`13`	`+[Module documentation](https://codeception.com/docs/modules/SOAP)`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ public function testXmlIsBuilt()`
`37`	`37`	`{`
`38`	`38`	`$dom = new \DOMDocument();`
`39`	`39`	`$dom->load($this->layout);`
`40`		`- $this->assertEqualXMLStructure($this->module->xmlRequest->documentElement, $dom->documentElement);`
`41`	`40`	`$this->assertXmlStringEqualsXmlString($dom->saveXML(), $this->module->xmlRequest->saveXML());`
`42`	`41`	`}`
`43`	`42`
`@@ -50,7 +49,7 @@ public function testBuildHeaders()`
`50`	`49`	`$header->appendChild($dom->createElement('username', 'davert'));`
`51`	`50`	`$header->appendChild($dom->createElement('password', '123456'));`
`52`	`51`	`$dom->documentElement->getElementsByTagName('Header')->item(0)->appendChild($header);`
`53`		`- $this->assertEqualXMLStructure($this->module->xmlRequest->documentElement, $dom->documentElement);`
	`52`	`+ $this->assertXmlStringEqualsXmlString($dom->saveXML(), $this->module->xmlRequest->saveXML());`
`54`	`53`	`}`
`55`	`54`
`56`	`55`	`public function testBuildRequest()`
`@@ -65,7 +64,7 @@ public function testBuildRequest()`
`65`	`64`	`$request = $dom->createElement('ns:KillHumans');`
`66`	`65`	`$request->appendChild($body);`
`67`	`66`	`$dom->documentElement->getElementsByTagName('Body')->item(0)->appendChild($request);`
`68`		`- $this->assertEqualXMLStructure($this->module->xmlRequest->documentElement, $dom->documentElement);`
	`67`	`+ $this->assertXmlStringEqualsXmlString($dom->saveXML(), $this->module->xmlRequest->saveXML());`
`69`	`68`	`}`
`70`	`69`
`71`	`70`	`public function testBuildRequestWithDomNode()`
`@@ -80,7 +79,7 @@ public function testBuildRequestWithDomNode()`
`80`	`79`	`$dom->documentElement->getElementsByTagName('Body')->item(0)->appendChild($request);`
`81`	`80`
`82`	`81`	`$this->module->sendSoapRequest('KillHumans', $body);`
`83`		`- $this->assertEqualXMLStructure($this->module->xmlRequest->documentElement, $dom->documentElement);`
	`82`	`+ $this->assertXmlStringEqualsXmlString($dom->saveXML(), $this->module->xmlRequest->saveXML());`
`84`	`83`	`}`
`85`	`84`
`86`	`85`	`public function testSeeXmlIncludes()`