@@ -176,6 +176,9 @@ |
||
176 | 176 | return $this; |
177 | 177 | } |
178 | 178 | |
179 | + /** |
|
180 | + * @param string $key |
|
181 | + */ |
|
179 | 182 | protected function & getSessionRef($key) |
180 | 183 | { |
181 | 184 | $session = null; |
@@ -3018,7 +3018,8 @@ discard block |
||
3018 | 3018 | * Not implemented |
3019 | 3019 | * |
3020 | 3020 | * @param string path |
3021 | - * @return mixed |
|
3021 | + * @param string $path |
|
3022 | + * @return string |
|
3022 | 3023 | * @author Dmitry (dio) Levashov |
3023 | 3024 | **/ |
3024 | 3025 | protected function crypt($path) { |
@@ -3030,7 +3031,8 @@ discard block |
||
3030 | 3031 | * Not implemented |
3031 | 3032 | * |
3032 | 3033 | * @param mixed hash |
3033 | - * @return mixed |
|
3034 | + * @param string $hash |
|
3035 | + * @return string |
|
3034 | 3036 | * @author Dmitry (dio) Levashov |
3035 | 3037 | **/ |
3036 | 3038 | protected function uncrypt($hash) { |
@@ -3134,7 +3136,7 @@ discard block |
||
3134 | 3136 | * @param string $from from character encoding |
3135 | 3137 | * @param string $to to character encoding |
3136 | 3138 | * @param string $locale local locale |
3137 | - * @param $restoreLocale |
|
3139 | + * @param boolean $restoreLocale |
|
3138 | 3140 | * @param string $unknown replaces character for unknown |
3139 | 3141 | * @return mixed |
3140 | 3142 | */ |
@@ -3390,7 +3392,7 @@ discard block |
||
3390 | 3392 | * |
3391 | 3393 | * @param string $dir parent dir path |
3392 | 3394 | * @param string $name new file name |
3393 | - * @param null $isDir |
|
3395 | + * @param boolean $isDir |
|
3394 | 3396 | * @return bool |
3395 | 3397 | * @author Dmitry (dio) Levashov |
3396 | 3398 | */ |
@@ -4026,7 +4028,7 @@ discard block |
||
4026 | 4028 | * @param string $src source path |
4027 | 4029 | * @param string $dst destination dir path |
4028 | 4030 | * @param string $name new file name (optionaly) |
4029 | - * @return string|false |
|
4031 | + * @return string |
|
4030 | 4032 | * @author Dmitry (dio) Levashov |
4031 | 4033 | **/ |
4032 | 4034 | protected function copy($src, $dst, $name) { |
@@ -4099,7 +4101,7 @@ discard block |
||
4099 | 4101 | * @param string $src source path |
4100 | 4102 | * @param string $dst destination dir path |
4101 | 4103 | * @param string $name new file name |
4102 | - * @return string|false |
|
4104 | + * @return string|boolean |
|
4103 | 4105 | * @author Dmitry (dio) Levashov |
4104 | 4106 | **/ |
4105 | 4107 | protected function move($src, $dst, $name) { |
@@ -4124,7 +4126,7 @@ discard block |
||
4124 | 4126 | * @param string $src source file hash |
4125 | 4127 | * @param string $destination destination dir path |
4126 | 4128 | * @param string $name file name |
4127 | - * @return string|false |
|
4129 | + * @return string |
|
4128 | 4130 | * @author Dmitry (dio) Levashov |
4129 | 4131 | **/ |
4130 | 4132 | protected function copyFrom($volume, $src, $destination, $name) { |
@@ -4742,8 +4744,8 @@ discard block |
||
4742 | 4744 | * @param string $path image file |
4743 | 4745 | * @param int $width square width |
4744 | 4746 | * @param int $height square height |
4745 | - * @param int|string $align reserved |
|
4746 | - * @param int|string $valign reserved |
|
4747 | + * @param string $align reserved |
|
4748 | + * @param string $valign reserved |
|
4747 | 4749 | * @param string $bgcolor square background color in #rrggbb format |
4748 | 4750 | * @param string $destformat image destination format |
4749 | 4751 | * @param int $jpgQuality JEPG quality (1-100) |
@@ -5005,7 +5007,7 @@ discard block |
||
5005 | 5007 | * |
5006 | 5008 | * @param string $command command line |
5007 | 5009 | * @param array $output stdout strings |
5008 | - * @param array|int $return_var process exit code |
|
5010 | + * @param integer $return_var process exit code |
|
5009 | 5011 | * @param array $error_output stderr strings |
5010 | 5012 | * @return int exit code |
5011 | 5013 | * @author Alexey Sukhotin |
@@ -5533,7 +5535,7 @@ discard block |
||
5533 | 5535 | * @param array $files files names list |
5534 | 5536 | * @param string $name archive name |
5535 | 5537 | * @param array $arc archiver options |
5536 | - * @return string|bool |
|
5538 | + * @return string|false |
|
5537 | 5539 | * @author Dmitry (dio) Levashov, |
5538 | 5540 | * @author Alexey Sukhotin |
5539 | 5541 | * @author Naoki Sawada |
@@ -771,7 +771,7 @@ discard block |
||
771 | 771 | * |
772 | 772 | * @param string $path parent dir path |
773 | 773 | * @param string $name new directory name |
774 | - * @return string|bool |
|
774 | + * @return string|false |
|
775 | 775 | * @author Dmitry (dio) Levashov |
776 | 776 | **/ |
777 | 777 | protected function _mkdir($path, $name) { |
@@ -791,7 +791,7 @@ discard block |
||
791 | 791 | * |
792 | 792 | * @param string $path parent dir path |
793 | 793 | * @param string $name new file name |
794 | - * @return string|bool |
|
794 | + * @return string|false |
|
795 | 795 | * @author Dmitry (dio) Levashov |
796 | 796 | **/ |
797 | 797 | protected function _mkfile($path, $name) { |
@@ -845,7 +845,7 @@ discard block |
||
845 | 845 | * @param string $source source file path |
846 | 846 | * @param $targetDir |
847 | 847 | * @param string $name file name |
848 | - * @return bool|string |
|
848 | + * @return string|false |
|
849 | 849 | * @internal param string $target target dir path |
850 | 850 | * @author Dmitry (dio) Levashov |
851 | 851 | */ |
@@ -1135,7 +1135,7 @@ discard block |
||
1135 | 1135 | * @param array $files files names list |
1136 | 1136 | * @param string $name archive name |
1137 | 1137 | * @param array $arc archiver options |
1138 | - * @return string|bool |
|
1138 | + * @return string|false |
|
1139 | 1139 | * @author Dmitry (dio) Levashov, |
1140 | 1140 | * @author Alexey Sukhotin |
1141 | 1141 | **/ |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | * |
65 | 65 | * 以下のものは非対応 |
66 | 66 | * BITMAPV4HEADER と BITMAPV5HEADER に含まれる色空間に関する様々な機能 |
67 | - * @param $filename_or_stream_or_binary |
|
67 | + * @param string $filename_or_stream_or_binary |
|
68 | 68 | * @return bool|resource |
69 | 69 | */ |
70 | 70 | |
@@ -96,6 +96,9 @@ discard block |
||
96 | 96 | return $bmp; |
97 | 97 | } |
98 | 98 | |
99 | + /** |
|
100 | + * @param string $str |
|
101 | + */ |
|
99 | 102 | public static function loadFromString($str){ |
100 | 103 | //data scheme より古いバージョンから対応しているようなので php://memory を使う |
101 | 104 | $fp = fopen("php://memory", "r+b"); |
@@ -119,6 +122,9 @@ discard block |
||
119 | 122 | return $bmp; |
120 | 123 | } |
121 | 124 | |
125 | + /** |
|
126 | + * @param resource $stream |
|
127 | + */ |
|
122 | 128 | public static function loadFromStream($stream){ |
123 | 129 | $buf = fread($stream, 14); //2+4+2+2+4 |
124 | 130 | if ($buf === false){ |
@@ -7,10 +7,9 @@ |
||
7 | 7 | */ |
8 | 8 | namespace PH7; |
9 | 9 | |
10 | -use |
|
11 | -PH7\Framework\Navigation\Page, |
|
12 | -PH7\Framework\Url\Header, |
|
13 | -PH7\Framework\Mvc\Router\Uri; |
|
10 | +use PH7\Framework\Navigation\Page; |
|
11 | +use PH7\Framework\Url\Header; |
|
12 | +use PH7\Framework\Mvc\Router\Uri; |
|
14 | 13 | |
15 | 14 | class SettingController extends Controller |
16 | 15 | { |
@@ -7,10 +7,9 @@ |
||
7 | 7 | */ |
8 | 8 | namespace PH7; |
9 | 9 | |
10 | -use |
|
11 | -PH7\Framework\Mvc\Router\Uri, |
|
12 | -PH7\Framework\Mvc\Model\DbConfig, |
|
13 | -PH7\Framework\Mvc\Model\Module as ModuleModel; |
|
10 | +use PH7\Framework\Mvc\Router\Uri; |
|
11 | +use PH7\Framework\Mvc\Model\DbConfig; |
|
12 | +use PH7\Framework\Mvc\Model\Module as ModuleModel; |
|
14 | 13 | |
15 | 14 | class DisableModuleForm |
16 | 15 | { |
@@ -67,6 +67,9 @@ discard block |
||
67 | 67 | \PFBC\Form::setSuccess('form_add_fake_profiles', nt('%n% user has successfully been added.', '%n% users have successfully been added.', $this->getUserNumber())); |
68 | 68 | } |
69 | 69 | |
70 | + /** |
|
71 | + * @return integer |
|
72 | + */ |
|
70 | 73 | protected function getUserNumber() |
71 | 74 | { |
72 | 75 | return $this->httpRequest->post('num'); |
@@ -98,7 +101,7 @@ discard block |
||
98 | 101 | * @param string $sApiParms Parameters to send to the API. |
99 | 102 | * @param string $sApiVersion Version of the API it will use. If fails from the API server, it will ignore it. |
100 | 103 | * |
101 | - * @return void |
|
104 | + * @return string |
|
102 | 105 | */ |
103 | 106 | private function getApiResults($sApiUrl, $sApiParms, $sApiVersion) |
104 | 107 | { |
@@ -12,11 +12,10 @@ |
||
12 | 12 | |
13 | 13 | defined('PH7') or exit('Restricted access'); |
14 | 14 | |
15 | -use |
|
16 | -PH7\Framework\Url\Url, |
|
17 | -PH7\Framework\Geo\Misc\Country, |
|
18 | -PH7\Framework\Security\Validate\Validate, |
|
19 | -PH7\Framework\Ip\Ip; |
|
15 | +use PH7\Framework\Url\Url; |
|
16 | +use PH7\Framework\Geo\Misc\Country; |
|
17 | +use PH7\Framework\Security\Validate\Validate; |
|
18 | +use PH7\Framework\Ip\Ip; |
|
20 | 19 | |
21 | 20 | /** Reset the time limit and increase the memory **/ |
22 | 21 | @set_time_limit(0); |
@@ -7,7 +7,8 @@ |
||
7 | 7 | */ |
8 | 8 | namespace PH7; |
9 | 9 | |
10 | -use PH7\Framework\Url\Header, PH7\Framework\Mvc\Router\Uri; |
|
10 | +use PH7\Framework\Url\Header; |
|
11 | +use PH7\Framework\Mvc\Router\Uri; |
|
11 | 12 | |
12 | 13 | class AccountController extends Controller |
13 | 14 | { |
@@ -9,10 +9,9 @@ |
||
9 | 9 | */ |
10 | 10 | namespace PH7; |
11 | 11 | |
12 | -use |
|
13 | -PH7\Framework\Navigation\Page, |
|
14 | -PH7\Framework\Url\Header, |
|
15 | -PH7\Framework\Mvc\Router\Uri; |
|
12 | +use PH7\Framework\Navigation\Page; |
|
13 | +use PH7\Framework\Url\Header; |
|
14 | +use PH7\Framework\Mvc\Router\Uri; |
|
16 | 15 | |
17 | 16 | class AdminController extends Controller |
18 | 17 | { |