@@ -12,7 +12,8 @@ |
||
| 12 | 12 | namespace PH7\Framework\Geo\Ip; |
| 13 | 13 | defined('PH7') or exit('Restricted access'); |
| 14 | 14 | |
| 15 | -use GeoIp2\Database\Reader, PH7\Framework\Ip\Ip; |
|
| 15 | +use GeoIp2\Database\Reader; |
|
| 16 | +use PH7\Framework\Ip\Ip; |
|
| 16 | 17 | |
| 17 | 18 | class Geo |
| 18 | 19 | { |
@@ -198,6 +198,9 @@ |
||
| 198 | 198 | $this->form = $form; |
| 199 | 199 | } |
| 200 | 200 | |
| 201 | + /** |
|
| 202 | + * @param string $id |
|
| 203 | + */ |
|
| 201 | 204 | public function setID($id) |
| 202 | 205 | { |
| 203 | 206 | $this->attributes['id'] = $id; |
@@ -114,7 +114,7 @@ |
||
| 114 | 114 | * Get Time text. |
| 115 | 115 | * |
| 116 | 116 | * @param integer $iWaitTime |
| 117 | - * @return integer |
|
| 117 | + * @return string |
|
| 118 | 118 | */ |
| 119 | 119 | private static function _getTimeText($iWaitTime) |
| 120 | 120 | { |
@@ -357,7 +357,7 @@ |
||
| 357 | 357 | /** |
| 358 | 358 | * Set CSS/JS variables. |
| 359 | 359 | * |
| 360 | - * @param array $aVars Variable names containing the values. |
|
| 360 | + * @param array $aVals Variable names containing the values. |
|
| 361 | 361 | * @return void |
| 362 | 362 | */ |
| 363 | 363 | private function _setVariables(array $aVals) |
@@ -13,13 +13,12 @@ |
||
| 13 | 13 | namespace PH7\Framework\Layout\Gzip; |
| 14 | 14 | defined('PH7') or exit('Restricted access'); |
| 15 | 15 | |
| 16 | -use |
|
| 17 | -PH7\Framework\File\File, |
|
| 18 | -PH7\Framework\Config\Config, |
|
| 19 | -PH7\Framework\Layout\Optimization, |
|
| 20 | -PH7\Framework\Navigation\Browser, |
|
| 21 | -PH7\Framework\Http\Http, |
|
| 22 | -PH7\Framework\Mvc\Request\Http as HttpRequest; |
|
| 16 | +use PH7\Framework\File\File; |
|
| 17 | +use PH7\Framework\Config\Config; |
|
| 18 | +use PH7\Framework\Layout\Optimization; |
|
| 19 | +use PH7\Framework\Navigation\Browser; |
|
| 20 | +use PH7\Framework\Http\Http; |
|
| 21 | +use PH7\Framework\Mvc\Request\Http as HttpRequest; |
|
| 23 | 22 | |
| 24 | 23 | class Gzip |
| 25 | 24 | { |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | * |
| 377 | 377 | * @param string $sTplFile Default NULL |
| 378 | 378 | * @param string $sDirPath Default NULL |
| 379 | - * @param string $_bInclude Default 1 (TRUE) |
|
| 379 | + * @param integer $_bInclude Default 1 (TRUE) |
|
| 380 | 380 | * @return string |
| 381 | 381 | * @throws \PH7\Framework\Layout\Tpl\Engine\PH7Tpl\Exception If the template file does no exist. |
| 382 | 382 | */ |
@@ -562,7 +562,7 @@ discard block |
||
| 562 | 562 | * |
| 563 | 563 | * @see __get() |
| 564 | 564 | * |
| 565 | - * @param $sVarName string Name of a variable that is to be retrieved. |
|
| 565 | + * @param string $sVarName string Name of a variable that is to be retrieved. |
|
| 566 | 566 | * @return mixed Value of that variable. |
| 567 | 567 | */ |
| 568 | 568 | public function getVar($sVarName) |
@@ -585,7 +585,7 @@ discard block |
||
| 585 | 585 | * |
| 586 | 586 | * If the folder compile does not exist, it creates a folder. |
| 587 | 587 | * @access private |
| 588 | - * @return object this |
|
| 588 | + * @return PH7Tpl this |
|
| 589 | 589 | */ |
| 590 | 590 | private function checkCompileDir() |
| 591 | 591 | { |
@@ -598,7 +598,7 @@ discard block |
||
| 598 | 598 | * |
| 599 | 599 | * If the folder cache does not exist, it creates a folder. |
| 600 | 600 | * @access private |
| 601 | - * @return object this |
|
| 601 | + * @return PH7Tpl this |
|
| 602 | 602 | */ |
| 603 | 603 | private function checkCacheDir() |
| 604 | 604 | { |
@@ -784,7 +784,7 @@ discard block |
||
| 784 | 784 | /** |
| 785 | 785 | * Get the reserved variables. |
| 786 | 786 | * |
| 787 | - * @return array |
|
| 787 | + * @return string[] |
|
| 788 | 788 | */ |
| 789 | 789 | public function getReservedWords() |
| 790 | 790 | { |
@@ -847,7 +847,7 @@ discard block |
||
| 847 | 847 | * Checks if the template file in the $this->sTemplateDirFile attribute is the main page (layout.tpl). |
| 848 | 848 | * |
| 849 | 849 | * @access private |
| 850 | - * @return boolean |
|
| 850 | + * @return integer |
|
| 851 | 851 | */ |
| 852 | 852 | private function isMainPage() |
| 853 | 853 | { |
@@ -858,7 +858,7 @@ discard block |
||
| 858 | 858 | * Checks if the compile file in the $this->sCompileDirFile attribute is the main page (layout.cpl.php). |
| 859 | 859 | * |
| 860 | 860 | * @access private |
| 861 | - * @return boolean |
|
| 861 | + * @return integer |
|
| 862 | 862 | */ |
| 863 | 863 | final private function isMainCompilePage() |
| 864 | 864 | { |
@@ -869,7 +869,7 @@ discard block |
||
| 869 | 869 | * Checks if the compile file in the $this->sCompileDirFile attribute is the XML (with XSL layout) Sitemap page (mainlayout.xsl.cpl.php). |
| 870 | 870 | * |
| 871 | 871 | * @access private |
| 872 | - * @return boolean |
|
| 872 | + * @return integer |
|
| 873 | 873 | */ |
| 874 | 874 | final private function isXmlSitemapCompilePage() |
| 875 | 875 | { |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | * @see get() |
| 36 | 36 | * |
| 37 | 37 | * @param boolean $bPrint Default FALSE |
| 38 | - * @return void |
|
| 38 | + * @return null|string |
|
| 39 | 39 | */ |
| 40 | 40 | public function display($bPrint = false) |
| 41 | 41 | { |
@@ -56,7 +56,7 @@ |
||
| 56 | 56 | * @param integer $iWidth |
| 57 | 57 | * @param integer $iHeight |
| 58 | 58 | * @param boolean $bOnlyActive Default TRUE |
| 59 | - * @return object Query |
|
| 59 | + * @return false|null Query |
|
| 60 | 60 | */ |
| 61 | 61 | public function ad($iWidth, $iHeight, $bOnlyActive = true) |
| 62 | 62 | { |
@@ -13,11 +13,10 @@ |
||
| 13 | 13 | namespace PH7\Framework\Mvc\Model; |
| 14 | 14 | defined('PH7') or exit('Restricted access'); |
| 15 | 15 | |
| 16 | -use |
|
| 17 | -PH7\Framework\Mvc\Model\Engine\Db, |
|
| 18 | -PH7\Framework\Registry\Registry, |
|
| 19 | -PH7\Framework\Cache\Cache, |
|
| 20 | -PH7\Framework\Parse\SysVar; |
|
| 16 | +use PH7\Framework\Mvc\Model\Engine\Db; |
|
| 17 | +use PH7\Framework\Registry\Registry; |
|
| 18 | +use PH7\Framework\Cache\Cache; |
|
| 19 | +use PH7\Framework\Parse\SysVar; |
|
| 21 | 20 | |
| 22 | 21 | class Design extends \PH7\Framework\Layout\Html\Design |
| 23 | 22 | { |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | * |
| 49 | 49 | * @param string $sKey the array key |
| 50 | 50 | * @param string $sValue The value |
| 51 | - * @return object this |
|
| 51 | + * @return Record this |
|
| 52 | 52 | */ |
| 53 | 53 | public function addValue($sKey, $sValue) |
| 54 | 54 | { |
@@ -394,7 +394,7 @@ discard block |
||
| 394 | 394 | * |
| 395 | 395 | * @param string $sTable |
| 396 | 396 | * @param array $aValues |
| 397 | - * @return object this |
|
| 397 | + * @return Record this |
|
| 398 | 398 | */ |
| 399 | 399 | public function updates($sTable, array $aValues) |
| 400 | 400 | { |
@@ -418,7 +418,7 @@ discard block |
||
| 418 | 418 | * |
| 419 | 419 | * @param string $sTable |
| 420 | 420 | * @param string $sWhat Default: '*' |
| 421 | - * @return object this |
|
| 421 | + * @return Record this |
|
| 422 | 422 | * |
| 423 | 423 | */ |
| 424 | 424 | public function select($sTable, $sWhat = '*') |
@@ -434,7 +434,7 @@ discard block |
||
| 434 | 434 | * |
| 435 | 435 | * @param string $sField |
| 436 | 436 | * @param string $sValue |
| 437 | - * @return object this |
|
| 437 | + * @return Record this |
|
| 438 | 438 | * |
| 439 | 439 | */ |
| 440 | 440 | public function find($sField, $sValue) |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | * |
| 451 | 451 | * @param string $sField |
| 452 | 452 | * @param string $sValue |
| 453 | - * @return object this |
|
| 453 | + * @return Record this |
|
| 454 | 454 | * |
| 455 | 455 | */ |
| 456 | 456 | public function andFind($sField, $sValue) |
@@ -466,7 +466,7 @@ discard block |
||
| 466 | 466 | * |
| 467 | 467 | * @param string $sField |
| 468 | 468 | * @param string $sValue |
| 469 | - * @return object this |
|
| 469 | + * @return Record this |
|
| 470 | 470 | * |
| 471 | 471 | */ |
| 472 | 472 | public function orFind($sField, $sValue) |
@@ -482,7 +482,7 @@ discard block |
||
| 482 | 482 | * |
| 483 | 483 | * @param string $sField |
| 484 | 484 | * @param string $sValue |
| 485 | - * @return object this |
|
| 485 | + * @return Record this |
|
| 486 | 486 | */ |
| 487 | 487 | public function havingFind($sField, $sValue) |
| 488 | 488 | { |
@@ -496,7 +496,7 @@ discard block |
||
| 496 | 496 | * @param string $sField |
| 497 | 497 | * @param string $sValue |
| 498 | 498 | * @param string $sOperator Default: '=' |
| 499 | - * @return object this |
|
| 499 | + * @return Record this |
|
| 500 | 500 | * |
| 501 | 501 | */ |
| 502 | 502 | public function where($sField, $sValue, $sOperator = '=') |
@@ -511,7 +511,7 @@ discard block |
||
| 511 | 511 | * @param string $sField |
| 512 | 512 | * @param string $sValue |
| 513 | 513 | * @param string $sOperator Default: '=' |
| 514 | - * @return object this |
|
| 514 | + * @return Record this |
|
| 515 | 515 | */ |
| 516 | 516 | public function andClause($sField, $sValue, $sOperator = '=') |
| 517 | 517 | { |
@@ -525,7 +525,7 @@ discard block |
||
| 525 | 525 | * @param string $sField |
| 526 | 526 | * @param string $sValue |
| 527 | 527 | * @param string $sOperator Default: '=' |
| 528 | - * @return object this |
|
| 528 | + * @return Record this |
|
| 529 | 529 | */ |
| 530 | 530 | public function orClause($sField, $sValue, $sOperator = '=') |
| 531 | 531 | { |
@@ -538,7 +538,7 @@ discard block |
||
| 538 | 538 | * |
| 539 | 539 | * @param integer $iOffset |
| 540 | 540 | * @param integer $iLimit |
| 541 | - * @return object this |
|
| 541 | + * @return Record this |
|
| 542 | 542 | */ |
| 543 | 543 | public function limit($iOffset, $iLimit) |
| 544 | 544 | { |
@@ -551,7 +551,7 @@ discard block |
||
| 551 | 551 | * |
| 552 | 552 | * @param string $sField |
| 553 | 553 | * @param string $sOrder Default: 'ASC' |
| 554 | - * @return object this |
|
| 554 | + * @return Record this |
|
| 555 | 555 | */ |
| 556 | 556 | public function orderBy($sField, $sOrder = Db::ASC) |
| 557 | 557 | { |
@@ -563,7 +563,7 @@ discard block |
||
| 563 | 563 | * Add a GROUP BY clause. |
| 564 | 564 | * |
| 565 | 565 | * @param string $sGroup |
| 566 | - * @return object this |
|
| 566 | + * @return Record this |
|
| 567 | 567 | */ |
| 568 | 568 | public function groupBy($sGroup) |
| 569 | 569 | { |
@@ -577,7 +577,7 @@ discard block |
||
| 577 | 577 | * @param string $sField |
| 578 | 578 | * @param string $sValue |
| 579 | 579 | * @param string $sOperator Default: '=' |
| 580 | - * @return object this |
|
| 580 | + * @return Record this |
|
| 581 | 581 | */ |
| 582 | 582 | public function having($sField, $sValue, $sOperator = '=') |
| 583 | 583 | { |
@@ -590,7 +590,7 @@ discard block |
||
| 590 | 590 | * |
| 591 | 591 | * @param string $sClsName Clause operator. |
| 592 | 592 | * @param string $sVal Value. |
| 593 | - * @return object this |
|
| 593 | + * @return Record this |
|
| 594 | 594 | */ |
| 595 | 595 | protected function clause($sClsName, $sVal) |
| 596 | 596 | { |
@@ -605,7 +605,7 @@ discard block |
||
| 605 | 605 | * @param string $sField Field |
| 606 | 606 | * @param string $sVal Value. |
| 607 | 607 | * @param string $sOpt Operator. |
| 608 | - * @return object this |
|
| 608 | + * @return Record this |
|
| 609 | 609 | */ |
| 610 | 610 | protected function optClause($sClsName, $sField, $sVal, $sOpt) |
| 611 | 611 | { |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | * Convert mod to table. |
| 48 | 48 | * |
| 49 | 49 | * @param string $Mod |
| 50 | - * @return mixed (string | void) Returns the table if it is correct. |
|
| 50 | + * @return string (string | void) Returns the table if it is correct. |
|
| 51 | 51 | * @throws \PH7\Framework\Mvc\Model\Engine\Util\Various::launchErr() If the table is not valid. |
| 52 | 52 | */ |
| 53 | 53 | public static function convertModToTable($Mod) |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | * @see \PH7\Framework\Mvc\Model\Engine\Util\Various::launchErr() |
| 120 | 120 | * |
| 121 | 121 | * @param string $sTable |
| 122 | - * @return mixed (string | void) Returns the table if it is correct. |
|
| 122 | + * @return string (string | void) Returns the table if it is correct. |
|
| 123 | 123 | * @throws \PH7\Framework\Mvc\Model\Engine\Util\Various::launchErr() If the table is not valid. |
| 124 | 124 | */ |
| 125 | 125 | public static function convertTableToId($sTable) |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | * @see \PH7\Framework\Mvc\Model\Engine\Util\Various::launchErr() |
| 181 | 181 | * |
| 182 | 182 | * @param string $sTable |
| 183 | - * @return mixed (string | void) Returns the table if it is correct. |
|
| 183 | + * @return string|null (string | void) Returns the table if it is correct. |
|
| 184 | 184 | * @throws \PH7\Framework\Mvc\Model\Engine\Util\Various::launchErr() If the table is not valid. |
| 185 | 185 | */ |
| 186 | 186 | public static function checkTable($sTable) |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | * @see \PH7\Framework\Mvc\Model\Engine\Util\Various::launchErr() |
| 213 | 213 | * |
| 214 | 214 | * @param string $sTable |
| 215 | - * @return mixed (string | void) Returns the table if it is correct. |
|
| 215 | + * @return string|null (string | void) Returns the table if it is correct. |
|
| 216 | 216 | * @throws \PH7\Framework\Mvc\Model\Engine\Util\Various::launchErr() If the table is not valid. |
| 217 | 217 | */ |
| 218 | 218 | public static function checkModelTable($sTable) |
@@ -12,7 +12,8 @@ |
||
| 12 | 12 | namespace PH7\Framework\Mvc\Model\Engine\Util; |
| 13 | 13 | defined('PH7') or exit('Restricted access'); |
| 14 | 14 | |
| 15 | -use PH7\Framework\Mvc\Model\Engine\Db, PH7\Framework\Pattern\Statik; |
|
| 15 | +use PH7\Framework\Mvc\Model\Engine\Db; |
|
| 16 | +use PH7\Framework\Pattern\Statik; |
|
| 16 | 17 | |
| 17 | 18 | class Various |
| 18 | 19 | { |