Completed
Push — master ( c53dd7...979eb7 )
by chihiro
31:42
created
src/Eccube/Service/PluginService.php 2 patches
Doc Comments   +21 added lines patch added patch discarded remove patch
@@ -36,6 +36,9 @@  discard block
 block discarded – undo
36 36
     const EVENT_YML = 'event.yml';
37 37
     private $app;
38 38
 
39
+    /**
40
+     * @param \Silex\Application $app
41
+     */
39 42
     public function __construct($app)
40 43
     {
41 44
         $this->app = $app;
@@ -98,6 +101,9 @@  discard block
 block discarded – undo
98 101
         }
99 102
     }
100 103
 
104
+    /**
105
+     * @param string $dir
106
+     */
101 107
     public function unpackPluginArchive($archive, $dir)
102 108
     {
103 109
         $extension = pathinfo($archive, PATHINFO_EXTENSION);
@@ -116,6 +122,9 @@  discard block
 block discarded – undo
116 122
         }
117 123
     }
118 124
 
125
+    /**
126
+     * @param string $dir
127
+     */
119 128
     public function checkPluginArchiveContent($dir)
120 129
     {
121 130
         try {
@@ -153,6 +162,9 @@  discard block
 block discarded – undo
153 162
         }
154 163
     }
155 164
 
165
+    /**
166
+     * @param string $yml
167
+     */
156 168
     public function readYml($yml)
157 169
     {
158 170
         if (file_exists($yml)) {
@@ -170,6 +182,9 @@  discard block
 block discarded – undo
170 182
         // ディレクトリ名などに使われれるので厳しめ
171 183
     }
172 184
 
185
+    /**
186
+     * @param string $path
187
+     */
173 188
     public function deleteFile($path)
174 189
     {
175 190
         $f = new Filesystem();
@@ -189,6 +204,9 @@  discard block
 block discarded – undo
189 204
         return $this->app['config']['plugin_realdir'].'/'.$name;
190 205
     }
191 206
 
207
+    /**
208
+     * @param string $d
209
+     */
192 210
     public function createPluginDir($d)
193 211
     {
194 212
         $b = @mkdir($d);
@@ -248,6 +266,9 @@  discard block
 block discarded – undo
248 266
         return $p;
249 267
     }
250 268
 
269
+    /**
270
+     * @param string $method
271
+     */
251 272
     public function callPluginManagerMethod($meta, $method)
252 273
     {
253 274
         $class = '\\Plugin'.'\\'.$meta['code'].'\\'.'PluginManager';
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -119,7 +119,7 @@
 block discarded – undo
119 119
     public function checkPluginArchiveContent($dir)
120 120
     {
121 121
         try {
122
-            $meta = $this->readYml($dir . '/config.yml');
122
+            $meta = $this->readYml($dir.'/config.yml');
123 123
         } catch (\Symfony\Component\Yaml\Exception\ParseException $e) {
124 124
             throw new PluginException($e->getMessage(), $e->getCode(), $e);
125 125
         }
Please login to merge, or discard this patch.
src/Eccube/Service/ShoppingService.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@
 block discarded – undo
152 152
      * 仮受注情報作成
153 153
      *
154 154
      * @param $Customer
155
-     * @param $preOrderId
155
+     * @param string $preOrderId
156 156
      * @return mixed
157 157
      * @throws \Doctrine\ORM\NoResultException
158 158
      * @throws \Doctrine\ORM\NonUniqueResultException
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -932,7 +932,7 @@
 block discarded – undo
932 932
 
933 933
         // 配送日数が設定されている
934 934
         if ($deliveryDateFlag) {
935
-            $period = new \DatePeriod (
935
+            $period = new \DatePeriod(
936 936
                 new \DateTime($minDate.' day'),
937 937
                 new \DateInterval('P1D'),
938 938
                 new \DateTime($minDate + $this->app['config']['deliv_date_end_max'].' day')
Please login to merge, or discard this patch.
src/silex-doctrine-migrations/MigrationServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
         $app['db.migrations.table_name'] = null;
25 25
         $app['db.migrations.name'] = null;
26 26
 
27
-        $app['dispatcher']->addListener(ConsoleEvents::INIT, function (ConsoleEvent $event) use ($app) {
27
+        $app['dispatcher']->addListener(ConsoleEvents::INIT, function(ConsoleEvent $event) use ($app) {
28 28
             $application = $event->getApplication();
29 29
 
30 30
             $helpers = array('dialog' => new DialogHelper());
Please login to merge, or discard this patch.
src/Eccube/Application/ApplicationTrait.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -20,32 +20,32 @@  discard block
 block discarded – undo
20 20
      */
21 21
     public function addSuccess($message, $namespace = 'front')
22 22
     {
23
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.success', $message);
23
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.success', $message);
24 24
     }
25 25
 
26 26
     public function addError($message, $namespace = 'front')
27 27
     {
28
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.error', $message);
28
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.error', $message);
29 29
     }
30 30
 
31 31
     public function addDanger($message, $namespace = 'front')
32 32
     {
33
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.danger', $message);
33
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.danger', $message);
34 34
     }
35 35
 
36 36
     public function addWarning($message, $namespace = 'front')
37 37
     {
38
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.warning', $message);
38
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.warning', $message);
39 39
     }
40 40
 
41 41
     public function addInfo($message, $namespace = 'front')
42 42
     {
43
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.info', $message);
43
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.info', $message);
44 44
     }
45 45
 
46 46
     public function addRequestError($message, $namespace = 'front')
47 47
     {
48
-        $this['session']->getFlashBag()->set('eccube.' . $namespace . '.request.error', $message);
48
+        $this['session']->getFlashBag()->set('eccube.'.$namespace.'.request.error', $message);
49 49
     }
50 50
 
51 51
     public function clearMessage()
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
         if (is_null($namespace)) {
65 65
             $this['session']->getFlashBag()->set('eccube.login.target.path', $targetPath);
66 66
         } else {
67
-            $this['session']->getFlashBag()->set('eccube.' . $namespace . '.login.target.path', $targetPath);
67
+            $this['session']->getFlashBag()->set('eccube.'.$namespace.'.login.target.path', $targetPath);
68 68
         }
69 69
     }
70 70
 
@@ -234,14 +234,14 @@  discard block
 block discarded – undo
234 234
         $eventName = $view;
235 235
         if ($this->isAdminRequest()) {
236 236
             // 管理画面の場合、event名に「Admin/」を付ける
237
-            $eventName = 'Admin/' . $view;
237
+            $eventName = 'Admin/'.$view;
238 238
         }
239
-        $this['monolog']->debug('Template Event Name : ' . $eventName);
239
+        $this['monolog']->debug('Template Event Name : '.$eventName);
240 240
 
241 241
         $this['eccube.event.dispatcher']->dispatch($eventName, $event);
242 242
 
243 243
         if ($response instanceof StreamedResponse) {
244
-            $response->setCallback(function () use ($twig, $view, $parameters) {
244
+            $response->setCallback(function() use ($twig, $view, $parameters) {
245 245
                 $twig->display($view, $parameters);
246 246
             });
247 247
         } else {
Please login to merge, or discard this patch.
src/Eccube/Resource/doctrine/migration/Version20150812132454.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
         // this up() migration is auto-generated, please modify it to your needs
22 22
         $t = $schema->getTable(self::NAME);
23 23
 
24
-        if($t->hasColumn('option_delivery_fee')){
24
+        if ($t->hasColumn('option_delivery_fee')) {
25 25
             $t->dropColumn('option_delivery_fee');
26 26
         }
27 27
 
Please login to merge, or discard this patch.
src/Eccube/Resource/doctrine/migration/Version20150722170707.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
     public function up(Schema $schema)
17 17
     {
18 18
 
19
-        if($this->connection->getDatabasePlatform()->getName() == "mysql"){
19
+        if ($this->connection->getDatabasePlatform()->getName() == "mysql") {
20 20
             // this up() migration is auto-generated, please modify it to your needs
21 21
             $this->addSql("alter table  dtb_base_info                 collate utf8_general_ci ;");
22 22
             $this->addSql("alter table  dtb_block                     collate utf8_general_ci ;");
Please login to merge, or discard this patch.
src/Eccube/Resource/doctrine/migration/Version20151023102323.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 
28 28
         $PageLayout = new PageLayout();
29 29
         $PageLayout->setDeviceType($DeviceType);
30
-        $PageLayout->setName( '商品購入/お届け先の追加');
30
+        $PageLayout->setName('商品購入/お届け先の追加');
31 31
         $PageLayout->setUrl('shopping_shipping_edit');
32 32
         $PageLayout->setFileName('Shopping/shipping_edit');
33 33
         $PageLayout->setEditFlg(2);
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 
39 39
         $PageLayout = new PageLayout();
40 40
         $PageLayout->setDeviceType($DeviceType);
41
-        $PageLayout->setName( '商品購入/お届け先の複数指定(お届け先の追加)');
41
+        $PageLayout->setName('商品購入/お届け先の複数指定(お届け先の追加)');
42 42
         $PageLayout->setUrl('shopping_shipping_multiple_edit');
43 43
         $PageLayout->setFileName('Shopping/shipping_multiple_edit');
44 44
         $PageLayout->setEditFlg(2);
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 
50 50
         $PageLayout = new PageLayout();
51 51
         $PageLayout->setDeviceType($DeviceType);
52
-        $PageLayout->setName( '商品購入/購入エラー');
52
+        $PageLayout->setName('商品購入/購入エラー');
53 53
         $PageLayout->setUrl('shopping_error');
54 54
         $PageLayout->setFileName('Shopping/shopping_error');
55 55
         $PageLayout->setEditFlg(2);
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 
61 61
         $PageLayout = new PageLayout();
62 62
         $PageLayout->setDeviceType($DeviceType);
63
-        $PageLayout->setName( 'ご利用ガイド');
63
+        $PageLayout->setName('ご利用ガイド');
64 64
         $PageLayout->setUrl('help_guide');
65 65
         $PageLayout->setFileName('Help/guide');
66 66
         $PageLayout->setEditFlg(2);
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 
71 71
         $PageLayout = new PageLayout();
72 72
         $PageLayout->setDeviceType($DeviceType);
73
-        $PageLayout->setName( 'パスワード再発行(入力ページ)');
73
+        $PageLayout->setName('パスワード再発行(入力ページ)');
74 74
         $PageLayout->setUrl('forgot');
75 75
         $PageLayout->setFileName('Forgot/index');
76 76
         $PageLayout->setEditFlg(2);
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 
81 81
         $PageLayout = new PageLayout();
82 82
         $PageLayout->setDeviceType($DeviceType);
83
-        $PageLayout->setName( 'パスワード再発行(完了ページ)');
83
+        $PageLayout->setName('パスワード再発行(完了ページ)');
84 84
         $PageLayout->setUrl('forgot_complete');
85 85
         $PageLayout->setFileName('Forgot/complete');
86 86
         $PageLayout->setEditFlg(2);
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 
92 92
         $PageLayout = new PageLayout();
93 93
         $PageLayout->setDeviceType($DeviceType);
94
-        $PageLayout->setName( 'パスワード変更((完了ページ)');
94
+        $PageLayout->setName('パスワード変更((完了ページ)');
95 95
         $PageLayout->setUrl('forgot_reset');
96 96
         $PageLayout->setFileName('Forgot/reset');
97 97
         $PageLayout->setEditFlg(2);
Please login to merge, or discard this patch.
src/Eccube/Resource/doctrine/migration/Version20151110174227.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
         $t_dtb_mail_history = $schema->getTable(self::DTB_MAIL_HISTORY);
25 25
 
26 26
         $keyName = '';
27
-        if($t_dtb_mail_history->hasColumn('creator_id')){
27
+        if ($t_dtb_mail_history->hasColumn('creator_id')) {
28 28
             $keys = $t_dtb_mail_history->getForeignKeys();
29 29
             foreach ($keys as $key) {
30 30
                 $column = $key->getColumns();
Please login to merge, or discard this patch.
src/Eccube/Resource/doctrine/migration/Version20150806222639.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,8 +39,8 @@
 block discarded – undo
39 39
     public function up(Schema $schema)
40 40
     {
41 41
         // this up() migration is auto-generated, please modify it to your needs
42
-        $t=$schema->getTable('dtb_product_class');
43
-        if($t->hasColumn('stock_unlimited_tmp')){
42
+        $t = $schema->getTable('dtb_product_class');
43
+        if ($t->hasColumn('stock_unlimited_tmp')) {
44 44
             $this->addSql('update dtb_product_class set stock_unlimited = stock_unlimited_tmp;');
45 45
             $t->dropColumn('stock_unlimited_tmp');
46 46
         }
Please login to merge, or discard this patch.