Merge pull request #4416 from wallabag/update-deps

Update deps

.travis.yml

@@ -1,3 +1,5 @@
+os: linux
+dist: xenial
 language: php
 
 services:
@@ -10,8 +12,7 @@ services:
 cache:
     apt: true
     directories:
-        - vendor
+        - $HOME/.composer/cache/files
-        - $HOME/.composer/cache
         - node_modules
         - $HOME/.npm
         - $HOME/.yarn-cache
@@ -34,7 +35,7 @@ env:
     - DB=pgsql
     - DB=sqlite
 
-matrix:
+jobs:
     fast_finish: true
     include:
         - php: 7.3
@@ -47,13 +48,6 @@ branches:
 
 before_install:
     - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
-
-install:
-    - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.10; fi;
-    - if [[ $ASSETS = build ]]; then npm install -g yarn@latest; fi;
-    - if [[ $ASSETS = build ]]; then yarn install; fi;
-
-before_script:
     - PHP=$TRAVIS_PHP_VERSION
     - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
     - phpenv config-rm xdebug.ini || echo "xdebug not available"
@@ -63,15 +57,18 @@ before_script:
     - pecl channel-update pecl.php.net
     - yes | pecl install imagick
 
-script:
+install:
-    - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
+    - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.10; fi;
+    - if [[ $ASSETS = build ]]; then npm install -g yarn@latest; fi;
+    - if [[ $ASSETS = build ]]; then yarn install; fi;
+    - composer install -o --no-interaction --no-progress --prefer-dist --no-suggest
+    - php bin/simple-phpunit install
 
-    - echo "travis_fold:start:prepare"
+before_script:
     - make prepare DB=$DB
-    - echo "travis_fold:end:prepare"
-
     - make fixtures
 
+script:
     - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then ./bin/simple-phpunit -v ; fi;
     # PHPStan needs PHPUnit to be installed and cache app to be generated
     - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then php bin/phpstan analyse src tests --no-progress --level 1 ; fi;

app/AppKernel.php

@@ -56,7 +56,7 @@ class AppKernel extends Kernel
             }
 
             if ('dev' === $this->getEnvironment()) {
-                $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
+                $bundles[] = new Symfony\Bundle\MakerBundle\MakerBundle();
                 $bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle();
             }
         }

composer.json

@@ -32,81 +32,83 @@
     },
     "require": {
         "php": ">=7.1.3",
-        "ext-pcre": "*",
-        "ext-dom": "*",
-        "ext-curl": "*",
-        "ext-gd": "*",
-        "ext-session": "*",
         "ext-ctype": "*",
+        "ext-curl": "*",
+        "ext-dom": "*",
+        "ext-gd": "*",
         "ext-hash": "*",
-        "ext-simplexml": "*",
+        "ext-iconv": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "ext-xml": "*",
+        "ext-pcre": "*",
-        "ext-iconv": "*",
-        "ext-tokenizer": "*",
         "ext-pdo": "*",
+        "ext-session": "*",
+        "ext-simplexml": "*",
         "ext-tidy": "*",
-        "symfony/symfony": "3.4.*",
+        "ext-tokenizer": "*",
-        "doctrine/orm": "^2.6",
+        "ext-xml": "*",
+        "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/dbal": "2.9.2",
+        "doctrine/doctrine-migrations-bundle": "^1.3",
-        "twig/extensions": "^1.5",
+        "doctrine/orm": "^2.6",
-        "symfony/swiftmailer-bundle": "^3.2",
+        "friendsofsymfony/jsrouting-bundle": "^2.2",
-        "symfony/monolog-bundle": "^3.1",
+        "friendsofsymfony/oauth-server-bundle": "^1.5",
+        "friendsofsymfony/rest-bundle": "~2.1",
+        "friendsofsymfony/user-bundle": "2.0.*",
+        "guzzlehttp/guzzle": "^5.3.1",
+        "html2text/html2text": "^4.1",
+        "incenteev/composer-parameter-handler": "^2.1",
+        "j0k3r/graby": "^2.0",
+        "javibravo/simpleue": "^2.0",
+        "jms/serializer-bundle": "~2.2",
+        "kphoen/rulerz-bundle": "~0.13",
+        "laminas/laminas-code": "^3.4",
+        "laminas/laminas-diactoros": "^2.3",
+        "lexik/form-filter-bundle": "^5.0.4",
+        "liip/theme-bundle": "^1.4.6",
+        "mgargano/simplehtmldom": "~1.5",
+        "mnapoli/piwik-twig-extension": "^3.0",
+        "nelmio/api-doc-bundle": "^2.13.2",
+        "nelmio/cors-bundle": "~1.5",
+        "ocramius/proxy-manager": "^2.1.1",
+        "php-amqplib/rabbitmq-bundle": "^1.14",
+        "php-http/guzzle5-adapter": "^2.0",
+        "php-http/httplug-bundle": "^1.14",
+        "pragmarx/recovery": "^0.1.0",
+        "predis/predis": "v1.1.x-dev",
+        "scheb/two-factor-bundle": "4.5.0",
         "sensio/distribution-bundle": "^5.0",
         "sensio/framework-extra-bundle": "^5.2",
-        "incenteev/composer-parameter-handler": "^2.1",
+        "sentry/sentry-symfony": "^3.0",
-        "nelmio/cors-bundle": "~1.5",
-        "friendsofsymfony/rest-bundle": "~2.1",
-        "jms/serializer-bundle": "~2.2",
-        "nelmio/api-doc-bundle": "^2.13.2",
-        "mgargano/simplehtmldom": "~1.5",
-        "tecnickcom/tcpdf": "^6.3.0",
-        "willdurand/hateoas-bundle": "~1.3",
-        "liip/theme-bundle": "^1.4.6",
-        "lexik/form-filter-bundle": "^5.0.4",
-        "j0k3r/graby": "^2.0",
-        "php-http/guzzle5-adapter": "^2.0",
-        "friendsofsymfony/user-bundle": "2.0.*",
-        "friendsofsymfony/oauth-server-bundle": "^1.5",
         "stof/doctrine-extensions-bundle": "^1.2",
-        "scheb/two-factor-bundle": "^4.4",
-        "wallabag/phpepub": "^4.0.7.2",
-        "wallabag/php-mobi": "~1.0",
-        "kphoen/rulerz-bundle": "~0.13",
-        "guzzlehttp/guzzle": "^5.3.1",
-        "doctrine/doctrine-migrations-bundle": "^1.3",
-        "craue/config-bundle": "^2.3.0",
-        "mnapoli/piwik-twig-extension": "^3.0",
-        "ocramius/proxy-manager": "^2.1.1",
-        "white-october/pagerfanta-bundle": "^1.1",
-        "php-amqplib/rabbitmq-bundle": "^1.14",
-        "predis/predis": "v1.1.x-dev",
-        "javibravo/simpleue": "^2.0",
         "symfony/dom-crawler": "^3.4",
-        "friendsofsymfony/jsrouting-bundle": "^2.2",
+        "symfony/monolog-bundle": "^3.1",
-        "bdunogier/guzzle-site-authenticator": "^1.0.0",
+        "symfony/swiftmailer-bundle": "^3.2",
-        "defuse/php-encryption": "^2.1",
+        "symfony/symfony": "3.4.*",
-        "html2text/html2text": "^4.1",
+        "tecnickcom/tcpdf": "^6.3.0",
-        "pragmarx/recovery": "^0.1.0",
+        "twig/extensions": "^1.5",
-        "php-http/httplug-bundle": "^1.14",
+        "wallabag/php-mobi": "~1.0",
-        "sentry/sentry-symfony": "^3.0"
+        "wallabag/phpepub": "^4.0.7.2",
+        "white-october/pagerfanta-bundle": "^1.1",
+        "willdurand/hateoas-bundle": "~1.3"
     },
     "require-dev": {
-        "doctrine/doctrine-fixtures-bundle": "~3.0",
-        "sensio/generator-bundle": "^3.0",
-        "symfony/phpunit-bridge": "~4.3.8",
-        "friendsofphp/php-cs-fixer": "~2.13",
-        "m6web/redis-mock": "^5.0",
         "dama/doctrine-test-bundle": "^5.0",
+        "doctrine/doctrine-fixtures-bundle": "~3.0",
+        "friendsofphp/php-cs-fixer": "~2.13",
+        "guzzlehttp/psr7": "^1.0",
+        "m6web/redis-mock": "^5.0",
+        "php-http/mock-client": "^1.0",
         "phpstan/phpstan": "^0.11.0",
+        "phpstan/phpstan-doctrine": "^0.11.0",
         "phpstan/phpstan-phpunit": "^0.11.0",
         "phpstan/phpstan-symfony": "^0.11.0",
-        "phpstan/phpstan-doctrine": "^0.11.0",
+        "symfony/maker-bundle": "^1.18",
-        "php-http/mock-client": "^1.0",
+        "symfony/phpunit-bridge": "~4.3.8"
-        "guzzlehttp/psr7": "^1.0"
     },
     "suggest": {
         "ext-imagick": "To keep GIF animation when downloading image is enabled"
@@ -158,7 +160,8 @@
         "bin-dir": "bin",
         "platform": {
             "php": "7.1.3"
-        }
+        },
+        "sort-packages": true
     },
     "minimum-stability": "dev",
     "prefer-stable": true