EC-CUBE / ec-cube

src/Eccube/Form/Type/Install/Step4Type.php

Spacing +3 added lines, -3 removed lines

@@ -96,7 +96,7 @@ 
                     new Assert\Callback(array($this, 'validate')),
                 ),
             ))
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) {
                 $form = $event->getForm();
                 $data = $form->getData();
                 try {
@@ -121,7 +121,7 @@ 
                     $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config);
                     $conn->connect();
                 } catch (\Exception $e) {
-                    $form['database']->addError(new FormError('データベースに接続できませんでした。' . $e->getMessage()));
+                    $form['database']->addError(new FormError('データベースに接続できませんでした。'.$e->getMessage()));
                 }
             });
     }
@@ -137,7 +137,7 @@ 
     public function validate($data, ExecutionContext $context, $param = null)
     {
         $parameters = $this->app['request']->get('install_step4');
-        if ($parameters['database'] != 'pdo_sqlite'){
+        if ($parameters['database'] != 'pdo_sqlite') {
             $context->validateValue($data, array(
                 new Assert\NotBlank()
             ));

src/Eccube/Application.php

Braces +1 added lines, -1 removed lines

@@ -454,7 +454,7 @@
         foreach ($finder as $dir) {
             if (file_exists($dir->getRealPath().'/config.yml')) {
                 $config = Yaml::parse(file_get_contents($dir->getRealPath().'/config.yml'));
-            }else{
+            } else{
                 $error = 'Application::initDoctrine : config.yamlがみつかりません'.$dir->getRealPath();
                 $this->log($error, array(), Logger::WARNING);
                 continue;

Doc Comments +1 added lines, -1 removed lines

@@ -725,7 +725,7 @@
      * 成功 : trueを返却
      *　失敗 : \Doctrine\DBAL\DBALExceptionエラーが発生( 接続に失敗した場合 )、エラー画面を表示しdie()
      * 備考 : app['debug']がtrueの際は処理を行わない
-     * @return boolean true
+     * @return null|boolean true
      *
      */
     protected function checkDatabaseConnection()

Spacing +3 added lines, -3 removed lines

@@ -454,7 +454,7 @@ 
         foreach ($finder as $dir) {
             if (file_exists($dir->getRealPath().'/config.yml')) {
                 $config = Yaml::parse(file_get_contents($dir->getRealPath().'/config.yml'));
-            }else{
+            } else {
                 $error = 'Application::initDoctrine : config.yamlがみつかりません'.$dir->getRealPath();
                 $this->log($error, array(), Logger::WARNING);
                 continue;
@@ -669,7 +669,7 @@ 
             //config.ymlのないディレクトリは無視する
             try {
                 $this['eccube.service.plugin']->checkPluginArchiveContent($dir->getRealPath());
-            } catch(\Eccube\Exception\PluginException $e) {
+            } catch (\Eccube\Exception\PluginException $e) {
                 $this['monolog']->warning($e->getMessage());
                 continue;
             }
@@ -721,7 +721,7 @@ 
                 foreach ($config['service'] as $service) {
                     $class = '\\Plugin\\'.$config['code'].'\\ServiceProvider\\'.$service;
                     if (!class_exists($class)) {
-                        $this['monolog']->warning('該当クラスが見つかりません:' . $class);
+                        $this['monolog']->warning('該当クラスが見つかりません:'.$class);
                         continue;
                     }
                     $this->register(new $class($this));

src/Eccube/Event/FormEventSubscriber.php

Unused Use Statements -1 removed lines

@@ -29,7 +29,6 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Yaml\Yaml;
-use Monolog\Logger;
 
 class FormEventSubscriber implements EventSubscriberInterface
 {

Spacing +10 added lines, -10 removed lines

@@ -37,7 +37,7 @@ 
     {
         $events = array();
         // YamlでParseしてがんばる
-        $basePath = __DIR__ . '/../../../app/Plugin';
+        $basePath = __DIR__.'/../../../app/Plugin';
         $finder = Finder::create()
             ->in($basePath)
             ->directories()
@@ -46,18 +46,18 @@ 
         $app = \Eccube\Application::getInstance();
 
         foreach ($finder as $dir) {
-            $config = Yaml::parse(file_get_contents($dir->getRealPath() . '/config.yml'));
+            $config = Yaml::parse(file_get_contents($dir->getRealPath().'/config.yml'));
             try {
                 $app['eccube.service.plugin']->checkPluginArchiveContent($dir->getRealPath());
-            } catch(\Eccube\Exception\PluginException $e) {
+            } catch (\Eccube\Exception\PluginException $e) {
                 $app['monolog']->warning($e->getMessage());
                 continue;
             }
-            $config = $app['eccube.service.plugin']->readYml($dir->getRealPath() . '/config.yml');
+            $config = $app['eccube.service.plugin']->readYml($dir->getRealPath().'/config.yml');
 
             if (isset($config['form'])) {
                 foreach ($config['form'] as $event => $class) {
-                    $events[$event][] = '\\Plugin\\' . $config['code'] . '\\' . $class;
+                    $events[$event][] = '\\Plugin\\'.$config['code'].'\\'.$class;
                 }
             }
         }
@@ -81,7 +81,7 @@ 
         $events = self::getEvents();
 
         if (isset($events['onPreSetData'])) {
-            foreach($events['onPreSetData'] as $formEventClass) {
+            foreach ($events['onPreSetData'] as $formEventClass) {
                 $formEvent = new $formEventClass();
                 $formEvent->onPreSetData($event);
             }
@@ -93,7 +93,7 @@ 
         $events = self::getEvents();
 
         if (isset($events['onPostSetData'])) {
-            foreach($events['onPostSetData'] as $formEventClass) {
+            foreach ($events['onPostSetData'] as $formEventClass) {
                 $formEvent = new $formEventClass();
                 $formEvent->onPostSetData($event);
             }
@@ -105,7 +105,7 @@ 
         $events = self::getEvents();
 
         if (isset($events['onPreSubmit'])) {
-            foreach($events['onPreSubmit'] as $formEventClass) {
+            foreach ($events['onPreSubmit'] as $formEventClass) {
                 $formEvent = new $formEventClass();
                 $formEvent->onPreSubmit($event);
             }
@@ -117,7 +117,7 @@ 
         $events = self::getEvents();
 
         if (isset($events['onSubmit'])) {
-            foreach($events['onSubmit'] as $formEventClass) {
+            foreach ($events['onSubmit'] as $formEventClass) {
                 $formEvent = new $formEventClass();
                 $formEvent->onSubmit($event);
             }
@@ -129,7 +129,7 @@ 
         $events = self::getEvents();
 
         if (isset($events['onPostSubmit'])) {
-            foreach($events['onPostSubmit'] as $formEventClass) {
+            foreach ($events['onPostSubmit'] as $formEventClass) {
                 $formEvent = new $formEventClass();
                 $formEvent->onPostSubmit($event);
             }