summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Molenaar <sean@seanmolenaar.eu>2021-02-04 21:02:08 +0100
committerSean Molenaar <SMillerDev@users.noreply.github.com>2021-02-05 07:27:11 +0100
commit76298c011b6a22baf213221345e1f87ae0ec3cd7 (patch)
treea1da40d63c3923c89e14a9c960e576a515f0f711
parentbb6fb66b57bf0d3b9b035c0cb64c21b40990802a (diff)
Composer: Remove favicon hack
Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>
-rw-r--r--composer.json10
-rw-r--r--composer.lock32
2 files changed, 21 insertions, 21 deletions
diff --git a/composer.json b/composer.json
index a05dcb742..3449e72fd 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,7 @@
"pear/net_url2": "2.2.2",
"riimu/kit-pathjoin": "1.2.0",
"debril/feed-io": "^v4.7.9",
- "arthurhoaro/favicon": "dev-master#6ffd4cf0c5e162d084e0d136ae4326a5351d8603",
+ "arthurhoaro/favicon": "^1.3.2",
"andreskrey/readability.php": "^2.1",
"ext-json": "*",
"ext-simplexml": "*",
@@ -58,18 +58,12 @@
"squizlabs/php_codesniffer": "^3.5.6",
"phpstan/phpstan": "^0.12.43",
"vimeo/psalm": "^4.0",
- "christophwurst/nextcloud": "^v21.0.0-beta6",
+ "christophwurst/nextcloud": "^v21.0.0-beta8",
"guzzlehttp/guzzle": "^7.2",
"doctrine/dbal": "^3.0",
"symfony/console": "^4.4.18",
"psr/log": "^1.1.0"
},
- "repositories": [
- {
- "type": "git",
- "url": "https://github.com/SMillerDev/favicon"
- }
- ],
"replace": {
"guzzlehttp/guzzle": "*",
"psr/log": "*",
diff --git a/composer.lock b/composer.lock
index 887880a51..c4b013144 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": "eb823a38907b7a4dbc29c4f666c18551",
+ "content-hash": "3ac5f7676d857ef288dcf2998c4203f2",
"packages": [
{
"name": "andreskrey/readability.php",
@@ -65,11 +65,17 @@
},
{
"name": "arthurhoaro/favicon",
- "version": "dev-master",
+ "version": "v1.3.2",
"source": {
"type": "git",
- "url": "https://github.com/SMillerDev/favicon",
- "reference": "6ffd4cf0c5e162d084e0d136ae4326a5351d8603"
+ "url": "https://github.com/ArthurHoaro/favicon.git",
+ "reference": "ed3c3f6fd9ab39b28eb86567c4b0a0583ca264a6"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/ArthurHoaro/favicon/zipball/ed3c3f6fd9ab39b28eb86567c4b0a0583ca264a6",
+ "reference": "ed3c3f6fd9ab39b28eb86567c4b0a0583ca264a6",
+ "shasum": ""
},
"require": {
"ext-dom": "*",
@@ -81,13 +87,13 @@
"squizlabs/php_codesniffer": "^3.5",
"weew/helpers-filesystem": "~1.0"
},
- "default-branch": true,
"type": "library",
"autoload": {
"psr-4": {
"Favicon\\": "src/Favicon/"
}
},
+ "notification-url": "https://packagist.org/downloads/",
"license": [
"Apache-2.0"
],
@@ -110,9 +116,10 @@
],
"support": {
"issues": "https://github.com/ArthurHoaro/favicon/issues",
+ "source": "https://github.com/ArthurHoaro/favicon/tree/v1.3.2",
"sources": "https://github.com/ArthurHoaro/favicon"
},
- "time": "2021-02-02T20:16:04+00:00"
+ "time": "2021-02-03T12:26:59+00:00"
},
{
"name": "debril/feed-io",
@@ -527,16 +534,16 @@
},
{
"name": "christophwurst/nextcloud",
- "version": "v21.0.0-beta6",
+ "version": "v21.0.0-beta8",
"source": {
"type": "git",
"url": "https://github.com/ChristophWurst/nextcloud_composer.git",
- "reference": "1a47a3cba5ce8185e84e8ffcb5ca1a3b050f5adc"
+ "reference": "7c7a5bd142ec8799c8bff8c34abc0d22c97c6c87"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/1a47a3cba5ce8185e84e8ffcb5ca1a3b050f5adc",
- "reference": "1a47a3cba5ce8185e84e8ffcb5ca1a3b050f5adc",
+ "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/7c7a5bd142ec8799c8bff8c34abc0d22c97c6c87",
+ "reference": "7c7a5bd142ec8799c8bff8c34abc0d22c97c6c87",
"shasum": ""
},
"require": {
@@ -561,9 +568,9 @@
"description": "Composer package containing Nextcloud's public API (classes, interfaces)",
"support": {
"issues": "https://github.com/ChristophWurst/nextcloud_composer/issues",
- "source": "https://github.com/ChristophWurst/nextcloud_composer/tree/v21.0.0-beta6"
+ "source": "https://github.com/ChristophWurst/nextcloud_composer/tree/v21.0.0-beta8"
},
- "time": "2021-01-20T09:09:58+00:00"
+ "time": "2021-02-03T07:55:40+00:00"
},
{
"name": "composer/package-versions-deprecated",
@@ -3689,7 +3696,6 @@
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
- "arthurhoaro/favicon": 20,
"christophwurst/nextcloud": 10
},
"prefer-stable": false,