From 5c1a4d28c4378b6fb07dbd2c72a60fba524691d8 Mon Sep 17 00:00:00 2001
From: Nazri <nazhamz95@gmail.com>
Date: Mon, 28 May 2018 10:58:40 +0800
Subject: [PATCH 01/12] customer booking bank slip

---
 app/Http/Controllers/BookingController.php    | 31 ++++++++++++++
 app/UserBankSlip.php                          | 10 +++++
 database/factories/UserBankSlipFactory.php    |  9 +++++
 ...8_032048_create_china_bank_slips_table.php |  2 +-
 ...24_082214_create_user_bank_slips_table.php | 40 +++++++++++++++++++
 routes/api.php                                |  2 +
 vendor/composer/autoload_classmap.php         |  2 +-
 vendor/composer/autoload_static.php           |  2 +-
 8 files changed, 95 insertions(+), 3 deletions(-)
 create mode 100644 app/UserBankSlip.php
 create mode 100644 database/factories/UserBankSlipFactory.php
 create mode 100644 database/migrations/2018_05_24_082214_create_user_bank_slips_table.php

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index e69995a8..b3043f85 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use Illuminate\Http\Request;
 use App\Booking;
 use App\Rate;
+use App\UserBankSlip;
 use App\User;
 use Auth;
 
@@ -124,9 +125,39 @@ class BookingController extends Controller
         // return false;
         //$booking = Booking::create($request->all());
         return response()->json($booking, 201);
+
        
     }
 
+    public function uploadbankslip(Request $request)
+    {
+        // Handle File Upload
+        if($request->hasFile('bankslip_url')){
+            // Get filename with the extension
+            $filenameWithExt = $request->file('bankslip_url')->getClientOriginalName();
+            // Get just filename
+            $filename = pathinfo($filenameWithExt, PATHINFO_FILENAME);
+            // Get just ext
+            $extension = $request->file('bankslip_url')->getClientOriginalExtension();
+            // Filename to store
+            $fileNameToStore= $filename.'_'.time().'.'.$extension;
+            // Upload Image
+            $path = $request->file('bankslip_url')->storeAs('public/userbankslip', $fileNameToStore);
+        } else {
+            $fileNameToStore = 'hello.jpg';
+        }
+        // Create Post
+        $post = new UserBankSlip;
+        $post->bank_slip_type = $request->input('bank_slip_type');
+        $post->transfer_amount = $request->input('transfer_amount');
+        $post->book_id = $request->input('book_id');
+        $post->cust_marking = $request->input('cust_marking');
+        $post->is_approve = $request->input('is_approve');
+        $post->bankslip_url = $fileNameToStore;
+        $post->save();;
+    }
+
+
     /**
      * Display the specified resource.
      *
diff --git a/app/UserBankSlip.php b/app/UserBankSlip.php
new file mode 100644
index 00000000..c169e599
--- /dev/null
+++ b/app/UserBankSlip.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class UserBankSlip extends Model
+{
+    protected $fillable = ['bank_slip_type','bankslip_url','transfer_amount','book_id','cust_marking', 'is_approve'];
+}
diff --git a/database/factories/UserBankSlipFactory.php b/database/factories/UserBankSlipFactory.php
new file mode 100644
index 00000000..1fd73bba
--- /dev/null
+++ b/database/factories/UserBankSlipFactory.php
@@ -0,0 +1,9 @@
+<?php
+
+use Faker\Generator as Faker;
+
+$factory->define(App\UserBankSlip::class, function (Faker $faker) {
+    return [
+        //
+    ];
+});
diff --git a/database/migrations/2018_05_08_032048_create_china_bank_slips_table.php b/database/migrations/2018_05_08_032048_create_china_bank_slips_table.php
index 84138017..c9e54898 100644
--- a/database/migrations/2018_05_08_032048_create_china_bank_slips_table.php
+++ b/database/migrations/2018_05_08_032048_create_china_bank_slips_table.php
@@ -15,7 +15,7 @@ class CreateChinaBankSlipsTable extends Migration
     {
         Schema::create('china_bank_slips', function (Blueprint $table) {
             $table->increments('id');
-            $table->string('bompany_name');
+            $table->string('company_name');
             $table->string('bank_name');
             $table->string('acc_no');
             $table->string('bank_address');
diff --git a/database/migrations/2018_05_24_082214_create_user_bank_slips_table.php b/database/migrations/2018_05_24_082214_create_user_bank_slips_table.php
new file mode 100644
index 00000000..03c9fb91
--- /dev/null
+++ b/database/migrations/2018_05_24_082214_create_user_bank_slips_table.php
@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateUserBankSlipsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('user_bank_slips', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('bank_slip_type');
+            $table->string('bankslip_url');
+            $table->double('transfer_amount');
+            $table->string('cust_marking');
+            $table->boolean('is_approve');
+
+            $table->integer('book_id')->unsigned();
+            $table->foreign('book_id')->references('id')->on('bookings');
+
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('user_bank_slips');
+    }
+}
diff --git a/routes/api.php b/routes/api.php
index bec708df..9e20d51f 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -80,3 +80,5 @@ Route::put('setting-supplier/{supplier}', 'SettingSupplierController@update');
 Route::delete('setting-supplier/{supplier}', 'SettingSupplierController@delete');
 
 Route::post('upload-china-bankslip', 'ChinaBankSlipController@store');
+
+Route::post('upload-bs', 'BookingController@uploadbankslip');
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 30abb800..d43e3335 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -47,6 +47,7 @@ return array(
     'App\\SettingCredit' => $baseDir . '/app/SettingCredit.php',
     'App\\SettingSupplier' => $baseDir . '/app/SettingSupplier.php',
     'App\\User' => $baseDir . '/app/User.php',
+    'App\\UserBankSlip' => $baseDir . '/app/UserBankSlip.php',
     'BookTableSeeder' => $baseDir . '/database/seeds/BookTableSeeder.php',
     'Carbon\\Carbon' => $vendorDir . '/nesbot/carbon/src/Carbon/Carbon.php',
     'Carbon\\CarbonInterval' => $vendorDir . '/nesbot/carbon/src/Carbon/CarbonInterval.php',
@@ -3726,7 +3727,6 @@ return array(
     'Tests\\DuskTestCase' => $baseDir . '/tests/DuskTestCase.php',
     'Tests\\Feature\\LocaleTest' => $baseDir . '/tests/Feature/LocaleTest.php',
     'Tests\\Feature\\LoginTest' => $baseDir . '/tests/Feature/LoginTest.php',
-    'Tests\\Feature\\OAuthTest' => $baseDir . '/tests/Feature/OAuthTest.php',
     'Tests\\Feature\\RegisterTest' => $baseDir . '/tests/Feature/RegisterTest.php',
     'Tests\\Feature\\SettingsTest' => $baseDir . '/tests/Feature/SettingsTest.php',
     'Tests\\TestCase' => $baseDir . '/tests/TestCase.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 20eedeed..1a5f6454 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -446,6 +446,7 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'App\\SettingCredit' => __DIR__ . '/../..' . '/app/SettingCredit.php',
         'App\\SettingSupplier' => __DIR__ . '/../..' . '/app/SettingSupplier.php',
         'App\\User' => __DIR__ . '/../..' . '/app/User.php',
+        'App\\UserBankSlip' => __DIR__ . '/../..' . '/app/UserBankSlip.php',
         'BookTableSeeder' => __DIR__ . '/../..' . '/database/seeds/BookTableSeeder.php',
         'Carbon\\Carbon' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/Carbon.php',
         'Carbon\\CarbonInterval' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/CarbonInterval.php',
@@ -4125,7 +4126,6 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'Tests\\DuskTestCase' => __DIR__ . '/../..' . '/tests/DuskTestCase.php',
         'Tests\\Feature\\LocaleTest' => __DIR__ . '/../..' . '/tests/Feature/LocaleTest.php',
         'Tests\\Feature\\LoginTest' => __DIR__ . '/../..' . '/tests/Feature/LoginTest.php',
-        'Tests\\Feature\\OAuthTest' => __DIR__ . '/../..' . '/tests/Feature/OAuthTest.php',
         'Tests\\Feature\\RegisterTest' => __DIR__ . '/../..' . '/tests/Feature/RegisterTest.php',
         'Tests\\Feature\\SettingsTest' => __DIR__ . '/../..' . '/tests/Feature/SettingsTest.php',
         'Tests\\TestCase' => __DIR__ . '/../..' . '/tests/TestCase.php',

From 4210cdc19db032064387fc6805f678dd401f10a6 Mon Sep 17 00:00:00 2001
From: Nazri <nazhamz95@gmail.com>
Date: Mon, 28 May 2018 17:24:13 +0800
Subject: [PATCH 02/12] upload purchase order

---
 app/Http/Controllers/BookingController.php    | 26 +++++++++++++
 app/PurchaseOrder.php                         | 10 +++++
 database/factories/PurchaseOrderFactory.php   |  9 +++++
 ...24_082214_create_user_bank_slips_table.php | 10 ++---
 ...28_085925_create_purchase_orders_table.php | 35 +++++++++++++++++
 routes/api.php                                |  1 +
 tests/Unit/BookingTest.php                    | 38 +++++++++++++++----
 vendor/composer/autoload_classmap.php         |  1 +
 vendor/composer/autoload_static.php           |  1 +
 9 files changed, 118 insertions(+), 13 deletions(-)
 create mode 100644 app/PurchaseOrder.php
 create mode 100644 database/factories/PurchaseOrderFactory.php
 create mode 100644 database/migrations/2018_05_28_085925_create_purchase_orders_table.php

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index b3043f85..7c6f105c 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\PurchaseOrder;
 use Illuminate\Http\Request;
 use App\Booking;
 use App\Rate;
@@ -157,6 +158,31 @@ class BookingController extends Controller
         $post->save();;
     }
 
+    public function uploadPurchaseOrder(Request $request)
+    {
+        // Handle File Upload
+        if($request->hasFile('image_location')){
+            // Get filename with the extension
+            $filenameWithExt = $request->file('image_location')->getClientOriginalName();
+            // Get just filename
+            $filename = pathinfo($filenameWithExt, PATHINFO_FILENAME);
+            // Get just ext
+            $extension = $request->file('image_location')->getClientOriginalExtension();
+            // Filename to store
+            $fileNameToStore= $filename.'_'.time().'.'.$extension;
+            // Upload Image
+            $path = $request->file('image_location')->storeAs('public/userPurchaseOrder', $fileNameToStore);
+        } else {
+            $fileNameToStore = 'hello.jpg';
+        }
+        // Create Post
+        $post = new PurchaseOrder;
+        $post->amount = $request->input('amount');
+        $post->book_id = $request->input('book_id');
+        $post->image_location = $fileNameToStore;
+        $post->save();;
+    }
+
 
     /**
      * Display the specified resource.
diff --git a/app/PurchaseOrder.php b/app/PurchaseOrder.php
new file mode 100644
index 00000000..8aab2697
--- /dev/null
+++ b/app/PurchaseOrder.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class PurchaseOrder extends Model
+{
+    protected $fillable = ['image_location','amount','book_id'];
+}
diff --git a/database/factories/PurchaseOrderFactory.php b/database/factories/PurchaseOrderFactory.php
new file mode 100644
index 00000000..0f14e1a3
--- /dev/null
+++ b/database/factories/PurchaseOrderFactory.php
@@ -0,0 +1,9 @@
+<?php
+
+use Faker\Generator as Faker;
+
+$factory->define(App\PurchaseOrder::class, function (Faker $faker) {
+    return [
+        //
+    ];
+});
diff --git a/database/migrations/2018_05_24_082214_create_user_bank_slips_table.php b/database/migrations/2018_05_24_082214_create_user_bank_slips_table.php
index 03c9fb91..c2f8e150 100644
--- a/database/migrations/2018_05_24_082214_create_user_bank_slips_table.php
+++ b/database/migrations/2018_05_24_082214_create_user_bank_slips_table.php
@@ -15,11 +15,11 @@ class CreateUserBankSlipsTable extends Migration
     {
         Schema::create('user_bank_slips', function (Blueprint $table) {
             $table->increments('id');
-            $table->string('bank_slip_type');
-            $table->string('bankslip_url');
-            $table->double('transfer_amount');
-            $table->string('cust_marking');
-            $table->boolean('is_approve');
+            $table->string('bank_slip_type')->nullable();
+            $table->string('bankslip_url')->nullable();
+            $table->double('transfer_amount')->nullable();
+            $table->string('cust_marking')->nullable();
+            $table->boolean('is_approve')->nullable();
 
             $table->integer('book_id')->unsigned();
             $table->foreign('book_id')->references('id')->on('bookings');
diff --git a/database/migrations/2018_05_28_085925_create_purchase_orders_table.php b/database/migrations/2018_05_28_085925_create_purchase_orders_table.php
new file mode 100644
index 00000000..910a6991
--- /dev/null
+++ b/database/migrations/2018_05_28_085925_create_purchase_orders_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreatePurchaseOrdersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('purchase_orders', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('image_location');
+            $table->double('amount');
+            $table->integer('book_id')->unsigned();
+            $table->foreign('book_id')->references('id')->on('bookings');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('purchase_orders');
+    }
+}
diff --git a/routes/api.php b/routes/api.php
index 9e20d51f..da4caed6 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -82,3 +82,4 @@ Route::delete('setting-supplier/{supplier}', 'SettingSupplierController@delete')
 Route::post('upload-china-bankslip', 'ChinaBankSlipController@store');
 
 Route::post('upload-bs', 'BookingController@uploadbankslip');
+Route::post('upload-po', 'BookingController@uploadPurchaseOrder');
\ No newline at end of file
diff --git a/tests/Unit/BookingTest.php b/tests/Unit/BookingTest.php
index 71cbb641..a3a100dc 100644
--- a/tests/Unit/BookingTest.php
+++ b/tests/Unit/BookingTest.php
@@ -6,6 +6,9 @@ use Tests\TestCase;
 use Illuminate\Foundation\Testing\WithoutMiddleware;
 use Illuminate\Database\Seeder;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Artisan;
 use App\User;
 
@@ -22,17 +25,17 @@ class BookingTest extends TestCase
 
        public function testPost()
           {
-              $response = 
+              $response =
               $this->actingAs($this->user)
               ->postJson('/api/booking/',  [
                 'account_name' => 'johnny',
-                'account_num' => '1234567', 
-                'bank_name' => 'myabnak', 
-                'bank_branch' => 'banking', 
-                'company_name' => 'besaras', 
-                'company_address' => 'californina', 
-                'bank_address' => 'cyber', 
-                'swift_code' => '123wert', 
+                'account_num' => '1234567',
+                'bank_name' => 'myabnak',
+                'bank_branch' => 'banking',
+                'company_name' => 'besaras',
+                'company_address' => 'californina',
+                'bank_address' => 'cyber',
+                'swift_code' => '123wert',
                 'cnap' => '2131rew',
                 'term' => 'x2_cash',
                 'amount' => '14000'
@@ -40,4 +43,23 @@ class BookingTest extends TestCase
               $response->assertStatus(500);
           }
 
+        public function testImageUpload()
+        {
+            Storage::fake('bankslip_url');
+
+            $response = $this->json('POST', '/api/upload-bs', [
+            'bankslip_url' => UploadedFile::fake()->image('comp.jpg'),
+                'bank_slip_type' => '',
+                'transfer_amount' => '1000',
+                'book_id' => '1',
+                'cust_marking' => '12345',
+                'is_approve' => '1',
+
+            ]);
+            //var_dump($response);
+            dd($response->getContent());
+            $response->assertStatus(200);
+        }
+
+
 }
\ No newline at end of file
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index d43e3335..16d0da87 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -41,6 +41,7 @@ return array(
     'App\\Providers\\BroadcastServiceProvider' => $baseDir . '/app/Providers/BroadcastServiceProvider.php',
     'App\\Providers\\EventServiceProvider' => $baseDir . '/app/Providers/EventServiceProvider.php',
     'App\\Providers\\RouteServiceProvider' => $baseDir . '/app/Providers/RouteServiceProvider.php',
+    'App\\PurchaseOrder' => $baseDir . '/app/PurchaseOrder.php',
     'App\\Rate' => $baseDir . '/app/Rate.php',
     'App\\Role' => $baseDir . '/app/Role.php',
     'App\\SettingBeneficiary' => $baseDir . '/app/SettingBeneficiary.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 1a5f6454..a3e6b143 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -440,6 +440,7 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'App\\Providers\\BroadcastServiceProvider' => __DIR__ . '/../..' . '/app/Providers/BroadcastServiceProvider.php',
         'App\\Providers\\EventServiceProvider' => __DIR__ . '/../..' . '/app/Providers/EventServiceProvider.php',
         'App\\Providers\\RouteServiceProvider' => __DIR__ . '/../..' . '/app/Providers/RouteServiceProvider.php',
+        'App\\PurchaseOrder' => __DIR__ . '/../..' . '/app/PurchaseOrder.php',
         'App\\Rate' => __DIR__ . '/../..' . '/app/Rate.php',
         'App\\Role' => __DIR__ . '/../..' . '/app/Role.php',
         'App\\SettingBeneficiary' => __DIR__ . '/../..' . '/app/SettingBeneficiary.php',

From 11ccbd6a91f3981d11c40af457af42c41aaad315 Mon Sep 17 00:00:00 2001
From: Nazri <nazhamz95@gmail.com>
Date: Wed, 30 May 2018 12:24:30 +0800
Subject: [PATCH 03/12] fix discussion

---
 app/Http/Controllers/BookingController.php    | 104 ++++--------------
 app/PurchaseOrder.php                         |   2 +-
 app/UserBankSlip.php                          |   2 +-
 ...28_085925_create_purchase_orders_table.php |   2 +-
 ..._030248_update_upload_booking_bankslip.php |  31 ++++++
 routes/api.php                                |   4 +-
 tests/Unit/BookingTest.php                    |   2 +-
 7 files changed, 61 insertions(+), 86 deletions(-)
 create mode 100644 database/migrations/2018_05_30_030248_update_upload_booking_bankslip.php

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 7c6f105c..4d6975ef 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -12,32 +12,7 @@ use Auth;
 
 class BookingController extends Controller
 {
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    //public function index()
-    //{
-    //    return response()->json(['success' => true, 'message'=> "You have successfully logged out."]);
-    //}
 
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    //public function create()
-    //{
-    //        return response()->json(['success' => true, 'message'=> "Success"]);
-    //}
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
     public function store(Request $request)
     {
         $rates = Rate::all()->last();
@@ -74,7 +49,7 @@ class BookingController extends Controller
          }
 
          //Calculation part
-        //  $bookings = Booking::all();
+        //$bookings = Booking::all();
         $amount = $request->input("amount");
         if ($amount >= 10000 && ($term == 'x2_cash' || $term = 'x2_cheque' || $term = 'x2_ba')) {
             $svcharge = 0;
@@ -130,7 +105,7 @@ class BookingController extends Controller
        
     }
 
-    public function uploadbankslip(Request $request)
+    public function uploadbankslip(Request $request, $id)
     {
         // Handle File Upload
         if($request->hasFile('bankslip_url')){
@@ -145,75 +120,53 @@ class BookingController extends Controller
             // Upload Image
             $path = $request->file('bankslip_url')->storeAs('public/userbankslip', $fileNameToStore);
         } else {
-            $fileNameToStore = 'hello.jpg';
+            return response()->json(['message'=>'No file detected'],200);
+
         }
+
+        $id = Booking::find($id);
+        $id->book_id = $request->input('book_id');
+        $id->cust_marking = $request->input('cust_marking');
+        $id->is_approve = $request->input('is_approve');
+        $id->bank_slip_type = $request->input('bank_slip_type');
+
         // Create Post
         $post = new UserBankSlip;
-        $post->bank_slip_type = $request->input('bank_slip_type');
         $post->transfer_amount = $request->input('transfer_amount');
-        $post->book_id = $request->input('book_id');
-        $post->cust_marking = $request->input('cust_marking');
-        $post->is_approve = $request->input('is_approve');
         $post->bankslip_url = $fileNameToStore;
         $post->save();;
+
+
     }
 
-    public function uploadPurchaseOrder(Request $request)
+    public function uploadPurchaseOrder(Request $request, $id)
     {
         // Handle File Upload
-        if($request->hasFile('image_location')){
+        if($request->hasFile('image_url')){
             // Get filename with the extension
-            $filenameWithExt = $request->file('image_location')->getClientOriginalName();
+            $filenameWithExt = $request->file('image_url')->getClientOriginalName();
             // Get just filename
             $filename = pathinfo($filenameWithExt, PATHINFO_FILENAME);
             // Get just ext
-            $extension = $request->file('image_location')->getClientOriginalExtension();
+            $extension = $request->file('image_url')->getClientOriginalExtension();
             // Filename to store
             $fileNameToStore= $filename.'_'.time().'.'.$extension;
             // Upload Image
-            $path = $request->file('image_location')->storeAs('public/userPurchaseOrder', $fileNameToStore);
+            $path = $request->file('image_url')->storeAs('public/userPurchaseOrder', $fileNameToStore);
         } else {
-            $fileNameToStore = 'hello.jpg';
+            return response()->json(['message'=>'No file detected'],200);
         }
+
+        $id = Booking::find($id);
+        $id->book_id = $request->input('book_id');
+
         // Create Post
         $post = new PurchaseOrder;
         $post->amount = $request->input('amount');
-        $post->book_id = $request->input('book_id');
-        $post->image_location = $fileNameToStore;
+        $post->image_url = $fileNameToStore;
         $post->save();;
     }
 
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    //public function show($id)
-    //{
-        // $booking = Booking::find($id);
-    //    return view('booking.index');
-    //}
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    //public function edit($id)
-    //{
-        //
-    //}
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
     public function update(Request $request, $book_id)
     {
             $book_id = Booking::find($book_id);
@@ -231,17 +184,8 @@ class BookingController extends Controller
             $book_id->save();
      
             return response()->json(['book_id'=>$book_id],200);
-
-
-    
     }
 
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
     public function delete(Booking $book_id)
     {
         $book_id->delete($book_id);
diff --git a/app/PurchaseOrder.php b/app/PurchaseOrder.php
index 8aab2697..6a5a9374 100644
--- a/app/PurchaseOrder.php
+++ b/app/PurchaseOrder.php
@@ -6,5 +6,5 @@ use Illuminate\Database\Eloquent\Model;
 
 class PurchaseOrder extends Model
 {
-    protected $fillable = ['image_location','amount','book_id'];
+    protected $fillable = ['image_url','amount','book_id'];
 }
diff --git a/app/UserBankSlip.php b/app/UserBankSlip.php
index c169e599..8aa809a6 100644
--- a/app/UserBankSlip.php
+++ b/app/UserBankSlip.php
@@ -6,5 +6,5 @@ use Illuminate\Database\Eloquent\Model;
 
 class UserBankSlip extends Model
 {
-    protected $fillable = ['bank_slip_type','bankslip_url','transfer_amount','book_id','cust_marking', 'is_approve'];
+    protected $fillable = ['bank_slip_type','bankslip_url','transfer_amount','book_id','cust_marking'];
 }
diff --git a/database/migrations/2018_05_28_085925_create_purchase_orders_table.php b/database/migrations/2018_05_28_085925_create_purchase_orders_table.php
index 910a6991..08ebcbd2 100644
--- a/database/migrations/2018_05_28_085925_create_purchase_orders_table.php
+++ b/database/migrations/2018_05_28_085925_create_purchase_orders_table.php
@@ -15,7 +15,7 @@ class CreatePurchaseOrdersTable extends Migration
     {
         Schema::create('purchase_orders', function (Blueprint $table) {
             $table->increments('id');
-            $table->string('image_location');
+            $table->string('image_url');
             $table->double('amount');
             $table->integer('book_id')->unsigned();
             $table->foreign('book_id')->references('id')->on('bookings');
diff --git a/database/migrations/2018_05_30_030248_update_upload_booking_bankslip.php b/database/migrations/2018_05_30_030248_update_upload_booking_bankslip.php
new file mode 100644
index 00000000..3e020dee
--- /dev/null
+++ b/database/migrations/2018_05_30_030248_update_upload_booking_bankslip.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateUploadBookingBankslip extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('user_bank_slips', function (Blueprint $table) {
+            $table->boolean('is_approve')->default('false');
+        });
+    }
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('user_bank_slips', function (Blueprint $table) {
+            //
+        });
+    }
+}
diff --git a/routes/api.php b/routes/api.php
index da4caed6..917a0732 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -81,5 +81,5 @@ Route::delete('setting-supplier/{supplier}', 'SettingSupplierController@delete')
 
 Route::post('upload-china-bankslip', 'ChinaBankSlipController@store');
 
-Route::post('upload-bs', 'BookingController@uploadbankslip');
-Route::post('upload-po', 'BookingController@uploadPurchaseOrder');
\ No newline at end of file
+Route::post('booking/{id}/upload-user-bankslip', 'BookingController@uploadbankslip');
+Route::post('booking/{id}/upload-po', 'BookingController@uploadPurchaseOrder');
\ No newline at end of file
diff --git a/tests/Unit/BookingTest.php b/tests/Unit/BookingTest.php
index a3a100dc..598336a8 100644
--- a/tests/Unit/BookingTest.php
+++ b/tests/Unit/BookingTest.php
@@ -40,7 +40,7 @@ class BookingTest extends TestCase
                 'term' => 'x2_cash',
                 'amount' => '14000'
             ]);
-              $response->assertStatus(500);
+              $response->assertStatus(200);
           }
 
         public function testImageUpload()

From 7381252c57cc8cff233ff94f2d1110086ca7ad36 Mon Sep 17 00:00:00 2001
From: Nazri <nazhamz95@gmail.com>
Date: Wed, 30 May 2018 13:24:22 +0800
Subject: [PATCH 04/12] fix discussion 2

---
 app/Http/Controllers/BookingController.php | 24 ++++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 4d6975ef..4fc6bcf7 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -58,7 +58,10 @@ class BookingController extends Controller
              $svcharge = 20.00;
          }
 
-         $bia = round(($amount + $svcharge) / $rate + (0*($amount + $svcharge)), 2);
+         $gst = 0*($amount + $svcharge);
+
+
+         $bia = round(($amount + $svcharge) / $rate + $gst,2);
         //gst = 0.00% -> (0*($amount + $svcharge))
         //bia = bank in amount in MYR
 
@@ -120,18 +123,17 @@ class BookingController extends Controller
             // Upload Image
             $path = $request->file('bankslip_url')->storeAs('public/userbankslip', $fileNameToStore);
         } else {
-            return response()->json(['message'=>'No file detected'],200);
+            return response()->json(['message'=>'No file detected'],400);
 
         }
 
-        $id = Booking::find($id);
-        $id->book_id = $request->input('book_id');
-        $id->cust_marking = $request->input('cust_marking');
-        $id->is_approve = $request->input('is_approve');
-        $id->bank_slip_type = $request->input('bank_slip_type');
+        $booking = Booking::find($id);
+        $booking->cust_marking = $request->input('cust_marking');
+        $booking->bank_slip_type = $request->input('bank_slip_type');
 
         // Create Post
         $post = new UserBankSlip;
+        $post->book_id = $booking->id;
         $post->transfer_amount = $request->input('transfer_amount');
         $post->bankslip_url = $fileNameToStore;
         $post->save();;
@@ -154,17 +156,17 @@ class BookingController extends Controller
             // Upload Image
             $path = $request->file('image_url')->storeAs('public/userPurchaseOrder', $fileNameToStore);
         } else {
-            return response()->json(['message'=>'No file detected'],200);
+            return response()->json(['message'=>'No file detected'],400);
         }
 
-        $id = Booking::find($id);
-        $id->book_id = $request->input('book_id');
+        $booking = Booking::find($id);
 
         // Create Post
         $post = new PurchaseOrder;
+        $post->book_id = $booking->id;
         $post->amount = $request->input('amount');
         $post->image_url = $fileNameToStore;
-        $post->save();;
+        $post->save();
     }
 
     public function update(Request $request, $book_id)

From cc3ea574f876538358b1532bf59c0fafec8ecab4 Mon Sep 17 00:00:00 2001
From: Nazri <nazhamz95@gmail.com>
Date: Wed, 30 May 2018 16:33:11 +0800
Subject: [PATCH 05/12] add logic, test

---
 app/Http/Controllers/BookingController.php    | 39 ++++++---
 ...24_082214_create_user_bank_slips_table.php |  1 -
 ..._030248_update_upload_booking_bankslip.php |  2 +-
 phpunit.xml                                   |  4 +
 tests/Unit/BookingTest.php                    | 82 +++++++++++++++----
 5 files changed, 97 insertions(+), 31 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 4fc6bcf7..4ec2c00d 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -15,6 +15,13 @@ class BookingController extends Controller
 
     public function store(Request $request)
     {
+        //logic if booking is not belongs to user, prohibit them from accessing the api
+        $user = User::where("id", Auth::user()->id)->first();
+        if (!$user)
+        {
+            return response()->json(['message'=>'Access denied'],401);
+        }
+
         $rates = Rate::all()->last();
         $term = $request->input('term');
         $rate = 1;
@@ -49,23 +56,31 @@ class BookingController extends Controller
          }
 
          //Calculation part
-        //$bookings = Booking::all();
         $amount = $request->input("amount");
-        if ($amount >= 10000 && ($term == 'x2_cash' || $term = 'x2_cheque' || $term = 'x2_ba')) {
+
+         //logic : if amount higher than 10,000, no service charge. if amount lower than 10,000, 20.00 service charge
+         if ($amount >= 10000 && ($term == 'x2_cash' || $term = 'x2_cheque' || $term = 'x2_ba')) {
             $svcharge = 0;
         }
          else {
              $svcharge = 20.00;
          }
 
-         $gst = 0*($amount + $svcharge);
+         //initial calculation
+         $RMBinMYR = (($amount + $svcharge) / $rate);
 
+        //calculate gst, 0% after 1june 2018
+         $gst = 0*$RMBinMYR;
 
-         $bia = round(($amount + $svcharge) / $rate + $gst,2);
-        //gst = 0.00% -> (0*($amount + $svcharge))
-        //bia = bank in amount in MYR
+         //calculate Sales Tax, 10% of initial calculation
+         $sales_tax = 0.10*$RMBinMYR;
+
+         //calculate billing, 1.5% of initial calculation
+         $billing = 0.015*$RMBinMYR;
+
+         //bia = bank in amount in MYR
+         $bia = round($RMBinMYR + $gst + $sales_tax + $billing,2);
 
-        //  return $bia;
          $user = Auth::user(); 
          $booking = new Booking();
          $booking->account_name = $request->input('account_name');
@@ -97,12 +112,9 @@ class BookingController extends Controller
          $booking->verification_status = $request->input('verification_status');
 
          $booking->user()->associate($user);
-         //$booking->user_id = $request->input('user_id');
          $booking->bia = $bia;
          $booking->save();
 
-        // return false;
-        //$booking = Booking::create($request->all());
         return response()->json($booking, 201);
 
        
@@ -136,7 +148,8 @@ class BookingController extends Controller
         $post->book_id = $booking->id;
         $post->transfer_amount = $request->input('transfer_amount');
         $post->bankslip_url = $fileNameToStore;
-        $post->save();;
+        $post->save();
+        return response()->json(['message'=>'Success'],201);
 
 
     }
@@ -167,13 +180,13 @@ class BookingController extends Controller
         $post->amount = $request->input('amount');
         $post->image_url = $fileNameToStore;
         $post->save();
+        return response()->json(['message'=>'Success'],201);
     }
 
     public function update(Request $request, $book_id)
     {
             $book_id = Booking::find($book_id);
-            
-            //$com_id->id = $request->input('id');
+
             $book_id->account_name = $request->input('account_name');
             $book_id->account_num = $request->input('account_num');
             $book_id->bank_name = $request->input('bank_name');
diff --git a/database/migrations/2018_05_24_082214_create_user_bank_slips_table.php b/database/migrations/2018_05_24_082214_create_user_bank_slips_table.php
index c2f8e150..0d11cdd5 100644
--- a/database/migrations/2018_05_24_082214_create_user_bank_slips_table.php
+++ b/database/migrations/2018_05_24_082214_create_user_bank_slips_table.php
@@ -19,7 +19,6 @@ class CreateUserBankSlipsTable extends Migration
             $table->string('bankslip_url')->nullable();
             $table->double('transfer_amount')->nullable();
             $table->string('cust_marking')->nullable();
-            $table->boolean('is_approve')->nullable();
 
             $table->integer('book_id')->unsigned();
             $table->foreign('book_id')->references('id')->on('bookings');
diff --git a/database/migrations/2018_05_30_030248_update_upload_booking_bankslip.php b/database/migrations/2018_05_30_030248_update_upload_booking_bankslip.php
index 3e020dee..70a052ca 100644
--- a/database/migrations/2018_05_30_030248_update_upload_booking_bankslip.php
+++ b/database/migrations/2018_05_30_030248_update_upload_booking_bankslip.php
@@ -14,7 +14,7 @@ class UpdateUploadBookingBankslip extends Migration
     public function up()
     {
         Schema::table('user_bank_slips', function (Blueprint $table) {
-            $table->boolean('is_approve')->default('false');
+            $table->boolean('is_approve')->default('0');
         });
     }
     /**
diff --git a/phpunit.xml b/phpunit.xml
index 2a973817..d61b43d6 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -20,6 +20,9 @@
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">./app</directory>
+            <exclude>
+                <file>./app/Http/routes.php</file>
+            </exclude>
         </whitelist>
     </filter>
     <php>
@@ -31,5 +34,6 @@
         <env name="MAIL_DRIVER" value="array"/>
         <env name="DB_CONNECTION" value="sqlite"/>
         <env name="DB_DATABASE" value=":memory:"/>
+        <ini name="display_errors" value="true"/>
     </php>
 </phpunit>
diff --git a/tests/Unit/BookingTest.php b/tests/Unit/BookingTest.php
index 598336a8..3f23ea6d 100644
--- a/tests/Unit/BookingTest.php
+++ b/tests/Unit/BookingTest.php
@@ -38,28 +38,78 @@ class BookingTest extends TestCase
                 'swift_code' => '123wert',
                 'cnap' => '2131rew',
                 'term' => 'x2_cash',
-                'amount' => '14000'
+                'amount' => '14000',
+                'rmb_book_amount' => '2131',
+                'rmb_book_pay_method' => '2131rea',
+                'rmb_book_account_name' => '2131rew',
+                'rmb_book_acc_no' => '2131',
+                'rmb_book_bank_branch' => '2131rew',
+                'usd_book_amount' => '2131',
+                'usd_book_pay_method' => '2131rew',
+                'usd_book_company_name' => '2131rew',
+                'usd_book_company_address' => '2131rew',
+                'usd_book_swift_code' => '2131rew',
+                'usd_book_cnap' => '2131rew',
+                'usd_book_bank_branch' => '2131rew',
+                'verification_status' => '1'
             ]);
-              $response->assertStatus(200);
+              $response->assertStatus(201);
           }
 
-        public function testImageUpload()
-        {
-            Storage::fake('bankslip_url');
 
-            $response = $this->json('POST', '/api/upload-bs', [
+    public function testuploadbankslip()
+    {
+        Storage::fake('bankslip_url');
+
+        $response = $this->json('POST', '/api/booking/1/upload-user-bankslip', [
             'bankslip_url' => UploadedFile::fake()->image('comp.jpg'),
-                'bank_slip_type' => '',
-                'transfer_amount' => '1000',
-                'book_id' => '1',
-                'cust_marking' => '12345',
-                'is_approve' => '1',
+            'transfer_amount' => '12345'
+        ]);
+        dd($response->getContent());
+        $response->assertStatus(201);
+    }
 
-            ]);
-            //var_dump($response);
-            dd($response->getContent());
-            $response->assertStatus(200);
-        }
+    public function testuploadPO()
+    {
+        Storage::fake('image_url');
 
+        $response = $this->json('POST', '/api/booking/1/upload-po', [
+            'image_url' => UploadedFile::fake()->image('comp.jpg'),
+            'amount' => '12345'
+        ]);
+        dd($response->getContent());
+        $response->assertStatus(201);
+    }
+
+
+//    function upload_bankslip_test()
+//    {
+//        Storage::fake('public');
+//
+//        $this->json('post', '/api/booking/1/upload-user-bankslip', [
+//            'bankslip_url' => $file = UploadedFile::fake()->image('random.jpg'),
+//            'transfer_amount' => '12345',
+//        ]);
+//
+//        $this->assertEquals('file/' . $file->hashName(), Upload::latest()->first()->file);
+//
+//        Storage::disk('public')->assertExists('file/' . $file->hashName());
+//
+//    }
+//
+//    function upload_po_test()
+//    {
+//        Storage::fake('public');
+//
+//        $this->json('post', '/api/booking/1/upload-po', [
+//            'image_url' => $file = UploadedFile::fake()->image('random.jpg'),
+//            'amount' => '12345',
+//        ]);
+//
+//        $this->assertEquals('file/' . $file->hashName(), Upload::latest()->first()->file);
+//
+//        Storage::disk('public')->assertExists('file/' . $file->hashName());
+//
+//    }
 
 }
\ No newline at end of file

From d7025b7f86f7452975805908117a5eac7ade24f5 Mon Sep 17 00:00:00 2001
From: Nazri <nazhamz95@gmail.com>
Date: Thu, 31 May 2018 10:38:45 +0800
Subject: [PATCH 06/12] update logic

---
 app/Http/Controllers/BookingController.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 4ec2c00d..6046ce03 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -15,13 +15,6 @@ class BookingController extends Controller
 
     public function store(Request $request)
     {
-        //logic if booking is not belongs to user, prohibit them from accessing the api
-        $user = User::where("id", Auth::user()->id)->first();
-        if (!$user)
-        {
-            return response()->json(['message'=>'Access denied'],401);
-        }
-
         $rates = Rate::all()->last();
         $term = $request->input('term');
         $rate = 1;
@@ -122,6 +115,12 @@ class BookingController extends Controller
 
     public function uploadbankslip(Request $request, $id)
     {
+        $post = User::find($id);
+        if (!$post)
+        {
+            return response()->json(['message'=>'Access denied'],401);
+        }
+
         // Handle File Upload
         if($request->hasFile('bankslip_url')){
             // Get filename with the extension
@@ -156,6 +155,12 @@ class BookingController extends Controller
 
     public function uploadPurchaseOrder(Request $request, $id)
     {
+        $post = User::where("user_id", Auth::user()->id)->first();
+        if (!$post)
+        {
+            return response()->json(['message'=>'Access denied'], 401);
+        }
+
         // Handle File Upload
         if($request->hasFile('image_url')){
             // Get filename with the extension

From 6e54771ca27fee25c084200861b883285d0b55e5 Mon Sep 17 00:00:00 2001
From: Nazri <nazhamz95@gmail.com>
Date: Tue, 5 Jun 2018 10:15:43 +0800
Subject: [PATCH 07/12] upload po test

---
 app/Http/Controllers/BookingController.php | 116 ++++++++++++---------
 tests/Unit/BookingTest.php                 |  38 +------
 2 files changed, 72 insertions(+), 82 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 6046ce03..f97afe4a 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -4,11 +4,13 @@ namespace App\Http\Controllers;
 
 use App\PurchaseOrder;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
 use App\Booking;
 use App\Rate;
 use App\UserBankSlip;
 use App\User;
 use Auth;
+use Validator;
 
 class BookingController extends Controller
 {
@@ -115,77 +117,95 @@ class BookingController extends Controller
 
     public function uploadbankslip(Request $request, $id)
     {
-        $post = User::find($id);
-        if (!$post)
+        $user_bankslip = Booking::where("user_id", Auth::user()->id)->first();
+        if (!$user_bankslip)
         {
-            return response()->json(['message'=>'Access denied'],401);
+            return response()->json(['message'=>'Access denied'], 200);
         }
 
-        // Handle File Upload
-        if($request->hasFile('bankslip_url')){
-            // Get filename with the extension
-            $filenameWithExt = $request->file('bankslip_url')->getClientOriginalName();
-            // Get just filename
-            $filename = pathinfo($filenameWithExt, PATHINFO_FILENAME);
-            // Get just ext
-            $extension = $request->file('bankslip_url')->getClientOriginalExtension();
-            // Filename to store
-            $fileNameToStore= $filename.'_'.time().'.'.$extension;
-            // Upload Image
-            $path = $request->file('bankslip_url')->storeAs('public/userbankslip', $fileNameToStore);
-        } else {
-            return response()->json(['message'=>'No file detected'],400);
+        $validator = Validator::make($request->all(), [
+            'bankslip_url'   => 'image|mimes:jpg,jpeg,bmp,png'
+        ]);
 
+        if($validator->fails())
+        {
+            return response()->json(['message'=>'Incorrect format'],200);
         }
 
+        if($file = $request->file('bankslip_url'))
+        {
+            $bankslip_url = $request->file('bankslip_url');
+            $filename = $bankslip_url->getClientOriginalName();
+            $unique_name = 'bank_slip_' . md5($filename. time());
+
+            $file = $request->file('bankslip_url');
+            $ext = $file->getClientOriginalExtension();
+            $input['bankslip_url'] = $filename;
+            Storage::putFileAs(
+                'bankslip_url',/*folder name*/ $file, $unique_name. '.' .$ext
+            );
+            $user_bankslip->bankslip_url = $unique_name. '.' .$ext; //update database
+        } //end if
+        else {
+            return response()->json(['message' => 'No file detected'], 400);
+        }
+
+
         $booking = Booking::find($id);
         $booking->cust_marking = $request->input('cust_marking');
         $booking->bank_slip_type = $request->input('bank_slip_type');
 
         // Create Post
-        $post = new UserBankSlip;
-        $post->book_id = $booking->id;
-        $post->transfer_amount = $request->input('transfer_amount');
-        $post->bankslip_url = $fileNameToStore;
-        $post->save();
-        return response()->json(['message'=>'Success'],201);
+        $user_bankslip = new UserBankSlip;
+        $user_bankslip->book_id = $booking->id;
+        $user_bankslip->transfer_amount = $request->input('transfer_amount');
+        $user_bankslip->save();
 
+        return response()->json(['message'=>$user_bankslip],200);
 
     }
 
     public function uploadPurchaseOrder(Request $request, $id)
     {
-        $post = User::where("user_id", Auth::user()->id)->first();
-        if (!$post)
+        $user_po = Booking::where("user_id", Auth::user()->id)->first();
+        if (!$user_po)
         {
-            return response()->json(['message'=>'Access denied'], 401);
+            return response()->json(['message'=>'Access denied'], 200);
         }
 
-        // Handle File Upload
-        if($request->hasFile('image_url')){
-            // Get filename with the extension
-            $filenameWithExt = $request->file('image_url')->getClientOriginalName();
-            // Get just filename
-            $filename = pathinfo($filenameWithExt, PATHINFO_FILENAME);
-            // Get just ext
-            $extension = $request->file('image_url')->getClientOriginalExtension();
-            // Filename to store
-            $fileNameToStore= $filename.'_'.time().'.'.$extension;
-            // Upload Image
-            $path = $request->file('image_url')->storeAs('public/userPurchaseOrder', $fileNameToStore);
-        } else {
-            return response()->json(['message'=>'No file detected'],400);
+        $validator = Validator::make($request->all(), [
+            'image_url'   => 'image|mimes:jpg,jpeg,bmp,png'
+        ]);
+
+        if($validator->fails())
+        {
+            return response()->json(['message'=>'Incorrect format'],200);
+        }
+
+        if($file = $request->file('image_url'))
+        {
+            $image_url = $request->file('image_url');
+            $filename = $image_url->getClientOriginalName();
+            $unique_name = 'purchase_order_' . md5($filename. time());
+
+            $file = $request->file('image_url');
+            $ext = $file->getClientOriginalExtension();
+            $input['image_url'] = $filename;
+            Storage::putFileAs(
+                'image_url',/*folder name*/ $file, $unique_name. '.' .$ext
+            );
+            $user_po->image_url = $unique_name. '.' .$ext; //update database
+        } //end if
+        else {
+            return response()->json(['message' => 'No file detected'], 400);
         }
 
         $booking = Booking::find($id);
-
-        // Create Post
-        $post = new PurchaseOrder;
-        $post->book_id = $booking->id;
-        $post->amount = $request->input('amount');
-        $post->image_url = $fileNameToStore;
-        $post->save();
-        return response()->json(['message'=>'Success'],201);
+        $user_po = new PurchaseOrder;
+        $user_po->book_id = $booking->id;
+        $user_po->amount = $request->input('amount');
+        $user_po->save();
+        return response()->json(['message'=>'Success'],200);
     }
 
     public function update(Request $request, $book_id)
diff --git a/tests/Unit/BookingTest.php b/tests/Unit/BookingTest.php
index 3f23ea6d..9e198b4f 100644
--- a/tests/Unit/BookingTest.php
+++ b/tests/Unit/BookingTest.php
@@ -63,10 +63,11 @@ class BookingTest extends TestCase
 
         $response = $this->json('POST', '/api/booking/1/upload-user-bankslip', [
             'bankslip_url' => UploadedFile::fake()->image('comp.jpg'),
-            'transfer_amount' => '12345'
+            'transfer_amount' => '9000'
         ]);
+
         dd($response->getContent());
-        $response->assertStatus(201);
+        $response->assertStatus(200);
     }
 
     public function testuploadPO()
@@ -78,38 +79,7 @@ class BookingTest extends TestCase
             'amount' => '12345'
         ]);
         dd($response->getContent());
-        $response->assertStatus(201);
+        $response->assertStatus(200);
     }
 
-
-//    function upload_bankslip_test()
-//    {
-//        Storage::fake('public');
-//
-//        $this->json('post', '/api/booking/1/upload-user-bankslip', [
-//            'bankslip_url' => $file = UploadedFile::fake()->image('random.jpg'),
-//            'transfer_amount' => '12345',
-//        ]);
-//
-//        $this->assertEquals('file/' . $file->hashName(), Upload::latest()->first()->file);
-//
-//        Storage::disk('public')->assertExists('file/' . $file->hashName());
-//
-//    }
-//
-//    function upload_po_test()
-//    {
-//        Storage::fake('public');
-//
-//        $this->json('post', '/api/booking/1/upload-po', [
-//            'image_url' => $file = UploadedFile::fake()->image('random.jpg'),
-//            'amount' => '12345',
-//        ]);
-//
-//        $this->assertEquals('file/' . $file->hashName(), Upload::latest()->first()->file);
-//
-//        Storage::disk('public')->assertExists('file/' . $file->hashName());
-//
-//    }
-
 }
\ No newline at end of file

From 5ce817cd334c0969e693605d3c7109fcbce25d42 Mon Sep 17 00:00:00 2001
From: Too <sengweitoo@gmail.com>
Date: Thu, 14 Jun 2018 15:08:00 +0800
Subject: [PATCH 08/12] remove duplicate getting banksli_url. add user bank
 slip into database in uploadbankslip. save image_url in uploadpurchaseorder

---
 app/Http/Controllers/BookingController.php | 42 ++++++++++++++--------
 vendor/composer/autoload_static.php        | 20 +++++------
 2 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index f97afe4a..245e3df1 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -132,19 +132,24 @@ class BookingController extends Controller
             return response()->json(['message'=>'Incorrect format'],200);
         }
 
-        if($file = $request->file('bankslip_url'))
+        $unique_image_url = ""; //init variable
+        if($bankslip_url = $request->file('bankslip_url'))
         {
-            $bankslip_url = $request->file('bankslip_url');
+            // Get image name and store it
             $filename = $bankslip_url->getClientOriginalName();
+            $input['bankslip_url'] = $filename;
+
+            //hash image name
             $unique_name = 'bank_slip_' . md5($filename. time());
 
-            $file = $request->file('bankslip_url');
-            $ext = $file->getClientOriginalExtension();
-            $input['bankslip_url'] = $filename;
+            // Get image extension concentae it with hashed image name
+            $ext = $bankslip_url->getClientOriginalExtension();
+            $unique_image_url = $unique_name. '.' .$ext;
+            //update database
             Storage::putFileAs(
-                'bankslip_url',/*folder name*/ $file, $unique_name. '.' .$ext
-            );
-            $user_bankslip->bankslip_url = $unique_name. '.' .$ext; //update database
+                'bankslip_url',/*folder name*/ $bankslip_url,  $unique_image_url
+            ); 
+            
         } //end if
         else {
             return response()->json(['message' => 'No file detected'], 400);
@@ -158,6 +163,7 @@ class BookingController extends Controller
         // Create Post
         $user_bankslip = new UserBankSlip;
         $user_bankslip->book_id = $booking->id;
+        $user_bankslip->bankslip_url =  $unique_image_url;
         $user_bankslip->transfer_amount = $request->input('transfer_amount');
         $user_bankslip->save();
 
@@ -182,19 +188,24 @@ class BookingController extends Controller
             return response()->json(['message'=>'Incorrect format'],200);
         }
 
-        if($file = $request->file('image_url'))
+        $unique_image_url = ""; // declare variable
+        if($image_url = $request->file('image_url'))
         {
-            $image_url = $request->file('image_url');
+            // Get image name and store it
             $filename = $image_url->getClientOriginalName();
+            $input['image_url'] = $filename;
+            
+            // hash image name
             $unique_name = 'purchase_order_' . md5($filename. time());
 
-            $file = $request->file('image_url');
-            $ext = $file->getClientOriginalExtension();
-            $input['image_url'] = $filename;
+            // Get image extension concentae it with hashed image name
+            $ext = $image_url->getClientOriginalExtension();
+            $unique_image_url = $unique_name. '.' .$ext; 
+
+            //update database
             Storage::putFileAs(
-                'image_url',/*folder name*/ $file, $unique_name. '.' .$ext
+                'image_url',/*folder name*/ $image_url, $unique_image_url
             );
-            $user_po->image_url = $unique_name. '.' .$ext; //update database
         } //end if
         else {
             return response()->json(['message' => 'No file detected'], 400);
@@ -202,6 +213,7 @@ class BookingController extends Controller
 
         $booking = Booking::find($id);
         $user_po = new PurchaseOrder;
+        $user_po->image_url = $unique_image_url;
         $user_po->book_id = $booking->id;
         $user_po->amount = $request->input('amount');
         $user_po->save();
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index a3e6b143..f20ed968 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -4,22 +4,22 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
+class ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a
 {
     public static $files = array (
         '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
         '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php',
         '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php',
-        'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php',
         '2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php',
+        'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php',
         'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php',
-        '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
         '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php',
+        '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
         'bd9634f2d41831496de0d3dfe4c94881' => __DIR__ . '/..' . '/symfony/polyfill-php56/bootstrap.php',
         'f0906e6318348a765ffb6eb24e0d0938' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/helpers.php',
         '58571171fd5812e6e447dce228f52f4d' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/helpers.php',
-        '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
         '801c31d8ed748cfa537fa45402288c95' => __DIR__ . '/..' . '/psy/psysh/src/functions.php',
+        '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
         'f18cc91337d49233e5754e93f3ed9ec3' => __DIR__ . '/..' . '/laravelcollective/html/src/helpers.php',
     );
 
@@ -140,8 +140,8 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'phpDocumentor\\Reflection\\' => 
         array (
             0 => __DIR__ . '/..' . '/phpdocumentor/reflection-common/src',
-            1 => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src',
-            2 => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src',
+            1 => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src',
+            2 => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src',
         ),
         'Zizaco\\Entrust\\' => 
         array (
@@ -4322,10 +4322,10 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a::$classMap;
 
         }, null, ClassLoader::class);
     }

From fb944428a5c3cbebe81e4c9189a3d20a18e5570b Mon Sep 17 00:00:00 2001
From: Too <sengweitoo@gmail.com>
Date: Thu, 14 Jun 2018 23:46:39 +0800
Subject: [PATCH 09/12] fix conflit

---
 app/Http/Controllers/BookingController.php |   4 +-
 vendor/composer/autoload_classmap.php      | 134 ++++++++++-------
 vendor/composer/autoload_static.php        | 160 ++++++++++++---------
 3 files changed, 177 insertions(+), 121 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 90558bc7..5d2ddf1a 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -108,12 +108,10 @@ class BookingController extends Controller
 
         return response()->json($booking, 201);
     }
-
-
+    
     public function update(Request $request, $book_id)
     {
             $book_id = Booking::find($book_id);
-
             $book_id->account_name = $request->input('account_name');
             $book_id->account_num = $request->input('account_num');
             $book_id->bank_name = $request->input('bank_name');
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index f18da5fc..3ce074de 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -1103,9 +1103,6 @@ return array(
     'Faker\\ValidGenerator' => $vendorDir . '/fzaninotto/faker/src/Faker/ValidGenerator.php',
     'Fideloper\\Proxy\\TrustProxies' => $vendorDir . '/fideloper/proxy/src/TrustProxies.php',
     'Fideloper\\Proxy\\TrustedProxyServiceProvider' => $vendorDir . '/fideloper/proxy/src/TrustedProxyServiceProvider.php',
-    'File_Iterator' => $vendorDir . '/phpunit/php-file-iterator/src/Iterator.php',
-    'File_Iterator_Facade' => $vendorDir . '/phpunit/php-file-iterator/src/Facade.php',
-    'File_Iterator_Factory' => $vendorDir . '/phpunit/php-file-iterator/src/Factory.php',
     'GuzzleHttp\\Client' => $vendorDir . '/guzzlehttp/guzzle/src/Client.php',
     'GuzzleHttp\\ClientInterface' => $vendorDir . '/guzzlehttp/guzzle/src/ClientInterface.php',
     'GuzzleHttp\\Cookie\\CookieJar' => $vendorDir . '/guzzlehttp/guzzle/src/Cookie/CookieJar.php',
@@ -1609,6 +1606,7 @@ return array(
     'Illuminate\\Foundation\\Console\\MailMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/MailMakeCommand.php',
     'Illuminate\\Foundation\\Console\\ModelMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/ModelMakeCommand.php',
     'Illuminate\\Foundation\\Console\\NotificationMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/NotificationMakeCommand.php',
+    'Illuminate\\Foundation\\Console\\ObserverMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/ObserverMakeCommand.php',
     'Illuminate\\Foundation\\Console\\PackageDiscoverCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/PackageDiscoverCommand.php',
     'Illuminate\\Foundation\\Console\\PolicyMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/PolicyMakeCommand.php',
     'Illuminate\\Foundation\\Console\\PresetCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/PresetCommand.php',
@@ -2571,50 +2569,50 @@ return array(
     'PHPUnit\\Framework\\IncompleteTestError' => $vendorDir . '/phpunit/phpunit/src/Framework/IncompleteTestError.php',
     'PHPUnit\\Framework\\InvalidCoversTargetException' => $vendorDir . '/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php',
     'PHPUnit\\Framework\\MissingCoversAnnotationException' => $vendorDir . '/phpunit/phpunit/src/Framework/MissingCoversAnnotationException.php',
-    'PHPUnit\\Framework\\MockObject\\BadMethodCallException' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Exception/BadMethodCallException.php',
-    'PHPUnit\\Framework\\MockObject\\Builder\\Identity' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Builder/Identity.php',
-    'PHPUnit\\Framework\\MockObject\\Builder\\InvocationMocker' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Builder/InvocationMocker.php',
-    'PHPUnit\\Framework\\MockObject\\Builder\\Match' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Builder/Match.php',
-    'PHPUnit\\Framework\\MockObject\\Builder\\MethodNameMatch' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Builder/MethodNameMatch.php',
-    'PHPUnit\\Framework\\MockObject\\Builder\\NamespaceMatch' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Builder/NamespaceMatch.php',
-    'PHPUnit\\Framework\\MockObject\\Builder\\ParametersMatch' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Builder/ParametersMatch.php',
-    'PHPUnit\\Framework\\MockObject\\Builder\\Stub' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Builder/Stub.php',
-    'PHPUnit\\Framework\\MockObject\\Exception' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Exception/Exception.php',
-    'PHPUnit\\Framework\\MockObject\\Generator' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Generator.php',
-    'PHPUnit\\Framework\\MockObject\\Invocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Invocation/Invocation.php',
-    'PHPUnit\\Framework\\MockObject\\InvocationMocker' => $vendorDir . '/phpunit/phpunit-mock-objects/src/InvocationMocker.php',
-    'PHPUnit\\Framework\\MockObject\\Invocation\\ObjectInvocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Invocation/ObjectInvocation.php',
-    'PHPUnit\\Framework\\MockObject\\Invocation\\StaticInvocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Invocation/StaticInvocation.php',
-    'PHPUnit\\Framework\\MockObject\\Invokable' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Invokable.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\AnyInvokedCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/AnyInvokedCount.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\AnyParameters' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/AnyParameters.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\ConsecutiveParameters' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/ConsecutiveParameters.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\DeferredError' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/DeferredError.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\Invocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/Invocation.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtIndex' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtIndex.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtLeastCount.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastOnce' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtLeastOnce.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtMostCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtMostCount.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedCount.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedRecorder' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedRecorder.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\MethodName' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/MethodName.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\Parameters' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/Parameters.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\StatelessInvocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/StatelessInvocation.php',
-    'PHPUnit\\Framework\\MockObject\\MockBuilder' => $vendorDir . '/phpunit/phpunit-mock-objects/src/MockBuilder.php',
-    'PHPUnit\\Framework\\MockObject\\MockObject' => $vendorDir . '/phpunit/phpunit-mock-objects/src/ForwardCompatibility/MockObject.php',
-    'PHPUnit\\Framework\\MockObject\\RuntimeException' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Exception/RuntimeException.php',
-    'PHPUnit\\Framework\\MockObject\\Stub' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\ConsecutiveCalls' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/ConsecutiveCalls.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\Exception' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/Exception.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\MatcherCollection' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/MatcherCollection.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnArgument' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/ReturnArgument.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnCallback' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/ReturnCallback.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnReference' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/ReturnReference.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnSelf' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/ReturnSelf.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnStub' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/ReturnStub.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnValueMap' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/ReturnValueMap.php',
-    'PHPUnit\\Framework\\MockObject\\Verifiable' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Verifiable.php',
+    'PHPUnit\\Framework\\MockObject\\BadMethodCallException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Exception/BadMethodCallException.php',
+    'PHPUnit\\Framework\\MockObject\\Builder\\Identity' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Builder/Identity.php',
+    'PHPUnit\\Framework\\MockObject\\Builder\\InvocationMocker' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Builder/InvocationMocker.php',
+    'PHPUnit\\Framework\\MockObject\\Builder\\Match' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Builder/Match.php',
+    'PHPUnit\\Framework\\MockObject\\Builder\\MethodNameMatch' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Builder/MethodNameMatch.php',
+    'PHPUnit\\Framework\\MockObject\\Builder\\NamespaceMatch' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Builder/NamespaceMatch.php',
+    'PHPUnit\\Framework\\MockObject\\Builder\\ParametersMatch' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Builder/ParametersMatch.php',
+    'PHPUnit\\Framework\\MockObject\\Builder\\Stub' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Builder/Stub.php',
+    'PHPUnit\\Framework\\MockObject\\Exception' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Exception/Exception.php',
+    'PHPUnit\\Framework\\MockObject\\Generator' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Generator.php',
+    'PHPUnit\\Framework\\MockObject\\Invocation' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Invocation/Invocation.php',
+    'PHPUnit\\Framework\\MockObject\\InvocationMocker' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/InvocationMocker.php',
+    'PHPUnit\\Framework\\MockObject\\Invocation\\ObjectInvocation' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Invocation/ObjectInvocation.php',
+    'PHPUnit\\Framework\\MockObject\\Invocation\\StaticInvocation' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Invocation/StaticInvocation.php',
+    'PHPUnit\\Framework\\MockObject\\Invokable' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Invokable.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\AnyInvokedCount' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/AnyInvokedCount.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\AnyParameters' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/AnyParameters.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\ConsecutiveParameters' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/ConsecutiveParameters.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\DeferredError' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/DeferredError.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\Invocation' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/Invocation.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtIndex' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtIndex.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastCount' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtLeastCount.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastOnce' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtLeastOnce.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtMostCount' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtMostCount.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedCount' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedCount.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedRecorder' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedRecorder.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\MethodName' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/MethodName.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\Parameters' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/Parameters.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\StatelessInvocation' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/StatelessInvocation.php',
+    'PHPUnit\\Framework\\MockObject\\MockBuilder' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/MockBuilder.php',
+    'PHPUnit\\Framework\\MockObject\\MockObject' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/ForwardCompatibility/MockObject.php',
+    'PHPUnit\\Framework\\MockObject\\RuntimeException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Exception/RuntimeException.php',
+    'PHPUnit\\Framework\\MockObject\\Stub' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\ConsecutiveCalls' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/ConsecutiveCalls.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\Exception' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/Exception.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\MatcherCollection' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/MatcherCollection.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnArgument' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnArgument.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnCallback' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnCallback.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnReference' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnReference.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnSelf' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnSelf.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnStub' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnStub.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnValueMap' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnValueMap.php',
+    'PHPUnit\\Framework\\MockObject\\Verifiable' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Verifiable.php',
     'PHPUnit\\Framework\\OutputError' => $vendorDir . '/phpunit/phpunit/src/Framework/OutputError.php',
     'PHPUnit\\Framework\\RiskyTest' => $vendorDir . '/phpunit/phpunit/src/Framework/RiskyTest.php',
     'PHPUnit\\Framework\\RiskyTestError' => $vendorDir . '/phpunit/phpunit/src/Framework/RiskyTestError.php',
@@ -2658,6 +2656,7 @@ return array(
     'PHPUnit\\Runner\\TestHook' => $vendorDir . '/phpunit/phpunit/src/Runner/Hook/TestHook.php',
     'PHPUnit\\Runner\\TestListenerAdapter' => $vendorDir . '/phpunit/phpunit/src/Runner/Hook/TestListenerAdapter.php',
     'PHPUnit\\Runner\\TestSuiteLoader' => $vendorDir . '/phpunit/phpunit/src/Runner/TestSuiteLoader.php',
+    'PHPUnit\\Runner\\TestSuiteSorter' => $vendorDir . '/phpunit/phpunit/src/Runner/TestSuiteSorter.php',
     'PHPUnit\\Runner\\Version' => $vendorDir . '/phpunit/phpunit/src/Runner/Version.php',
     'PHPUnit\\TextUI\\Command' => $vendorDir . '/phpunit/phpunit/src/TextUI/Command.php',
     'PHPUnit\\TextUI\\ResultPrinter' => $vendorDir . '/phpunit/phpunit/src/TextUI/ResultPrinter.php',
@@ -2692,7 +2691,7 @@ return array(
     'PHPUnit\\Util\\Type' => $vendorDir . '/phpunit/phpunit/src/Util/Type.php',
     'PHPUnit\\Util\\Xml' => $vendorDir . '/phpunit/phpunit/src/Util/Xml.php',
     'PHPUnit\\Util\\XmlTestListRenderer' => $vendorDir . '/phpunit/phpunit/src/Util/XmlTestListRenderer.php',
-    'PHPUnit_Framework_MockObject_MockObject' => $vendorDir . '/phpunit/phpunit-mock-objects/src/MockObject.php',
+    'PHPUnit_Framework_MockObject_MockObject' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/MockObject.php',
     'PHP_Token' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
     'PHP_TokenWithScope' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
     'PHP_TokenWithScopeAndVisibility' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
@@ -3270,6 +3269,7 @@ return array(
     'Psy\\CodeCleaner\\InstanceOfPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/InstanceOfPass.php',
     'Psy\\CodeCleaner\\LeavePsyshAlonePass' => $vendorDir . '/psy/psysh/src/CodeCleaner/LeavePsyshAlonePass.php',
     'Psy\\CodeCleaner\\LegacyEmptyPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/LegacyEmptyPass.php',
+    'Psy\\CodeCleaner\\ListPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/ListPass.php',
     'Psy\\CodeCleaner\\LoopContextPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/LoopContextPass.php',
     'Psy\\CodeCleaner\\MagicConstantsPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/MagicConstantsPass.php',
     'Psy\\CodeCleaner\\NamespaceAwarePass' => $vendorDir . '/psy/psysh/src/CodeCleaner/NamespaceAwarePass.php',
@@ -3311,10 +3311,10 @@ return array(
     'Psy\\Command\\SudoCommand' => $vendorDir . '/psy/psysh/src/Command/SudoCommand.php',
     'Psy\\Command\\ThrowUpCommand' => $vendorDir . '/psy/psysh/src/Command/ThrowUpCommand.php',
     'Psy\\Command\\TimeitCommand' => $vendorDir . '/psy/psysh/src/Command/TimeitCommand.php',
+    'Psy\\Command\\TimeitCommand\\TimeitVisitor' => $vendorDir . '/psy/psysh/src/Command/TimeitCommand/TimeitVisitor.php',
     'Psy\\Command\\TraceCommand' => $vendorDir . '/psy/psysh/src/Command/TraceCommand.php',
     'Psy\\Command\\WhereamiCommand' => $vendorDir . '/psy/psysh/src/Command/WhereamiCommand.php',
     'Psy\\Command\\WtfCommand' => $vendorDir . '/psy/psysh/src/Command/WtfCommand.php',
-    'Psy\\Compiler' => $vendorDir . '/psy/psysh/src/Compiler.php',
     'Psy\\ConfigPaths' => $vendorDir . '/psy/psysh/src/ConfigPaths.php',
     'Psy\\Configuration' => $vendorDir . '/psy/psysh/src/Configuration.php',
     'Psy\\ConsoleColorFactory' => $vendorDir . '/psy/psysh/src/ConsoleColorFactory.php',
@@ -3331,6 +3331,7 @@ return array(
     'Psy\\Exception\\TypeErrorException' => $vendorDir . '/psy/psysh/src/Exception/TypeErrorException.php',
     'Psy\\ExecutionClosure' => $vendorDir . '/psy/psysh/src/ExecutionClosure.php',
     'Psy\\ExecutionLoop' => $vendorDir . '/psy/psysh/src/ExecutionLoop.php',
+    'Psy\\ExecutionLoopClosure' => $vendorDir . '/psy/psysh/src/ExecutionLoopClosure.php',
     'Psy\\ExecutionLoop\\AbstractListener' => $vendorDir . '/psy/psysh/src/ExecutionLoop/AbstractListener.php',
     'Psy\\ExecutionLoop\\Listener' => $vendorDir . '/psy/psysh/src/ExecutionLoop/Listener.php',
     'Psy\\ExecutionLoop\\ProcessForker' => $vendorDir . '/psy/psysh/src/ExecutionLoop/ProcessForker.php',
@@ -3353,7 +3354,9 @@ return array(
     'Psy\\Readline\\Libedit' => $vendorDir . '/psy/psysh/src/Readline/Libedit.php',
     'Psy\\Readline\\Readline' => $vendorDir . '/psy/psysh/src/Readline/Readline.php',
     'Psy\\Readline\\Transient' => $vendorDir . '/psy/psysh/src/Readline/Transient.php',
+    'Psy\\Reflection\\ReflectionClassConstant' => $vendorDir . '/psy/psysh/src/Reflection/ReflectionClassConstant.php',
     'Psy\\Reflection\\ReflectionConstant' => $vendorDir . '/psy/psysh/src/Reflection/ReflectionConstant.php',
+    'Psy\\Reflection\\ReflectionConstant_' => $vendorDir . '/psy/psysh/src/Reflection/ReflectionConstant_.php',
     'Psy\\Reflection\\ReflectionLanguageConstruct' => $vendorDir . '/psy/psysh/src/Reflection/ReflectionLanguageConstruct.php',
     'Psy\\Reflection\\ReflectionLanguageConstructParameter' => $vendorDir . '/psy/psysh/src/Reflection/ReflectionLanguageConstructParameter.php',
     'Psy\\Shell' => $vendorDir . '/psy/psysh/src/Shell.php',
@@ -3514,6 +3517,9 @@ return array(
     'SebastianBergmann\\Environment\\OperatingSystem' => $vendorDir . '/sebastian/environment/src/OperatingSystem.php',
     'SebastianBergmann\\Environment\\Runtime' => $vendorDir . '/sebastian/environment/src/Runtime.php',
     'SebastianBergmann\\Exporter\\Exporter' => $vendorDir . '/sebastian/exporter/src/Exporter.php',
+    'SebastianBergmann\\FileIterator\\Facade' => $vendorDir . '/phpunit/php-file-iterator/src/Facade.php',
+    'SebastianBergmann\\FileIterator\\Factory' => $vendorDir . '/phpunit/php-file-iterator/src/Factory.php',
+    'SebastianBergmann\\FileIterator\\Iterator' => $vendorDir . '/phpunit/php-file-iterator/src/Iterator.php',
     'SebastianBergmann\\GlobalState\\Blacklist' => $vendorDir . '/sebastian/global-state/src/Blacklist.php',
     'SebastianBergmann\\GlobalState\\CodeExporter' => $vendorDir . '/sebastian/global-state/src/CodeExporter.php',
     'SebastianBergmann\\GlobalState\\Exception' => $vendorDir . '/sebastian/global-state/src/exceptions/Exception.php',
@@ -3561,6 +3567,7 @@ return array(
     'Symfony\\Component\\Console\\Exception\\InvalidArgumentException' => $vendorDir . '/symfony/console/Exception/InvalidArgumentException.php',
     'Symfony\\Component\\Console\\Exception\\InvalidOptionException' => $vendorDir . '/symfony/console/Exception/InvalidOptionException.php',
     'Symfony\\Component\\Console\\Exception\\LogicException' => $vendorDir . '/symfony/console/Exception/LogicException.php',
+    'Symfony\\Component\\Console\\Exception\\NamespaceNotFoundException' => $vendorDir . '/symfony/console/Exception/NamespaceNotFoundException.php',
     'Symfony\\Component\\Console\\Exception\\RuntimeException' => $vendorDir . '/symfony/console/Exception/RuntimeException.php',
     'Symfony\\Component\\Console\\Formatter\\OutputFormatter' => $vendorDir . '/symfony/console/Formatter/OutputFormatter.php',
     'Symfony\\Component\\Console\\Formatter\\OutputFormatterInterface' => $vendorDir . '/symfony/console/Formatter/OutputFormatterInterface.php',
@@ -3581,6 +3588,7 @@ return array(
     'Symfony\\Component\\Console\\Helper\\SymfonyQuestionHelper' => $vendorDir . '/symfony/console/Helper/SymfonyQuestionHelper.php',
     'Symfony\\Component\\Console\\Helper\\Table' => $vendorDir . '/symfony/console/Helper/Table.php',
     'Symfony\\Component\\Console\\Helper\\TableCell' => $vendorDir . '/symfony/console/Helper/TableCell.php',
+    'Symfony\\Component\\Console\\Helper\\TableRows' => $vendorDir . '/symfony/console/Helper/TableRows.php',
     'Symfony\\Component\\Console\\Helper\\TableSeparator' => $vendorDir . '/symfony/console/Helper/TableSeparator.php',
     'Symfony\\Component\\Console\\Helper\\TableStyle' => $vendorDir . '/symfony/console/Helper/TableStyle.php',
     'Symfony\\Component\\Console\\Input\\ArgvInput' => $vendorDir . '/symfony/console/Input/ArgvInput.php',
@@ -3597,6 +3605,7 @@ return array(
     'Symfony\\Component\\Console\\Output\\BufferedOutput' => $vendorDir . '/symfony/console/Output/BufferedOutput.php',
     'Symfony\\Component\\Console\\Output\\ConsoleOutput' => $vendorDir . '/symfony/console/Output/ConsoleOutput.php',
     'Symfony\\Component\\Console\\Output\\ConsoleOutputInterface' => $vendorDir . '/symfony/console/Output/ConsoleOutputInterface.php',
+    'Symfony\\Component\\Console\\Output\\ConsoleSectionOutput' => $vendorDir . '/symfony/console/Output/ConsoleSectionOutput.php',
     'Symfony\\Component\\Console\\Output\\NullOutput' => $vendorDir . '/symfony/console/Output/NullOutput.php',
     'Symfony\\Component\\Console\\Output\\Output' => $vendorDir . '/symfony/console/Output/Output.php',
     'Symfony\\Component\\Console\\Output\\OutputInterface' => $vendorDir . '/symfony/console/Output/OutputInterface.php',
@@ -3610,6 +3619,7 @@ return array(
     'Symfony\\Component\\Console\\Terminal' => $vendorDir . '/symfony/console/Terminal.php',
     'Symfony\\Component\\Console\\Tester\\ApplicationTester' => $vendorDir . '/symfony/console/Tester/ApplicationTester.php',
     'Symfony\\Component\\Console\\Tester\\CommandTester' => $vendorDir . '/symfony/console/Tester/CommandTester.php',
+    'Symfony\\Component\\Console\\Tester\\TesterTrait' => $vendorDir . '/symfony/console/Tester/TesterTrait.php',
     'Symfony\\Component\\CssSelector\\CssSelectorConverter' => $vendorDir . '/symfony/css-selector/CssSelectorConverter.php',
     'Symfony\\Component\\CssSelector\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/css-selector/Exception/ExceptionInterface.php',
     'Symfony\\Component\\CssSelector\\Exception\\ExpressionErrorException' => $vendorDir . '/symfony/css-selector/Exception/ExpressionErrorException.php',
@@ -3716,8 +3726,15 @@ return array(
     'Symfony\\Component\\HttpFoundation\\ExpressionRequestMatcher' => $vendorDir . '/symfony/http-foundation/ExpressionRequestMatcher.php',
     'Symfony\\Component\\HttpFoundation\\FileBag' => $vendorDir . '/symfony/http-foundation/FileBag.php',
     'Symfony\\Component\\HttpFoundation\\File\\Exception\\AccessDeniedException' => $vendorDir . '/symfony/http-foundation/File/Exception/AccessDeniedException.php',
+    'Symfony\\Component\\HttpFoundation\\File\\Exception\\CannotWriteFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/CannotWriteFileException.php',
+    'Symfony\\Component\\HttpFoundation\\File\\Exception\\ExtensionFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/ExtensionFileException.php',
     'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileException' => $vendorDir . '/symfony/http-foundation/File/Exception/FileException.php',
     'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileNotFoundException' => $vendorDir . '/symfony/http-foundation/File/Exception/FileNotFoundException.php',
+    'Symfony\\Component\\HttpFoundation\\File\\Exception\\FormSizeFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/FormSizeFileException.php',
+    'Symfony\\Component\\HttpFoundation\\File\\Exception\\IniSizeFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/IniSizeFileException.php',
+    'Symfony\\Component\\HttpFoundation\\File\\Exception\\NoFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/NoFileException.php',
+    'Symfony\\Component\\HttpFoundation\\File\\Exception\\NoTmpDirFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/NoTmpDirFileException.php',
+    'Symfony\\Component\\HttpFoundation\\File\\Exception\\PartialFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/PartialFileException.php',
     'Symfony\\Component\\HttpFoundation\\File\\Exception\\UnexpectedTypeException' => $vendorDir . '/symfony/http-foundation/File/Exception/UnexpectedTypeException.php',
     'Symfony\\Component\\HttpFoundation\\File\\Exception\\UploadException' => $vendorDir . '/symfony/http-foundation/File/Exception/UploadException.php',
     'Symfony\\Component\\HttpFoundation\\File\\File' => $vendorDir . '/symfony/http-foundation/File/File.php',
@@ -3731,6 +3748,7 @@ return array(
     'Symfony\\Component\\HttpFoundation\\File\\Stream' => $vendorDir . '/symfony/http-foundation/File/Stream.php',
     'Symfony\\Component\\HttpFoundation\\File\\UploadedFile' => $vendorDir . '/symfony/http-foundation/File/UploadedFile.php',
     'Symfony\\Component\\HttpFoundation\\HeaderBag' => $vendorDir . '/symfony/http-foundation/HeaderBag.php',
+    'Symfony\\Component\\HttpFoundation\\HeaderUtils' => $vendorDir . '/symfony/http-foundation/HeaderUtils.php',
     'Symfony\\Component\\HttpFoundation\\IpUtils' => $vendorDir . '/symfony/http-foundation/IpUtils.php',
     'Symfony\\Component\\HttpFoundation\\JsonResponse' => $vendorDir . '/symfony/http-foundation/JsonResponse.php',
     'Symfony\\Component\\HttpFoundation\\ParameterBag' => $vendorDir . '/symfony/http-foundation/ParameterBag.php',
@@ -3754,10 +3772,12 @@ return array(
     'Symfony\\Component\\HttpFoundation\\Session\\SessionInterface' => $vendorDir . '/symfony/http-foundation/Session/SessionInterface.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\AbstractSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MemcachedSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php',
+    'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MigratingSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/MigratingSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MongoDbSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NullSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/NullSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\PdoSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php',
+    'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\RedisSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\StrictSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/StrictSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MetadataBag' => $vendorDir . '/symfony/http-foundation/Session/Storage/MetadataBag.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MockArraySessionStorage' => $vendorDir . '/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php',
@@ -3789,6 +3809,7 @@ return array(
     'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\RequestValueResolver' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentResolver/RequestValueResolver.php',
     'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\ServiceValueResolver' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentResolver/ServiceValueResolver.php',
     'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\SessionValueResolver' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentResolver/SessionValueResolver.php',
+    'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\TraceableValueResolver' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentResolver/TraceableValueResolver.php',
     'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\VariadicValueResolver' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentResolver/VariadicValueResolver.php',
     'Symfony\\Component\\HttpKernel\\Controller\\ArgumentValueResolverInterface' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentValueResolverInterface.php',
     'Symfony\\Component\\HttpKernel\\Controller\\ContainerControllerResolver' => $vendorDir . '/symfony/http-kernel/Controller/ContainerControllerResolver.php',
@@ -3903,6 +3924,7 @@ return array(
     'Symfony\\Component\\Process\\Exception\\InvalidArgumentException' => $vendorDir . '/symfony/process/Exception/InvalidArgumentException.php',
     'Symfony\\Component\\Process\\Exception\\LogicException' => $vendorDir . '/symfony/process/Exception/LogicException.php',
     'Symfony\\Component\\Process\\Exception\\ProcessFailedException' => $vendorDir . '/symfony/process/Exception/ProcessFailedException.php',
+    'Symfony\\Component\\Process\\Exception\\ProcessSignaledException' => $vendorDir . '/symfony/process/Exception/ProcessSignaledException.php',
     'Symfony\\Component\\Process\\Exception\\ProcessTimedOutException' => $vendorDir . '/symfony/process/Exception/ProcessTimedOutException.php',
     'Symfony\\Component\\Process\\Exception\\RuntimeException' => $vendorDir . '/symfony/process/Exception/RuntimeException.php',
     'Symfony\\Component\\Process\\ExecutableFinder' => $vendorDir . '/symfony/process/ExecutableFinder.php',
@@ -3949,8 +3971,6 @@ return array(
     'Symfony\\Component\\Routing\\Loader\\ProtectedPhpFileLoader' => $vendorDir . '/symfony/routing/Loader/PhpFileLoader.php',
     'Symfony\\Component\\Routing\\Loader\\XmlFileLoader' => $vendorDir . '/symfony/routing/Loader/XmlFileLoader.php',
     'Symfony\\Component\\Routing\\Loader\\YamlFileLoader' => $vendorDir . '/symfony/routing/Loader/YamlFileLoader.php',
-    'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperCollection' => $vendorDir . '/symfony/routing/Matcher/Dumper/DumperCollection.php',
-    'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperRoute' => $vendorDir . '/symfony/routing/Matcher/Dumper/DumperRoute.php',
     'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumper' => $vendorDir . '/symfony/routing/Matcher/Dumper/MatcherDumper.php',
     'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumperInterface' => $vendorDir . '/symfony/routing/Matcher/Dumper/MatcherDumperInterface.php',
     'Symfony\\Component\\Routing\\Matcher\\Dumper\\PhpMatcherDumper' => $vendorDir . '/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php',
@@ -4049,6 +4069,7 @@ return array(
     'Symfony\\Component\\VarDumper\\Caster\\EnumStub' => $vendorDir . '/symfony/var-dumper/Caster/EnumStub.php',
     'Symfony\\Component\\VarDumper\\Caster\\ExceptionCaster' => $vendorDir . '/symfony/var-dumper/Caster/ExceptionCaster.php',
     'Symfony\\Component\\VarDumper\\Caster\\FrameStub' => $vendorDir . '/symfony/var-dumper/Caster/FrameStub.php',
+    'Symfony\\Component\\VarDumper\\Caster\\GmpCaster' => $vendorDir . '/symfony/var-dumper/Caster/GmpCaster.php',
     'Symfony\\Component\\VarDumper\\Caster\\LinkStub' => $vendorDir . '/symfony/var-dumper/Caster/LinkStub.php',
     'Symfony\\Component\\VarDumper\\Caster\\PdoCaster' => $vendorDir . '/symfony/var-dumper/Caster/PdoCaster.php',
     'Symfony\\Component\\VarDumper\\Caster\\PgSqlCaster' => $vendorDir . '/symfony/var-dumper/Caster/PgSqlCaster.php',
@@ -4068,13 +4089,24 @@ return array(
     'Symfony\\Component\\VarDumper\\Cloner\\DumperInterface' => $vendorDir . '/symfony/var-dumper/Cloner/DumperInterface.php',
     'Symfony\\Component\\VarDumper\\Cloner\\Stub' => $vendorDir . '/symfony/var-dumper/Cloner/Stub.php',
     'Symfony\\Component\\VarDumper\\Cloner\\VarCloner' => $vendorDir . '/symfony/var-dumper/Cloner/VarCloner.php',
+    'Symfony\\Component\\VarDumper\\Command\\Descriptor\\CliDescriptor' => $vendorDir . '/symfony/var-dumper/Command/Descriptor/CliDescriptor.php',
+    'Symfony\\Component\\VarDumper\\Command\\Descriptor\\DumpDescriptorInterface' => $vendorDir . '/symfony/var-dumper/Command/Descriptor/DumpDescriptorInterface.php',
+    'Symfony\\Component\\VarDumper\\Command\\Descriptor\\HtmlDescriptor' => $vendorDir . '/symfony/var-dumper/Command/Descriptor/HtmlDescriptor.php',
+    'Symfony\\Component\\VarDumper\\Command\\ServerDumpCommand' => $vendorDir . '/symfony/var-dumper/Command/ServerDumpCommand.php',
     'Symfony\\Component\\VarDumper\\Dumper\\AbstractDumper' => $vendorDir . '/symfony/var-dumper/Dumper/AbstractDumper.php',
     'Symfony\\Component\\VarDumper\\Dumper\\CliDumper' => $vendorDir . '/symfony/var-dumper/Dumper/CliDumper.php',
+    'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\CliContextProvider' => $vendorDir . '/symfony/var-dumper/Dumper/ContextProvider/CliContextProvider.php',
+    'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\ContextProviderInterface' => $vendorDir . '/symfony/var-dumper/Dumper/ContextProvider/ContextProviderInterface.php',
+    'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\RequestContextProvider' => $vendorDir . '/symfony/var-dumper/Dumper/ContextProvider/RequestContextProvider.php',
+    'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\SourceContextProvider' => $vendorDir . '/symfony/var-dumper/Dumper/ContextProvider/SourceContextProvider.php',
     'Symfony\\Component\\VarDumper\\Dumper\\DataDumperInterface' => $vendorDir . '/symfony/var-dumper/Dumper/DataDumperInterface.php',
     'Symfony\\Component\\VarDumper\\Dumper\\HtmlDumper' => $vendorDir . '/symfony/var-dumper/Dumper/HtmlDumper.php',
+    'Symfony\\Component\\VarDumper\\Dumper\\ServerDumper' => $vendorDir . '/symfony/var-dumper/Dumper/ServerDumper.php',
     'Symfony\\Component\\VarDumper\\Exception\\ThrowingCasterException' => $vendorDir . '/symfony/var-dumper/Exception/ThrowingCasterException.php',
+    'Symfony\\Component\\VarDumper\\Server\\DumpServer' => $vendorDir . '/symfony/var-dumper/Server/DumpServer.php',
     'Symfony\\Component\\VarDumper\\Test\\VarDumperTestTrait' => $vendorDir . '/symfony/var-dumper/Test/VarDumperTestTrait.php',
     'Symfony\\Component\\VarDumper\\VarDumper' => $vendorDir . '/symfony/var-dumper/VarDumper.php',
+    'Symfony\\Polyfill\\Ctype\\Ctype' => $vendorDir . '/symfony/polyfill-ctype/Ctype.php',
     'Symfony\\Polyfill\\Mbstring\\Mbstring' => $vendorDir . '/symfony/polyfill-mbstring/Mbstring.php',
     'Symfony\\Polyfill\\Php56\\Php56' => $vendorDir . '/symfony/polyfill-php56/Php56.php',
     'Symfony\\Polyfill\\Php72\\Php72' => $vendorDir . '/symfony/polyfill-php72/Php72.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index d7780aad..f14d3ae6 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -4,27 +4,23 @@
 
 namespace Composer\Autoload;
 
-<<<<<<< HEAD
 class ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a
-=======
-class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
->>>>>>> c5a509e7b16025d96c70871ddb865b075cf1e035
 {
     public static $files = array (
         '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
         '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
         '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php',
         '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php',
-        '2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php',
+        '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
         'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php',
+        '2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php',
         'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php',
-        '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php',
         '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
+        '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php',
         'bd9634f2d41831496de0d3dfe4c94881' => __DIR__ . '/..' . '/symfony/polyfill-php56/bootstrap.php',
         'f0906e6318348a765ffb6eb24e0d0938' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/helpers.php',
         '58571171fd5812e6e447dce228f52f4d' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/helpers.php',
         '801c31d8ed748cfa537fa45402288c95' => __DIR__ . '/..' . '/psy/psysh/src/functions.php',
-        '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
         'f18cc91337d49233e5754e93f3ed9ec3' => __DIR__ . '/..' . '/laravelcollective/html/src/helpers.php',
     );
 
@@ -58,6 +54,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
             'Symfony\\Polyfill\\Php72\\' => 23,
             'Symfony\\Polyfill\\Php56\\' => 23,
             'Symfony\\Polyfill\\Mbstring\\' => 26,
+            'Symfony\\Polyfill\\Ctype\\' => 23,
             'Symfony\\Component\\VarDumper\\' => 28,
             'Symfony\\Component\\Translation\\' => 30,
             'Symfony\\Component\\Routing\\' => 26,
@@ -148,8 +145,8 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'phpDocumentor\\Reflection\\' => 
         array (
             0 => __DIR__ . '/..' . '/phpdocumentor/reflection-common/src',
-            1 => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src',
-            2 => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src',
+            1 => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src',
+            2 => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src',
         ),
         'Zizaco\\Entrust\\' => 
         array (
@@ -195,6 +192,10 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         array (
             0 => __DIR__ . '/..' . '/symfony/polyfill-mbstring',
         ),
+        'Symfony\\Polyfill\\Ctype\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/polyfill-ctype',
+        ),
         'Symfony\\Component\\VarDumper\\' => 
         array (
             0 => __DIR__ . '/..' . '/symfony/var-dumper',
@@ -1530,9 +1531,6 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Faker\\ValidGenerator' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/ValidGenerator.php',
         'Fideloper\\Proxy\\TrustProxies' => __DIR__ . '/..' . '/fideloper/proxy/src/TrustProxies.php',
         'Fideloper\\Proxy\\TrustedProxyServiceProvider' => __DIR__ . '/..' . '/fideloper/proxy/src/TrustedProxyServiceProvider.php',
-        'File_Iterator' => __DIR__ . '/..' . '/phpunit/php-file-iterator/src/Iterator.php',
-        'File_Iterator_Facade' => __DIR__ . '/..' . '/phpunit/php-file-iterator/src/Facade.php',
-        'File_Iterator_Factory' => __DIR__ . '/..' . '/phpunit/php-file-iterator/src/Factory.php',
         'GuzzleHttp\\Client' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Client.php',
         'GuzzleHttp\\ClientInterface' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/ClientInterface.php',
         'GuzzleHttp\\Cookie\\CookieJar' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Cookie/CookieJar.php',
@@ -2036,6 +2034,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Illuminate\\Foundation\\Console\\MailMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/MailMakeCommand.php',
         'Illuminate\\Foundation\\Console\\ModelMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ModelMakeCommand.php',
         'Illuminate\\Foundation\\Console\\NotificationMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/NotificationMakeCommand.php',
+        'Illuminate\\Foundation\\Console\\ObserverMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ObserverMakeCommand.php',
         'Illuminate\\Foundation\\Console\\PackageDiscoverCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/PackageDiscoverCommand.php',
         'Illuminate\\Foundation\\Console\\PolicyMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/PolicyMakeCommand.php',
         'Illuminate\\Foundation\\Console\\PresetCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/PresetCommand.php',
@@ -2998,50 +2997,50 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'PHPUnit\\Framework\\IncompleteTestError' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/IncompleteTestError.php',
         'PHPUnit\\Framework\\InvalidCoversTargetException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php',
         'PHPUnit\\Framework\\MissingCoversAnnotationException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MissingCoversAnnotationException.php',
-        'PHPUnit\\Framework\\MockObject\\BadMethodCallException' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Exception/BadMethodCallException.php',
-        'PHPUnit\\Framework\\MockObject\\Builder\\Identity' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Builder/Identity.php',
-        'PHPUnit\\Framework\\MockObject\\Builder\\InvocationMocker' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Builder/InvocationMocker.php',
-        'PHPUnit\\Framework\\MockObject\\Builder\\Match' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Builder/Match.php',
-        'PHPUnit\\Framework\\MockObject\\Builder\\MethodNameMatch' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Builder/MethodNameMatch.php',
-        'PHPUnit\\Framework\\MockObject\\Builder\\NamespaceMatch' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Builder/NamespaceMatch.php',
-        'PHPUnit\\Framework\\MockObject\\Builder\\ParametersMatch' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Builder/ParametersMatch.php',
-        'PHPUnit\\Framework\\MockObject\\Builder\\Stub' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Builder/Stub.php',
-        'PHPUnit\\Framework\\MockObject\\Exception' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Exception/Exception.php',
-        'PHPUnit\\Framework\\MockObject\\Generator' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Generator.php',
-        'PHPUnit\\Framework\\MockObject\\Invocation' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Invocation/Invocation.php',
-        'PHPUnit\\Framework\\MockObject\\InvocationMocker' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/InvocationMocker.php',
-        'PHPUnit\\Framework\\MockObject\\Invocation\\ObjectInvocation' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Invocation/ObjectInvocation.php',
-        'PHPUnit\\Framework\\MockObject\\Invocation\\StaticInvocation' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Invocation/StaticInvocation.php',
-        'PHPUnit\\Framework\\MockObject\\Invokable' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Invokable.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\AnyInvokedCount' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/AnyInvokedCount.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\AnyParameters' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/AnyParameters.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\ConsecutiveParameters' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/ConsecutiveParameters.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\DeferredError' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/DeferredError.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\Invocation' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/Invocation.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtIndex' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtIndex.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastCount' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtLeastCount.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastOnce' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtLeastOnce.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtMostCount' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtMostCount.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedCount' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedCount.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedRecorder' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedRecorder.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\MethodName' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/MethodName.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\Parameters' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/Parameters.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\StatelessInvocation' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/StatelessInvocation.php',
-        'PHPUnit\\Framework\\MockObject\\MockBuilder' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/MockBuilder.php',
-        'PHPUnit\\Framework\\MockObject\\MockObject' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/ForwardCompatibility/MockObject.php',
-        'PHPUnit\\Framework\\MockObject\\RuntimeException' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Exception/RuntimeException.php',
-        'PHPUnit\\Framework\\MockObject\\Stub' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\ConsecutiveCalls' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/ConsecutiveCalls.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\Exception' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/Exception.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\MatcherCollection' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/MatcherCollection.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnArgument' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/ReturnArgument.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnCallback' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/ReturnCallback.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnReference' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/ReturnReference.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnSelf' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/ReturnSelf.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnStub' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/ReturnStub.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnValueMap' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/ReturnValueMap.php',
-        'PHPUnit\\Framework\\MockObject\\Verifiable' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Verifiable.php',
+        'PHPUnit\\Framework\\MockObject\\BadMethodCallException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Exception/BadMethodCallException.php',
+        'PHPUnit\\Framework\\MockObject\\Builder\\Identity' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Builder/Identity.php',
+        'PHPUnit\\Framework\\MockObject\\Builder\\InvocationMocker' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Builder/InvocationMocker.php',
+        'PHPUnit\\Framework\\MockObject\\Builder\\Match' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Builder/Match.php',
+        'PHPUnit\\Framework\\MockObject\\Builder\\MethodNameMatch' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Builder/MethodNameMatch.php',
+        'PHPUnit\\Framework\\MockObject\\Builder\\NamespaceMatch' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Builder/NamespaceMatch.php',
+        'PHPUnit\\Framework\\MockObject\\Builder\\ParametersMatch' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Builder/ParametersMatch.php',
+        'PHPUnit\\Framework\\MockObject\\Builder\\Stub' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Builder/Stub.php',
+        'PHPUnit\\Framework\\MockObject\\Exception' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Exception/Exception.php',
+        'PHPUnit\\Framework\\MockObject\\Generator' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Generator.php',
+        'PHPUnit\\Framework\\MockObject\\Invocation' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Invocation/Invocation.php',
+        'PHPUnit\\Framework\\MockObject\\InvocationMocker' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/InvocationMocker.php',
+        'PHPUnit\\Framework\\MockObject\\Invocation\\ObjectInvocation' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Invocation/ObjectInvocation.php',
+        'PHPUnit\\Framework\\MockObject\\Invocation\\StaticInvocation' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Invocation/StaticInvocation.php',
+        'PHPUnit\\Framework\\MockObject\\Invokable' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Invokable.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\AnyInvokedCount' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/AnyInvokedCount.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\AnyParameters' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/AnyParameters.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\ConsecutiveParameters' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/ConsecutiveParameters.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\DeferredError' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/DeferredError.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\Invocation' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/Invocation.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtIndex' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtIndex.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastCount' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtLeastCount.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastOnce' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtLeastOnce.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtMostCount' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtMostCount.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedCount' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedCount.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedRecorder' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedRecorder.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\MethodName' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/MethodName.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\Parameters' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/Parameters.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\StatelessInvocation' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/StatelessInvocation.php',
+        'PHPUnit\\Framework\\MockObject\\MockBuilder' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/MockBuilder.php',
+        'PHPUnit\\Framework\\MockObject\\MockObject' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/ForwardCompatibility/MockObject.php',
+        'PHPUnit\\Framework\\MockObject\\RuntimeException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Exception/RuntimeException.php',
+        'PHPUnit\\Framework\\MockObject\\Stub' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\ConsecutiveCalls' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/ConsecutiveCalls.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\Exception' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/Exception.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\MatcherCollection' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/MatcherCollection.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnArgument' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnArgument.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnCallback' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnCallback.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnReference' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnReference.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnSelf' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnSelf.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnStub' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnStub.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnValueMap' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnValueMap.php',
+        'PHPUnit\\Framework\\MockObject\\Verifiable' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Verifiable.php',
         'PHPUnit\\Framework\\OutputError' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/OutputError.php',
         'PHPUnit\\Framework\\RiskyTest' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/RiskyTest.php',
         'PHPUnit\\Framework\\RiskyTestError' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/RiskyTestError.php',
@@ -3085,6 +3084,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'PHPUnit\\Runner\\TestHook' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/Hook/TestHook.php',
         'PHPUnit\\Runner\\TestListenerAdapter' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/Hook/TestListenerAdapter.php',
         'PHPUnit\\Runner\\TestSuiteLoader' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/TestSuiteLoader.php',
+        'PHPUnit\\Runner\\TestSuiteSorter' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/TestSuiteSorter.php',
         'PHPUnit\\Runner\\Version' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/Version.php',
         'PHPUnit\\TextUI\\Command' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/Command.php',
         'PHPUnit\\TextUI\\ResultPrinter' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/ResultPrinter.php',
@@ -3119,7 +3119,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'PHPUnit\\Util\\Type' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Type.php',
         'PHPUnit\\Util\\Xml' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Xml.php',
         'PHPUnit\\Util\\XmlTestListRenderer' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/XmlTestListRenderer.php',
-        'PHPUnit_Framework_MockObject_MockObject' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/MockObject.php',
+        'PHPUnit_Framework_MockObject_MockObject' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/MockObject.php',
         'PHP_Token' => __DIR__ . '/..' . '/phpunit/php-token-stream/src/Token.php',
         'PHP_TokenWithScope' => __DIR__ . '/..' . '/phpunit/php-token-stream/src/Token.php',
         'PHP_TokenWithScopeAndVisibility' => __DIR__ . '/..' . '/phpunit/php-token-stream/src/Token.php',
@@ -3697,6 +3697,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Psy\\CodeCleaner\\InstanceOfPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/InstanceOfPass.php',
         'Psy\\CodeCleaner\\LeavePsyshAlonePass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/LeavePsyshAlonePass.php',
         'Psy\\CodeCleaner\\LegacyEmptyPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/LegacyEmptyPass.php',
+        'Psy\\CodeCleaner\\ListPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/ListPass.php',
         'Psy\\CodeCleaner\\LoopContextPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/LoopContextPass.php',
         'Psy\\CodeCleaner\\MagicConstantsPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/MagicConstantsPass.php',
         'Psy\\CodeCleaner\\NamespaceAwarePass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/NamespaceAwarePass.php',
@@ -3738,10 +3739,10 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Psy\\Command\\SudoCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/SudoCommand.php',
         'Psy\\Command\\ThrowUpCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/ThrowUpCommand.php',
         'Psy\\Command\\TimeitCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/TimeitCommand.php',
+        'Psy\\Command\\TimeitCommand\\TimeitVisitor' => __DIR__ . '/..' . '/psy/psysh/src/Command/TimeitCommand/TimeitVisitor.php',
         'Psy\\Command\\TraceCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/TraceCommand.php',
         'Psy\\Command\\WhereamiCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/WhereamiCommand.php',
         'Psy\\Command\\WtfCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/WtfCommand.php',
-        'Psy\\Compiler' => __DIR__ . '/..' . '/psy/psysh/src/Compiler.php',
         'Psy\\ConfigPaths' => __DIR__ . '/..' . '/psy/psysh/src/ConfigPaths.php',
         'Psy\\Configuration' => __DIR__ . '/..' . '/psy/psysh/src/Configuration.php',
         'Psy\\ConsoleColorFactory' => __DIR__ . '/..' . '/psy/psysh/src/ConsoleColorFactory.php',
@@ -3758,6 +3759,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Psy\\Exception\\TypeErrorException' => __DIR__ . '/..' . '/psy/psysh/src/Exception/TypeErrorException.php',
         'Psy\\ExecutionClosure' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionClosure.php',
         'Psy\\ExecutionLoop' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionLoop.php',
+        'Psy\\ExecutionLoopClosure' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionLoopClosure.php',
         'Psy\\ExecutionLoop\\AbstractListener' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionLoop/AbstractListener.php',
         'Psy\\ExecutionLoop\\Listener' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionLoop/Listener.php',
         'Psy\\ExecutionLoop\\ProcessForker' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionLoop/ProcessForker.php',
@@ -3780,7 +3782,9 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Psy\\Readline\\Libedit' => __DIR__ . '/..' . '/psy/psysh/src/Readline/Libedit.php',
         'Psy\\Readline\\Readline' => __DIR__ . '/..' . '/psy/psysh/src/Readline/Readline.php',
         'Psy\\Readline\\Transient' => __DIR__ . '/..' . '/psy/psysh/src/Readline/Transient.php',
+        'Psy\\Reflection\\ReflectionClassConstant' => __DIR__ . '/..' . '/psy/psysh/src/Reflection/ReflectionClassConstant.php',
         'Psy\\Reflection\\ReflectionConstant' => __DIR__ . '/..' . '/psy/psysh/src/Reflection/ReflectionConstant.php',
+        'Psy\\Reflection\\ReflectionConstant_' => __DIR__ . '/..' . '/psy/psysh/src/Reflection/ReflectionConstant_.php',
         'Psy\\Reflection\\ReflectionLanguageConstruct' => __DIR__ . '/..' . '/psy/psysh/src/Reflection/ReflectionLanguageConstruct.php',
         'Psy\\Reflection\\ReflectionLanguageConstructParameter' => __DIR__ . '/..' . '/psy/psysh/src/Reflection/ReflectionLanguageConstructParameter.php',
         'Psy\\Shell' => __DIR__ . '/..' . '/psy/psysh/src/Shell.php',
@@ -3941,6 +3945,9 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'SebastianBergmann\\Environment\\OperatingSystem' => __DIR__ . '/..' . '/sebastian/environment/src/OperatingSystem.php',
         'SebastianBergmann\\Environment\\Runtime' => __DIR__ . '/..' . '/sebastian/environment/src/Runtime.php',
         'SebastianBergmann\\Exporter\\Exporter' => __DIR__ . '/..' . '/sebastian/exporter/src/Exporter.php',
+        'SebastianBergmann\\FileIterator\\Facade' => __DIR__ . '/..' . '/phpunit/php-file-iterator/src/Facade.php',
+        'SebastianBergmann\\FileIterator\\Factory' => __DIR__ . '/..' . '/phpunit/php-file-iterator/src/Factory.php',
+        'SebastianBergmann\\FileIterator\\Iterator' => __DIR__ . '/..' . '/phpunit/php-file-iterator/src/Iterator.php',
         'SebastianBergmann\\GlobalState\\Blacklist' => __DIR__ . '/..' . '/sebastian/global-state/src/Blacklist.php',
         'SebastianBergmann\\GlobalState\\CodeExporter' => __DIR__ . '/..' . '/sebastian/global-state/src/CodeExporter.php',
         'SebastianBergmann\\GlobalState\\Exception' => __DIR__ . '/..' . '/sebastian/global-state/src/exceptions/Exception.php',
@@ -3988,6 +3995,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\Console\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/symfony/console/Exception/InvalidArgumentException.php',
         'Symfony\\Component\\Console\\Exception\\InvalidOptionException' => __DIR__ . '/..' . '/symfony/console/Exception/InvalidOptionException.php',
         'Symfony\\Component\\Console\\Exception\\LogicException' => __DIR__ . '/..' . '/symfony/console/Exception/LogicException.php',
+        'Symfony\\Component\\Console\\Exception\\NamespaceNotFoundException' => __DIR__ . '/..' . '/symfony/console/Exception/NamespaceNotFoundException.php',
         'Symfony\\Component\\Console\\Exception\\RuntimeException' => __DIR__ . '/..' . '/symfony/console/Exception/RuntimeException.php',
         'Symfony\\Component\\Console\\Formatter\\OutputFormatter' => __DIR__ . '/..' . '/symfony/console/Formatter/OutputFormatter.php',
         'Symfony\\Component\\Console\\Formatter\\OutputFormatterInterface' => __DIR__ . '/..' . '/symfony/console/Formatter/OutputFormatterInterface.php',
@@ -4008,6 +4016,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\Console\\Helper\\SymfonyQuestionHelper' => __DIR__ . '/..' . '/symfony/console/Helper/SymfonyQuestionHelper.php',
         'Symfony\\Component\\Console\\Helper\\Table' => __DIR__ . '/..' . '/symfony/console/Helper/Table.php',
         'Symfony\\Component\\Console\\Helper\\TableCell' => __DIR__ . '/..' . '/symfony/console/Helper/TableCell.php',
+        'Symfony\\Component\\Console\\Helper\\TableRows' => __DIR__ . '/..' . '/symfony/console/Helper/TableRows.php',
         'Symfony\\Component\\Console\\Helper\\TableSeparator' => __DIR__ . '/..' . '/symfony/console/Helper/TableSeparator.php',
         'Symfony\\Component\\Console\\Helper\\TableStyle' => __DIR__ . '/..' . '/symfony/console/Helper/TableStyle.php',
         'Symfony\\Component\\Console\\Input\\ArgvInput' => __DIR__ . '/..' . '/symfony/console/Input/ArgvInput.php',
@@ -4024,6 +4033,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\Console\\Output\\BufferedOutput' => __DIR__ . '/..' . '/symfony/console/Output/BufferedOutput.php',
         'Symfony\\Component\\Console\\Output\\ConsoleOutput' => __DIR__ . '/..' . '/symfony/console/Output/ConsoleOutput.php',
         'Symfony\\Component\\Console\\Output\\ConsoleOutputInterface' => __DIR__ . '/..' . '/symfony/console/Output/ConsoleOutputInterface.php',
+        'Symfony\\Component\\Console\\Output\\ConsoleSectionOutput' => __DIR__ . '/..' . '/symfony/console/Output/ConsoleSectionOutput.php',
         'Symfony\\Component\\Console\\Output\\NullOutput' => __DIR__ . '/..' . '/symfony/console/Output/NullOutput.php',
         'Symfony\\Component\\Console\\Output\\Output' => __DIR__ . '/..' . '/symfony/console/Output/Output.php',
         'Symfony\\Component\\Console\\Output\\OutputInterface' => __DIR__ . '/..' . '/symfony/console/Output/OutputInterface.php',
@@ -4037,6 +4047,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\Console\\Terminal' => __DIR__ . '/..' . '/symfony/console/Terminal.php',
         'Symfony\\Component\\Console\\Tester\\ApplicationTester' => __DIR__ . '/..' . '/symfony/console/Tester/ApplicationTester.php',
         'Symfony\\Component\\Console\\Tester\\CommandTester' => __DIR__ . '/..' . '/symfony/console/Tester/CommandTester.php',
+        'Symfony\\Component\\Console\\Tester\\TesterTrait' => __DIR__ . '/..' . '/symfony/console/Tester/TesterTrait.php',
         'Symfony\\Component\\CssSelector\\CssSelectorConverter' => __DIR__ . '/..' . '/symfony/css-selector/CssSelectorConverter.php',
         'Symfony\\Component\\CssSelector\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/symfony/css-selector/Exception/ExceptionInterface.php',
         'Symfony\\Component\\CssSelector\\Exception\\ExpressionErrorException' => __DIR__ . '/..' . '/symfony/css-selector/Exception/ExpressionErrorException.php',
@@ -4143,8 +4154,15 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\HttpFoundation\\ExpressionRequestMatcher' => __DIR__ . '/..' . '/symfony/http-foundation/ExpressionRequestMatcher.php',
         'Symfony\\Component\\HttpFoundation\\FileBag' => __DIR__ . '/..' . '/symfony/http-foundation/FileBag.php',
         'Symfony\\Component\\HttpFoundation\\File\\Exception\\AccessDeniedException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/AccessDeniedException.php',
+        'Symfony\\Component\\HttpFoundation\\File\\Exception\\CannotWriteFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/CannotWriteFileException.php',
+        'Symfony\\Component\\HttpFoundation\\File\\Exception\\ExtensionFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/ExtensionFileException.php',
         'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/FileException.php',
         'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileNotFoundException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/FileNotFoundException.php',
+        'Symfony\\Component\\HttpFoundation\\File\\Exception\\FormSizeFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/FormSizeFileException.php',
+        'Symfony\\Component\\HttpFoundation\\File\\Exception\\IniSizeFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/IniSizeFileException.php',
+        'Symfony\\Component\\HttpFoundation\\File\\Exception\\NoFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/NoFileException.php',
+        'Symfony\\Component\\HttpFoundation\\File\\Exception\\NoTmpDirFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/NoTmpDirFileException.php',
+        'Symfony\\Component\\HttpFoundation\\File\\Exception\\PartialFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/PartialFileException.php',
         'Symfony\\Component\\HttpFoundation\\File\\Exception\\UnexpectedTypeException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/UnexpectedTypeException.php',
         'Symfony\\Component\\HttpFoundation\\File\\Exception\\UploadException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/UploadException.php',
         'Symfony\\Component\\HttpFoundation\\File\\File' => __DIR__ . '/..' . '/symfony/http-foundation/File/File.php',
@@ -4158,6 +4176,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\HttpFoundation\\File\\Stream' => __DIR__ . '/..' . '/symfony/http-foundation/File/Stream.php',
         'Symfony\\Component\\HttpFoundation\\File\\UploadedFile' => __DIR__ . '/..' . '/symfony/http-foundation/File/UploadedFile.php',
         'Symfony\\Component\\HttpFoundation\\HeaderBag' => __DIR__ . '/..' . '/symfony/http-foundation/HeaderBag.php',
+        'Symfony\\Component\\HttpFoundation\\HeaderUtils' => __DIR__ . '/..' . '/symfony/http-foundation/HeaderUtils.php',
         'Symfony\\Component\\HttpFoundation\\IpUtils' => __DIR__ . '/..' . '/symfony/http-foundation/IpUtils.php',
         'Symfony\\Component\\HttpFoundation\\JsonResponse' => __DIR__ . '/..' . '/symfony/http-foundation/JsonResponse.php',
         'Symfony\\Component\\HttpFoundation\\ParameterBag' => __DIR__ . '/..' . '/symfony/http-foundation/ParameterBag.php',
@@ -4181,10 +4200,12 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\HttpFoundation\\Session\\SessionInterface' => __DIR__ . '/..' . '/symfony/http-foundation/Session/SessionInterface.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\AbstractSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MemcachedSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php',
+        'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MigratingSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/MigratingSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MongoDbSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NullSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/NullSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\PdoSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php',
+        'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\RedisSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\StrictSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/StrictSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MetadataBag' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/MetadataBag.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MockArraySessionStorage' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php',
@@ -4216,6 +4237,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\RequestValueResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentResolver/RequestValueResolver.php',
         'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\ServiceValueResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentResolver/ServiceValueResolver.php',
         'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\SessionValueResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentResolver/SessionValueResolver.php',
+        'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\TraceableValueResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentResolver/TraceableValueResolver.php',
         'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\VariadicValueResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentResolver/VariadicValueResolver.php',
         'Symfony\\Component\\HttpKernel\\Controller\\ArgumentValueResolverInterface' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentValueResolverInterface.php',
         'Symfony\\Component\\HttpKernel\\Controller\\ContainerControllerResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ContainerControllerResolver.php',
@@ -4330,6 +4352,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\Process\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/symfony/process/Exception/InvalidArgumentException.php',
         'Symfony\\Component\\Process\\Exception\\LogicException' => __DIR__ . '/..' . '/symfony/process/Exception/LogicException.php',
         'Symfony\\Component\\Process\\Exception\\ProcessFailedException' => __DIR__ . '/..' . '/symfony/process/Exception/ProcessFailedException.php',
+        'Symfony\\Component\\Process\\Exception\\ProcessSignaledException' => __DIR__ . '/..' . '/symfony/process/Exception/ProcessSignaledException.php',
         'Symfony\\Component\\Process\\Exception\\ProcessTimedOutException' => __DIR__ . '/..' . '/symfony/process/Exception/ProcessTimedOutException.php',
         'Symfony\\Component\\Process\\Exception\\RuntimeException' => __DIR__ . '/..' . '/symfony/process/Exception/RuntimeException.php',
         'Symfony\\Component\\Process\\ExecutableFinder' => __DIR__ . '/..' . '/symfony/process/ExecutableFinder.php',
@@ -4376,8 +4399,6 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\Routing\\Loader\\ProtectedPhpFileLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/PhpFileLoader.php',
         'Symfony\\Component\\Routing\\Loader\\XmlFileLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/XmlFileLoader.php',
         'Symfony\\Component\\Routing\\Loader\\YamlFileLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/YamlFileLoader.php',
-        'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperCollection' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/DumperCollection.php',
-        'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperRoute' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/DumperRoute.php',
         'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumper' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/MatcherDumper.php',
         'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumperInterface' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/MatcherDumperInterface.php',
         'Symfony\\Component\\Routing\\Matcher\\Dumper\\PhpMatcherDumper' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php',
@@ -4476,6 +4497,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\VarDumper\\Caster\\EnumStub' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/EnumStub.php',
         'Symfony\\Component\\VarDumper\\Caster\\ExceptionCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/ExceptionCaster.php',
         'Symfony\\Component\\VarDumper\\Caster\\FrameStub' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/FrameStub.php',
+        'Symfony\\Component\\VarDumper\\Caster\\GmpCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/GmpCaster.php',
         'Symfony\\Component\\VarDumper\\Caster\\LinkStub' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/LinkStub.php',
         'Symfony\\Component\\VarDumper\\Caster\\PdoCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/PdoCaster.php',
         'Symfony\\Component\\VarDumper\\Caster\\PgSqlCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/PgSqlCaster.php',
@@ -4495,13 +4517,24 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\VarDumper\\Cloner\\DumperInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/DumperInterface.php',
         'Symfony\\Component\\VarDumper\\Cloner\\Stub' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/Stub.php',
         'Symfony\\Component\\VarDumper\\Cloner\\VarCloner' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/VarCloner.php',
+        'Symfony\\Component\\VarDumper\\Command\\Descriptor\\CliDescriptor' => __DIR__ . '/..' . '/symfony/var-dumper/Command/Descriptor/CliDescriptor.php',
+        'Symfony\\Component\\VarDumper\\Command\\Descriptor\\DumpDescriptorInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Command/Descriptor/DumpDescriptorInterface.php',
+        'Symfony\\Component\\VarDumper\\Command\\Descriptor\\HtmlDescriptor' => __DIR__ . '/..' . '/symfony/var-dumper/Command/Descriptor/HtmlDescriptor.php',
+        'Symfony\\Component\\VarDumper\\Command\\ServerDumpCommand' => __DIR__ . '/..' . '/symfony/var-dumper/Command/ServerDumpCommand.php',
         'Symfony\\Component\\VarDumper\\Dumper\\AbstractDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/AbstractDumper.php',
         'Symfony\\Component\\VarDumper\\Dumper\\CliDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/CliDumper.php',
+        'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\CliContextProvider' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/ContextProvider/CliContextProvider.php',
+        'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\ContextProviderInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/ContextProvider/ContextProviderInterface.php',
+        'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\RequestContextProvider' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/ContextProvider/RequestContextProvider.php',
+        'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\SourceContextProvider' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/ContextProvider/SourceContextProvider.php',
         'Symfony\\Component\\VarDumper\\Dumper\\DataDumperInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/DataDumperInterface.php',
         'Symfony\\Component\\VarDumper\\Dumper\\HtmlDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/HtmlDumper.php',
+        'Symfony\\Component\\VarDumper\\Dumper\\ServerDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/ServerDumper.php',
         'Symfony\\Component\\VarDumper\\Exception\\ThrowingCasterException' => __DIR__ . '/..' . '/symfony/var-dumper/Exception/ThrowingCasterException.php',
+        'Symfony\\Component\\VarDumper\\Server\\DumpServer' => __DIR__ . '/..' . '/symfony/var-dumper/Server/DumpServer.php',
         'Symfony\\Component\\VarDumper\\Test\\VarDumperTestTrait' => __DIR__ . '/..' . '/symfony/var-dumper/Test/VarDumperTestTrait.php',
         'Symfony\\Component\\VarDumper\\VarDumper' => __DIR__ . '/..' . '/symfony/var-dumper/VarDumper.php',
+        'Symfony\\Polyfill\\Ctype\\Ctype' => __DIR__ . '/..' . '/symfony/polyfill-ctype/Ctype.php',
         'Symfony\\Polyfill\\Mbstring\\Mbstring' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/Mbstring.php',
         'Symfony\\Polyfill\\Php56\\Php56' => __DIR__ . '/..' . '/symfony/polyfill-php56/Php56.php',
         'Symfony\\Polyfill\\Php72\\Php72' => __DIR__ . '/..' . '/symfony/polyfill-php72/Php72.php',
@@ -4716,17 +4749,10 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-<<<<<<< HEAD
             $loader->prefixLengthsPsr4 = ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a::$prefixDirsPsr4;
             $loader->prefixesPsr0 = ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a::$prefixesPsr0;
             $loader->classMap = ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a::$classMap;
-=======
-            $loader->prefixLengthsPsr4 = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$classMap;
->>>>>>> c5a509e7b16025d96c70871ddb865b075cf1e035
 
         }, null, ClassLoader::class);
     }

From 3060aa1c1fcae344c4270339e23a117db6dd21c5 Mon Sep 17 00:00:00 2001
From: Too <sengweitoo@gmail.com>
Date: Fri, 15 Jun 2018 17:13:53 +0800
Subject: [PATCH 10/12] Fix wrong variable name. Add auth check before upload
 bankslip and PO. Optimize some code stlye

---
 app/Http/Controllers/BookingController.php | 169 ++++++++-------------
 composer.lock                              |  20 +--
 tests/Feature/BookingTest.php              |  95 ++++++++----
 vendor/composer/autoload_classmap.php      |   3 +-
 vendor/composer/autoload_static.php        |  24 +--
 5 files changed, 147 insertions(+), 164 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index c095741a..0d6255c4 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -47,13 +47,7 @@ class BookingController extends Controller
                 break;
         }
 
-<<<<<<< HEAD
         // Calculation Service charge 
-=======
-
-        // Calculation 
-        // Service charge 
->>>>>>> 83dfca2ae18825a69bca7aec5619abf7f4d0671f
         $amount = $request->input("amount");
 
          //logic : if amount higher than 10,000, no service charge. if amount lower than 10,000, 20.00 service charge
@@ -114,9 +108,13 @@ class BookingController extends Controller
 
         return response()->json($booking, 201);
     }
-    
+
     public function update(Request $request, $book_id)
     {
+        if (!Auth::check())
+        {
+            return response()->json(['message'=>'not loggin'],200);    
+        }
             $book_id = Booking::find($book_id);
             $book_id->account_name = $request->input('account_name');
             $book_id->account_num = $request->input('account_num');
@@ -134,98 +132,85 @@ class BookingController extends Controller
 
     public function uploadbankslip(Request $request, $id)
     {
-        $user_bankslip = Booking::where("user_id", Auth::user()->id)->first();
-        if (!$user_bankslip)
-        {
-            return response()->json(['message'=>'Access denied'], 200);
-        }
-
-        $validator = Validator::make($request->all(), [
-            'bankslip_url'   => 'image|mimes:jpg,jpeg,bmp,png'
-        ]);
-
-        if($validator->fails())
-        {
-            return response()->json(['message'=>'Incorrect format'],200);
-        }
-
-        $unique_image_url = ""; //init variable
-        if($bankslip_url = $request->file('bankslip_url'))
-        {
-            // Get image name and store it
-            $filename = $bankslip_url->getClientOriginalName();
-            $input['bankslip_url'] = $filename;
-
-            //hash image name
-            $unique_name = 'bank_slip_' . md5($filename. time());
-
-            // Get image extension concentae it with hashed image name
-            $ext = $bankslip_url->getClientOriginalExtension();
-            $unique_image_url = $unique_name. '.' .$ext;
-            //update database
-            Storage::putFileAs(
-                'bankslip_url',/*folder name*/ $bankslip_url,  $unique_image_url
-            ); 
-            
-        } //end if
-        else {
-            return response()->json(['message' => 'No file detected'], 400);
-        }
-
-
         $booking = Booking::find($id);
+
+        /* Validation*/
+            if (!$booking || Auth::user()->id != $booking->user_id)
+            {
+                return response()->json(['message'=>'Access denied'], 200);
+            }
+
+            $validator = Validator::make($request->all(), [
+                'bankslip_url'   => 'image|mimes:jpg,jpeg,bmp,png'
+            ]);
+
+            if($validator->fails())
+            {
+                return response()->json(['message'=>'Incorrect format'],200);
+            }
+
+            if(!$bankslip_file = $request->file('bankslip_url'))
+            {
+                return response()->json(['message' => 'No file detected'], 400);
+            }
+        /* End Validation */
+      
+        $filename = $bankslip_file->getClientOriginalName();
+        $ext = $bankslip_file->getClientOriginalExtension();
+        $input['bankslip_url'] = $filename;
+
+        $unique_name = 'bank_slip_' . md5($filename. time());
+        $unique_image_url = $unique_name. '.' .$ext;
+        Storage::putFileAs(
+            'bankslip_url',/*folder name*/ $bankslip_file,  $unique_image_url
+        ); 
+
         $booking->cust_marking = $request->input('cust_marking');
         $booking->bank_slip_type = $request->input('bank_slip_type');
 
-        // Create Post
         $user_bankslip = new UserBankSlip;
         $user_bankslip->book_id = $booking->id;
         $user_bankslip->bankslip_url =  $unique_image_url;
         $user_bankslip->transfer_amount = $request->input('transfer_amount');
         $user_bankslip->save();
 
-        return response()->json(['message'=>$user_bankslip],200);
+        return response()->json(['message'=>"Success"],200);
     }
 
     public function uploadPurchaseOrder(Request $request, $id)
     {
-        $user_po = Booking::where("user_id", Auth::user()->id)->first();
-        if (!$user_po)
-        {
-            return response()->json(['message'=>'Access denied'], 200);
-        }
+        $booking = Booking::find($id);
+        /* Validation */
+            if (!$booking || Auth::user()->id != $booking->user_id)
+            {
+                return response()->json(['message'=>'Access denied'], 200);
+            }
 
-        $validator = Validator::make($request->all(), [
-            'image_url'   => 'image|mimes:jpg,jpeg,bmp,png'
-        ]);
+            $validator = Validator::make($request->all(), [
+                'image_url'   => 'image|mimes:jpg,jpeg,bmp,png'
+            ]);
 
-        if($validator->fails())
-        {
-            return response()->json(['message'=>'Incorrect format'],200);
-        }
+            if($validator->fails())
+            {
+                return response()->json(['message'=>'Incorrect format'],200);
+            }
 
-        $unique_image_url = ""; // declare variable
-        if($image_url = $request->file('image_url'))
-        {
-            // Get image name and store it
-            $filename = $image_url->getClientOriginalName();
-            $input['image_url'] = $filename;
-            
-            // hash image name
-            $unique_name = 'purchase_order_' . md5($filename. time());
+            if(!$user_input_file = $request->file('image_url'))
+            {
+                return response()->json(['message' => 'No file detected'], 400);
+            }
+        /* End Validation */
 
-            // Get image extension concentae it with hashed image name
-            $ext = $image_url->getClientOriginalExtension();
-            $unique_image_url = $unique_name. '.' .$ext; 
 
-            //update database
-            Storage::putFileAs(
-                'image_url',/*folder name*/ $image_url, $unique_image_url
-            );
-        } //end if
-        else {
-            return response()->json(['message' => 'No file detected'], 400);
-        }
+        $filename = $user_input_file->getClientOriginalName();
+        $ext = $user_input_file->getClientOriginalExtension();
+
+        $input['image_url'] = $filename;
+        $unique_name = 'purchase_order_' . md5($filename. time());
+        $unique_image_url = $unique_name. '.' .$ext; 
+        Storage::putFileAs(
+            'image_url',/*folder name*/ $user_input_file, $unique_image_url
+        );
 
         $booking = Booking::find($id);
         $user_po = new PurchaseOrder;
@@ -233,32 +218,12 @@ class BookingController extends Controller
         $user_po->book_id = $booking->id;
         $user_po->amount = $request->input('amount');
         $user_po->save();
+
         return response()->json(['message'=>'Success'],200);
     }
-<<<<<<< HEAD
-=======
-
-    public function update(Request $request, $book_id)
-    {
-            $book_id = Booking::find($book_id);
-
-            $book_id->account_name = $request->input('account_name');
-            $book_id->account_num = $request->input('account_num');
-            $book_id->bank_name = $request->input('bank_name');
-            $book_id->bank_branch = $request->input('bank_branch');
-            $book_id->company_name = $request->input('company_name');
-            $book_id->company_address = $request->input('company_address');
-            $book_id->bank_address = $request->input('bank_address');
-            $book_id->swift_code = $request->input('swift_code');
-            $book_id->cnap = $request->input('cnap');
-            $book_id->save();
-     
-            return response()->json(['book_id'=>$book_id],200);
-    }
-
->>>>>>> 83dfca2ae18825a69bca7aec5619abf7f4d0671f
     public function delete(Booking $book_id)
     {
+        $booking = Booking::where('user_id', Auth::user())->where('id', $book_id)->firstOrFail();
         $booking->delete($book_id);
         return response()->json($book_id, 204);
     }
diff --git a/composer.lock b/composer.lock
index 216fe060..a060a284 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1063,16 +1063,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v5.6.24",
+            "version": "v5.6.25",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "56290edeb0d8051826d40b4cbd8ed3c30348b2b5"
+                "reference": "a15efe4fbcd6b38ea76edc5c8939ffde4f4c7b7f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/56290edeb0d8051826d40b4cbd8ed3c30348b2b5",
-                "reference": "56290edeb0d8051826d40b4cbd8ed3c30348b2b5",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/a15efe4fbcd6b38ea76edc5c8939ffde4f4c7b7f",
+                "reference": "a15efe4fbcd6b38ea76edc5c8939ffde4f4c7b7f",
                 "shasum": ""
             },
             "require": {
@@ -1198,7 +1198,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2018-06-04T14:51:03+00:00"
+            "time": "2018-06-12T14:39:24+00:00"
         },
         {
             "name": "laravel/socialite",
@@ -4730,16 +4730,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "3.0.0",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "ed5fd2281113729f1ebcc64d101ad66028aeb3d5"
+                "reference": "591a30922f54656695e59b1f39501aec513403da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/ed5fd2281113729f1ebcc64d101ad66028aeb3d5",
-                "reference": "ed5fd2281113729f1ebcc64d101ad66028aeb3d5",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/591a30922f54656695e59b1f39501aec513403da",
+                "reference": "591a30922f54656695e59b1f39501aec513403da",
                 "shasum": ""
             },
             "require": {
@@ -4790,7 +4790,7 @@
                 "compare",
                 "equality"
             ],
-            "time": "2018-04-18T13:33:00+00:00"
+            "time": "2018-06-14T15:05:28+00:00"
         },
         {
             "name": "sebastian/diff",
diff --git a/tests/Feature/BookingTest.php b/tests/Feature/BookingTest.php
index 55d9a2d4..c25c3ab9 100644
--- a/tests/Feature/BookingTest.php
+++ b/tests/Feature/BookingTest.php
@@ -2,48 +2,85 @@
 
 namespace Tests\Unit\BookingTest;
 
-use App\User;
-use Artisan;
 use Tests\TestCase;
+use Illuminate\Foundation\Testing\WithoutMiddleware;
+use Illuminate\Database\Seeder;
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Foundation\Support\Providers\AuthServiceProvider;
+use Auth;
+use Artisan;
+use App\User;
+use App\Booking;
 
 class BookingTest extends TestCase
 {
     protected $user;
-
+    
     public function setUp()
     {
         parent::setUp();
         Artisan::call('db:seed');
-        $this->user = factory(User::class)->create();
+        $this->user = User::Find(1);
     }
 
     public function testPost()
     {
-        $response =
-        $this->actingAs($this->user)
-            ->postJson('/api/booking/', [
-                'term' => 'x1_ba',
-                'account_name' => 'johnny',
-                'account_num' => '1234567',
-                'bank_name' => 'myabnak',
-                'bank_branch' => 'banking',
-                'company_name' => 'besaras',
-                'company_address' => 'californina',
-                'bank_address' => 'cyber',
-                'swift_code' => '123wert',
-                'cnap' => '2131rew',
-                'term' => 'x2_cash',
-                'rmb_book_amount' => 14000,
-                'rmb_book_pay_method' => 'x1_ba',
-                'rmb_book_account_name' => 'Xiao Xue',
-                'rmb_book_acc_no' => '12332123123',
-                'rmb_book_bank_branch' => 'ShenZhen',
-                'amount' => 14000,
-            ]);
-        dd($response->getContent());
-        $response->assertStatus(200);
-       
+      $response =
+      $this->actingAs($this->user)
+      ->postJson('/api/booking/',  [
+        'account_name' => 'johnny',
+        'account_num' => '1234567',
+        'bank_name' => 'myabnak',
+        'bank_branch' => 'banking',
+        'company_name' => 'besaras',
+        'company_address' => 'californina',
+        'bank_address' => 'cyber',
+        'swift_code' => '123wert',
+        'cnap' => '2131rew',
+        'term' => 'x2_cash',
+        'amount' => '14000',
+        'rmb_book_amount' => '2131',
+        'rmb_book_pay_method' => '2131rea',
+        'rmb_book_account_name' => '2131rew',
+        'rmb_book_acc_no' => '2131',
+        'rmb_book_bank_branch' => '2131rew',
+        'usd_book_amount' => '2131',
+        'usd_book_pay_method' => '2131rew',
+        'usd_book_company_name' => '2131rew',
+        'usd_book_company_address' => '2131rew',
+        'usd_book_swift_code' => '2131rew',
+        'usd_book_cnap' => '2131rew',
+        'usd_book_bank_branch' => '2131rew',
+        'verification_status' => '1'
+    ]);
+      $response->assertStatus(201);
+    }
+
+    public function testuploadbankslip()
+    {
+       $this->actingAs($this->user);
+        Storage::fake('bankslip_url');
+
+        $response = $this->json('POST', '/api/booking/1/upload-user-bankslip', [
+            'bankslip_url' => UploadedFile::fake()->image('comp.jpg'),
+            'transfer_amount' => '9000'
+        ]);
+        $response->assertStatus(200);
+    }
+
+    public function testuploadPO()
+    {
+        $this->actingAs($this->user);
+        Storage::fake('image_url');
+
+        $response = $this->json('POST', '/api/booking/1/upload-po', [
+            'image_url' => UploadedFile::fake()->image('comp.jpg'),
+            'amount' => '12345'
+        ]);
+        $response->assertStatus(200);
     }
-   
 
 }
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 3ce074de..e628820c 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -1679,6 +1679,7 @@ return array(
     'Illuminate\\Foundation\\Testing\\WithoutEvents' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/WithoutEvents.php',
     'Illuminate\\Foundation\\Testing\\WithoutMiddleware' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/WithoutMiddleware.php',
     'Illuminate\\Foundation\\Validation\\ValidatesRequests' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php',
+    'Illuminate\\Hashing\\AbstractHasher' => $vendorDir . '/laravel/framework/src/Illuminate/Hashing/AbstractHasher.php',
     'Illuminate\\Hashing\\ArgonHasher' => $vendorDir . '/laravel/framework/src/Illuminate/Hashing/ArgonHasher.php',
     'Illuminate\\Hashing\\BcryptHasher' => $vendorDir . '/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php',
     'Illuminate\\Hashing\\HashManager' => $vendorDir . '/laravel/framework/src/Illuminate/Hashing/HashManager.php',
@@ -4130,7 +4131,7 @@ return array(
     'Tests\\Feature\\RegisterTest' => $baseDir . '/tests/Feature/RegisterTest.php',
     'Tests\\Feature\\SettingsTest' => $baseDir . '/tests/Feature/SettingsTest.php',
     'Tests\\TestCase' => $baseDir . '/tests/TestCase.php',
-    'Tests\\Unit\\BookingTest\\BookingTest' => $baseDir . '/tests/Feature/BookingTest.php',
+    'Tests\\Unit\\BookingTest\\BookingTest' => $baseDir . '/tests/Feature/BookingTest2.php',
     'Text_Template' => $vendorDir . '/phpunit/php-text-template/src/Template.php',
     'TheSeer\\Tokenizer\\Exception' => $vendorDir . '/theseer/tokenizer/src/Exception.php',
     'TheSeer\\Tokenizer\\NamespaceUri' => $vendorDir . '/theseer/tokenizer/src/NamespaceUri.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 444c22b5..fdae4849 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -4,15 +4,7 @@
 
 namespace Composer\Autoload;
 
-<<<<<<< HEAD
 class ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a
-=======
-<<<<<<< HEAD
-class ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a
-=======
-class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
->>>>>>> 9fa55b3394b938349e815fea8c8f6acc5b00fd15
->>>>>>> 83dfca2ae18825a69bca7aec5619abf7f4d0671f
 {
     public static $files = array (
         '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
@@ -2115,6 +2107,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Illuminate\\Foundation\\Testing\\WithoutEvents' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/WithoutEvents.php',
         'Illuminate\\Foundation\\Testing\\WithoutMiddleware' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/WithoutMiddleware.php',
         'Illuminate\\Foundation\\Validation\\ValidatesRequests' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php',
+        'Illuminate\\Hashing\\AbstractHasher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Hashing/AbstractHasher.php',
         'Illuminate\\Hashing\\ArgonHasher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Hashing/ArgonHasher.php',
         'Illuminate\\Hashing\\BcryptHasher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php',
         'Illuminate\\Hashing\\HashManager' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Hashing/HashManager.php',
@@ -4566,7 +4559,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Tests\\Feature\\RegisterTest' => __DIR__ . '/../..' . '/tests/Feature/RegisterTest.php',
         'Tests\\Feature\\SettingsTest' => __DIR__ . '/../..' . '/tests/Feature/SettingsTest.php',
         'Tests\\TestCase' => __DIR__ . '/../..' . '/tests/TestCase.php',
-        'Tests\\Unit\\BookingTest\\BookingTest' => __DIR__ . '/../..' . '/tests/Feature/BookingTest.php',
+        'Tests\\Unit\\BookingTest\\BookingTest' => __DIR__ . '/../..' . '/tests/Feature/BookingTest2.php',
         'Text_Template' => __DIR__ . '/..' . '/phpunit/php-text-template/src/Template.php',
         'TheSeer\\Tokenizer\\Exception' => __DIR__ . '/..' . '/theseer/tokenizer/src/Exception.php',
         'TheSeer\\Tokenizer\\NamespaceUri' => __DIR__ . '/..' . '/theseer/tokenizer/src/NamespaceUri.php',
@@ -4757,23 +4750,10 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
->>>>>>> 83dfca2ae18825a69bca7aec5619abf7f4d0671f
             $loader->prefixLengthsPsr4 = ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a::$prefixDirsPsr4;
             $loader->prefixesPsr0 = ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a::$prefixesPsr0;
             $loader->classMap = ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a::$classMap;
-<<<<<<< HEAD
-=======
-=======
-            $loader->prefixLengthsPsr4 = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$classMap;
->>>>>>> 9fa55b3394b938349e815fea8c8f6acc5b00fd15
->>>>>>> 83dfca2ae18825a69bca7aec5619abf7f4d0671f
 
         }, null, ClassLoader::class);
     }

From 67b966f40f4f9819e4c128fc52111405d867a776 Mon Sep 17 00:00:00 2001
From: Too <sengweitoo@gmail.com>
Date: Fri, 15 Jun 2018 18:21:12 +0800
Subject: [PATCH 11/12] add file checking in bookingtest. optimize some code.

---
 app/Http/Controllers/BookingController.php | 40 ++++++++++------------
 tests/Feature/BookingTest.php              | 14 ++++++--
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 0d6255c4..cd47742a 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -111,31 +111,27 @@ class BookingController extends Controller
 
     public function update(Request $request, $book_id)
     {
-        if (!Auth::check())
-        {
-            return response()->json(['message'=>'not loggin'],200);    
-        }
-            $book_id = Booking::find($book_id);
-            $book_id->account_name = $request->input('account_name');
-            $book_id->account_num = $request->input('account_num');
-            $book_id->bank_name = $request->input('bank_name');
-            $book_id->bank_branch = $request->input('bank_branch');
-            $book_id->company_name = $request->input('company_name');
-            $book_id->company_address = $request->input('company_address');
-            $book_id->bank_address = $request->input('bank_address');
-            $book_id->swift_code = $request->input('swift_code');
-            $book_id->cnap = $request->input('cnap');
-            $book_id->save();
-     
-            return response()->json(['book_id'=>$book_id],200);
+        $book_id = Booking::find($book_id);
+        $book_id->account_name = $request->input('account_name');
+        $book_id->account_num = $request->input('account_num');
+        $book_id->bank_name = $request->input('bank_name');
+        $book_id->bank_branch = $request->input('bank_branch');
+        $book_id->company_name = $request->input('company_name');
+        $book_id->company_address = $request->input('company_address');
+        $book_id->bank_address = $request->input('bank_address');
+        $book_id->swift_code = $request->input('swift_code');
+        $book_id->cnap = $request->input('cnap');
+        $book_id->save();
+ 
+        return response()->json(['book_id'=>$book_id],200);
     }
 
     public function uploadbankslip(Request $request, $id)
     {
-        $booking = Booking::find($id);
+        $booking = Booking::where('user_id',Auth::user()->id)->where('id',$id)->first();
 
         /* Validation*/
-            if (!$booking || Auth::user()->id != $booking->user_id)
+            if (!$booking)
             {
                 return response()->json(['message'=>'Access denied'], 200);
             }
@@ -179,9 +175,10 @@ class BookingController extends Controller
 
     public function uploadPurchaseOrder(Request $request, $id)
     {
-        $booking = Booking::find($id);
+         $booking = Booking::where('user_id',Auth::user()->id)->where('id',$id)->first();
+
         /* Validation */
-            if (!$booking || Auth::user()->id != $booking->user_id)
+            if (!$booking)
             {
                 return response()->json(['message'=>'Access denied'], 200);
             }
@@ -212,7 +209,6 @@ class BookingController extends Controller
             'image_url',/*folder name*/ $user_input_file, $unique_image_url
         );
 
-        $booking = Booking::find($id);
         $user_po = new PurchaseOrder;
         $user_po->image_url = $unique_image_url;
         $user_po->book_id = $booking->id;
diff --git a/tests/Feature/BookingTest.php b/tests/Feature/BookingTest.php
index c25c3ab9..7ec79a24 100644
--- a/tests/Feature/BookingTest.php
+++ b/tests/Feature/BookingTest.php
@@ -23,7 +23,7 @@ class BookingTest extends TestCase
     {
         parent::setUp();
         Artisan::call('db:seed');
-        $this->user = User::Find(1);
+        $this->user = factory(User::class)->create();
     }
 
     public function testPost()
@@ -61,11 +61,15 @@ class BookingTest extends TestCase
 
     public function testuploadbankslip()
     {
-       $this->actingAs($this->user);
+        $this->actingAs($this->user);
         Storage::fake('bankslip_url');
+        $bankslip_url = UploadedFile::fake()->image('comp.jpg');
+        if(!file_exists($bankslip_url)){
+            $response->assertStatus(400);    
+        }
 
         $response = $this->json('POST', '/api/booking/1/upload-user-bankslip', [
-            'bankslip_url' => UploadedFile::fake()->image('comp.jpg'),
+            'bankslip_url' => $bankslip_url,
             'transfer_amount' => '9000'
         ]);
         $response->assertStatus(200);
@@ -75,6 +79,10 @@ class BookingTest extends TestCase
     {
         $this->actingAs($this->user);
         Storage::fake('image_url');
+        $image_url = UploadedFile::fake()->image('comp.jpg');
+        if(!file_exists($image_url)){
+            $response->assertStatus(400);    
+        }
 
         $response = $this->json('POST', '/api/booking/1/upload-po', [
             'image_url' => UploadedFile::fake()->image('comp.jpg'),

From 82b2c0104ecf2b332576af21d9babd65bea0fed7 Mon Sep 17 00:00:00 2001
From: Too <sengweitoo@gmail.com>
Date: Fri, 15 Jun 2018 21:13:11 +0800
Subject: [PATCH 12/12] Remove unused bookingtest.php

---
 tests/Unit/BookingTest.php | 85 --------------------------------------
 1 file changed, 85 deletions(-)
 delete mode 100644 tests/Unit/BookingTest.php

diff --git a/tests/Unit/BookingTest.php b/tests/Unit/BookingTest.php
deleted file mode 100644
index 9e198b4f..00000000
--- a/tests/Unit/BookingTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-namespace Tests\Unit\BookingTest;
-
-use Tests\TestCase;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
-use Illuminate\Database\Seeder;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Http\UploadedFile;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Artisan;
-use App\User;
-
-class BookingTest extends TestCase
-{
-    protected $user;
-    
-    public function setUp()
-    {
-        parent::setUp();
-        Artisan::call('db:seed');
-        $this->user = factory(User::class)->create();
-    }
-
-       public function testPost()
-          {
-              $response =
-              $this->actingAs($this->user)
-              ->postJson('/api/booking/',  [
-                'account_name' => 'johnny',
-                'account_num' => '1234567',
-                'bank_name' => 'myabnak',
-                'bank_branch' => 'banking',
-                'company_name' => 'besaras',
-                'company_address' => 'californina',
-                'bank_address' => 'cyber',
-                'swift_code' => '123wert',
-                'cnap' => '2131rew',
-                'term' => 'x2_cash',
-                'amount' => '14000',
-                'rmb_book_amount' => '2131',
-                'rmb_book_pay_method' => '2131rea',
-                'rmb_book_account_name' => '2131rew',
-                'rmb_book_acc_no' => '2131',
-                'rmb_book_bank_branch' => '2131rew',
-                'usd_book_amount' => '2131',
-                'usd_book_pay_method' => '2131rew',
-                'usd_book_company_name' => '2131rew',
-                'usd_book_company_address' => '2131rew',
-                'usd_book_swift_code' => '2131rew',
-                'usd_book_cnap' => '2131rew',
-                'usd_book_bank_branch' => '2131rew',
-                'verification_status' => '1'
-            ]);
-              $response->assertStatus(201);
-          }
-
-
-    public function testuploadbankslip()
-    {
-        Storage::fake('bankslip_url');
-
-        $response = $this->json('POST', '/api/booking/1/upload-user-bankslip', [
-            'bankslip_url' => UploadedFile::fake()->image('comp.jpg'),
-            'transfer_amount' => '9000'
-        ]);
-
-        dd($response->getContent());
-        $response->assertStatus(200);
-    }
-
-    public function testuploadPO()
-    {
-        Storage::fake('image_url');
-
-        $response = $this->json('POST', '/api/booking/1/upload-po', [
-            'image_url' => UploadedFile::fake()->image('comp.jpg'),
-            'amount' => '12345'
-        ]);
-        dd($response->getContent());
-        $response->assertStatus(200);
-    }
-
-}
\ No newline at end of file