Merge pull request #16 from tarfin-labs/php-8-2-support

general updates
tarfin-labs · May 11, 2023 · 00899f2 · 00899f2
2 parents d2954aa + 95e34aa
commit 00899f2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 14 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,6 +1,6 @@
 name: tests
 
-on: [ push, pull_request ]
+on: [push, pull_request]
 
 jobs:
     test:
@@ -9,8 +9,8 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [ 7.2, 7.3, 7.4, 8.0, 8.1,8.2 ]
-                dependency-version: [ prefer-lowest, prefer-stable ]
+                php: [7.2, 7.3, 7.4, 8.0, 8.1, 8.2]
+                dependency-version: [prefer-lowest, prefer-stable]
 
         name: P${{ matrix.php }} - ${{ matrix.dependency-version }}
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,18 @@ All notable changes to `zbar-php` will be documented in this file
 
 ## Unreleased
 
+## 1.6.0 - 2023-05-11
+- PHP 8.2 support added.
+
+## 1.5.0 - 2023-03-24
+- zbar command not found error added.
+
+## 1.4.0 - 2023-01-05
 - New `Zbar::type()` (to get the type of bar code) and `Zbar::decode()` (to get an object with both the bar code and type).
 
+## 1.3.0 - 2022-02-15
+- PHP 8.1 support added.
+
 ## 1.2.0 - 2021-06-03
 - PHP 8 support added.
 

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
-  <coverage>
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
-    <report>
-      <clover outputFile="build/logs/clover.xml"/>
-      <html outputDirectory="build/coverage"/>
-      <text outputFile="build/coverage.txt"/>
-    </report>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         bootstrap="vendor/autoload.php"
+         backupGlobals="false"
+         colors="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
+         cacheDirectory=".phpunit.cache"
+         backupStaticProperties="false">
   <testsuites>
     <testsuite name="Test Suite">
       <directory>tests</directory>
@@ -18,4 +16,9 @@
   <logging>
     <junit outputFile="build/report.junit.xml"/>
   </logging>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>