Skip to content

Commit 8676d66

Browse files
meng-tianmeng-tian
authored
Merge pull request #20 from meng-tian/support-php8
Change supported PHP versions
2 parents 0a6b18a + 77ad1ca commit 8676d66

File tree

3 files changed

+38
-38
lines changed

3 files changed

+38
-38
lines changed

‎.github/workflows/main.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
matrix:
99
operating-system: [ubuntu-latest]
10-
php-versions: ['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
10+
php-versions: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
1111

1212
runs-on: ${{ matrix.operating-system }}
1313

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
}
1111
],
1212
"require": {
13-
"php": ">=5.4.0"
13+
"php": ">=7.1.0"
1414
},
1515
"require-dev": {
16-
"phpunit/phpunit": "~4.8"
16+
"phpunit/phpunit": "~7.0|~9.3"
1717
},
1818
"autoload": {
1919
"psr-4": {"Meng\\Soap\\": "src/"}

‎tests/InterpreterTest.php‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use Meng\Soap\Interpreter;
44
use Meng\Soap\SoapRequest;
55

6-
class InterpreterTest extends PHPUnit_Framework_TestCase
6+
class InterpreterTest extends \PHPUnit\Framework\TestCase
77
{
88
/**
99
* @test
@@ -16,12 +16,12 @@ public function requestWsdlArrayArguments()
1616
$this->assertEquals('http://www.webserviceX.NET/ConversionRate', $request->getSoapAction());
1717
$this->assertEquals('1', $request->getSoapVersion());
1818
$this->assertNotEmpty($request->getSoapMessage());
19-
$this->assertContains('http://schemas.xmlsoap.org/soap/envelope/', $request->getSoapMessage());
20-
$this->assertContains('ConversionRate', $request->getSoapMessage());
21-
$this->assertContains('FromCurrency', $request->getSoapMessage());
22-
$this->assertContains('AFA', $request->getSoapMessage());
23-
$this->assertContains('ToCurrency', $request->getSoapMessage());
24-
$this->assertContains('ALL', $request->getSoapMessage());
19+
$this->assertRegExp('/http:\/\/schemas\.xmlsoap\.org\/soap\/envelope\//', $request->getSoapMessage());
20+
$this->assertRegExp('/ConversionRate/', $request->getSoapMessage());
21+
$this->assertRegExp('/FromCurrency/', $request->getSoapMessage());
22+
$this->assertRegExp('/AFA/', $request->getSoapMessage());
23+
$this->assertRegExp('/ToCurrency/', $request->getSoapMessage());
24+
$this->assertRegExp('/ALL/', $request->getSoapMessage());
2525
}
2626

2727
/**
@@ -38,12 +38,12 @@ public function requestWsdlObjectArguments()
3838
$this->assertEquals('http://www.webserviceX.NET/ConversionRate', $request->getSoapAction());
3939
$this->assertEquals('1', $request->getSoapVersion());
4040
$this->assertNotEmpty($request->getSoapMessage());
41-
$this->assertContains('http://schemas.xmlsoap.org/soap/envelope/', $request->getSoapMessage());
42-
$this->assertContains('ConversionRate', $request->getSoapMessage());
43-
$this->assertContains('FromCurrency', $request->getSoapMessage());
44-
$this->assertContains('AFA', $request->getSoapMessage());
45-
$this->assertContains('ToCurrency', $request->getSoapMessage());
46-
$this->assertContains('ALL', $request->getSoapMessage());
41+
$this->assertRegExp('/http:\/\/schemas\.xmlsoap\.org\/soap\/envelope\//', $request->getSoapMessage());
42+
$this->assertRegExp('/ConversionRate/', $request->getSoapMessage());
43+
$this->assertRegExp('/FromCurrency/', $request->getSoapMessage());
44+
$this->assertRegExp('/AFA/', $request->getSoapMessage());
45+
$this->assertRegExp('/ToCurrency/', $request->getSoapMessage());
46+
$this->assertRegExp('/ALL/', $request->getSoapMessage());
4747
}
4848

4949
/**
@@ -62,15 +62,15 @@ public function requestWsdlInputHeaders()
6262
$this->assertEquals('http://www.webserviceX.NET/ConversionRate', $request->getSoapAction());
6363
$this->assertEquals('1', $request->getSoapVersion());
6464
$this->assertNotEmpty($request->getSoapMessage());
65-
$this->assertContains('http://schemas.xmlsoap.org/soap/envelope/', $request->getSoapMessage());
66-
$this->assertContains('www.namespace.com', $request->getSoapMessage());
67-
$this->assertContains('test_header', $request->getSoapMessage());
68-
$this->assertContains('header_data', $request->getSoapMessage());
69-
$this->assertContains('ConversionRate', $request->getSoapMessage());
70-
$this->assertContains('FromCurrency', $request->getSoapMessage());
71-
$this->assertContains('AFA', $request->getSoapMessage());
72-
$this->assertContains('ToCurrency', $request->getSoapMessage());
73-
$this->assertContains('ALL', $request->getSoapMessage());
65+
$this->assertRegExp('/http:\/\/schemas\.xmlsoap\.org\/soap\/envelope\//', $request->getSoapMessage());
66+
$this->assertRegExp('/www\.namespace\.com/', $request->getSoapMessage());
67+
$this->assertRegExp('/test_header/', $request->getSoapMessage());
68+
$this->assertRegExp('/header_data/', $request->getSoapMessage());
69+
$this->assertRegExp('/ConversionRate/', $request->getSoapMessage());
70+
$this->assertRegExp('/FromCurrency/', $request->getSoapMessage());
71+
$this->assertRegExp('/AFA/', $request->getSoapMessage());
72+
$this->assertRegExp('/ToCurrency/', $request->getSoapMessage());
73+
$this->assertRegExp('/ALL/', $request->getSoapMessage());
7474
}
7575

7676
/**
@@ -98,12 +98,12 @@ public function requestTypeMapToXML()
9898
$this->assertEquals('http://www.webserviceX.NET/ConversionRate', $request->getSoapAction());
9999
$this->assertEquals('1', $request->getSoapVersion());
100100
$this->assertNotEmpty($request->getSoapMessage());
101-
$this->assertContains('http://schemas.xmlsoap.org/soap/envelope/', $request->getSoapMessage());
102-
$this->assertContains('ConversionRate', $request->getSoapMessage());
103-
$this->assertContains('FromCurrency', $request->getSoapMessage());
104-
$this->assertContains('OLD', $request->getSoapMessage());
105-
$this->assertContains('ToCurrency', $request->getSoapMessage());
106-
$this->assertContains('NEW', $request->getSoapMessage());
101+
$this->assertRegExp('/http:\/\/schemas\.xmlsoap\.org\/soap\/envelope\//', $request->getSoapMessage());
102+
$this->assertRegExp('/ConversionRate/', $request->getSoapMessage());
103+
$this->assertRegExp('/FromCurrency/', $request->getSoapMessage());
104+
$this->assertRegExp('/OLD/', $request->getSoapMessage());
105+
$this->assertRegExp('/ToCurrency/', $request->getSoapMessage());
106+
$this->assertRegExp('/NEW/', $request->getSoapMessage());
107107
}
108108

109109
/**
@@ -255,9 +255,9 @@ public function requestWsdlSoapV12()
255255
$this->assertEquals('http://www.webserviceX.NET/GetAirportInformationByCountry', $request->getSoapAction());
256256
$this->assertEquals('2', $request->getSoapVersion());
257257
$this->assertNotEmpty($request->getSoapMessage());
258-
$this->assertContains('http://www.w3.org/2003/05/soap-envelope', $request->getSoapMessage());
259-
$this->assertContains('GetAirportInformationByCountry', $request->getSoapMessage());
260-
$this->assertContains('country', $request->getSoapMessage());
258+
$this->assertRegExp('/http:\/\/www\.w3\.org\/2003\/05\/soap-envelope/', $request->getSoapMessage());
259+
$this->assertRegExp('/GetAirportInformationByCountry/', $request->getSoapMessage());
260+
$this->assertRegExp('/country/', $request->getSoapMessage());
261261
}
262262

263263
/**
@@ -290,10 +290,10 @@ public function requestWithoutWsdl()
290290
$this->assertEquals('www.location.com', $request->getEndpoint());
291291
$this->assertEquals('www.uri.com#anything', $request->getSoapAction());
292292
$this->assertEquals('1', $request->getSoapVersion());
293-
$this->assertContains('one', $request->getSoapMessage());
294-
$this->assertContains('two', $request->getSoapMessage());
295-
$this->assertContains('three', $request->getSoapMessage());
296-
$this->assertContains('four', $request->getSoapMessage());
293+
$this->assertRegExp('/one/', $request->getSoapMessage());
294+
$this->assertRegExp('/two/', $request->getSoapMessage());
295+
$this->assertRegExp('/three/', $request->getSoapMessage());
296+
$this->assertRegExp('/four/', $request->getSoapMessage());
297297
}
298298

299299
/**

0 commit comments

Comments
 (0)