Skip to content

Commit 797a79f

Browse files
committed
Version update
1 parent d964c7d commit 797a79f

8 files changed

Lines changed: 13 additions & 13 deletions

File tree

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
],
1919
"require": {
2020
"php" : "~5.6|~7.0",
21-
"corecmf/core": "1.1.*",
22-
"corecmf/socialite": "^1.1",
23-
"corecmf/storage": "^1.1"
21+
"corecmf/core": "1.3.*",
22+
"corecmf/socialite": "^1.3.*",
23+
"corecmf/storage": "^1.3.*"
2424
},
2525
"require-dev": {
2626
"phpunit/phpunit" : "~4.0||~5.0||~6.0",
@@ -43,7 +43,7 @@
4343
},
4444
"extra": {
4545
"branch-alias": {
46-
"dev-master": "1.0-dev"
46+
"dev-master": "1.3.0-dev"
4747
}
4848
},
4949
"config": {

src/App/Http/Controllers/Api/PackageController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Illuminate\Http\Request;
66

77
use App\Http\Controllers\Controller;
8-
use CoreCMF\Core\Http\Models\Package;
8+
use CoreCMF\Core\App\Models\Package;
99
use CoreCMF\Admin\App\Models\Config;
1010
use CoreCMF\Admin\App\Http\Validator\ModelRules;
1111
use CoreCMF\Core\Support\Package\Manage as packageManage;

src/App/Http/Controllers/Api/PermissionController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Illuminate\Http\Request;
66
use App\Http\Controllers\Controller;
77

8-
use CoreCMF\Core\Http\Models\Permission;
8+
use CoreCMF\Core\App\Models\Permission;
99
use CoreCMF\Admin\App\Models\Config;
1010
use CoreCMF\Admin\App\Http\Validator\PermissionRules;
1111
class PermissionController extends Controller

src/App/Http/Controllers/Api/RoleController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
use Illuminate\Http\Request;
66
use App\Http\Controllers\Controller;
7-
use CoreCMF\Core\Http\Models\Role;
7+
use CoreCMF\Core\App\Models\Role;
88
use CoreCMF\Admin\App\Models\Config;
9-
use CoreCMF\Core\Http\Models\Permission;
9+
use CoreCMF\Core\App\Models\Permission;
1010
use CoreCMF\Admin\App\Http\Validator\RoleRules;
1111

1212
class RoleController extends Controller

src/App/Http/Controllers/Api/UploadController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use App\Http\Requests;
99
use App\Http\Controllers\Controller;
1010

11-
use CoreCMF\Core\Http\Models\Upload;
11+
use CoreCMF\Core\App\Models\Upload;
1212

1313
class UploadController extends Controller
1414
{

src/App/Http/Controllers/Api/UserController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
use Illuminate\Http\Request;
66

77
use App\Http\Controllers\Controller;
8-
use CoreCMF\Core\Http\Models\User;
9-
use CoreCMF\Core\Http\Models\Role;
8+
use CoreCMF\Core\App\Models\User;
9+
use CoreCMF\Core\App\Models\Role;
1010
use CoreCMF\Admin\App\Models\Config;
1111
use CoreCMF\Admin\App\Http\Validator\UserRules;
1212

src/App/Http/Middleware/CheckRole.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Closure;
66
use Route;
77
use App\Http\Controllers\Controller;
8-
use CoreCMF\Core\Http\Models\Permission;
8+
use CoreCMF\Core\App\Models\Permission;
99

1010
class CheckRole
1111
{

src/App/Models/Config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace CoreCMF\Admin\App\Models;
44

55
use Illuminate\Database\Eloquent\Model;
6-
use CoreCMF\Core\Http\Models\Upload;
6+
use CoreCMF\Core\App\Models\Upload;
77

88
class Config extends Model
99
{

0 commit comments

Comments
 (0)