Skip to content

Commit

Permalink
Merge pull request #2 from tracepath/master
Browse files Browse the repository at this point in the history
Update to Laravel 5.8
Thanks @tracepath 
Sorry for not maintaining this app myself, I didn't realize it was used
  • Loading branch information
axeloz authored Oct 3, 2019
2 parents 0078179 + 36ddae4 commit 4c7b5d4
Show file tree
Hide file tree
Showing 9 changed files with 5,912 additions and 2,983 deletions.
13 changes: 13 additions & 0 deletions app/Http/Controllers/UserController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php

namespace app\Http\Controllers;

use Illuminate\Http\Request;

class UserController extends Controller
{
function getUser(Request $request)
{
return $request->user();
}
}
22 changes: 22 additions & 0 deletions app/Http/Controllers/WebController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php

namespace app\Http\Controllers;

use Illuminate\Http\Request;


class WebController extends Controller
{
function homepage(Request $request)
{

if (Upload::canUpload($request->ip()) !== true) {
return view('cannotupload', [
'u' => $request->get('u')
]);
} else {
return redirect()->route('upload.create');
}

}
}
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
"license": "MIT",
"type": "project",
"require": {
"php": ">=5.6.4",
"laravel/framework": "5.4.*",
"laravel/tinker": "~1.0"
"php": "^7.1.3",
"laravel/framework": "5.8.*",
"laravel/tinker": "^1.0"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "~5.7"
"mockery/mockery": "^1.0",
"phpunit/phpunit": "^7.5"
},
"autoload": {
"classmap": [
Expand Down
Loading

0 comments on commit 4c7b5d4

Please sign in to comment.