From 0a59dc5a797b2f5f78a8e34040e132dca8363f02 Mon Sep 17 00:00:00 2001
From: "R. Eric Wheeler" <sikofitt@gmail.com>
Date: Tue, 17 May 2022 18:15:13 +0000
Subject: [PATCH] Merge 1.x into master

---
 .gitlab-ci.yml | 9 ++++++++-
 composer.json  | 6 +++++-
 composer.lock  | 2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 981c08c..2f4e09a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,6 @@ before_script:
   - php composer.phar install
 
 # Run our tests
-# If Xdebug was installed you can generate a coverage report and see code coverage metrics.
 test:7.4:
   only:
     - 1.x
@@ -35,3 +34,11 @@ test:8.0:
   image: php:8.0
   script:
     - vendor/bin/phpunit --configuration phpunit.xml --coverage-text --colors=never
+test:8.1:
+  only:
+    - 1.x
+  tags:
+    - default
+  image: php:8.1
+  script:
+    - vendor/bin/phpunit --configuration phpunit.xml --coverage-text --colors=never
diff --git a/composer.json b/composer.json
index f36c1b0..1a8b364 100644
--- a/composer.json
+++ b/composer.json
@@ -2,6 +2,7 @@
     "name": "olivebbs/getch",
     "description": "Implements _getch and _ungetch for windows and linux using ffi",
     "type": "library",
+    "keywords": ["getch", "windows", "conio", "linux", "console", "conio.h", "hotkey", "termios"],
     "require": {
         "php": ">=7.4",
         "ext-ffi": "*"
@@ -29,5 +30,8 @@
             "name": "R. Eric Wheeler",
             "email": "sikofitt@gmail.com"
         }
-    ]
+    ],
+    "conflict": {
+      "sikofitt/getch": "*"
+    }
 }
diff --git a/composer.lock b/composer.lock
index 5bf2b88..a580409 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a9f24f3e6bdfb946f6671416016d7e76",
+    "content-hash": "4d1f166ee2e71f29c8f3567cba3ee2e6",
     "packages": [],
     "packages-dev": [
         {