@@ -13,7 +13,6 @@ |
||
| 13 | 13 | use PDOException; |
| 14 | 14 | use Ibonly\PotatoORM\DatabaseQueryInterface; |
| 15 | 15 | use Ibonly\PotatoORM\ColumnNotExistExeption; |
| 16 | -use Ibonly\PotatoORM\InvalidConnectionException; |
|
| 17 | 16 | use Ibonly\PotatoORM\TableDoesNotExistException; |
| 18 | 17 | |
| 19 | 18 | class DatabaseQuery implements DatabaseQueryInterface |
@@ -83,6 +83,7 @@ discard block |
||
| 83 | 83 | /** |
| 84 | 84 | * getTableName() |
| 85 | 85 | * |
| 86 | + * @param string $connection |
|
| 86 | 87 | * @return string |
| 87 | 88 | */ |
| 88 | 89 | protected function getTableName($connection) |
@@ -123,7 +124,7 @@ discard block |
||
| 123 | 124 | * @param $tablename |
| 124 | 125 | * @param $con |
| 125 | 126 | * |
| 126 | - * @return bool |
|
| 127 | + * @return boolean|null |
|
| 127 | 128 | */ |
| 128 | 129 | public function checkTableExist($table, $con=NULL) |
| 129 | 130 | { |
@@ -138,7 +139,7 @@ discard block |
||
| 138 | 139 | /** |
| 139 | 140 | * checkTableName Return the table name |
| 140 | 141 | * |
| 141 | - * @param $tablename |
|
| 142 | + * @param string $tablename |
|
| 142 | 143 | * @param $con |
| 143 | 144 | * |
| 144 | 145 | * @return string |
@@ -159,7 +160,7 @@ discard block |
||
| 159 | 160 | * checkColumn Check if column exist in table |
| 160 | 161 | * |
| 161 | 162 | * @param $tableName |
| 162 | - * @param $columnName |
|
| 163 | + * @param string $columnName |
|
| 163 | 164 | * @param $con |
| 164 | 165 | * |
| 165 | 166 | * @return string |
@@ -268,6 +269,7 @@ discard block |
||
| 268 | 269 | /** |
| 269 | 270 | * selectAllQuery |
| 270 | 271 | * |
| 272 | + * @param string $tableName |
|
| 271 | 273 | * @return string |
| 272 | 274 | */ |
| 273 | 275 | public function selectAllQuery($tableName) |
@@ -327,6 +329,9 @@ discard block |
||
| 327 | 329 | /** |
| 328 | 330 | * selectQuery |
| 329 | 331 | * |
| 332 | + * @param string $tableName |
|
| 333 | + * @param string $fields |
|
| 334 | + * @param string $connection |
|
| 330 | 335 | * @return string |
| 331 | 336 | */ |
| 332 | 337 | public static function selectQuery($tableName, $fields, $data, $condition, $connection) |
@@ -360,6 +365,7 @@ discard block |
||
| 360 | 365 | /** |
| 361 | 366 | * insertQuery |
| 362 | 367 | * |
| 368 | + * @param string $tableName |
|
| 363 | 369 | * @return string |
| 364 | 370 | */ |
| 365 | 371 | public function insertQuery($tableName) |
@@ -373,6 +379,7 @@ discard block |
||
| 373 | 379 | /** |
| 374 | 380 | * updateQuery |
| 375 | 381 | * |
| 382 | + * @param string $tableName |
|
| 376 | 383 | * @return string |
| 377 | 384 | */ |
| 378 | 385 | public function updateQuery($tableName, $id) |
@@ -387,7 +394,8 @@ discard block |
||
| 387 | 394 | * query($query, $dbCOnnection) |
| 388 | 395 | * Raw sql query |
| 389 | 396 | * |
| 390 | - * @return object |
|
| 397 | + * @param string $query |
|
| 398 | + * @return GetData |
|
| 391 | 399 | */ |
| 392 | 400 | public function query($query, $con = NULL) |
| 393 | 401 | { |
@@ -9,17 +9,12 @@ |
||
| 9 | 9 | |
| 10 | 10 | namespace Ibonly\PotatoORM; |
| 11 | 11 | |
| 12 | -use PDO; |
|
| 13 | -use Exception; |
|
| 14 | -use PDOException; |
|
| 15 | 12 | use Ibonly\PotatoORM\GetData; |
| 16 | 13 | use Ibonly\PotatoORM\DatabaseQuery; |
| 17 | 14 | use Ibonly\PotatoORM\ModelInterface; |
| 18 | 15 | use Ibonly\PotatoORM\UserNotFoundException; |
| 19 | 16 | use Ibonly\PotatoORM\EmptyDatabaseException; |
| 20 | 17 | use Ibonly\PotatoORM\SaveUserExistException; |
| 21 | -use Ibonly\PotatoORM\ColumnNotExistExeption; |
|
| 22 | -use Ibonly\PotatoORM\InvalidConnectionException; |
|
| 23 | 18 | |
| 24 | 19 | class Model extends DatabaseQuery implements ModelInterface |
| 25 | 20 | { |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | * getALL() |
| 26 | 26 | * Get all record from the database |
| 27 | 27 | * |
| 28 | - * @return object |
|
| 28 | + * @return GetData |
|
| 29 | 29 | */ |
| 30 | 30 | public function getAll($dbConnection = NULL) |
| 31 | 31 | { |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | * where($data, $condition) |
| 45 | 45 | * Get data from database where $data = $condition |
| 46 | 46 | * |
| 47 | - * @return object |
|
| 47 | + * @return GetData |
|
| 48 | 48 | */ |
| 49 | 49 | public function where($data, $condition = NULL, $dbConnection = NULL) |
| 50 | 50 | { |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | * find($value) |
| 65 | 65 | * Find data from database where id = $value |
| 66 | 66 | * |
| 67 | - * @return array |
|
| 67 | + * @return Model |
|
| 68 | 68 | */ |
| 69 | 69 | public static function find($value, $dbConnection = NULL) |
| 70 | 70 | { |
@@ -41,6 +41,9 @@ |
||
| 41 | 41 | return $output; |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | + /** |
|
| 45 | + * @param string $con |
|
| 46 | + */ |
|
| 44 | 47 | public function whereClause($data = null, $condition = null, $con = null) |
| 45 | 48 | { |
| 46 | 49 | $joinClause = self::joinClause(); |
@@ -83,8 +83,8 @@ discard block |
||
| 83 | 83 | /** |
| 84 | 84 | *@method bool ValidateExtension() returns whether the extension of file to be uploaded |
| 85 | 85 | * is allowable or not. |
| 86 | - *@return true the extension is valid. |
|
| 87 | - *@return false the extension is invalid. |
|
| 86 | + *@return boolean the extension is valid. |
|
| 87 | + *@return boolean the extension is invalid. |
|
| 88 | 88 | */ |
| 89 | 89 | public function ValidateExtension() |
| 90 | 90 | { |
@@ -115,8 +115,8 @@ discard block |
||
| 115 | 115 | |
| 116 | 116 | /** |
| 117 | 117 | *@method bool ValidateSize() returns whether the file size is acceptable. |
| 118 | - *@return true the size is smaller than the alloted value. |
|
| 119 | - *@return false the size is larger than the alloted value. |
|
| 118 | + *@return boolean the size is smaller than the alloted value. |
|
| 119 | + *@return boolean the size is larger than the alloted value. |
|
| 120 | 120 | */ |
| 121 | 121 | public function ValidateSize() |
| 122 | 122 | { |
@@ -140,8 +140,8 @@ discard block |
||
| 140 | 140 | |
| 141 | 141 | /** |
| 142 | 142 | *@method bool ValidateExistance() determins whether the file already exists. If so, rename $FileName. |
| 143 | - *@return true can never be returned as all file names must be unique. |
|
| 144 | - *@return false the file name does not exist. |
|
| 143 | + *@return null|false can never be returned as all file names must be unique. |
|
| 144 | + *@return null|false the file name does not exist. |
|
| 145 | 145 | */ |
| 146 | 146 | public function ValidateExistance($uploadDirectory) |
| 147 | 147 | { |
@@ -161,8 +161,8 @@ discard block |
||
| 161 | 161 | |
| 162 | 162 | /** |
| 163 | 163 | *@method bool ValidateDirectory() |
| 164 | - *@return true the UploadDirectory exists, writable, and has a traling slash. |
|
| 165 | - *@return false the directory was never set, does not exist, or is not writable. |
|
| 164 | + *@return null|boolean the UploadDirectory exists, writable, and has a traling slash. |
|
| 165 | + *@return null|boolean the directory was never set, does not exist, or is not writable. |
|
| 166 | 166 | */ |
| 167 | 167 | public function ValidateDirectory($uploadDirectory) |
| 168 | 168 | { |
@@ -194,8 +194,8 @@ discard block |
||
| 194 | 194 | |
| 195 | 195 | /** |
| 196 | 196 | *@method bool ValidateImage() |
| 197 | - *@return true the image is smaller than the alloted dimensions. |
|
| 198 | - *@return false the width and/or height is larger then the alloted dimensions. |
|
| 197 | + *@return boolean the image is smaller than the alloted dimensions. |
|
| 198 | + *@return boolean the width and/or height is larger then the alloted dimensions. |
|
| 199 | 199 | */ |
| 200 | 200 | public function ValidateImage() { |
| 201 | 201 | $MaximumWidth = $this->MaximumWidth; |
@@ -311,6 +311,9 @@ discard block |
||
| 311 | 311 | return $this->UploadDirectory; |
| 312 | 312 | } |
| 313 | 313 | |
| 314 | + /** |
|
| 315 | + * @return string |
|
| 316 | + */ |
|
| 314 | 317 | public function GetTempName() |
| 315 | 318 | { |
| 316 | 319 | return $this->output['tmp_name']; |