Merge pull request #7 from codebendercc/parameters-revision

Parameters cleanup

Author: spiliot

Symfony/app/config/config.yml

@@ -38,29 +38,3 @@ assetic:
         #    jar: "%kernel.root_dir%/Resources/java/compiler.jar"
         #yui_css:
         #    jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
-
-# Doctrine Configuration
-doctrine:
-    dbal:
-        driver:   "%database_driver%"
-        host:     "%database_host%"
-        port:     "%database_port%"
-        dbname:   "%database_name%"
-        user:     "%database_user%"
-        password: "%database_password%"
-        charset:  UTF8
-        # if using pdo_sqlite as your database driver, add the path in parameters.yml
-        # e.g. database_path: "%kernel.root_dir%/data/data.db3"
-        # path:     "%database_path%"
-
-    orm:
-        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 }

Symfony/app/config/parameters.yml.dist

@@ -1,19 +1,7 @@
 parameters:
-    database_driver:   pdo_mysql
-    database_host:     ~
-    database_port:     ~
-    database_name:     ~
-    database_user:     ~
-    database_password: ~
-
-    mailer_transport:  smtp
-    mailer_host:       ~
-    mailer_user:       ~
-    mailer_password:   ~
-
     locale:            en
     secret:            ThisTokenIsNotSoSecretChangeIt
     compiler: 'http://compilerurl.com/'
-    library: 'http://libraryappurl.com/'
+    library_manager: 'http://libraryappurl.com/'
     authorizationKey: authenticationekey
     version: version

Symfony/src/Codebender/BuilderBundle/Controller/DefaultController.php

@@ -127,7 +127,7 @@ protected function getLibraryInfo($data)
     {
         $handler = $this->get('codebender_builder.handler');
 
-        $libraryManager = $this->container->getParameter('library');
+        $libraryManager = $this->container->getParameter('library_manager');
 
         return $handler->postRawData($libraryManager, $data);
     }

Symfony/src/Codebender/BuilderBundle/Tests/Controller/DefaultControllerUnitTest.php

@@ -237,7 +237,7 @@ public function testGetLibraryInfo() {
 
         $controller->expects($this->once())->method('get')->with('codebender_builder.handler')->will($this->returnValue($apiHandler));
 
-        $container->expects($this->once())->method('getParameter')->with('library')->will($this->returnValue('http://library/manager'));
+        $container->expects($this->once())->method('getParameter')->with('library_manager')->will($this->returnValue('http://library/manager'));
 
         $apiHandler->expects($this->once())->method('postRawData')->with('http://library/manager', 'library data')->will($this->returnValue('Whatever'));
 

scripts/install.sh

@@ -93,8 +93,8 @@ set +x
 cat app/config/parameters.yml | grep -v "compiler:" | tee app/config/parameters.yml > /dev/null
 echo "    compiler: '$COMPILER_URL'" >> app/config/parameters.yml
 
-cat app/config/parameters.yml | grep -v "library:" | tee app/config/parameters.yml > /dev/null
-echo "    library: '$LIBRARY_URL'" >> app/config/parameters.yml
+cat app/config/parameters.yml | grep -v "library_manager:" | tee app/config/parameters.yml > /dev/null
+echo "    library_manager: '$LIBRARY_URL'" >> app/config/parameters.yml
 set -x