Skip to content

Commit 9c4f1af

Browse files
committed
code style
1 parent c614a07 commit 9c4f1af

2 files changed

Lines changed: 10 additions & 11 deletions

File tree

src/Merge.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace Gettext;
44

55
/**
6-
* Static class with merge contants
6+
* Static class with merge contants.
77
*/
88
class Merge
99
{
@@ -33,7 +33,7 @@ class Merge
3333
const DEFAULTS = 5; //1 + 4
3434

3535
/**
36-
* Merge the flags of two translations
36+
* Merge the flags of two translations.
3737
*
3838
* @param Translation $from
3939
* @param Translation $to
@@ -53,7 +53,7 @@ public static function mergeFlags(Translation $from, Translation $to, $options =
5353
}
5454

5555
/**
56-
* Merge the extracted comments of two translations
56+
* Merge the extracted comments of two translations.
5757
*
5858
* @param Translation $from
5959
* @param Translation $to
@@ -73,7 +73,7 @@ public static function mergeExtractedComments(Translation $from, Translation $to
7373
}
7474

7575
/**
76-
* Merge the comments of two translations
76+
* Merge the comments of two translations.
7777
*
7878
* @param Translation $from
7979
* @param Translation $to
@@ -93,7 +93,7 @@ public static function mergeComments(Translation $from, Translation $to, $option
9393
}
9494

9595
/**
96-
* Merge the references of two translations
96+
* Merge the references of two translations.
9797
*
9898
* @param Translation $from
9999
* @param Translation $to
@@ -113,7 +113,7 @@ public static function mergeReferences(Translation $from, Translation $to, $opti
113113
}
114114

115115
/**
116-
* Merge the translations of two translations
116+
* Merge the translations of two translations.
117117
*
118118
* @param Translation $from
119119
* @param Translation $to
@@ -137,7 +137,7 @@ public static function mergeTranslation(Translation $from, Translation $to, $opt
137137
}
138138

139139
/**
140-
* Merge the translations of two translations
140+
* Merge the translations of two translations.
141141
*
142142
* @param Translations $from
143143
* @param Translations $to
@@ -167,7 +167,7 @@ public static function mergeTranslations(Translations $from, Translations $to, $
167167
}
168168

169169
/**
170-
* Merge the headers of two translations
170+
* Merge the headers of two translations.
171171
*
172172
* @param Translations $from
173173
* @param Translations $to

src/Translations.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
* @method addFromYamlDictionaryString(array $options = [])
5454
* @method toYamlDictionaryFile(string $filename, array $options = [])
5555
* @method toYamlDictionaryString(array $options = [])
56-
*
5756
*/
5857
class Translations extends \ArrayObject
5958
{
@@ -385,7 +384,7 @@ public function insert($context, $original, $plural = '')
385384
/**
386385
* Merges this translations with other translations.
387386
*
388-
* @param Translations $translations The translations instance to merge with
387+
* @param Translations $translations The translations instance to merge with
389388
* @param int $options
390389
*
391390
* @return self
@@ -396,5 +395,5 @@ public function mergeWith(Translations $translations, $options = Merge::DEFAULTS
396395
Merge::mergeTranslations($translations, $this, $options);
397396

398397
return $this;
399-
}
398+
}
400399
}

0 commit comments

Comments
 (0)