Avoid deprecated message by using a new strategy

j0k3r · Apr 8, 2020 · 069a709 · 069a709
1 parent 23300a4
commit 069a709
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 33 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,16 +16,14 @@ cache:
 matrix:
     fast_finish: true
     include:
-        - php: 7.3
-        - php: 7.4
-        - php: nightly
         - php: 7.2
           env: CS_FIXER=run
-        - php: 7.2
+        - php: 7.3
           env: COVERAGE=run
-    allow_failures:
         - php: 7.4
         - php: nightly
+    allow_failures:
+        - php: nightly
 
 before_install:
     - echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -56,7 +56,7 @@ doctrine:
 
     orm:
         auto_generate_proxy_classes: "%kernel.debug%"
-        naming_strategy: doctrine.orm.naming_strategy.underscore
+        naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
         auto_mapping: true
 
 doctrine_migrations:

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "php": "^7.2",
         "ashleydawson/simple-pagination-bundle": "^3.0",
         "cache/predis-adapter": "^1.0",
-        "doctrine/doctrine-bundle": "^1.6",
+        "doctrine/doctrine-bundle": "^1.12",
         "doctrine/doctrine-cache-bundle": "^1.2",
         "doctrine/doctrine-migrations-bundle": "^2.0",
         "doctrine/orm": "^2.5",

diff --git a/composer.lock b/composer.lock