Updating configuration files to upgraded dependencies

Author: lcobucci

config/cli-config.php

@@ -2,25 +2,12 @@
 use Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper;
 use Doctrine\DBAL\Migrations\Tools\Console\Command as Migrations;
 use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper;
-use Lcobucci\ActionMapper2\DependencyInjection\ContainerConfig;
-use Lcobucci\DependencyInjection\XmlContainerBuilder;
 use Lcobucci\Fixture\Console\DataFixtureHelper;
 use Lcobucci\Fixture\Console\ExecuteCommand;
 use Symfony\Component\Console\Helper\DialogHelper;
 use Symfony\Component\Console\Helper\HelperSet;
 
-$config = require __DIR__ . '/di-container.php';
-
-$builder = new XmlContainerBuilder(
-    ContainerConfig::getClass($config),
-    ContainerConfig::getDumpDir($config)
-);
-
-$container = $builder->getContainer(
-    $config->getFile(),
-    array(),
-    $config->getDefaultParameters()
-);
+$container = require __DIR__ . '/di-container.php';
 
 $em = $container->get('entitymanager');
 

config/di-config.php

@@ -0,0 +1,11 @@
+<?php
+use Lcobucci\ActionMapper2\DependencyInjection\ContainerConfig;
+
+return new ContainerConfig(
+    __DIR__ . '/services.xml',
+    __DIR__ . '/../tmp',
+    array(
+        'app.baseDir' => realpath(__DIR__ . '/../') . '/'
+    ),
+    '\PHPSC\Conference\Infra\DependencyInjection\Container'
+);

config/di-container.php

@@ -1,11 +1,6 @@
 <?php
-use Lcobucci\ActionMapper2\DependencyInjection\ContainerConfig;
+use Lcobucci\DependencyInjection\XmlContainerBuilder;
 
-return new ContainerConfig(
-    __DIR__ . '/services.xml',
-    __DIR__ . '/../tmp',
-    '\PHPSC\Conference\Infra\DependencyInjection\Container',
-    array(
-        'app.baseDir' => realpath(__DIR__ . '/../') . '/'
-    )
-);
+$builder = new XmlContainerBuilder();
+
+return $builder->getContainer(require __DIR__ . '/di-config.php');

public/index.php

@@ -11,7 +11,7 @@
 
 $app = ApplicationBuilder::build(
     __DIR__ . '/../config/routes.xml',
-    require __DIR__ . '/../config/di-container.php',
+    require __DIR__ . '/../config/di-config.php',
     new ErrorHandler(),
     'app.cache'
 );

tmp/.gitignore

@@ -1,3 +1,4 @@
 /*.php
+/*.meta
 /*.json
 /phperrors.log