From d62e24401ac9d81c710131e943c67a4e57c20238 Mon Sep 17 00:00:00 2001 From: nakazawakan Date: Tue, 25 Jan 2022 21:06:12 -0600 Subject: [PATCH] =?UTF-8?q?composer=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 6148 -> 6148 bytes backend/.DS_Store | Bin 8196 -> 8196 bytes .../Controllers/Api/MeetingsController.php | 3 +- backend/composer.lock | 109 +++++++++--------- infra/.DS_Store | Bin 0 -> 6148 bytes 5 files changed, 57 insertions(+), 55 deletions(-) create mode 100644 infra/.DS_Store diff --git a/.DS_Store b/.DS_Store index 33b2c4e755fc287256972b76741e113135f5cd1e..5ac847daa6f596ca1f330b44f13b1d5ad3287595 100644 GIT binary patch delta 315 zcmZoMXffEJ!c@<+!tpl)0|N_#9z!}qCPPVXzKcszPJR+ljN{jr>#Hg*9Ck#NPr)l+ zkYN~{oS$0&)Wg8E6+|+yGbAx2G9)u(Go&))F{I?ABUFenzu3t?c^Q)&+tt)_fu$EF ze_#@se2<9-!Bwc&C<7bD3Upl_LmER7Ln5*X3=G=dKs%6Rk$tdqo2j`!#0MxU5Pra} Z0?8LFK+_vGFJw+*nOMNLnVsV=KL9(=R|Eh6 delta 315 zcmZoMXffEJ!c@=La9|w+0|N_#9z!}qCPPVXzKcszPJR+ljAMST)cdUm4m+aCr{I+@ z$S@2}&d)6X>S18)m;j>K8Il+h8Il>Y8B!VY7*cZ55h|FO9pg4kUdANHcC+tD?EV9j zKQM_*zQ@Fa;40L!SUdok!U}X<9zz;K5kn%f2@DLv?x?cJKH!Li`v6IQZa%^f*i|6; Xf(2-L!sdm{X)F^9_%^e1{N)D#P$X41 diff --git a/backend/.DS_Store b/backend/.DS_Store index f36fbf6666529d0bd66fc1f8a5c8c413280ab075..41e6f9c1ed75285df7d827326fa1190dc1bc6cf2 100644 GIT binary patch delta 613 zcmZp1XmOa}&uFkQU^hRb!DJqR6->7CCT|l6Vf-+eTTq3WMZSD;jG)A1FTr>wmVn8t z1r-<{O+F(i!S|Kr;Wq;RUu&3AE0%E?axs^Mr*Tqsv|;jklq^(j#Gro?F|$Urzo zC9PocX(3q_h65e*CchDqVY~Dh>@hxJISmLCY&jc40YfQ663{c549Up)8IC?+n0!uH zY;u+`AJc-HVCDqjB$op~7c;Oi6afRFl%WJY2pAaRBGBcLy)77b4ivg(B64i=Ian5& zoSGaZ;>4tpIeDH)HWQ=6WNy)U%)iBEPhKM`!&YK&7n)FDi$gUf)H<^kg( kpP>lZ!OWZ=HWu12Zf2MG#v%%gncRF>=rM56#4bxl0D%Is(f|Me delta 365 zcmZp1XmOa}F8U^hRb&SV~e6-=5;leYV&;#X0ULiof4_VDd3xIW{Qsm9QK$qnE>EZV^?cl8(tSB0vX- zBrq=NHt_%aZ_V4&2@PmBP> C&vO?5 diff --git a/backend/app/Http/Controllers/Api/MeetingsController.php b/backend/app/Http/Controllers/Api/MeetingsController.php index c15433f9..25131009 100644 --- a/backend/app/Http/Controllers/Api/MeetingsController.php +++ b/backend/app/Http/Controllers/Api/MeetingsController.php @@ -21,6 +21,7 @@ use App\Mail\FathersApprovalMail; class MeetingsController extends Controller { public function register (Request $r) { + dd($r->all()); if (!isset(session()->get('fathers')['id'])) { return ['status_code' => 400, 'error_messages' => ['ミーティングの登録に失敗しました。']]; } @@ -694,7 +695,7 @@ class MeetingsController extends Controller { if (request()->route()->action['as'] != 'mdc') { $result->children = []; $rec = []; - + if (null !== ($rel = FatherRelation::select('child_id')->where('father_id', (int)$result->father_id)->get())) { foreach ($rel as $i => $re) { if (null !== ($rech = Child::select($all_child_select)->where('id', $re->child_id)->first())) { diff --git a/backend/composer.lock b/backend/composer.lock index 12f2b259..bcd534d4 100644 --- a/backend/composer.lock +++ b/backend/composer.lock @@ -1275,16 +1275,16 @@ }, { "name": "laravel/framework", - "version": "v8.80.0", + "version": "v8.81.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "8949a2e46b0f274f39c61eee8d5de1dc6a1f686b" + "reference": "9cc0efd724ce67a190b1695ba31a27bbb1ae9177" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/8949a2e46b0f274f39c61eee8d5de1dc6a1f686b", - "reference": "8949a2e46b0f274f39c61eee8d5de1dc6a1f686b", + "url": "https://api.github.com/repos/laravel/framework/zipball/9cc0efd724ce67a190b1695ba31a27bbb1ae9177", + "reference": "9cc0efd724ce67a190b1695ba31a27bbb1ae9177", "shasum": "" }, "require": { @@ -1317,7 +1317,7 @@ "symfony/var-dumper": "^5.4", "tijsverkoyen/css-to-inline-styles": "^2.2.2", "vlucas/phpdotenv": "^5.4.1", - "voku/portable-ascii": "^1.4.8" + "voku/portable-ascii": "^1.6.1" }, "conflict": { "tightenco/collect": "<5.5.33" @@ -1444,7 +1444,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-01-18T15:51:42+00:00" + "time": "2022-01-25T16:41:46+00:00" }, { "name": "laravel/nexmo-notification-channel", @@ -1771,16 +1771,16 @@ }, { "name": "league/commonmark", - "version": "2.1.1", + "version": "2.2.1", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "17d2b9cb5161a2ea1a8dd30e6991d668e503fb9d" + "reference": "f8afb78f087777b040e0ab8a6b6ca93f6fc3f18a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/17d2b9cb5161a2ea1a8dd30e6991d668e503fb9d", - "reference": "17d2b9cb5161a2ea1a8dd30e6991d668e503fb9d", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/f8afb78f087777b040e0ab8a6b6ca93f6fc3f18a", + "reference": "f8afb78f087777b040e0ab8a6b6ca93f6fc3f18a", "shasum": "" }, "require": { @@ -1788,6 +1788,7 @@ "league/config": "^1.1.1", "php": "^7.4 || ^8.0", "psr/event-dispatcher": "^1.0", + "symfony/deprecation-contracts": "^2.1 || ^3.0", "symfony/polyfill-php80": "^1.15" }, "require-dev": { @@ -1813,7 +1814,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.2-dev" + "dev-main": "2.3-dev" } }, "autoload": { @@ -1870,7 +1871,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T18:25:06+00:00" + "time": "2022-01-25T14:37:33+00:00" }, { "name": "league/config", @@ -2205,16 +2206,16 @@ }, { "name": "nesbot/carbon", - "version": "2.55.2", + "version": "2.56.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "8c2a18ce3e67c34efc1b29f64fe61304368259a2" + "reference": "626ec8cbb724cd3c3400c3ed8f730545b744e3f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/8c2a18ce3e67c34efc1b29f64fe61304368259a2", - "reference": "8c2a18ce3e67c34efc1b29f64fe61304368259a2", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/626ec8cbb724cd3c3400c3ed8f730545b744e3f4", + "reference": "626ec8cbb724cd3c3400c3ed8f730545b744e3f4", "shasum": "" }, "require": { @@ -2231,7 +2232,7 @@ "kylekatarnls/multi-tester": "^2.0", "phpmd/phpmd": "^2.9", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12.54", + "phpstan/phpstan": "^0.12.54 || ^1.0", "phpunit/phpunit": "^7.5.20 || ^8.5.14", "squizlabs/php_codesniffer": "^3.4" }, @@ -2297,7 +2298,7 @@ "type": "tidelift" } ], - "time": "2021-12-03T14:59:52+00:00" + "time": "2022-01-21T17:08:38+00:00" }, { "name": "nette/schema", @@ -2363,16 +2364,16 @@ }, { "name": "nette/utils", - "version": "v3.2.6", + "version": "v3.2.7", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "2f261e55bd6a12057442045bf2c249806abc1d02" + "reference": "0af4e3de4df9f1543534beab255ccf459e7a2c99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/2f261e55bd6a12057442045bf2c249806abc1d02", - "reference": "2f261e55bd6a12057442045bf2c249806abc1d02", + "url": "https://api.github.com/repos/nette/utils/zipball/0af4e3de4df9f1543534beab255ccf459e7a2c99", + "reference": "0af4e3de4df9f1543534beab255ccf459e7a2c99", "shasum": "" }, "require": { @@ -2442,9 +2443,9 @@ ], "support": { "issues": "https://github.com/nette/utils/issues", - "source": "https://github.com/nette/utils/tree/v3.2.6" + "source": "https://github.com/nette/utils/tree/v3.2.7" }, - "time": "2021-11-24T15:47:23+00:00" + "time": "2022-01-24T11:29:14+00:00" }, { "name": "nexmo/laravel", @@ -5768,16 +5769,16 @@ }, { "name": "voku/portable-ascii", - "version": "1.5.6", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/voku/portable-ascii.git", - "reference": "80953678b19901e5165c56752d087fc11526017c" + "reference": "87337c91b9dfacee02452244ee14ab3c43bc485a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/portable-ascii/zipball/80953678b19901e5165c56752d087fc11526017c", - "reference": "80953678b19901e5165c56752d087fc11526017c", + "url": "https://api.github.com/repos/voku/portable-ascii/zipball/87337c91b9dfacee02452244ee14ab3c43bc485a", + "reference": "87337c91b9dfacee02452244ee14ab3c43bc485a", "shasum": "" }, "require": { @@ -5814,7 +5815,7 @@ ], "support": { "issues": "https://github.com/voku/portable-ascii/issues", - "source": "https://github.com/voku/portable-ascii/tree/1.5.6" + "source": "https://github.com/voku/portable-ascii/tree/1.6.1" }, "funding": [ { @@ -5838,7 +5839,7 @@ "type": "tidelift" } ], - "time": "2020-11-12T00:07:28+00:00" + "time": "2022-01-24T18:55:24+00:00" }, { "name": "vonage/client", @@ -6337,16 +6338,16 @@ }, { "name": "fakerphp/faker", - "version": "v1.17.0", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/FakerPHP/Faker.git", - "reference": "b85e9d44eae8c52cca7aa0939483611f7232b669" + "reference": "2e77a868f6540695cf5ebf21e5ab472c65f47567" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/b85e9d44eae8c52cca7aa0939483611f7232b669", - "reference": "b85e9d44eae8c52cca7aa0939483611f7232b669", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/2e77a868f6540695cf5ebf21e5ab472c65f47567", + "reference": "2e77a868f6540695cf5ebf21e5ab472c65f47567", "shasum": "" }, "require": { @@ -6371,7 +6372,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "v1.17-dev" + "dev-main": "v1.18-dev" } }, "autoload": { @@ -6396,9 +6397,9 @@ ], "support": { "issues": "https://github.com/FakerPHP/Faker/issues", - "source": "https://github.com/FakerPHP/Faker/tree/v1.17.0" + "source": "https://github.com/FakerPHP/Faker/tree/v1.18.0" }, - "time": "2021-12-05T17:14:47+00:00" + "time": "2022-01-23T17:56:23+00:00" }, { "name": "filp/whoops", @@ -6524,16 +6525,16 @@ }, { "name": "laravel/sail", - "version": "v1.13.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "a14125e71779c99e27979431a66ea2793aa6ae50" + "reference": "b9749028732eca8080c26d01cd88a2f3549c2e3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/a14125e71779c99e27979431a66ea2793aa6ae50", - "reference": "a14125e71779c99e27979431a66ea2793aa6ae50", + "url": "https://api.github.com/repos/laravel/sail/zipball/b9749028732eca8080c26d01cd88a2f3549c2e3e", + "reference": "b9749028732eca8080c26d01cd88a2f3549c2e3e", "shasum": "" }, "require": { @@ -6580,20 +6581,20 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2022-01-18T18:06:55+00:00" + "time": "2022-01-20T15:31:25+00:00" }, { "name": "mockery/mockery", - "version": "1.4.4", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "e01123a0e847d52d186c5eb4b9bf58b0c6d00346" + "reference": "c10a5f6e06fc2470ab1822fa13fa2a7380f8fbac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/e01123a0e847d52d186c5eb4b9bf58b0c6d00346", - "reference": "e01123a0e847d52d186c5eb4b9bf58b0c6d00346", + "url": "https://api.github.com/repos/mockery/mockery/zipball/c10a5f6e06fc2470ab1822fa13fa2a7380f8fbac", + "reference": "c10a5f6e06fc2470ab1822fa13fa2a7380f8fbac", "shasum": "" }, "require": { @@ -6650,9 +6651,9 @@ ], "support": { "issues": "https://github.com/mockery/mockery/issues", - "source": "https://github.com/mockery/mockery/tree/1.4.4" + "source": "https://github.com/mockery/mockery/tree/1.5.0" }, - "time": "2021-09-13T15:28:59+00:00" + "time": "2022-01-20T13:18:17+00:00" }, { "name": "myclabs/deep-copy", @@ -7457,16 +7458,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.11", + "version": "9.5.13", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "2406855036db1102126125537adb1406f7242fdd" + "reference": "597cb647654ede35e43b137926dfdfef0fb11743" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2406855036db1102126125537adb1406f7242fdd", - "reference": "2406855036db1102126125537adb1406f7242fdd", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/597cb647654ede35e43b137926dfdfef0fb11743", + "reference": "597cb647654ede35e43b137926dfdfef0fb11743", "shasum": "" }, "require": { @@ -7544,7 +7545,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.11" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.13" }, "funding": [ { @@ -7556,7 +7557,7 @@ "type": "github" } ], - "time": "2021-12-25T07:07:57+00:00" + "time": "2022-01-24T07:33:35+00:00" }, { "name": "sebastian/cli-parser", diff --git a/infra/.DS_Store b/infra/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a1336b737b26340a4440f1e83f99d3724bac21e3 GIT binary patch literal 6148 zcmeHKO-jR15T4gojOe0E5f|?Yy+JH-?V=#KlUisCiHV4y3nBOL4({BF=oQ3kcmOwk z^JYksCgM&-W?wcWP-o44WEAOgi z+uKo(&un507z4(@Z!&9Bi^ixo>jNhhbnhttYVClnW|