Fix tests on PHPUnit 9

antonioribeiro · antonioribeiro · commit 0d83b2f197e5 · 2020-09-19T11:41:18.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@
 /src/data/third-party/
 composer.phar
 composer.lock
+.phpunit.result.cache
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,31 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="tests/bootstrap.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         syntaxCheck="true"
-         verbose="true"
->
-    <testsuites>
-        <testsuite name="Laravel Test Suite">
-            <directory suffix="Test.php">./tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-            <exclude>./src/package/Update</exclude>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-html" target="coverage/" lowUpperBound="35" highLowerBound="70"/>
-        <log type="coverage-clover" target="coverage/coverage-clover.xml" lowUpperBound="35" highLowerBound="70"/>
-        <log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
-    </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="tests/bootstrap.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnError="false" stopOnFailure="false" verbose="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <report>
+      <clover outputFile="coverage/coverage-clover.xml"/>
+      <html outputDirectory="coverage/" lowUpperBound="35" highLowerBound="70"/>
+      <text outputFile="php://stdout" showUncoveredFiles="true"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Laravel Test Suite">
+      <directory suffix="Test.php">./tests</directory>
+    </testsuite>
+  </testsuites>
+  <logging/>
 </phpunit>
diff --git a/tests/CountriesTest.php b/tests/CountriesTest.php
@@ -88,9 +88,7 @@ public function testCountEverything()
             }, 0);
         });
 
-        $results = coollect($results)->sortBy(function ($country) {
-            return $country[1];
-        });
+        $results = coollect($results)->sort();
 
         $this->assertEquals($results->toArray(), [
             'taxes' => 33,
