Completed
Pull Request — master (#1922)
by chihiro
39:42
created
src/Eccube/Resource/doctrine/migration/Version20160413151321.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
 
22 22
         // path.ymlの更新
23 23
         $app = Application::getInstance();
24
-        $file = $app['config']['root_dir'] . '/app/config/eccube/path.yml';
24
+        $file = $app['config']['root_dir'].'/app/config/eccube/path.yml';
25 25
         $config = Yaml::parse(file_get_contents($file));
26 26
 
27 27
         if (!array_key_exists('public_path', $config)) {
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/DebugServiceProvider.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 {
67 67
     public function register(Application $app)
68 68
     {
69
-        $app['var_dumper.cloner'] = $app->share(function ($app) {
69
+        $app['var_dumper.cloner'] = $app->share(function($app) {
70 70
             $cloner = new VarCloner();
71 71
 
72 72
             if (isset($app['debug.max_items'])) {
@@ -80,23 +80,23 @@  discard block
 block discarded – undo
80 80
             return $cloner;
81 81
         });
82 82
 
83
-        $app['data_collector.templates'] = $app->share($app->extend('data_collector.templates', function ($templates) {
83
+        $app['data_collector.templates'] = $app->share($app->extend('data_collector.templates', function($templates) {
84 84
             return array_merge($templates, array(array('dump', '@Debug/Profiler/dump.html.twig')));
85 85
         }));
86 86
 
87
-        $app['data_collector.dump'] = $app->share(function ($app) {
87
+        $app['data_collector.dump'] = $app->share(function($app) {
88 88
             return new DumpDataCollector($app['stopwatch'], $app['code.file_link_format']);
89 89
         });
90 90
 
91
-        $app['data_collectors'] = $app->share($app->extend('data_collectors', function ($collectors, $app) {
92
-            $collectors['dump'] = $app->share(function ($app) {
91
+        $app['data_collectors'] = $app->share($app->extend('data_collectors', function($collectors, $app) {
92
+            $collectors['dump'] = $app->share(function($app) {
93 93
                 return $app['data_collector.dump'];
94 94
             });
95 95
 
96 96
             return $collectors;
97 97
         }));
98 98
 
99
-        $app['twig'] = $app->share($app->extend('twig', function ($twig, $app) {
99
+        $app['twig'] = $app->share($app->extend('twig', function($twig, $app) {
100 100
             if (class_exists('\Symfony\Bridge\Twig\Extension\DumpExtension')) {
101 101
                 $twig->addExtension(new DumpExtension($app['var_dumper.cloner']));
102 102
             }
@@ -104,13 +104,13 @@  discard block
 block discarded – undo
104 104
             return $twig;
105 105
         }));
106 106
 
107
-        $app['twig.loader.filesystem'] = $app->share($app->extend('twig.loader.filesystem', function ($loader, $app) {
107
+        $app['twig.loader.filesystem'] = $app->share($app->extend('twig.loader.filesystem', function($loader, $app) {
108 108
             $loader->addPath($app['debug.templates_path'], 'Debug');
109 109
 
110 110
             return $loader;
111 111
         }));
112 112
 
113
-        $app['debug.templates_path'] = function () {
113
+        $app['debug.templates_path'] = function() {
114 114
             $r = new \ReflectionClass('Symfony\Bundle\DebugBundle\DependencyInjection\Configuration');
115 115
 
116 116
             return dirname(dirname($r->getFileName())).'/Resources/views';
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
         // This code is here to lazy load the dump stack. This default
123 123
         // configuration for CLI mode is overridden in HTTP mode on
124 124
         // 'kernel.request' event
125
-        VarDumper::setHandler(function ($var) use ($app) {
125
+        VarDumper::setHandler(function($var) use ($app) {
126 126
             $dumper = new CliDumper();
127 127
             $dumper->dump($app['var_dumper.cloner']->cloneVar($var));
128 128
         });
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Store/PluginController.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,6 @@
 block discarded – undo
36 36
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
37 37
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
38 38
 use Symfony\Component\Validator\Constraints as Assert;
39
-use Symfony\Component\Form\FormError;
40 39
 
41 40
 class PluginController extends AbstractController
42 41
 {
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/SearchProductType.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,6 @@
 block discarded – undo
27 27
 use Symfony\Component\Form\AbstractType;
28 28
 use Symfony\Component\Form\Extension\Core\Type;
29 29
 use Symfony\Component\Form\FormBuilderInterface;
30
-use Symfony\Component\Validator\Constraints as Assert;
31 30
 
32 31
 class SearchProductType extends AbstractType
33 32
 {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Content/CacheController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@
 block discarded – undo
58 58
                 }
59 59
                 if ($dir == 'doctrine') {
60 60
                     // doctrineが指定された場合は, cache driver経由で削除.
61
-                    $config =  $app['orm.em']->getConfiguration();
61
+                    $config = $app['orm.em']->getConfiguration();
62 62
                     $this->deleteDoctrineCache($config->getMetadataCacheImpl());
63 63
                     $this->deleteDoctrineCache($config->getQueryCacheImpl());
64 64
                     $this->deleteDoctrineCache($config->getResultCacheImpl());
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/ChangePasswordType.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -36,6 +36,9 @@
 block discarded – undo
36 36
 {
37 37
     protected $app;
38 38
 
39
+    /**
40
+     * @param \Silex\Application $app
41
+     */
39 42
     public function __construct($app)
40 43
     {
41 44
         $this->app = $app;
Please login to merge, or discard this patch.
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -25,8 +25,6 @@
 block discarded – undo
25 25
 
26 26
 use Symfony\Component\Form\AbstractType;
27 27
 use Symfony\Component\Form\FormBuilderInterface;
28
-use Symfony\Component\Form\FormError;
29
-use Symfony\Component\Form\FormEvents;
30 28
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
31 29
 use Symfony\Component\Security\Core\Validator\Constraints\UserPassword;
32 30
 use Symfony\Component\Validator\Constraints as Assert;
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/AdminController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -65,12 +65,12 @@  discard block
 block discarded – undo
65 65
     {
66 66
         // install.phpのチェック.
67 67
         if (isset($app['config']['eccube_install']) && $app['config']['eccube_install'] == 1) {
68
-            $file = $app['config']['root_dir'] . '/html/install.php';
68
+            $file = $app['config']['root_dir'].'/html/install.php';
69 69
             if (file_exists($file)) {
70 70
                 $message = $app->trans('admin.install.warning', array('installphpPath' => 'html/install.php'));
71 71
                 $app->addWarning($message, 'admin');
72 72
             }
73
-            $fileOnRoot = $app['config']['root_dir'] . '/install.php';
73
+            $fileOnRoot = $app['config']['root_dir'].'/install.php';
74 74
             if (file_exists($fileOnRoot)) {
75 75
                 $message = $app->trans('admin.install.warning', array('installphpPath' => 'install.php'));
76 76
                 $app->addWarning($message, 'admin');
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
                     t1.status
312 312
                 ORDER BY
313 313
                     t1.status';
314
-        $rsm = new ResultSetMapping();;
314
+        $rsm = new ResultSetMapping(); ;
315 315
         $rsm->addScalarResult('status', 'status');
316 316
         $rsm->addScalarResult('count', 'count');
317 317
         $query = $em->createNativeQuery($sql, $rsm);
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/System/MasterdataController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@
 block discarded – undo
128 128
                 $entityName = str_replace('-', '\\', $data['masterdata_name']);
129 129
                 $entity = new $entityName();
130 130
                 $rank = 0;
131
-                $ids = array_map(function ($v) {return $v['id'];}, $data['data']);
131
+                $ids = array_map(function($v) {return $v['id']; }, $data['data']);
132 132
                 foreach ($data['data'] as $key => $value) {
133 133
                     if ($value['id'] !== null && $value['name'] !== null) {
134 134
                         $entity->setId($value['id']);
Please login to merge, or discard this patch.
src/Eccube/Doctrine/ORM/Query/Extract.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@
 block discarded – undo
108 108
         if ($driver == 'pdo_sqlite') {
109 109
             return sprintf("CAST(STRFTIME('%s', %s) AS INTEGER)", $this->formats[$this->field], $this->source->dispatch($sqlWalker));
110 110
         } else {
111
-            return sprintf('EXTRACT(%s FROM %s %s)', $this->field, (string)$this->type, $this->source->dispatch($sqlWalker));
111
+            return sprintf('EXTRACT(%s FROM %s %s)', $this->field, (string) $this->type, $this->source->dispatch($sqlWalker));
112 112
         }
113 113
     }
114 114
 }
115 115
\ No newline at end of file
Please login to merge, or discard this patch.