Updates test suite for phpunit 6, adds vagrant file

hollodotme · Feb 23, 2017 · 17ac4d3 · 17ac4d3
1 parent c784a19
commit 17ac4d3
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
-.idea/
+/.idea/
+/.vagrant/
 /vendor/
 /build/logs/
diff --git a/Vagrantfile b/Vagrantfile
@@ -0,0 +1,12 @@
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+
+  # box-config
+  config.vm.box = "DreiWolt/devops007"
+
+  # network-config
+  config.vm.network :private_network, ip: "192.168.3.13"
+  config.vm.hostname = "FCGIClient"
+
+end
diff --git a/build/phpunit.xml b/build/phpunit.xml
@@ -1,5 +1,5 @@
 <phpunit
-	bootstrap="../tests/Unit/bootstrap.php"
+	bootstrap="../tests/bootstrap.php"
 	verbose="true"
 	beStrictAboutOutputDuringTests="true"
 	beStrictAboutTestSize="true"
@@ -16,11 +16,6 @@
 		<whitelist processUncoveredFilesFromWhitelist="true">
 			<directory suffix=".php">../src</directory>
 		</whitelist>
-		<blacklist>
-			<directory suffix=".php">../tests/Unit</directory>
-			<directory>../tests/Unit/Fixtures</directory>
-			<directory>../vendor</directory>
-		</blacklist>
 	</filter>
 	<logging>
 		<log type="coverage-html" target="logs/coverage"/>

diff --git a/composer.json b/composer.json
@@ -41,15 +41,15 @@
 	"extra": {
 		"tools": {
 			"phpunit": {
-				"url": "https://phar.phpunit.de/phpunit.phar",
+				"url": "https://phar.phpunit.de/phpunit-6.0.7.phar",
 				"only-dev": true
 			},
 			"coveralls": {
 				"url": "https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar",
 				"only-dev": true
 			},
 			"phpmetrics": {
-				"url": "https://github.com/phpmetrics/PhpMetrics/releases/download/v2.0.0-rc/phpmetrics.phar",
+				"url": "https://github.com/phpmetrics/PhpMetrics/releases/download/v2.0.0/phpmetrics.phar",
 				"only-dev": true
 			}
 		}

diff --git a/composer.lock b/composer.lock
diff --git a/tests/Unit/ClientTest.php b/tests/Unit/ClientTest.php
@@ -26,7 +26,7 @@
 use hollodotme\FastCGI\Client;
 use hollodotme\FastCGI\SocketConnections\UnixDomainSocket;
 
-class ClientTest extends \PHPUnit_Framework_TestCase
+class ClientTest extends \PHPUnit\Framework\TestCase
 {
 	/**
 	 * @expectedException \hollodotme\FastCGI\Exceptions\ConnectException

diff --git a/tests/Unit/Encoders/NameValuePairEncoderTest.php b/tests/Unit/Encoders/NameValuePairEncoderTest.php
@@ -25,7 +25,7 @@
 
 use hollodotme\FastCGI\Encoders\NameValuePairEncoder;
 
-class NameValuePairEncoderTest extends \PHPUnit_Framework_TestCase
+class NameValuePairEncoderTest extends \PHPUnit\Framework\TestCase
 {
 	/**
 	 * @param array $pairs

diff --git a/tests/Unit/Encoders/PacketEncoderTest.php b/tests/Unit/Encoders/PacketEncoderTest.php
@@ -25,7 +25,7 @@
 
 use hollodotme\FastCGI\Encoders\PacketEncoder;
 
-class PacketEncoderTest extends \PHPUnit_Framework_TestCase
+class PacketEncoderTest extends \PHPUnit\Framework\TestCase
 {
 	/**
 	 * @param int    $type

diff --git a/tests/Unit/SocketConnections/NetworkSocketTest.php b/tests/Unit/SocketConnections/NetworkSocketTest.php
@@ -27,7 +27,7 @@
 use hollodotme\FastCGI\SocketConnections\Defaults;
 use hollodotme\FastCGI\SocketConnections\NetworkSocket;
 
-class NetworkSocketTest extends \PHPUnit_Framework_TestCase
+class NetworkSocketTest extends \PHPUnit\Framework\TestCase
 {
 	public function testImplementsConnectionInterface()
 	{

diff --git a/tests/Unit/SocketConnections/UnixDomainSocketTest.php b/tests/Unit/SocketConnections/UnixDomainSocketTest.php
@@ -27,7 +27,7 @@
 use hollodotme\FastCGI\SocketConnections\Defaults;
 use hollodotme\FastCGI\SocketConnections\UnixDomainSocket;
 
-class UnixDomainSocketTest extends \PHPUnit_Framework_TestCase
+class UnixDomainSocketTest extends \PHPUnit\Framework\TestCase
 {
 	public function testImplementsConnectionInterface()
 	{

diff --git a/tests/Unit/Timing/TimerTest.php b/tests/Unit/Timing/TimerTest.php
@@ -25,7 +25,7 @@
 
 use hollodotme\FastCGI\Timing\Timer;
 
-class TimerTest extends \PHPUnit_Framework_TestCase
+class TimerTest extends \PHPUnit\Framework\TestCase
 {
 	/**
 	 * @expectedException \hollodotme\FastCGI\Timing\Exceptions\TimerNotStartedException

diff --git a/tests/Unit/bootstrap.php → tests/bootstrap.php b/tests/Unit/bootstrap.php → tests/bootstrap.php
@@ -21,4 +21,4 @@
  * SOFTWARE.
  */
 
-require(__DIR__ . '/../../vendor/autoload.php');
+require(__DIR__ . '/../vendor/autoload.php');