Skip to content

Commit

Permalink
Release (#388)
Browse files Browse the repository at this point in the history
* prepare for 1.3.0 release

* syntax updates
  • Loading branch information
Nyholm authored Aug 7, 2016
1 parent 18dc419 commit 8c2fd74
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
1 change: 1 addition & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Translation/Dumper/XliffDumper.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@
],
"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"
},
"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"
},
Expand All @@ -36,7 +36,7 @@
"target-dir": "JMS/TranslationBundle",
"extra": {
"branch-alias": {
"dev-master": "1.3-dev"
"dev-master": "1.4-dev"
}
}
}

0 comments on commit 8c2fd74

Please sign in to comment.