Updated mockery, added phpunit.xml.dist

Author: ezimuel

.gitignore

@@ -27,3 +27,6 @@ util/output
 
 # Sami docs generator
 /sami.phar
+
+# PHPUnit
+phpunit.xml

composer.json

@@ -6,7 +6,10 @@
   "license": "Apache-2.0",
   "authors": [
     {
-      "name": "Zachary Tong"
+        "name": "Zachary Tong"
+    },
+    {
+        "name": "Enrico Zimuel"
     }
   ],
   "require": {
@@ -18,7 +21,7 @@
   "require-dev": {
     "cpliakas/git-wrapper": "~1.0",
     "doctrine/inflector": "^1.1",
-    "mockery/mockery": "0.9.4",
+    "mockery/mockery": "^1.2",
     "phpstan/phpstan-shim": "0.9.1",
     "phpunit/phpunit": "6.3.0",
     "squizlabs/php_codesniffer": "3.0.2",
@@ -36,7 +39,8 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Elasticsearch\\Tests\\":      "tests/Elasticsearch/Tests/"
+      "Elasticsearch\\Tests\\": "tests/Elasticsearch/Tests/",
+      "Elasticsearch\\IntegrationTests\\": "tests/Elasticsearch/IntegrationTests/"
     }
   },
   "config": {

phpunit.xml

@@ -9,7 +9,7 @@
         beStrictAboutOutputDuringTests="true"
 >
     <php>
-        <server name="ES_TEST_HOST" value="http://localhost:9200"/>
+        <server name="ES_TEST_HOST" value="localhost:9200"/>
     </php>
     <testsuites>
         <testsuite name="Tests">

phpunit.xml.dist

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.3/phpunit.xsd"
+        bootstrap="tests/bootstrap.php"
+        colors="true"
+        failOnRisky="true"
+        verbose="true"
+        beStrictAboutChangesToGlobalState="true"
+        beStrictAboutOutputDuringTests="true"
+>
+    <php>
+        <server name="ES_TEST_HOST" value=""/>
+    </php>
+    <testsuites>
+        <testsuite name="Tests">
+            <directory>tests</directory>
+            <exclude>tests/Elasticsearch/Tests/YamlRunnerTest.php</exclude>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
+</phpunit>