From 5214aa23fe9aac03ae79423840bee8da19947db2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Turan=20Karatu=C4=9F?= <tkaratug@hotmail.com.tr>
Date: Thu, 3 Jun 2021 12:28:38 +0300
Subject: [PATCH] PHP 8 support added.

---
 .github/workflows/tests.yml |  2 +-
 .scrutinizer.yml            | 19 -------------------
 CHANGELOG.md                |  3 +++
 composer.json               |  5 +++--
 4 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 .scrutinizer.yml

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4e721d6..4562b96 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -9,7 +9,7 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [7.2, 7.3, 7.4]
+                php: [7.2, 7.3, 7.4, 8.0]
                 dependency-version: [prefer-lowest, prefer-stable]
 
         name: P${{ matrix.php }} - ${{ matrix.dependency-version }}
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
deleted file mode 100644
index df16b68..0000000
--- a/.scrutinizer.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-filter:
-    excluded_paths: [tests/*]
-
-checks:
-    php:
-        remove_extra_empty_lines: true
-        remove_php_closing_tag: true
-        remove_trailing_whitespace: true
-        fix_use_statements:
-            remove_unused: true
-            preserve_multiple: false
-            preserve_blanklines: true
-            order_alphabetically: true
-        fix_php_opening_tag: true
-        fix_linefeed: true
-        fix_line_ending: true
-        fix_identation_4spaces: true
-        fix_doc_comments: true
-
diff --git a/CHANGELOG.md b/CHANGELOG.md
index beb9d2e..6cb8cd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ All notable changes to `zbar-php` will be documented in this file
 
 ## Unreleased
 
+## 1.2.0 - 2021-06-03
+- PHP 8 support added.
+
 ## 1.1.0 - 2020-10-14
 - Better error messages.
 
diff --git a/composer.json b/composer.json
index 79f2d1d..7bb782f 100644
--- a/composer.json
+++ b/composer.json
@@ -18,11 +18,12 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.2 || ^8.0",
+        "ext-imagick": "*",
         "symfony/process": "^4.4|^5.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.5"
+        "phpunit/phpunit": "^8.5|^9.0"
     },
     "autoload": {
         "psr-4": {