Sf(*):Upgrade Sf2.6

- Upgrade 2.4 -> 2.5 et 2.5 -> 2.6
in6pio · Feb 14, 2015 · a84020d · a84020d
1 parent b8c528f
commit a84020d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -64,6 +64,7 @@ public function registerBundles()
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
             $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
             $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
+            $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
         }
 
         return $bundles;

diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php
@@ -578,8 +578,8 @@ function_exists('simplexml_import_dom'),
 
         $this->addRecommendation(
             class_exists('DomDocument'),
-            'PHP-XML module should be installed',
-            'Install and enable the <strong>PHP-XML</strong> module.'
+            'PHP-DOM and PHP-XML modules should be installed',
+            'Install and enable the <strong>PHP-DOM</strong> and the <strong>PHP-XML</strong> modules.'
         );
 
         $this->addRecommendation(

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -11,7 +11,9 @@ framework:
         strict_requirements: ~
     form:            ~
     csrf_protection: true
-    validation:      { enable_annotations: true }
+    validation:
+        enable_annotations: true
+        strict_email: true
     templating:
         engines: ['twig']
         #assets_version: SomeVersionScheme

diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
     },
     "require": {
         "php": ">=5.3.3",
-        "symfony/symfony": "~2.4",
+        "symfony/symfony": "2.6.*",
         "doctrine/orm": ">=2.2.3,<2.4-dev",
         "doctrine/doctrine-bundle": "~1.2",
         "doctrine/doctrine-fixtures-bundle": "dev-master",
@@ -27,7 +27,8 @@
         "genemu/form-bundle": "v2.2.1",
         "gedmo/doctrine-extensions": "dev-master",        
         "jms/security-extra-bundle": "dev-master",
-        "stof/doctrine-extensions-bundle": "dev-master"               
+        "stof/doctrine-extensions-bundle": "dev-master",
+        "egulias/email-validator": "~1.2"         
     },
     "scripts": {
         "post-install-cmd": [

diff --git a/src/mgate/SuiviBundle/Form/Type/AuditType.php b/src/mgate/SuiviBundle/Form/Type/AuditType.php
@@ -52,7 +52,7 @@ public function getName()
     public function buildForm(FormBuilder $builder, array $options)
     {
         $builder->add('gender_code', new GenderType(), array(
-            'empty_value' => 'Type d\'audit',
+            'placeholder' => 'Type d\'audit',
         ));
     }
 }