Merge branch '1.2'

* 1.2: Change application's version to v1.2.6-DEV Generate changelog for v1.2.5 Change application's version to v1.2.5 Change application's version to v1.1.13-DEV Generate changelog for v1.1.12 Change application's version to v1.1.12 improve currency specs
Sylius · Aug 13, 2018 · 1c96c84 · 1c96c84
2 parents 9b5b5e3 + 1b47b85
commit 1c96c84
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 0 deletions.
diff --git a/CHANGELOG-1.1.md b/CHANGELOG-1.1.md
@@ -1,5 +1,17 @@
 # CHANGELOG FOR `1.1.X`
 
+## v1.1.12 (2018-08-13)
+
+#### TL;DR
+
+- Database migrations support MySQL 8 ([#9622](https://github.com/Sylius/Sylius/pull/9622))
+
+#### Details
+
+- [#9622](https://github.com/Sylius/Sylius/pull/9622) Quote row_number identifier for MySQL queries (@alcaeus)
+- [#9624](https://github.com/Sylius/Sylius/pull/9624) Fix missing "required" class on some form fields (@teohhanhui)
+- [#9634](https://github.com/Sylius/Sylius/pull/9634) [Core] Fix OrderItemNamesSetter specification (@Zales0123)
+
 ## v1.1.11 (2018-07-27)
 
 #### TL;DR

diff --git a/CHANGELOG-1.2.md b/CHANGELOG-1.2.md
@@ -1,5 +1,18 @@
 # CHANGELOG FOR `1.2.X`
 
+## v1.2.5 (2018-08-13)
+
+#### TL;DR
+
+- Database migrations support MySQL 8 ([#9622](https://github.com/Sylius/Sylius/pull/9622))
+
+#### Details
+
+- [#9622](https://github.com/Sylius/Sylius/pull/9622) Quote row_number identifier for MySQL queries (@alcaeus)
+- [#9624](https://github.com/Sylius/Sylius/pull/9624) Fix missing "required" class on some form fields (@teohhanhui)
+- [#9634](https://github.com/Sylius/Sylius/pull/9634) [Core] Fix OrderItemNamesSetter specification (@Zales0123)
+- [#9642](https://github.com/Sylius/Sylius/pull/9642) [Currency] Improve currency specs (@loic425)
+
 ## v1.2.4 (2018-07-27)
 
 #### TL;DR

diff --git a/src/Sylius/Component/Currency/spec/Model/CurrencySpec.php b/src/Sylius/Component/Currency/spec/Model/CurrencySpec.php
@@ -39,6 +39,18 @@ function its_code_is_mutable(): void
         $this->getCode()->shouldReturn('RSD');
     }
 
+    function it_does_not_return_name_when_it_has_no_code()
+    {
+        $this->setCode(null);
+        $this->getName()->shouldReturn(null);
+    }
+
+    function it_returns_name_of_currency_code(): void
+    {
+        $this->setCode('EUR');
+        $this->getName()->shouldReturn('Euro');
+    }
+
     function it_initializes_creation_date_by_default(): void
     {
         $this->getCreatedAt()->shouldHaveType(\DateTimeInterface::class);