| @@ -58,7 +58,7 @@ | ||
| 58 | 58 | |
| 59 | 59 | // load config dev | 
| 60 | 60 | $conf = $app['config']; | 
| 61 | -$app['config'] = $app->share(function () use ($conf) { | |
| 61 | +$app['config'] = $app->share(function() use ($conf) { | |
| 62 | 62 | $confarray = array(); | 
| 63 | 63 | $config_dev_file = __DIR__.'/../app/config/eccube/config_dev.yml'; | 
| 64 | 64 |      if (file_exists($config_dev_file)) { | 
| @@ -89,20 +89,20 @@ discard block | ||
| 89 | 89 | $max = count($Blocks); | 
| 90 | 90 |                  for ($i = 0; $i < $max; $i++) { | 
| 91 | 91 | // block_id が取得できない場合は INSERT しない | 
| 92 | -                    if (!isset($data['id_' . $i])) { | |
| 92 | +                    if (!isset($data['id_'.$i])) { | |
| 93 | 93 | continue; | 
| 94 | 94 | } | 
| 95 | 95 | // 未使用は INSERT しない | 
| 96 | -                    if ($data['target_id_' . $i] == \Eccube\Entity\PageLayout::TARGET_ID_UNUSED) { | |
| 96 | +                    if ($data['target_id_'.$i] == \Eccube\Entity\PageLayout::TARGET_ID_UNUSED) { | |
| 97 | 97 | continue; | 
| 98 | 98 | } | 
| 99 | 99 | // 他のページに anywhere が存在する場合は INSERT しない | 
| 100 | - $anywhere = (isset($data['anywhere_' . $i]) && $data['anywhere_' . $i] == 1) ? 1 : 0; | |
| 101 | -                    if (isset($data['anywhere_' . $i]) && $data['anywhere_' . $i] == 1) { | |
| 100 | + $anywhere = (isset($data['anywhere_'.$i]) && $data['anywhere_'.$i] == 1) ? 1 : 0; | |
| 101 | +                    if (isset($data['anywhere_'.$i]) && $data['anywhere_'.$i] == 1) { | |
| 102 | 102 |                          $Other = $app['orm.em']->getRepository('Eccube\Entity\BlockPosition') | 
| 103 | 103 | ->findBy(array( | 
| 104 | 104 | 'anywhere' => 1, | 
| 105 | - 'block_id' => $data['id_' . $i], | |
| 105 | + 'block_id' => $data['id_'.$i], | |
| 106 | 106 | )); | 
| 107 | 107 |                          if (count($Other) > 0) { | 
| 108 | 108 | continue; | 
| @@ -112,14 +112,14 @@ discard block | ||
| 112 | 112 | $BlockPosition = new \Eccube\Entity\BlockPosition(); | 
| 113 | 113 |                      $Block = $app['orm.em']->getRepository('Eccube\Entity\Block') | 
| 114 | 114 | ->findOneBy(array( | 
| 115 | - 'id' => $data['id_' . $i], | |
| 115 | + 'id' => $data['id_'.$i], | |
| 116 | 116 | 'DeviceType' => $DeviceType, | 
| 117 | 117 | )); | 
| 118 | 118 | $BlockPosition | 
| 119 | 119 | ->setPageId($id) | 
| 120 | - ->setBlockId($data['id_' . $i]) | |
| 121 | - ->setBlockRow($data['top_' . $i]) | |
| 122 | - ->setTargetId($data['target_id_' . $i]) | |
| 120 | + ->setBlockId($data['id_'.$i]) | |
| 121 | + ->setBlockRow($data['top_'.$i]) | |
| 122 | + ->setTargetId($data['target_id_'.$i]) | |
| 123 | 123 | ->setBlock($Block) | 
| 124 | 124 | ->setPageLayout($TargetPageLayout) | 
| 125 | 125 | ->setAnywhere($anywhere); | 
| @@ -95,7 +95,7 @@ | ||
| 95 | 95 |          $num = $app['eccube.repository.product_class']->createQueryBuilder('pc') | 
| 96 | 96 |              ->select('count(pc.id)') | 
| 97 | 97 |              ->where('pc.ClassCategory1 = :id OR pc.ClassCategory2 = :id') | 
| 98 | -            ->setParameter('id',$id) | |
| 98 | +            ->setParameter('id', $id) | |
| 99 | 99 | ->getQuery() | 
| 100 | 100 | ->getSingleScalarResult(); | 
| 101 | 101 |          if ($num > 0) { | 
| @@ -49,7 +49,7 @@ discard block | ||
| 49 | 49 | |
| 50 | 50 | return $phpinfo; | 
| 51 | 51 | |
| 52 | - break; | |
| 52 | + break; | |
| 53 | 53 | default: | 
| 54 | 54 | break; | 
| 55 | 55 | } | 
| @@ -61,8 +61,8 @@ discard block | ||
| 61 | 61 | )); | 
| 62 | 62 | } | 
| 63 | 63 | |
| 64 | - public function getSystemInfo(Application $app) | |
| 65 | -     { | |
| 64 | + public function getSystemInfo(Application $app) | |
| 65 | +        { | |
| 66 | 66 | $system = $app['eccube.service.system']; | 
| 67 | 67 | $server = $app['request']; | 
| 68 | 68 | |
| @@ -78,5 +78,5 @@ discard block | ||
| 78 | 78 |          $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $server->headers->get('User-Agent')); | 
| 79 | 79 | |
| 80 | 80 | return $arrSystemInfo; | 
| 81 | - } | |
| 81 | + } | |
| 82 | 82 | } | 
| @@ -67,13 +67,13 @@ | ||
| 67 | 67 | $server = $app['request']; | 
| 68 | 68 | |
| 69 | 69 | $arrSystemInfo = array( | 
| 70 | -            array('title' => 'EC-CUBE',     'value' => Constant::VERSION), | |
| 71 | -            array('title' => 'サーバーOS',    'value' => php_uname()), | |
| 72 | -            array('title' => 'DBサーバー',    'value' => $system->getDbversion()), | |
| 73 | -            array('title' => 'WEBサーバー',   'value' => $server->server->get("SERVER_SOFTWARE")), | |
| 70 | +            array('title' => 'EC-CUBE', 'value' => Constant::VERSION), | |
| 71 | +            array('title' => 'サーバーOS', 'value' => php_uname()), | |
| 72 | +            array('title' => 'DBサーバー', 'value' => $system->getDbversion()), | |
| 73 | +            array('title' => 'WEBサーバー', 'value' => $server->server->get("SERVER_SOFTWARE")), | |
| 74 | 74 | ); | 
| 75 | 75 | |
| 76 | -        $value = phpversion() . ' (' . implode(', ', get_loaded_extensions()) . ')'; | |
| 76 | +        $value = phpversion().' ('.implode(', ', get_loaded_extensions()).')'; | |
| 77 | 77 |          $arrSystemInfo[] = array('title' => 'PHP', 'value' => $value); | 
| 78 | 78 |          $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $server->headers->get('User-Agent')); | 
| 79 | 79 | |
| @@ -38,7 +38,7 @@ | ||
| 38 | 38 | |
| 39 | 39 |          if ($app['eccube.layout']) { | 
| 40 | 40 |              foreach ($app['eccube.layout']->getBlocPositions() as $blocPositions) { | 
| 41 | -                if ($blocPositions->getTargetId() == constant("Eccube\Entity\BlocPosition::" . $position)) { | |
| 41 | +                if ($blocPositions->getTargetId() == constant("Eccube\Entity\BlocPosition::".$position)) { | |
| 42 | 42 | $blocks[] = $blocPositions->getBloc(); | 
| 43 | 43 | } | 
| 44 | 44 | } | 
| @@ -32,7 +32,7 @@ | ||
| 32 | 32 | public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias) | 
| 33 | 33 |      { | 
| 34 | 34 |          if ($targetEntity->reflClass->getName() === 'Eccube\Entity\ProductClass') { | 
| 35 | - return $targetTableAlias . '.stock >= 1 OR ' . $targetTableAlias . '.stock_unlimited = 1'; | |
| 35 | + return $targetTableAlias.'.stock >= 1 OR '.$targetTableAlias.'.stock_unlimited = 1'; | |
| 36 | 36 |          } else { | 
| 37 | 37 | return ""; | 
| 38 | 38 | } | 
| @@ -33,12 +33,12 @@ | ||
| 33 | 33 |      { | 
| 34 | 34 | // 決済処理中/購入処理中を除く. | 
| 35 | 35 |          if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Order') { | 
| 36 | - return $targetTableAlias . '.status <> 7 AND ' . $targetTableAlias . '.status <> 8'; | |
| 36 | + return $targetTableAlias.'.status <> 7 AND '.$targetTableAlias.'.status <> 8'; | |
| 37 | 37 | } | 
| 38 | 38 | |
| 39 | 39 | // 決済処理中/購入処理中を除く. | 
| 40 | 40 |          if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Master\OrderStatus') { | 
| 41 | - return $targetTableAlias . '.id <> 7 AND ' . $targetTableAlias . '.id <> 8'; | |
| 41 | + return $targetTableAlias.'.id <> 7 AND '.$targetTableAlias.'.id <> 8'; | |
| 42 | 42 | } | 
| 43 | 43 | |
| 44 | 44 | return ''; | 
| @@ -46,7 +46,7 @@ | ||
| 46 | 46 | public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias) | 
| 47 | 47 |      { | 
| 48 | 48 |          if ($targetEntity->hasField('del_flg') && !in_array($targetEntity->getName(), $this->getExcludes())) { | 
| 49 | - return $targetTableAlias . '.del_flg = 0'; | |
| 49 | + return $targetTableAlias.'.del_flg = 0'; | |
| 50 | 50 |          } else { | 
| 51 | 51 | return ""; | 
| 52 | 52 | } | 
| @@ -41,7 +41,7 @@ | ||
| 41 | 41 | 'label' => false, | 
| 42 | 42 | 'class' => 'Eccube\Entity\PageLayout', | 
| 43 | 43 | 'property' => 'name', | 
| 44 | -                'query_builder' => function (EntityRepository $er) { | |
| 44 | +                'query_builder' => function(EntityRepository $er) { | |
| 45 | 45 | return $er | 
| 46 | 46 |                          ->createQueryBuilder('l') | 
| 47 | 47 |                          ->where('l.id <> 0') |