@@ -3,8 +3,6 @@ |
||
| 3 | 3 | use App; |
| 4 | 4 | use Auth; |
| 5 | 5 | use File; |
| 6 | -use Illuminate\Routing\Redirector; |
|
| 7 | -use Illuminate\Routing\Router; |
|
| 8 | 6 | use Input; |
| 9 | 7 | use Mascame\Artificer\Fields\FieldFactory; |
| 10 | 8 | use Mascame\Artificer\Permit\ModelPermit; |
@@ -285,8 +285,8 @@ |
||
| 285 | 285 | |
| 286 | 286 | /** |
| 287 | 287 | * @param $validator |
| 288 | - * @param $route |
|
| 289 | - * @param null $id |
|
| 288 | + * @param string $route |
|
| 289 | + * @param integer $id |
|
| 290 | 290 | * @return Redirect |
| 291 | 291 | */ |
| 292 | 292 | protected function redirect($validator, $route, $id = null) |
@@ -123,7 +123,7 @@ |
||
| 123 | 123 | /** |
| 124 | 124 | * Display the specified post. |
| 125 | 125 | * |
| 126 | - * @return Response |
|
| 126 | + * @return ModelController |
|
| 127 | 127 | */ |
| 128 | 128 | public function all($modelName, $data = null, $sort = null) |
| 129 | 129 | { |
@@ -1,13 +1,11 @@ |
||
| 1 | 1 | <?php namespace Mascame\Artificer\Http\Controllers; |
| 2 | 2 | |
| 3 | 3 | use Event; |
| 4 | -use Illuminate\Database\Eloquent\Collection; |
|
| 5 | 4 | use Input; |
| 6 | 5 | use Mascame\Artificer\Options\AdminOption; |
| 7 | 6 | use Redirect; |
| 8 | 7 | use Request; |
| 9 | 8 | use Response; |
| 10 | -use Session; |
|
| 11 | 9 | use URL; |
| 12 | 10 | use View; |
| 13 | 11 | |
@@ -40,7 +40,6 @@ |
||
| 40 | 40 | |
| 41 | 41 | /** |
| 42 | 42 | * @param $table |
| 43 | - * @param null $primaryKey |
|
| 44 | 43 | * @return static |
| 45 | 44 | */ |
| 46 | 45 | public function setup($config) |
@@ -30,6 +30,9 @@ |
||
| 30 | 30 | return self::hasPermission($model_permissions, self::getRole()); |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | + /** |
|
| 34 | + * @param string|null $route |
|
| 35 | + */ |
|
| 33 | 36 | public static function routeAction($route) |
| 34 | 37 | { |
| 35 | 38 | $route_permission = AdminOption::get('models.route_permission'); |
@@ -1,7 +1,6 @@ |
||
| 1 | 1 | <?php namespace Mascame\Artificer\Fields\Types; |
| 2 | 2 | |
| 3 | 3 | use Form; |
| 4 | -use HTML; |
|
| 5 | 4 | use Input; |
| 6 | 5 | |
| 7 | 6 | class Email extends \Mascame\Formality\Types\Email |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use Mascame\Artificer\Model\Model; |
| 6 | 6 | use \Illuminate\Support\Str as Str; |
| 7 | 7 | use Mascame\Artificer\Fields\FieldWrapper; |
| 8 | -use Mascame\Formality\Field\Field; |
|
| 9 | 8 | |
| 10 | 9 | class FieldFactory extends \Mascame\Formality\Factory\Factory |
| 11 | 10 | { |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | |
| 59 | 59 | /** |
| 60 | 60 | * @param $field Relation |
| 61 | - * @return mixed |
|
| 61 | + * @return \Mascame\Formality\Field\FieldInterface |
|
| 62 | 62 | */ |
| 63 | 63 | public function completeRelation($field) { |
| 64 | 64 | $relationship = $field->getOption('relationship', []); |
@@ -189,7 +189,7 @@ |
||
| 189 | 189 | |
| 190 | 190 | /** |
| 191 | 191 | * @param $model |
| 192 | - * @return bool |
|
| 192 | + * @return null|boolean |
|
| 193 | 193 | */ |
| 194 | 194 | protected function isCurrent($modelName) |
| 195 | 195 | { |
@@ -1,10 +1,8 @@ |
||
| 1 | 1 | <?php namespace Mascame\Artificer\Model; |
| 2 | 2 | |
| 3 | -use Illuminate\Contracts\Database\ModelIdentifier; |
|
| 4 | 3 | use View; |
| 5 | 4 | use Route; |
| 6 | 5 | use \Illuminate\Support\Str as Str; |
| 7 | -use Mascame\Artificer\Options\AdminOption; |
|
| 8 | 6 | |
| 9 | 7 | // Todo: get column type http://stackoverflow.com/questions/18562684/how-to-get-database-field-type-in-laravel |
| 10 | 8 | class Model |
@@ -26,8 +26,7 @@ |
||
| 26 | 26 | |
| 27 | 27 | /** |
| 28 | 28 | * Field constructor. |
| 29 | - * @param FieldInterface|TypeInterface $field |
|
| 30 | - * @param null $relation |
|
| 29 | + * @param FieldInterface $field |
|
| 31 | 30 | */ |
| 32 | 31 | public function __construct(FieldInterface $field) |
| 33 | 32 | { |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | /** |
| 39 | 39 | * @param null $fileToCheck |
| 40 | - * @return mixed |
|
| 40 | + * @return boolean |
|
| 41 | 41 | */ |
| 42 | 42 | protected function isPublished($fileToCheck = null) { |
| 43 | 43 | if (! $fileToCheck) $fileToCheck = config_path($this->name); |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | * Add files to publishable array & autopublish them in case directory does not exist |
| 54 | 54 | * |
| 55 | 55 | * @param array $paths |
| 56 | - * @param null $group |
|
| 56 | + * @param string $group |
|
| 57 | 57 | */ |
| 58 | 58 | protected function publishes(array $paths, $group = null) { |
| 59 | 59 | parent::publishes($paths, $group); |