From 8c2fd74b82f24a6f889e3bbf82d18aa4171e8168 Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Sun, 7 Aug 2016 10:06:55 +0200
Subject: [PATCH] Release (#388)

* prepare for 1.3.0 release

* syntax updates
---
 Changelog.md                       |  1 +
 Translation/Dumper/XliffDumper.php |  2 +-
 composer.json                      | 16 ++++++++--------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 059b401b..8558b8c1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -12,6 +12,7 @@
 * The `DefaultPhpFileExtractor` could be extended an modified which function we should extraction messages from.
 * Make sure Message ID is always a string to avoid issues with numerial IDs. 
 * Make source files clickable in WebUI
+* Message sources in Xliff files will be sorted in alphabetical order 
 
 ### 1.2.2 to 1.2.3
 
diff --git a/Translation/Dumper/XliffDumper.php b/Translation/Dumper/XliffDumper.php
index 3b8bf0ac..36d0f718 100644
--- a/Translation/Dumper/XliffDumper.php
+++ b/Translation/Dumper/XliffDumper.php
@@ -213,7 +213,7 @@ public function dump(MessageCatalogue $catalogue, $domain = 'messages')
      * @param array $sources
      * @return FileSource
      */
-    protected function getSortedSources($sources)
+    protected function getSortedSources(array $sources)
     {
         $indexedSources = array();
         foreach ($sources as $source) {
diff --git a/composer.json b/composer.json
index 059c1f11..114bc7ea 100644
--- a/composer.json
+++ b/composer.json
@@ -13,10 +13,10 @@
     ],
     "minimum-stability": "stable",
     "require": {
-        "php": "^5.3.3|^7.0",
-        "symfony/framework-bundle": "^2.3|^3.0",
-        "nikic/php-parser": "^1.4|^2.0",
-        "symfony/console": "^2.3|^3.0"
+        "php": "^5.3.3 || ^7.0",
+        "symfony/framework-bundle": "^2.3 || ^3.0",
+        "nikic/php-parser": "^1.4 || ^2.0",
+        "symfony/console": "^2.3 || ^3.0"
     },
     "conflict": {
         "twig/twig": "<1.12"
@@ -24,9 +24,9 @@
     "require-dev": {
         "psr/log": "^1.0",
         "twig/twig": "^1.12",
-        "symfony/symfony": "^2.3|^3.0",
-        "symfony/expression-language": "~2.6|~3.0",
-        "sensio/framework-extra-bundle": "^2.3|^3.0",
+        "symfony/symfony": "^2.3 || ^3.0",
+        "symfony/expression-language": "^2.6 || ^3.0",
+        "sensio/framework-extra-bundle": "^2.3 || ^3.0",
         "jms/di-extra-bundle": "^1.1",
         "matthiasnoback/symfony-dependency-injection-test": "^0.7.6"
     },
@@ -36,7 +36,7 @@
     "target-dir": "JMS/TranslationBundle",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.3-dev"
+            "dev-master": "1.4-dev"
         }
     }
 }