diff options
author | Kevin Decherf <kevin@kdecherf.com> | 2020-03-28 18:39:56 +0100 |
---|---|---|
committer | Kevin Decherf <kevin@kdecherf.com> | 2020-03-29 16:27:31 +0200 |
commit | 9d196fcc157d2c9e852396dbc8fcd7e0407358ab (patch) | |
tree | 8d1225e971a55b31c6a7a76c00ea4cf9d028beaf | |
parent | 6277578d4f3a3acecaab6f677b2ac81db2d2981e (diff) | |
download | wallabag-9d196fcc157d2c9e852396dbc8fcd7e0407358ab.tar.gz wallabag-9d196fcc157d2c9e852396dbc8fcd7e0407358ab.tar.zst wallabag-9d196fcc157d2c9e852396dbc8fcd7e0407358ab.zip |
composer: replace grandt/phpepub with wallabag version
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
-rw-r--r-- | composer.json | 11 | ||||
-rw-r--r-- | composer.lock | 142 |
2 files changed, 74 insertions, 79 deletions
diff --git a/composer.json b/composer.json index bfe287c4..0b228222 100644 --- a/composer.json +++ b/composer.json | |||
@@ -73,7 +73,7 @@ | |||
73 | "friendsofsymfony/oauth-server-bundle": "^1.5", | 73 | "friendsofsymfony/oauth-server-bundle": "^1.5", |
74 | "stof/doctrine-extensions-bundle": "^1.2", | 74 | "stof/doctrine-extensions-bundle": "^1.2", |
75 | "scheb/two-factor-bundle": "^4.4", | 75 | "scheb/two-factor-bundle": "^4.4", |
76 | "grandt/phpepub": "dev-master", | 76 | "wallabag/phpepub": "^4.0.7.2", |
77 | "wallabag/php-mobi": "~1.0", | 77 | "wallabag/php-mobi": "~1.0", |
78 | "kphoen/rulerz-bundle": "~0.13", | 78 | "kphoen/rulerz-bundle": "~0.13", |
79 | "guzzlehttp/guzzle": "^5.3.1", | 79 | "guzzlehttp/guzzle": "^5.3.1", |
@@ -161,12 +161,5 @@ | |||
161 | } | 161 | } |
162 | }, | 162 | }, |
163 | "minimum-stability": "dev", | 163 | "minimum-stability": "dev", |
164 | "prefer-stable": true, | 164 | "prefer-stable": true |
165 | "repositories": [ | ||
166 | { | ||
167 | "type": "vcs", | ||
168 | "url": "https://github.com/Daniel-KM/PHPePub", | ||
169 | "comment": "The most up-to-date PHPePub as of now" | ||
170 | } | ||
171 | ] | ||
172 | } | 165 | } |
diff --git a/composer.lock b/composer.lock index e0231ac8..9f63e3b4 100644 --- a/composer.lock +++ b/composer.lock | |||
@@ -4,7 +4,7 @@ | |||
4 | "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", | 4 | "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", |
5 | "This file is @generated automatically" | 5 | "This file is @generated automatically" |
6 | ], | 6 | ], |
7 | "content-hash": "4458551b4c0cddd988d7bbbc76dc38dc", | 7 | "content-hash": "60ce056a3ba44dfa4e039261a2326ae9", |
8 | "packages": [ | 8 | "packages": [ |
9 | { | 9 | { |
10 | "name": "bdunogier/guzzle-site-authenticator", | 10 | "name": "bdunogier/guzzle-site-authenticator", |
@@ -2279,69 +2279,6 @@ | |||
2279 | "time": "2015-08-13T06:14:41+00:00" | 2279 | "time": "2015-08-13T06:14:41+00:00" |
2280 | }, | 2280 | }, |
2281 | { | 2281 | { |
2282 | "name": "grandt/phpepub", | ||
2283 | "version": "dev-master", | ||
2284 | "source": { | ||
2285 | "type": "git", | ||
2286 | "url": "https://github.com/Daniel-KM/PHPePub.git", | ||
2287 | "reference": "78546d9a49d59ad9a32b13f3d95cc2f548add1c3" | ||
2288 | }, | ||
2289 | "dist": { | ||
2290 | "type": "zip", | ||
2291 | "url": "https://api.github.com/repos/Daniel-KM/PHPePub/zipball/78546d9a49d59ad9a32b13f3d95cc2f548add1c3", | ||
2292 | "reference": "78546d9a49d59ad9a32b13f3d95cc2f548add1c3", | ||
2293 | "shasum": "" | ||
2294 | }, | ||
2295 | "require": { | ||
2296 | "grandt/phpresizegif": "~1.0.3", | ||
2297 | "grandt/relativepath": "~1.0.1", | ||
2298 | "masterminds/html5": "~2.3", | ||
2299 | "php": ">=5.3.0", | ||
2300 | "phpzip/phpzip": "~2.0.7" | ||
2301 | }, | ||
2302 | "type": "library", | ||
2303 | "autoload": { | ||
2304 | "psr-4": { | ||
2305 | "PHPePub\\": "src/PHPePub" | ||
2306 | }, | ||
2307 | "classmap": [ | ||
2308 | "src/lib.uuid.php" | ||
2309 | ] | ||
2310 | }, | ||
2311 | "license": [ | ||
2312 | "LGPL-2.1" | ||
2313 | ], | ||
2314 | "authors": [ | ||
2315 | { | ||
2316 | "name": "A. Grandt", | ||
2317 | "email": "php@grandt.com", | ||
2318 | "homepage": "http://grandt.com", | ||
2319 | "role": "Developer" | ||
2320 | }, | ||
2321 | { | ||
2322 | "name": "An, Hyeong-woo", | ||
2323 | "email": "mail@mytory.net", | ||
2324 | "homepage": "https://mytory.net", | ||
2325 | "role": "Contributor" | ||
2326 | }, | ||
2327 | { | ||
2328 | "name": "Daniel Berthereau", | ||
2329 | "email": "daniel.composer@berthereau.net", | ||
2330 | "role": "Contributor" | ||
2331 | } | ||
2332 | ], | ||
2333 | "description": "Package to create and stream e-books in the ePub 2.0 and 3.0 formats.", | ||
2334 | "homepage": "https://github.com/Grandt/PHPePub", | ||
2335 | "keywords": [ | ||
2336 | "e-book", | ||
2337 | "epub" | ||
2338 | ], | ||
2339 | "support": { | ||
2340 | "source": "https://github.com/Daniel-KM/PHPePub/tree/master" | ||
2341 | }, | ||
2342 | "time": "2018-10-21T22:00:00+00:00" | ||
2343 | }, | ||
2344 | { | ||
2345 | "name": "grandt/phpresizegif", | 2282 | "name": "grandt/phpresizegif", |
2346 | "version": "1.0.3", | 2283 | "version": "1.0.3", |
2347 | "source": { | 2284 | "source": { |
@@ -7862,7 +7799,7 @@ | |||
7862 | ], | 7799 | ], |
7863 | "authors": [ | 7800 | "authors": [ |
7864 | { | 7801 | { |
7865 | "name": "Sebastien Malot", | 7802 | "name": "Sebastien MALOT", |
7866 | "email": "sebastien@malot.fr" | 7803 | "email": "sebastien@malot.fr" |
7867 | } | 7804 | } |
7868 | ], | 7805 | ], |
@@ -9423,8 +9360,8 @@ | |||
9423 | "authors": [ | 9360 | "authors": [ |
9424 | { | 9361 | { |
9425 | "name": "Sander Kromwijk", | 9362 | "name": "Sander Kromwijk", |
9426 | "email": "s.kromwijk@gmail.co", | 9363 | "role": "Original developer", |
9427 | "role": "Original developer" | 9364 | "email": "s.kromwijk@gmail.co" |
9428 | }, | 9365 | }, |
9429 | { | 9366 | { |
9430 | "name": "Nicolas LÅ“uillet", | 9367 | "name": "Nicolas LÅ“uillet", |
@@ -9437,6 +9374,72 @@ | |||
9437 | "time": "2019-08-08T12:26:23+00:00" | 9374 | "time": "2019-08-08T12:26:23+00:00" |
9438 | }, | 9375 | }, |
9439 | { | 9376 | { |
9377 | "name": "wallabag/phpepub", | ||
9378 | "version": "4.0.7.2", | ||
9379 | "source": { | ||
9380 | "type": "git", | ||
9381 | "url": "https://github.com/wallabag/PHPePub.git", | ||
9382 | "reference": "ae4861e970fed1c6ae9ed85eefe03ac7c0113518" | ||
9383 | }, | ||
9384 | "dist": { | ||
9385 | "type": "zip", | ||
9386 | "url": "https://api.github.com/repos/wallabag/PHPePub/zipball/ae4861e970fed1c6ae9ed85eefe03ac7c0113518", | ||
9387 | "reference": "ae4861e970fed1c6ae9ed85eefe03ac7c0113518", | ||
9388 | "shasum": "" | ||
9389 | }, | ||
9390 | "require": { | ||
9391 | "grandt/phpresizegif": "~1.0.3", | ||
9392 | "grandt/relativepath": "~1.0.1", | ||
9393 | "masterminds/html5": "~2.3", | ||
9394 | "php": ">=5.3.0", | ||
9395 | "phpzip/phpzip": "~2.0.7" | ||
9396 | }, | ||
9397 | "type": "library", | ||
9398 | "autoload": { | ||
9399 | "psr-4": { | ||
9400 | "PHPePub\\": "src/PHPePub" | ||
9401 | }, | ||
9402 | "classmap": [ | ||
9403 | "src/lib.uuid.php" | ||
9404 | ] | ||
9405 | }, | ||
9406 | "notification-url": "https://packagist.org/downloads/", | ||
9407 | "license": [ | ||
9408 | "LGPL-2.1" | ||
9409 | ], | ||
9410 | "authors": [ | ||
9411 | { | ||
9412 | "name": "A. Grandt", | ||
9413 | "email": "php@grandt.com", | ||
9414 | "homepage": "http://grandt.com", | ||
9415 | "role": "Developer" | ||
9416 | }, | ||
9417 | { | ||
9418 | "name": "An, Hyeong-woo", | ||
9419 | "email": "mail@mytory.net", | ||
9420 | "homepage": "https://mytory.net", | ||
9421 | "role": "Contributor" | ||
9422 | }, | ||
9423 | { | ||
9424 | "name": "Daniel Berthereau", | ||
9425 | "email": "daniel.composer@berthereau.net", | ||
9426 | "role": "Contributor" | ||
9427 | }, | ||
9428 | { | ||
9429 | "name": "Kevin Decherf", | ||
9430 | "homepage": "https://kdecherf.com", | ||
9431 | "role": "Contributor" | ||
9432 | } | ||
9433 | ], | ||
9434 | "description": "Package to create and stream e-books in the ePub 2.0 and 3.0 formats.", | ||
9435 | "homepage": "https://github.com/wallabag/PHPePub", | ||
9436 | "keywords": [ | ||
9437 | "e-book", | ||
9438 | "epub" | ||
9439 | ], | ||
9440 | "time": "2020-03-22T16:24:31+00:00" | ||
9441 | }, | ||
9442 | { | ||
9440 | "name": "wallabag/tcpdf", | 9443 | "name": "wallabag/tcpdf", |
9441 | "version": "6.2.26", | 9444 | "version": "6.2.26", |
9442 | "source": { | 9445 | "source": { |
@@ -9626,7 +9629,7 @@ | |||
9626 | "email": "adrien.brault@gmail.com" | 9629 | "email": "adrien.brault@gmail.com" |
9627 | }, | 9630 | }, |
9628 | { | 9631 | { |
9629 | "name": "William DURAND", | 9632 | "name": "William Durand", |
9630 | "email": "william.durand1@gmail.com" | 9633 | "email": "william.durand1@gmail.com" |
9631 | } | 9634 | } |
9632 | ], | 9635 | ], |
@@ -9676,7 +9679,7 @@ | |||
9676 | ], | 9679 | ], |
9677 | "authors": [ | 9680 | "authors": [ |
9678 | { | 9681 | { |
9679 | "name": "William DURAND", | 9682 | "name": "William Durand", |
9680 | "email": "william.durand1@gmail.com" | 9683 | "email": "william.durand1@gmail.com" |
9681 | } | 9684 | } |
9682 | ], | 9685 | ], |
@@ -11520,7 +11523,6 @@ | |||
11520 | "aliases": [], | 11523 | "aliases": [], |
11521 | "minimum-stability": "dev", | 11524 | "minimum-stability": "dev", |
11522 | "stability-flags": { | 11525 | "stability-flags": { |
11523 | "grandt/phpepub": 20, | ||
11524 | "predis/predis": 20 | 11526 | "predis/predis": 20 |
11525 | }, | 11527 | }, |
11526 | "prefer-stable": true, | 11528 | "prefer-stable": true, |