Permalink
Browse files

update vendors and remove swiftmailer and doctrine dbal

  • Loading branch information...
csanquer committed Aug 21, 2013
1 parent 3425a94 commit 936692c31856880a5abc068d720b1238d9b40211
Showing with 322 additions and 519 deletions.
  1. +0 −31 app/bootstrap.php
  2. +23 −25 composer.json
  3. +299 −463 composer.lock
@@ -6,16 +6,12 @@
use \Silex\Provider\MonologServiceProvider;
use \Silex\Provider\ServiceControllerServiceProvider;
use \Silex\Provider\SessionServiceProvider;
use \Silex\Provider\SwiftmailerServiceProvider;
use \Silex\Provider\TranslationServiceProvider;
use \Silex\Provider\TwigServiceProvider;
use \Silex\Provider\UrlGeneratorServiceProvider;
use \Silex\Provider\ValidatorServiceProvider;
use \Silex\Provider\WebProfilerServiceProvider;
use \Spyrit\Datalea\Form\extension\BootstrapFormExtension;
use \Spyrit\Silex\Utils\Provider\Database\PDOServiceProvider;
use \Swift_MailTransport;
use \Swift_SendmailTransport;
use \Symfony\Component\ClassLoader\DebugClassLoader;
use \Symfony\Component\Filesystem\Filesystem;
use \Symfony\Component\HttpFoundation\Response;
@@ -226,33 +222,6 @@ function createDefaultSilexApp($appdir = __DIR__, $env = 'prod', $debug = false)
$app->mount('/_profiler', $p);
}
//add swiftmailer with default SMTP transport
if (!empty($config['swiftmailer'])) {
$app->register(new SwiftmailerServiceProvider(), array(
'swiftmailer.options' => isset($config['swiftmailer']['options']) ? $config['swiftmailer']['options'] : array(),
));
// custom swiftmailer transport
$swiftTransport = in_array($config['swiftmailer']['transport'], array('mail', 'sendmail', 'smtp')) ? $config['swiftmailer']['transport'] : 'smtp';
switch ($swiftTransport) {
case 'mail':
$app['swiftmailer.transport'] = new Swift_MailTransport();
break;
case 'sendmail':
$app['swiftmailer.transport'] = new Swift_SendmailTransport();
break;
case 'smtp':
default:
break;
}
}
//Database PDO Connection
if (!empty($config['databases'])) {
$app->register(new PDOServiceProvider(), array(
'pdo.dbs.options' => is_array($config['databases']) ? $config['databases'] : array(),
));
}
/*
* mount or define controllers
*/
@@ -20,32 +20,30 @@
"php": ">=5.3.3",
"ext-mbstring": "*",
"ext-SimpleXML": "*",
"silex/silex": "1.0.*",
"silex/web-profiler": "1.0.*",
"swiftmailer/swiftmailer": "4.2.*",
"doctrine/dbal": "2.2.*",
"twig/twig": ">=1.8.0,<2.0-dev",
"twig/extensions": "dev-master",
"symfony/twig-bridge": ">=2.1,<2.4-dev",
"symfony/form": ">=2.1,<2.4-dev",
"symfony/validator": ">=2.1,<2.4-dev",
"symfony/finder": ">=2.1,<2.4-dev",
"symfony/filesystem": ">=2.1,<2.4-dev",
"symfony/translation": ">=2.1,<2.4-dev",
"symfony/locale": ">=2.1,<2.4-dev",
"symfony/browser-kit": ">=2.1,<2.4-dev",
"symfony/class-loader": ">=2.1,<2.4-dev",
"symfony/css-selector": ">=2.1,<2.4-dev",
"symfony/console": ">=2.1,<2.4-dev",
"symfony/config": ">=2.1,<2.4-dev",
"symfony/yaml": ">=2.1,<2.4-dev",
"symfony/process": ">=2.1,<2.4-dev",
"symfony/security": ">=2.1,<2.4-dev",
"symfony/monolog-bridge": ">=2.1,<2.4-dev",
"silex/silex": "~1.1",
"silex/web-profiler": "~1.0",
"twig/twig": "~1.13",
"twig/extensions": "~1.0",
"symfony/twig-bridge": "~2.3",
"symfony/form": "~2.3",
"symfony/validator": "~2.3",
"symfony/finder": "~2.3",
"symfony/filesystem": "~2.3",
"symfony/translation": "~2.3",
"symfony/locale": "~2.3",
"symfony/browser-kit": "~2.3",
"symfony/class-loader": "~2.3",
"symfony/css-selector": "~2.3",
"symfony/console": "~2.3",
"symfony/config": "~2.3",
"symfony/yaml": "~2.3",
"symfony/process": "~2.3",
"symfony/security": "~2.3",
"symfony/monolog-bridge": "~2.3",
"spyrit/silex-utils": "dev-master",
"fzaninotto/faker": "1.1.*@dev",
"spyrit/light-csv": "dev-master",
"CodePlex/PHPExcel": "1.7.8"
"fzaninotto/faker": "~1.1",
"spyrit/light-csv": "~0.1",
"CodePlex/PHPExcel": "~1.7"
},
"suggest": {
"php": ">=5.4.0"
Oops, something went wrong.

0 comments on commit 936692c

Please sign in to comment.