Merge pull request #9 from silinternational/develop

Release 1.1.0 Allow for PHP8
silinternational · Dec 2, 2022 · 5dcc48b · 5dcc48b
2 parents 33a6563 + 78b4407
commit 5dcc48b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ composer.lock
 vendor
 credentials
 local.env
+.idea/
diff --git a/Makefile b/Makefile
@@ -5,4 +5,4 @@ install:
 	docker-compose run --rm test composer install
 
 update:
-	docker-compose run --rm test composer update
+	docker-compose run --rm test bash -c "php -version && composer update && composer show -D > versions.txt"
diff --git a/composer.json b/composer.json
@@ -4,15 +4,15 @@
     "type": "library",
     "license": "MIT",
     "require": {
-        "php": "^7.4",
+        "php": "^7.4||^8.1",
         "ext-json": "*",
         "google/apiclient": "^v1.1.9",
         "google/apiclient-services": "^0.176"
     },
     "require-dev": {
         "behat/behat": "^3.6",
         "roave/security-advisories": "dev-master",
-        "silinternational/php-env": "^2.1"
+        "silinternational/php-env": "^2.1||^3.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
     test:
-        image: silintl/php7:7.4
+        image: silintl/php8:8.1
         env_file:
           - local.env
         volumes:

diff --git a/versions.txt b/versions.txt
@@ -0,0 +1,5 @@
+behat/behat               v3.11.0            Scenario-oriented BDD framework for PHP
+google/apiclient          v1.1.9             Client library for Google APIs
+google/apiclient-services v0.176.0           Client library for Google APIs
+roave/security-advisories dev-master b311503 Prevents installation of composer packages with known security vulnerabil...
+silinternational/php-env  3.1.0              Simple PHP library for getting (or requiring) environment variables, desi...
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ composer.lock @@
     vendor
     credentials
     local.env
+    .idea/