Merge 0d76aa1 into e6a8437

j0k3r · Apr 7, 2020 · bc47249 · bc47249
2 parents e6a8437 + 0d76aa1
commit bc47249
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,8 +4,6 @@ services:
     - mysql
 
 php:
-    - 7.2
-    - 7.3
     - 7.4
     - nightly
 
@@ -15,10 +13,9 @@ matrix:
     include:
         - php: 7.2
           env: COVERAGE=run
-        - php: 7.2
+        - php: 7.3
           env: CS_FIXER=run
     allow_failures:
-        - php: 7.4
         - php: nightly
 
 # faster builds on new travis setup not using sudo

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -52,7 +52,7 @@ doctrine:
         entity_managers:
             default:
                 auto_mapping: true
-                naming_strategy: doctrine.orm.naming_strategy.underscore
+                naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
                 dql:
                     datetime_functions:
                         DATE: DoctrineExtensions\Query\Mysql\Date

diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
     "require": {
         "php": "^7.2",
         "beberlei/doctrineextensions": "^1.2",
-        "doctrine/doctrine-bundle": "^1.6",
+        "doctrine/doctrine-bundle": "^1.12",
         "doctrine/doctrine-migrations-bundle": "^2.0",
         "doctrine/orm": "^2.5",
         "incenteev/composer-parameter-handler": "^2.0",

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