remove DOCTRINE_XXX not needed env vars.

makasim · makasim · commit 476982225435 · 2018-09-11T16:49:02.000+03:00
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -30,12 +30,6 @@ services:
       - PHPREDIS_DSN=redis+phpredis://redis
       - GPS_DSN=gps:?projectId=mqdev&emulatorHost=http://google-pubsub:8085
       - SQS_DSN=sqs:?key=key&secret=secret&region=us-east-1&endpoint=http://localstack:4576&version=latest
-      - DOCTRINE_DRIVER=pdo_mysql
-      - DOCTRINE_HOST=mysql
-      - DOCTRINE_PORT=3306
-      - DOCTRINE_DB_NAME=mqdev
-      - DOCTRINE_USER=root
-      - DOCTRINE_PASSWORD=rootpass
       - REDIS_HOST=redis
       - REDIS_PORT=6379
       - AWS_SQS_KEY=key
diff --git a/pkg/dbal/examples/consume.php b/pkg/dbal/examples/consume.php
@@ -19,12 +19,8 @@
 
 $config = [
     'connection' => [
-        'dbname' => getenv('DOCTRINE_DB_NAME'),
-        'user' => getenv('DOCTRINE_USER'),
-        'password' => getenv('DOCTRINE_PASSWORD'),
-        'host' => getenv('DOCTRINE_HOST'),
-        'port' => getenv('DOCTRINE_PORT'),
-        'driver' => getenv('DOCTRINE_DRIVER'),
+        'url' => getenv('DOCTRINE_DSN'),
+        'driver' => 'pdo_mysql',
     ],
 ];
 
diff --git a/pkg/dbal/examples/produce.php b/pkg/dbal/examples/produce.php
@@ -19,12 +19,8 @@
 
 $config = [
     'connection' => [
-        'dbname' => getenv('DOCTRINE_DB_NAME'),
-        'user' => getenv('DOCTRINE_USER'),
-        'password' => getenv('DOCTRINE_PASSWORD'),
-        'host' => getenv('DOCTRINE_HOST'),
-        'port' => getenv('DOCTRINE_PORT'),
-        'driver' => getenv('DOCTRINE_DRIVER'),
+        'url' => getenv('DOCTRINE_DSN'),
+        'driver' => 'pdo_mysql',
     ],
 ];
 
diff --git a/pkg/enqueue-bundle/Tests/Functional/App/AppKernel.php b/pkg/enqueue-bundle/Tests/Functional/App/AppKernel.php
@@ -45,21 +45,6 @@ public function registerContainerConfiguration(LoaderInterface $loader)
         $loader->load(__DIR__.'/config/config.yml');
     }
 
-    protected function getKernelParameters()
-    {
-        $parameters = parent::getKernelParameters();
-
-        // it works in all Symfony version, 2.8, 3.x, 4.x
-        $parameters['db.driver'] = getenv('DOCTRINE_DRIVER');
-        $parameters['db.host'] = getenv('DOCTRINE_HOST');
-        $parameters['db.port'] = getenv('DOCTRINE_PORT');
-        $parameters['db.name'] = getenv('DOCTRINE_DB_NAME');
-        $parameters['db.user'] = getenv('DOCTRINE_USER');
-        $parameters['db.password'] = getenv('DOCTRINE_PASSWORD');
-
-        return $parameters;
-    }
-
     protected function getContainerClass()
     {
         return parent::getContainerClass().'BundleDefault';
diff --git a/pkg/enqueue-bundle/Tests/Functional/App/config/config.yml b/pkg/enqueue-bundle/Tests/Functional/App/config/config.yml
@@ -17,12 +17,8 @@ framework:
 
 doctrine:
     dbal:
-        driver:   "%db.driver%"
-        host:     "%db.host%"
-        port:     "%db.port%"
-        dbname:   "%db.name%"
-        user:     "%db.user%"
-        password: "%db.password%"
+        url:   "%env(DOCTRINE_DSN)%"
+        driver: pdo_mysql
         charset:  UTF8
 
 enqueue:
diff --git a/pkg/job-queue/Tests/Functional/app/AppKernel.php b/pkg/job-queue/Tests/Functional/app/AppKernel.php
@@ -44,21 +44,6 @@ public function registerContainerConfiguration(LoaderInterface $loader)
         $loader->load(__DIR__.'/config/config.yml');
     }
 
-    protected function getKernelParameters()
-    {
-        $parameters = parent::getKernelParameters();
-
-        // it works in all Symfony version, 2.8, 3.x, 4.x
-        $parameters['db.driver'] = getenv('DOCTRINE_DRIVER');
-        $parameters['db.host'] = getenv('DOCTRINE_HOST');
-        $parameters['db.port'] = getenv('DOCTRINE_PORT');
-        $parameters['db.name'] = getenv('DOCTRINE_DB_NAME');
-        $parameters['db.user'] = getenv('DOCTRINE_USER');
-        $parameters['db.password'] = getenv('DOCTRINE_PASSWORD');
-
-        return $parameters;
-    }
-
     protected function getContainerClass()
     {
         return parent::getContainerClass().'JobQueue';
diff --git a/pkg/job-queue/Tests/Functional/app/config/config.yml b/pkg/job-queue/Tests/Functional/app/config/config.yml
@@ -16,12 +16,8 @@ framework:
 
 doctrine:
     dbal:
-        driver:   "%db.driver%"
-        host:     "%db.host%"
-        port:     "%db.port%"
-        dbname:   "%db.name%"
-        user:     "%db.user%"
-        password: "%db.password%"
+        url:   "%env(DOCTRINE_DSN)%"
+        driver: pdo_mysql
         charset:  UTF8
         wrapper_class: "Enqueue\\JobQueue\\Test\\DbalPersistedConnection"
     orm:
