Skip to content

Commit b0a5b45

Browse files
ChristophWurstChristophWurst
committed
Update Laravel to v5.6
Signed-off-by: Christoph Wurst <[email protected]>
1 parent 10e363f commit b0a5b45

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+2420
-1117
lines changed

Diff for: ‎app/Auth/Abilities/CompetitionAbilities.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
use App\MasterData\Association;
2525
use App\MasterData\Competition;
2626
use App\MasterData\CompetitionState;
27-
use App\TastingStage;
2827
use App\MasterData\User;
28+
use App\TastingStage;
2929
use Illuminate\Support\Facades\Log;
3030

3131
class CompetitionAbilities {

Diff for: ‎app/Console/Commands/ChangePassword.php

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace App\Console\Commands;
44

55
use App\Contracts\MasterDataStore;
6-
use App\Exceptions\ValidationException;
76
use Illuminate\Console\Command;
87

98
class ChangePassword extends Command

Diff for: ‎app/Database/Repositories/TastingSessionRepository.php

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
namespace App\Database\Repositories;
2323

2424
use App\MasterData\Competition;
25-
use App\MasterData\User;
2625
use App\Tasting\TastingSession;
2726
use App\Tasting\TastingStage;
2827

Diff for: ‎app/FlawExport.php

+15-15
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
use Illuminate\Support\Collection;
2525
use Illuminate\Support\Facades\Log;
2626
use Illuminate\Support\Str;
27-
use PHPExcel;
28-
use PHPExcel_Settings;
29-
use PHPExcel_Worksheet;
30-
use PHPExcel_Worksheet_PageSetup;
31-
use PHPExcel_Writer_Excel5;
27+
use PhpSpreadsheet\Spreadsheet;
28+
use PhpOffice\PhpSpreadsheet\Settings;
29+
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
30+
use PhpSpreadsheet\Worksheet\PageSetup;;
31+
use PhpSpreadsheet\Writer\Xls;
3232

3333
class FlawExport {
3434

@@ -52,9 +52,9 @@ class FlawExport {
5252
/**
5353
* Set worksheets first rows header values
5454
*
55-
* @param PHPExcel_Worksheet $sheet
55+
* @param \PhpOffice\PhpSpreadsheet\Spreadsheet $sheet
5656
*/
57-
private function setExcelHeaders(PHPExcel_Worksheet $sheet) {
57+
private function setExcelHeaders(\PhpOffice\PhpSpreadsheet\Spreadsheet $sheet) {
5858
//headers
5959
$sheet->setCellValue("A1", $this->headers[0]);
6060
$sheet->setCellValue("B1", $this->headers[1]);
@@ -74,9 +74,9 @@ private function setExcelHeaders(PHPExcel_Worksheet $sheet) {
7474
/**
7575
* Set worksheets data rows
7676
*
77-
* @param PHPExcel_Worksheet $sheet
77+
* @param \PhpOffice\PhpSpreadsheet\Spreadsheet $sheet
7878
*/
79-
private function setExcelData(PHPExcel_Worksheet $sheet) {
79+
private function setExcelData(\PhpOffice\PhpSpreadsheet\Spreadsheet $sheet) {
8080
//data
8181
$row = 2;
8282
foreach ($this->wines as $w) {
@@ -116,19 +116,19 @@ public function __construct(Collection $wines) {
116116
public function asExcel() {
117117
$filename = sys_get_temp_dir() . '/' . Str::random();
118118
$locale = 'de_DE';
119-
$validLocale = PHPExcel_Settings::setLocale($locale);
119+
$validLocale = Settings::setLocale($locale);
120120
if (!$validLocale) {
121121
Log::warning('Unable to set locale to ' . $locale . " - reverting to en_us" . PHP_EOL);
122122
}
123-
$doc = new PHPExcel();
124-
$sheet = $doc->getSheet();
125-
$layout = new PHPExcel_Worksheet_PageSetup();
126-
$layout->setPaperSize(PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4);
123+
$doc = new Spreadsheet();
124+
$sheet = $doc->getSheet(0);
125+
$layout = new PageSetup();
126+
$layout->setPaperSize(PageSetup::PAPERSIZE_A4);
127127
$sheet->setPageSetup($layout);
128128
$sheet->setTitle('Fehlerprotokoll');
129129
$this->setExcelHeaders($sheet);
130130
$this->setExcelData($sheet);
131-
$writer = new PHPExcel_Writer_Excel5($doc);
131+
$writer = new Xls($doc);
132132
$writer->save($filename);
133133
return $filename;
134134
}

Diff for: ‎app/Http/Controllers/ActivityLogController.php

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
namespace App\Http\Controllers;
2323

2424
use App\Contracts\ActivityLogger;
25-
use App\Http\Controllers\BaseController;
2625
use Illuminate\Contracts\View\Factory;
2726
use Illuminate\Http\Response;
2827

Diff for: ‎app/Http/Controllers/AddressCatalogueExport.php

+16-15
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@
2323

2424
use Illuminate\Support\Collection;
2525
use Illuminate\Support\Str;
26-
use PHPExcel;
27-
use PHPExcel_Settings;
28-
use PHPExcel_Worksheet;
29-
use PHPExcel_Worksheet_PageSetup;
30-
use PHPExcel_Writer_Excel5;
26+
use PhpOffice\PhpSpreadsheet\Settings;
27+
use PhpSpreadsheet\Spreadsheet;
28+
use PhpSpreadsheet\Worksheet\PageSetup;
29+
use PhpSpreadsheet\Writer\Xls;
30+
31+
;
3132

3233
class AddressCatalogueExport {
3334

@@ -51,9 +52,9 @@ class AddressCatalogueExport {
5152
/**
5253
* Set worksheets first rows header values
5354
*
54-
* @param PHPExcel_Worksheet $sheet
55+
* @param \PhpOffice\PhpSpreadsheet\Spreadsheet $sheet
5556
*/
56-
private function setExcelHeaders(PHPExcel_Worksheet $sheet) {
57+
private function setExcelHeaders(\PhpOffice\PhpSpreadsheet\Spreadsheet $sheet) {
5758
//headers
5859
$sheet->setCellValue("A1", $this->headers[0]);
5960
$sheet->setCellValue("B1", $this->headers[1]);
@@ -62,9 +63,9 @@ private function setExcelHeaders(PHPExcel_Worksheet $sheet) {
6263
/**
6364
* Set worksheets data rows
6465
*
65-
* @param PHPExcel_Worksheet $sheet
66+
* @param \PhpOffice\PhpSpreadsheet\Spreadsheet $sheet
6667
*/
67-
private function setExcelData(PHPExcel_Worksheet $sheet) {
68+
private function setExcelData(\PhpOffice\PhpSpreadsheet\Spreadsheet $sheet) {
6869
//data
6970
$row = 2;
7071
foreach ($this->addresses as $address) {
@@ -91,19 +92,19 @@ public function __construct(Collection $addresses) {
9192
public function asExcel() {
9293
$filename = sys_get_temp_dir() . '/' . Str::random();
9394
$locale = 'de_DE';
94-
$validLocale = PHPExcel_Settings::setLocale($locale);
95+
$validLocale = Settings::setLocale($locale);
9596
if (!$validLocale) {
9697
Log::warning('Unable to set locale to ' . $locale . " - reverting to en_us" . PHP_EOL);
9798
}
98-
$doc = new PHPExcel();
99-
$sheet = $doc->getSheet();
100-
$layout = new PHPExcel_Worksheet_PageSetup();
101-
$layout->setPaperSize(PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4);
99+
$doc = new Spreadsheet();
100+
$sheet = $doc->getSheet(0);
101+
$layout = new PageSetup();
102+
$layout->setPaperSize(PageSetup::PAPERSIZE_A4);
102103
$sheet->setPageSetup($layout);
103104
$sheet->setTitle('Adresskatalog');
104105
$this->setExcelHeaders($sheet);
105106
$this->setExcelData($sheet);
106-
$writer = new PHPExcel_Writer_Excel5($doc);
107+
$writer = new Xls($doc);
107108
$writer->save($filename);
108109
return $filename;
109110
}

Diff for: ‎app/Http/Controllers/AdminTastingCatalogueExport.php

+16-15
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@
2323

2424
use Illuminate\Support\Collection;
2525
use Illuminate\Support\Str;
26-
use PHPExcel;
27-
use PHPExcel_Settings;
28-
use PHPExcel_Worksheet;
29-
use PHPExcel_Worksheet_PageSetup;
30-
use PHPExcel_Writer_Excel5;
26+
use PhpOffice\PhpSpreadsheet\Settings;
27+
use PhpSpreadsheet\Spreadsheet;
28+
use PhpSpreadsheet\Worksheet\PageSetup;
29+
use PhpSpreadsheet\Writer\Xls;
30+
31+
;
3132

3233
class AdminTastingCatalogueExport {
3334

@@ -60,9 +61,9 @@ class AdminTastingCatalogueExport {
6061
/**
6162
* Set worksheets first rows header values
6263
*
63-
* @param PHPExcel_Worksheet $sheet
64+
* @param \PhpOffice\PhpSpreadsheet\Spreadsheet $sheet
6465
*/
65-
private function setExcelHeaders(PHPExcel_Worksheet $sheet) {
66+
private function setExcelHeaders(\PhpOffice\PhpSpreadsheet\Spreadsheet $sheet) {
6667
//headers
6768
$sheet->setCellValue("A1", $this->headers[0]);
6869
$sheet->setCellValue("B1", $this->headers[1]);
@@ -80,9 +81,9 @@ private function setExcelHeaders(PHPExcel_Worksheet $sheet) {
8081
/**
8182
* Set worksheets data rows
8283
*
83-
* @param PHPExcel_Worksheet $sheet
84+
* @param \PhpOffice\PhpSpreadsheet\Spreadsheet $sheet
8485
*/
85-
private function setExcelData(PHPExcel_Worksheet $sheet) {
86+
private function setExcelData(\PhpOffice\PhpSpreadsheet\Spreadsheet $sheet) {
8687
// Sort data
8788
$this->wines = $this->wines->sort(function($wine1, $wine2) {
8889
return $wine1->applicant->association->id - $wine2->applicant->association->id;
@@ -128,19 +129,19 @@ public function __construct(Collection $wines) {
128129
public function asExcel() {
129130
$filename = sys_get_temp_dir() . '/' . Str::random();
130131
$locale = 'de_DE';
131-
$validLocale = PHPExcel_Settings::setLocale($locale);
132+
$validLocale = Settings::setLocale($locale);
132133
if (!$validLocale) {
133134
Log::warning('Unable to set locale to ' . $locale . " - reverting to en_us" . PHP_EOL);
134135
}
135-
$doc = new PHPExcel();
136-
$sheet = $doc->getSheet();
137-
$layout = new PHPExcel_Worksheet_PageSetup();
138-
$layout->setPaperSize(PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4);
136+
$doc = new Spreadsheet();
137+
$sheet = $doc->getSheet(0);
138+
$layout = new PageSetup();
139+
$layout->setPaperSize(PageSetup::PAPERSIZE_A4);
139140
$sheet->setPageSetup($layout);
140141
$sheet->setTitle('Kostkatalog');
141142
$this->setExcelHeaders($sheet);
142143
$this->setExcelData($sheet);
143-
$writer = new PHPExcel_Writer_Excel5($doc);
144+
$writer = new Xls($doc);
144145
$writer->save($filename);
145146
return $filename;
146147
}

Diff for: ‎app/Http/Controllers/AnnouncementsController.php

-4
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,14 @@
2323

2424
use App\Mail\Announcement;
2525
use App\MasterData\Applicant;
26-
use App\MasterData\Download;
27-
use App\MasterData\User;
2826
use Illuminate\Auth\AuthManager;
2927
use Illuminate\Contracts\View\Factory;
3028
use Illuminate\Contracts\View\View;
3129
use Illuminate\Http\Request;
3230
use Illuminate\Http\Response;
3331
use Illuminate\Support\Facades\Mail;
3432
use Illuminate\Support\Facades\Redirect;
35-
use Illuminate\Support\Facades\Storage;
3633
use function pathinfo;
37-
use function storage_path;
3834

3935
class AnnouncementsController extends BaseController
4036
{

Diff for: ‎app/Http/Controllers/ApplicantController.php

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
use App\Contracts\MasterDataStore;
2525
use App\Exceptions\ValidationException;
26-
use App\Http\Controllers\BaseController;
2726
use App\MasterData\Applicant;
2827
use App\MasterData\User;
2928
use Illuminate\Auth\AuthManager;

Diff for: ‎app/Http/Controllers/AssociationController.php

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
use App\Contracts\MasterDataStore;
2525
use App\Exceptions\ValidationException;
26-
use App\Http\Controllers\BaseController;
2726
use App\MasterData\Association;
2827
use Illuminate\Auth\AuthManager;
2928
use Illuminate\Contracts\View\Factory;

Diff for: ‎app/Http/Controllers/Auth/ForgotPasswordController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
use App\Http\Controllers\Controller;
66
use App\MasterData\User;
7-
use function back;
87
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
98
use Illuminate\Support\Facades\Password;
109
use Symfony\Component\HttpFoundation\Request;
10+
use function back;
1111

1212
class ForgotPasswordController extends Controller
1313
{

Diff for: ‎app/Http/Controllers/Auth/LoginController.php

-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44

55
use App\Contracts\ActivityLogger;
66
use App\Http\Controllers\BaseController;
7-
use App\Http\Controllers\Controller;
87
use Illuminate\Auth\AuthManager;
98
use Illuminate\Contracts\View\Factory;
10-
use Illuminate\Foundation\Auth\AuthenticatesUsers;
119
use Illuminate\Http\Request;
1210
use Illuminate\Support\Facades\Redirect;
1311
use Illuminate\Support\Facades\Session;

Diff for: ‎app/Http/Controllers/Auth/RegisterController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
namespace App\Http\Controllers\Auth;
44

5-
use App\User;
65
use App\Http\Controllers\Controller;
7-
use Illuminate\Support\Facades\Validator;
6+
use App\User;
87
use Illuminate\Foundation\Auth\RegistersUsers;
8+
use Illuminate\Support\Facades\Validator;
99

1010
class RegisterController extends Controller
1111
{

Diff for: ‎app/Http/Controllers/CompetitionController.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,11 @@
2424
use App\Contracts\MasterDataStore;
2525
use App\Contracts\TastingCatalogueHandler;
2626
use App\Contracts\TastingHandler;
27-
use App\Http\Controllers\BaseController;
2827
use App\MasterData\Association;
2928
use App\MasterData\Competition;
3029
use App\MasterData\CompetitionState;
3130
use App\Tasting\TastingStage;
3231
use App\WinesChosenSignedOff;
33-
use function array_map;
3432
use Illuminate\Auth\AuthManager;
3533
use Illuminate\Contracts\View\Factory;
3634
use Illuminate\Contracts\View\View;
@@ -41,6 +39,7 @@
4139
use Illuminate\Support\Facades\Input;
4240
use Illuminate\Support\Facades\Redirect;
4341
use Symfony\Component\Process\Exception\InvalidArgumentException;
42+
use function array_map;
4443

4544
class CompetitionController extends BaseController {
4645

Diff for: ‎app/Http/Controllers/Controller.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
namespace App\Http\Controllers;
44

5+
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
56
use Illuminate\Foundation\Bus\DispatchesJobs;
6-
use Illuminate\Routing\Controller as BaseController;
77
use Illuminate\Foundation\Validation\ValidatesRequests;
8-
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
8+
use Illuminate\Routing\Controller as BaseController;
99

1010
class Controller extends BaseController
1111
{

Diff for: ‎app/Http/Controllers/DownloadsController.php

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
use App\MasterData\Download;
2525
use Illuminate\Contracts\View\Factory;
26-
use Illuminate\Http\Response;
2726

2827
class DownloadsController extends BaseController {
2928

Diff for: ‎app/Http/Controllers/EvaluationController.php

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
namespace App\Http\Controllers;
2323

24-
use App\Http\Controllers\BaseController;
2524
use App\MasterData\Competition;
2625
use Illuminate\Contracts\View\Factory;
2726
use Illuminate\Http\Response;

0 commit comments

Comments
 (0)