@@ -59,7 +59,7 @@ |
||
| 59 | 59 | 'label' => '拒否URL', |
| 60 | 60 | 'required' => false, |
| 61 | 61 | )) |
| 62 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
| 62 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
| 63 | 63 | $form = $event->getForm(); |
| 64 | 64 | |
| 65 | 65 | $Authority = $form['Authority']->getData(); |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | |
| 37 | 37 | public function __construct(Application $app) |
| 38 | 38 | { |
| 39 | - $this->app = $app; |
|
| 39 | + $this->app = $app; |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | public function supportsAttribute($attribute) |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | { |
| 308 | 308 | $config = $this->config; |
| 309 | 309 | |
| 310 | - return function ($value) use ($config) { |
|
| 310 | + return function($value) use ($config) { |
|
| 311 | 311 | return mb_convert_encoding( |
| 312 | 312 | (string) $value, $config['csv_export_encoding'], 'UTF-8' |
| 313 | 313 | ); |
@@ -431,7 +431,7 @@ discard block |
||
| 431 | 431 | if ($Conditions instanceof ArrayCollection) { |
| 432 | 432 | $Conditions = new ArrayCollection( |
| 433 | 433 | array_map( |
| 434 | - function ($Entity) use ($em) { |
|
| 434 | + function($Entity) use ($em) { |
|
| 435 | 435 | return $em->getRepository(get_class($Entity))->find($Entity->getId()); |
| 436 | 436 | }, $Conditions->toArray() |
| 437 | 437 | ) |
@@ -325,7 +325,6 @@ discard block |
||
| 325 | 325 | |
| 326 | 326 | /** |
| 327 | 327 | * @param $row |
| 328 | - * @param null $callback |
|
| 329 | 328 | */ |
| 330 | 329 | public function fputcsv($row) |
| 331 | 330 | { |
@@ -424,7 +423,6 @@ discard block |
||
| 424 | 423 | * XXX self::setExportQueryBuilder() をコールする前に EntityManager を取得したいので、引数で渡している |
| 425 | 424 | * |
| 426 | 425 | * @param array $searchData セッションから取得した検索条件の配列 |
| 427 | - * @param EntityManager $em |
|
| 428 | 426 | */ |
| 429 | 427 | protected function findDeserializeObjects(array &$searchData) |
| 430 | 428 | { |
@@ -88,7 +88,7 @@ |
||
| 88 | 88 | ->setCompanyName($Customer->getCompanyName()) |
| 89 | 89 | ->setZip01($Customer->getZip01()) |
| 90 | 90 | ->setZip02($Customer->getZip02()) |
| 91 | - ->setZipcode($Customer->getZip01() . $Customer->getZip02()) |
|
| 91 | + ->setZipcode($Customer->getZip01().$Customer->getZip02()) |
|
| 92 | 92 | ->setPref($Customer->getPref()) |
| 93 | 93 | ->setAddr01($Customer->getAddr01()) |
| 94 | 94 | ->setAddr02($Customer->getAddr02()) |
@@ -26,7 +26,6 @@ discard block |
||
| 26 | 26 | use Doctrine\ORM\EntityManager; |
| 27 | 27 | use Eccube\Annotation\Inject; |
| 28 | 28 | use Eccube\Application; |
| 29 | -use Eccube\Common\Constant; |
|
| 30 | 29 | use Eccube\Controller\AbstractController; |
| 31 | 30 | use Eccube\Entity\CustomerAddress; |
| 32 | 31 | use Eccube\Event\EccubeEvents; |
@@ -35,12 +34,10 @@ discard block |
||
| 35 | 34 | use Eccube\Repository\CustomerRepository; |
| 36 | 35 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
| 37 | 36 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 38 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
|
| 39 | 37 | use Symfony\Component\EventDispatcher\EventDispatcher; |
| 40 | 38 | use Symfony\Component\Form\FormFactory; |
| 41 | 39 | use Symfony\Component\HttpFoundation\Request; |
| 42 | 40 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
| 43 | -use Symfony\Component\Security\Core\Encoder\EncoderFactory; |
|
| 44 | 41 | use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; |
| 45 | 42 | |
| 46 | 43 | /** |
@@ -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( |
@@ -106,7 +106,7 @@ |
||
| 106 | 106 | $class2Valied = $this->isValiedCategory($ClassName2); |
| 107 | 107 | |
| 108 | 108 | // 規格が選択されていないか、選択された状態で分類が保有されていれば、画面表示 |
| 109 | - if($class1Valied && $class2Valied){ |
|
| 109 | + if ($class1Valied && $class2Valied) { |
|
| 110 | 110 | $hasClassCategoryFlg = true; |
| 111 | 111 | } |
| 112 | 112 | |
@@ -603,6 +603,9 @@ discard block |
||
| 603 | 603 | /** |
| 604 | 604 | * 登録、更新時のエラー画面表示 |
| 605 | 605 | * |
| 606 | + * @param Application $app |
|
| 607 | + * @param boolean $not_product_class |
|
| 608 | + * @param \Symfony\Component\Form\FormInterface $classForm |
|
| 606 | 609 | */ |
| 607 | 610 | protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null) |
| 608 | 611 | { |
@@ -654,6 +657,7 @@ discard block |
||
| 654 | 657 | |
| 655 | 658 | /** |
| 656 | 659 | * 規格1と規格2を組み合わせた商品規格を作成 |
| 660 | + * @param Application $app |
|
| 657 | 661 | */ |
| 658 | 662 | private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null) |
| 659 | 663 | { |
@@ -741,6 +745,7 @@ discard block |
||
| 741 | 745 | * |
| 742 | 746 | * @param $productClassDest ProductClass コピー先となる商品規格 |
| 743 | 747 | * @param $productClassOrig ProductClass コピー元となる商品規格 |
| 748 | + * @param Application $app |
|
| 744 | 749 | */ |
| 745 | 750 | private function setDefaultProductClass($app, $productClassDest, $productClassOrig) { |
| 746 | 751 | $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate()); |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | /** |
| 41 | 41 | * Returns a list of functions to add to the existing list. |
| 42 | 42 | * |
| 43 | - * @return array An array of functions |
|
| 43 | + * @return \Twig_SimpleFunction[] An array of functions |
|
| 44 | 44 | */ |
| 45 | 45 | public function getFunctions() |
| 46 | 46 | { |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | /** |
| 62 | 62 | * Returns a list of filters. |
| 63 | 63 | * |
| 64 | - * @return array |
|
| 64 | + * @return \Twig_SimpleFilter[] |
|
| 65 | 65 | */ |
| 66 | 66 | public function getFilters() |
| 67 | 67 | { |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | if (is_callable($function)) { |
| 69 | 69 | return call_user_func_array($function, $arg_list); |
| 70 | 70 | } |
| 71 | - trigger_error('Called to an undefined function : php_'. $function, E_USER_WARNING); |
|
| 71 | + trigger_error('Called to an undefined function : php_'.$function, E_USER_WARNING); |
|
| 72 | 72 | |
| 73 | 73 | }, ['pre_escape' => 'html', 'is_safe' => ['html']]), |
| 74 | 74 | |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | public function getCsrfTokenForAnchor() |
| 157 | 157 | { |
| 158 | 158 | $token = $this->app['csrf.token_manager']->getToken(Constant::TOKEN_NAME)->getValue(); |
| 159 | - return 'token-for-anchor=\'' . $token . '\''; |
|
| 159 | + return 'token-for-anchor=\''.$token.'\''; |
|
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | /** |
@@ -117,9 +117,9 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | $this->file = $file; |
| 119 | 119 | $this->file->setFlags( |
| 120 | - \SplFileObject::READ_CSV | |
|
| 121 | - \SplFileObject::SKIP_EMPTY | |
|
| 122 | - \SplFileObject::READ_AHEAD | |
|
| 120 | + \SplFileObject::READ_CSV| |
|
| 121 | + \SplFileObject::SKIP_EMPTY| |
|
| 122 | + \SplFileObject::READ_AHEAD| |
|
| 123 | 123 | \SplFileObject::DROP_NEW_LINE |
| 124 | 124 | ); |
| 125 | 125 | $this->file->setCsvControl( |
@@ -362,7 +362,7 @@ discard block |
||
| 362 | 362 | if ($count > 1) { |
| 363 | 363 | $incrementedHeaders[] = $header; |
| 364 | 364 | for ($i = 1; $i < $count; $i++) { |
| 365 | - $incrementedHeaders[] = $header . $i; |
|
| 365 | + $incrementedHeaders[] = $header.$i; |
|
| 366 | 366 | } |
| 367 | 367 | } else { |
| 368 | 368 | $incrementedHeaders[] = $header; |
@@ -413,7 +413,7 @@ discard block |
||
| 413 | 413 | protected function convertEncodingRows($row) { |
| 414 | 414 | if ('\\' === DIRECTORY_SEPARATOR && PHP_VERSION_ID >= 70000) { |
| 415 | 415 | foreach ($row as &$col) { |
| 416 | - $col = mb_convert_encoding($col , 'UTF-8', 'SJIS-win'); |
|
| 416 | + $col = mb_convert_encoding($col, 'UTF-8', 'SJIS-win'); |
|
| 417 | 417 | } |
| 418 | 418 | } |
| 419 | 419 | return $row; |
@@ -24,7 +24,6 @@ |
||
| 24 | 24 | namespace Eccube\Service; |
| 25 | 25 | |
| 26 | 26 | use Eccube\Annotation\Service; |
| 27 | -use Eccube\Application; |
|
| 28 | 27 | |
| 29 | 28 | |
| 30 | 29 | /** |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | |
| 54 | 54 | foreach ($criteria as $col => $val) { |
| 55 | 55 | $qb->andWhere($qb->expr()->notIn('o.'.$col, ':'.$col)) |
| 56 | - ->setParameter($col, (array)$val); |
|
| 56 | + ->setParameter($col, (array) $val); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | if (is_array($orderBy)) { |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | $session->set('eccube.admin.order.customer.search', $searchData); |
| 334 | 334 | $session->set('eccube.admin.order.customer.search.page_no', $page_no); |
| 335 | 335 | } else { |
| 336 | - $searchData = (array)$session->get('eccube.admin.order.customer.search'); |
|
| 336 | + $searchData = (array) $session->get('eccube.admin.order.customer.search'); |
|
| 337 | 337 | if (is_null($page_no)) { |
| 338 | 338 | $page_no = intval($session->get('eccube.admin.order.customer.search.page_no')); |
| 339 | 339 | } else { |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | $session->set('eccube.admin.order.product.search', $searchData); |
| 490 | 490 | $session->set('eccube.admin.order.product.search.page_no', $page_no); |
| 491 | 491 | } else { |
| 492 | - $searchData = (array)$session->get('eccube.admin.order.product.search'); |
|
| 492 | + $searchData = (array) $session->get('eccube.admin.order.product.search'); |
|
| 493 | 493 | if (is_null($page_no)) { |
| 494 | 494 | $page_no = intval($session->get('eccube.admin.order.product.search.page_no')); |
| 495 | 495 | } else { |