Skip to content

Commit

Permalink
sort php8 vs php7.4 errors
Browse files Browse the repository at this point in the history
  • Loading branch information
dave-mills committed Nov 23, 2021
1 parent d1a319f commit 53c72fb
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 113 deletions.
6 changes: 5 additions & 1 deletion app/Exports/XlsChoicesExport.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@

class XlsChoicesExport implements FromCollection, WithTitle, WithHeadings, WithMapping
{
public function __construct(public Xlsform $xlsform){}
public Xlsform $xlsform;

public function __construct(Xlsform $xlsform){
$this->xlsform = $xlsform;
}

public function collection()
{
Expand Down
6 changes: 5 additions & 1 deletion app/Exports/XlsFormExport.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
class XlsFormExport implements WithMultipleSheets
{

public function __construct (public Xlsform $xlsform){}
public Xlsform $xlsform;

public function __construct (Xlsform $xlsform){
$this->xlsform = $xlsform;
}

public function sheets(): array
{
Expand Down
6 changes: 5 additions & 1 deletion app/Exports/XlsSettingsExport.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@
class XlsSettingsExport implements FromCollection, WithTitle
{

public function __construct (public Xlsform $xlsform){}
public Xlsform $xlsform;

public function __construct (Xlsform $xlsform){
$this->xlsform = $xlsform;
}

public function collection()
{
Expand Down
6 changes: 5 additions & 1 deletion app/Exports/XlsSurveyExport.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@
class XlsSurveyExport implements FromCollection, WithHeadings, WithMapping, WithTitle
{

public function __construct (public Xlsform $xlsform){}
public Xlsform $xlsform;

public function __construct (Xlsform $xlsform){
$this->xlsform = $xlsform;
}


public function collection()
Expand Down
2 changes: 0 additions & 2 deletions app/Http/Controllers/Auth/RegisteredUserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ public function store(Request $request)
]
);
}
dump($response->ok());
dump($response->body());

// After registering, authenticate via the standard LoginRequest()

Expand Down
6 changes: 5 additions & 1 deletion app/Jobs/ImportCoreRowsToSurveysTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@ class ImportCoreRowsToSurveysTable implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

public Collection $rows;

/**
* Create a new job instance.
*
* @return void
*/
public function __construct(public Collection $rows){}
public function __construct(Collection $rows){
$this->rows = $rows;
}

/**
* Execute the job.
Expand Down
2 changes: 1 addition & 1 deletion artisan
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env php
<?php
/** @noinspection ALL */<?php

define('LARAVEL_START', microtime(true));

Expand Down
4 changes: 2 additions & 2 deletions resources/views/components/dropdown.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@props(['align' => 'right', 'width' => '48', 'contentClasses' => 'py-1 bg-white'])

@php
switch ($align) {
/** @noinspection PhpUndefinedVariableInspection */switch ($align) {
case 'left':
$alignmentClasses = 'origin-top-left left-0';
break;
Expand All @@ -14,7 +14,7 @@
break;
}
switch ($width) {
/** @noinspection PhpUndefinedVariableInspection */switch ($width) {
case '48':
$width = 'w-48';
break;
Expand Down
4 changes: 2 additions & 2 deletions resources/views/errors/layout.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{{-- show error using sidebar layout if looged in AND on an admin page; otherwise use a blank page --}}

@php
$title = 'Error '.$error_number;
/** @noinspection PhpUndefinedVariableInspection */$title = 'Error '.$error_number;
@endphp

@section('after_styles')
Expand Down Expand Up @@ -54,4 +54,4 @@
</div>
</div>
</div>
@endsection
@endsection
100 changes: 0 additions & 100 deletions resources/views/layouts/navigation.blade.php

This file was deleted.

2 changes: 1 addition & 1 deletion resources/views/vendor/backpack/crud/import.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@extends(backpack_view('blank'))

@php
$defaultBreadcrumbs = [
/** @noinspection PhpUndefinedVariableInspection */$defaultBreadcrumbs = [
trans('backpack::crud.admin') => url(config('backpack.base.route_prefix'), 'dashboard'),
$crud->entity_name_plural => url($crud->route),
trans('backpack::crud.add') => false,
Expand Down

0 comments on commit 53c72fb

Please sign in to comment.