| @@ -204,7 +204,7 @@ | ||
| 204 | 204 | /** | 
| 205 | 205 | * Scan files of the given directory. | 
| 206 | 206 | * | 
| 207 | - * @param $current_directory | |
| 207 | + * @param string $current_directory | |
| 208 | 208 | * @return \Illuminate\Support\Collection | 
| 209 | 209 | */ | 
| 210 | 210 | protected function scanFiles($current_directory) | 
| @@ -2,7 +2,6 @@ | ||
| 2 | 2 | |
| 3 | 3 | namespace Yajra\CMS\Http\Controllers; | 
| 4 | 4 | |
| 5 | -use App\Http\Requests; | |
| 6 | 5 | use Collective\Html\HtmlBuilder; | 
| 7 | 6 | use Illuminate\Contracts\Console\Kernel; | 
| 8 | 7 | use Illuminate\Contracts\Logging\Log; | 
| @@ -2,11 +2,11 @@ | ||
| 2 | 2 | |
| 3 | 3 | namespace Yajra\CMS\Http\Controllers; | 
| 4 | 4 | |
| 5 | -use Yajra\CMS\DataTables\PermissionsDataTable; | |
| 6 | 5 | use Illuminate\Database\QueryException; | 
| 7 | 6 | use Illuminate\Http\Request; | 
| 8 | 7 | use Yajra\Acl\Models\Permission; | 
| 9 | 8 | use Yajra\Acl\Models\Role; | 
| 9 | +use Yajra\CMS\DataTables\PermissionsDataTable; | |
| 10 | 10 | |
| 11 | 11 | class PermissionsController extends Controller | 
| 12 | 12 |  { | 
| @@ -109,7 +109,7 @@ | ||
| 109 | 109 | * Remove selected role. | 
| 110 | 110 | * | 
| 111 | 111 | * @param \Yajra\Acl\Models\Role $role | 
| 112 | - * @return \Illuminate\Http\RedirectResponse | |
| 112 | + * @return \Illuminate\Http\JsonResponse | |
| 113 | 113 | */ | 
| 114 | 114 | public function destroy(Role $role) | 
| 115 | 115 |      { | 
| @@ -109,7 +109,7 @@ | ||
| 109 | 109 | * Remove selected role. | 
| 110 | 110 | * | 
| 111 | 111 | * @param \Yajra\Acl\Models\Role $role | 
| 112 | - * @return \Illuminate\Http\RedirectResponse | |
| 112 | + * @return \Illuminate\Http\JsonResponse | |
| 113 | 113 | */ | 
| 114 | 114 | public function destroy(Role $role) | 
| 115 | 115 |      { | 
| @@ -2,11 +2,11 @@ | ||
| 2 | 2 | |
| 3 | 3 | namespace Yajra\CMS\Http\Controllers; | 
| 4 | 4 | |
| 5 | -use Yajra\CMS\DataTables\RolesDataTable; | |
| 6 | 5 | use Illuminate\Database\QueryException; | 
| 7 | 6 | use Illuminate\Http\Request; | 
| 8 | 7 | use Yajra\Acl\Models\Permission; | 
| 9 | 8 | use Yajra\Acl\Models\Role; | 
| 9 | +use Yajra\CMS\DataTables\RolesDataTable; | |
| 10 | 10 | |
| 11 | 11 | class RolesController extends Controller | 
| 12 | 12 |  { | 
| @@ -48,7 +48,7 @@ | ||
| 48 | 48 | /** | 
| 49 | 49 | * Generate the menu. | 
| 50 | 50 | * | 
| 51 | - * @param \Caffeinated\Menus\Builder|\Caffeinated\Menus\Item $menuBuilder | |
| 51 | + * @param Builder $menuBuilder | |
| 52 | 52 | * @param \Yajra\CMS\Entities\Menu $menu | 
| 53 | 53 | */ | 
| 54 | 54 | protected function generateMenu($menuBuilder, $menu) | 
| @@ -7,7 +7,6 @@ | ||
| 7 | 7 | use Closure; | 
| 8 | 8 | use Yajra\CMS\Entities\Menu; | 
| 9 | 9 | use Yajra\CMS\Entities\Navigation; | 
| 10 | -use Yajra\CMS\Entities\Widget; | |
| 11 | 10 | use Yajra\CMS\Repositories\Navigation\Repository; | 
| 12 | 11 | |
| 13 | 12 | class DynamicMenusBuilder | 
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | * | 
| 24 | 24 | * @param string $key | 
| 25 | 25 | * @param string $default | 
| 26 | - * @return mixed | |
| 26 | + * @return string | |
| 27 | 27 | */ | 
| 28 | 28 | public function param($key, $default = '') | 
| 29 | 29 |      { | 
| @@ -155,7 +155,7 @@ | ||
| 155 | 155 | * Get all widget types. | 
| 156 | 156 | * | 
| 157 | 157 | * @param string $type | 
| 158 | - * @return string | |
| 158 | + * @return \Illuminate\Http\JsonResponse | |
| 159 | 159 | */ | 
| 160 | 160 | public function templates($type) | 
| 161 | 161 |      { | 
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | <?php | 
| 2 | 2 | |
| 3 | -use Illuminate\Database\Schema\Blueprint; | |
| 4 | 3 | use Illuminate\Database\Migrations\Migration; | 
| 4 | +use Illuminate\Database\Schema\Blueprint; | |
| 5 | 5 | use Illuminate\Support\Facades\Schema; | 
| 6 | 6 | |
| 7 | 7 | class CreateArticlesTable extends Migration | 
| @@ -23,8 +23,8 @@ | ||
| 23 | 23 | use Yajra\CMS\Themes\ThemesServiceProvider; | 
| 24 | 24 | use Yajra\CMS\View\Directives\PageHeaderDirective; | 
| 25 | 25 | use Yajra\CMS\View\Directives\TooltipDirective; | 
| 26 | -use Yajra\Datatables\DatatablesServiceProvider; | |
| 27 | 26 | use Yajra\Datatables\ButtonsServiceProvider; | 
| 27 | +use Yajra\Datatables\DatatablesServiceProvider; | |
| 28 | 28 | |
| 29 | 29 | class CoreServiceProvider extends ServiceProvider | 
| 30 | 30 |  { |