@@ -128,7 +128,7 @@ |
||
128 | 128 | $i++; |
129 | 129 | } |
130 | 130 | } else { |
131 | - $message = $data['error_code'] . ' : ' . $data['error_message']; |
|
131 | + $message = $data['error_code'].' : '.$data['error_message']; |
|
132 | 132 | } |
133 | 133 | } else { |
134 | 134 | $success = 0; |
@@ -170,7 +170,7 @@ |
||
170 | 170 | |
171 | 171 | /** |
172 | 172 | * @param $trait |
173 | - * @param $generator |
|
173 | + * @param ClassGenerator $generator |
|
174 | 174 | */ |
175 | 175 | private function removePropertiesFromProxy($trait, $generator) |
176 | 176 | { |
@@ -86,7 +86,7 @@ |
||
86 | 86 | |
87 | 87 | foreach ($traits as $trait) { |
88 | 88 | $this->removePropertiesFromProxy($trait, $generator); |
89 | - $generator->addTrait('\\' . $trait); |
|
89 | + $generator->addTrait('\\'.$trait); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | // extendしたクラスが相対パスになるので |
@@ -44,7 +44,7 @@ |
||
44 | 44 | |
45 | 45 | public function updateSchema($generatedFiles, $proxiesDirectory) |
46 | 46 | { |
47 | - $outputDir = sys_get_temp_dir() . '/proxy_' . Str::random(12); |
|
47 | + $outputDir = sys_get_temp_dir().'/proxy_'.Str::random(12); |
|
48 | 48 | mkdir($outputDir); |
49 | 49 | |
50 | 50 | try { |
@@ -31,7 +31,7 @@ |
||
31 | 31 | { |
32 | 32 | /** |
33 | 33 | * FormExtensionAutoWiring constructor. |
34 | - * @param array|string[] $scanDirs |
|
34 | + * @param string[] $scanDirs |
|
35 | 35 | */ |
36 | 36 | public function __construct($scanDirs) |
37 | 37 | { |
@@ -30,7 +30,7 @@ |
||
30 | 30 | { |
31 | 31 | /** |
32 | 32 | * RepositoryAutoWiring constructor. |
33 | - * @param array|string[] $scanDirs |
|
33 | + * @param string[] $scanDirs |
|
34 | 34 | */ |
35 | 35 | public function __construct($scanDirs) |
36 | 36 | { |
@@ -30,8 +30,8 @@ |
||
30 | 30 | { |
31 | 31 | /** |
32 | 32 | * RepositoryDefinition constructor. |
33 | - * @param $id |
|
34 | - * @param $refClass |
|
33 | + * @param string $id |
|
34 | + * @param \ReflectionClass $refClass |
|
35 | 35 | */ |
36 | 36 | public function __construct($id, $refClass) |
37 | 37 | { |
@@ -161,7 +161,9 @@ |
||
161 | 161 | } |
162 | 162 | |
163 | 163 | if (!empty($components)) { |
164 | - if ($snippets) $snippets .= PHP_EOL; |
|
164 | + if ($snippets) { |
|
165 | + $snippets .= PHP_EOL; |
|
166 | + } |
|
165 | 167 | $snippets .= $wiring->generate($twig, $components); |
166 | 168 | $snippets .= $wiring->generateExtend($twig, $components); |
167 | 169 | } |
@@ -12,7 +12,7 @@ |
||
12 | 12 | { |
13 | 13 | public function register(Container $app) |
14 | 14 | { |
15 | - $app['eccube.di'] = function (Container $app) { |
|
15 | + $app['eccube.di'] = function(Container $app) { |
|
16 | 16 | $di = new DependencyBuilder( |
17 | 17 | $app['eccube.di.generator.dir'], |
18 | 18 | $app['eccube.di.generator.class'], |
@@ -1,31 +1,31 @@ |
||
1 | 1 | <?php return [ |
2 | - 'root_dir' => '%ROOT_DIR%', |
|
3 | - 'root_urlpath' => env('ECCUBE_ROOT_URLPATH', null), |
|
4 | - 'template_code' => env('ECCUBE_TEMPLATE_CODE','default'), |
|
5 | - 'admin_route' => env('ECCUBE_ADMIN_ROUTE','admin'), |
|
6 | - 'user_data_route' => env('ECCUBE_USER_DATA_ROUTE', 'user_data'), |
|
7 | - 'public_path' => env('ECCUBE_ROOT_URLPATH', null).'/html', |
|
8 | - 'public_path_realdir' => '%ROOT_DIR%/html', |
|
9 | - 'image_save_realdir' => '%ROOT_DIR%/html/upload/save_image', |
|
10 | - 'image_temp_realdir' => '%ROOT_DIR%/html/upload/temp_image', |
|
11 | - 'user_data_realdir' => '%ROOT_DIR%/html/user_data', |
|
12 | - 'block_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default/Block', |
|
13 | - 'block_realdir' => '%ROOT_DIR%/app/template/default/Block', |
|
14 | - 'template_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default', |
|
15 | - 'template_default_html_realdir' => '%ROOT_DIR%/html/template/default', |
|
16 | - 'template_admin_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/admin', |
|
17 | - 'template_admin_html_realdir' => '%ROOT_DIR%/html/template/admin', |
|
18 | - 'template_realdir' => '%ROOT_DIR%/app/template/default', |
|
19 | - 'template_html_realdir' => '%ROOT_DIR%/html/template/default', |
|
20 | - 'template_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/template', |
|
21 | - 'csv_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/csv', |
|
22 | - 'plugin_realdir' => '%ROOT_DIR%/app/Plugin', |
|
23 | - 'plugin_temp_realdir' => '%ROOT_DIR%/app/cache/plugin', |
|
24 | - 'plugin_html_realdir' => '%ROOT_DIR%/html/plugin', |
|
25 | - 'admin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/admin', |
|
26 | - 'front_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/default', |
|
27 | - 'image_save_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/save_image', |
|
28 | - 'image_temp_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/temp_image', |
|
29 | - 'user_data_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/user_data', |
|
30 | - 'plugin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/plugin', |
|
2 | + 'root_dir' => '%ROOT_DIR%', |
|
3 | + 'root_urlpath' => env('ECCUBE_ROOT_URLPATH', null), |
|
4 | + 'template_code' => env('ECCUBE_TEMPLATE_CODE','default'), |
|
5 | + 'admin_route' => env('ECCUBE_ADMIN_ROUTE','admin'), |
|
6 | + 'user_data_route' => env('ECCUBE_USER_DATA_ROUTE', 'user_data'), |
|
7 | + 'public_path' => env('ECCUBE_ROOT_URLPATH', null).'/html', |
|
8 | + 'public_path_realdir' => '%ROOT_DIR%/html', |
|
9 | + 'image_save_realdir' => '%ROOT_DIR%/html/upload/save_image', |
|
10 | + 'image_temp_realdir' => '%ROOT_DIR%/html/upload/temp_image', |
|
11 | + 'user_data_realdir' => '%ROOT_DIR%/html/user_data', |
|
12 | + 'block_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default/Block', |
|
13 | + 'block_realdir' => '%ROOT_DIR%/app/template/default/Block', |
|
14 | + 'template_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default', |
|
15 | + 'template_default_html_realdir' => '%ROOT_DIR%/html/template/default', |
|
16 | + 'template_admin_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/admin', |
|
17 | + 'template_admin_html_realdir' => '%ROOT_DIR%/html/template/admin', |
|
18 | + 'template_realdir' => '%ROOT_DIR%/app/template/default', |
|
19 | + 'template_html_realdir' => '%ROOT_DIR%/html/template/default', |
|
20 | + 'template_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/template', |
|
21 | + 'csv_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/csv', |
|
22 | + 'plugin_realdir' => '%ROOT_DIR%/app/Plugin', |
|
23 | + 'plugin_temp_realdir' => '%ROOT_DIR%/app/cache/plugin', |
|
24 | + 'plugin_html_realdir' => '%ROOT_DIR%/html/plugin', |
|
25 | + 'admin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/admin', |
|
26 | + 'front_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/default', |
|
27 | + 'image_save_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/save_image', |
|
28 | + 'image_temp_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/temp_image', |
|
29 | + 'user_data_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/user_data', |
|
30 | + 'plugin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/plugin', |
|
31 | 31 | ]; |
@@ -1,8 +1,8 @@ |
||
1 | 1 | <?php return [ |
2 | 2 | 'root_dir' => '%ROOT_DIR%', |
3 | 3 | 'root_urlpath' => env('ECCUBE_ROOT_URLPATH', null), |
4 | - 'template_code' => env('ECCUBE_TEMPLATE_CODE','default'), |
|
5 | - 'admin_route' => env('ECCUBE_ADMIN_ROUTE','admin'), |
|
4 | + 'template_code' => env('ECCUBE_TEMPLATE_CODE', 'default'), |
|
5 | + 'admin_route' => env('ECCUBE_ADMIN_ROUTE', 'admin'), |
|
6 | 6 | 'user_data_route' => env('ECCUBE_USER_DATA_ROUTE', 'user_data'), |
7 | 7 | 'public_path' => env('ECCUBE_ROOT_URLPATH', null).'/html', |
8 | 8 | 'public_path_realdir' => '%ROOT_DIR%/html', |