Completed
Push — experimental/3.1 ( 9b1714...6cf17a )
by chihiro
22s
created
src/Eccube/Repository/PluginEventHandlerRepository.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -73,17 +73,17 @@  discard block
 block discarded – undo
73 73
 
74 74
         $qb = $this->createQueryBuilder('e');
75 75
         $qb->andWhere("e.priority >= $range_end ")
76
-           ->andWhere("e.priority <= $range_start ")
77
-           ->andWhere('e.event = :event')
78
-           ->setParameter('event',$event)
79
-           ->setMaxResults(1)
80
-           ->orderBy('e.priority','ASC');
76
+            ->andWhere("e.priority <= $range_start ")
77
+            ->andWhere('e.event = :event')
78
+            ->setParameter('event',$event)
79
+            ->setMaxResults(1)
80
+            ->orderBy('e.priority','ASC');
81 81
 
82 82
         $result=$qb->getQuery()->getResult();
83 83
         if(count($result)){
84
-             return $result[0]->getPriority() -1;
84
+                return $result[0]->getPriority() -1;
85 85
         }else{
86
-             return $range_start;
86
+                return $range_start;
87 87
         }
88 88
 
89 89
     }
@@ -96,13 +96,13 @@  discard block
 block discarded – undo
96 96
         $qb = $this->createQueryBuilder('e');
97 97
 
98 98
         $qb->andWhere("e.priority >= $range_end ")
99
-           ->andWhere("e.priority <= $range_start ")
100
-           ->andWhere('e.priority '.($up ?  '>' : '<' ).' :pri')
101
-           ->andWhere('e.event = :event')
102
-           ->setParameter('event',$pluginEventHandler->getEvent())
103
-           ->setParameter('pri',  $pluginEventHandler->getPriority()  )
104
-           ->setMaxResults(1)
105
-           ->orderBy('e.priority', ($up ? 'ASC':'DESC' )  );
99
+            ->andWhere("e.priority <= $range_start ")
100
+            ->andWhere('e.priority '.($up ?  '>' : '<' ).' :pri')
101
+            ->andWhere('e.event = :event')
102
+            ->setParameter('event',$pluginEventHandler->getEvent())
103
+            ->setParameter('pri',  $pluginEventHandler->getPriority()  )
104
+            ->setMaxResults(1)
105
+            ->orderBy('e.priority', ($up ? 'ASC':'DESC' )  );
106 106
 
107 107
         $result=$qb->getQuery()->getResult();
108 108
 
Please login to merge, or discard this patch.
src/Eccube/Repository/ProductRepository.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
      */
61 61
     protected $appConfig;
62 62
 
63
-   /**
63
+    /**
64 64
      * get query builder.
65 65
      *
66 66
      * @param  array $searchData
Please login to merge, or discard this patch.
src/Eccube/Repository/NewsRepository.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@
 block discarded – undo
114 114
      */
115 115
     public function delete($News)
116 116
     {
117
-       $this->createQueryBuilder('n')
117
+        $this->createQueryBuilder('n')
118 118
             ->update()
119 119
             ->set('n.rank', 'n.rank - 1')
120 120
             ->where('n.rank > :rank')
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/SecurityType.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -77,8 +77,8 @@
 block discarded – undo
77 77
                     new Assert\NotBlank(),
78 78
                     new Assert\Length(array('max' => $this->appConfig['stext_len'])),
79 79
                     new Assert\Regex(array(
80
-                       'pattern' => "/^[0-9a-zA-Z]+$/",
81
-                   )),
80
+                        'pattern' => "/^[0-9a-zA-Z]+$/",
81
+                    )),
82 82
                 ),
83 83
             ))
84 84
             ->add('admin_allow_hosts', TextareaType::class, array(
Please login to merge, or discard this patch.
src/Eccube/Resource/config/path.php 1 patch
Indentation   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -1,31 +1,31 @@
 block discarded – undo
1 1
 <?php return [
2
-  'root_dir' => '%ROOT_DIR%',
3
-  'root_urlpath' => env('ROOT_URLPATH', null),
4
-  'template_code' => env('TEMPLATE_CODE','default'),
5
-  'admin_route' => env('ADMIN_ROUTE','admin'),
6
-  'user_data_route' => env('USER_DATA_ROUTE', 'user_data'),
7
-  'public_path' => '/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' => '/html/template/admin',
26
-  'front_urlpath' => '/html/template/default',
27
-  'image_save_urlpath' => '/html/upload/save_image',
28
-  'image_temp_urlpath' => '/html/upload/temp_image',
29
-  'user_data_urlpath' => '/html/user_data',
30
-  'plugin_urlpath' => '/html/plugin',
2
+    'root_dir' => '%ROOT_DIR%',
3
+    'root_urlpath' => env('ROOT_URLPATH', null),
4
+    'template_code' => env('TEMPLATE_CODE','default'),
5
+    'admin_route' => env('ADMIN_ROUTE','admin'),
6
+    'user_data_route' => env('USER_DATA_ROUTE', 'user_data'),
7
+    'public_path' => '/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' => '/html/template/admin',
26
+    'front_urlpath' => '/html/template/default',
27
+    'image_save_urlpath' => '/html/upload/save_image',
28
+    'image_temp_urlpath' => '/html/upload/temp_image',
29
+    'user_data_urlpath' => '/html/user_data',
30
+    'plugin_urlpath' => '/html/plugin',
31 31
 ];
Please login to merge, or discard this patch.
src/Eccube/Resource/config/log.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php return [
2
-  'log' => 
3
-  [
2
+    'log' => 
3
+    [
4 4
     'suffix' => null,
5 5
     'filename' => 'site',
6 6
     'delimiter' => '_',
@@ -13,8 +13,8 @@  discard block
 block discarded – undo
13 13
     'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
14 14
     'channel' => 
15 15
     [
16
-      'monolog' => 
17
-      [
16
+        'monolog' => 
17
+        [
18 18
         'name' => 'eccube',
19 19
         'filename' => 'site',
20 20
         'delimiter' => '_',
@@ -25,9 +25,9 @@  discard block
 block discarded – undo
25 25
         'max_files' => 90,
26 26
         'log_dateformat' => 'Y-m-d H:i:s,u',
27 27
         'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
28
-      ],
29
-      'front' => 
30
-      [
28
+        ],
29
+        'front' => 
30
+        [
31 31
         'name' => 'front',
32 32
         'filename' => 'front_site',
33 33
         'delimiter' => '_',
@@ -38,9 +38,9 @@  discard block
 block discarded – undo
38 38
         'max_files' => 90,
39 39
         'log_dateformat' => 'Y-m-d H:i:s,u',
40 40
         'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
41
-      ],
42
-      'admin' => 
43
-      [
41
+        ],
42
+        'admin' => 
43
+        [
44 44
         'name' => 'admin',
45 45
         'filename' => 'admin_site',
46 46
         'delimiter' => '_',
@@ -51,12 +51,12 @@  discard block
 block discarded – undo
51 51
         'max_files' => 90,
52 52
         'log_dateformat' => 'Y-m-d H:i:s,u',
53 53
         'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
54
-      ],
54
+        ],
55 55
     ],
56 56
     'exclude_keys' => 
57 57
     [
58
-      'password',
59
-      'app',
58
+        'password',
59
+        'app',
60
+    ],
60 61
     ],
61
-  ],
62 62
 ];
Please login to merge, or discard this patch.
src/Eccube/Resource/config/doctrine_cache.php 1 patch
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -1,39 +1,39 @@
 block discarded – undo
1 1
 <?php return [
2
-  'doctrine_cache' => 
3
-  [
2
+    'doctrine_cache' => 
3
+    [
4 4
     'metadata_cache' => 
5 5
     [
6
-      'driver' => 'array',
7
-      'path' => null,
8
-      'host' => null,
9
-      'port' => null,
10
-      'password' => null,
6
+        'driver' => 'array',
7
+        'path' => null,
8
+        'host' => null,
9
+        'port' => null,
10
+        'password' => null,
11 11
     ],
12 12
     'query_cache' => 
13 13
     [
14
-      'driver' => 'array',
15
-      'path' => null,
16
-      'host' => null,
17
-      'port' => null,
18
-      'password' => null,
14
+        'driver' => 'array',
15
+        'path' => null,
16
+        'host' => null,
17
+        'port' => null,
18
+        'password' => null,
19 19
     ],
20 20
     'result_cache' => 
21 21
     [
22
-      'driver' => 'array',
23
-      'path' => null,
24
-      'host' => null,
25
-      'port' => null,
26
-      'password' => null,
27
-      'lifetime' => 3600,
28
-      'clear_cache' => true,
22
+        'driver' => 'array',
23
+        'path' => null,
24
+        'host' => null,
25
+        'port' => null,
26
+        'password' => null,
27
+        'lifetime' => 3600,
28
+        'clear_cache' => true,
29 29
     ],
30 30
     'hydration_cache' => 
31 31
     [
32
-      'driver' => 'array',
33
-      'path' => null,
34
-      'host' => null,
35
-      'port' => null,
36
-      'password' => null,
32
+        'driver' => 'array',
33
+        'path' => null,
34
+        'host' => null,
35
+        'port' => null,
36
+        'password' => null,
37
+    ],
37 38
     ],
38
-  ],
39 39
 ];
Please login to merge, or discard this patch.