@@ -1,7 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace Darya\ORM\Relation; |
| 3 | 3 | |
| 4 | -use Exception; |
|
| 5 | 4 | use Darya\ORM\Record; |
| 6 | 5 | use Darya\ORM\Relation; |
| 7 | 6 | |
@@ -115,7 +115,7 @@ |
||
| 115 | 115 | * |
| 116 | 116 | * Returns true if the model was successfully dissociated. |
| 117 | 117 | * |
| 118 | - * @return int |
|
| 118 | + * @return boolean |
|
| 119 | 119 | */ |
| 120 | 120 | public function dissociate() { |
| 121 | 121 | $associated = $this->retrieve(); |
@@ -113,7 +113,7 @@ |
||
| 113 | 113 | * @return string |
| 114 | 114 | */ |
| 115 | 115 | protected function delimitClass($class) { |
| 116 | - return preg_replace_callback('/([A-Z])/', function ($matches) { |
|
| 116 | + return preg_replace_callback('/([A-Z])/', function($matches) { |
|
| 117 | 117 | return '_' . strtolower($matches[1]); |
| 118 | 118 | }, lcfirst(basename($class))); |
| 119 | 119 | } |
@@ -472,7 +472,7 @@ |
||
| 472 | 472 | /** |
| 473 | 473 | * Retrieve all related model instances. |
| 474 | 474 | * |
| 475 | - * @return Record[]|null |
|
| 475 | + * @return Record[] |
|
| 476 | 476 | */ |
| 477 | 477 | public function all() { |
| 478 | 478 | if (!$this->loaded()) { |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | return $controller; |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | - return preg_replace_callback('/^(.)|-(.)/', function ($matches) {
|
|
| 99 | + return preg_replace_callback('/^(.)|-(.)/', function($matches) {
|
|
| 100 | 100 | return strtoupper($matches[1] ?: $matches[2]); |
| 101 | 101 | }, $controller) . 'Controller'; |
| 102 | 102 | } |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | * @return string Action method name |
| 112 | 112 | */ |
| 113 | 113 | public static function prepareAction($action) {
|
| 114 | - return preg_replace_callback('/-(.)/', function ($matches) {
|
|
| 114 | + return preg_replace_callback('/-(.)/', function($matches) {
|
|
| 115 | 115 | return strtoupper($matches[1]); |
| 116 | 116 | }, $action); |
| 117 | 117 | } |
@@ -712,7 +712,7 @@ discard block |
||
| 712 | 712 | * @return string |
| 713 | 713 | */ |
| 714 | 714 | public function generate($path, array $parameters = array()) {
|
| 715 | - return preg_replace_callback('#/(:[A-Za-z0-9_-]+(\??))#', function ($match) use ($parameters) {
|
|
| 715 | + return preg_replace_callback('#/(:[A-Za-z0-9_-]+(\??))#', function($match) use ($parameters) {
|
|
| 716 | 716 | $parameter = trim($match[1], '?:'); |
| 717 | 717 | |
| 718 | 718 | if ($parameter && isset($parameters[$parameter])) {
|
@@ -193,7 +193,7 @@ |
||
| 193 | 193 | |
| 194 | 194 | $container = $this; |
| 195 | 195 | |
| 196 | - return function () use ($callable, $container) { |
|
| 196 | + return function() use ($callable, $container) { |
|
| 197 | 197 | static $instance; |
| 198 | 198 | |
| 199 | 199 | if ($instance === null) { |
@@ -120,7 +120,7 @@ |
||
| 120 | 120 | public function closure(array $filter, $or = false) { |
| 121 | 121 | $filterer = $this; |
| 122 | 122 | |
| 123 | - return function ($row) use ($filterer, $filter, $or) { |
|
| 123 | + return function($row) use ($filterer, $filter, $or) { |
|
| 124 | 124 | return $filterer->matches($row, $filter, $or); |
| 125 | 125 | }; |
| 126 | 126 | } |
@@ -171,7 +171,7 @@ |
||
| 171 | 171 | $this->data[$resource] = $this->filterer->map( |
| 172 | 172 | $this->data[$resource], |
| 173 | 173 | $filter, |
| 174 | - function ($row) use ($data, &$affected) { |
|
| 174 | + function($row) use ($data, &$affected) { |
|
| 175 | 175 | foreach ($data as $key => $value) { |
| 176 | 176 | $row[$key] = $value; |
| 177 | 177 | } |
@@ -284,7 +284,7 @@ |
||
| 284 | 284 | * @param array|string $order [optional] |
| 285 | 285 | * @param int $limit [optional] |
| 286 | 286 | * @param int $offset [optional] |
| 287 | - * @return array |
|
| 287 | + * @return string |
|
| 288 | 288 | */ |
| 289 | 289 | public static function all($filter = array(), $order = array(), $limit = null, $offset = 0) { |
| 290 | 290 | return static::generate(static::load($filter, $order, $limit, $offset)); |
@@ -77,7 +77,7 @@ |
||
| 77 | 77 | * @return mixed |
| 78 | 78 | */ |
| 79 | 79 | public function get($attribute) { |
| 80 | - list($attribute, $subattribute) = array_pad(explode('.', $attribute, 2), 2, null); |
|
| 80 | + list($attribute, $subattribute) = array_pad(explode('.', $attribute, 2), 2, null); |
|
| 81 | 81 | |
| 82 | 82 | if ($this->hasRelation($attribute)) { |
| 83 | 83 | $related = $this->related($attribute); |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | /** |
| 216 | 216 | * Execute the given storage query. |
| 217 | 217 | * |
| 218 | - * @param Query $storageQuery |
|
| 218 | + * @param StorageQuery $storageQuery |
|
| 219 | 219 | * @return DatabaseStorageResult |
| 220 | 220 | */ |
| 221 | 221 | public function execute(StorageQuery $storageQuery) { |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | * |
| 234 | 234 | * @param string $resource |
| 235 | 235 | * @param array|string $columns [optional] |
| 236 | - * @return Builder |
|
| 236 | + * @return QueryBuilder |
|
| 237 | 237 | */ |
| 238 | 238 | public function query($resource, $columns = array()) { |
| 239 | 239 | $query = new StorageQuery($resource, (array) $columns); |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | * |
| 281 | 281 | * Returns false if there was no error. |
| 282 | 282 | * |
| 283 | - * @return string|bool |
|
| 283 | + * @return string|false |
|
| 284 | 284 | */ |
| 285 | 285 | public function error() { |
| 286 | 286 | if ($error = $this->connection->error()) { |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | * Retrieves the related models without matching them to their parents. |
| 18 | 18 | * |
| 19 | 19 | * @param array $instances |
| 20 | - * @return array |
|
| 20 | + * @return Record[] |
|
| 21 | 21 | */ |
| 22 | 22 | public function eagerLoad(array $instances) |
| 23 | 23 | { |