Merge 54aafd4 into 5ae155e

.travis.yml

@@ -3,12 +3,7 @@ language: php
 services:
     - mongodb
 
-env:
-    global:
-        - MONGO_DRIVER=mongodb
-
 php:
-    - 7.0
     - 7.1
     - 7.2
     - nightly
@@ -17,11 +12,9 @@ php:
 matrix:
     fast_finish: true
     include:
-        - php: 5.6
-          env: MONGO_DRIVER=mongo
-        - php: 7.0
+        - php: 7.2
           env: COVERAGE=run
-        - php: 7.0
+        - php: 7.2
           env: CS_FIXER=run
     allow_failures:
         - php: nightly
@@ -41,8 +34,7 @@ install:
 before_script:
     - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
     - pecl channel-update pecl.php.net
-    - yes '' | pecl -q install -f $MONGO_DRIVER
-    - if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." || "$TRAVIS_PHP_VERSION" = "nightly" ]]; then composer config "platform.ext-mongo" "1.6.16" && COMPOSER_MEMORY_LIMIT=-1 composer require alcaeus/mongo-php-adapter; fi
+    - yes '' | pecl -q install -f mongodb
     - if [ $COVERAGE = run ]; then PHPUNIT_FLAGS="--coverage-clover build/logs/clover.xml"; fi;
 
 script:

app/AppKernel.php

@@ -17,7 +17,6 @@ public function registerBundles()
             new Doctrine\Bundle\MongoDBBundle\DoctrineMongoDBBundle(),
             new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
             new Sentry\SentryBundle\SentryBundle(),
-            new Ekino\Bundle\NewRelicBundle\EkinoNewRelicBundle(),
             new Api43\FeedBundle\Api43FeedBundle(),
         ];
 

app/config/config.yml

@@ -67,13 +67,7 @@ monolog:
             level: debug
             channels: ['graby']
 
-ekino_new_relic:
-    enabled: false
-    application_name: f43.me
-    api_key: "%newrelic_api_key%"
-    logging: true
-    log_commands: true
-    using_symfony_cache: false
-    transaction_naming: route
-    ignored_commands:
-        - "cache:clear"
+# see https://github.com/symfony/symfony-standard/pull/1133
+sensio_framework_extra:
+   router:
+        annotations: false

app/config/config_prod.yml

@@ -41,6 +41,3 @@ doctrine_mongodb:
 
 sentry:
     dsn: "%sentry_dsn%"
-
-ekino_new_relic:
-    enabled: true

app/config/parameters.yml.dist

@@ -59,5 +59,3 @@ parameters:
     github.client_secret: xxx
 
     sentry_dsn: "https://xxx:xxx@sentry.io/666"
-
-    newrelic_api_key: xxx

app/config/parameters.yml.docker

@@ -38,5 +38,3 @@ parameters:
     twitter.access_token_secret: xxx
 
     sentry_dsn: "https://xxx:xxx@sentry.io/666"
-
-    newrelic_api_key: xxx

app/config/parameters.yml.travis

@@ -38,4 +38,3 @@ parameters:
     github.client_id: xxx
     github.client_secret: xxx
     sentry_dsn:
-    newrelic_api_key: xxx

app/config/security.yml

@@ -26,6 +26,7 @@ security:
         secured:
             pattern: ^/
             anonymous:  ~
+            logout_on_user_change: true
             form_login:
                 login_path: login
                 check_path: login_check

composer.json

@@ -19,13 +19,13 @@
         }
     ],
     "require": {
-        "php": "^5.6 || ^7.0",
-        "symfony/symfony": "3.3.*",
+        "php": "^7.1",
+        "symfony/symfony": "3.4.*",
         "doctrine/doctrine-bundle": "^1.6",
         "twig/extensions": "~1.1",
         "symfony/monolog-bundle": "^3.1.0",
         "sensio/distribution-bundle": "^5.0.19",
-        "sensio/framework-extra-bundle": "^3.0.2",
+        "sensio/framework-extra-bundle": "^5.2.1",
         "incenteev/composer-parameter-handler": "^2.0",
         "doctrine/mongodb-odm-bundle": "^3.2",
         "stof/doctrine-extensions-bundle": "~1.1",
@@ -36,15 +36,15 @@
         "guzzlehttp/guzzle": "~5.0",
         "mnsami/composer-custom-directory-installer": "~1.0",
         "ricardoper/twitteroauth": "~1.0",
-        "sentry/sentry-symfony": "^0.7",
-        "ekino/newrelic-bundle": "^1.3"
+        "sentry/sentry-symfony": "^2.0",
+        "alcaeus/mongo-php-adapter": "^1.1"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "~2.0",
         "php-coveralls/php-coveralls": "~1.0",
         "sensio/generator-bundle": "~3.0",
-        "doctrine/doctrine-fixtures-bundle": "~2.2",
-        "symfony/phpunit-bridge": "^3.0"
+        "doctrine/doctrine-fixtures-bundle": "~3.0",
+        "symfony/phpunit-bridge": "^4.0"
     },
     "scripts": {
         "post-cmd": [
@@ -65,7 +65,8 @@
     "prefer-stable": true,
     "config": {
         "platform": {
-            "php": "5.6"
+            "php": "7.1",
+            "ext-mongo": "1.6.16"
         },
         "bin-dir": "bin"
     },