From 89daa1d1d770fed79c420503b26f7de3492c8873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mario=20Bla=C5=BEek?= <blazek.mario@gmail.com>
Date: Mon, 22 Jan 2018 12:09:52 +0100
Subject: [PATCH] Enabled PHPUnit v6

---
 Tests/Helper/UserContentHelperTest.php |  3 ++-
 Tests/OAuth/eZUserProviderTest.php     |  3 ++-
 composer.json                          | 15 ++++++++++++++-
 phpunit.xml                            | 10 ++++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/Tests/Helper/UserContentHelperTest.php b/Tests/Helper/UserContentHelperTest.php
index 5258bc4..0acf94f 100644
--- a/Tests/Helper/UserContentHelperTest.php
+++ b/Tests/Helper/UserContentHelperTest.php
@@ -5,8 +5,9 @@
 use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition;
 use Netgen\Bundle\EzSocialConnectBundle\Entity\OAuthEz;
 use Netgen\Bundle\EzSocialConnectBundle\OAuth\OAuthEzUser;
+use PHPUnit\Framework\TestCase;
 
-class UserContentHelperTest extends \PHPUnit_Framework_TestCase
+class UserContentHelperTest extends TestCase
 {
     public function testGetUserCreateStruct()
     {
diff --git a/Tests/OAuth/eZUserProviderTest.php b/Tests/OAuth/eZUserProviderTest.php
index c6dd68d..9424edb 100644
--- a/Tests/OAuth/eZUserProviderTest.php
+++ b/Tests/OAuth/eZUserProviderTest.php
@@ -5,8 +5,9 @@
 
 use Netgen\Bundle\EzSocialConnectBundle\Entity\OAuthEz;
 use Netgen\Bundle\EzSocialConnectBundle\OAuth\OAuthEzUser;
+use PHPUnit\Framework\TestCase;
 
-class eZUserProviderTest extends \PHPUnit_Framework_TestCase
+class eZUserProviderTest extends TestCase
 {
     public function testGetUserIfAlreadyLinked()
     {
diff --git a/composer.json b/composer.json
index 6e1cdd8..ed5779e 100644
--- a/composer.json
+++ b/composer.json
@@ -2,6 +2,15 @@
     "name": "netgen/ez-social-connect",
     "description": "Bundle for eZ Publish which enables sign in with various social networks",
     "type": "ezplatform-bundle",
+    "keywords": [
+        "ezpublish",
+        "ezplatform",
+        "netgen",
+        "ez-social-connect",
+        "oauth",
+        "social-login"
+    ],
+    "homepage": "https://github.com/netgen/NetgenEzSocialConnectBundle",
     "license": "GPL-2.0-only",
     "authors": [
         {
@@ -17,10 +26,14 @@
     },
     "require-dev": {
         "ezsystems/ezpublish-kernel": "6.12",
-        "phpunit/phpunit": "^5.7"
+        "phpunit/phpunit": "^5.7|^6.0"
     },
     "target-dir": "Netgen/Bundle/EzSocialConnectBundle",
     "autoload": {
         "psr-0": { "Netgen\\Bundle\\EzSocialConnectBundle": "" }
+    },
+    "scripts": {
+        "test": "@php vendor/bin/phpunit --colors=always",
+        "coverage": "@php -dzend_extension=xdebug.so vendor/bin/phpunit --colors=always"
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
index d7fbadc..4e59c05 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <phpunit bootstrap="vendor/autoload.php"
          backupGlobals="false"
          backupStaticAttributes="false"
@@ -5,6 +6,9 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          colors="true"
+         verbose="true"
+         processIsolation="false"
+         stopOnFailure="false"
 >
     <testsuites>
         <testsuite name="Netgen\Bundle\EzSocialConnectBundle\Tests">
@@ -29,4 +33,10 @@
             </exclude>
         </whitelist>
     </filter>
+    <logging>
+        <log type="junit" target="build/report.junit.xml"/>
+        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
+        <log type="coverage-text" target="build/coverage.txt"/>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+    </logging>
 </phpunit>