From 578e3376fcda7fbe0d4602662caaec7c0eeba7a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
<1005065+DeepDiver1975@users.noreply.github.com>
Date: Thu, 3 Aug 2023 12:27:27 +0200
Subject: [PATCH] fix: use firebase/php-jwt from core
---
appinfo/info.xml | 2 +-
composer.json | 6 ++---
composer.lock | 70 +++---------------------------------------------
3 files changed, 7 insertions(+), 71 deletions(-)
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 13467373..3302d1ea 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -22,7 +22,7 @@
https://github.com/owncloud/files_texteditor.git
https://raw.githubusercontent.com/owncloud/screenshots/a068ff44c439aa4969ea37b60e45bed875bbbb98/files_texteditor/texteditor.png
-
+
diff --git a/composer.json b/composer.json
index 7f41435c..fd77617d 100644
--- a/composer.json
+++ b/composer.json
@@ -2,14 +2,14 @@
"name": "owncloud/files_texteditor",
"config" : {
"platform": {
- "php": "7.3"
+ "php": "7.4"
},
"allow-plugins": {
"bamarni/composer-bin-plugin": true
}
},
- "require": {
- "firebase/php-jwt": "^6.0"
+ "replace": {
+ "firebase/php-jwt": "^6.8"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8"
diff --git a/composer.lock b/composer.lock
index 1da9a670..a5279fd0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,72 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "977afbce6c02844691be4dfbca0bdaa0",
- "packages": [
- {
- "name": "firebase/php-jwt",
- "version": "v6.4.0",
- "source": {
- "type": "git",
- "url": "https://github.com/firebase/php-jwt.git",
- "reference": "4dd1e007f22a927ac77da5a3fbb067b42d3bc224"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/firebase/php-jwt/zipball/4dd1e007f22a927ac77da5a3fbb067b42d3bc224",
- "reference": "4dd1e007f22a927ac77da5a3fbb067b42d3bc224",
- "shasum": ""
- },
- "require": {
- "php": "^7.1||^8.0"
- },
- "require-dev": {
- "guzzlehttp/guzzle": "^6.5||^7.4",
- "phpspec/prophecy-phpunit": "^1.1",
- "phpunit/phpunit": "^7.5||^9.5",
- "psr/cache": "^1.0||^2.0",
- "psr/http-client": "^1.0",
- "psr/http-factory": "^1.0"
- },
- "suggest": {
- "ext-sodium": "Support EdDSA (Ed25519) signatures",
- "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Firebase\\JWT\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Neuman Vong",
- "email": "neuman+pear@twilio.com",
- "role": "Developer"
- },
- {
- "name": "Anant Narayanan",
- "email": "anant@php.net",
- "role": "Developer"
- }
- ],
- "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
- "homepage": "https://github.com/firebase/php-jwt",
- "keywords": [
- "jwt",
- "php"
- ],
- "support": {
- "issues": "https://github.com/firebase/php-jwt/issues",
- "source": "https://github.com/firebase/php-jwt/tree/v6.4.0"
- },
- "time": "2023-02-09T21:01:23+00:00"
- }
- ],
+ "content-hash": "0668a69d3793669e9ff8b730b23b9c31",
+ "packages": [],
"packages-dev": [
{
"name": "bamarni/composer-bin-plugin",
@@ -137,7 +73,7 @@
"platform": [],
"platform-dev": [],
"platform-overrides": {
- "php": "7.3"
+ "php": "7.4"
},
"plugin-api-version": "2.3.0"
}