| @@ -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 | } | 
| @@ -55,8 +55,8 @@ | ||
| 55 | 55 | new Assert\NotBlank(), | 
| 56 | 56 |                      new Assert\Length(array('max' => $this->config['stext_len'])), | 
| 57 | 57 | new Assert\Regex(array( | 
| 58 | - 'pattern' => "/^[0-9a-zA-Z]+$/", | |
| 59 | - )), | |
| 58 | + 'pattern' => "/^[0-9a-zA-Z]+$/", | |
| 59 | + )), | |
| 60 | 60 | ), | 
| 61 | 61 | )) | 
| 62 | 62 |              ->add('admin_allow_host', 'textarea', array( | 
| @@ -17,8 +17,8 @@ | ||
| 17 | 17 | $config->registerMigrationsFromDirectory($migrationFilePath ); | 
| 18 | 18 | $config->setMigrationsTableName(self::MIGRATION_TABLE_PREFIX.$pluginCode); | 
| 19 | 19 | $migration = new Migration($config); | 
| 20 | - // null 又は 'last' を渡すと最新バージョンまでマイグレートする | |
| 21 | - // 0か'first'を渡すと最初に戻る | |
| 20 | + // null 又は 'last' を渡すと最新バージョンまでマイグレートする | |
| 21 | + // 0か'first'を渡すと最初に戻る | |
| 22 | 22 | $migration->migrate($version, false); | 
| 23 | 23 | |
| 24 | 24 | |
| @@ -274,7 +274,7 @@ | ||
| 274 | 274 |              $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null; | 
| 275 | 275 | $qb | 
| 276 | 276 |                  ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' . | 
| 277 | - 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti') | |
| 277 | + 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti') | |
| 278 | 278 |                  ->setParameter('multi', $multi) | 
| 279 | 279 |                  ->setParameter('likemulti', '%' . $searchData['multi'] . '%'); | 
| 280 | 280 | } | 
| @@ -73,17 +73,17 @@ discard block | ||
| 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,14 +96,14 @@ discard block | ||
| 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.del_flg = 0 ")  | |
| 101 | -           ->andWhere('e.priority '.($up ?  '>' : '<' ).' :pri') | |
| 102 | -           ->andWhere('e.event = :event') | |
| 103 | -           ->setParameter('event',$pluginEventHandler->getEvent()) | |
| 104 | -           ->setParameter('pri',  $pluginEventHandler->getPriority()  ) | |
| 105 | - ->setMaxResults(1) | |
| 106 | -           ->orderBy('e.priority', ($up ? 'ASC':'DESC' )  ); | |
| 99 | +            ->andWhere("e.priority <= $range_start ") | |
| 100 | +            ->andWhere("e.del_flg = 0 ")  | |
| 101 | +            ->andWhere('e.priority '.($up ?  '>' : '<' ).' :pri') | |
| 102 | +            ->andWhere('e.event = :event') | |
| 103 | +            ->setParameter('event',$pluginEventHandler->getEvent()) | |
| 104 | +            ->setParameter('pri',  $pluginEventHandler->getPriority()  ) | |
| 105 | + ->setMaxResults(1) | |
| 106 | +            ->orderBy('e.priority', ($up ? 'ASC':'DESC' )  ); | |
| 107 | 107 | |
| 108 | 108 | $result=$qb->getQuery()->getResult(); | 
| 109 | 109 | |
| @@ -55,10 +55,10 @@ discard block | ||
| 55 | 55 |          if(PluginEventHandler::EVENT_HANDLER_TYPE_FIRST==$type){ | 
| 56 | 56 | $range_start=PluginEventHandler::EVENT_PRIORITY_FIRST_START; | 
| 57 | 57 | $range_end=PluginEventHandler::EVENT_PRIORITY_FIRST_END; | 
| 58 | -        }elseif(PluginEventHandler::EVENT_HANDLER_TYPE_LAST==$type){ | |
| 58 | +        } elseif(PluginEventHandler::EVENT_HANDLER_TYPE_LAST==$type){ | |
| 59 | 59 | $range_start=PluginEventHandler::EVENT_PRIORITY_LAST_START; | 
| 60 | 60 | $range_end=PluginEventHandler::EVENT_PRIORITY_LAST_END; | 
| 61 | -        }else{ | |
| 61 | +        } else{ | |
| 62 | 62 | $range_start=PluginEventHandler::EVENT_PRIORITY_NORMAL_START; | 
| 63 | 63 | $range_end=PluginEventHandler::EVENT_PRIORITY_NORMAL_END; | 
| 64 | 64 | } | 
| @@ -82,7 +82,7 @@ discard block | ||
| 82 | 82 | $result=$qb->getQuery()->getResult(); | 
| 83 | 83 |          if(count($result)){ | 
| 84 | 84 | return $result[0]->getPriority() -1; | 
| 85 | -        }else{ | |
| 85 | +        } else{ | |
| 86 | 86 | return $range_start; | 
| 87 | 87 | } | 
| 88 | 88 | |
| @@ -119,7 +119,7 @@ discard block | ||
| 119 | 119 | $em->flush(); | 
| 120 | 120 | $em->getConnection()->commit(); | 
| 121 | 121 | # 移動する | 
| 122 | -        }else{ | |
| 122 | +        } else{ | |
| 123 | 123 | # 移動しない | 
| 124 | 124 |              throw new PluginException("Can't swap"); | 
| 125 | 125 | } | 
| @@ -138,7 +138,7 @@ | ||
| 138 | 138 | 'allow_add' => true, | 
| 139 | 139 | 'allow_delete' => true, | 
| 140 | 140 | 'data' => $ProductClasses, | 
| 141 | - )); | |
| 141 | + )); | |
| 142 | 142 | |
| 143 | 143 | $event = new EventArgs( | 
| 144 | 144 | array( | 
| @@ -1155,11 +1155,11 @@ | ||
| 1155 | 1155 | } | 
| 1156 | 1156 | |
| 1157 | 1157 | /** | 
| 1158 | - * ProductCategory作成 | |
| 1159 | - * @param \Eccube\Entity\Product $Product | |
| 1160 | - * @param \Eccube\Entity\Category $Category | |
| 1161 | - * @return ProductCategory | |
| 1162 | - */ | |
| 1158 | + * ProductCategory作成 | |
| 1159 | + * @param \Eccube\Entity\Product $Product | |
| 1160 | + * @param \Eccube\Entity\Category $Category | |
| 1161 | + * @return ProductCategory | |
| 1162 | + */ | |
| 1163 | 1163 | private function makeProductCategory($Product, $Category, $rank) | 
| 1164 | 1164 |      { | 
| 1165 | 1165 | $ProductCategory = new ProductCategory(); | 
| @@ -160,7 +160,7 @@ | ||
| 160 | 160 | $this->paramList = array( | 
| 161 | 161 | 'pluginCode' => array( | 
| 162 | 162 | 'no' => 1, | 
| 163 | - 'label' => '[+]Plugin Code: ', | |
| 163 | + 'label' => '[+]Plugin Code: ', | |
| 164 | 164 | 'value' => null, | 
| 165 | 165 | 'name' => '[+]Please enter Plugin Name (only pascal case letters numbers are allowed)', | 
| 166 | 166 | 'validation' => array( |