Completed
Pull Request — 3.6 (#8611)
by Loz
10:02
created
thirdparty/Zend/Translate/Adapter/Gettext.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@
 block discarded – undo
58 58
      * @param  string  $filename  MO file to add, full path must be given for access
59 59
      * @param  string  $locale    New Locale/Language to set, identical with locale identifier,
60 60
      *                            see Zend_Locale for more information
61
-     * @param  array   $option    OPTIONAL Options to use
61
+     * @param  array   $options    OPTIONAL Options to use
62 62
      * @throws Zend_Translation_Exception
63 63
      * @return array
64 64
      */
Please login to merge, or discard this patch.
thirdparty/Zend/Translate/Adapter/Qt.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
      * @param  string  $locale    Locale/Language to add data for, identical with locale identifier,
53 53
      *                            see Zend_Locale for more information
54 54
      * @param  string  $filename  QT file to add, full path must be given for access
55
-     * @param  array   $option    OPTIONAL Options to use
55
+     * @param  array   $options    OPTIONAL Options to use
56 56
      * @throws Zend_Translation_Exception
57 57
      * @return array
58 58
      */
@@ -137,6 +137,9 @@  discard block
 block discarded – undo
137 137
         }
138 138
     }
139 139
 
140
+    /**
141
+     * @param string $filename
142
+     */
140 143
     private function _findEncoding($filename)
141 144
     {
142 145
         $file = file_get_contents($filename, null, null, 0, 100);
Please login to merge, or discard this patch.
thirdparty/Zend/Translate/Adapter/Tbx.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
      * @param  string  $filename  TBX file to add, full path must be given for access
50 50
      * @param  string  $locale    Locale has no effect for TBX because TBX defines all languages within
51 51
      *                            the source file
52
-     * @param  array   $option    OPTIONAL Options to use
52
+     * @param  array   $options    OPTIONAL Options to use
53 53
      * @throws Zend_Translation_Exception
54 54
      * @return array
55 55
      */
@@ -142,6 +142,9 @@  discard block
 block discarded – undo
142 142
         }
143 143
     }
144 144
 
145
+    /**
146
+     * @param string $filename
147
+     */
145 148
     private function _findEncoding($filename)
146 149
     {
147 150
         $file = file_get_contents($filename, null, null, 0, 100);
Please login to merge, or discard this patch.
thirdparty/Zend/Translate/Adapter/Tmx.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
      * @param  string  $filename  TMX file to add, full path must be given for access
51 51
      * @param  string  $locale    Locale has no effect for TMX because TMX defines all languages within
52 52
      *                            the source file
53
-     * @param  array   $option    OPTIONAL Options to use
53
+     * @param  array   $options    OPTIONAL Options to use
54 54
      * @throws Zend_Translation_Exception
55 55
      * @return array
56 56
      */
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
     /**
208 208
      * Internal method, detects the encoding of the xml file
209 209
      *
210
-     * @param string $name Filename
210
+     * @param string $filename
211 211
      * @return string Encoding
212 212
      */
213 213
     protected function _findEncoding($filename)
Please login to merge, or discard this patch.
thirdparty/Zend/Translate/Adapter/Xliff.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
      * @param  string  $locale    Locale/Language to add data for, identical with locale identifier,
55 55
      *                            see Zend_Locale for more information
56 56
      * @param  string  $filename  XLIFF file to add, full path must be given for access
57
-     * @param  array   $option    OPTIONAL Options to use
57
+     * @param  array   $options    OPTIONAL Options to use
58 58
      * @throws Zend_Translation_Exception
59 59
      * @return array
60 60
      */
@@ -206,6 +206,9 @@  discard block
 block discarded – undo
206 206
         }
207 207
     }
208 208
 
209
+    /**
210
+     * @param string $filename
211
+     */
209 212
     private function _findEncoding($filename)
210 213
     {
211 214
         $file = file_get_contents($filename, null, null, 0, 100);
Please login to merge, or discard this patch.
thirdparty/Zend/Translate/Adapter/XmlTm.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
      * @param  string  $locale    Locale/Language to add data for, identical with locale identifier,
49 49
      *                            see Zend_Locale for more information
50 50
      * @param  string  $filename  XMLTM file to add, full path must be given for access
51
-     * @param  array   $option    OPTIONAL Options to use
51
+     * @param  array   $options    OPTIONAL Options to use
52 52
      * @throws Zend_Translation_Exception
53 53
      * @return array
54 54
      */
@@ -116,6 +116,9 @@  discard block
 block discarded – undo
116 116
         }
117 117
     }
118 118
 
119
+    /**
120
+     * @param string $filename
121
+     */
119 122
     private function _findEncoding($filename)
120 123
     {
121 124
         $file = file_get_contents($filename, null, null, 0, 100);
Please login to merge, or discard this patch.
thirdparty/zend_translate_railsyaml/library/Translate/Adapter/RailsYAML.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
     /**
18 18
      * Generates the adapter
19 19
      *
20
-     * @param  array|Zend_Config $options Translation content
20
+     * @param  string $options Translation content
21 21
      */
22 22
     public function __construct($options = array()) {
23 23
         $this->_options['keyDelimiter'] = ".";
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
      * @param  string|array  $data  Filename and full path to the translation source
32 32
      * @param  string        $locale    Locale/Language to add data for, identical with locale identifier,
33 33
      *                                  see Zend_Locale for more information
34
-     * @param  array         $option    OPTIONAL Options to use
34
+     * @param  array         $options    OPTIONAL Options to use
35 35
      */
36 36
     protected function _loadTranslationData($data, $locale, array $options = array())
37 37
     {   
Please login to merge, or discard this patch.
library/Translate/Adapter/thirdparty/sfYaml/lib/sfYamlInline.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -159,9 +159,9 @@
 block discarded – undo
159 159
   /**
160 160
    * Parses a scalar to a YAML string.
161 161
    *
162
-   * @param scalar  $scalar
162
+   * @param string  $scalar
163 163
    * @param string  $delimiters
164
-   * @param array   $stringDelimiter
164
+   * @param array   $stringDelimiters
165 165
    * @param integer $i
166 166
    * @param boolean $evaluate
167 167
    *
Please login to merge, or discard this patch.
view/ArrayData.php 1 patch
Doc Comments   +4 added lines, -10 removed lines patch added patch discarded remove patch
@@ -50,14 +50,7 @@  discard block
 block discarded – undo
50 50
 	/**
51 51
 	 * Gets a field from this object.
52 52
 	 *
53
-	 * @param string $field
54
-	 *
55
-	 * If the value is an object but not an instance of
56
-	 * ViewableData, it will be converted recursively to an
57
-	 * ArrayData.
58
-	 *
59
-	 * If the value is an associative array, it will likewise be
60
-	 * converted recursively to an ArrayData.
53
+	 * @param string $f
61 54
 	 */
62 55
 	public function getField($f) {
63 56
 		$value = $this->array[$f];
@@ -73,7 +66,7 @@  discard block
 block discarded – undo
73 66
 	* Add or set a field on this object.
74 67
 	*
75 68
 	* @param string $field
76
-	* @param mixed $value
69
+	* @param string $value
77 70
 	*/
78 71
 	public function setField($field, $value) {
79 72
 		$this->array[$field] = $value;
@@ -83,6 +76,7 @@  discard block
 block discarded – undo
83 76
 	 * Check array to see if field isset
84 77
 	 *
85 78
 	 * @param string Field Key
79
+	 * @param string $f
86 80
 	 * @return bool
87 81
 	 */
88 82
 	public function hasField($f) {
@@ -93,7 +87,7 @@  discard block
 block discarded – undo
93 87
 	 * Converts an associative array to a simple object
94 88
 	 *
95 89
 	 * @param array
96
-	 * @return obj $obj
90
+	 * @return stdClass $obj
97 91
 	 */
98 92
 	public static function array_to_object($arr = null) {
99 93
 		$obj = new stdClass();
Please login to merge, or discard this patch.