From 16d7a0b8010ab7fb5eb2e30d6f6260655a17ad50 Mon Sep 17 00:00:00 2001 From: Schparky <3172830+Schparky@users.noreply.github.com> Date: Wed, 16 Feb 2022 16:36:01 -0700 Subject: [PATCH 1/4] don't destroy the world --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bd7ff56..da3fe6e 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ it-now: clean install test clean: docker-compose kill - docker system prune -f + docker-compose rm -f install: docker-compose run --rm cli bash -c "composer install" From 130e7f34cad4ea1c657adc847ff572dc1f7d990e Mon Sep 17 00:00:00 2001 From: Steve Bagwell Date: Mon, 22 Aug 2022 16:20:24 -0400 Subject: [PATCH 2/4] update to php 8.1 from 7.4 --- composer.json | 10 ++++++++-- docker-compose.yml | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index aeb694d..ab018c9 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ ], "minimum-stability": "stable", "require": { - "php": "^7.2", + "php": "^8.1", "psr/log": "^1.0" }, "require-dev": { @@ -37,5 +37,11 @@ "type": "composer", "url": "https://asset-packagist.org" } - ] + ], + "config": { + "allow-plugins": { + "yiisoft/yii2-composer": true, + "simplesamlphp/composer-module-installer": true + } + } } diff --git a/docker-compose.yml b/docker-compose.yml index 3fb8a30..8b986e5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '2.2' services: cli: - image: silintl/php7:7.4 + image: silintl/php8:8.1 volumes: - ./:/data working_dir: /data From 8dc4a6547f850670b5e45c6ce9d508fa23da2cbf Mon Sep 17 00:00:00 2001 From: Steve Bagwell Date: Mon, 22 Aug 2022 16:30:01 -0400 Subject: [PATCH 3/4] Updated license copyright year --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 3776ad7..22ec5d8 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2021 SIL International +Copyright (c) 2022 SIL International Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 02bda586e72fd71fd13aa400f0d95ce5920f4f5f Mon Sep 17 00:00:00 2001 From: Steve Bagwell Date: Mon, 22 Aug 2022 16:50:16 -0400 Subject: [PATCH 4/4] use version range --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ab018c9..5941cee 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ ], "minimum-stability": "stable", "require": { - "php": "^8.1", + "php": "^7.4 || ^8.0", "psr/log": "^1.0" }, "require-dev": {