Commit graph

173 commits

Author SHA1 Message Date
Jeremy Benoist
2a253d24ca
Upgrade scheb/two-factor-bundle to fix vulnerability
The bundle was locked to a version which contains a security bug.
Jumping to the most recent fix the issue.

But we'll have the `ListenerInterface` issue, again.
So, downgrading sentry-symfony instead.

See 0cf743f6fb
2020-06-02 07:53:26 +02:00
Jeremy Benoist
0cf743f6fb
Lock scheb/two-factor-bundle to avoid issue with ListenerInterface / TwoFactorListener
- v4.6.0 introduce a fix for "deprecated listener for Symfony < 4.3"
- but sentry-symfony 3.3.0 introduce a bug in the workaround previous fix
- which was fixed in sentry-symfony 3.4.2
- we can't upgrade to that version because it requires sentry/sdk 2.1 which use `php-http/guzzle6-adapter` instead of curl
- as we are using guzzle5, we can't upgrade and fix the listerner issue
2020-05-25 07:14:00 +02:00
Jeremy Benoist
2a74acb77f
Update deps
- Clean Travis config file
  - Only cache deps from composer (avoiding metadata to invalid Travis cache)
  - Update config file to match future version from Travis
  - Remove useless (not so working) `travis_fold`
- Remove `SensioGeneratorBundle` and use `MakerBundle`
  ```
  Package sensio/generator-bundle is abandoned, you should avoid using it. Use symfony/maker-bundle instead.
  ```
- Sort packages in `composer.json`
- Use `laminas/*` package to remove deprecated `zendframework/*` ones:
  ```
  Package zendframework/zend-code is abandoned, you should avoid using it. Use laminas/laminas-code instead.
  Package zendframework/zend-diactoros is abandoned, you should avoid using it. Use laminas/laminas-diactoros instead.
  Package zendframework/zend-eventmanager is abandoned, you should avoid using it. Use laminas/laminas-eventmanager instead.
  ```
2020-05-25 06:28:04 +02:00
Nicolas Lœuillet
9717d01298
Upgrade Piwik Twig Extension to Matomo 2020-04-29 14:19:31 +02:00
Kevin Decherf
7f88c7423f Replace wallabag's fork of tcpdf with the original one, fix notices for PHP 7.4
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2020-04-26 18:29:34 +02:00
Kevin Decherf
9d196fcc15 composer: replace grandt/phpepub with wallabag version
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2020-03-29 16:27:31 +02:00
dependabot-preview[bot]
501d5fd102
Bump m6web/redis-mock from 4.7.0 to 5.0.0
Bumps [m6web/redis-mock](https://github.com/M6Web/RedisMock) from 4.7.0 to 5.0.0.
- [Release notes](https://github.com/M6Web/RedisMock/releases)
- [Commits](https://github.com/M6Web/RedisMock/compare/v4.7.0...v5.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-09 03:56:31 +00:00
Jeremy Benoist
d3847ac125
Lock PHPUnit-Bridge
Version 4.4.0 & 5.0.0 will install PHPUnit 8.3.x by default which required PHP > 7.1.
We could lock the PHPUnit version using `SYMFONY_PHPUNIT_VERSION` env variable but we'll have an issue with PHP 5 then because there is no PHPUnit version compatible with both PHP 5 & PHP 7.

Also update deps:
  - Updating ocramius/package-versions (1.4.0 => 1.4.2)
  - Updating j0k3r/graby-site-config (1.0.94 => 1.0.95)
  - Updating php-http/client-common (2.0.0 => 2.1.0)
  - Updating symfony/mime (v4.3.8 => v4.4.0)
  - Updating white-october/pagerfanta-bundle (v1.2.4 => v1.3.1)
  - Installing phpseclib/phpseclib (2.0.23)
  - Updating php-amqplib/php-amqplib (v2.10.1 => v2.11.0)
  - Updating nette/php-generator (v3.2.3 => v3.3.1)
  - Updating zendframework/zend-diactoros (2.2.0 => 2.2.1)
2019-11-22 22:38:42 +01:00
dependabot-preview[bot]
47b1f433dd
Bump symfony/phpunit-bridge from 4.3.8 to 5.0.0
Bumps [symfony/phpunit-bridge](https://github.com/symfony/phpunit-bridge) from 4.3.8 to 5.0.0.
- [Release notes](https://github.com/symfony/phpunit-bridge/releases)
- [Changelog](https://github.com/symfony/phpunit-bridge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/symfony/phpunit-bridge/compare/v4.3.8...v5.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-22 04:15:10 +00:00
Jeremy Benoist
7f2ae89d0d
Locked dbal to 2.9.2
Because the 2.9.3 seems to break test.
Like a conflict with `DoctrineTestBundle` I guess (which can't be updated because we are still allowing PHP 7.1 and is not).

The generated error usually appear when we update data using a service during test (like changing the craue config).
Here is the error:

```
Testing tests/Wallabag/CoreBundle/Controller/
PHP Fatal error:  Uncaught PDOException: There is no active transaction in /Users/jeremy/Sites/github/wallabag/vendor/dama/doctrine-test-bundle/src/DAMA/DoctrineTestBundle/Doctrine/DBAL/StaticDriver.php:142
Stack trace:
#0 /Users/jeremy/Sites/github/wallabag/vendor/dama/doctrine-test-bundle/src/DAMA/DoctrineTestBundle/Doctrine/DBAL/StaticDriver.php(142): PDO->rollBack()
#1 /Users/jeremy/Sites/github/wallabag/vendor/dama/doctrine-test-bundle/src/DAMA/DoctrineTestBundle/PHPUnit/PHPUnitListener.php(39): DAMA\DoctrineTestBundle\Doctrine\DBAL\StaticDriver::rollBack()
#2 /Users/jeremy/Sites/github/wallabag/vendor/bin/.phpunit/phpunit-7.4/src/Framework/TestResult.php(412): DAMA\DoctrineTestBundle\PHPUnit\PHPUnitListener->endTest(Object(Tests\Wallabag\CoreBundle\Controller\ConfigControllerTest), 3.3917479515076)
#3 /Users/jeremy/Sites/github/wallabag/vendor/bin/.phpunit/phpunit-7.4/src/Framework/TestResult.php(893): PHPUnit\Framework\TestResult->endTest(Object(Tests\Wallabag\CoreBundle\Controller\ConfigControllerTest), 3.3917479515076 in /Users/jeremy/Sites/github/wallabag/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php on line 91

Fatal error: Uncaught PDOException: There is no active transaction in /Users/jeremy/Sites/github/wallabag/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php on line 91

InvalidArgumentException: The controller for URI "/config" is not callable. The "kernel" service is synthetic, it needs to be set at boot time before it can be used. in /Users/jeremy/Sites/github/wallabag/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php on line 91

Call Stack:
    3.4732   57305872   1. Symfony\Component\Debug\ErrorHandler->handleException() /Users/jeremy/Sites/github/wallabag/vendor/symfony/symfony/src/Symfony/Component/Debug/ErrorHandler.php:0
    3.5000   58014320   2. Symfony\Component\Debug\ErrorHandler->handleException() /Users/jeremy/Sites/github/wallabag/vendor/symfony/symfony/src/Symfony/Component/Debug/ErrorHandler.php:613
```
2019-11-12 15:34:10 +01:00
Jeremy Benoist
1576905e03
Rename internal settings table
In fact it's not _just_ a rename.
We are now able to use our own entity with the CraueConfigBundle which allow us to enforce a custom length on string field and avoid error with utf8mb4 on MySQL.
To fix that issue before we were in need to fork CraueConfigBundle to hard apply these length changes.

The recent 2.3.0 release fix that issue. That's why we are in need to rename the table (getting rid of the bundle name from it)

Also updating deps:
  - Updating symfony/polyfill-mbstring (v1.11.0 => v1.12.0)
  - Updating symfony/polyfill-ctype (v1.11.0 => v1.12.0)
  - Updating symfony/polyfill-php70 (v1.11.0 => v1.12.0)
  - Updating symfony/polyfill-util (v1.11.0 => v1.12.0)
  - Updating symfony/polyfill-php56 (v1.11.0 => v1.12.0)
  - Updating symfony/polyfill-intl-icu (v1.11.0 => v1.12.0)
  - Updating symfony/polyfill-apcu (v1.11.0 => v1.12.0)
  - Updating j0k3r/graby-site-config (1.0.88 => 1.0.89)
  - Updating php-http/message (1.7.2 => 1.8.0)
  - Updating symfony/polyfill-php73 (v1.11.0 => v1.12.0)
  - Updating symfony/http-client (v4.3.2 => v4.3.3)
  - Updating symfony/polyfill-php72 (v1.11.0 => v1.12.0)
  - Updating symfony/polyfill-intl-idn (v1.11.0 => v1.12.0)
  - Updating symfony/mime (v4.3.2 => v4.3.3)
  - Updating craue/config-bundle (dev-utf8mb4 46cfd37 => 2.3.0)
  - Updating masterminds/html5 (2.6.0 => 2.7.0)
  - Updating nette/di (v3.0.0 => v3.0.1)
  - Updating symfony/polyfill-iconv (v1.11.0 => v1.12.0)
  - Updating wallabag/php-mobi (1.0.1 => 1.1.0)
2019-08-08 16:03:20 +02:00
dependabot-preview[bot]
28378675f1
Bump scheb/two-factor-bundle from 3.21.0 to 4.4.0
Bumps [scheb/two-factor-bundle](https://github.com/scheb/two-factor-bundle) from 3.21.0 to 4.4.0.
- [Release notes](https://github.com/scheb/two-factor-bundle/releases)
- [Upgrade guide](https://github.com/scheb/two-factor-bundle/blob/master/UPGRADE.md)
- [Commits](https://github.com/scheb/two-factor-bundle/compare/v3.21.0...v4.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-26 02:18:22 +00:00
Jeremy Benoist
a2f4efe6d2
Use Twig 2.0
`mnapoli/piwik-twig-extension` locked Twig to the 1.10 version. The new version is compatible with Twig 2.0
2019-06-21 12:46:53 +02:00
Jeremy Benoist
955a3bde17
Add Sentry support
Only enable in production
2019-06-05 13:15:15 +02:00
Jeremy Benoist
7abda3ba52
Drop SimplePie
It was only used to make an absolute url when downloading images.
The deps is still there (in the `composer.lock`) because Graby use it (not for absolute but for encoding).
2019-05-29 17:05:12 +02:00
adev
bf9ace0643
Use httplug 2019-05-28 11:40:41 +02:00
Jeremy Benoist
9306c2a368
Use Imagick to keep GIF animation
If Imagick is available, GIF will be saved using it to keep animation.
Otherwise the previous method will be used and the animation won't be kept.
2019-05-10 15:33:36 +02:00
Jeremy Benoist
18460b2d79
Merge remote-tracking branch 'origin/master' into 2.4 2019-02-07 18:01:15 +01:00
Jeremy Benoist
dfd0a7bc5f
Add backup codes 2019-01-23 13:28:03 +01:00
Jeremy Benoist
a6b242a1fd
Enable OTP 2FA
- Update SchebTwoFactorBundle to version 3
- Enable Google 2fa on the bundle
- Disallow ability to use both email and google as 2fa
- Update Ocramius Proxy Manager to handle typed function & attributes (from PHP 7)
- use `$this->addFlash` shortcut instead of `$this->get('session')->getFlashBag()->add`
- update admin to be able to create/reset the 2fa
2019-01-23 13:28:02 +01:00
Jérémy Benoist
c73025ad8b
Merge pull request #3858 from wallabag/bump-ocramius
Bump ocramius/proxy-manager
2019-01-18 16:50:24 +01:00
Jeremy Benoist
1e0d8ad7b7
Enable PHPStan
- Fix error for level 0 & 1 (level 7 has 699 errors...)
- Add `updated_at` to site_credential (so the `timestamps()` method applies correctly)
2019-01-18 15:25:50 +01:00
Thomas Citharel
9666fb70fc
Bump ocramius/proxy-manager
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-01-17 12:47:24 +01:00
Eloi Coutant
1ec44a346b
Update composer.json to add php-tidy (ext-tidy)
Should fix https://github.com/wallabag/wallabag/issues/3844 for milestone https://github.com/wallabag/wallabag/milestone/63.
2019-01-16 21:54:38 +01:00
Jeremy Benoist
5419a8368e
Merge remote-tracking branch 'origin/master' into 2.4 2019-01-15 09:41:18 +01:00
Jeremy Benoist
a5e9a98aa3
Come back to stable version
Previous one was used because some PHPUnit version where deleted and tests can't be run anymore.
2019-01-14 17:00:32 +01:00
Jeremy Benoist
8bb381e78c
No more dev for guzzle-site-authenticator 2018-12-13 22:12:21 +01:00
Jeremy Benoist
9a8a1bdfdb
Use our own fork for CraueConfigBundle
Mostly to fix utf8mb4 issue
2018-11-28 22:04:55 +01:00
Jeremy Benoist
8f2038e5b1
Fix tests 2018-11-28 22:04:55 +01:00
Jeremy Benoist
9394e8098a
Jump to unrelease predis
To fix deprecated message regarding `each()`
2018-11-28 22:04:54 +01:00
Jeremy Benoist
6fc95673df
Cleanup 2018-11-28 22:04:54 +01:00
Jeremy Benoist
3c7900d0cd
Jump to PHP 7.1+ 2018-11-25 10:08:45 +01:00
Jeremy Benoist
b878be4cc9
Merge remote-tracking branch 'origin/master' into 2.4
# Conflicts:
#	web/wallassets/baggy.js
#	web/wallassets/manifest.json
#	web/wallassets/material.css
#	web/wallassets/material.js
2018-11-25 09:58:18 +01:00
Jeremy Benoist
ea60d76e60
Use latest bridge to avoid PHPUnit break
Because branch 4.8 & 5.7 have been removed
2018-11-23 22:11:10 +01:00
Jeremy Benoist
115de64e5b
Jump to Symfony 3.4
Thanks to the BC compatibility, almost nothing have to be changed.
All changes are related to new bundle version of:
- SensioFrameworkExtraBundle
- DoctrineFixturesBundle
2018-10-04 14:11:57 +02:00
Jeremy Benoist
ad77c3451f
Looked UserBundle again.
See https://github.com/FriendsOfSymfony/FOSUserBundle/compare/v2.0.2...v2.1.0#diff-8a79d0e62995dd549be4e463c35a8cc3

It generate an error about a variable called `registration_enabled` which can not be found.
So I guess we are in the case of “such usage” about BC in UserBundle. Don’t want to loose time finding how to fix it. Rollback to the working version.
2018-02-24 22:12:48 +01:00
Jeremy Benoist
7185fbff62
Update dama/doctrine-test-bundle
Because:

PHP Fatal error:  Class 'PHPUnit_Framework_BaseTestListener' not found in /home/travis/build/wallabag/wallabag/vendor/dama/doctrine-test-bundle/src/DAMA/DoctrineTestBundle/PHPUnit/LegacyPHPUnitListener.php on line 7
2017-12-18 13:29:34 +01:00
Kevin Decherf
b495929c0d composer: update dependency versions to reduce memory footprint
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 21:00:27 +01:00
Jeremy Benoist
c8ac32cf17
Jump to Simpleue 2.0
The 1.3.0 tag is introducing BC so we jump to the 2.0
2017-11-18 16:28:54 +01:00
Jeremy Benoist
f40c88eb1f
Jump to Symfony 3.3 & update others deps
Also update tests urls
2017-10-09 16:45:12 +02:00
Nicolas Hart
c660878388 better entry txt export using html2text 2017-08-27 00:04:21 +02:00
Jeremy Benoist
f808b01692
Add a real configuration for CS-Fixer 2017-07-01 09:52:38 +02:00
Jeremy Benoist
906424c1b6
Crypt site credential password 2017-06-20 16:03:35 +02:00
Jérémy Benoist
2a0eec07a5 Merge pull request #3137 from aaa2000/isolated-tests
Isolated tests
2017-06-01 07:58:17 +02:00
adev
7ab5eb9508 Isolated tests
Use https://github.com/dmaicher/doctrine-test-bundle to have test isolation.
2017-05-31 16:03:54 +02:00
Jérémy Benoist
4368a27152
PR has been merged in graby 2017-05-31 14:00:15 +02:00
Jeremy Benoist
0d6cfb884c
Remove htmlawed and use graby instead
Instead of using htmlawed (which is already used in graby) use graby directly (which require some refacto on graby side).
Still needs some tests.
2017-05-31 14:00:15 +02:00
Jeremy Benoist
74a75f7d43
Use graby ContentExtractor to clean html
It might be better to re-use some graby functionalities to clean html instead of building a new system.
2017-05-31 14:00:15 +02:00
Jeremy Benoist
e869ee7d7f
Switch back to latest guzzle-site-authenticator 2017-05-24 07:29:46 +02:00
Jeremy Benoist
4ab0d25f65
Merge remote-tracking branch 'origin/master' into 2.3 2017-05-19 11:25:19 +02:00