From c968b918e46659b1812a47463512093c7bf33338 Mon Sep 17 00:00:00 2001 From: Jonathan Hafkamp Date: Thu, 19 Nov 2020 13:11:25 +0100 Subject: [PATCH 1/3] Make Composer v2 ready --- .gitignore | 1 + composer.json | 100 +++++++++++++++++++++++++------------------------- 2 files changed, 51 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index db78b71..6e4f756 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ composer.lock vendor phpunit.xml .phpunit-watcher.yml +.idea diff --git a/composer.json b/composer.json index bacadc5..5738840 100644 --- a/composer.json +++ b/composer.json @@ -1,53 +1,53 @@ { - "name": "kapersoft/flysystem-sharefile", - "description": "Flysystem Adapter for ShareFile", - "keywords": [ - "kapersoft", - "flysystem-sharefile", - "flysystem", - "sharfile", - "api" - ], - "homepage": "https://github.com/kapersoft/flysystem-sharefile", - "license": "MIT", - "authors": [ - { - "name": "Jan Willem Kaper", - "email": "kapersoft@gmail.com", - "homepage": "https://kapersoft.com", - "role": "Developer" - } - ], - "require": { - "php": "^7.0", - "ext-curl": "*", - "kapersoft/sharefile-api": "^1.1.0", - "league/flysystem": "^1.0.41" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "^2.5", - "fzaninotto/faker": "^1.7", - "larapack/dd": "^1.1", - "mikey179/vfsStream": "^1.6", - "phpunit/phpunit": "^6.0", - "sabre/dav": "^3.2" - }, - "autoload": { - "psr-4": { - "Kapersoft\\FlysystemSharefile\\": "src" - } - }, - "autoload-dev": { - "psr-4": { - "Kapersoft\\FlysystemSharefile\\Tests\\": "tests" - } - }, - "scripts": { - "test": "vendor/bin/phpunit", - "cs": "vendor/bin/php-cs-fixer fix --allow-risky=yes" - }, - "config": { - "sort-packages": true, - "process-timeout": 0 + "name": "kapersoft/flysystem-sharefile", + "description": "Flysystem Adapter for ShareFile", + "keywords": [ + "kapersoft", + "flysystem-sharefile", + "flysystem", + "sharfile", + "api" + ], + "homepage": "https://github.com/kapersoft/flysystem-sharefile", + "license": "MIT", + "authors": [ + { + "name": "Jan Willem Kaper", + "email": "kapersoft@gmail.com", + "homepage": "https://kapersoft.com", + "role": "Developer" } + ], + "require": { + "php": "^7.0", + "ext-curl": "*", + "kapersoft/sharefile-api": "^1.1.0|dev-master", + "league/flysystem": "^1.0.41" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.5", + "fzaninotto/faker": "^1.7", + "larapack/dd": "^1.1", + "mikey179/vfsstream": "^1.6", + "phpunit/phpunit": "^6.0", + "sabre/dav": "^3.2" + }, + "autoload": { + "psr-4": { + "Kapersoft\\FlysystemSharefile\\": "src" + } + }, + "autoload-dev": { + "psr-4": { + "Kapersoft\\FlysystemSharefile\\Tests\\": "tests" + } + }, + "scripts": { + "test": "vendor/bin/phpunit", + "cs": "vendor/bin/php-cs-fixer fix --allow-risky=yes" + }, + "config": { + "sort-packages": true, + "process-timeout": 0 + } } From c93673f23d077efa8e2f519451a0b86b29ae4d1e Mon Sep 17 00:00:00 2001 From: Jonathan Hafkamp Date: Tue, 23 Feb 2021 15:39:12 +0100 Subject: [PATCH 2/3] Update to make use of our SATIS version --- composer.json | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 5738840..a9ae821 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "kapersoft/flysystem-sharefile", + "name": "creativeorange/flysystem-sharefile", "description": "Flysystem Adapter for ShareFile", "keywords": [ "kapersoft", @@ -21,7 +21,7 @@ "require": { "php": "^7.0", "ext-curl": "*", - "kapersoft/sharefile-api": "^1.1.0|dev-master", + "creativeorange/sharefile-api": "^2.0", "league/flysystem": "^1.0.41" }, "require-dev": { @@ -49,5 +49,14 @@ "config": { "sort-packages": true, "process-timeout": 0 - } + }, + "repositories": [ + { + "type": "composer", + "url": "https://satis.creativeorange.dev", + "only": [ + "creativeorange/*" + ] + } + ] } From af85660664f265e6cae1e92f74fccb97975a5d98 Mon Sep 17 00:00:00 2001 From: Jonathan Hafkamp Date: Tue, 12 Oct 2021 14:58:50 +0200 Subject: [PATCH 3/3] Prepare upgrade to PHP8 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a9ae821..876d6f9 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ } ], "require": { - "php": "^7.0", + "php": "^7.0|^8.0", "ext-curl": "*", "creativeorange/sharefile-api": "^2.0", "league/flysystem": "^1.0.41"