Completed
Push — dev/upgrade ( 0c4059 )
by Kiyotaka
06:32
created
src/Eccube/DependencyInjection/EccubeExtension.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -64,12 +64,12 @@
 block discarded – undo
64 64
 
65 65
         // SSL強制時は, httpsのみにアクセス制限する
66 66
         $accessControl = [
67
-          [ 'path' => '^/%eccube_admin_route%/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY' ],
68
-          [ 'path' => '^/%eccube_admin_route%/', 'roles' => 'ROLE_ADMIN' ],
69
-          [ 'path' => '^/mypage/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY' ],
70
-          [ 'path' => '^/mypage/withdraw_complete', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY' ],
71
-          [ 'path' => '^/mypage/change', 'roles' => 'IS_AUTHENTICATED_FULLY' ],
72
-          [ 'path' => '^/mypage/', 'roles' => 'ROLE_USER' ],
67
+          ['path' => '^/%eccube_admin_route%/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'],
68
+          ['path' => '^/%eccube_admin_route%/', 'roles' => 'ROLE_ADMIN'],
69
+          ['path' => '^/mypage/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'],
70
+          ['path' => '^/mypage/withdraw_complete', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'],
71
+          ['path' => '^/mypage/change', 'roles' => 'IS_AUTHENTICATED_FULLY'],
72
+          ['path' => '^/mypage/', 'roles' => 'ROLE_USER'],
73 73
         ];
74 74
         if ($forceSSL) {
75 75
             foreach ($accessControl as &$control) {
Please login to merge, or discard this patch.
src/Eccube/Repository/BaseInfoRepository.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@
 block discarded – undo
44 44
         $BaseInfo = $this->find($id);
45 45
 
46 46
         if (null === $BaseInfo) {
47
-            throw new \Exception('BaseInfo not found. id = '. $id);
47
+            throw new \Exception('BaseInfo not found. id = '.$id);
48 48
         }
49 49
 
50 50
         return $this->find($id);
Please login to merge, or discard this patch.
src/Eccube/Command/UpgradeCommand.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -841,7 +841,7 @@  discard block
 block discarded – undo
841 841
     protected function overrideSources()
842 842
     {
843 843
         // 変更ファイルの競合を調査
844
-        $changes = array_filter(self::FILE_HASH, function($hash, $file) {
844
+        $changes = array_filter(self::FILE_HASH, function ($hash, $file) {
845 845
             return hash_file('md5', $this->projectRoot.'/'.$file) !== $hash;
846 846
         }, ARRAY_FILTER_USE_BOTH);
847 847
 
@@ -850,7 +850,7 @@  discard block
 block discarded – undo
850 850
         if ($changes) {
851 851
             $msg = '以下の'.count($changes).'ファイルが変更されています.'.PHP_EOL.'    '.implode(PHP_EOL.'    ', array_keys($changes)).PHP_EOL;
852 852
             $this->io->write($msg);
853
-            $mode = $this->io->ask('どうしますか?'.PHP_EOL.'    1: バージョンアップを中止する'.PHP_EOL.'    2: 最新バージョンで上書きしてバージョンアップ'.PHP_EOL.'    3: 既存のファイルを残してバージョンアップ', null, function($val) {
853
+            $mode = $this->io->ask('どうしますか?'.PHP_EOL.'    1: バージョンアップを中止する'.PHP_EOL.'    2: 最新バージョンで上書きしてバージョンアップ'.PHP_EOL.'    3: 既存のファイルを残してバージョンアップ', null, function ($val) {
854 854
                 if (array_search($val, ['1', '2', '3']) === false) {
855 855
                     throw new \RuntimeException('番号を入力してください');
856 856
                 }
@@ -883,7 +883,7 @@  discard block
 block discarded – undo
883 883
     protected function execRequirePlugins()
884 884
     {
885 885
         // インストール済みプラグインの `composer require` 実行
886
-        $packageNames = array_map(function(Plugin $Plugin) {
886
+        $packageNames = array_map(function (Plugin $Plugin) {
887 887
             return 'ec-cube/'.$Plugin->getCode().':'.$Plugin->getVersion();
888 888
         }, $this->pluginRepository->findAll());
889 889
 
Please login to merge, or discard this patch.