<commit_before><?php

namespace App\Http\Controllers;

use Auth;
use App\User;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Redirect;
use Illuminate\Support\Facades\Validator;

class ProfileController extends Controller
{
    /**
     * Create a new controller instance.
     *
     * @return void
     */
    public function __construct()
    {
        $this->middleware('auth');
    }

    /**
     * Show profile.
     *
     * @return \Illuminate\Http\Response
     */
    public function index()
    {
        return view('profile');
    }

    /**
     * Show edit profile form.
     *
     * @return \Illuminate\Http\Response
     */
    public function editIndex()
    {
        return view('edit');
    }

    /**
     * Update user.
     *
     * @return Illuminate\Support\Facades\Redirect
     */
    public function updateProfile(Request $request)
    {
        $ruser = $request->user();

        /* Validate incoming data */
        $this->validate($request, [
            'name' => 'required|string|regex:/^[a-zA-Z ]+$/|max:255',
            'title' => 'required|string|regex:/^[a-zA-Z ]+$/|max:255',
            'sector' => 'required|string|regex:/^[a-zA-Z ]+$/|max:255',
            'location' => 'required|string|regex:/^[a-zA-Z ]+$/|max:255',
            'experience' => 'required|integer|min:0|max:50',
            'java' => 'boolean',
            'python' => 'boolean',
            'email' => 'required|string|email|max:255|unique:users,email,' . $ruser->id
        ]);

        $id = Auth::user()->id;

        $user = User::findOrFail($id);

        $user->name=$request['name'];
        $user->email=$request['email'];
        $user->title=$request['title'];
        $user->location=$request['location'];
        $user->sector=$request['sector'];
        $user->experience=$request['experience'];

        $user->java=$request['java'];
        $user->python=$request['python'];
        $user->c=$request['c'];
        $user->csharp=$request['csharp'];
        $user->cplus=$request['cplus'];
        $user->php=$request['php'];
        $user->html=$request['html'];
        $user->css=$request['css'];
        $user->javascript=$request['javascript'];
        $user->sql=$request['sql'];
        $user->unix=$request['unix'];
        $user->winserver=$request['winserver'];
        $user->windesktop=$request['windesktop'];
        $user->linuxdesktop=$request['linuxdesktop'];
        $user->macosdesktop=$request['macosdesktop'];
        $user->pearl=$request['pearl'];
        $user->bash=$request['bash'];
        $user->batch=$request['batch'];
        $user->cisco=$request['cisco'];
        $user->office=$request['office'];
        $user->r=$request['r'];
        $user->go=$request['go'];
        $user->ruby=$request['ruby'];
        $user->asp=$request['asp'];
        $user->scala=$request['scala'];

        $user->save();

        return Redirect::route('profile');
    }
}
<commit_msg>Fix merge issue<commit_after><?php

namespace App\Http\Controllers;

use Auth;
use App\User;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Redirect;
use Illuminate\Support\Facades\Validator;

class ProfileController extends Controller
{
    /**
     * Create a new controller instance.
     *
     * @return void
     */
    public function __construct()
    {
        $this->middleware('auth');
    }

    /**
     * Show profile.
     *
     * @return \Illuminate\Http\Response
     */
    public function index()
    {
        return view('profile');
    }

    /**
     * Show edit profile form.
     *
     * @return \Illuminate\Http\Response
     */
    public function editIndex()
    {
        return view('edit');
    }

    /**
     * Update user.
     *
     * @return Illuminate\Support\Facades\Redirect
     */
    public function updateProfile(Request $request)
    {
        $ruser = $request->user();

        /* Validate incoming data */
        $this->validate($request, [
            'name' => 'required|string|regex:/^[a-zA-Z ]+$/|max:255',
            'title' => 'required|string|regex:/^[a-zA-Z ]+$/|max:255',
            'sector' => 'required|string|regex:/^[a-zA-Z ]+$/|max:255',
            'location' => 'required|string|regex:/^[a-zA-Z ]+$/|max:255',
            'experience' => 'required|integer|min:0|max:50','java' => 'boolean',
			'python' => 'boolean',
			'c' => 'boolean',
			'csharp' => 'boolean',
			'cplus' => 'boolean',
			'php' => 'boolean',
			'html' => 'boolean',
			'css' => 'boolean',
			'javascript' => 'boolean',
			'sql' => 'boolean',
			'unix' => 'boolean',
			'winserver' => 'boolean',
			'windesktop' => 'boolean',
			'linuxdesktop' => 'boolean',
        	'macosdesktop' => 'boolean',
			'pearl' => 'boolean',
			'bash' => 'boolean',
			'batch' => 'boolean',
			'cisco' => 'boolean',
			'office' => 'boolean',
			'r' => 'boolean',
			'go' => 'boolean',
			'ruby' => 'boolean',
			'asp' => 'boolean',
			'scala' => 'boolean',
            'email' => 'required|string|email|max:255|unique:users,email,' . $ruser->id
        ]);

        $user = Auth::user();

        $user->name=$request['name'];
        $user->email=$request['email'];
        $user->title=$request['title'];
        $user->location=$request['location'];
        $user->sector=$request['sector'];
        $user->experience=$request['experience'];

        $user->java=$request['java'];
        $user->python=$request['python'];
        $user->c=$request['c'];
        $user->csharp=$request['csharp'];
        $user->cplus=$request['cplus'];
        $user->php=$request['php'];
        $user->html=$request['html'];
        $user->css=$request['css'];
        $user->javascript=$request['javascript'];
        $user->sql=$request['sql'];
        $user->unix=$request['unix'];
        $user->winserver=$request['winserver'];
        $user->windesktop=$request['windesktop'];
        $user->linuxdesktop=$request['linuxdesktop'];
        $user->macosdesktop=$request['macosdesktop'];
        $user->pearl=$request['pearl'];
        $user->bash=$request['bash'];
        $user->batch=$request['batch'];
        $user->cisco=$request['cisco'];
        $user->office=$request['office'];
        $user->r=$request['r'];
        $user->go=$request['go'];
        $user->ruby=$request['ruby'];
        $user->asp=$request['asp'];
        $user->scala=$request['scala'];

        $user->save();

        return Redirect::route('profile');
    }
}

{'fraction_non_alphanumeric': 0.20910493827160495, 'fraction_numerical': 0.005555555555555556, 'mean_word_length': 2.5806629834254142, 'pattern_counts': {'":': 0, '<': 5, '<?xml version=': 0, '>': 115, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '1548910', 'n_tokens_mistral': 2124, 'n_tokens_neox': 1995, 'n_words': 291}