Skip to content

Commit 260ded2

Browse files
vcnainalavcnainala
authored
Merge pull request #1184 from NFDI4Chem/laravel-11x-migration
Laravel 11x migration
2 parents 5974f5d + 9165f76 commit 260ded2

323 files changed

Lines changed: 833 additions & 3318 deletions

File tree

Some content is hidden

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

‎.env.ci.test‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ DB_DATABASE=nmrxiv
2525
DB_USERNAME=postgres
2626
DB_PASSWORD=postgres
2727

28-
BROADCAST_DRIVER=log
29-
CACHE_DRIVER=file
28+
BROADCAST_CONNECTION=log
29+
CACHE_STORE=file
3030
FILESYSTEM_DRIVER=local
3131
QUEUE_CONNECTION=redis
3232
SESSION_DRIVER=redis

‎.env.example‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ APP_ENV=local
33
APP_KEY=
44
APP_DEBUG=true
55
APP_URL=http://localhost:80
6+
7+
APP_LOCALE=en
8+
APP_FALLBACK_LOCALE=en
9+
APP_FAKER_LOCALE=en_US
10+
APP_MAINTENANCE_DRIVER=file
11+
APP_MAINTENANCE_STORE=database
12+
BCRYPT_ROUNDS=12
613
APP_DESCRIPTION='nmrXiv is currently developed as the FAIR, consensus-driven NMR data repository and computational platform. The ultimate goal is to accelerate broader coordination and data sharing among natural product (NP) researchers by enabling the storage, management, sharing and analysis of NMR data.'
714
COOL_OFF_PERIOD=10
815
SCHEMA_VERSION=beta
@@ -20,6 +27,7 @@ DATACITE_API=https://api.datacite.org/
2027

2128

2229
LOG_CHANNEL=stack
30+
LOG_STACK=single
2331
LOG_LEVEL=debug
2432

2533
DB_CONNECTION=pgsql
@@ -29,12 +37,15 @@ DB_DATABASE=nmrxiv
2937
DB_USERNAME=sail
3038
DB_PASSWORD=password
3139

32-
BROADCAST_DRIVER=log
33-
CACHE_DRIVER=file
40+
BROADCAST_CONNECTION=log
41+
CACHE_STORE=file
3442
FILESYSTEM_DRIVER=local
3543
QUEUE_CONNECTION=redis
3644
SESSION_DRIVER=redis
3745
SESSION_LIFETIME=120
46+
SESSION_ENCRYPT=false
47+
SESSION_PATH=/
48+
SESSION_DOMAIN=null
3849

3950
MEMCACHED_HOST=memcached
4051

‎app/Actions/Jetstream/CreateTeam.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function create($user, array $input)
3131
'personal_team' => false,
3232
]));
3333

34-
//return $team;
34+
// return $team;
3535
return redirect()->route('dashboard')->with('success', 'Team created successfully');
3636
}
3737
}

‎app/Actions/Project/CreateNewProject.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function create(array $input)
5656
$user, ['role' => 'creator']
5757
);
5858
}
59-
$validaton = new Validation();
59+
$validaton = new Validation;
6060
$validaton->save();
6161
$project->associate($validation);
6262
$project->save();

‎app/Actions/Project/DeleteProject.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@ public function deleteStudy($study)
9292
{
9393
$datasets = $study->datasets;
9494
$sample = $study->sample;
95-
//Detach Molecules and Delete Sample
95+
// Detach Molecules and Delete Sample
9696
if ($sample) {
9797
$this->deleteSample($sample);
9898
}
9999
foreach ($datasets as $dataset) {
100100
$this->deleteDatasets($dataset);
101101
}
102-
//Delete Study
102+
// Delete Study
103103
$study->delete();
104104
}
105105

@@ -115,7 +115,7 @@ public function deleteDatasets($dataset)
115115
if ($nmriumInfo) {
116116
$this->deleteNMRium($nmriumInfo);
117117
}
118-
//Delete Dataset
118+
// Delete Dataset
119119
$dataset->delete();
120120
}
121121

@@ -133,26 +133,26 @@ public function deleteProject($project)
133133
$draft = $project->draft;
134134
$validation = $project->validation;
135135

136-
//Detach Authors
136+
// Detach Authors
137137
if ($authors && count($authors) > 0) {
138138
$project->authors()->detach(
139139
$authors
140140
);
141141
}
142-
//Detach Citations
142+
// Detach Citations
143143
if ($citations && count($citations) > 0) {
144144
$project->citations()->detach(
145145
$citations
146146
);
147147
}
148-
//Delete Validations
148+
// Delete Validations
149149
if ($validation) {
150150
$validation->delete();
151151
}
152-
//Delete Project
152+
// Delete Project
153153
$project->delete();
154154

155-
//Delete Draft and Files
155+
// Delete Draft and Files
156156
if ($draft) {
157157
$this->deleteDraft($draft);
158158
}
@@ -183,12 +183,12 @@ public function deleteNMRium($nmriumInfo)
183183
*/
184184
public function deleteDraft($draft)
185185
{
186-
//Delete Files
186+
// Delete Files
187187
$files = $draft->files;
188188
foreach ($files as $file) {
189189
$this->deleteFSO($file);
190190
}
191-
//Delete Draft
191+
// Delete Draft
192192
$draft = $draft->refresh();
193193
$draft->delete();
194194
}

‎app/Actions/Project/InviteProjectMember.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function invite($user, $project, string $email, ?string $role = null, ?st
2828

2929
$this->validate($project, $email, $role, $message);
3030

31-
//InvitingProjectMember::dispatch($project, $email, $role, $message);
31+
// InvitingProjectMember::dispatch($project, $email, $role, $message);
3232

3333
$invitation = $project->projectInvitations()->create([
3434
'email' => $email,

‎app/Actions/Project/UpdateProject.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public function update(Project $project, array $input)
107107
$validation = $project->validation;
108108

109109
if (! $validation) {
110-
$validation = new Validation();
110+
$validation = new Validation;
111111
$validation->save();
112112
$project->validation()->associate($validation);
113113
$project->save();
@@ -145,7 +145,7 @@ public function update(Project $project, array $input)
145145
*/
146146
public function attachAuthor(Project $project, $authors)
147147
{
148-
//dd($authors);
148+
// dd($authors);
149149
$authors_map = [];
150150
$index = 0;
151151
foreach ($authors as $author) {

‎app/Actions/Study/InviteStudyMember.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function invite($user, $study, string $email, ?string $role = null, ?stri
2929

3030
$this->validate($study, $email, $role, $message);
3131

32-
//InvitingStudyMember::dispatch($study, $email, $role, $message);
32+
// InvitingStudyMember::dispatch($study, $email, $role, $message);
3333

3434
$invitation = $study->studyInvitations()->create([
3535
'email' => $email,
@@ -43,7 +43,7 @@ public function invite($user, $study, string $email, ?string $role = null, ?stri
4343
$invitedUser = User::where('email', $invitation->email)->first();
4444

4545
if ($invitedUser) {
46-
//$invitedUser->notify(new StudyInviteNotification($invitation));
46+
// $invitedUser->notify(new StudyInviteNotification($invitation));
4747
event(new StudyInvite($invitedUser, $invitation));
4848
}
4949
}

‎app/Console/Commands/ArchiveData.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class ArchiveData extends Command
2727
/**
2828
* Execute the console command.
2929
*/
30-
public function handle()
30+
public function handle(): void
3131
{
3232
return DB::transaction(function () {
3333
$projects = Project::where([

‎app/Console/Commands/AssignDOIs.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@ class AssignDOIs extends Command
2626

2727
/**
2828
* Execute the console command.
29-
*
30-
* @return int
3129
*/
32-
public function handle(AssignIdentifier $assigner)
30+
public function handle(AssignIdentifier $assigner): int
3331
{
3432
return DB::transaction(function () use ($assigner) {
3533
$projects = Project::where([

0 commit comments

Comments
 (0)