Merge branch 'develop'

* develop:
  Fix tests
  Update README for v2.1.2
  Don't throw exception if no settings to restore
  Added the missing less file.

Author: Florian Eckerstorfer

README.md

@@ -104,6 +104,11 @@ This bundle has two main dependencies, Symfony and Bootstrap. The following tabl
 Changelog
 ---------
 
+### Version 2.1.2 (6 March 2015)
+
+- When restoring form settings, don't throw an exception if there are no settings to restore (by [florianeckerstorfer](https://github.com/florianeckerstorfer))
+- [#356](https://github.com/braincrafted/bootstrap-bundle/pull/356) Add missing `responsive-embed.less` (by [blaues0cke](https://github.com/blaues0cke))
+
 ### Version 2.1.1 (31 January 2015)
 
 - [#301](https://github.com/braincrafted/bootstrap-bundle/pull/301) Fix generate command for Symfony v2.5 (by [mumia](https://github.com/mumia))

Resources/views/Bootstrap/bootstrap.less.twig

@@ -48,6 +48,7 @@
 @import "{{ assets_dir }}less/panels.less";
 @import "{{ assets_dir }}less/wells.less";
 @import "{{ assets_dir }}less/close.less";
+@import "{{ assets_dir }}less/responsive-embed.less";
 
 // Components w/ JavaScript
 @import "{{ assets_dir }}less/modals.less";

Tests/Twig/BootstrapFormExtensionTest.php

@@ -125,11 +125,8 @@ public function testBackupFormSettingsRestoreFormSettings()
         $this->assertEquals(2, $this->extension->getLabelCol());
         $this->assertEquals(3, $this->extension->getSimpleCol());
 
-        try {
-            $this->extension->restoreFormSettings();
-            $this->fail('Expected UnderflowException not thrown');
-        } catch (\UnderflowException $e) {
-        }
+        // Nothing happens if we try to restore form settings but none exist
+        $this->extension->restoreFormSettings();
     }
 
     /**

Twig/BootstrapFormExtension.php

@@ -207,12 +207,11 @@ public function backupFormSettings()
      *
      * @internal Should only be used at the end of form_end.
      * @see backupFormSettings
-     * @throws \UnderflowException
      */
     public function restoreFormSettings()
     {
         if (count($this->settingsStack) < 1) {
-            throw new \UnderflowException("No settings on the stack to restore");
+            return;
         }
 
         $settings = array_pop($this->settingsStack);