Unverified Commit 811f969a authored by Viral Solani's avatar Viral Solani Committed by GitHub

Merge pull request #246 from viralsolani/develop

Merge Develop to master
parents dafb3a3a e38cf422
...@@ -54,6 +54,9 @@ Generate a new application key ...@@ -54,6 +54,9 @@ Generate a new application key
php artisan key:generate php artisan key:generate
Generate a new JWT secret key (If you want to use API)
php artisan jwt:secret
Generate a new JWT authentication secret key Generate a new JWT authentication secret key
php artisan jwt:secret php artisan jwt:secret
...@@ -79,7 +82,7 @@ For generating the files of unisharp file manager ...@@ -79,7 +82,7 @@ For generating the files of unisharp file manager
php artisan vendor:publish --tag=lfm_public php artisan vendor:publish --tag=lfm_public
For linking storage folder in public For linking storage folder in public
php artisan storage:link php artisan storage:link
Start the local development server Start the local development server
......
<?php <?php
Breadcrumbs::register('admin.blogcategories.index', function ($breadcrumbs) { Breadcrumbs::register('admin.blogCategories.index', function ($breadcrumbs) {
$breadcrumbs->parent('admin.dashboard'); $breadcrumbs->parent('admin.dashboard');
$breadcrumbs->push(trans('menus.backend.blogcategories.management'), route('admin.blogcategories.index')); $breadcrumbs->push(trans('menus.backend.blogcategories.management'), route('admin.blogCategories.index'));
}); });
Breadcrumbs::register('admin.blogcategories.create', function ($breadcrumbs) { Breadcrumbs::register('admin.blogCategories.create', function ($breadcrumbs) {
$breadcrumbs->parent('admin.blogcategories.index'); $breadcrumbs->parent('admin.blogCategories.index');
$breadcrumbs->push(trans('menus.backend.blogcategories.create'), route('admin.blogcategories.create')); $breadcrumbs->push(trans('menus.backend.blogcategories.create'), route('admin.blogCategories.create'));
}); });
Breadcrumbs::register('admin.blogcategories.edit', function ($breadcrumbs, $id) { Breadcrumbs::register('admin.blogCategories.edit', function ($breadcrumbs, $id) {
$breadcrumbs->parent('admin.blogcategories.index'); $breadcrumbs->parent('admin.blogCategories.index');
$breadcrumbs->push(trans('menus.backend.blogcategories.edit'), route('admin.blogcategories.edit', $id)); $breadcrumbs->push(trans('menus.backend.blogcategories.edit'), route('admin.blogCategories.edit', $id));
}); });
<?php <?php
Breadcrumbs::register('admin.blogtags.index', function ($breadcrumbs) { Breadcrumbs::register('admin.blogTags.index', function ($breadcrumbs) {
$breadcrumbs->parent('admin.dashboard'); $breadcrumbs->parent('admin.dashboard');
$breadcrumbs->push(trans('menus.backend.blogtags.management'), route('admin.blogtags.index')); $breadcrumbs->push(trans('menus.backend.blogtags.management'), route('admin.blogTags.index'));
}); });
Breadcrumbs::register('admin.blogtags.create', function ($breadcrumbs) { Breadcrumbs::register('admin.blogTags.create', function ($breadcrumbs) {
$breadcrumbs->parent('admin.blogtags.index'); $breadcrumbs->parent('admin.blogTags.index');
$breadcrumbs->push(trans('menus.backend.blogtags.create'), route('admin.blogtags.create')); $breadcrumbs->push(trans('menus.backend.blogtags.create'), route('admin.blogTags.create'));
}); });
Breadcrumbs::register('admin.blogtags.edit', function ($breadcrumbs, $id) { Breadcrumbs::register('admin.blogTags.edit', function ($breadcrumbs, $id) {
$breadcrumbs->parent('admin.blogtags.index'); $breadcrumbs->parent('admin.blogTags.index');
$breadcrumbs->push(trans('menus.backend.blogtags.edit'), route('admin.blogtags.edit', $id)); $breadcrumbs->push(trans('menus.backend.blogtags.edit'), route('admin.blogTags.edit', $id));
}); });
...@@ -32,9 +32,11 @@ class BlogCategoriesController extends APIController ...@@ -32,9 +32,11 @@ class BlogCategoriesController extends APIController
public function index(Request $request) public function index(Request $request)
{ {
$limit = $request->get('paginate') ? $request->get('paginate') : 25; $limit = $request->get('paginate') ? $request->get('paginate') : 25;
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
return BlogCategoriesResource::collection( return BlogCategoriesResource::collection(
$this->repository->getForDataTable()->paginate($limit) $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
); );
} }
......
...@@ -30,9 +30,11 @@ class BlogTagsController extends APIController ...@@ -30,9 +30,11 @@ class BlogTagsController extends APIController
public function index(Request $request) public function index(Request $request)
{ {
$limit = $request->get('paginate') ? $request->get('paginate') : 25; $limit = $request->get('paginate') ? $request->get('paginate') : 25;
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
return BlogTagsResource::collection( return BlogTagsResource::collection(
$this->repository->getForDataTable()->paginate($limit) $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
); );
} }
......
...@@ -30,9 +30,11 @@ class BlogsController extends APIController ...@@ -30,9 +30,11 @@ class BlogsController extends APIController
public function index(Request $request) public function index(Request $request)
{ {
$limit = $request->get('paginate') ? $request->get('paginate') : 25; $limit = $request->get('paginate') ? $request->get('paginate') : 25;
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
return BlogsResource::collection( return BlogsResource::collection(
$this->repository->getForDataTable()->paginate($limit) $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
); );
} }
......
...@@ -30,9 +30,11 @@ class DeactivatedUsersController extends APIController ...@@ -30,9 +30,11 @@ class DeactivatedUsersController extends APIController
public function index(Request $request) public function index(Request $request)
{ {
$limit = $request->get('paginate') ? $request->get('paginate') : 25; $limit = $request->get('paginate') ? $request->get('paginate') : 25;
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
return UserResource::collection( return UserResource::collection(
$this->repository->getForDataTable(0, false)->paginate($limit) $this->repository->getForDataTable(0, false)->orderBy($sortBy, $orderBy)->paginate($limit)
); );
} }
} }
...@@ -30,9 +30,11 @@ class DeletedUsersController extends APIController ...@@ -30,9 +30,11 @@ class DeletedUsersController extends APIController
public function index(Request $request) public function index(Request $request)
{ {
$limit = $request->get('paginate') ? $request->get('paginate') : 25; $limit = $request->get('paginate') ? $request->get('paginate') : 25;
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
return UserResource::collection( return UserResource::collection(
$this->repository->getForDataTable(0, true)->paginate($limit) $this->repository->getForDataTable(0, true)->orderBy($sortBy, $orderBy)->paginate($limit)
); );
} }
} }
...@@ -30,9 +30,11 @@ class FaqsController extends APIController ...@@ -30,9 +30,11 @@ class FaqsController extends APIController
public function index(Request $request) public function index(Request $request)
{ {
$limit = $request->get('paginate') ? $request->get('paginate') : 25; $limit = $request->get('paginate') ? $request->get('paginate') : 25;
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
return FaqsResource::collection( return FaqsResource::collection(
$this->repository->getForDataTable()->paginate($limit) $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
); );
} }
......
...@@ -30,9 +30,11 @@ class PagesController extends APIController ...@@ -30,9 +30,11 @@ class PagesController extends APIController
public function index(Request $request) public function index(Request $request)
{ {
$limit = $request->get('paginate') ? $request->get('paginate') : 25; $limit = $request->get('paginate') ? $request->get('paginate') : 25;
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
return PagesResource::collection( return PagesResource::collection(
$this->repository->getForDataTable()->paginate($limit) $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
); );
} }
......
...@@ -32,9 +32,11 @@ class PermissionController extends APIController ...@@ -32,9 +32,11 @@ class PermissionController extends APIController
public function index(Request $request) public function index(Request $request)
{ {
$limit = $request->get('paginate') ? $request->get('paginate') : 25; $limit = $request->get('paginate') ? $request->get('paginate') : 25;
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
return PermissionResource::collection( return PermissionResource::collection(
$this->repository->getForDataTable()->paginate($limit) $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
); );
} }
...@@ -104,6 +106,7 @@ class PermissionController extends APIController ...@@ -104,6 +106,7 @@ class PermissionController extends APIController
$this->repository->delete($permission); $this->repository->delete($permission);
return $this->respond([ return $this->respond([
'data' => $permission->id,
'message' => trans('alerts.backend.permissions.deleted'), 'message' => trans('alerts.backend.permissions.deleted'),
]); ]);
} }
......
...@@ -32,9 +32,11 @@ class RolesController extends APIController ...@@ -32,9 +32,11 @@ class RolesController extends APIController
public function index(Request $request) public function index(Request $request)
{ {
$limit = $request->get('paginate') ? $request->get('paginate') : 25; $limit = $request->get('paginate') ? $request->get('paginate') : 25;
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
return RoleResource::collection( return RoleResource::collection(
$this->repository->getForDataTable()->paginate($limit) $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
); );
} }
...@@ -60,6 +62,7 @@ class RolesController extends APIController ...@@ -60,6 +62,7 @@ class RolesController extends APIController
public function store(Request $request) public function store(Request $request)
{ {
$validation = $this->validateRole($request); $validation = $this->validateRole($request);
if ($validation->fails()) { if ($validation->fails()) {
return $this->throwValidation($validation->messages()->first()); return $this->throwValidation($validation->messages()->first());
} }
...@@ -105,6 +108,7 @@ class RolesController extends APIController ...@@ -105,6 +108,7 @@ class RolesController extends APIController
$this->repository->delete($role); $this->repository->delete($role);
return $this->respond([ return $this->respond([
'data' => $role->id,
'message' => trans('alerts.backend.roles.deleted'), 'message' => trans('alerts.backend.roles.deleted'),
]); ]);
} }
......
...@@ -32,9 +32,11 @@ class UsersController extends APIController ...@@ -32,9 +32,11 @@ class UsersController extends APIController
public function index(Request $request) public function index(Request $request)
{ {
$limit = $request->get('paginate') ? $request->get('paginate') : 25; $limit = $request->get('paginate') ? $request->get('paginate') : 25;
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
return UserResource::collection( return UserResource::collection(
$this->repository->getForDataTable(1, false)->paginate($limit) $this->repository->getForDataTable(1, false)->orderBy($sortBy, $orderBy)->paginate($limit)
); );
} }
...@@ -106,6 +108,7 @@ class UsersController extends APIController ...@@ -106,6 +108,7 @@ class UsersController extends APIController
$this->repository->delete($user); $this->repository->delete($user);
return $this->respond([ return $this->respond([
'data' => $user->id,
'message' => trans('alerts.backend.users.deleted'), 'message' => trans('alerts.backend.users.deleted'),
]); ]);
} }
......
...@@ -9,6 +9,7 @@ use App\Http\Requests\Backend\BlogCategories\EditBlogCategoriesRequest; ...@@ -9,6 +9,7 @@ use App\Http\Requests\Backend\BlogCategories\EditBlogCategoriesRequest;
use App\Http\Requests\Backend\BlogCategories\ManageBlogCategoriesRequest; use App\Http\Requests\Backend\BlogCategories\ManageBlogCategoriesRequest;
use App\Http\Requests\Backend\BlogCategories\StoreBlogCategoriesRequest; use App\Http\Requests\Backend\BlogCategories\StoreBlogCategoriesRequest;
use App\Http\Requests\Backend\BlogCategories\UpdateBlogCategoriesRequest; use App\Http\Requests\Backend\BlogCategories\UpdateBlogCategoriesRequest;
use App\Http\Responses\Backend\BlogCategory\EditResponse;
use App\Http\Responses\RedirectResponse; use App\Http\Responses\RedirectResponse;
use App\Http\Responses\ViewResponse; use App\Http\Responses\ViewResponse;
use App\Models\BlogCategories\BlogCategory; use App\Models\BlogCategories\BlogCategory;
...@@ -65,7 +66,7 @@ class BlogCategoriesController extends Controller ...@@ -65,7 +66,7 @@ class BlogCategoriesController extends Controller
* @param \App\Models\BlogCategories\BlogCategory $blogCategory * @param \App\Models\BlogCategories\BlogCategory $blogCategory
* @param \App\Http\Requests\Backend\BlogCategories\EditBlogCategoriesRequest $request * @param \App\Http\Requests\Backend\BlogCategories\EditBlogCategoriesRequest $request
* *
* @return mixed * @return \App\Http\Responses\Backend\BlogCategory\EditResponse
*/ */
public function edit(BlogCategory $blogCategory, EditBlogCategoriesRequest $request) public function edit(BlogCategory $blogCategory, EditBlogCategoriesRequest $request)
{ {
......
...@@ -22,14 +22,6 @@ class FrontendController extends Controller ...@@ -22,14 +22,6 @@ class FrontendController extends Controller
return view('frontend.index', compact('google_analytics', $google_analytics)); return view('frontend.index', compact('google_analytics', $google_analytics));
} }
/**
* @return \Illuminate\View\View
*/
public function macros()
{
return view('frontend.macros');
}
/** /**
* show page by $page_slug. * show page by $page_slug.
*/ */
......
<?php
namespace App\Http\Middleware;
use Closure;
use JWTAuth;
use Tymon\JWTAuth\Exceptions\JWTException;
class VerifyJWTToken
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
*
* @return mixed
*/
public function handle($request, Closure $next)
{
try {
$user = JWTAuth::parseToken()->authenticate();
} catch (JWTException $e) {
if ($e instanceof \Tymon\JWTAuth\Exceptions\TokenExpiredException) {
return response()->json(['token_expired'], $e->getStatusCode());
} elseif ($e instanceof \Tymon\JWTAuth\Exceptions\TokenInvalidException) {
return response()->json(['token_invalid'], $e->getStatusCode());
} else {
return response()->json(['error' => 'Token is required']);
}
}
return $next($request);
}
}
...@@ -27,7 +27,7 @@ class UpdateBlogCategoriesRequest extends Request ...@@ -27,7 +27,7 @@ class UpdateBlogCategoriesRequest extends Request
public function rules() public function rules()
{ {
return [ return [
'name' => 'required|max:191', 'name' => 'required|max:191|unique:blog_categories,name,'.$this->segment(3),
]; ];
} }
...@@ -39,6 +39,7 @@ class UpdateBlogCategoriesRequest extends Request ...@@ -39,6 +39,7 @@ class UpdateBlogCategoriesRequest extends Request
public function messages() public function messages()
{ {
return [ return [
'name.unique' => 'Blog category name already exists, please enter a different name.',
'name.required' => 'Blog category name must required', 'name.required' => 'Blog category name must required',
'name.max' => 'Blog category may not be greater than 191 characters.', 'name.max' => 'Blog category may not be greater than 191 characters.',
]; ];
......
...@@ -27,7 +27,7 @@ class UpdateBlogTagsRequest extends Request ...@@ -27,7 +27,7 @@ class UpdateBlogTagsRequest extends Request
public function rules() public function rules()
{ {
return [ return [
'name' => 'required|max:191', 'name' => 'required|max:191|unique:blog_tags,name,'.$this->segment(3),
]; ];
} }
...@@ -39,6 +39,7 @@ class UpdateBlogTagsRequest extends Request ...@@ -39,6 +39,7 @@ class UpdateBlogTagsRequest extends Request
public function messages() public function messages()
{ {
return [ return [
'name.unique' => 'Blog Tag name already exists, please enter a different name.',
'name.required' => 'Blog Tag name is a required field.', 'name.required' => 'Blog Tag name is a required field.',
'name.max' => 'Blog Tag may not be greater than 191 characters.', 'name.max' => 'Blog Tag may not be greater than 191 characters.',
]; ];
......
...@@ -27,7 +27,7 @@ class UpdateBlogsRequest extends Request ...@@ -27,7 +27,7 @@ class UpdateBlogsRequest extends Request
public function rules() public function rules()
{ {
return [ return [
'name' => 'required|max:191', 'name' => 'required|max:191|unique:blogs,name,'.$this->segment(3),
'content' => 'required', 'content' => 'required',
'categories' => 'required', 'categories' => 'required',
'tags' => 'required', 'tags' => 'required',
...@@ -42,6 +42,7 @@ class UpdateBlogsRequest extends Request ...@@ -42,6 +42,7 @@ class UpdateBlogsRequest extends Request
public function messages() public function messages()
{ {
return [ return [
'name.unique' => 'Blog name already exists, please enter a different name.',
'name.required' => 'Please insert Blog Title', 'name.required' => 'Please insert Blog Title',
'name.max' => 'Blog Title may not be greater than 191 characters.', 'name.max' => 'Blog Title may not be greater than 191 characters.',
]; ];
......
...@@ -18,8 +18,8 @@ class RoleResource extends Resource ...@@ -18,8 +18,8 @@ class RoleResource extends Resource
return [ return [
'id' => $this->id, 'id' => $this->id,
'name' => $this->name, 'name' => $this->name,
'permission' => ($this->all) ? 'All' : optional($this->permissions)->pluck('display_name'), 'permissions' => ($this->all) ? 'All' : optional($this->permissions)->pluck('display_name'),
'noofuses' => $this->users->count(), 'number_of_users' => $this->users->count(),
'sort' => $this->sort, 'sort' => $this->sort,
'status' => $this->status, 'status' => $this->status,
'registered_at' => $this->created_at->toIso8601String(), 'registered_at' => $this->created_at->toIso8601String(),
......
...@@ -25,8 +25,8 @@ class UserResource extends Resource ...@@ -25,8 +25,8 @@ class UserResource extends Resource
'role' => optional($this->roles()->first())->name, 'role' => optional($this->roles()->first())->name,
'permissions' => $this->permissions()->get(), 'permissions' => $this->permissions()->get(),
'status' => $this->status, 'status' => $this->status,
'registered_at' => $this->created_at->toIso8601String(), 'created_at' => $this->created_at->toIso8601String(),
'last_updated_at' => $this->updated_at->toIso8601String(), 'updated_at' => $this->updated_at->toIso8601String(),
]; ];
} }
} }
<?php <?php
namespace App\Http\Responses\Backend\Menu; namespace App\Http\Responses\Backend\BlogCategory;
use Illuminate\Contracts\Support\Responsable; use Illuminate\Contracts\Support\Responsable;
...@@ -14,7 +14,7 @@ class EditResponse implements Responsable ...@@ -14,7 +14,7 @@ class EditResponse implements Responsable
/** /**
* @param \App\Models\BlogCategories\BlogCategory $blogCategory * @param \App\Models\BlogCategories\BlogCategory $blogCategory
*/ */
public function __construct($blogCategory, $types, $modules) public function __construct($blogCategory)
{ {
$this->blogCategory = $blogCategory; $this->blogCategory = $blogCategory;
} }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "529102fbc0fdd6142c7a86d0c99443c6", "content-hash": "1ff0891115bc89c4dcca27e33644c3cf",
"packages": [ "packages": [
{ {
"name": "arcanedev/log-viewer", "name": "arcanedev/log-viewer",
...@@ -249,16 +249,16 @@ ...@@ -249,16 +249,16 @@
}, },
{ {
"name": "davejamesmiller/laravel-breadcrumbs", "name": "davejamesmiller/laravel-breadcrumbs",
"version": "5.0.0", "version": "5.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/davejamesmiller/laravel-breadcrumbs.git", "url": "https://github.com/davejamesmiller/laravel-breadcrumbs.git",
"reference": "590cb313d783460bdac4d3a801c83e6ecf561eb7" "reference": "2a02abfeca13acba6d528f4fcd385570452308f7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/davejamesmiller/laravel-breadcrumbs/zipball/590cb313d783460bdac4d3a801c83e6ecf561eb7", "url": "https://api.github.com/repos/davejamesmiller/laravel-breadcrumbs/zipball/2a02abfeca13acba6d528f4fcd385570452308f7",
"reference": "590cb313d783460bdac4d3a801c83e6ecf561eb7", "reference": "2a02abfeca13acba6d528f4fcd385570452308f7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -304,7 +304,7 @@ ...@@ -304,7 +304,7 @@
"keywords": [ "keywords": [
"laravel" "laravel"
], ],
"time": "2018-02-10T19:00:08+00:00" "time": "2018-05-05T19:30:03+00:00"
}, },
{ {
"name": "dnoegel/php-xdg-base-dir", "name": "dnoegel/php-xdg-base-dir",
...@@ -819,16 +819,16 @@ ...@@ -819,16 +819,16 @@
}, },
{ {
"name": "dragonmantank/cron-expression", "name": "dragonmantank/cron-expression",
"version": "v2.1.0", "version": "v2.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/dragonmantank/cron-expression.git", "url": "https://github.com/dragonmantank/cron-expression.git",
"reference": "3f00985deec8df53d4cc1e5c33619bda1ee309a5" "reference": "92a2c3768d50e21a1f26a53cb795ce72806266c5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/3f00985deec8df53d4cc1e5c33619bda1ee309a5", "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/92a2c3768d50e21a1f26a53cb795ce72806266c5",
"reference": "3f00985deec8df53d4cc1e5c33619bda1ee309a5", "reference": "92a2c3768d50e21a1f26a53cb795ce72806266c5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -864,7 +864,7 @@ ...@@ -864,7 +864,7 @@
"cron", "cron",
"schedule" "schedule"
], ],
"time": "2018-04-06T15:51:55+00:00" "time": "2018-06-06T03:12:17+00:00"
}, },
{ {
"name": "egulias/email-validator", "name": "egulias/email-validator",
...@@ -1025,16 +1025,16 @@ ...@@ -1025,16 +1025,16 @@
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
"version": "6.3.2", "version": "6.3.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/guzzle.git", "url": "https://github.com/guzzle/guzzle.git",
"reference": "68d0ea14d5a3f42a20e87632a5f84931e2709c90" "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/68d0ea14d5a3f42a20e87632a5f84931e2709c90", "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
"reference": "68d0ea14d5a3f42a20e87632a5f84931e2709c90", "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1044,7 +1044,7 @@ ...@@ -1044,7 +1044,7 @@
}, },
"require-dev": { "require-dev": {
"ext-curl": "*", "ext-curl": "*",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4", "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
"psr/log": "^1.0" "psr/log": "^1.0"
}, },
"suggest": { "suggest": {
...@@ -1086,7 +1086,7 @@ ...@@ -1086,7 +1086,7 @@
"rest", "rest",
"web service" "web service"
], ],
"time": "2018-03-26T16:33:04+00:00" "time": "2018-04-22T15:46:56+00:00"
}, },
{ {
"name": "guzzlehttp/promises", "name": "guzzlehttp/promises",
...@@ -1269,16 +1269,16 @@ ...@@ -1269,16 +1269,16 @@
}, },
{ {
"name": "intervention/image", "name": "intervention/image",
"version": "2.4.1", "version": "2.4.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Intervention/image.git", "url": "https://github.com/Intervention/image.git",
"reference": "3603dbcc9a17d307533473246a6c58c31cf17919" "reference": "e82d274f786e3d4b866a59b173f42e716f0783eb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Intervention/image/zipball/3603dbcc9a17d307533473246a6c58c31cf17919", "url": "https://api.github.com/repos/Intervention/image/zipball/e82d274f786e3d4b866a59b173f42e716f0783eb",
"reference": "3603dbcc9a17d307533473246a6c58c31cf17919", "reference": "e82d274f786e3d4b866a59b173f42e716f0783eb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1298,7 +1298,7 @@ ...@@ -1298,7 +1298,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.3-dev" "dev-master": "2.4-dev"
}, },
"laravel": { "laravel": {
"providers": [ "providers": [
...@@ -1335,7 +1335,7 @@ ...@@ -1335,7 +1335,7 @@
"thumbnail", "thumbnail",
"watermark" "watermark"
], ],
"time": "2017-09-21T16:29:17+00:00" "time": "2018-05-29T14:19:03+00:00"
}, },
{ {
"name": "jakub-onderka/php-console-color", "name": "jakub-onderka/php-console-color",
...@@ -1426,16 +1426,16 @@ ...@@ -1426,16 +1426,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v5.6.17", "version": "v5.6.26",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "0f787c763ae8fb9fae0c8c809830ba4fa81e2d9d" "reference": "7047df295e77cecb6a2f84736a732af66cc6789c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/0f787c763ae8fb9fae0c8c809830ba4fa81e2d9d", "url": "https://api.github.com/repos/laravel/framework/zipball/7047df295e77cecb6a2f84736a732af66cc6789c",
"reference": "0f787c763ae8fb9fae0c8c809830ba4fa81e2d9d", "reference": "7047df295e77cecb6a2f84736a732af66cc6789c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1561,20 +1561,20 @@ ...@@ -1561,20 +1561,20 @@
"framework", "framework",
"laravel" "laravel"
], ],
"time": "2018-04-17T12:51:04+00:00" "time": "2018-06-20T14:21:11+00:00"
}, },
{ {
"name": "laravel/socialite", "name": "laravel/socialite",
"version": "v3.0.9", "version": "v3.0.12",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/socialite.git", "url": "https://github.com/laravel/socialite.git",
"reference": "fc1c8d415699e502f3e61cbc61e3250d5bd942eb" "reference": "b5f465847b1d637efa86bbfe2fc1c9d2bd12f60f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/socialite/zipball/fc1c8d415699e502f3e61cbc61e3250d5bd942eb", "url": "https://api.github.com/repos/laravel/socialite/zipball/b5f465847b1d637efa86bbfe2fc1c9d2bd12f60f",
"reference": "fc1c8d415699e502f3e61cbc61e3250d5bd942eb", "reference": "b5f465847b1d637efa86bbfe2fc1c9d2bd12f60f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1623,20 +1623,20 @@ ...@@ -1623,20 +1623,20 @@
"laravel", "laravel",
"oauth" "oauth"
], ],
"time": "2017-11-06T16:02:48+00:00" "time": "2018-06-01T15:06:47+00:00"
}, },
{ {
"name": "laravel/tinker", "name": "laravel/tinker",
"version": "v1.0.6", "version": "v1.0.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/tinker.git", "url": "https://github.com/laravel/tinker.git",
"reference": "b22fe905fcefdffae76b011e27c7ac09e07e052b" "reference": "e3086ee8cb1f54a39ae8dcb72d1c37d10128997d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/tinker/zipball/b22fe905fcefdffae76b011e27c7ac09e07e052b", "url": "https://api.github.com/repos/laravel/tinker/zipball/e3086ee8cb1f54a39ae8dcb72d1c37d10128997d",
"reference": "b22fe905fcefdffae76b011e27c7ac09e07e052b", "reference": "e3086ee8cb1f54a39ae8dcb72d1c37d10128997d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1686,20 +1686,20 @@ ...@@ -1686,20 +1686,20 @@
"laravel", "laravel",
"psysh" "psysh"
], ],
"time": "2018-04-16T12:10:37+00:00" "time": "2018-05-17T13:42:07+00:00"
}, },
{ {
"name": "laravelcollective/html", "name": "laravelcollective/html",
"version": "v5.6.6", "version": "v5.6.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/LaravelCollective/html.git", "url": "https://github.com/LaravelCollective/html.git",
"reference": "b3a10245c791a211e5f8ec37117f4549cd22aabe" "reference": "974605fcd22a7e4d19f0b2ef635a0d1d7400387d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/LaravelCollective/html/zipball/b3a10245c791a211e5f8ec37117f4549cd22aabe", "url": "https://api.github.com/repos/LaravelCollective/html/zipball/974605fcd22a7e4d19f0b2ef635a0d1d7400387d",
"reference": "b3a10245c791a211e5f8ec37117f4549cd22aabe", "reference": "974605fcd22a7e4d19f0b2ef635a0d1d7400387d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1713,7 +1713,7 @@ ...@@ -1713,7 +1713,7 @@
"require-dev": { "require-dev": {
"illuminate/database": "5.6.*", "illuminate/database": "5.6.*",
"mockery/mockery": "~1.0", "mockery/mockery": "~1.0",
"phpunit/phpunit": "~5.4" "phpunit/phpunit": "~7.1"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
...@@ -1754,7 +1754,7 @@ ...@@ -1754,7 +1754,7 @@
], ],
"description": "HTML and Form Builders for the Laravel Framework", "description": "HTML and Form Builders for the Laravel Framework",
"homepage": "https://laravelcollective.com", "homepage": "https://laravelcollective.com",
"time": "2018-04-09T14:09:32+00:00" "time": "2018-06-18T15:04:16+00:00"
}, },
{ {
"name": "lcobucci/jwt", "name": "lcobucci/jwt",
...@@ -1816,16 +1816,16 @@ ...@@ -1816,16 +1816,16 @@
}, },
{ {
"name": "league/flysystem", "name": "league/flysystem",
"version": "1.0.44", "version": "1.0.45",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/flysystem.git", "url": "https://github.com/thephpleague/flysystem.git",
"reference": "168dbe519737221dc87d17385cde33073881fd02" "reference": "a99f94e63b512d75f851b181afcdf0ee9ebef7e6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/168dbe519737221dc87d17385cde33073881fd02", "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a99f94e63b512d75f851b181afcdf0ee9ebef7e6",
"reference": "168dbe519737221dc87d17385cde33073881fd02", "reference": "a99f94e63b512d75f851b181afcdf0ee9ebef7e6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1896,7 +1896,7 @@ ...@@ -1896,7 +1896,7 @@
"sftp", "sftp",
"storage" "storage"
], ],
"time": "2018-04-06T09:58:14+00:00" "time": "2018-05-07T08:44:23+00:00"
}, },
{ {
"name": "league/oauth1-client", "name": "league/oauth1-client",
...@@ -2157,16 +2157,16 @@ ...@@ -2157,16 +2157,16 @@
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
"version": "v4.0.1", "version": "v4.0.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nikic/PHP-Parser.git", "url": "https://github.com/nikic/PHP-Parser.git",
"reference": "e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3" "reference": "35b8caf75e791ba1b2d24fec1552168d72692b12"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3", "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/35b8caf75e791ba1b2d24fec1552168d72692b12",
"reference": "e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3", "reference": "35b8caf75e791ba1b2d24fec1552168d72692b12",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2204,20 +2204,20 @@ ...@@ -2204,20 +2204,20 @@
"parser", "parser",
"php" "php"
], ],
"time": "2018-03-25T17:35:16+00:00" "time": "2018-06-03T11:33:10+00:00"
}, },
{ {
"name": "paragonie/random_compat", "name": "paragonie/random_compat",
"version": "v2.0.12", "version": "v2.0.17",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/paragonie/random_compat.git", "url": "https://github.com/paragonie/random_compat.git",
"reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb" "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/258c89a6b97de7dfaf5b8c7607d0478e236b04fb", "url": "https://api.github.com/repos/paragonie/random_compat/zipball/29af24f25bab834fcbb38ad2a69fa93b867e070d",
"reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb", "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2249,10 +2249,11 @@ ...@@ -2249,10 +2249,11 @@
"description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
"keywords": [ "keywords": [
"csprng", "csprng",
"polyfill",
"pseudorandom", "pseudorandom",
"random" "random"
], ],
"time": "2018-04-04T21:24:14+00:00" "time": "2018-07-04T16:31:37+00:00"
}, },
{ {
"name": "psr/container", "name": "psr/container",
...@@ -2450,16 +2451,16 @@ ...@@ -2450,16 +2451,16 @@
}, },
{ {
"name": "psy/psysh", "name": "psy/psysh",
"version": "v0.9.3", "version": "v0.9.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/bobthecow/psysh.git", "url": "https://github.com/bobthecow/psysh.git",
"reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4" "reference": "4a2ce86f199d51b6e2524214dc06835e872f4fce"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/79c280013cf0b30fa23f3ba8bd3649218075adf4", "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4a2ce86f199d51b6e2524214dc06835e872f4fce",
"reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4", "reference": "4a2ce86f199d51b6e2524214dc06835e872f4fce",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2471,9 +2472,9 @@ ...@@ -2471,9 +2472,9 @@
"symfony/var-dumper": "~2.7|~3.0|~4.0" "symfony/var-dumper": "~2.7|~3.0|~4.0"
}, },
"require-dev": { "require-dev": {
"bamarni/composer-bin-plugin": "^1.2",
"hoa/console": "~2.15|~3.16", "hoa/console": "~2.15|~3.16",
"phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0", "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0"
"symfony/finder": "~2.1|~3.0|~4.0"
}, },
"suggest": { "suggest": {
"ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
...@@ -2518,7 +2519,7 @@ ...@@ -2518,7 +2519,7 @@
"interactive", "interactive",
"shell" "shell"
], ],
"time": "2018-04-18T12:32:50+00:00" "time": "2018-06-10T17:57:20+00:00"
}, },
{ {
"name": "ramsey/uuid", "name": "ramsey/uuid",
...@@ -2602,16 +2603,16 @@ ...@@ -2602,16 +2603,16 @@
}, },
{ {
"name": "spatie/laravel-cors", "name": "spatie/laravel-cors",
"version": "1.2.0", "version": "1.2.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/spatie/laravel-cors.git", "url": "https://github.com/spatie/laravel-cors.git",
"reference": "98893ca6eb773f587dfb4e2745dbfabd21fafd27" "reference": "314899baf691dd4bbaf3cbbbcaf5aedb4b39a89b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/spatie/laravel-cors/zipball/98893ca6eb773f587dfb4e2745dbfabd21fafd27", "url": "https://api.github.com/repos/spatie/laravel-cors/zipball/314899baf691dd4bbaf3cbbbcaf5aedb4b39a89b",
"reference": "98893ca6eb773f587dfb4e2745dbfabd21fafd27", "reference": "314899baf691dd4bbaf3cbbbcaf5aedb4b39a89b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2657,20 +2658,20 @@ ...@@ -2657,20 +2658,20 @@
"request", "request",
"spatie" "spatie"
], ],
"time": "2018-03-30T07:39:12+00:00" "time": "2018-05-04T21:18:32+00:00"
}, },
{ {
"name": "swiftmailer/swiftmailer", "name": "swiftmailer/swiftmailer",
"version": "v6.0.2", "version": "v6.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git", "url": "https://github.com/swiftmailer/swiftmailer.git",
"reference": "412333372fb6c8ffb65496a2bbd7321af75733fc" "reference": "aa899fef280b1c1aec8d5d4ac069af7f80c89a23"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/412333372fb6c8ffb65496a2bbd7321af75733fc", "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/aa899fef280b1c1aec8d5d4ac069af7f80c89a23",
"reference": "412333372fb6c8ffb65496a2bbd7321af75733fc", "reference": "aa899fef280b1c1aec8d5d4ac069af7f80c89a23",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2681,10 +2682,14 @@ ...@@ -2681,10 +2682,14 @@
"mockery/mockery": "~0.9.1", "mockery/mockery": "~0.9.1",
"symfony/phpunit-bridge": "~3.3@dev" "symfony/phpunit-bridge": "~3.3@dev"
}, },
"suggest": {
"ext-intl": "Needed to support internationalized email addresses",
"true/punycode": "Needed to support internationalized email addresses, if ext-intl is not installed"
},
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "6.0-dev" "dev-master": "6.1-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -2706,26 +2711,26 @@ ...@@ -2706,26 +2711,26 @@
} }
], ],
"description": "Swiftmailer, free feature-rich PHP mailer", "description": "Swiftmailer, free feature-rich PHP mailer",
"homepage": "http://swiftmailer.symfony.com", "homepage": "https://swiftmailer.symfony.com",
"keywords": [ "keywords": [
"email", "email",
"mail", "mail",
"mailer" "mailer"
], ],
"time": "2017-09-30T22:39:41+00:00" "time": "2018-07-04T11:12:44+00:00"
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v4.0.8", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "aad9a6fe47319f22748fd764f52d3a7ca6fa6b64" "reference": "70591cda56b4b47c55776ac78e157c4bb6c8b43f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/aad9a6fe47319f22748fd764f52d3a7ca6fa6b64", "url": "https://api.github.com/repos/symfony/console/zipball/70591cda56b4b47c55776ac78e157c4bb6c8b43f",
"reference": "aad9a6fe47319f22748fd764f52d3a7ca6fa6b64", "reference": "70591cda56b4b47c55776ac78e157c4bb6c8b43f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2745,7 +2750,7 @@ ...@@ -2745,7 +2750,7 @@
"symfony/process": "~3.4|~4.0" "symfony/process": "~3.4|~4.0"
}, },
"suggest": { "suggest": {
"psr/log": "For using the console logger", "psr/log-implementation": "For using the console logger",
"symfony/event-dispatcher": "", "symfony/event-dispatcher": "",
"symfony/lock": "", "symfony/lock": "",
"symfony/process": "" "symfony/process": ""
...@@ -2753,7 +2758,7 @@ ...@@ -2753,7 +2758,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.0-dev" "dev-master": "4.1-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -2780,20 +2785,20 @@ ...@@ -2780,20 +2785,20 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-04-03T05:24:00+00:00" "time": "2018-05-31T10:17:53+00:00"
}, },
{ {
"name": "symfony/css-selector", "name": "symfony/css-selector",
"version": "v4.0.8", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/css-selector.git", "url": "https://github.com/symfony/css-selector.git",
"reference": "03f965583147957f1ecbad7ea1c9d6fd5e525ec2" "reference": "03ac71606ecb0b0ce792faa17d74cc32c2949ef4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/03f965583147957f1ecbad7ea1c9d6fd5e525ec2", "url": "https://api.github.com/repos/symfony/css-selector/zipball/03ac71606ecb0b0ce792faa17d74cc32c2949ef4",
"reference": "03f965583147957f1ecbad7ea1c9d6fd5e525ec2", "reference": "03ac71606ecb0b0ce792faa17d74cc32c2949ef4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2802,7 +2807,7 @@ ...@@ -2802,7 +2807,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.0-dev" "dev-master": "4.1-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -2833,20 +2838,20 @@ ...@@ -2833,20 +2838,20 @@
], ],
"description": "Symfony CssSelector Component", "description": "Symfony CssSelector Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-03-19T22:35:49+00:00" "time": "2018-05-30T07:26:09+00:00"
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",
"version": "v4.0.8", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/debug.git", "url": "https://github.com/symfony/debug.git",
"reference": "5961d02d48828671f5d8a7805e06579d692f6ede" "reference": "dbe0fad88046a755dcf9379f2964c61a02f5ae3d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/5961d02d48828671f5d8a7805e06579d692f6ede", "url": "https://api.github.com/repos/symfony/debug/zipball/dbe0fad88046a755dcf9379f2964c61a02f5ae3d",
"reference": "5961d02d48828671f5d8a7805e06579d692f6ede", "reference": "dbe0fad88046a755dcf9379f2964c61a02f5ae3d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2862,7 +2867,7 @@ ...@@ -2862,7 +2867,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.0-dev" "dev-master": "4.1-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -2889,20 +2894,20 @@ ...@@ -2889,20 +2894,20 @@
], ],
"description": "Symfony Debug Component", "description": "Symfony Debug Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-04-03T05:24:00+00:00" "time": "2018-06-08T09:39:36+00:00"
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v4.0.8", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/event-dispatcher.git", "url": "https://github.com/symfony/event-dispatcher.git",
"reference": "63353a71073faf08f62caab4e6889b06a787f07b" "reference": "2391ed210a239868e7256eb6921b1bd83f3087b5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/63353a71073faf08f62caab4e6889b06a787f07b", "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2391ed210a239868e7256eb6921b1bd83f3087b5",
"reference": "63353a71073faf08f62caab4e6889b06a787f07b", "reference": "2391ed210a239868e7256eb6921b1bd83f3087b5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2925,7 +2930,7 @@ ...@@ -2925,7 +2930,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.0-dev" "dev-master": "4.1-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -2952,20 +2957,20 @@ ...@@ -2952,20 +2957,20 @@
], ],
"description": "Symfony EventDispatcher Component", "description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-04-06T07:35:43+00:00" "time": "2018-04-06T07:35:57+00:00"
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
"version": "v4.0.8", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/finder.git", "url": "https://github.com/symfony/finder.git",
"reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49" "reference": "84714b8417d19e4ba02ea78a41a975b3efaafddb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/ca27c02b7a3fef4828c998c2ff9ba7aae1641c49", "url": "https://api.github.com/repos/symfony/finder/zipball/84714b8417d19e4ba02ea78a41a975b3efaafddb",
"reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49", "reference": "84714b8417d19e4ba02ea78a41a975b3efaafddb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2974,7 +2979,7 @@ ...@@ -2974,7 +2979,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.0-dev" "dev-master": "4.1-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -3001,20 +3006,20 @@ ...@@ -3001,20 +3006,20 @@
], ],
"description": "Symfony Finder Component", "description": "Symfony Finder Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-04-04T05:10:37+00:00" "time": "2018-06-19T21:38:16+00:00"
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v4.0.8", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-foundation.git", "url": "https://github.com/symfony/http-foundation.git",
"reference": "d0864a82e5891ab61d31eecbaa48bed5a09b8e6c" "reference": "4f9c7cf962e635b0b26b14500ac046e07dbef7f3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/d0864a82e5891ab61d31eecbaa48bed5a09b8e6c", "url": "https://api.github.com/repos/symfony/http-foundation/zipball/4f9c7cf962e635b0b26b14500ac046e07dbef7f3",
"reference": "d0864a82e5891ab61d31eecbaa48bed5a09b8e6c", "reference": "4f9c7cf962e635b0b26b14500ac046e07dbef7f3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3022,12 +3027,13 @@ ...@@ -3022,12 +3027,13 @@
"symfony/polyfill-mbstring": "~1.1" "symfony/polyfill-mbstring": "~1.1"
}, },
"require-dev": { "require-dev": {
"predis/predis": "~1.0",
"symfony/expression-language": "~3.4|~4.0" "symfony/expression-language": "~3.4|~4.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.0-dev" "dev-master": "4.1-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -3054,33 +3060,34 @@ ...@@ -3054,33 +3060,34 @@
], ],
"description": "Symfony HttpFoundation Component", "description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-04-03T05:24:00+00:00" "time": "2018-06-19T21:38:16+00:00"
}, },
{ {
"name": "symfony/http-kernel", "name": "symfony/http-kernel",
"version": "v4.0.8", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-kernel.git", "url": "https://github.com/symfony/http-kernel.git",
"reference": "6dd620d96d64456075536ffe3c6c4658dd689021" "reference": "29c094a1c4f8209b7e033f612cbbd69029e38955"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/6dd620d96d64456075536ffe3c6c4658dd689021", "url": "https://api.github.com/repos/symfony/http-kernel/zipball/29c094a1c4f8209b7e033f612cbbd69029e38955",
"reference": "6dd620d96d64456075536ffe3c6c4658dd689021", "reference": "29c094a1c4f8209b7e033f612cbbd69029e38955",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1.3", "php": "^7.1.3",
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/debug": "~3.4|~4.0", "symfony/debug": "~3.4|~4.0",
"symfony/event-dispatcher": "~3.4|~4.0", "symfony/event-dispatcher": "~4.1",
"symfony/http-foundation": "~3.4.4|~4.0.4" "symfony/http-foundation": "^4.1.1",
"symfony/polyfill-ctype": "~1.8"
}, },
"conflict": { "conflict": {
"symfony/config": "<3.4", "symfony/config": "<3.4",
"symfony/dependency-injection": "<3.4.5|<4.0.5,>=4", "symfony/dependency-injection": "<4.1",
"symfony/var-dumper": "<3.4", "symfony/var-dumper": "<4.1.1",
"twig/twig": "<1.34|<2.4,>=2" "twig/twig": "<1.34|<2.4,>=2"
}, },
"provide": { "provide": {
...@@ -3092,7 +3099,7 @@ ...@@ -3092,7 +3099,7 @@
"symfony/config": "~3.4|~4.0", "symfony/config": "~3.4|~4.0",
"symfony/console": "~3.4|~4.0", "symfony/console": "~3.4|~4.0",
"symfony/css-selector": "~3.4|~4.0", "symfony/css-selector": "~3.4|~4.0",
"symfony/dependency-injection": "^3.4.5|^4.0.5", "symfony/dependency-injection": "^4.1",
"symfony/dom-crawler": "~3.4|~4.0", "symfony/dom-crawler": "~3.4|~4.0",
"symfony/expression-language": "~3.4|~4.0", "symfony/expression-language": "~3.4|~4.0",
"symfony/finder": "~3.4|~4.0", "symfony/finder": "~3.4|~4.0",
...@@ -3101,7 +3108,7 @@ ...@@ -3101,7 +3108,7 @@
"symfony/stopwatch": "~3.4|~4.0", "symfony/stopwatch": "~3.4|~4.0",
"symfony/templating": "~3.4|~4.0", "symfony/templating": "~3.4|~4.0",
"symfony/translation": "~3.4|~4.0", "symfony/translation": "~3.4|~4.0",
"symfony/var-dumper": "~3.4|~4.0" "symfony/var-dumper": "^4.1.1"
}, },
"suggest": { "suggest": {
"symfony/browser-kit": "", "symfony/browser-kit": "",
...@@ -3113,7 +3120,7 @@ ...@@ -3113,7 +3120,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.0-dev" "dev-master": "4.1-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -3140,20 +3147,75 @@ ...@@ -3140,20 +3147,75 @@
], ],
"description": "Symfony HttpKernel Component", "description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-04-06T16:25:03+00:00" "time": "2018-06-25T13:06:45+00:00"
},
{
"name": "symfony/polyfill-ctype",
"version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
"reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.8-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Ctype\\": ""
},
"files": [
"bootstrap.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
},
{
"name": "Gert de Pagter",
"email": "BackEndTea@gmail.com"
}
],
"description": "Symfony polyfill for ctype functions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"ctype",
"polyfill",
"portable"
],
"time": "2018-04-30T19:57:29+00:00"
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
"version": "v1.7.0", "version": "v1.8.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git", "url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b" "reference": "3296adf6a6454a050679cde90f95350ad604b171"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b", "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171",
"reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b", "reference": "3296adf6a6454a050679cde90f95350ad604b171",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3165,7 +3227,7 @@ ...@@ -3165,7 +3227,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.7-dev" "dev-master": "1.8-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -3199,20 +3261,20 @@ ...@@ -3199,20 +3261,20 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2018-01-30T19:27:44+00:00" "time": "2018-04-26T10:06:28+00:00"
}, },
{ {
"name": "symfony/polyfill-php56", "name": "symfony/polyfill-php56",
"version": "v1.7.0", "version": "v1.8.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php56.git", "url": "https://github.com/symfony/polyfill-php56.git",
"reference": "ebc999ce5f14204c5150b9bd15f8f04e621409d8" "reference": "af98553c84912459db3f636329567809d639a8f6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/ebc999ce5f14204c5150b9bd15f8f04e621409d8", "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/af98553c84912459db3f636329567809d639a8f6",
"reference": "ebc999ce5f14204c5150b9bd15f8f04e621409d8", "reference": "af98553c84912459db3f636329567809d639a8f6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3222,7 +3284,7 @@ ...@@ -3222,7 +3284,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.7-dev" "dev-master": "1.8-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -3255,20 +3317,20 @@ ...@@ -3255,20 +3317,20 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2018-01-30T19:27:44+00:00" "time": "2018-04-26T10:06:28+00:00"
}, },
{ {
"name": "symfony/polyfill-php72", "name": "symfony/polyfill-php72",
"version": "v1.7.0", "version": "v1.8.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php72.git", "url": "https://github.com/symfony/polyfill-php72.git",
"reference": "8eca20c8a369e069d4f4c2ac9895144112867422" "reference": "a4576e282d782ad82397f3e4ec1df8e0f0cafb46"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/8eca20c8a369e069d4f4c2ac9895144112867422", "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/a4576e282d782ad82397f3e4ec1df8e0f0cafb46",
"reference": "8eca20c8a369e069d4f4c2ac9895144112867422", "reference": "a4576e282d782ad82397f3e4ec1df8e0f0cafb46",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3277,7 +3339,7 @@ ...@@ -3277,7 +3339,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.7-dev" "dev-master": "1.8-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -3310,20 +3372,20 @@ ...@@ -3310,20 +3372,20 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2018-01-31T17:43:24+00:00" "time": "2018-04-26T10:06:28+00:00"
}, },
{ {
"name": "symfony/polyfill-util", "name": "symfony/polyfill-util",
"version": "v1.7.0", "version": "v1.8.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-util.git", "url": "https://github.com/symfony/polyfill-util.git",
"reference": "e17c808ec4228026d4f5a8832afa19be85979563" "reference": "1a5ad95d9436cbff3296034fe9f8d586dce3fb3a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-util/zipball/e17c808ec4228026d4f5a8832afa19be85979563", "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/1a5ad95d9436cbff3296034fe9f8d586dce3fb3a",
"reference": "e17c808ec4228026d4f5a8832afa19be85979563", "reference": "1a5ad95d9436cbff3296034fe9f8d586dce3fb3a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3332,7 +3394,7 @@ ...@@ -3332,7 +3394,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.7-dev" "dev-master": "1.8-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -3362,20 +3424,20 @@ ...@@ -3362,20 +3424,20 @@
"polyfill", "polyfill",
"shim" "shim"
], ],
"time": "2018-01-31T18:08:44+00:00" "time": "2018-04-26T10:06:28+00:00"
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v4.0.8", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/process.git", "url": "https://github.com/symfony/process.git",
"reference": "d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25" "reference": "1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25", "url": "https://api.github.com/repos/symfony/process/zipball/1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a",
"reference": "d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25", "reference": "1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3384,7 +3446,7 @@ ...@@ -3384,7 +3446,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.0-dev" "dev-master": "4.1-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -3411,20 +3473,20 @@ ...@@ -3411,20 +3473,20 @@
], ],
"description": "Symfony Process Component", "description": "Symfony Process Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-04-03T05:24:00+00:00" "time": "2018-05-31T10:17:53+00:00"
}, },
{ {
"name": "symfony/routing", "name": "symfony/routing",
"version": "v4.0.8", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/routing.git", "url": "https://github.com/symfony/routing.git",
"reference": "0663036dd57dbfd4e9ff29f75bbd5dd3253ebe71" "reference": "b38b9797327b26ea2e4146a40e6e2dc9820a6932"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/0663036dd57dbfd4e9ff29f75bbd5dd3253ebe71", "url": "https://api.github.com/repos/symfony/routing/zipball/b38b9797327b26ea2e4146a40e6e2dc9820a6932",
"reference": "0663036dd57dbfd4e9ff29f75bbd5dd3253ebe71", "reference": "b38b9797327b26ea2e4146a40e6e2dc9820a6932",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3437,7 +3499,6 @@ ...@@ -3437,7 +3499,6 @@
}, },
"require-dev": { "require-dev": {
"doctrine/annotations": "~1.0", "doctrine/annotations": "~1.0",
"doctrine/common": "~2.2",
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/config": "~3.4|~4.0", "symfony/config": "~3.4|~4.0",
"symfony/dependency-injection": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0",
...@@ -3456,7 +3517,7 @@ ...@@ -3456,7 +3517,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.0-dev" "dev-master": "4.1-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -3489,20 +3550,20 @@ ...@@ -3489,20 +3550,20 @@
"uri", "uri",
"url" "url"
], ],
"time": "2018-04-04T13:50:32+00:00" "time": "2018-06-19T21:38:16+00:00"
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
"version": "v4.0.8", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/translation.git", "url": "https://github.com/symfony/translation.git",
"reference": "e20a9b7f9f62cb33a11638b345c248e7d510c938" "reference": "b6d8164085ee0b6debcd1b7a131fd6f63bb04854"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/e20a9b7f9f62cb33a11638b345c248e7d510c938", "url": "https://api.github.com/repos/symfony/translation/zipball/b6d8164085ee0b6debcd1b7a131fd6f63bb04854",
"reference": "e20a9b7f9f62cb33a11638b345c248e7d510c938", "reference": "b6d8164085ee0b6debcd1b7a131fd6f63bb04854",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3517,20 +3578,21 @@ ...@@ -3517,20 +3578,21 @@
"require-dev": { "require-dev": {
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/config": "~3.4|~4.0", "symfony/config": "~3.4|~4.0",
"symfony/console": "~3.4|~4.0",
"symfony/dependency-injection": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0",
"symfony/finder": "~2.8|~3.0|~4.0", "symfony/finder": "~2.8|~3.0|~4.0",
"symfony/intl": "~3.4|~4.0", "symfony/intl": "~3.4|~4.0",
"symfony/yaml": "~3.4|~4.0" "symfony/yaml": "~3.4|~4.0"
}, },
"suggest": { "suggest": {
"psr/log": "To use logging capability in translator", "psr/log-implementation": "To use logging capability in translator",
"symfony/config": "", "symfony/config": "",
"symfony/yaml": "" "symfony/yaml": ""
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.0-dev" "dev-master": "4.1-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -3557,20 +3619,20 @@ ...@@ -3557,20 +3619,20 @@
], ],
"description": "Symfony Translation Component", "description": "Symfony Translation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-02-22T10:50:29+00:00" "time": "2018-06-22T08:59:39+00:00"
}, },
{ {
"name": "symfony/var-dumper", "name": "symfony/var-dumper",
"version": "v4.0.8", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/var-dumper.git", "url": "https://github.com/symfony/var-dumper.git",
"reference": "e1b4d008100f4d203cc38b0d793ad6252d8d8af0" "reference": "b2eebaec085d1f2cafbad7644733d494a3bbbc9b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/e1b4d008100f4d203cc38b0d793ad6252d8d8af0", "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b2eebaec085d1f2cafbad7644733d494a3bbbc9b",
"reference": "e1b4d008100f4d203cc38b0d793ad6252d8d8af0", "reference": "b2eebaec085d1f2cafbad7644733d494a3bbbc9b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3579,20 +3641,26 @@ ...@@ -3579,20 +3641,26 @@
"symfony/polyfill-php72": "~1.5" "symfony/polyfill-php72": "~1.5"
}, },
"conflict": { "conflict": {
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
"symfony/console": "<3.4"
}, },
"require-dev": { "require-dev": {
"ext-iconv": "*", "ext-iconv": "*",
"symfony/process": "~3.4|~4.0",
"twig/twig": "~1.34|~2.4" "twig/twig": "~1.34|~2.4"
}, },
"suggest": { "suggest": {
"ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
"ext-intl": "To show region name in time zone dump" "ext-intl": "To show region name in time zone dump",
"symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
}, },
"bin": [
"Resources/bin/var-dump-server"
],
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.0-dev" "dev-master": "4.1-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -3626,7 +3694,7 @@ ...@@ -3626,7 +3694,7 @@
"debug", "debug",
"dump" "dump"
], ],
"time": "2018-04-04T05:10:37+00:00" "time": "2018-06-23T12:23:56+00:00"
}, },
{ {
"name": "tijsverkoyen/css-to-inline-styles", "name": "tijsverkoyen/css-to-inline-styles",
...@@ -3677,16 +3745,16 @@ ...@@ -3677,16 +3745,16 @@
}, },
{ {
"name": "tymon/jwt-auth", "name": "tymon/jwt-auth",
"version": "dev-develop", "version": "1.0.0-rc.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/tymondesigns/jwt-auth.git", "url": "https://github.com/tymondesigns/jwt-auth.git",
"reference": "2b79229235d83523a05069ccb9c97cd5ec0b8123" "reference": "d5220f6a84cbb8300f6f2f0f20aa908d072b4e4b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/tymondesigns/jwt-auth/zipball/2b79229235d83523a05069ccb9c97cd5ec0b8123", "url": "https://api.github.com/repos/tymondesigns/jwt-auth/zipball/d5220f6a84cbb8300f6f2f0f20aa908d072b4e4b",
"reference": "2b79229235d83523a05069ccb9c97cd5ec0b8123", "reference": "d5220f6a84cbb8300f6f2f0f20aa908d072b4e4b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3748,20 +3816,20 @@ ...@@ -3748,20 +3816,20 @@
"jwt", "jwt",
"laravel" "laravel"
], ],
"time": "2018-03-10T22:14:03+00:00" "time": "2018-02-07T20:55:14+00:00"
}, },
{ {
"name": "unisharp/laravel-filemanager", "name": "unisharp/laravel-filemanager",
"version": "v1.8.4", "version": "v1.9.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/UniSharp/laravel-filemanager.git", "url": "https://github.com/UniSharp/laravel-filemanager.git",
"reference": "ccbba303a3a66a9706b50c98923af12e2f9ac02a" "reference": "aaf2764f26eb8dcc9356bea1e25010333c2e61f4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/UniSharp/laravel-filemanager/zipball/ccbba303a3a66a9706b50c98923af12e2f9ac02a", "url": "https://api.github.com/repos/UniSharp/laravel-filemanager/zipball/aaf2764f26eb8dcc9356bea1e25010333c2e61f4",
"reference": "ccbba303a3a66a9706b50c98923af12e2f9ac02a", "reference": "aaf2764f26eb8dcc9356bea1e25010333c2e61f4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3787,14 +3855,14 @@ ...@@ -3787,14 +3855,14 @@
"extra": { "extra": {
"laravel": { "laravel": {
"providers": [ "providers": [
"Unisharp\\Laravelfilemanager\\LaravelFilemanagerServiceProvider" "UniSharp\\LaravelFilemanager\\LaravelFilemanagerServiceProvider"
], ],
"aliases": [] "aliases": []
} }
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Unisharp\\Laravelfilemanager\\": "src/" "UniSharp\\LaravelFilemanager\\": "src/"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
...@@ -3822,32 +3890,32 @@ ...@@ -3822,32 +3890,32 @@
"tinymce", "tinymce",
"upload" "upload"
], ],
"time": "2017-12-28T09:23:53+00:00" "time": "2018-07-05T11:36:08+00:00"
}, },
{ {
"name": "vlucas/phpdotenv", "name": "vlucas/phpdotenv",
"version": "v2.4.0", "version": "v2.5.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/vlucas/phpdotenv.git", "url": "https://github.com/vlucas/phpdotenv.git",
"reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c" "reference": "6ae3e2e6494bb5e58c2decadafc3de7f1453f70a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c", "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/6ae3e2e6494bb5e58c2decadafc3de7f1453f70a",
"reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c", "reference": "6ae3e2e6494bb5e58c2decadafc3de7f1453f70a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.9" "php": ">=5.3.9"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.8 || ^5.0" "phpunit/phpunit": "^4.8.35 || ^5.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.4-dev" "dev-master": "2.5-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -3857,7 +3925,7 @@ ...@@ -3857,7 +3925,7 @@
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"BSD-3-Clause-Attribution" "BSD-3-Clause"
], ],
"authors": [ "authors": [
{ {
...@@ -3872,20 +3940,20 @@ ...@@ -3872,20 +3940,20 @@
"env", "env",
"environment" "environment"
], ],
"time": "2016-09-01T10:05:43+00:00" "time": "2018-07-01T10:25:50+00:00"
}, },
{ {
"name": "yajra/laravel-datatables-oracle", "name": "yajra/laravel-datatables-oracle",
"version": "v8.4.3", "version": "v8.7.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/yajra/laravel-datatables.git", "url": "https://github.com/yajra/laravel-datatables.git",
"reference": "9a87175e5ca02627aec98ec767fce5f5cbc98177" "reference": "34c281691df93374ac2b3d96e8611f0a6abf2b47"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/9a87175e5ca02627aec98ec767fce5f5cbc98177", "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/34c281691df93374ac2b3d96e8611f0a6abf2b47",
"reference": "9a87175e5ca02627aec98ec767fce5f5cbc98177", "reference": "34c281691df93374ac2b3d96e8611f0a6abf2b47",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3943,22 +4011,22 @@ ...@@ -3943,22 +4011,22 @@
"jquery", "jquery",
"laravel" "laravel"
], ],
"time": "2018-04-05T14:51:57+00:00" "time": "2018-06-03T01:33:29+00:00"
} }
], ],
"packages-dev": [ "packages-dev": [
{ {
"name": "barryvdh/laravel-debugbar", "name": "barryvdh/laravel-debugbar",
"version": "v3.1.4", "version": "v3.1.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/barryvdh/laravel-debugbar.git", "url": "https://github.com/barryvdh/laravel-debugbar.git",
"reference": "7a91480cc6e597caed5117a3c5d685f06d35c5a1" "reference": "d3cdca2ad6cc6e67735b4a63e7551c690a497f5f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/7a91480cc6e597caed5117a3c5d685f06d35c5a1", "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/d3cdca2ad6cc6e67735b4a63e7551c690a497f5f",
"reference": "7a91480cc6e597caed5117a3c5d685f06d35c5a1", "reference": "d3cdca2ad6cc6e67735b4a63e7551c690a497f5f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -4013,20 +4081,20 @@ ...@@ -4013,20 +4081,20 @@
"profiler", "profiler",
"webprofiler" "webprofiler"
], ],
"time": "2018-03-06T08:35:31+00:00" "time": "2018-05-03T18:27:04+00:00"
}, },
{ {
"name": "bvipul/generator", "name": "bvipul/generator",
"version": "dev-master", "version": "v5.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/bvipul/generator.git", "url": "https://github.com/bvipul/generator.git",
"reference": "18b79a924aa40ee0c199c0cd65a454db1be55d42" "reference": "e434c59a4d88eb963460e6facef792688efcc154"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/bvipul/generator/zipball/18b79a924aa40ee0c199c0cd65a454db1be55d42", "url": "https://api.github.com/repos/bvipul/generator/zipball/e434c59a4d88eb963460e6facef792688efcc154",
"reference": "18b79a924aa40ee0c199c0cd65a454db1be55d42", "reference": "e434c59a4d88eb963460e6facef792688efcc154",
"shasum": "" "shasum": ""
}, },
"type": "package", "type": "package",
...@@ -4046,30 +4114,75 @@ ...@@ -4046,30 +4114,75 @@
} }
], ],
"description": "To create a whole module with all related files like model, controller, repository, routes, views etc with a simple GUI.", "description": "To create a whole module with all related files like model, controller, repository, routes, views etc with a simple GUI.",
"time": "2018-04-13T17:56:21+00:00" "time": "2018-06-23T17:18:07+00:00"
},
{
"name": "codedungeon/php-cli-colors",
"version": "1.10.7",
"source": {
"type": "git",
"url": "https://github.com/mikeerickson/php-cli-colors.git",
"reference": "5649ef76ec0c9ed626e95bf40fdfaf4b8efcf79b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mikeerickson/php-cli-colors/zipball/5649ef76ec0c9ed626e95bf40fdfaf4b8efcf79b",
"reference": "5649ef76ec0c9ed626e95bf40fdfaf4b8efcf79b",
"shasum": ""
},
"require-dev": {
"phpunit/phpunit": ">=5.2"
},
"type": "library",
"autoload": {
"psr-4": {
"Codedungeon\\PHPCliColors\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Mike Erickson",
"email": "codedungeon@gmail.com"
}
],
"description": "PHP Package for using color output in CLI commands",
"homepage": "https://github.com/mikeerickson/php-cli-colors",
"keywords": [
"color",
"colors",
"composer",
"package",
"php"
],
"time": "2018-05-17T01:34:14+00:00"
}, },
{ {
"name": "codedungeon/phpunit-result-printer", "name": "codedungeon/phpunit-result-printer",
"version": "0.6.1", "version": "0.19.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/mikeerickson/phpunit-pretty-result-printer.git", "url": "https://github.com/mikeerickson/phpunit-pretty-result-printer.git",
"reference": "e4cbf937b422bd2ce5ff9929e77592eb8188dbe6" "reference": "3ff0ebbfeca8cf57e0493b9a0a45f22a70626989"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/mikeerickson/phpunit-pretty-result-printer/zipball/e4cbf937b422bd2ce5ff9929e77592eb8188dbe6", "url": "https://api.github.com/repos/mikeerickson/phpunit-pretty-result-printer/zipball/3ff0ebbfeca8cf57e0493b9a0a45f22a70626989",
"reference": "e4cbf937b422bd2ce5ff9929e77592eb8188dbe6", "reference": "3ff0ebbfeca8cf57e0493b9a0a45f22a70626989",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"codedungeon/php-cli-colors": "^1.10",
"hassankhan/config": "^0.10.0", "hassankhan/config": "^0.10.0",
"php": "^7.1", "php": "^7.1",
"symfony/yaml": "^2.7|^3.0|^4.0" "symfony/yaml": "^2.7|^3.0|^4.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": ">=5.2", "phpunit/phpunit": "7.1.1",
"spatie/phpunit-watcher": "^1.3" "spatie/phpunit-watcher": "^1.5"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
...@@ -4089,13 +4202,15 @@ ...@@ -4089,13 +4202,15 @@
], ],
"description": "PHPUnit Pretty Result Printer", "description": "PHPUnit Pretty Result Printer",
"keywords": [ "keywords": [
"TDD",
"composer", "composer",
"package", "package",
"phpunit", "phpunit",
"printer", "printer",
"result-printer" "result-printer",
"testing"
], ],
"time": "2018-03-02T23:02:03+00:00" "time": "2018-05-24T02:02:32+00:00"
}, },
{ {
"name": "doctrine/instantiator", "name": "doctrine/instantiator",
...@@ -4153,16 +4268,16 @@ ...@@ -4153,16 +4268,16 @@
}, },
{ {
"name": "filp/whoops", "name": "filp/whoops",
"version": "2.1.14", "version": "2.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/filp/whoops.git", "url": "https://github.com/filp/whoops.git",
"reference": "c6081b8838686aa04f1e83ba7e91f78b7b2a23e6" "reference": "181c4502d8f34db7aed7bfe88d4f87875b8e947a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/filp/whoops/zipball/c6081b8838686aa04f1e83ba7e91f78b7b2a23e6", "url": "https://api.github.com/repos/filp/whoops/zipball/181c4502d8f34db7aed7bfe88d4f87875b8e947a",
"reference": "c6081b8838686aa04f1e83ba7e91f78b7b2a23e6", "reference": "181c4502d8f34db7aed7bfe88d4f87875b8e947a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -4170,9 +4285,9 @@ ...@@ -4170,9 +4285,9 @@
"psr/log": "^1.0.1" "psr/log": "^1.0.1"
}, },
"require-dev": { "require-dev": {
"mockery/mockery": "0.9.*", "mockery/mockery": "^0.9 || ^1.0",
"phpunit/phpunit": "^4.8.35 || ^5.7", "phpunit/phpunit": "^4.8.35 || ^5.7",
"symfony/var-dumper": "^2.6 || ^3.0" "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0"
}, },
"suggest": { "suggest": {
"symfony/var-dumper": "Pretty print complex values better with var-dumper available", "symfony/var-dumper": "Pretty print complex values better with var-dumper available",
...@@ -4181,7 +4296,7 @@ ...@@ -4181,7 +4296,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.0-dev" "dev-master": "2.1-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -4210,7 +4325,7 @@ ...@@ -4210,7 +4325,7 @@
"throwable", "throwable",
"whoops" "whoops"
], ],
"time": "2017-11-23T18:22:44+00:00" "time": "2018-03-03T17:56:25+00:00"
}, },
{ {
"name": "fzaninotto/faker", "name": "fzaninotto/faker",
...@@ -4540,25 +4655,28 @@ ...@@ -4540,25 +4655,28 @@
}, },
{ {
"name": "myclabs/deep-copy", "name": "myclabs/deep-copy",
"version": "1.7.0", "version": "1.8.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/myclabs/DeepCopy.git", "url": "https://github.com/myclabs/DeepCopy.git",
"reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
"reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.6 || ^7.0" "php": "^7.1"
},
"replace": {
"myclabs/deep-copy": "self.version"
}, },
"require-dev": { "require-dev": {
"doctrine/collections": "^1.0", "doctrine/collections": "^1.0",
"doctrine/common": "^2.6", "doctrine/common": "^2.6",
"phpunit/phpunit": "^4.1" "phpunit/phpunit": "^7.1"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
...@@ -4581,7 +4699,7 @@ ...@@ -4581,7 +4699,7 @@
"object", "object",
"object graph" "object graph"
], ],
"time": "2017-10-19T19:58:43+00:00" "time": "2018-06-11T23:09:50+00:00"
}, },
{ {
"name": "phar-io/manifest", "name": "phar-io/manifest",
...@@ -4902,23 +5020,23 @@ ...@@ -4902,23 +5020,23 @@
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
"version": "6.0.3", "version": "6.0.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "774a82c0c5da4c1c7701790c262035d235ab7856" "reference": "865662550c384bc1db7e51d29aeda1c2c161d69a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/774a82c0c5da4c1c7701790c262035d235ab7856", "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/865662550c384bc1db7e51d29aeda1c2c161d69a",
"reference": "774a82c0c5da4c1c7701790c262035d235ab7856", "reference": "865662550c384bc1db7e51d29aeda1c2c161d69a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-dom": "*", "ext-dom": "*",
"ext-xmlwriter": "*", "ext-xmlwriter": "*",
"php": "^7.1", "php": "^7.1",
"phpunit/php-file-iterator": "^1.4.2", "phpunit/php-file-iterator": "^2.0",
"phpunit/php-text-template": "^1.2.1", "phpunit/php-text-template": "^1.2.1",
"phpunit/php-token-stream": "^3.0", "phpunit/php-token-stream": "^3.0",
"sebastian/code-unit-reverse-lookup": "^1.0.1", "sebastian/code-unit-reverse-lookup": "^1.0.1",
...@@ -4961,29 +5079,29 @@ ...@@ -4961,29 +5079,29 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2018-04-06T15:39:20+00:00" "time": "2018-06-01T07:51:50+00:00"
}, },
{ {
"name": "phpunit/php-file-iterator", "name": "phpunit/php-file-iterator",
"version": "1.4.5", "version": "2.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
"reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" "reference": "cecbc684605bb0cc288828eb5d65d93d5c676d3c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cecbc684605bb0cc288828eb5d65d93d5c676d3c",
"reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", "reference": "cecbc684605bb0cc288828eb5d65d93d5c676d3c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": "^7.1"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.4.x-dev" "dev-master": "2.0.x-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -4998,7 +5116,7 @@ ...@@ -4998,7 +5116,7 @@
"authors": [ "authors": [
{ {
"name": "Sebastian Bergmann", "name": "Sebastian Bergmann",
"email": "sb@sebastian-bergmann.de", "email": "sebastian@phpunit.de",
"role": "lead" "role": "lead"
} }
], ],
...@@ -5008,7 +5126,7 @@ ...@@ -5008,7 +5126,7 @@
"filesystem", "filesystem",
"iterator" "iterator"
], ],
"time": "2017-11-27T13:52:08+00:00" "time": "2018-06-11T11:44:00+00:00"
}, },
{ {
"name": "phpunit/php-text-template", "name": "phpunit/php-text-template",
...@@ -5151,35 +5269,35 @@ ...@@ -5151,35 +5269,35 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "7.1.4", "version": "7.2.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "6d51299e307dc510149e0b7cd1931dd11770e1cb" "reference": "400a3836ee549ae6f665323ac3f21e27eac7155f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6d51299e307dc510149e0b7cd1931dd11770e1cb", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/400a3836ee549ae6f665323ac3f21e27eac7155f",
"reference": "6d51299e307dc510149e0b7cd1931dd11770e1cb", "reference": "400a3836ee549ae6f665323ac3f21e27eac7155f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/instantiator": "^1.1",
"ext-dom": "*", "ext-dom": "*",
"ext-json": "*", "ext-json": "*",
"ext-libxml": "*", "ext-libxml": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"ext-xml": "*", "ext-xml": "*",
"myclabs/deep-copy": "^1.6.1", "myclabs/deep-copy": "^1.7",
"phar-io/manifest": "^1.0.1", "phar-io/manifest": "^1.0.1",
"phar-io/version": "^1.0", "phar-io/version": "^1.0",
"php": "^7.1", "php": "^7.1",
"phpspec/prophecy": "^1.7", "phpspec/prophecy": "^1.7",
"phpunit/php-code-coverage": "^6.0.1", "phpunit/php-code-coverage": "^6.0.7",
"phpunit/php-file-iterator": "^1.4.3", "phpunit/php-file-iterator": "^2.0.1",
"phpunit/php-text-template": "^1.2.1", "phpunit/php-text-template": "^1.2.1",
"phpunit/php-timer": "^2.0", "phpunit/php-timer": "^2.0",
"phpunit/phpunit-mock-objects": "^6.1.1", "sebastian/comparator": "^3.0",
"sebastian/comparator": "^2.1 || ^3.0",
"sebastian/diff": "^3.0", "sebastian/diff": "^3.0",
"sebastian/environment": "^3.1", "sebastian/environment": "^3.1",
"sebastian/exporter": "^3.1", "sebastian/exporter": "^3.1",
...@@ -5188,10 +5306,14 @@ ...@@ -5188,10 +5306,14 @@
"sebastian/resource-operations": "^1.0", "sebastian/resource-operations": "^1.0",
"sebastian/version": "^2.0.1" "sebastian/version": "^2.0.1"
}, },
"conflict": {
"phpunit/phpunit-mock-objects": "*"
},
"require-dev": { "require-dev": {
"ext-pdo": "*" "ext-pdo": "*"
}, },
"suggest": { "suggest": {
"ext-soap": "*",
"ext-xdebug": "*", "ext-xdebug": "*",
"phpunit/php-invoker": "^2.0" "phpunit/php-invoker": "^2.0"
}, },
...@@ -5201,7 +5323,7 @@ ...@@ -5201,7 +5323,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "7.1-dev" "dev-master": "7.2-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -5227,63 +5349,7 @@ ...@@ -5227,63 +5349,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2018-04-18T13:41:53+00:00" "time": "2018-06-21T13:13:39+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
"version": "6.1.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
"reference": "70c740bde8fd9ea9ea295be1cd875dd7b267e157"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/70c740bde8fd9ea9ea295be1cd875dd7b267e157",
"reference": "70c740bde8fd9ea9ea295be1cd875dd7b267e157",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.5",
"php": "^7.1",
"phpunit/php-text-template": "^1.2.1",
"sebastian/exporter": "^3.1"
},
"require-dev": {
"phpunit/phpunit": "^7.0"
},
"suggest": {
"ext-soap": "*"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "6.1-dev"
}
},
"autoload": {
"classmap": [
"src/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de",
"role": "lead"
}
],
"description": "Mock Object library for PHPUnit",
"homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
"keywords": [
"mock",
"xunit"
],
"time": "2018-04-11T04:50:36+00:00"
}, },
{ {
"name": "sebastian/code-unit-reverse-lookup", "name": "sebastian/code-unit-reverse-lookup",
...@@ -5332,16 +5398,16 @@ ...@@ -5332,16 +5398,16 @@
}, },
{ {
"name": "sebastian/comparator", "name": "sebastian/comparator",
"version": "3.0.0", "version": "3.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git", "url": "https://github.com/sebastianbergmann/comparator.git",
"reference": "ed5fd2281113729f1ebcc64d101ad66028aeb3d5" "reference": "591a30922f54656695e59b1f39501aec513403da"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/ed5fd2281113729f1ebcc64d101ad66028aeb3d5", "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/591a30922f54656695e59b1f39501aec513403da",
"reference": "ed5fd2281113729f1ebcc64d101ad66028aeb3d5", "reference": "591a30922f54656695e59b1f39501aec513403da",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -5392,20 +5458,20 @@ ...@@ -5392,20 +5458,20 @@
"compare", "compare",
"equality" "equality"
], ],
"time": "2018-04-18T13:33:00+00:00" "time": "2018-06-14T15:05:28+00:00"
}, },
{ {
"name": "sebastian/diff", "name": "sebastian/diff",
"version": "3.0.0", "version": "3.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/diff.git", "url": "https://github.com/sebastianbergmann/diff.git",
"reference": "e09160918c66281713f1c324c1f4c4c3037ba1e8" "reference": "366541b989927187c4ca70490a35615d3fef2dce"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/e09160918c66281713f1c324c1f4c4c3037ba1e8", "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/366541b989927187c4ca70490a35615d3fef2dce",
"reference": "e09160918c66281713f1c324c1f4c4c3037ba1e8", "reference": "366541b989927187c4ca70490a35615d3fef2dce",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -5448,7 +5514,7 @@ ...@@ -5448,7 +5514,7 @@
"unidiff", "unidiff",
"unified diff" "unified diff"
], ],
"time": "2018-02-01T13:45:15+00:00" "time": "2018-06-10T07:54:39+00:00"
}, },
{ {
"name": "sebastian/environment", "name": "sebastian/environment",
...@@ -5850,20 +5916,21 @@ ...@@ -5850,20 +5916,21 @@
}, },
{ {
"name": "symfony/dom-crawler", "name": "symfony/dom-crawler",
"version": "v4.0.8", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/dom-crawler.git", "url": "https://github.com/symfony/dom-crawler.git",
"reference": "d6c04c7532535b5e0b63db45b543cd60818e0fbc" "reference": "3350cacf151b48d903114ab8f7a4ccb23e07e10a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/d6c04c7532535b5e0b63db45b543cd60818e0fbc", "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/3350cacf151b48d903114ab8f7a4ccb23e07e10a",
"reference": "d6c04c7532535b5e0b63db45b543cd60818e0fbc", "reference": "3350cacf151b48d903114ab8f7a4ccb23e07e10a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1.3", "php": "^7.1.3",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-mbstring": "~1.0" "symfony/polyfill-mbstring": "~1.0"
}, },
"require-dev": { "require-dev": {
...@@ -5875,7 +5942,7 @@ ...@@ -5875,7 +5942,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.0-dev" "dev-master": "4.1-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -5902,24 +5969,25 @@ ...@@ -5902,24 +5969,25 @@
], ],
"description": "Symfony DomCrawler Component", "description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-03-19T22:35:49+00:00" "time": "2018-05-01T23:02:13+00:00"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v4.0.8", "version": "v4.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/yaml.git", "url": "https://github.com/symfony/yaml.git",
"reference": "8b34ebb5989df61cbd77eff29a02c4db9ac1069c" "reference": "80e4bfa9685fc4a09acc4a857ec16974a9cd944e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/8b34ebb5989df61cbd77eff29a02c4db9ac1069c", "url": "https://api.github.com/repos/symfony/yaml/zipball/80e4bfa9685fc4a09acc4a857ec16974a9cd944e",
"reference": "8b34ebb5989df61cbd77eff29a02c4db9ac1069c", "reference": "80e4bfa9685fc4a09acc4a857ec16974a9cd944e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1.3" "php": "^7.1.3",
"symfony/polyfill-ctype": "~1.8"
}, },
"conflict": { "conflict": {
"symfony/console": "<3.4" "symfony/console": "<3.4"
...@@ -5933,7 +6001,7 @@ ...@@ -5933,7 +6001,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.0-dev" "dev-master": "4.1-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -5960,7 +6028,7 @@ ...@@ -5960,7 +6028,7 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-04-03T05:24:00+00:00" "time": "2018-05-30T07:26:09+00:00"
}, },
{ {
"name": "theseer/tokenizer", "name": "theseer/tokenizer",
...@@ -6162,8 +6230,7 @@ ...@@ -6162,8 +6230,7 @@
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": {
"tymon/jwt-auth": 20, "tymon/jwt-auth": 5
"bvipul/generator": 20
}, },
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
}, },
"devDependencies": { "devDependencies": {
"axios": "^0.17", "axios": "^0.18",
"bootstrap-sass": "^3.3.7", "bootstrap-sass": "^3.3.7",
"cross-env": "^5.1", "cross-env": "^5.1",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
"datatables.net-buttons": "^1.3.1", "datatables.net-buttons": "^1.3.1",
"moment": "^2.18.1", "moment": "^2.18.1",
"nestable2": "^1.5.0", "nestable2": "^1.5.0",
"node-sass": "^4.9.0",
"pluralize": "^7.0.0", "pluralize": "^7.0.0",
"select2": "^4.0.4", "select2": "^4.0.4",
"tinymce": "^4.5.8" "tinymce": "^4.5.8"
......
...@@ -743,7 +743,7 @@ function _init() { ...@@ -743,7 +743,7 @@ function _init() {
* or customize the JavaScript scaffolding to fit your unique needs. * or customize the JavaScript scaffolding to fit your unique needs.
*/ */
Vue.component('flash', require('../components/backend/Flash.vue')); Vue.component('flash', require('../components/Flash.vue'));
Vue.component('export-component', require('../components/backend/Export.vue')); Vue.component('export-component', require('../components/backend/Export.vue'));
const app = new Vue({ const app = new Vue({
......
...@@ -29,11 +29,16 @@ export default { ...@@ -29,11 +29,16 @@ export default {
methods: { methods: {
flash(message, type) { flash(message, type) {
this.body = message;
this.typeClass = "alert alert-" + type; if (! type) {
this.show = true; type = "info";
}
this.hide(); this.body = message;
this.typeClass = "alert alert-" + type;
this.show = true;
this.hide();
}, },
hide() { hide() {
......
...@@ -13,6 +13,7 @@ require('../bootstrap'); ...@@ -13,6 +13,7 @@ require('../bootstrap');
* or customize the JavaScript scaffolding to fit your unique needs. * or customize the JavaScript scaffolding to fit your unique needs.
*/ */
Vue.component('flash', require('../components/Flash.vue'));
Vue.component('example', require('../components/frontend/Example.vue')); Vue.component('example', require('../components/frontend/Example.vue'));
const app = new Vue({ const app = new Vue({
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<h3 class="box-title">{{ trans('labels.backend.faqs.create') }}</h3> <h3 class="box-title">{{ trans('labels.backend.faqs.create') }}</h3>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
@include('backend.includes.partials.faqs-header-buttons') @include('backend.faqs.partials.faqs-header-buttons')
</div><!--box-tools pull-right--> </div><!--box-tools pull-right-->
</div><!-- /.box-header --> </div><!-- /.box-header -->
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<h3 class="box-title">{{ trans('labels.backend.faqs.edit') }}</h3> <h3 class="box-title">{{ trans('labels.backend.faqs.edit') }}</h3>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
@include('backend.includes.partials.faqs-header-buttons') @include('backend.faqs.partials.faqs-header-buttons')
</div><!--box-tools pull-right--> </div><!--box-tools pull-right-->
</div><!-- /.box-header --> </div><!-- /.box-header -->
...@@ -34,4 +34,4 @@ ...@@ -34,4 +34,4 @@
</div><!--box--> </div><!--box-->
</div> </div>
{{ Form::close() }} {{ Form::close() }}
@endsection @endsection
\ No newline at end of file
...@@ -36,9 +36,7 @@ ...@@ -36,9 +36,7 @@
<!-- Scripts --> <!-- Scripts -->
<script> <script>
window.Laravel = <?php echo json_encode([ window.Laravel = {!! json_encode([ 'csrfToken' => csrf_token() ]) !!};
'csrfToken' => csrf_token(),
]); ?>
</script> </script>
</head> </head>
<body class="skin-{{ config('backend.theme') }} {{ config('backend.layout') }}"> <body class="skin-{{ config('backend.theme') }} {{ config('backend.layout') }}">
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
</div><!--navbar-header--> </div><!--navbar-header-->
<div class="collapse navbar-collapse" id="frontend-navbar-collapse"> <div class="collapse navbar-collapse" id="frontend-navbar-collapse">
<ul class="nav navbar-nav"> {{-- <ul class="nav navbar-nav">
<li>{{ link_to_route('frontend.macros', trans('navs.frontend.macros')) }}</li> <li></li>
</ul> </ul> --}}
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
@if (config('locale.status') && count(config('locale.languages')) > 1) @if (config('locale.status') && count(config('locale.languages')) > 1)
<li class="dropdown"> <li class="dropdown">
......
@extends('frontend.layouts.app')
@section('content')
<div class="row">
<div class="col-xs-12">
<div class="panel panel-default">
<div class="panel-heading"><i class="fa fa-home"></i> {{ trans('labels.frontend.macros.macro_examples') }}</div>
<div class="panel-body">
<div class="form-group">
<label>{{ trans('labels.frontend.macros.state.us.us') }}</label>
{{-- Shorthand for this is just selectState, set which version is shorthanded in Macros/Dropdowns --}}
{{ Form::selectStateUS('state', 'NY', ['class' => 'form-control']) }}
</div>
<div class="form-group">
<label>{{ trans('labels.frontend.macros.state.us.outlying') }}</label>
{{ Form::selectStateUSOutlyingTerritories('state_outlying', null, ['class' => 'form-control']) }}
</div>
<div class="form-group">
<label>{{ trans('labels.frontend.macros.state.us.armed') }}</label>
{{ Form::selectStateUSArmedForces('armed_forces', null, ['class' => 'form-control']) }}
</div>
<div class="form-group">
<label>{{ trans('labels.frontend.macros.territories.canada') }}</label>
{{ Form::selectCanadaTerritories('canada_territories', null, ['class' => 'form-control']) }}
</div>
<div class="form-group">
<label>{{ trans('labels.frontend.macros.state.mexico') }}</label>
{{ Form::selectStateMexico('mexico', null, ['class' => 'form-control']) }}
</div>
<div class="form-group">
<label>{{ trans('labels.frontend.macros.country.alpha') }}</label>
{{ Form::selectCountryAlpha('country_alpha', 'ISO 3166-2:US', ['class' => 'form-control']) }}
</div>
<div class="form-group">
<label>{{ trans('labels.frontend.macros.country.alpha2') }}</label>
{{-- Shorthand for this is just selectCountry, set which version is shorthanded in Macros/Dropdowns --}}
{{ Form::selectCountryAlpha2('country_alpha2', 'US', ['class' => 'form-control']) }}
</div>
<div class="form-group">
<label>{{ trans('labels.frontend.macros.country.alpha3') }}</label>
{{ Form::selectCountryAlpha3('country_alpha3', 'USA', ['class' => 'form-control']) }}
</div>
<div class="form-group">
<label>{{ trans('labels.frontend.macros.country.numeric') }}</label>
{{ Form::selectCountryNumeric('country_numeric', '840', ['class' => 'form-control']) }}
</div>
<div class="form-group">
<label>{{ trans('labels.frontend.macros.timezone') }}</label>
{{ Form::selectTimezone('timezone', 'America/New_York', ['class' => 'form-control']) }}
</div>
</div>
</div><!-- panel -->
</div><!-- col-md-10 -->
</div><!-- row -->
@endsection
\ No newline at end of file
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
* All route names are prefixed with 'frontend.'. * All route names are prefixed with 'frontend.'.
*/ */
Route::get('/', 'FrontendController@index')->name('index'); Route::get('/', 'FrontendController@index')->name('index');
Route::get('macros', 'FrontendController@macros')->name('macros');
Route::post('/get/states', 'FrontendController@getStates')->name('get.states'); Route::post('/get/states', 'FrontendController@getStates')->name('get.states');
Route::post('/get/cities', 'FrontendController@getCities')->name('get.cities'); Route::post('/get/cities', 'FrontendController@getCities')->name('get.cities');
......
...@@ -76,4 +76,17 @@ class ManageBlogCategoriesTest extends TestCase ...@@ -76,4 +76,17 @@ class ManageBlogCategoriesTest extends TestCase
$this->assertDatabaseMissing(config('module.blog_categories.table'), ['name' => $category->name, 'id' => $category->id, 'deleted_at' => null]); $this->assertDatabaseMissing(config('module.blog_categories.table'), ['name' => $category->name, 'id' => $category->id, 'deleted_at' => null]);
} }
/** @test */
public function a_user_can_not_update_a_blog_category_with_same_name()
{
$this->actingAs($this->admin)->withExceptionHandling();
$catCategory = create(BlogCategory::class, ['name' => 'Cat']);
$dogCategory = create(BlogCategory::class, ['name' => 'Dog']);
$this->patch(route('admin.blogCategories.update', $dogCategory),
['name' => 'Cat']
)->assertSessionHasErrors('name');
}
} }
...@@ -76,4 +76,17 @@ class ManageBlogTagsTest extends TestCase ...@@ -76,4 +76,17 @@ class ManageBlogTagsTest extends TestCase
$this->assertDatabaseMissing(config('module.blog_tags.table'), ['name' => $tag->name, 'id' => $tag->id, 'deleted_at' => null]); $this->assertDatabaseMissing(config('module.blog_tags.table'), ['name' => $tag->name, 'id' => $tag->id, 'deleted_at' => null]);
} }
/** @test */
public function a_user_can_not_update_a_blog_tag_with_same_name()
{
$this->actingAs($this->admin)->withExceptionHandling();
$catTag = create(BlogTag::class, ['name' => 'Cat']);
$dogTag = create(BlogTag::class, ['name' => 'Dog']);
$this->patch(route('admin.blogTags.update', $dogTag),
['name' => 'Cat']
)->assertSessionHasErrors('name');
}
} }
...@@ -196,4 +196,17 @@ class ManageBlogsTest extends TestCase ...@@ -196,4 +196,17 @@ class ManageBlogsTest extends TestCase
$this->assertDatabaseMissing(config('module.blogs.table'), ['id' => $this->blog->id, 'deleted_at' => null]); $this->assertDatabaseMissing(config('module.blogs.table'), ['id' => $this->blog->id, 'deleted_at' => null]);
} }
/** @test */
public function a_user_can_not_update_a_blog_with_same_name()
{
$this->actingAs($this->admin)->withExceptionHandling();
$catCategory = create(Blog::class, ['name' => 'Cat']);
$dogCategory = create(Blog::class, ['name' => 'Dog']);
$this->patch(route('admin.blogs.update', $dogCategory),
['name' => 'Cat']
)->assertSessionHasErrors('name');
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment