sf4, fix errors with report bundle, adapt new config yaml directory

DependencyInjection/ChillReportExtension.php

@@ -25,11 +25,11 @@ class ChillReportExtension extends Extension implements PrependExtensionInterfac
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
-        $loader->load('services.yml');
+        $loader->load('services.yaml');
-        $loader->load('services/fixtures.yml');
+        $loader->load('services/fixtures.yaml');
-        $loader->load('services/export.yml');
+        $loader->load('services/export.yaml');
-        $loader->load('services/controller.yml');
+        $loader->load('services/controller.yaml');
     }
 
     /**
@@ -75,7 +75,7 @@ class ChillReportExtension extends Extension implements PrependExtensionInterfac
          $container->prependExtensionConfig('chill_main', array(
            'routing' => array(
               'resources' => array(
-                 '@ChillReportBundle/Resources/config/routing.yml'
+                 '@ChillReportBundle/config/routes.yaml'
               )
            )
         ));

DependencyInjection/Configuration.php

@@ -17,8 +17,8 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
+        $treeBuilder = new TreeBuilder('chill_report');
-        $rootNode = $treeBuilder->root('chill_report');
+        $rootNode = $treeBuilder->getRootNode('chill_report');
 
         // Here you should define the parameters that are allowed to
         // configure your bundle. See the documentation linked above for

Resources/translations/messages.fr.yml

@@ -14,7 +14,6 @@ Date: Date
 User: Utilisateur
 'Report type': 'Type de rapport'
 'View the report': "Voir le rapport"
-'Update the report': "Mettre à jour le rapport"
 Report data: Données du rapport
 'Report view : %name%': 'Rapport : %name%'
 Report: Rapport
@@ -38,7 +37,7 @@ No report registered for this person.: Aucun rapport pour cette personne.
 '%total% reports matching the search "%pattern%"': '{0} Aucun rapport ne correspond à la recherche "%pattern%" | {1} Un rapport correspond à la recherche "%pattern%" | ]1,Inf]%total% rapports correspondent à la recherche "%pattern%"'
 
 #timeline
-'%user% has filled a %report_label% report': %user% a ajouté un rapport '%report_label%'
+'%user% has filled a %report_label% report': "%user% a ajouté un rapport '%report_label%'"
 
 #roles
 CHILL_REPORT_UPDATE: Modifier les rapports

Resources/translations/messages.nl.yml

@@ -14,7 +14,6 @@ Date: Datum
 User: Gebruiker
 'Report type': 'Soort of verslag'
 'View the report': "Bekijk de consultatiegegevens"
-'Update the report': "Update van de consultatiegegevens"
 
 #Flash messages
 'Success : report created!': "De consultatiegegevens zijn correct ingevuld!"
@@ -29,4 +28,4 @@ User: Gebruiker
 'You are going to leave a page with unsubmitted data. Are you sure you want to leave ?': 'U bent aan te vertrekken een pagina die veranderdt datas behoudt. Bent u er zeker van dat u wil vertrekken ?'
 
 #timeline
-'%user% has filled a %report_label% report on %date%': %user% heeft een rapport '%report_label%' toegevoegd om %date%
+'%user% has filled a %report_label% report on %date%': "%user% heeft een rapport '%report_label%' toegevoegd om %date%"

config/services/fixtures.yaml

@@ -1,4 +1,4 @@
 services:
     Chill\ReportBundle\DataFixtures\ORM\:
-        resource: ../../../DataFixtures/ORM
+        resource: ../../DataFixtures/ORM
         tags: [ 'doctrine.fixture.orm' ]