From 14eeee5b7e9ba2dd2804684d2cdabc4c49098269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Benoist?= Date: Wed, 17 Jun 2020 06:02:12 +0200 Subject: [PATCH 01/47] wallabag is now translated using Weblate --- README.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e00c7ea06..a60c5c4e7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ + + [![Build Status](https://api.travis-ci.org/wallabag/wallabag.svg?branch=master)](https://travis-ci.org/wallabag/wallabag) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=master) [![Gitter](https://badges.gitter.im/gitterHQ/gitter.svg)](https://gitter.im/wallabag/wallabag) +[![Translation status](https://hosted.weblate.org/widgets/wallabag/-/svg-badge.svg)](https://hosted.weblate.org/engage/wallabag/?utm_source=widget) # What is wallabag? wallabag is a self-hostable PHP application allowing you to not miss any content anymore. @@ -10,14 +13,12 @@ More information on our website: [wallabag.org](https://wallabag.org). If you do not have your own server, consider [the wallabag.it hosting solution](https://wallabag.it). -![wallabag logo](https://raw.githubusercontent.com/wallabag/logo/master/_default/typo-horizontal/png/sm/logo-typo-horizontal-black-no-bg-no-border-sm.png) - # Install wallabag Please read [the documentation to see the wallabag requirements](https://doc.wallabag.org/en/admin/installation/requirements.html). Then you can install wallabag by executing the following commands: -``` +```bash git clone https://github.com/wallabag/wallabag.git cd wallabag && make install ``` @@ -29,6 +30,10 @@ Now, [configure a virtual host](https://doc.wallabag.org/en/admin/installation/v Wallabag app for [YunoHost](https://yunohost.org). See [here](https://github.com/YunoHost-Apps/wallabag2_ynh) +# Translate wallabag + +[wallabag](https://hosted.weblate.org/projects/wallabag/) is being translated using [Weblate](https://weblate.org/), a web tool designed to ease translating for both developers and translators. Feel free to help us [translate wallabag](https://hosted.weblate.org/projects/wallabag/)! + # License Copyright © 2013-current Nicolas Lœuillet This work is free. You can redistribute it and/or modify it under the From 70fb345837b252b05832310786ed9d4f51ee043a Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 17 Jun 2020 03:46:28 +0000 Subject: [PATCH 02/47] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (483 of 483 strings) --- .../Resources/translations/messages.zh.yml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml index b651ec446..7c0568677 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml @@ -58,6 +58,7 @@ config: rules: '标签规则' new_user: '添加用户' reset: '重置区域' + rss: RSS form: save: '保存' form_settings: @@ -67,6 +68,10 @@ config: reading_speed: label: '阅读速度（词 / 每分钟）' help_message: '你可以使用在线工具来估计自己的阅读速度：' + 400_word: 我每分钟能读大概400个单词 + 300_word: 我每分钟能读大概300个单词 + 200_word: 我每分钟能读大概200个单词 + 100_word: 我每分钟能读大概100个单词 action_mark_as_read: label: '将一个项目删除、加星标或是标记为已读后该做什么？' redirect_homepage: '返回主页' @@ -113,6 +118,8 @@ config: description: '如果你删除你的账号，你的所有文章、标签以及账号本身都会被永久删除(且无法撤销)，然后你将会被登出。' confirm: '你真的确定的吗？（这不能被撤销）' button: '删除我的账号' + help_twoFactorAuthentication: 如果你启用双因素认证，每次你想登录到wallabag，你会通过电子邮件收到一个代码。 + twoFactorAuthentication_label: 双因素认证 reset: title: '重置区（危险区域）' description: '一旦你点击这个按钮，你就可以移除你账号中的某些信息。请注意这些操作是不可撤销的。' @@ -183,6 +190,19 @@ config: two_factor_code_description_4: '从你配置好的应用中测试 OTP 码' cancel: "取消" enable: "启用" + form_rss: + rss_limit: RSS源中的条目数 + rss_link: + all: 全部 + archive: 已存档 + starred: 已标星 + unread: 未读 + rss_links: RSS链接 + token_reset: 重新生成你的令牌 + token_create: 创建你的令牌 + no_token: 没有令牌 + token_label: RSS令牌 + description: wallabag提供的RSS源可以让你用你喜欢的RSS阅读器阅读你保存的文章。首先需要生成一个令牌。 entry: default_title: '项目标题' page_titles: @@ -375,6 +395,7 @@ quickstart: language: '变更语言和设计' feed: '启用订阅源' tagging_rules: '编写规则来给你的文章自动加上标签' + rss: 启用RSS源 admin: title: '管理员' description: '作为一名管理员，你在 wallabag 上享有特权。你可以：' @@ -557,6 +578,7 @@ user: delete: 删除 delete_confirm: 确定要这么做吗？ back_to_list: 返回列表 + twofactor_label: 双因素认证 search: placeholder: 通过用户名或者邮箱筛选 site_credential: @@ -599,6 +621,8 @@ flashes: otp_enabled: 两步验证已启用 tagging_rules_imported: 标签规则已导入 tagging_rules_not_imported: 导入标签规则时发生了错误 + rss_token_updated: RSS令牌已更新 + rss_updated: RSS信息已更新 entry: notice: entry_already_saved: '该项目已于 %date% 保存' From f4c1d70ead2e230ec141c06febbe756f462f9c5f Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 17 Jun 2020 03:53:23 +0000 Subject: [PATCH 03/47] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (6 of 6 strings) --- src/Wallabag/CoreBundle/Resources/translations/validators.zh.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.zh.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.zh.yml index 3541c768a..c07a92e27 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.zh.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.zh.yml @@ -5,3 +5,4 @@ validator: item_per_page_too_high: '这会让应用十分卡顿' feed_limit_too_high: '这会让应用十分卡顿' quote_length_too_high: '引用内容过长，最多不能超过 {{ limit }} 个字符。' + rss_limit_too_high: 这肯定会杀死应用程序 From e58c86862fd935cd976bd8182c8da9570e351944 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 22 Jun 2020 02:30:24 +0000 Subject: [PATCH 04/47] Bump phpstan/phpstan from 0.12.29 to 0.12.30 Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 0.12.29 to 0.12.30. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Commits](https://github.com/phpstan/phpstan/compare/0.12.29...0.12.30) Signed-off-by: dependabot-preview[bot] --- composer.lock | 80 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 75 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index fd8a97200..970fc5326 100644 --- a/composer.lock +++ b/composer.lock @@ -716,6 +716,20 @@ "iterators", "php" ], + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcollections", + "type": "tidelift" + } + ], "time": "2020-05-25T19:24:35+00:00" }, { @@ -799,6 +813,20 @@ "doctrine", "php" ], + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcommon", + "type": "tidelift" + } + ], "time": "2020-06-05T16:46:05+00:00" }, { @@ -975,6 +1003,20 @@ "orm", "persistence" ], + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdoctrine-bundle", + "type": "tidelift" + } + ], "time": "2020-05-25T19:50:59+00:00" }, { @@ -9826,6 +9868,20 @@ "keywords": [ "framework" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-06-12T10:57:23+00:00" }, { @@ -11202,16 +11258,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.29", + "version": "0.12.30", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "9771daaf6b95c6313b908d0bcdee0afcd51f838a" + "reference": "1f2c16d3fbb5eec6e55fbe2358e32570cefa20e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9771daaf6b95c6313b908d0bcdee0afcd51f838a", - "reference": "9771daaf6b95c6313b908d0bcdee0afcd51f838a", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1f2c16d3fbb5eec6e55fbe2358e32570cefa20e5", + "reference": "1f2c16d3fbb5eec6e55fbe2358e32570cefa20e5", "shasum": "" }, "require": { @@ -11254,7 +11310,7 @@ "type": "tidelift" } ], - "time": "2020-06-14T14:10:59+00:00" + "time": "2020-06-21T14:08:19+00:00" }, { "name": "phpstan/phpstan-doctrine", @@ -11514,6 +11570,20 @@ "scaffold", "scaffolding" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-29T14:47:30+00:00" }, { From 511957eabf142ece766a2808c1308580bd3fe3c9 Mon Sep 17 00:00:00 2001 From: Diego Heras Date: Sat, 20 Jun 2020 08:55:53 +0000 Subject: [PATCH 05/47] Translated using Weblate (Spanish) Currently translated at 100.0% (483 of 483 strings) --- .../CoreBundle/Resources/translations/messages.es.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index f8810a6cf..18da0fb84 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml @@ -57,6 +57,7 @@ config: rules: 'Reglas de etiquetado' new_user: 'Añadir un usuario' reset: 'Reiniciar mi cuenta' + rss: RSS form: save: 'Guardar' form_settings: @@ -66,6 +67,10 @@ config: reading_speed: label: 'Velocidad de lectura (palabras por minuto)' help_message: 'Puede utilizar herramientas en línea para calcular su velocidad de lectura:' + 400_word: Leo ~400 palabras por minuto + 300_word: Leo ~300 palabras por minuto + 200_word: Leo ~200 palabras por minuto + 100_word: Leo ~100 palabras por minuto action_mark_as_read: label: '¿Qué hacer después de eliminar, marcar como favorito o marcar un artículo como leído?' redirect_homepage: 'Ir a la página de inicio' @@ -110,6 +115,8 @@ config: description: Si eliminas tu cuenta, TODOS tus artículos, TODAS tus etiquetas, TODAS tus anotaciones y tu cuenta serán eliminadas de forma PERMANENTE (no se puede DESHACER). Después serás desconectado. confirm: ¿Estás completamente seguro? (NO SE PUEDE DESHACER) button: Eliminar mi cuenta + help_twoFactorAuthentication: Si habilita la autenticación de dos factores (2FA), cada vez que desee iniciar sesión en wallabag, recibirá un código por correo electrónico. + twoFactorAuthentication_label: Autenticación de dos factores reset: title: Reiniciar mi cuenta (zona peligrosa) description: Pulsando los botones de abajo puedes eliminar alguna información de tu cuenta. Ten en cuenta que estas acciones son IRREVERSIBLES. @@ -363,6 +370,7 @@ quickstart: language: 'Cambie el idioma y el diseño' feed: 'Activar los feeds RSS' tagging_rules: 'Escribe reglas para etiquetar automáticamente tus artículos' + rss: Habilitar canales RSS admin: title: 'Administración' description: 'Como administrador, tienes algunos privilegios en wallabag. Puedes:' @@ -538,6 +546,7 @@ user: delete: Eliminar delete_confirm: ¿Estás seguro? back_to_list: Volver a la lista + twofactor_label: Autenticación de dos factores search: placeholder: Filtrar por nombre de usuario o correo electrónico site_credential: @@ -577,6 +586,8 @@ flashes: tags_reset: Etiquetas reiniciadas entries_reset: Artículos reiniciados archived_reset: Artículos archivados eliminados + rss_token_updated: Token RSS actualizado + rss_updated: Información RSS actualizada entry: notice: entry_already_saved: 'Artículo ya guardado el %fecha%' From 46f309617f23a142b9b16eecb00380f82153d2b1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 24 Jun 2020 02:17:35 +0000 Subject: [PATCH 06/47] Bump phpstan/phpstan-doctrine from 0.12.16 to 0.12.17 Bumps [phpstan/phpstan-doctrine](https://github.com/phpstan/phpstan-doctrine) from 0.12.16 to 0.12.17. - [Release notes](https://github.com/phpstan/phpstan-doctrine/releases) - [Commits](https://github.com/phpstan/phpstan-doctrine/compare/0.12.16...0.12.17) Signed-off-by: dependabot-preview[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 970fc5326..d2f6b46e2 100644 --- a/composer.lock +++ b/composer.lock @@ -11314,16 +11314,16 @@ }, { "name": "phpstan/phpstan-doctrine", - "version": "0.12.16", + "version": "0.12.17", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-doctrine.git", - "reference": "65146e35905478bfb4e2ba078ffca1a16029d4ee" + "reference": "5eed42b2815f100f25bd45fe8c1a9b01f3e41657" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/65146e35905478bfb4e2ba078ffca1a16029d4ee", - "reference": "65146e35905478bfb4e2ba078ffca1a16029d4ee", + "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/5eed42b2815f100f25bd45fe8c1a9b01f3e41657", + "reference": "5eed42b2815f100f25bd45fe8c1a9b01f3e41657", "shasum": "" }, "require": { @@ -11376,7 +11376,7 @@ "MIT" ], "description": "Doctrine extensions for PHPStan", - "time": "2020-06-14T11:03:59+00:00" + "time": "2020-06-23T08:50:27+00:00" }, { "name": "phpstan/phpstan-phpunit", From e538a8b6cb2bb8f47f05b8dda757135e36f5f896 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 25 Jun 2020 02:23:26 +0000 Subject: [PATCH 07/47] Bump phpstan/phpstan from 0.12.30 to 0.12.31 Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 0.12.30 to 0.12.31. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Commits](https://github.com/phpstan/phpstan/compare/0.12.30...0.12.31) Signed-off-by: dependabot-preview[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index d2f6b46e2..56e9f6f01 100644 --- a/composer.lock +++ b/composer.lock @@ -11258,16 +11258,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.30", + "version": "0.12.31", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "1f2c16d3fbb5eec6e55fbe2358e32570cefa20e5" + "reference": "776c8056b401e1b67f277b9e9fb334d1a274671d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1f2c16d3fbb5eec6e55fbe2358e32570cefa20e5", - "reference": "1f2c16d3fbb5eec6e55fbe2358e32570cefa20e5", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/776c8056b401e1b67f277b9e9fb334d1a274671d", + "reference": "776c8056b401e1b67f277b9e9fb334d1a274671d", "shasum": "" }, "require": { @@ -11310,7 +11310,7 @@ "type": "tidelift" } ], - "time": "2020-06-21T14:08:19+00:00" + "time": "2020-06-24T20:55:29+00:00" }, { "name": "phpstan/phpstan-doctrine", From 4721a00bc88bd7733f0511cdb6310f948f8662cc Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2020 02:25:50 +0000 Subject: [PATCH 08/47] Bump jms/serializer-bundle from 3.6.0 to 3.7.0 Bumps [jms/serializer-bundle](https://github.com/schmittjoh/JMSSerializerBundle) from 3.6.0 to 3.7.0. - [Release notes](https://github.com/schmittjoh/JMSSerializerBundle/releases) - [Changelog](https://github.com/schmittjoh/JMSSerializerBundle/blob/master/CHANGELOG.md) - [Commits](https://github.com/schmittjoh/JMSSerializerBundle/compare/3.6.0...3.7.0) Signed-off-by: dependabot-preview[bot] --- composer.lock | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/composer.lock b/composer.lock index 56e9f6f01..09dfdab12 100644 --- a/composer.lock +++ b/composer.lock @@ -4362,33 +4362,29 @@ }, { "name": "jms/serializer", - "version": "3.7.0", + "version": "3.8.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/serializer.git", - "reference": "6ae57ed4a2c028051ead47e57005e4866b1c34b1" + "reference": "13ead2c318da7965eafda9348bc70eadc872baac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/6ae57ed4a2c028051ead47e57005e4866b1c34b1", - "reference": "6ae57ed4a2c028051ead47e57005e4866b1c34b1", + "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/13ead2c318da7965eafda9348bc70eadc872baac", + "reference": "13ead2c318da7965eafda9348bc70eadc872baac", "shasum": "" }, "require": { "doctrine/annotations": "^1.0", "doctrine/instantiator": "^1.0.3", - "hoa/compiler": "^3.17.08.08", + "doctrine/lexer": "^1.1", "jms/metadata": "^2.0", "php": "^7.2" }, - "conflict": { - "hoa/consistency": "<1.17.05.02", - "hoa/core": "*", - "hoa/iterator": "<2.16.03.15" - }, "require-dev": { "doctrine/coding-standard": "^5.0", "doctrine/orm": "~2.1", + "doctrine/persistence": "^1.3.3|^2.0|^3.0", "doctrine/phpcr-odm": "^1.3|^2.0", "ext-pdo_sqlite": "*", "jackalope/jackalope-doctrine-dbal": "^1.1.5", @@ -4402,7 +4398,7 @@ "symfony/translation": "^3.0|^4.0|^5.0", "symfony/validator": "^3.1.9|^4.0|^5.0", "symfony/yaml": "^3.3|^4.0|^5.0", - "twig/twig": "~1.34|~2.4" + "twig/twig": "~1.34|~2.4|^3.0" }, "suggest": { "doctrine/cache": "Required if you like to use cache functionality.", @@ -4412,7 +4408,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.7-dev" + "dev-master": "3.8-dev" } }, "autoload": { @@ -4449,23 +4445,24 @@ "type": "github" } ], - "time": "2020-05-23T06:09:27+00:00" + "time": "2020-06-28T11:22:30+00:00" }, { "name": "jms/serializer-bundle", - "version": "3.6.0", + "version": "3.7.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/JMSSerializerBundle.git", - "reference": "9986fff4d6c0ab099af0a7149376651e15c9a763" + "reference": "0ee8b75bfc484a342aa0471e3c6d9ad96fb430cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/9986fff4d6c0ab099af0a7149376651e15c9a763", - "reference": "9986fff4d6c0ab099af0a7149376651e15c9a763", + "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/0ee8b75bfc484a342aa0471e3c6d9ad96fb430cf", + "reference": "0ee8b75bfc484a342aa0471e3c6d9ad96fb430cf", "shasum": "" }, "require": { + "jms/metadata": "^2.3", "jms/serializer": "^3.0", "php": "^7.2", "symfony/dependency-injection": "^3.3 || ^4.0 || ^5.0", @@ -4489,7 +4486,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "3.6-dev" + "dev-master": "3.7-dev" } }, "autoload": { @@ -4528,7 +4525,7 @@ "type": "github" } ], - "time": "2020-05-23T06:13:14+00:00" + "time": "2020-06-28T11:26:21+00:00" }, { "name": "kphoen/rulerz", From 25a9f3fa407f4aff364fb1198e4cdd1695775c7e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2020 02:29:37 +0000 Subject: [PATCH 09/47] Bump friendsofphp/php-cs-fixer from 2.16.3 to 2.16.4 Bumps [friendsofphp/php-cs-fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) from 2.16.3 to 2.16.4. - [Release notes](https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases) - [Changelog](https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/2.16/CHANGELOG.md) - [Commits](https://github.com/FriendsOfPHP/PHP-CS-Fixer/compare/v2.16.3...v2.16.4) Signed-off-by: dependabot-preview[bot] --- composer.lock | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/composer.lock b/composer.lock index 56e9f6f01..4c524bd51 100644 --- a/composer.lock +++ b/composer.lock @@ -9150,16 +9150,16 @@ }, { "name": "symfony/polyfill-php70", - "version": "v1.17.0", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "82225c2d7d23d7e70515496d249c0152679b468e" + "reference": "471b096aede7025bace8eb356b9ac801aaba7e2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/82225c2d7d23d7e70515496d249c0152679b468e", - "reference": "82225c2d7d23d7e70515496d249c0152679b468e", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/471b096aede7025bace8eb356b9ac801aaba7e2d", + "reference": "471b096aede7025bace8eb356b9ac801aaba7e2d", "shasum": "" }, "require": { @@ -9170,6 +9170,10 @@ "extra": { "branch-alias": { "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -9219,7 +9223,7 @@ "type": "tidelift" } ], - "time": "2020-05-12T16:47:27+00:00" + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/polyfill-php72", @@ -10908,16 +10912,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.16.3", + "version": "v2.16.4", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "83baf823a33a1cbd5416c8626935cf3f843c10b0" + "reference": "1023c3458137ab052f6ff1e09621a721bfdeca13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/83baf823a33a1cbd5416c8626935cf3f843c10b0", - "reference": "83baf823a33a1cbd5416c8626935cf3f843c10b0", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/1023c3458137ab052f6ff1e09621a721bfdeca13", + "reference": "1023c3458137ab052f6ff1e09621a721bfdeca13", "shasum": "" }, "require": { @@ -10949,12 +10953,12 @@ "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1", "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1", "phpunitgoodpractices/traits": "^1.8", - "symfony/phpunit-bridge": "^4.3 || ^5.0", + "symfony/phpunit-bridge": "^5.1", "symfony/yaml": "^3.0 || ^4.0 || ^5.0" }, "suggest": { "ext-dom": "For handling output formats in XML", - "ext-mbstring": "For handling non-UTF8 characters in cache signature.", + "ext-mbstring": "For handling non-UTF8 characters.", "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.", "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.", "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." @@ -11001,7 +11005,7 @@ "type": "github" } ], - "time": "2020-04-15T18:51:10+00:00" + "time": "2020-06-27T23:57:46+00:00" }, { "name": "m6web/redis-mock", From 12206e42d58b356b405ced5fcc13d530f42211e8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2020 02:21:10 +0000 Subject: [PATCH 10/47] Bump friendsofsymfony/rest-bundle from 2.8.0 to 2.8.1 Bumps [friendsofsymfony/rest-bundle](https://github.com/FriendsOfSymfony/FOSRestBundle) from 2.8.0 to 2.8.1. - [Release notes](https://github.com/FriendsOfSymfony/FOSRestBundle/releases) - [Changelog](https://github.com/FriendsOfSymfony/FOSRestBundle/blob/3.x/CHANGELOG.md) - [Commits](https://github.com/FriendsOfSymfony/FOSRestBundle/compare/2.8.0...2.8.1) Signed-off-by: dependabot-preview[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index f93e8c8f8..ef3d2d583 100644 --- a/composer.lock +++ b/composer.lock @@ -2184,16 +2184,16 @@ }, { "name": "friendsofsymfony/rest-bundle", - "version": "2.8.0", + "version": "2.8.1", "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git", - "reference": "cc53e997761a56f657d2cae2d49e91dd64a7da76" + "reference": "5a8675e38684480afbabda61bdc9986eda19f913" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/cc53e997761a56f657d2cae2d49e91dd64a7da76", - "reference": "cc53e997761a56f657d2cae2d49e91dd64a7da76", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/5a8675e38684480afbabda61bdc9986eda19f913", + "reference": "5a8675e38684480afbabda61bdc9986eda19f913", "shasum": "" }, "require": { @@ -2286,7 +2286,7 @@ "keywords": [ "rest" ], - "time": "2020-06-03T06:41:50+00:00" + "time": "2020-06-29T10:27:43+00:00" }, { "name": "friendsofsymfony/user-bundle", From 82bdaf1bf43b707ada438b60f757887d33e3cfcc Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2020 02:26:53 +0000 Subject: [PATCH 11/47] Bump babdev/pagerfanta-bundle from 2.4.2 to 2.4.3 Bumps [babdev/pagerfanta-bundle](https://github.com/BabDev/BabDevPagerfantaBundle) from 2.4.2 to 2.4.3. - [Release notes](https://github.com/BabDev/BabDevPagerfantaBundle/releases) - [Changelog](https://github.com/BabDev/BabDevPagerfantaBundle/blob/2.x/CHANGELOG.md) - [Commits](https://github.com/BabDev/BabDevPagerfantaBundle/compare/v2.4.2...v2.4.3) Signed-off-by: dependabot-preview[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index ef3d2d583..890e5031e 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "babdev/pagerfanta-bundle", - "version": "v2.4.2", + "version": "v2.4.3", "source": { "type": "git", "url": "https://github.com/BabDev/BabDevPagerfantaBundle.git", - "reference": "93c041c59d43263ee63ddd3f922045328334bb81" + "reference": "602f4847b27d72364b49b31d15dfc02a59aaece8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/BabDev/BabDevPagerfantaBundle/zipball/93c041c59d43263ee63ddd3f922045328334bb81", - "reference": "93c041c59d43263ee63ddd3f922045328334bb81", + "url": "https://api.github.com/repos/BabDev/BabDevPagerfantaBundle/zipball/602f4847b27d72364b49b31d15dfc02a59aaece8", + "reference": "602f4847b27d72364b49b31d15dfc02a59aaece8", "shasum": "" }, "require": { @@ -78,7 +78,7 @@ "type": "github" } ], - "time": "2020-06-09T15:42:00+00:00" + "time": "2020-06-30T14:02:17+00:00" }, { "name": "bdunogier/guzzle-site-authenticator", From 845f7e2d9a22ad322e5e55e2eb73a751684d9d3d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 2 Jul 2020 02:30:00 +0000 Subject: [PATCH 12/47] Bump phpstan/phpstan from 0.12.31 to 0.12.32 Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 0.12.31 to 0.12.32. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Commits](https://github.com/phpstan/phpstan/compare/0.12.31...0.12.32) Signed-off-by: dependabot-preview[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 890e5031e..7817942f3 100644 --- a/composer.lock +++ b/composer.lock @@ -11259,16 +11259,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.31", + "version": "0.12.32", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "776c8056b401e1b67f277b9e9fb334d1a274671d" + "reference": "d03863f504c8432b3de4d1881f73f6acb8c0e67c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/776c8056b401e1b67f277b9e9fb334d1a274671d", - "reference": "776c8056b401e1b67f277b9e9fb334d1a274671d", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d03863f504c8432b3de4d1881f73f6acb8c0e67c", + "reference": "d03863f504c8432b3de4d1881f73f6acb8c0e67c", "shasum": "" }, "require": { @@ -11311,7 +11311,7 @@ "type": "tidelift" } ], - "time": "2020-06-24T20:55:29+00:00" + "time": "2020-07-01T11:57:52+00:00" }, { "name": "phpstan/phpstan-doctrine", From 03feebbcc09d00e79fe41fd0f4302663cff55878 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 3 Jul 2020 02:25:43 +0000 Subject: [PATCH 13/47] Bump php-http/mock-client from 1.3.1 to 1.4.0 Bumps [php-http/mock-client](https://github.com/php-http/mock-client) from 1.3.1 to 1.4.0. - [Release notes](https://github.com/php-http/mock-client/releases) - [Changelog](https://github.com/php-http/mock-client/blob/master/CHANGELOG.md) - [Commits](https://github.com/php-http/mock-client/compare/1.3.1...1.4.0) Signed-off-by: dependabot-preview[bot] --- composer.lock | 66 +++++++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 28 deletions(-) diff --git a/composer.lock b/composer.lock index 7817942f3..7c1713961 100644 --- a/composer.lock +++ b/composer.lock @@ -6001,16 +6001,16 @@ }, { "name": "php-http/client-common", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/php-http/client-common.git", - "reference": "a8b29678d61556f45d6236b1667db16d998ceec5" + "reference": "f3985360f3d054292605e9ec7c4bc24ebcf249bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/client-common/zipball/a8b29678d61556f45d6236b1667db16d998ceec5", - "reference": "a8b29678d61556f45d6236b1667db16d998ceec5", + "url": "https://api.github.com/repos/php-http/client-common/zipball/f3985360f3d054292605e9ec7c4bc24ebcf249bb", + "reference": "f3985360f3d054292605e9ec7c4bc24ebcf249bb", "shasum": "" }, "require": { @@ -6018,13 +6018,19 @@ "php-http/httplug": "^2.0", "php-http/message": "^1.6", "php-http/message-factory": "^1.0", - "symfony/options-resolver": " ^3.4.20 || ~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0" + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0", + "symfony/options-resolver": "^2.6 || ^3.4.20 || ~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0", + "symfony/polyfill-php80": "^1.17" }, "require-dev": { "doctrine/instantiator": "^1.1", "guzzlehttp/psr7": "^1.4", - "phpspec/phpspec": "^5.1", + "nyholm/psr7": "^1.2", + "phpspec/phpspec": "^5.1 || ^6.0", "phpspec/prophecy": "^1.8", + "phpunit/phpunit": "^7.5", "sebastian/comparator": "^3.0" }, "suggest": { @@ -6037,7 +6043,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.2.x-dev" } }, "autoload": { @@ -6063,7 +6069,7 @@ "http", "httplug" ], - "time": "2019-11-18T08:58:18+00:00" + "time": "2020-07-02T06:51:04+00:00" }, { "name": "php-http/curl-client", @@ -6132,16 +6138,16 @@ }, { "name": "php-http/discovery", - "version": "1.8.0", + "version": "1.9.0", "source": { "type": "git", "url": "https://github.com/php-http/discovery.git", - "reference": "10d9019f393773345aedc0dc79e7fd678da874ee" + "reference": "9ab7668fee74a5ad61996095e50917bd50ee8bfe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/discovery/zipball/10d9019f393773345aedc0dc79e7fd678da874ee", - "reference": "10d9019f393773345aedc0dc79e7fd678da874ee", + "url": "https://api.github.com/repos/php-http/discovery/zipball/9ab7668fee74a5ad61996095e50917bd50ee8bfe", + "reference": "9ab7668fee74a5ad61996095e50917bd50ee8bfe", "shasum": "" }, "require": { @@ -6164,7 +6170,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.9-dev" } }, "autoload": { @@ -6193,7 +6199,7 @@ "message", "psr7" ], - "time": "2020-06-14T10:44:12+00:00" + "time": "2020-07-02T11:43:45+00:00" }, { "name": "php-http/guzzle5-adapter", @@ -7138,20 +7144,20 @@ }, { "name": "psr/http-client", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-client.git", - "reference": "496a823ef742b632934724bf769560c2a5c7c44e" + "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/496a823ef742b632934724bf769560c2a5c7c44e", - "reference": "496a823ef742b632934724bf769560c2a5c7c44e", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", "shasum": "" }, "require": { - "php": "^7.0", + "php": "^7.0 || ^8.0", "psr/http-message": "^1.0" }, "type": "library", @@ -7183,7 +7189,7 @@ "psr", "psr-18" ], - "time": "2018-10-30T23:29:13+00:00" + "time": "2020-06-29T06:28:15+00:00" }, { "name": "psr/http-factory", @@ -11154,24 +11160,28 @@ }, { "name": "php-http/mock-client", - "version": "1.3.1", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/php-http/mock-client.git", - "reference": "186547be76fe81cc0c0589f9285ef9c8dded9845" + "reference": "9947c7ff939b4d64ff78c5aaf7b3a7d5192c82c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/mock-client/zipball/186547be76fe81cc0c0589f9285ef9c8dded9845", - "reference": "186547be76fe81cc0c0589f9285ef9c8dded9845", + "url": "https://api.github.com/repos/php-http/mock-client/zipball/9947c7ff939b4d64ff78c5aaf7b3a7d5192c82c5", + "reference": "9947c7ff939b4d64ff78c5aaf7b3a7d5192c82c5", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0", + "php": "^7.1", "php-http/client-common": "^1.9 || ^2.0", "php-http/discovery": "^1.0", "php-http/httplug": "^1.0 || ^2.0", - "php-http/message-factory": "^1.0" + "php-http/message-factory": "^1.0", + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0", + "symfony/polyfill-php80": "^1.17" }, "provide": { "php-http/async-client-implementation": "1.0", @@ -11184,7 +11194,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -11210,7 +11220,7 @@ "mock", "psr7" ], - "time": "2019-11-06T12:49:04+00:00" + "time": "2020-07-02T06:47:30+00:00" }, { "name": "phpstan/extension-installer", From effa5deacbdcc442996fa44cffd7f000a1b1b352 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 6 Jul 2020 07:58:14 +0200 Subject: [PATCH 14/47] Update deps Remove lock on dbal because we are now using PHP >= 7.2 --- composer.json | 9 +- composer.lock | 523 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 315 insertions(+), 217 deletions(-) diff --git a/composer.json b/composer.json index 6477d9ec9..a0d29ab48 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,6 @@ "bdunogier/guzzle-site-authenticator": "^1.0.0", "craue/config-bundle": "^2.3.0", "defuse/php-encryption": "^2.1", - "doctrine/dbal": "2.9.2", "doctrine/doctrine-bundle": "^1.9", "doctrine/doctrine-cache-bundle": "^1.3", "doctrine/doctrine-migrations-bundle": "^1.3", @@ -106,10 +105,10 @@ "m6web/redis-mock": "^5.0", "php-http/mock-client": "^1.0", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12.0", - "phpstan/phpstan-doctrine": "^0.12.0", - "phpstan/phpstan-phpunit": "^0.12.0", - "phpstan/phpstan-symfony": "^0.12.0", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-doctrine": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpstan/phpstan-symfony": "^0.12", "symfony/maker-bundle": "^1.18", "symfony/phpunit-bridge": "~5.1.1" }, diff --git a/composer.lock b/composer.lock index 7c1713961..85d90948e 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": "7bfe0742fcefa618c3817291f40c799f", + "content-hash": "2df8111ca5b34ecb7f1268404db82e27", "packages": [ { "name": "babdev/pagerfanta-bundle", @@ -289,71 +289,6 @@ ], "time": "2019-04-09T12:31:48+00:00" }, - { - "name": "composer/package-versions-deprecated", - "version": "1.8.0", - "source": { - "type": "git", - "url": "https://github.com/composer/package-versions-deprecated.git", - "reference": "98df7f1b293c0550bd5b1ce6b60b59bdda23aa47" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/98df7f1b293c0550bd5b1ce6b60b59bdda23aa47", - "reference": "98df7f1b293c0550bd5b1ce6b60b59bdda23aa47", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.1.0 || ^2.0", - "php": "^7" - }, - "replace": { - "ocramius/package-versions": "1.2 - 1.8.99" - }, - "require-dev": { - "composer/composer": "^1.9.3 || ^2.0@dev", - "ext-zip": "^1.13", - "phpunit/phpunit": "^6.5 || ^7" - }, - "type": "composer-plugin", - "extra": { - "class": "PackageVersions\\Installer", - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "PackageVersions\\": "src/PackageVersions" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com" - }, - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be" - } - ], - "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2020-04-23T11:49:37+00:00" - }, { "name": "craue/config-bundle", "version": "2.4.0", @@ -831,31 +766,32 @@ }, { "name": "doctrine/dbal", - "version": "v2.9.2", + "version": "2.10.2", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9" + "reference": "aab745e7b6b2de3b47019da81e7225e14dcfdac8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9", - "reference": "22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/aab745e7b6b2de3b47019da81e7225e14dcfdac8", + "reference": "aab745e7b6b2de3b47019da81e7225e14dcfdac8", "shasum": "" }, "require": { "doctrine/cache": "^1.0", "doctrine/event-manager": "^1.0", "ext-pdo": "*", - "php": "^7.1" + "php": "^7.2" }, "require-dev": { - "doctrine/coding-standard": "^5.0", - "jetbrains/phpstorm-stubs": "^2018.1.2", - "phpstan/phpstan": "^0.10.1", - "phpunit/phpunit": "^7.4", - "symfony/console": "^2.0.5|^3.0|^4.0", - "symfony/phpunit-bridge": "^3.4.5|^4.0.5" + "doctrine/coding-standard": "^6.0", + "jetbrains/phpstorm-stubs": "^2019.1", + "nikic/php-parser": "^4.4", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^8.4.1", + "symfony/console": "^2.0.5|^3.0|^4.0|^5.0", + "vimeo/psalm": "^3.11" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." @@ -866,7 +802,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.9.x-dev", + "dev-master": "2.10.x-dev", "dev-develop": "3.0.x-dev" } }, @@ -880,6 +816,10 @@ "MIT" ], "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -888,10 +828,6 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, { "name": "Jonathan Wage", "email": "jonwage@gmail.com" @@ -902,14 +838,39 @@ "keywords": [ "abstraction", "database", + "db2", "dbal", + "mariadb", + "mssql", "mysql", - "persistence", + "oci8", + "oracle", + "pdo", "pgsql", - "php", - "queryobject" + "postgresql", + "queryobject", + "sasql", + "sql", + "sqlanywhere", + "sqlite", + "sqlserver", + "sqlsrv" ], - "time": "2018-12-31T03:27:51+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdbal", + "type": "tidelift" + } + ], + "time": "2020-04-20T17:19:26+00:00" }, { "name": "doctrine/doctrine-bundle", @@ -1561,33 +1522,40 @@ }, { "name": "doctrine/orm", - "version": "v2.6.6", + "version": "v2.7.3", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "2d9b9351831d1230881c52f006011cbf72fe944e" + "reference": "d95e03ba660d50d785a9925f41927fef0ee553cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/2d9b9351831d1230881c52f006011cbf72fe944e", - "reference": "2d9b9351831d1230881c52f006011cbf72fe944e", + "url": "https://api.github.com/repos/doctrine/orm/zipball/d95e03ba660d50d785a9925f41927fef0ee553cf", + "reference": "d95e03ba660d50d785a9925f41927fef0ee553cf", "shasum": "" }, "require": { - "doctrine/annotations": "~1.5", - "doctrine/cache": "~1.6", - "doctrine/collections": "^1.4", - "doctrine/common": "^2.7.1", - "doctrine/dbal": "^2.6", - "doctrine/instantiator": "~1.1", + "doctrine/annotations": "^1.8", + "doctrine/cache": "^1.9.1", + "doctrine/collections": "^1.5", + "doctrine/common": "^2.11 || ^3.0", + "doctrine/dbal": "^2.9.3", + "doctrine/event-manager": "^1.1", + "doctrine/inflector": "^1.0", + "doctrine/instantiator": "^1.3", + "doctrine/lexer": "^1.0", + "doctrine/persistence": "^1.3.3 || ^2.0", "ext-pdo": "*", + "ocramius/package-versions": "^1.2", "php": "^7.1", - "symfony/console": "~3.0|~4.0" + "symfony/console": "^3.0|^4.0|^5.0" }, "require-dev": { "doctrine/coding-standard": "^5.0", + "phpstan/phpstan": "^0.12.18", "phpunit/phpunit": "^7.5", - "symfony/yaml": "~3.4|~4.0" + "symfony/yaml": "^3.4|^4.0|^5.0", + "vimeo/psalm": "^3.11" }, "suggest": { "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" @@ -1598,7 +1566,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6.x-dev" + "dev-master": "2.7.x-dev" } }, "autoload": { @@ -1633,12 +1601,26 @@ } ], "description": "Object-Relational-Mapper for PHP", - "homepage": "http://www.doctrine-project.org", + "homepage": "https://www.doctrine-project.org/projects/orm.html", "keywords": [ "database", "orm" ], - "time": "2019-11-18T22:01:21+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine/orm", + "type": "tidelift" + } + ], + "time": "2020-05-26T16:03:49+00:00" }, { "name": "doctrine/persistence", @@ -1817,16 +1799,16 @@ }, { "name": "egulias/email-validator", - "version": "2.1.17", + "version": "2.1.18", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "ade6887fd9bd74177769645ab5c474824f8a418a" + "reference": "cfa3d44471c7f5bfb684ac2b0da7114283d78441" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ade6887fd9bd74177769645ab5c474824f8a418a", - "reference": "ade6887fd9bd74177769645ab5c474824f8a418a", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/cfa3d44471c7f5bfb684ac2b0da7114283d78441", + "reference": "cfa3d44471c7f5bfb684ac2b0da7114283d78441", "shasum": "" }, "require": { @@ -1850,7 +1832,7 @@ }, "autoload": { "psr-4": { - "Egulias\\EmailValidator\\": "EmailValidator" + "Egulias\\EmailValidator\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1871,7 +1853,7 @@ "validation", "validator" ], - "time": "2020-02-13T22:36:52+00:00" + "time": "2020-06-16T20:11:17+00:00" }, { "name": "fig/link-util", @@ -3967,16 +3949,16 @@ }, { "name": "j0k3r/graby-site-config", - "version": "1.0.107", + "version": "1.0.108", "source": { "type": "git", "url": "https://github.com/j0k3r/graby-site-config.git", - "reference": "cc66dcbdeb9368a8eb385e21dcc88183b280412e" + "reference": "3365012abd50fc80fba11179e8a5f1d5bacbb5d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/cc66dcbdeb9368a8eb385e21dcc88183b280412e", - "reference": "cc66dcbdeb9368a8eb385e21dcc88183b280412e", + "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/3365012abd50fc80fba11179e8a5f1d5bacbb5d5", + "reference": "3365012abd50fc80fba11179e8a5f1d5bacbb5d5", "shasum": "" }, "require": { @@ -4003,7 +3985,7 @@ } ], "description": "Graby site config files", - "time": "2020-06-03T09:43:28+00:00" + "time": "2020-06-29T08:41:46+00:00" }, { "name": "j0k3r/httplug-ssrf-plugin", @@ -4253,20 +4235,20 @@ }, { "name": "jean85/pretty-package-versions", - "version": "1.3.0", + "version": "1.2", "source": { "type": "git", "url": "https://github.com/Jean85/pretty-package-versions.git", - "reference": "e3517fb11b67e798239354fe8213927d012ad8f9" + "reference": "75c7effcf3f77501d0e0caa75111aff4daa0dd48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/e3517fb11b67e798239354fe8213927d012ad8f9", - "reference": "e3517fb11b67e798239354fe8213927d012ad8f9", + "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/75c7effcf3f77501d0e0caa75111aff4daa0dd48", + "reference": "75c7effcf3f77501d0e0caa75111aff4daa0dd48", "shasum": "" }, "require": { - "composer/package-versions-deprecated": "^1.8.0", + "ocramius/package-versions": "^1.2.0", "php": "^7.0" }, "require-dev": { @@ -4300,7 +4282,7 @@ "release", "versions" ], - "time": "2020-04-24T14:19:45+00:00" + "time": "2018-06-13T13:22:40+00:00" }, { "name": "jms/metadata", @@ -5174,16 +5156,16 @@ }, { "name": "masterminds/html5", - "version": "2.7.1", + "version": "2.7.3", "source": { "type": "git", "url": "https://github.com/Masterminds/html5-php.git", - "reference": "a3edfe52f9e7380e498d33157e1330e85386645d" + "reference": "aad73dbfefd71d46072138109ce1288d96c329cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/a3edfe52f9e7380e498d33157e1330e85386645d", - "reference": "a3edfe52f9e7380e498d33157e1330e85386645d", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/aad73dbfefd71d46072138109ce1288d96c329cc", + "reference": "aad73dbfefd71d46072138109ce1288d96c329cc", "shasum": "" }, "require": { @@ -5237,7 +5219,7 @@ "serializer", "xml" ], - "time": "2020-02-06T11:39:04+00:00" + "time": "2020-07-05T07:53:37+00:00" }, { "name": "mgargano/simplehtmldom", @@ -5599,6 +5581,56 @@ ], "time": "2019-06-17T08:53:14+00:00" }, + { + "name": "ocramius/package-versions", + "version": "1.4.2", + "source": { + "type": "git", + "url": "https://github.com/Ocramius/PackageVersions.git", + "reference": "44af6f3a2e2e04f2af46bcb302ad9600cba41c7d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/44af6f3a2e2e04f2af46bcb302ad9600cba41c7d", + "reference": "44af6f3a2e2e04f2af46bcb302ad9600cba41c7d", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0.0", + "php": "^7.1.0" + }, + "require-dev": { + "composer/composer": "^1.6.3", + "doctrine/coding-standard": "^5.0.1", + "ext-zip": "*", + "infection/infection": "^0.7.1", + "phpunit/phpunit": "^7.5.17" + }, + "type": "composer-plugin", + "extra": { + "class": "PackageVersions\\Installer", + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "PackageVersions\\": "src/PackageVersions" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + } + ], + "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", + "time": "2019-11-15T16:17:10+00:00" + }, { "name": "ocramius/proxy-manager", "version": "2.2.3", @@ -7800,16 +7832,16 @@ }, { "name": "sentry/sentry", - "version": "2.4.0", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-php.git", - "reference": "e44561875e0d724bac3d9cdb705bf58847acd425" + "reference": "407573e22e6cc46b72cff07c117eeb16bf3a17de" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/e44561875e0d724bac3d9cdb705bf58847acd425", - "reference": "e44561875e0d724bac3d9cdb705bf58847acd425", + "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/407573e22e6cc46b72cff07c117eeb16bf3a17de", + "reference": "407573e22e6cc46b72cff07c117eeb16bf3a17de", "shasum": "" }, "require": { @@ -7893,7 +7925,7 @@ "type": "custom" } ], - "time": "2020-05-20T20:49:38+00:00" + "time": "2020-07-03T09:58:40+00:00" }, { "name": "sentry/sentry-symfony", @@ -8350,7 +8382,7 @@ }, { "name": "symfony/http-client", - "version": "v5.1.1", + "version": "v5.1.2", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", @@ -8507,7 +8539,7 @@ }, { "name": "symfony/mime", - "version": "v5.1.1", + "version": "v5.1.2", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", @@ -8647,16 +8679,16 @@ }, { "name": "symfony/polyfill-apcu", - "version": "v1.17.0", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-apcu.git", - "reference": "9ec426b564916afb9bfd15f78708ec322eeb8538" + "reference": "a96dc28442814ae56199f57b72a937b5a822150c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/9ec426b564916afb9bfd15f78708ec322eeb8538", - "reference": "9ec426b564916afb9bfd15f78708ec322eeb8538", + "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/a96dc28442814ae56199f57b72a937b5a822150c", + "reference": "a96dc28442814ae56199f57b72a937b5a822150c", "shasum": "" }, "require": { @@ -8666,6 +8698,10 @@ "extra": { "branch-alias": { "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -8713,20 +8749,20 @@ "type": "tidelift" } ], - "time": "2020-05-12T16:14:59+00:00" + "time": "2020-06-17T19:13:43+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.17.0", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9" + "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9", - "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d", + "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d", "shasum": "" }, "require": { @@ -8739,6 +8775,10 @@ "extra": { "branch-alias": { "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -8785,20 +8825,20 @@ "type": "tidelift" } ], - "time": "2020-05-12T16:14:59+00:00" + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.17.0", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424" + "reference": "ba6c9c18db36235b859cc29b8372d1c01298c035" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c4de7601eefbf25f9d47190abe07f79fe0a27424", - "reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/ba6c9c18db36235b859cc29b8372d1c01298c035", + "reference": "ba6c9c18db36235b859cc29b8372d1c01298c035", "shasum": "" }, "require": { @@ -8811,6 +8851,10 @@ "extra": { "branch-alias": { "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -8858,20 +8902,20 @@ "type": "tidelift" } ], - "time": "2020-05-12T16:47:27+00:00" + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.17.0", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "4ef3923e4a86e1b6ef72d42be59dbf7d33a685e3" + "reference": "7b5e03aeb88cc8b4b2b136e34b0fc0830e86cd4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/4ef3923e4a86e1b6ef72d42be59dbf7d33a685e3", - "reference": "4ef3923e4a86e1b6ef72d42be59dbf7d33a685e3", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/7b5e03aeb88cc8b4b2b136e34b0fc0830e86cd4d", + "reference": "7b5e03aeb88cc8b4b2b136e34b0fc0830e86cd4d", "shasum": "" }, "require": { @@ -8885,6 +8929,10 @@ "extra": { "branch-alias": { "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -8930,20 +8978,20 @@ "type": "tidelift" } ], - "time": "2020-05-12T16:14:59+00:00" + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.17.0", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a" + "reference": "a57f8161502549a742a63c09f0a604997bf47027" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3bff59ea7047e925be6b7f2059d60af31bb46d6a", - "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a57f8161502549a742a63c09f0a604997bf47027", + "reference": "a57f8161502549a742a63c09f0a604997bf47027", "shasum": "" }, "require": { @@ -8958,6 +9006,10 @@ "extra": { "branch-alias": { "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -9006,20 +9058,20 @@ "type": "tidelift" } ], - "time": "2020-05-12T16:47:27+00:00" + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.17.0", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "fa79b11539418b02fc5e1897267673ba2c19419c" + "reference": "7110338d81ce1cbc3e273136e4574663627037a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c", - "reference": "fa79b11539418b02fc5e1897267673ba2c19419c", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7110338d81ce1cbc3e273136e4574663627037a7", + "reference": "7110338d81ce1cbc3e273136e4574663627037a7", "shasum": "" }, "require": { @@ -9032,6 +9084,10 @@ "extra": { "branch-alias": { "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -9079,20 +9135,20 @@ "type": "tidelift" } ], - "time": "2020-05-12T16:47:27+00:00" + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/polyfill-php56", - "version": "v1.17.0", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "e3c8c138280cdfe4b81488441555583aa1984e23" + "reference": "a25861bb3c79b0ec2da9ede51de2ea573818b943" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/e3c8c138280cdfe4b81488441555583aa1984e23", - "reference": "e3c8c138280cdfe4b81488441555583aa1984e23", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/a25861bb3c79b0ec2da9ede51de2ea573818b943", + "reference": "a25861bb3c79b0ec2da9ede51de2ea573818b943", "shasum": "" }, "require": { @@ -9103,6 +9159,10 @@ "extra": { "branch-alias": { "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -9149,7 +9209,7 @@ "type": "tidelift" } ], - "time": "2020-05-12T16:47:27+00:00" + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/polyfill-php70", @@ -9299,16 +9359,16 @@ }, { "name": "symfony/polyfill-php73", - "version": "v1.17.0", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc" + "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a760d8964ff79ab9bf057613a5808284ec852ccc", - "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fa0837fe02d617d31fbb25f990655861bb27bd1a", + "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a", "shasum": "" }, "require": { @@ -9318,6 +9378,10 @@ "extra": { "branch-alias": { "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -9367,20 +9431,20 @@ "type": "tidelift" } ], - "time": "2020-05-12T16:47:27+00:00" + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.17.0", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd" + "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/5e30b2799bc1ad68f7feb62b60a73743589438dd", - "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4a5b6bba3259902e386eb80dd1956181ee90b5b2", + "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2", "shasum": "" }, "require": { @@ -9390,6 +9454,10 @@ "extra": { "branch-alias": { "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -9443,20 +9511,20 @@ "type": "tidelift" } ], - "time": "2020-05-12T16:47:27+00:00" + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/polyfill-util", - "version": "v1.17.0", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "4afb4110fc037752cf0ce9869f9ab8162c4e20d7" + "reference": "6dd644eda43cd2f3daa883d728d8ab4120a05af6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4afb4110fc037752cf0ce9869f9ab8162c4e20d7", - "reference": "4afb4110fc037752cf0ce9869f9ab8162c4e20d7", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/6dd644eda43cd2f3daa883d728d8ab4120a05af6", + "reference": "6dd644eda43cd2f3daa883d728d8ab4120a05af6", "shasum": "" }, "require": { @@ -9466,6 +9534,10 @@ "extra": { "branch-alias": { "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -9509,20 +9581,20 @@ "type": "tidelift" } ], - "time": "2020-05-12T16:14:59+00:00" + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/polyfill-uuid", - "version": "v1.17.0", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-uuid.git", - "reference": "6dbf0269e8aeab8253a5059c51c1760fb4034e87" + "reference": "5db3e66818f1f768b585220438436ea6c1e0b874" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/6dbf0269e8aeab8253a5059c51c1760fb4034e87", - "reference": "6dbf0269e8aeab8253a5059c51c1760fb4034e87", + "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/5db3e66818f1f768b585220438436ea6c1e0b874", + "reference": "5db3e66818f1f768b585220438436ea6c1e0b874", "shasum": "" }, "require": { @@ -9536,6 +9608,10 @@ "extra": { "branch-alias": { "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -9582,7 +9658,7 @@ "type": "tidelift" } ], - "time": "2020-05-12T16:47:27+00:00" + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/service-contracts", @@ -9955,16 +10031,16 @@ }, { "name": "thecodingmachine/safe", - "version": "v1.1.1", + "version": "v1.1.2", "source": { "type": "git", "url": "https://github.com/thecodingmachine/safe.git", - "reference": "04f9ffae372a9816d4472dfb7bcf6126b623a9df" + "reference": "85e21ee4c4118fd0cb85e9f2c778dfcb781acd1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/04f9ffae372a9816d4472dfb7bcf6126b623a9df", - "reference": "04f9ffae372a9816d4472dfb7bcf6126b623a9df", + "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/85e21ee4c4118fd0cb85e9f2c778dfcb781acd1b", + "reference": "85e21ee4c4118fd0cb85e9f2c778dfcb781acd1b", "shasum": "" }, "require": { @@ -10084,7 +10160,7 @@ "MIT" ], "description": "PHP core functions that throw exceptions instead of returning FALSE on error", - "time": "2020-05-04T15:25:36+00:00" + "time": "2020-06-11T08:39:56+00:00" }, { "name": "true/punycode", @@ -10189,31 +10265,31 @@ }, { "name": "twig/twig", - "version": "v2.12.5", + "version": "v2.13.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "18772e0190734944277ee97a02a9a6c6555fcd94" + "reference": "46a612ba1bbf6ee1c58acabacd868212ff8a2911" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/18772e0190734944277ee97a02a9a6c6555fcd94", - "reference": "18772e0190734944277ee97a02a9a6c6555fcd94", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/46a612ba1bbf6ee1c58acabacd868212ff8a2911", + "reference": "46a612ba1bbf6ee1c58acabacd868212ff8a2911", "shasum": "" }, "require": { - "php": "^7.0", + "php": ">=7.1.3", "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-mbstring": "^1.3" }, "require-dev": { "psr/container": "^1.0", - "symfony/phpunit-bridge": "^4.4|^5.0" + "symfony/phpunit-bridge": "^4.4.9|^5.0.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.12-dev" + "dev-master": "2.13-dev" } }, "autoload": { @@ -10250,7 +10326,29 @@ "keywords": [ "templating" ], - "time": "2020-02-11T15:31:23+00:00" + "funding": [ + { + "url": "https://certification.symfony.com/", + "type": "custom" + }, + { + "url": "https://live.symfony.com/", + "type": "custom" + }, + { + "url": "https://symfony.com/cloud/", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/twig/twig", + "type": "tidelift" + } + ], + "time": "2020-07-05T13:08:05+00:00" }, { "name": "wallabag/php-mobi", @@ -10699,26 +10797,27 @@ }, { "name": "dama/doctrine-test-bundle", - "version": "v6.2.0", + "version": "v6.3.2", "source": { "type": "git", "url": "https://github.com/dmaicher/doctrine-test-bundle.git", - "reference": "87e8e8a0587c70ccd0a35c651e2c7bb6d16b9940" + "reference": "06932e828b4e8ed8655b9b64ae30428e048b616e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dmaicher/doctrine-test-bundle/zipball/87e8e8a0587c70ccd0a35c651e2c7bb6d16b9940", - "reference": "87e8e8a0587c70ccd0a35c651e2c7bb6d16b9940", + "url": "https://api.github.com/repos/dmaicher/doctrine-test-bundle/zipball/06932e828b4e8ed8655b9b64ae30428e048b616e", + "reference": "06932e828b4e8ed8655b9b64ae30428e048b616e", "shasum": "" }, "require": { - "doctrine/dbal": "^2.9", + "doctrine/dbal": "^2.9,>=2.9.3", "doctrine/doctrine-bundle": "^1.11 || ^2.0", - "php": "^7.2", + "php": "^7.1", "symfony/framework-bundle": "^3.4 || ^4.3 || ^5.0" }, "require-dev": { - "phpunit/phpunit": "^7.0 || ^8.0", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", "symfony/phpunit-bridge": "^4.3 || ^5.0", "symfony/yaml": "^3.4 || ^4.3 || ^5.0" }, @@ -10751,7 +10850,7 @@ "symfony", "tests" ], - "time": "2019-10-28T19:15:26+00:00" + "time": "2020-03-02T20:42:23+00:00" }, { "name": "doctrine/data-fixtures", @@ -11057,16 +11156,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.5.0", + "version": "v4.6.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "53c2753d756f5adb586dca79c2ec0e2654dd9463" + "reference": "c346bbfafe2ff60680258b631afb730d186ed864" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/53c2753d756f5adb586dca79c2ec0e2654dd9463", - "reference": "53c2753d756f5adb586dca79c2ec0e2654dd9463", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c346bbfafe2ff60680258b631afb730d186ed864", + "reference": "c346bbfafe2ff60680258b631afb730d186ed864", "shasum": "" }, "require": { @@ -11105,7 +11204,7 @@ "parser", "php" ], - "time": "2020-06-03T07:24:19+00:00" + "time": "2020-07-02T17:12:47+00:00" }, { "name": "php-cs-fixer/diff", @@ -11599,7 +11698,7 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v5.1.1", + "version": "v5.1.2", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", From 351e00dcc4614983da34b563dfe863b429b207ad Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 5 Jul 2020 07:39:47 +0000 Subject: [PATCH 15/47] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (483 of 483 strings) --- .../Resources/translations/messages.zh.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml index 7c0568677..485e0fb5d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml @@ -326,7 +326,7 @@ about: by_contributing_2: '这里列出了我们的需求' by_paypal: '通过 Paypal' contributors: - description: '感谢为 wallabag 网页程序做出贡献的人们！' + description: '感谢为 wallabag 网页程序做出贡献的人们' third_party: description: '这里是 wallabag 使用的第三方库列表（以及它们的许可证）：' package: '包' @@ -465,7 +465,7 @@ import: description: "这个导入器会导入你 Pocket 账户中的所有内容。Pocket 不允许我们从它的服务器获取文章全文，所以导入的文章将由 wallabag 来重新抓取可读内容。" config_missing: description: "尚未配置好从 Pocket 中导入的功能。" - admin_message: 'You need to define %keyurls%a pocket_consumer_key%keyurle%.' + admin_message: '你需要定义 %keyurls%a pocket_consumer_key%keyurle%.' user_message: '你的服务器管理员需要先为 Pocket 配置一个 API Key。' authorize_message: '你可以从你的 Pocket 账号中汇入数据。只需要点击下方按钮并授权该应用程序连接 getpocket.com。' connect_to_pocket: '连接到 Pocket 并导入数据' @@ -480,7 +480,7 @@ import: page_title: 'Import > elCurator' description: '这个导入器会导入你 elCurator 账户中的所有内容。前往你 elCurator 账户的偏好设置页面，然后导出你的内容。你将得到一个 JSON 文件。' readability: - page_title: 'Import > Readability' + page_title: '导入 > Readability' description: '这个导入器会导入你 Readability 账户中的所有内容。在 tools（https://www.readability.com/tools/）页面，点击 "Data Export" 一栏下的 "Export your data"，你将会收到一封邮件，根据邮件指示下载得到一个 JSON 文件(尽管它并不以. json 结尾)。' how_to: '请选择你的 Readability 导出文件并点击下方按钮来上传和导入它。' worker: @@ -491,15 +491,15 @@ import: description: "这个导入器会导入你 Firefox 中的所有书签。只需要前往你的 bookmarks 页面(Ctrl+Maj+O)，然后进入 \"Import and backup\"，选择 \"Backup...\"你将得到一个 .json 文件。" how_to: "请选择书签备份文件然后点击下方的按钮来导入它。请注意这一过程可能会持续一段时间，因为需要获取所有的文章。" chrome: - page_title: 'Import > Chrome' + page_title: '导入> Chrome' description: "这个导入器会导入你 Chrome 中的所有书签。文件的位置取决于你的操作系统:
  • 在 Linux 上，前往 ~/.config/chromium/Default/ 目录
  • 在 Windows 上，它应该位于 %LOCALAPPDATA%\\Google\\Chrome\\User Data\\Default
  • 在 OS X 上，它应该在 ~/Library/Application Support/Google/Chrome/Default/Bookmarks
到达对应目录后， 把 Bookmarks 文件复制到一个你能找到的地方。
请注意如果你使用 Chromium 而不是 Chrome，你需要对应地纠正目录。

" how_to: "请选择书签备份文件然后点击下方的按钮来导入它。请注意这一过程可能会持续一段时间，因为需要获取所有的文章。" instapaper: - page_title: 'Import > Instapaper' + page_title: '导入> Instapaper' description: '这个导入器会导入你 Instapaper 账户中的所有内容。在设置页面（https://www.instapaper.com/user），点击 "Export" 一栏下的 "Download .CSV file"。你将会下载得到一个 CSV 文件（比如"instapaper-export.csv"）。' how_to: '请选择你的 Instapaper 导出文件并点击下方按钮来上传和导入它。' pinboard: - page_title: "Import > Pinboard" + page_title: "导入 > Pinboard" description: '这个导入器会导入你 Pinboard 账户中的所有内容。 在 backup 页面（https://pinboard.in/settings/backup），点击 "Bookmarks" 一栏下的 "JSON"。你将会下载得到一个 JSON 文件（比如"pinboard_export"）。' how_to: '请选择你的 Pinboard 导出文件并点击下方按钮来上传和导入它。' developer: @@ -515,8 +515,8 @@ developer: existing_clients: title: '现有客户端' field_id: 'Client ID' - field_secret: 'Client secret' - field_uris: 'Redirect URIs' + field_secret: '客户端secret' + field_uris: '重定向URIs' field_grant_types: '允许的授权形式' no_client: '目前还没有客户端。' remove: @@ -537,7 +537,7 @@ developer: page_description: '以下是你客户端的参数。' field_name: 'Client name' field_id: 'Client ID' - field_secret: 'Client secret' + field_secret: '客户端 secret' back: '返回' read_howto: '阅读教程 "如何创建我的第一个应用程序" ' howto: From f282d16162424fe47f8847c58c12604ce6ca1ea8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 8 Jul 2020 02:27:40 +0000 Subject: [PATCH 16/47] Bump laminas/laminas-diactoros from 2.3.0 to 2.3.1 Bumps [laminas/laminas-diactoros](https://github.com/laminas/laminas-diactoros) from 2.3.0 to 2.3.1. - [Release notes](https://github.com/laminas/laminas-diactoros/releases) - [Changelog](https://github.com/laminas/laminas-diactoros/blob/master/CHANGELOG.md) - [Commits](https://github.com/laminas/laminas-diactoros/compare/2.3.0...2.3.1) Signed-off-by: dependabot-preview[bot] --- composer.lock | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 7c1713961..47caafb08 100644 --- a/composer.lock +++ b/composer.lock @@ -4774,16 +4774,16 @@ }, { "name": "laminas/laminas-diactoros", - "version": "2.3.0", + "version": "2.3.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "5ab185dba63ec655a2380c97711b09adc7061f89" + "reference": "2ffc7cc816f6207b27923ee15edf6fac668390aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/5ab185dba63ec655a2380c97711b09adc7061f89", - "reference": "5ab185dba63ec655a2380c97711b09adc7061f89", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/2ffc7cc816f6207b27923ee15edf6fac668390aa", + "reference": "2ffc7cc816f6207b27923ee15edf6fac668390aa", "shasum": "" }, "require": { @@ -4855,6 +4855,7 @@ "http", "laminas", "psr", + "psr-17", "psr-7" ], "funding": [ @@ -4863,7 +4864,7 @@ "type": "community_bridge" } ], - "time": "2020-04-27T17:07:01+00:00" + "time": "2020-07-07T15:34:31+00:00" }, { "name": "laminas/laminas-eventmanager", From 33d245b7dad791caf665a2b729573496f0ee1293 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 8 Jul 2020 07:25:44 +0200 Subject: [PATCH 17/47] Remove deprecated methods --- src/Wallabag/CoreBundle/Repository/TagRepository.php | 3 +-- src/Wallabag/CoreBundle/Twig/WallabagExtension.php | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Wallabag/CoreBundle/Repository/TagRepository.php b/src/Wallabag/CoreBundle/Repository/TagRepository.php index 8464a6a55..9ddfbc85c 100644 --- a/src/Wallabag/CoreBundle/Repository/TagRepository.php +++ b/src/Wallabag/CoreBundle/Repository/TagRepository.php @@ -27,8 +27,7 @@ class TagRepository extends EntityRepository if (null !== $cacheLifeTime) { $query->useQueryCache(true); - $query->useResultCache(true); - $query->setResultCacheLifetime($cacheLifeTime); + $query->enableResultCache($cacheLifeTime); } return \count($query->getArrayResult()); diff --git a/src/Wallabag/CoreBundle/Twig/WallabagExtension.php b/src/Wallabag/CoreBundle/Twig/WallabagExtension.php index 47af3c8ec..2c8fbcaca 100644 --- a/src/Wallabag/CoreBundle/Twig/WallabagExtension.php +++ b/src/Wallabag/CoreBundle/Twig/WallabagExtension.php @@ -109,8 +109,7 @@ class WallabagExtension extends AbstractExtension implements GlobalsInterface ->getQuery(); $query->useQueryCache(true); - $query->useResultCache(true); - $query->setResultCacheLifetime($this->lifeTime); + $query->enableResultCache($this->lifeTime); return \count($query->getArrayResult()); } @@ -150,8 +149,7 @@ class WallabagExtension extends AbstractExtension implements GlobalsInterface ->getQuery(); $query->useQueryCache(true); - $query->useResultCache(true); - $query->setResultCacheLifetime($this->lifeTime); + $query->enableResultCache($this->lifeTime); $nbArchives = \count($query->getArrayResult()); From 3938a077f927c2d3e438ccda9c05ef791ce6b14a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 9 Jul 2020 02:21:11 +0000 Subject: [PATCH 18/47] Bump symfony/maker-bundle from 1.19.0 to 1.19.1 Bumps [symfony/maker-bundle](https://github.com/symfony/maker-bundle) from 1.19.0 to 1.19.1. - [Release notes](https://github.com/symfony/maker-bundle/releases) - [Changelog](https://github.com/symfony/maker-bundle/blob/master/CHANGELOG.md) - [Commits](https://github.com/symfony/maker-bundle/compare/v1.19.0...v1.19.1) Signed-off-by: dependabot-preview[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 49b5f552e..b8c9029d6 100644 --- a/composer.lock +++ b/composer.lock @@ -11617,16 +11617,16 @@ }, { "name": "symfony/maker-bundle", - "version": "v1.19.0", + "version": "v1.19.1", "source": { "type": "git", "url": "https://github.com/symfony/maker-bundle.git", - "reference": "bea8c3c959e48a2c952cc7c4f4f32964be8b8874" + "reference": "51c48ca9df84c16ed522a7781866900edf7c99f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/bea8c3c959e48a2c952cc7c4f4f32964be8b8874", - "reference": "bea8c3c959e48a2c952cc7c4f4f32964be8b8874", + "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/51c48ca9df84c16ed522a7781866900edf7c99f8", + "reference": "51c48ca9df84c16ed522a7781866900edf7c99f8", "shasum": "" }, "require": { @@ -11695,7 +11695,7 @@ "type": "tidelift" } ], - "time": "2020-05-29T14:47:30+00:00" + "time": "2020-07-06T00:27:41+00:00" }, { "name": "symfony/phpunit-bridge", From 1abcfe8c98a22ef5eb5b7b2dc62e2c5ee0284f72 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Mon, 13 Jul 2020 14:34:34 +0200 Subject: [PATCH 19/47] material: restore missing export and filter buttons on tags view The commit d9a68f6ced3f510e5a52d5f857ca9c19aed8924b introduced a change in the way export and filter buttons are showed. It ended in hidding them on the tag-related pages, preventing users to export entries for a given tag. Signed-off-by: Kevin Decherf --- .../CoreBundle/Resources/views/themes/material/layout.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 59705e89a..52e39e27b 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -92,6 +92,7 @@ casino + {% endif %}
  • filter_list @@ -102,7 +103,6 @@ file_download
    • - {% endif %}
  • account_circle From f4a1401de0d6d39521d47a69c9379d4780a07bca Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Mon, 13 Jul 2020 18:53:39 +0200 Subject: [PATCH 20/47] Reduce opacity of archived entries on tag view Fixes #4466 Signed-off-by: Kevin Decherf --- app/Resources/static/themes/material/css/cards.scss | 5 +++++ .../views/themes/material/Entry/_card_full_image.html.twig | 2 +- .../views/themes/material/Entry/_card_list.html.twig | 2 +- .../views/themes/material/Entry/_card_preview.html.twig | 2 +- .../Resources/views/themes/material/Entry/entries.html.twig | 6 +++--- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss index 80c9f253c..966510185 100644 --- a/app/Resources/static/themes/material/css/cards.scss +++ b/app/Resources/static/themes/material/css/cards.scss @@ -293,6 +293,11 @@ a.original:not(.waves-effect) { } } +.card.archived, +.card-stacked.archived { + opacity: 0.5; +} + #content .collection .collection-item { min-height: 65px; height: auto; diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig index ceb953819..1b1b4acb8 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig @@ -1,4 +1,4 @@ -
    +