Merge pull request PUGX#45 from agiuliano/master

Upgrade to Sf2.3 and remove unused dependencies

.gitignore

@@ -1,8 +1,7 @@
-composer.lock
 app/cache
 app/logs
-app/parameter.yml
+app/parameters.yml
 app/bootstrap.php.cache
 bin/phpunit
 vendor
-.idea
+web/bundles

app/AppKernel.php

@@ -12,21 +12,15 @@ public function registerBundles()
  new Symfony\Bundle\SecurityBundle\SecurityBundle(),
  new Symfony\Bundle\TwigBundle\TwigBundle(),
  new Symfony\Bundle\MonologBundle\MonologBundle(),
- new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
  new Symfony\Bundle\AsseticBundle\AsseticBundle(),
  new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
- new JMS\AopBundle\JMSAopBundle(),
- new JMS\DiExtraBundle\JMSDiExtraBundle($this),
- new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(),
-
  new Snc\RedisBundle\SncRedisBundle(),
  new PUGX\BadgeBundle\PUGXBadgeBundle(),
  );
 
  if (in_array($this->getEnvironment(), array('dev', 'test'))) {
  $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
  $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
- $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
  }
 
  return $bundles;

app/check.php

@@ -25,8 +25,13 @@
 
 echo_title('Mandatory requirements');
 
+$checkPassed = true;
 foreach ($symfonyRequirements->getRequirements() as $req) {
+ /** @var $req Requirement */
  echo_requirement($req);
+ if (!$req->isFulfilled()) {
+ $checkPassed = false;
+ }
 }
 
 echo_title('Optional recommendations');
@@ -35,6 +40,8 @@
  echo_requirement($req);
 }
 
+exit($checkPassed ? 0 : 1);
+
 /**
  * Prints a Requirement instance
  */

app/config/config.yml

@@ -56,14 +56,6 @@ assetic:
 # auto_generate_proxy_classes: %kernel.debug%
 # auto_mapping: true
 
-# Swiftmailer Configuration
-swiftmailer:
- transport: %mailer_transport%
- host: %mailer_host%
- username: %mailer_user%
- password: %mailer_password%
- spool: { type: memory }
-
 snc_redis:
  clients:
  default:

app/config/config_dev.yml

@@ -27,7 +27,4 @@ monolog:
  level: info
 
 assetic:
- use_controller: true
-
-#swiftmailer:
-# delivery_address: [email protected]
+ use_controller: true

app/config/config_test.yml

@@ -19,6 +19,3 @@ framework:
 web_profiler:
  toolbar: false
  intercept_redirects: false
-
-swiftmailer:
- disable_delivery: true

app/config/parameters.yml

@@ -1,15 +1,14 @@
+# This file is auto-generated during the composer install
 parameters:
- database_driver: pdo_mysql
- database_host: 127.0.0.1
- database_port: ~
- database_name: symfony
- database_user: root
- database_password: ~
-
- mailer_transport: smtp
- mailer_host: 127.0.0.1
- mailer_user: ~
- mailer_password: ~
-
- locale: en
- secret: ThisTokenIsNotSoSecretChangeIt
+ database_driver: pdo_mysql
+ database_host: 127.0.0.1
+ database_port: null
+ database_name: symfony
+ database_user: root
+ database_password: null
+ mailer_transport: smtp
+ mailer_host: 127.0.0.1
+ mailer_user: null
+ mailer_password: null
+ locale: en
+ secret: ThisTokenIsNotSoSecretChangeIt

app/config/parameters.yml.dist

@@ -0,0 +1,15 @@
+parameters:
+ database_driver: pdo_mysql
+ database_host: 127.0.0.1
+ database_port: ~
+ database_name: symfony
+ database_user: root
+ database_password: ~
+
+ mailer_transport: smtp
+ mailer_host: 127.0.0.1
+ mailer_user: ~
+ mailer_password: ~
+
+ locale: en
+ secret: ThisTokenIsNotSoSecretChangeIt

app/config/security.yml

@@ -1,7 +1,3 @@
-jms_security_extra:
- secure_all_services: false
- expressions: true
-
 security:
  encoders:
  Symfony\Component\Security\Core\User\User: plaintext

composer.json

@@ -16,24 +16,18 @@
  }
  ],
  "autoload": {
- "psr-0": {
- "": "src/"
- }
+ "psr-0": { "": "src/" }
  },
  "require": {
  "php": ">=5.3.3",
- "ext-gd": "*",
- "symfony/symfony": "2.2.*",
+ "symfony/symfony": "2.3.*",
  "twig/extensions": "1.0.*",
- "symfony/assetic-bundle": "2.1.*",
- "symfony/swiftmailer-bundle": "2.2.*",
- "symfony/monolog-bundle": "2.2.*",
- "sensio/distribution-bundle": "2.2.*",
- "sensio/framework-extra-bundle": "2.2.*",
- "sensio/generator-bundle": "2.2.*",
- "jms/security-extra-bundle": "1.4.*",
- "jms/di-extra-bundle": "1.3.*",
-
+ "symfony/assetic-bundle": "2.3.*",
+ "symfony/monolog-bundle": "2.3.*",
+ "sensio/distribution-bundle": "2.3.*",
+ "sensio/framework-extra-bundle": "2.3.*",
+ "incenteev/composer-parameter-handler": "~2.0",
+ "ext-gd": "*",
  "knplabs/packagist-api": "dev-master",
  "predis/predis": "0.8.*",
  "snc/redis-bundle": "1.1.*"
@@ -44,12 +38,14 @@
  },
  "scripts": {
  "post-install-cmd": [
+ "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
  "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
  "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
  "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
  "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
  ],
  "post-update-cmd": [
+ "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
  "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
  "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
  "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
@@ -59,12 +55,15 @@
  "config": {
  "bin-dir": "bin"
  },
- "minimum-stability": "alpha",
+ "minimum-stability": "stable",
  "extra": {
  "symfony-app-dir": "app",
  "symfony-web-dir": "web",
+ "incenteev-parameters": {
+ "file": "app/config/parameters.yml"
+ },
  "branch-alias": {
- "dev-master": "0.1-dev"
+ "dev-master": "2.3-dev"
  }
  }
 }