@@ -47,7 +47,7 @@ |
||
| 47 | 47 | $app = $this->app; |
| 48 | 48 | |
| 49 | 49 | $builder |
| 50 | - ->addEventListener(FormEvents::POST_SET_DATA, function ($event) use ($app) { |
|
| 50 | + ->addEventListener(FormEvents::POST_SET_DATA, function($event) use ($app) { |
|
| 51 | 51 | /** @var \Eccube\Entity\ShipmentItem $data */ |
| 52 | 52 | $data = $event->getData(); |
| 53 | 53 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -76,7 +76,7 @@ |
||
| 76 | 76 | $builder->setAttribute('tel02_name', $options['tel02_name']); |
| 77 | 77 | $builder->setAttribute('tel03_name', $options['tel03_name']); |
| 78 | 78 | // todo 変 |
| 79 | - $builder->addEventListener(FormEvents::POST_BIND, function ($event) use ($builder) { |
|
| 79 | + $builder->addEventListener(FormEvents::POST_BIND, function($event) use ($builder) { |
|
| 80 | 80 | $form = $event->getForm(); |
| 81 | 81 | $count = 0; |
| 82 | 82 | if ($form[$builder->getName().'01']->getData() != '') { |
@@ -9,12 +9,12 @@ |
||
| 9 | 9 | |
| 10 | 10 | CONST MIGRATION_TABLE_PREFIX = 'migration_'; |
| 11 | 11 | |
| 12 | - public function migrationSchema($app,$migrationFilePath,$pluginCode,$version=null) |
|
| 12 | + public function migrationSchema($app, $migrationFilePath, $pluginCode, $version = null) |
|
| 13 | 13 | { |
| 14 | 14 | $config = new Configuration($app['db']); |
| 15 | 15 | $config->setMigrationsNamespace('DoctrineMigrations'); |
| 16 | 16 | $config->setMigrationsDirectory($migrationFilePath); |
| 17 | - $config->registerMigrationsFromDirectory($migrationFilePath ); |
|
| 17 | + $config->registerMigrationsFromDirectory($migrationFilePath); |
|
| 18 | 18 | $config->setMigrationsTableName(self::MIGRATION_TABLE_PREFIX.$pluginCode); |
| 19 | 19 | $migration = new Migration($config); |
| 20 | 20 | // null 又は 'last' を渡すと最新バージョンまでマイグレートする |
@@ -187,7 +187,7 @@ |
||
| 187 | 187 | $this->app['config']['block_default_realdir'], |
| 188 | 188 | ); |
| 189 | 189 | foreach ($readPaths as $readPath) { |
| 190 | - $filePath = $readPath . '/' . $fileName . '.twig'; |
|
| 190 | + $filePath = $readPath.'/'.$fileName.'.twig'; |
|
| 191 | 191 | $fs = new Filesystem(); |
| 192 | 192 | if ($fs->exists($filePath)) { |
| 193 | 193 | return array( |
@@ -257,7 +257,7 @@ |
||
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | foreach ($readPaths as $readPath) { |
| 260 | - $filePath = $readPath . '/' . $fileName . '.twig'; |
|
| 260 | + $filePath = $readPath.'/'.$fileName.'.twig'; |
|
| 261 | 261 | $fs = new Filesystem(); |
| 262 | 262 | if ($fs->exists($filePath)) { |
| 263 | 263 | return array( |
@@ -42,8 +42,8 @@ discard block |
||
| 42 | 42 | $qb = $this->createQueryBuilder('e') |
| 43 | 43 | ->innerJoin('e.Plugin', 'p') |
| 44 | 44 | ->andWhere('e.del_flg = 0 ') |
| 45 | - ->Orderby('e.event','ASC') |
|
| 46 | - ->addOrderby('e.priority','DESC'); |
|
| 45 | + ->Orderby('e.event', 'ASC') |
|
| 46 | + ->addOrderby('e.priority', 'DESC'); |
|
| 47 | 47 | ; |
| 48 | 48 | |
| 49 | 49 | return $qb->getQuery()->getResult(); |
@@ -52,66 +52,66 @@ discard block |
||
| 52 | 52 | public function getPriorityRange($type) |
| 53 | 53 | { |
| 54 | 54 | |
| 55 | - if(PluginEventHandler::EVENT_HANDLER_TYPE_FIRST==$type){ |
|
| 56 | - $range_start=PluginEventHandler::EVENT_PRIORITY_FIRST_START; |
|
| 57 | - $range_end=PluginEventHandler::EVENT_PRIORITY_FIRST_END; |
|
| 58 | - }elseif(PluginEventHandler::EVENT_HANDLER_TYPE_LAST==$type){ |
|
| 59 | - $range_start=PluginEventHandler::EVENT_PRIORITY_LAST_START; |
|
| 60 | - $range_end=PluginEventHandler::EVENT_PRIORITY_LAST_END; |
|
| 61 | - }else{ |
|
| 62 | - $range_start=PluginEventHandler::EVENT_PRIORITY_NORMAL_START; |
|
| 63 | - $range_end=PluginEventHandler::EVENT_PRIORITY_NORMAL_END; |
|
| 55 | + if (PluginEventHandler::EVENT_HANDLER_TYPE_FIRST == $type) { |
|
| 56 | + $range_start = PluginEventHandler::EVENT_PRIORITY_FIRST_START; |
|
| 57 | + $range_end = PluginEventHandler::EVENT_PRIORITY_FIRST_END; |
|
| 58 | + }elseif (PluginEventHandler::EVENT_HANDLER_TYPE_LAST == $type) { |
|
| 59 | + $range_start = PluginEventHandler::EVENT_PRIORITY_LAST_START; |
|
| 60 | + $range_end = PluginEventHandler::EVENT_PRIORITY_LAST_END; |
|
| 61 | + } else { |
|
| 62 | + $range_start = PluginEventHandler::EVENT_PRIORITY_NORMAL_START; |
|
| 63 | + $range_end = PluginEventHandler::EVENT_PRIORITY_NORMAL_END; |
|
| 64 | 64 | } |
| 65 | - return array($range_start,$range_end); |
|
| 65 | + return array($range_start, $range_end); |
|
| 66 | 66 | |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - public function calcNewPriority($event , $type) |
|
| 69 | + public function calcNewPriority($event, $type) |
|
| 70 | 70 | { |
| 71 | 71 | |
| 72 | - list($range_start,$range_end) = $this->getPriorityRange($type); |
|
| 72 | + list($range_start, $range_end) = $this->getPriorityRange($type); |
|
| 73 | 73 | |
| 74 | 74 | $qb = $this->createQueryBuilder('e'); |
| 75 | 75 | $qb->andWhere("e.priority >= $range_end ") |
| 76 | 76 | ->andWhere("e.priority <= $range_start ") |
| 77 | 77 | ->andWhere('e.event = :event') |
| 78 | - ->setParameter('event',$event) |
|
| 78 | + ->setParameter('event', $event) |
|
| 79 | 79 | ->setMaxResults(1) |
| 80 | - ->orderBy('e.priority','ASC'); |
|
| 80 | + ->orderBy('e.priority', 'ASC'); |
|
| 81 | 81 | |
| 82 | - $result=$qb->getQuery()->getResult(); |
|
| 83 | - if(count($result)){ |
|
| 84 | - return $result[0]->getPriority() -1; |
|
| 85 | - }else{ |
|
| 82 | + $result = $qb->getQuery()->getResult(); |
|
| 83 | + if (count($result)) { |
|
| 84 | + return $result[0]->getPriority() - 1; |
|
| 85 | + } else { |
|
| 86 | 86 | return $range_start; |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - public function upPriority($pluginEventHandler,$up=true) |
|
| 91 | + public function upPriority($pluginEventHandler, $up = true) |
|
| 92 | 92 | { |
| 93 | 93 | |
| 94 | - list($range_start,$range_end) = $this->getPriorityRange($pluginEventHandler->getHandlerType()); |
|
| 94 | + list($range_start, $range_end) = $this->getPriorityRange($pluginEventHandler->getHandlerType()); |
|
| 95 | 95 | |
| 96 | 96 | $qb = $this->createQueryBuilder('e'); |
| 97 | 97 | |
| 98 | 98 | $qb->andWhere("e.priority >= $range_end ") |
| 99 | 99 | ->andWhere("e.priority <= $range_start ") |
| 100 | 100 | ->andWhere("e.del_flg = 0 ") |
| 101 | - ->andWhere('e.priority '.($up ? '>' : '<' ).' :pri') |
|
| 101 | + ->andWhere('e.priority '.($up ? '>' : '<').' :pri') |
|
| 102 | 102 | ->andWhere('e.event = :event') |
| 103 | - ->setParameter('event',$pluginEventHandler->getEvent()) |
|
| 104 | - ->setParameter('pri', $pluginEventHandler->getPriority() ) |
|
| 103 | + ->setParameter('event', $pluginEventHandler->getEvent()) |
|
| 104 | + ->setParameter('pri', $pluginEventHandler->getPriority()) |
|
| 105 | 105 | ->setMaxResults(1) |
| 106 | - ->orderBy('e.priority', ($up ? 'ASC':'DESC' ) ); |
|
| 106 | + ->orderBy('e.priority', ($up ? 'ASC' : 'DESC')); |
|
| 107 | 107 | |
| 108 | - $result=$qb->getQuery()->getResult(); |
|
| 108 | + $result = $qb->getQuery()->getResult(); |
|
| 109 | 109 | |
| 110 | - if(count($result)){ |
|
| 111 | - $em =$this->getEntityManager(); |
|
| 110 | + if (count($result)) { |
|
| 111 | + $em = $this->getEntityManager(); |
|
| 112 | 112 | $em->getConnection()->beginTransaction(); |
| 113 | 113 | // 2個のentityのprioriryを入れ替える |
| 114 | - $tmp=$pluginEventHandler->getPriority(); |
|
| 114 | + $tmp = $pluginEventHandler->getPriority(); |
|
| 115 | 115 | $pluginEventHandler->setPriority($result[0]->getPriority()); |
| 116 | 116 | $result[0]->setPriority($tmp); |
| 117 | 117 | $em->persist($result[0]); |
@@ -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 | } |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | public function up(Schema $schema) |
| 17 | 17 | { |
| 18 | 18 | |
| 19 | - if($this->connection->getDatabasePlatform()->getName() == "mysql"){ |
|
| 19 | + if ($this->connection->getDatabasePlatform()->getName() == "mysql") { |
|
| 20 | 20 | // this up() migration is auto-generated, please modify it to your needs |
| 21 | 21 | $this->addSql("alter table dtb_base_info collate utf8_general_ci ;"); |
| 22 | 22 | $this->addSql("alter table dtb_block collate utf8_general_ci ;"); |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | $t = $schema->getTable('dtb_product_class'); |
| 43 | 43 | $c = $t->getColumn('stock_unlimited'); |
| 44 | 44 | |
| 45 | - if($c->getType()->getName() != 'smallint'){ |
|
| 45 | + if ($c->getType()->getName() != 'smallint') { |
|
| 46 | 46 | $this->addSql('ALTER TABLE dtb_product_class ADD stock_unlimited_tmp int ;'); |
| 47 | 47 | $this->addSql('UPDATE dtb_product_class SET stock_unlimited_tmp = 1 where stock_unlimited = true '); |
| 48 | 48 | $this->addSql('UPDATE dtb_product_class SET stock_unlimited_tmp = 0 where stock_unlimited <> true '); |
@@ -38,8 +38,8 @@ |
||
| 38 | 38 | public function up(Schema $schema) |
| 39 | 39 | { |
| 40 | 40 | // this up() migration is auto-generated, please modify it to your needs |
| 41 | - $t=$schema->getTable('dtb_product_class'); |
|
| 42 | - if(!$t->hasColumn('stock_unlimited') && $t->hasColumn('stock_unlimited_tmp')){ |
|
| 41 | + $t = $schema->getTable('dtb_product_class'); |
|
| 42 | + if (!$t->hasColumn('stock_unlimited') && $t->hasColumn('stock_unlimited_tmp')) { |
|
| 43 | 43 | $t->addColumn('stock_unlimited', 'smallint', array('NotNull'=>true, 'Default'=>0)); |
| 44 | 44 | } |
| 45 | 45 | } |