Merge pull request #101 from Moskito89/feature/allow-php-8

khanamiryan · web-flow · commit 07fceefb79d8 · 2020-11-29T22:50:26.000+04:00
PHP 8 || Updated composer.json and PHPUnit
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /composer.lock
 /vendor
 .idea/
+.phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -18,10 +18,10 @@
     }
   ],
   "require": {
-    "php": "^5.6|^7.0"
+    "php": ">=5.6"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.7"
+    "phpunit/phpunit": "^9.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,10 +1,13 @@
-<phpunit bootstrap="tests/bootstrap.php">
-    <testsuite>
-        <directory suffix="Test.php">tests</directory>
-    </testsuite>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage>
+        <include>
+            <directory suffix=".php">tests/</directory>
+        </include>
+    </coverage>
+    <testsuites>
+        <testsuite name="Tests">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
 </phpunit>
diff --git a/tests/QrReaderTest.php b/tests/QrReaderTest.php
@@ -2,9 +2,10 @@
 
 namespace Khanamiryan\QrCodeTests;
 
+use PHPUnit\Framework\TestCase;
 use Zxing\QrReader;
 
-class QrReaderTest extends \PHPUnit\Framework\TestCase
+class QrReaderTest extends TestCase
 {
 
     public function testText1()
diff --git a/tests/QrReaderTest.php~ b/tests/QrReaderTest.php~

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 /composer.lock
 /vendor
 .idea/
 +.phpunit.result.cache
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,10 @@`
`2`	`2`
`3`	`3`	`namespace Khanamiryan\QrCodeTests;`
`4`	`4`
	`5`	`+use PHPUnit\Framework\TestCase;`
`5`	`6`	`use Zxing\QrReader;`
`6`	`7`
`7`		`-class QrReaderTest extends \PHPUnit\Framework\TestCase`
	`8`	`+class QrReaderTest extends TestCase`
`8`	`9`	`{`
`9`	`10`
`10`	`11`	`public function testText1()`