Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Platform
Commits
645b0ee3
Unverified
Commit
645b0ee3
authored
Sep 14, 2017
by
Nicolas Widart
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CS: PSR1/2
parent
c4e9f5bd
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
21 additions
and
18 deletions
+21
-18
EloquentBaseRepository.php
...les/Core/Repositories/Eloquent/EloquentBaseRepository.php
+0
-1
AbstractAdminSidebar.php
Modules/Core/Sidebar/AbstractAdminSidebar.php
+1
-1
MediaController.php
Modules/Media/Http/Controllers/Api/MediaController.php
+1
-0
MediaServiceProvider.php
Modules/Media/Providers/MediaServiceProvider.php
+0
-1
MaxFolderSizeRuleTest.php
Modules/Media/Tests/MaxFolderSizeRuleTest.php
+2
-1
TranslationController.php
...ranslation/Http/Controllers/Api/TranslationController.php
+3
-4
FileTranslationRepository.php
...anslation/Repositories/File/FileTranslationRepository.php
+1
-1
EloquentTranslationRepositoryTest.php
...s/Translation/Tests/EloquentTranslationRepositoryTest.php
+0
-1
User.php
Modules/User/Entities/Sentinel/User.php
+3
-3
Sentinel.php
Modules/User/Guards/Sentinel.php
+2
-0
UserServiceProvider.php
Modules/User/Providers/UserServiceProvider.php
+1
-1
EntityGenerator.php
...s/Workshop/Scaffold/Module/Generators/EntityGenerator.php
+1
-1
ModuleScaffoldTest.php
Modules/Workshop/Tests/ModuleScaffoldTest.php
+1
-1
helpers.php
Modules/Workshop/helpers.php
+1
-0
database.php
config/database.php
+1
-0
filesystems.php
config/filesystems.php
+1
-1
queue.php
config/queue.php
+1
-0
session.php
config/session.php
+1
-1
No files found.
Modules/Core/Repositories/Eloquent/EloquentBaseRepository.php
View file @
645b0ee3
...
...
@@ -62,7 +62,6 @@ abstract class EloquentBaseRepository implements BaseRepository
return
$this
->
model
;
}
/**
* @inheritdoc
*/
...
...
Modules/Core/Sidebar/AbstractAdminSidebar.php
View file @
645b0ee3
...
...
@@ -3,9 +3,9 @@
namespace
Modules\Core\Sidebar
;
use
Maatwebsite\Sidebar\Menu
;
use
Maatwebsite\Sidebar\SidebarExtender
;
use
Modules\Core\Events\BuildingSidebar
;
use
Modules\User\Contracts\Authentication
;
use
Maatwebsite\Sidebar\SidebarExtender
;
abstract
class
AbstractAdminSidebar
implements
SidebarExtender
{
...
...
Modules/Media/Http/Controllers/Api/MediaController.php
View file @
645b0ee3
...
...
@@ -50,6 +50,7 @@ class MediaController extends Controller
if
(
$file
->
isImage
())
{
return
'<img src="'
.
Imagy
::
getThumbnail
(
$file
->
path
,
'smallThumb'
)
.
'"/>'
;
}
return
'<i class="fa '
.
FileHelper
::
getFaIcon
(
$file
->
media_type
)
.
'" style="font-size: 20px;"></i>'
;
})
->
rawColumns
([
'thumbnail'
])
...
...
Modules/Media/Providers/MediaServiceProvider.php
View file @
645b0ee3
...
...
@@ -3,7 +3,6 @@
namespace
Modules\Media\Providers
;
use
Illuminate\Contracts\Events\Dispatcher
as
DispatcherContract
;
use
Illuminate\Support\Facades\Validator
;
use
Illuminate\Support\ServiceProvider
;
use
Modules\Core\Events\BuildingSidebar
;
use
Modules\Core\Traits\CanGetSidebarClassForModule
;
...
...
Modules/Media/Tests/MaxFolderSizeRuleTest.php
View file @
645b0ee3
...
...
@@ -11,9 +11,9 @@ namespace Modules\Media\Tests;
use
Illuminate\Container\Container
;
use
Illuminate\Filesystem\Filesystem
;
use
Illuminate\Http\UploadedFile
;
use
Illuminate\Validation\Factory
as
Validator
;
use
Illuminate\Translation\FileLoader
;
use
Illuminate\Translation\Translator
;
use
Illuminate\Validation\Factory
as
Validator
;
use
Modules\Media\Validators\MaxFolderSizeRule
;
final
class
MaxFolderSizeRuleTest
extends
MediaTestCase
...
...
@@ -50,6 +50,7 @@ final class MaxFolderSizeRuleTest extends MediaTestCase
$validator
=
(
new
Validator
(
$translator
))
->
make
([
'file'
=>
$directorySize
],
[
'file'
=>
[
'required'
,
new
MaxFolderSizeRule
()],
]);
return
$validator
;
}
}
Modules/Translation/Http/Controllers/Api/TranslationController.php
View file @
645b0ee3
...
...
@@ -2,13 +2,12 @@
namespace
Modules\Translation\Http\Controllers\Api
;
use
Cartalyst\Sentinel\Laravel\Facades\Sentinel
;
use
Illuminate\Http\Request
;
use
Illuminate\Routing\Controller
;
use
Illuminate\Database\Eloquent\Collection
;
use
Cartalyst\Sentinel\Laravel\Facades\Sentinel
;
use
Modules\User\Traits\CanFindUserWithBearerToken
;
use
Modules\Translation\Services\TranslationRevisions
;
use
Modules\Translation\Repositories\TranslationRepository
;
use
Modules\Translation\Services\TranslationRevisions
;
use
Modules\User\Traits\CanFindUserWithBearerToken
;
class
TranslationController
extends
Controller
{
...
...
Modules/Translation/Repositories/File/FileTranslationRepository.php
View file @
645b0ee3
...
...
@@ -2,8 +2,8 @@
namespace
Modules\Translation\Repositories\File
;
use
Illuminate\Filesystem\Filesystem
;
use
Illuminate\Contracts\Translation\Loader
;
use
Illuminate\Filesystem\Filesystem
;
use
Modules\Translation\Repositories\FileTranslationRepository
as
FileTranslationRepositoryInterface
;
class
FileTranslationRepository
implements
FileTranslationRepositoryInterface
...
...
Modules/Translation/Tests/EloquentTranslationRepositoryTest.php
View file @
645b0ee3
...
...
@@ -71,7 +71,6 @@ class EloquentTranslationRepositoryTest extends BaseTranslationTest
],
];
$this
->
assertEquals
(
$expected
,
$this
->
translation
->
allFormatted
());
}
...
...
Modules/User/Entities/Sentinel/User.php
View file @
645b0ee3
...
...
@@ -2,10 +2,10 @@
namespace
Modules\User\Entities\Sentinel
;
use
Illuminate\Contracts\Auth\Authenticatable
as
AuthenticatableContract
;
use
Illuminate\Auth\Authenticatable
;
use
Cartalyst\Sentinel\Laravel\Facades\Activation
;
use
Cartalyst\Sentinel\Users\EloquentUser
;
use
Illuminate\Auth\Authenticatable
;
use
Illuminate\Contracts\Auth\Authenticatable
as
AuthenticatableContract
;
use
Laracasts\Presenter\PresentableTrait
;
use
Modules\User\Entities\UserInterface
;
use
Modules\User\Entities\UserToken
;
...
...
@@ -114,7 +114,7 @@ class User extends EloquentUser implements UserInterface, AuthenticatableContrac
if
(
config
()
->
has
(
$config
))
{
$function
=
config
()
->
get
(
$config
);
$bound
=
$function
->
bindTo
(
$this
);
return
$bound
();
}
...
...
Modules/User/Guards/Sentinel.php
View file @
645b0ee3
...
...
@@ -17,6 +17,7 @@ class Sentinel implements LaravelGuard
if
(
SentinelFacade
::
check
())
{
return
true
;
}
return
false
;
}
...
...
@@ -47,6 +48,7 @@ class Sentinel implements LaravelGuard
if
(
$user
=
SentinelFacade
::
check
())
{
return
$user
->
id
;
}
return
null
;
}
...
...
Modules/User/Providers/UserServiceProvider.php
View file @
645b0ee3
...
...
@@ -11,6 +11,7 @@ use Modules\Core\Traits\CanPublishConfiguration;
use
Modules\User\Contracts\Authentication
;
use
Modules\User\Entities\UserToken
;
use
Modules\User\Events\Handlers\RegisterUserSidebar
;
use
Modules\User\Guards\Sentinel
;
use
Modules\User\Http\Middleware\AuthorisedApiToken
;
use
Modules\User\Http\Middleware\AuthorisedApiTokenAdmin
;
use
Modules\User\Http\Middleware\GuestMiddleware
;
...
...
@@ -21,7 +22,6 @@ use Modules\User\Repositories\Eloquent\EloquentUserTokenRepository;
use
Modules\User\Repositories\RoleRepository
;
use
Modules\User\Repositories\UserRepository
;
use
Modules\User\Repositories\UserTokenRepository
;
use
Modules\User\Guards\Sentinel
;
class
UserServiceProvider
extends
ServiceProvider
{
...
...
Modules/Workshop/Scaffold/Module/Generators/EntityGenerator.php
View file @
645b0ee3
...
...
@@ -108,7 +108,7 @@ class EntityGenerator extends Generator
$this
->
getContentForStub
(
'admin-controller.stub'
,
$entity
)
);
}
/**
* Generate the requests for the given entity
*
...
...
Modules/Workshop/Tests/ModuleScaffoldTest.php
View file @
645b0ee3
...
...
@@ -583,4 +583,4 @@ class ModuleScaffoldTest extends BaseTestCase
return
$controllerFile
;
}
}
\ No newline at end of file
}
Modules/Workshop/helpers.php
View file @
645b0ee3
...
...
@@ -6,6 +6,7 @@ if (! function_exists('module_version')) {
if
(
is_core_module
(
$module
->
name
)
===
true
)
{
return
\Modules\Core\Foundation\AsgardCms
::
VERSION
;
}
return
$module
->
version
;
}
}
config/database.php
View file @
645b0ee3
<?php
return
[
/*
|--------------------------------------------------------------------------
...
...
config/filesystems.php
View file @
645b0ee3
...
...
@@ -55,7 +55,7 @@ return [
'public'
=>
[
'driver'
=>
'local'
,
'root'
=>
storage_path
(
'app/public'
),
'url'
=>
env
(
'APP_URL'
)
.
'/storage'
,
'url'
=>
env
(
'APP_URL'
)
.
'/storage'
,
'visibility'
=>
'public'
,
],
...
...
config/queue.php
View file @
645b0ee3
<?php
return
[
/*
|--------------------------------------------------------------------------
...
...
config/session.php
View file @
645b0ee3
...
...
@@ -124,7 +124,7 @@ return [
'cookie'
=>
env
(
'SESSION_COOKIE'
,
str_slug
(
env
(
'APP_NAME'
,
'laravel'
),
'_'
)
.
'_session'
str_slug
(
env
(
'APP_NAME'
,
'laravel'
),
'_'
)
.
'_session'
),
/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment