Skip to content

Commit 90f5ac2

Browse files
committed
Upgrade to PHP 8.0, which was long overdue
1 parent c8a2f72 commit 90f5ac2

File tree

7 files changed

+24
-4064
lines changed

7 files changed

+24
-4064
lines changed

app/Http/routes.php

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
* It's a breeze. Simply tell Laravel the URIs it should respond to
1010
* and give it the controller to call when that URI is requested.
1111
*/
12+
13+
use Illuminate\Support\Facades\Redirect;
14+
use Illuminate\Support\Facades\Route;
15+
1216
Route::get('/', 'Welcome@index');
1317
Route::get('/route', 'RouteController@index');
1418
Route::get('/language', 'LanguageController@index');

app/Providers/EventServiceProvider.php

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Providers;
44

5+
use Illuminate\Contracts\Events\Dispatcher;
56
use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
67
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
78

@@ -21,13 +22,11 @@ class EventServiceProvider extends ServiceProvider
2122
/**
2223
* Register any other events for your application.
2324
*
24-
* @param \Illuminate\Contracts\Events\Dispatcher $events
2525
* @return void
2626
*/
27-
public function boot(DispatcherContract $events)
27+
public function boot()
2828
{
29-
parent::boot($events);
30-
31-
//
29+
parent::boot();
3230
}
31+
3332
}

app/Providers/RouteServiceProvider.php

+4-7
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace App\Providers;
44

5-
use Illuminate\Routing\Router;
65
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
6+
use Illuminate\Routing\Router;
77

88
class RouteServiceProvider extends ServiceProvider
99
{
@@ -19,20 +19,17 @@ class RouteServiceProvider extends ServiceProvider
1919
/**
2020
* Define your route model bindings, pattern filters, etc.
2121
*
22-
* @param \Illuminate\Routing\Router $router
2322
* @return void
2423
*/
25-
public function boot(Router $router)
24+
public function boot()
2625
{
27-
//
28-
29-
parent::boot($router);
26+
parent::boot();
3027
}
3128

3229
/**
3330
* Define the routes for the application.
3431
*
35-
* @param \Illuminate\Routing\Router $router
32+
* @param Router $router
3633
* @return void
3734
*/
3835
public function map(Router $router)

artisan

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/usr/bin/env php
22
<?php
33

4+
define('LARAVEL_START', microtime(true));
5+
46
/*
57
|--------------------------------------------------------------------------
68
| Register The Auto Loader
@@ -13,7 +15,7 @@
1315
|
1416
*/
1517

16-
require __DIR__.'/bootstrap/autoload.php';
18+
require __DIR__.'/vendor/autoload.php';
1719

1820
$app = require_once __DIR__.'/bootstrap/app.php';
1921

@@ -40,7 +42,7 @@ $status = $kernel->handle(
4042
| Shutdown The Application
4143
|--------------------------------------------------------------------------
4244
|
43-
| Once Artisan has finished running. We will fire off the shutdown events
45+
| Once Artisan has finished running, we will fire off the shutdown events
4446
| so that any final work may be done by the application before we shut
4547
| down the process. This is the last thing to happen to the request.
4648
|

composer.json

+8-14
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
11
{
2-
"name": "iRail/hyperRail",
2+
"name": "irail/hyperrail",
33
"description": "The web interface of iRail.be",
44
"keywords": [],
55
"license": "CC0-1.0",
66
"type": "project",
77
"require": {
8-
"php": ">=5.5.9",
9-
"laravel/framework": "5.1.*",
8+
"php": ">=8.0",
9+
"laravel/framework": "^6.19",
1010
"easyrdf/easyrdf": "*",
1111
"semsol/arc2": "*",
1212
"ml/json-ld": "1.*",
13-
"irail/stations": "^1.1",
14-
"guzzlehttp/guzzle": "~6.0",
15-
"barryvdh/laravel-debugbar": "^2.0",
13+
"irail/stations": "^1.6",
14+
"guzzlehttp/guzzle": "^7.2",
1615
"willdurand/negotiation": "^1.5.0"
1716
},
1817
"require-dev": {
19-
"fzaninotto/faker": "~1.4",
2018
"mockery/mockery": "0.9.*",
21-
"phpunit/phpunit": "~4.0",
22-
"phpspec/phpspec": "~2.1",
23-
"laravel/homestead": "^2.1"
19+
"phpunit/phpunit": "^9.0",
20+
"phpspec/phpspec": "^6.3"
2421
},
2522
"autoload": {
2623
"classmap": [
@@ -38,15 +35,12 @@
3835
"scripts": {
3936
"post-install-cmd": [
4037
"php artisan clear-compiled",
41-
"php artisan optimize",
4238
"cd vendor/irail/stations; npm install ; node bin/build.js > stations.jsonld"
4339
],
4440
"pre-update-cmd": [
45-
"php artisan clear-compiled"
4641
],
4742
"post-update-cmd": [
48-
"cd vendor/irail/stations; npm install ; node bin/build.js > stations.jsonld",
49-
"php artisan optimize"
43+
"cd vendor/irail/stations; npm install ; node bin/build.js > stations.jsonld"
5044
]
5145
},
5246
"config": {

0 commit comments

Comments
 (0)