From 1fd8f7acc424eb95043532f37b264ac00e8e4dc4 Mon Sep 17 00:00:00 2001
From: Ilya Gusev <mail@igusev.ru>
Date: Fri, 26 Oct 2018 17:47:08 +0300
Subject: [PATCH 1/3] Fixed tests autoload

---
 phpunit.xml.dist                              | 21 +++++++++++++------
 tests/CasesHelperTest.php                     |  2 --
 tests/CurrenciesHelperTest.php                |  2 --
 tests/English/CardinalNumeralTest.php         |  2 --
 tests/English/FunctionsTest.php               |  2 --
 tests/English/NounPluralizationTest.php       |  2 --
 tests/English/OrdinalNumeralTest.php          |  2 --
 tests/English/TimeSpellerTest.php             |  2 --
 tests/Russian/CardinalNumeralTest.php         |  2 --
 tests/Russian/FirstNamesInflecionTest.php     |  2 --
 tests/Russian/FunctionsTest.php               |  2 --
 .../GeographicalNamesInflectionTest.php       |  2 --
 tests/Russian/LastNamesInflectionTest.php     |  2 --
 tests/Russian/MiddleNamesInflectionTest.php   |  2 --
 tests/Russian/MoneySpellerTest.php            |  1 -
 tests/Russian/NounDeclensionTest.php          |  2 --
 tests/Russian/NounPluralizationTest.php       |  2 --
 tests/Russian/OrdinalNumeralTest.php          |  2 --
 tests/Russian/RussianLanguageTest.php         |  2 --
 tests/Russian/TimeSpellerTest.php             |  2 --
 20 files changed, 15 insertions(+), 43 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index cbf9794..2563672 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit colors="true" verbose="true">
-  <testsuites>
-    <testsuite>
-      <directory>tests</directory>
-    </testsuite>
-  </testsuites>
+<phpunit bootstrap="vendor/autoload.php"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="false"
+         verbose="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false">
+    <testsuites>
+        <testsuite>
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
 </phpunit>
diff --git a/tests/CasesHelperTest.php b/tests/CasesHelperTest.php
index 7c2a737..6ea16de 100644
--- a/tests/CasesHelperTest.php
+++ b/tests/CasesHelperTest.php
@@ -1,8 +1,6 @@
 <?php
 namespace morhos\test;
 
-require_once __DIR__.'/../vendor/autoload.php';
-
 use morphos\CasesHelper;
 use morphos\Cases;
 
diff --git a/tests/CurrenciesHelperTest.php b/tests/CurrenciesHelperTest.php
index 76be551..3947c44 100644
--- a/tests/CurrenciesHelperTest.php
+++ b/tests/CurrenciesHelperTest.php
@@ -1,8 +1,6 @@
 <?php
 namespace morhos\test;
 
-require_once __DIR__.'/../vendor/autoload.php';
-
 use morphos\CurrenciesHelper;
 use morphos\Currency;
 
diff --git a/tests/English/CardinalNumeralTest.php b/tests/English/CardinalNumeralTest.php
index 53429c6..5c9a1e9 100644
--- a/tests/English/CardinalNumeralTest.php
+++ b/tests/English/CardinalNumeralTest.php
@@ -1,8 +1,6 @@
 <?php
 namespace morhos\test\English;
 
-require_once __DIR__.'/../../vendor/autoload.php';
-
 use morphos\English\CardinalNumeralGenerator;
 
 class CardinalNumeralTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/English/FunctionsTest.php b/tests/English/FunctionsTest.php
index fc42eac..640cfdb 100644
--- a/tests/English/FunctionsTest.php
+++ b/tests/English/FunctionsTest.php
@@ -1,8 +1,6 @@
 <?php
 namespace morphos\test\English;
 
-require __DIR__.'/../../vendor/autoload.php';
-
 use morphos\Gender;
 use morphos\NumeralGenerator;
 
diff --git a/tests/English/NounPluralizationTest.php b/tests/English/NounPluralizationTest.php
index 76543b2..b26ac49 100644
--- a/tests/English/NounPluralizationTest.php
+++ b/tests/English/NounPluralizationTest.php
@@ -1,8 +1,6 @@
 <?php
 namespace morhos\test\English;
 
-require_once __DIR__.'/../../vendor/autoload.php';
-
 use morphos\English\NounPluralization;
 
 class NounPluralizationTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/English/OrdinalNumeralTest.php b/tests/English/OrdinalNumeralTest.php
index a316b8c..fa106fd 100644
--- a/tests/English/OrdinalNumeralTest.php
+++ b/tests/English/OrdinalNumeralTest.php
@@ -1,8 +1,6 @@
 <?php
 namespace morhos\test\English;
 
-require_once __DIR__.'/../../vendor/autoload.php';
-
 use morphos\English\OrdinalNumeralGenerator;
 
 class OrdinalNumeralTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/English/TimeSpellerTest.php b/tests/English/TimeSpellerTest.php
index 939b1bf..a166c84 100644
--- a/tests/English/TimeSpellerTest.php
+++ b/tests/English/TimeSpellerTest.php
@@ -1,8 +1,6 @@
 <?php
 namespace morphos\test\English;
 
-require __DIR__.'/../../vendor/autoload.php';
-
 use DateInterval;
 use morphos\English\TimeSpeller;
 
diff --git a/tests/Russian/CardinalNumeralTest.php b/tests/Russian/CardinalNumeralTest.php
index 03b13b6..a2d42a9 100644
--- a/tests/Russian/CardinalNumeralTest.php
+++ b/tests/Russian/CardinalNumeralTest.php
@@ -1,8 +1,6 @@
 <?php
 namespace morphos\test\Russian;
 
-require __DIR__.'/../../vendor/autoload.php';
-
 use morphos\NumeralGenerator;
 use morphos\Russian\Cases;
 use morphos\Russian\CardinalNumeralGenerator;
diff --git a/tests/Russian/FirstNamesInflecionTest.php b/tests/Russian/FirstNamesInflecionTest.php
index 25cdea6..193798b 100644
--- a/tests/Russian/FirstNamesInflecionTest.php
+++ b/tests/Russian/FirstNamesInflecionTest.php
@@ -1,8 +1,6 @@
 <?php
 namespace morhos\test\Russian;
 
-require __DIR__.'/../../vendor/autoload.php';
-
 use morphos\Gender;
 use morphos\NamesInflection;
 use morphos\Russian\Cases;
diff --git a/tests/Russian/FunctionsTest.php b/tests/Russian/FunctionsTest.php
index 60f02ff..c356f73 100644
--- a/tests/Russian/FunctionsTest.php
+++ b/tests/Russian/FunctionsTest.php
@@ -1,8 +1,6 @@
 <?php
 namespace morphos\test\Russian;
 
-require __DIR__.'/../../vendor/autoload.php';
-
 use morphos\Gender;
 use morphos\NumeralGenerator;
 use morphos\Russian\Cases;
diff --git a/tests/Russian/GeographicalNamesInflectionTest.php b/tests/Russian/GeographicalNamesInflectionTest.php
index 2c73df0..c47acf3 100644
--- a/tests/Russian/GeographicalNamesInflectionTest.php
+++ b/tests/Russian/GeographicalNamesInflectionTest.php
@@ -1,8 +1,6 @@
 <?php
 namespace morhos\test\Russian;
 
-require_once __DIR__.'/../../vendor/autoload.php';
-
 use morphos\Russian\Cases;
 use morphos\Russian\GeographicalNamesInflection;
 
diff --git a/tests/Russian/LastNamesInflectionTest.php b/tests/Russian/LastNamesInflectionTest.php
index 0294d41..9387db7 100644
--- a/tests/Russian/LastNamesInflectionTest.php
+++ b/tests/Russian/LastNamesInflectionTest.php
@@ -1,8 +1,6 @@
 <?php
 namespace morhos\test\Russian;
 
-require __DIR__.'/../../vendor/autoload.php';
-
 use morphos\Russian\Cases;
 use morphos\Russian\LastNamesInflection;
 use morphos\NamesInflection;
diff --git a/tests/Russian/MiddleNamesInflectionTest.php b/tests/Russian/MiddleNamesInflectionTest.php
index 37b221d..cb2b13e 100644
--- a/tests/Russian/MiddleNamesInflectionTest.php
+++ b/tests/Russian/MiddleNamesInflectionTest.php
@@ -1,8 +1,6 @@
 <?php
 namespace morhos\test\Russian;
 
-require __DIR__.'/../../vendor/autoload.php';
-
 use morphos\Russian\Cases;
 use morphos\Russian\MiddleNamesInflection;
 use morphos\NamesInflection;
diff --git a/tests/Russian/MoneySpellerTest.php b/tests/Russian/MoneySpellerTest.php
index 5186b91..23535c2 100644
--- a/tests/Russian/MoneySpellerTest.php
+++ b/tests/Russian/MoneySpellerTest.php
@@ -1,7 +1,6 @@
 <?php
 namespace morphos\test\Russian;
 
-require __DIR__.'/../../vendor/autoload.php';
 
 use morphos\Gender;
 use morphos\Currency;
diff --git a/tests/Russian/NounDeclensionTest.php b/tests/Russian/NounDeclensionTest.php
index 7bdaa2c..7fa2daf 100644
--- a/tests/Russian/NounDeclensionTest.php
+++ b/tests/Russian/NounDeclensionTest.php
@@ -1,8 +1,6 @@
 <?php
 namespace morhos\test\Russian;
 
-require_once __DIR__.'/../../vendor/autoload.php';
-
 use morphos\Gender;
 use morphos\Russian\NounDeclension;
 
diff --git a/tests/Russian/NounPluralizationTest.php b/tests/Russian/NounPluralizationTest.php
index 0bda4b4..e6299a7 100644
--- a/tests/Russian/NounPluralizationTest.php
+++ b/tests/Russian/NounPluralizationTest.php
@@ -1,8 +1,6 @@
 <?php
 namespace morhos\test\Russian;
 
-require_once __DIR__.'/../../vendor/autoload.php';
-
 use morphos\Russian\NounPluralization;
 
 class NounPluralizationTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/Russian/OrdinalNumeralTest.php b/tests/Russian/OrdinalNumeralTest.php
index 8f13924..48e940d 100644
--- a/tests/Russian/OrdinalNumeralTest.php
+++ b/tests/Russian/OrdinalNumeralTest.php
@@ -1,8 +1,6 @@
 <?php
 namespace morphos\test\Russian;
 
-require __DIR__.'/../../vendor/autoload.php';
-
 use morphos\NumeralGenerator;
 use morphos\Russian\Cases;
 use morphos\Russian\OrdinalNumeralGenerator;
diff --git a/tests/Russian/RussianLanguageTest.php b/tests/Russian/RussianLanguageTest.php
index 7456936..23183f9 100644
--- a/tests/Russian/RussianLanguageTest.php
+++ b/tests/Russian/RussianLanguageTest.php
@@ -1,8 +1,6 @@
 <?php
 namespace morphos\test\Russian;
 
-require __DIR__.'/../../vendor/autoload.php';
-
 use morphos\Gender;
 use morphos\NumeralGenerator;
 use morphos\Russian\Cases;
diff --git a/tests/Russian/TimeSpellerTest.php b/tests/Russian/TimeSpellerTest.php
index 6bab0ee..8a367e0 100644
--- a/tests/Russian/TimeSpellerTest.php
+++ b/tests/Russian/TimeSpellerTest.php
@@ -1,8 +1,6 @@
 <?php
 namespace morphos\test\Russian;
 
-require __DIR__.'/../../vendor/autoload.php';
-
 use DateInterval;
 use morphos\Russian\TimeSpeller;
 

From 560ad1e3e6b0692ce65b5dce6c9e31e07c8c6ca6 Mon Sep 17 00:00:00 2001
From: Ilya Gusev <mail@igusev.ru>
Date: Fri, 26 Oct 2018 18:08:24 +0300
Subject: [PATCH 2/3] upd phpunit

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index fee33ca..dbd8e8f 100644
--- a/composer.json
+++ b/composer.json
@@ -29,6 +29,6 @@
 		}
 	},
 	"require-dev": {
-		"phpunit/phpunit": "~4.8"
+		"phpunit/phpunit": "^5.0"
 	}
 }

From 1d7c450495c4feab80343afad93369be4aac6f1c Mon Sep 17 00:00:00 2001
From: Ilya Gusev <mail@igusev.ru>
Date: Fri, 26 Oct 2018 23:10:49 +0300
Subject: [PATCH 3/3] Revert "upd phpunit"

This reverts commit 560ad1e3e6b0692ce65b5dce6c9e31e07c8c6ca6.
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index dbd8e8f..fee33ca 100644
--- a/composer.json
+++ b/composer.json
@@ -29,6 +29,6 @@
 		}
 	},
 	"require-dev": {
-		"phpunit/phpunit": "^5.0"
+		"phpunit/phpunit": "~4.8"
 	}
 }