@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | { |
52 | 52 | if (app()->runningInConsole() === false) { |
53 | 53 | $this->app->booted( |
54 | - function () { |
|
54 | + function() { |
|
55 | 55 | |
56 | 56 | $frontendHandler = app('xe.frontend'); |
57 | 57 | |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | */ |
77 | 77 | private function registerPresenter() |
78 | 78 | { |
79 | - $this->app->singleton('xe.presenter', function ($app) { |
|
79 | + $this->app->singleton('xe.presenter', function($app) { |
|
80 | 80 | |
81 | 81 | $proxyClass = $app['xe.interception']->proxy(Presenter::class, 'Presenter'); |
82 | 82 | |
@@ -100,13 +100,13 @@ discard block |
||
100 | 100 | |
101 | 101 | $presenter->register( |
102 | 102 | $proxyHtmlRenderer::format(), |
103 | - function (Presenter $presenter) use ($proxyHtmlRenderer) { |
|
103 | + function(Presenter $presenter) use ($proxyHtmlRenderer) { |
|
104 | 104 | return new $proxyHtmlRenderer($presenter, app('xe.seo'), app('xe.widget.parser')); |
105 | 105 | } |
106 | 106 | ); |
107 | 107 | $presenter->register( |
108 | 108 | $proxyJsonRenderer::format(), |
109 | - function (Presenter $presenter) use ($proxyJsonRenderer) { |
|
109 | + function(Presenter $presenter) use ($proxyJsonRenderer) { |
|
110 | 110 | return new $proxyJsonRenderer($presenter); |
111 | 111 | } |
112 | 112 | ); |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | */ |
123 | 123 | private function registerFrontend() |
124 | 124 | { |
125 | - $this->app->singleton('xe.frontend', function ($app) { |
|
125 | + $this->app->singleton('xe.frontend', function($app) { |
|
126 | 126 | $tags = [ |
127 | 127 | 'title' => \Xpressengine\Presenter\Html\Tags\Title::class, |
128 | 128 | 'meta' => \Xpressengine\Presenter\Html\Tags\Meta::class, |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /* |
|
5 | + /* |
|
6 | 6 | |-------------------------------------------------------------------------- |
7 | 7 | | Mail Driver |
8 | 8 | |-------------------------------------------------------------------------- |
@@ -15,9 +15,9 @@ discard block |
||
15 | 15 | | |
16 | 16 | */ |
17 | 17 | |
18 | - 'driver' => env('MAIL_DRIVER', 'mail'), |
|
18 | + 'driver' => env('MAIL_DRIVER', 'mail'), |
|
19 | 19 | |
20 | - /* |
|
20 | + /* |
|
21 | 21 | |-------------------------------------------------------------------------- |
22 | 22 | | SMTP Host Address |
23 | 23 | |-------------------------------------------------------------------------- |
@@ -28,9 +28,9 @@ discard block |
||
28 | 28 | | |
29 | 29 | */ |
30 | 30 | |
31 | - 'host' => env('MAIL_HOST', 'smtp.mailgun.org'), |
|
31 | + 'host' => env('MAIL_HOST', 'smtp.mailgun.org'), |
|
32 | 32 | |
33 | - /* |
|
33 | + /* |
|
34 | 34 | |-------------------------------------------------------------------------- |
35 | 35 | | SMTP Host Port |
36 | 36 | |-------------------------------------------------------------------------- |
@@ -41,9 +41,9 @@ discard block |
||
41 | 41 | | |
42 | 42 | */ |
43 | 43 | |
44 | - 'port' => env('MAIL_PORT', 587), |
|
44 | + 'port' => env('MAIL_PORT', 587), |
|
45 | 45 | |
46 | - /* |
|
46 | + /* |
|
47 | 47 | |-------------------------------------------------------------------------- |
48 | 48 | | Global "From" Address |
49 | 49 | |-------------------------------------------------------------------------- |
@@ -54,12 +54,12 @@ discard block |
||
54 | 54 | | |
55 | 55 | */ |
56 | 56 | |
57 | - 'from' => [ |
|
57 | + 'from' => [ |
|
58 | 58 | 'address' => env('MAIL_FROM_ADDRESS', null), |
59 | 59 | 'name' => env('MAIL_FROM_NAME', null) |
60 | 60 | ], |
61 | 61 | |
62 | - /* |
|
62 | + /* |
|
63 | 63 | |-------------------------------------------------------------------------- |
64 | 64 | | E-Mail Encryption Protocol |
65 | 65 | |-------------------------------------------------------------------------- |
@@ -70,9 +70,9 @@ discard block |
||
70 | 70 | | |
71 | 71 | */ |
72 | 72 | |
73 | - 'encryption' => env('MAIL_ENCRYPTION', 'tls'), |
|
73 | + 'encryption' => env('MAIL_ENCRYPTION', 'tls'), |
|
74 | 74 | |
75 | - /* |
|
75 | + /* |
|
76 | 76 | |-------------------------------------------------------------------------- |
77 | 77 | | SMTP Server Username |
78 | 78 | |-------------------------------------------------------------------------- |
@@ -83,9 +83,9 @@ discard block |
||
83 | 83 | | |
84 | 84 | */ |
85 | 85 | |
86 | - 'username' => env('MAIL_USERNAME', null), |
|
86 | + 'username' => env('MAIL_USERNAME', null), |
|
87 | 87 | |
88 | - /* |
|
88 | + /* |
|
89 | 89 | |-------------------------------------------------------------------------- |
90 | 90 | | SMTP Server Password |
91 | 91 | |-------------------------------------------------------------------------- |
@@ -96,9 +96,9 @@ discard block |
||
96 | 96 | | |
97 | 97 | */ |
98 | 98 | |
99 | - 'password' => env('MAIL_PASSWORD', null), |
|
99 | + 'password' => env('MAIL_PASSWORD', null), |
|
100 | 100 | |
101 | - /* |
|
101 | + /* |
|
102 | 102 | |-------------------------------------------------------------------------- |
103 | 103 | | Sendmail System Path |
104 | 104 | |-------------------------------------------------------------------------- |
@@ -109,9 +109,9 @@ discard block |
||
109 | 109 | | |
110 | 110 | */ |
111 | 111 | |
112 | - 'sendmail' => env('MAIL_SENDMAIL', '/usr/sbin/sendmail -bs'), |
|
112 | + 'sendmail' => env('MAIL_SENDMAIL', '/usr/sbin/sendmail -bs'), |
|
113 | 113 | |
114 | - /* |
|
114 | + /* |
|
115 | 115 | |-------------------------------------------------------------------------- |
116 | 116 | | Mail "Pretend" |
117 | 117 | |-------------------------------------------------------------------------- |
@@ -122,6 +122,6 @@ discard block |
||
122 | 122 | | |
123 | 123 | */ |
124 | 124 | |
125 | - 'pretend' => env('MAIL_PRETEND', false) |
|
125 | + 'pretend' => env('MAIL_PRETEND', false) |
|
126 | 126 | |
127 | 127 | ]; |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | */ |
39 | 39 | public function boot() |
40 | 40 | { |
41 | - Document::creating(function (Document $model) { |
|
41 | + Document::creating(function(Document $model) { |
|
42 | 42 | $model->setReply(); |
43 | 43 | }); |
44 | 44 | } |
@@ -55,17 +55,17 @@ discard block |
||
55 | 55 | // set reply code length config to Document model |
56 | 56 | Document::setReplyCharLen($app['config']['xe.documentReplyCodeLen']); |
57 | 57 | |
58 | - $app->singleton('xe.document.config', function ($app) { |
|
58 | + $app->singleton('xe.document.config', function($app) { |
|
59 | 59 | return new ConfigHandler($app['xe.config']); |
60 | 60 | }); |
61 | - $app->singleton('xe.document.instance', function ($app) { |
|
61 | + $app->singleton('xe.document.instance', function($app) { |
|
62 | 62 | $instanceManagerClass = $app['xe.interception']->proxy(InstanceManager::class, 'DocumentInstanceManager'); |
63 | 63 | return new $instanceManagerClass( |
64 | 64 | $app['xe.db']->connection('document'), |
65 | 65 | $app['xe.document.config'] |
66 | 66 | ); |
67 | 67 | }); |
68 | - $app->singleton('xe.document', function ($app) { |
|
68 | + $app->singleton('xe.document', function($app) { |
|
69 | 69 | $documentHandlerClass = $app['xe.interception']->proxy(DocumentHandler::class, 'Document'); |
70 | 70 | $document = new $documentHandlerClass( |
71 | 71 | $app['xe.db']->connection('document'), |
@@ -3,16 +3,10 @@ |
||
3 | 3 | |
4 | 4 | use App; |
5 | 5 | use XePresenter; |
6 | -use Validator; |
|
7 | -use Hash; |
|
8 | -use Auth; |
|
9 | 6 | use Xpressengine\Config\ConfigEntity; |
10 | 7 | use Xpressengine\Http\Request; |
11 | -use Document; |
|
12 | 8 | use App\Sections\DynamicFieldSection; |
13 | 9 | use XeDB; |
14 | -use XeLang; |
|
15 | -use XeDynamicField; |
|
16 | 10 | use Xpressengine\Translation\Translator; |
17 | 11 | |
18 | 12 | class DynamicFieldController extends Controller |
@@ -132,7 +132,7 @@ |
||
132 | 132 | $fieldSkin = $registerHandler->getSkin($dynamicField, $request->get('skinId')); |
133 | 133 | |
134 | 134 | return XePresenter::makeApi([ |
135 | - 'configure' => $fieldType->getSettingsView($config) . $fieldSkin->settings($config), |
|
135 | + 'configure' => $fieldType->getSettingsView($config).$fieldSkin->settings($config), |
|
136 | 136 | ]); |
137 | 137 | } |
138 | 138 |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | /** |
75 | 75 | * Returns all route items |
76 | 76 | * |
77 | - * @return InstanceRoute[] |
|
77 | + * @return \Illuminate\Database\Eloquent\Collection |
|
78 | 78 | */ |
79 | 79 | public function all() |
80 | 80 | { |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | * Retrieve routes by site key |
113 | 113 | * |
114 | 114 | * @param string $siteKey site key |
115 | - * @return InstanceRoute[] |
|
115 | + * @return \Illuminate\Database\Eloquent\Collection |
|
116 | 116 | */ |
117 | 117 | public function fetchBySiteKey($siteKey) |
118 | 118 | { |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | * Retrieve routes by module name |
126 | 126 | * |
127 | 127 | * @param string $module module name |
128 | - * @return InstanceRoute[] |
|
128 | + * @return \Illuminate\Database\Eloquent\Collection |
|
129 | 129 | */ |
130 | 130 | public function fetchByModule($module) |
131 | 131 | { |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | /** |
69 | 69 | * runComposer |
70 | 70 | * |
71 | - * @param $path |
|
71 | + * @param string $path |
|
72 | 72 | * @param $command |
73 | 73 | * |
74 | 74 | * @return int |
@@ -82,6 +82,10 @@ discard block |
||
82 | 82 | $output = $this->output; |
83 | 83 | |
84 | 84 | return $process->run( |
85 | + |
|
86 | + /** |
|
87 | + * @param string $type |
|
88 | + */ |
|
85 | 89 | function ($type, $line) use ($output) { |
86 | 90 | $output->write($line); |
87 | 91 | } |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | |
52 | 52 | $this->info(PHP_EOL."Running 'composer $command'.".PHP_EOL); |
53 | 53 | |
54 | - if($this->runComposer(base_path(), $command) !== 0) { |
|
54 | + if ($this->runComposer(base_path(), $command) !== 0) { |
|
55 | 55 | throw new \Exception('Plugin Installation was faild.'); |
56 | 56 | } |
57 | 57 | |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | |
60 | 60 | $activate = $this->option('activate'); |
61 | 61 | |
62 | - if($activate) { |
|
62 | + if ($activate) { |
|
63 | 63 | $this->activatePlugin($name); |
64 | 64 | $this->info("Plugin '$name' is activated.".PHP_EOL); |
65 | 65 | } |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | $output = $this->output; |
83 | 83 | |
84 | 84 | return $process->run( |
85 | - function ($type, $line) use ($output) { |
|
85 | + function($type, $line) use ($output) { |
|
86 | 86 | $output->write($line); |
87 | 87 | } |
88 | 88 | ); |
@@ -8,50 +8,50 @@ discard block |
||
8 | 8 | class Kernel extends ConsoleKernel |
9 | 9 | { |
10 | 10 | |
11 | - /** |
|
12 | - * The bootstrap classes for the application. |
|
13 | - * |
|
14 | - * @var array |
|
15 | - */ |
|
16 | - protected $bootstrappers = [ |
|
17 | - 'Illuminate\Foundation\Bootstrap\DetectEnvironment', |
|
18 | - 'App\Bootstrappers\LoadConfiguration', |
|
19 | - 'Illuminate\Foundation\Bootstrap\ConfigureLogging', |
|
20 | - 'Illuminate\Foundation\Bootstrap\HandleExceptions', |
|
21 | - 'Illuminate\Foundation\Bootstrap\RegisterFacades', |
|
22 | - 'Illuminate\Foundation\Bootstrap\SetRequestForConsole', |
|
23 | - 'Illuminate\Foundation\Bootstrap\RegisterProviders', |
|
24 | - 'Illuminate\Foundation\Bootstrap\BootProviders', |
|
25 | - ]; |
|
26 | - |
|
27 | - /** |
|
28 | - * The Artisan commands provided by your application. |
|
29 | - * |
|
30 | - * @var array |
|
31 | - */ |
|
32 | - protected $commands = [ |
|
33 | - \App\Console\Commands\Inspire::class, |
|
11 | + /** |
|
12 | + * The bootstrap classes for the application. |
|
13 | + * |
|
14 | + * @var array |
|
15 | + */ |
|
16 | + protected $bootstrappers = [ |
|
17 | + 'Illuminate\Foundation\Bootstrap\DetectEnvironment', |
|
18 | + 'App\Bootstrappers\LoadConfiguration', |
|
19 | + 'Illuminate\Foundation\Bootstrap\ConfigureLogging', |
|
20 | + 'Illuminate\Foundation\Bootstrap\HandleExceptions', |
|
21 | + 'Illuminate\Foundation\Bootstrap\RegisterFacades', |
|
22 | + 'Illuminate\Foundation\Bootstrap\SetRequestForConsole', |
|
23 | + 'Illuminate\Foundation\Bootstrap\RegisterProviders', |
|
24 | + 'Illuminate\Foundation\Bootstrap\BootProviders', |
|
25 | + ]; |
|
26 | + |
|
27 | + /** |
|
28 | + * The Artisan commands provided by your application. |
|
29 | + * |
|
30 | + * @var array |
|
31 | + */ |
|
32 | + protected $commands = [ |
|
33 | + \App\Console\Commands\Inspire::class, |
|
34 | 34 | \App\Console\Commands\XeInstall::class, |
35 | - \App\Console\Commands\Trash::class, |
|
36 | - \App\Console\Commands\Schema::class, |
|
37 | - \App\Console\Commands\PutTranslation::class, |
|
38 | - \App\Console\Commands\XeCacheClear::class, |
|
39 | - \App\Console\Commands\StorageOptimize::class, |
|
40 | - \App\Console\Commands\Site::class, |
|
41 | - \App\Console\Commands\PluginMakeCommand::class, |
|
42 | - \App\Console\Commands\PluginInstallCommand::class, |
|
43 | - ]; |
|
44 | - |
|
45 | - /** |
|
46 | - * Define the application's command schedule. |
|
47 | - * |
|
48 | - * @param \Illuminate\Console\Scheduling\Schedule $schedule |
|
49 | - * @return void |
|
50 | - */ |
|
51 | - protected function schedule(Schedule $schedule) |
|
52 | - { |
|
53 | - $schedule->command('inspire')->hourly(); |
|
54 | - } |
|
35 | + \App\Console\Commands\Trash::class, |
|
36 | + \App\Console\Commands\Schema::class, |
|
37 | + \App\Console\Commands\PutTranslation::class, |
|
38 | + \App\Console\Commands\XeCacheClear::class, |
|
39 | + \App\Console\Commands\StorageOptimize::class, |
|
40 | + \App\Console\Commands\Site::class, |
|
41 | + \App\Console\Commands\PluginMakeCommand::class, |
|
42 | + \App\Console\Commands\PluginInstallCommand::class, |
|
43 | + ]; |
|
44 | + |
|
45 | + /** |
|
46 | + * Define the application's command schedule. |
|
47 | + * |
|
48 | + * @param \Illuminate\Console\Scheduling\Schedule $schedule |
|
49 | + * @return void |
|
50 | + */ |
|
51 | + protected function schedule(Schedule $schedule) |
|
52 | + { |
|
53 | + $schedule->command('inspire')->hourly(); |
|
54 | + } |
|
55 | 55 | |
56 | 56 | /** |
57 | 57 | * Bootstrap the application for artisan commands. |
@@ -83,18 +83,18 @@ discard block |
||
83 | 83 | * @return void |
84 | 84 | */ |
85 | 85 | protected function resetForFramework() |
86 | - { |
|
87 | - $this->resetProviders(); |
|
88 | - $this->setCommandBeforeInstall(); |
|
89 | - } |
|
86 | + { |
|
87 | + $this->resetProviders(); |
|
88 | + $this->setCommandBeforeInstall(); |
|
89 | + } |
|
90 | 90 | |
91 | 91 | /** |
92 | 92 | * Define for providers of framework. |
93 | 93 | * |
94 | 94 | * @return void |
95 | 95 | */ |
96 | - protected function resetProviders() |
|
97 | - { |
|
96 | + protected function resetProviders() |
|
97 | + { |
|
98 | 98 | $this->app['events']->listen('bootstrapped: App\Bootstrappers\LoadConfiguration', function ($app) { |
99 | 99 | $config = $app['config']; |
100 | 100 | |
@@ -105,20 +105,20 @@ discard block |
||
105 | 105 | |
106 | 106 | $config->set('app.providers', $providers); |
107 | 107 | }); |
108 | - } |
|
108 | + } |
|
109 | 109 | |
110 | 110 | /** |
111 | 111 | * Define commands for previously installation |
112 | 112 | * |
113 | 113 | * @return void |
114 | 114 | */ |
115 | - protected function setCommandBeforeInstall() |
|
116 | - { |
|
117 | - $this->commands = array_intersect($this->commands, [ |
|
115 | + protected function setCommandBeforeInstall() |
|
116 | + { |
|
117 | + $this->commands = array_intersect($this->commands, [ |
|
118 | 118 | \App\Console\Commands\Inspire::class, |
119 | 119 | \App\Console\Commands\XeInstall::class |
120 | 120 | ]); |
121 | - } |
|
121 | + } |
|
122 | 122 | |
123 | 123 | /** |
124 | 124 | * Define commands for after installation |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | |
75 | 75 | protected function isInstalled() |
76 | 76 | { |
77 | - return file_exists($this->app->storagePath() . '/app/installed'); |
|
77 | + return file_exists($this->app->storagePath().'/app/installed'); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | /** |
@@ -95,11 +95,11 @@ discard block |
||
95 | 95 | */ |
96 | 96 | protected function resetProviders() |
97 | 97 | { |
98 | - $this->app['events']->listen('bootstrapped: App\Bootstrappers\LoadConfiguration', function ($app) { |
|
98 | + $this->app['events']->listen('bootstrapped: App\Bootstrappers\LoadConfiguration', function($app) { |
|
99 | 99 | $config = $app['config']; |
100 | 100 | |
101 | 101 | $providers = $config['app.providers']; |
102 | - $providers = array_filter($providers, function ($p) { |
|
102 | + $providers = array_filter($providers, function($p) { |
|
103 | 103 | return substr($p, 0, strlen('Illuminate')) == 'Illuminate'; |
104 | 104 | }); |
105 | 105 |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | * fill |
122 | 122 | * |
123 | 123 | * @param array $attributes attributes |
124 | - * @return void |
|
124 | + * @return DynamicModel |
|
125 | 125 | */ |
126 | 126 | public function fill(array $attributes) |
127 | 127 | { |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | * Xpressengine\Database\Eloquent\Builder 울 사용하도록 변경 |
248 | 248 | * |
249 | 249 | * @param DynamicQuery $query dynamic query builder |
250 | - * @return \Xpressengine\Database\Eloquent\Builder|static |
|
250 | + * @return Builder |
|
251 | 251 | */ |
252 | 252 | public function newEloquentBuilder($query) |
253 | 253 | { |
@@ -102,7 +102,6 @@ |
||
102 | 102 | /** |
103 | 103 | * getRepository |
104 | 104 | * |
105 | - * @param null $model |
|
106 | 105 | * |
107 | 106 | * @return Mockery\MockInterface |
108 | 107 | */ |