Completed
Pull Request — master (#6244)
by Michael
15:14
created
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.
thirdparty/Zend/Cache/Backend/Apc.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -162,7 +162,7 @@
 block discarded – undo
162 162
      * @param  string $mode clean mode
163 163
      * @param  array  $tags array of tags
164 164
      * @throws Zend_Cache_Exception
165
-     * @return boolean true if no problem
165
+     * @return boolean|null true if no problem
166 166
      */
167 167
     public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
168 168
     {
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
@@ -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/Adapter/Tbx.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/Adapter/Xliff.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/Cache/Backend/File.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -732,6 +732,9 @@  discard block
 block discarded – undo
732 732
         return $result;
733 733
     }
734 734
 
735
+    /**
736
+     * @param string $mode
737
+     */
735 738
     protected function _get($dir, $mode, $tags = array())
736 739
     {
737 740
         if (!is_dir($dir)) {
@@ -819,6 +822,7 @@  discard block
 block discarded – undo
819 822
     /**
820 823
      * Compute & return the expire time
821 824
      *
825
+     * @param integer $lifetime
822 826
      * @return int expire time (unix timestamp)
823 827
      */
824 828
     protected function _expireTime($lifetime)
Please login to merge, or discard this patch.
tests/filesystem/AssetStoreTest.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -625,6 +625,9 @@  discard block
 block discarded – undo
625 625
 	}
626 626
 
627 627
 
628
+	/**
629
+	 * @param string $fileID
630
+	 */
628 631
 	public function getOriginalFilename($fileID) {
629 632
 		return parent::getOriginalFilename($fileID);
630 633
 	}
@@ -633,6 +636,9 @@  discard block
 block discarded – undo
633 636
 		return parent::removeVariant($fileID);
634 637
 	}
635 638
 
639
+	/**
640
+	 * @param null|string $variant
641
+	 */
636 642
 	public function getDefaultConflictResolution($variant) {
637 643
 		return parent::getDefaultConflictResolution($variant);
638 644
 	}
Please login to merge, or discard this patch.