Skip to content

Commit

Permalink
Update composer after enforcing php 8
Browse files Browse the repository at this point in the history
  • Loading branch information
barryo committed Jul 6, 2021
1 parent 56a583b commit 805eb31
Show file tree
Hide file tree
Showing 89 changed files with 216 additions and 364 deletions.
8 changes: 6 additions & 2 deletions .env.travisci
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ GRAPHER_BACKEND_SFLOW_ENABLED=true

IXP_API_JSONEXPORTSCHEMA_PUBLIC=true

MAIL_MAILER=log
MAIL_DRIVER=log

IXP_FE_BETA_CORE_BUNDLES=true

Expand All @@ -46,4 +46,8 @@ IXP_FE_FRONTEND_CUSTOMER_MANY=customers
IXP_FE_FRONTEND_CUSTOMER_OWNER="customer's"
IXP_FE_FRONTEND_CUSTOMER_OWNERS="customers'"

2FA_ENFORCE_FOR_USERS=4





3 changes: 2 additions & 1 deletion .idea/IXP-Manager.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 4 additions & 19 deletions .idea/php.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .phpstorm.meta.php/laravel.meta.php
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@
'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,
Expand Down Expand Up @@ -388,6 +389,7 @@
'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,
Expand Down Expand Up @@ -615,6 +617,7 @@
'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,
Expand Down Expand Up @@ -842,6 +845,7 @@
'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,
Expand Down Expand Up @@ -1069,6 +1073,7 @@
'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,
Expand Down Expand Up @@ -1296,6 +1301,7 @@
'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,
Expand Down Expand Up @@ -1523,6 +1529,7 @@
'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,
Expand Down Expand Up @@ -1750,6 +1757,7 @@
'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,
Expand Down Expand Up @@ -1977,6 +1985,7 @@
'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,
Expand Down Expand Up @@ -2204,6 +2213,7 @@
'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,
Expand Down Expand Up @@ -2431,6 +2441,7 @@
'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,
Expand Down
24 changes: 19 additions & 5 deletions _ide_helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

/**
* A helper file for Laravel, to provide autocomplete information to your IDE
* Generated for Laravel 8.47.0.
* Generated for Laravel 8.49.1.
*
* This file should not be included in your code, only analyzed by your IDE!
*
Expand Down Expand Up @@ -1978,7 +1978,7 @@ public static function logoutCurrentDevice()
*
* @param string $password
* @param string $attribute
* @return bool|null
* @return \IXP\Models\User|null
* @throws \Illuminate\Auth\AuthenticationException
* @static
*/
Expand Down Expand Up @@ -7243,6 +7243,8 @@ public static function hasMacro($name)
/**
*
*
* @method static \Illuminate\Log\Logger withContext(array $context = [])
* @method static \Illuminate\Log\Logger withoutContext()
* @method static void write(string $level, string $message, array $context = [])
* @method static void listen(\Closure $callback)
* @see \Illuminate\Log\Logger
Expand Down Expand Up @@ -13127,6 +13129,18 @@ public static function cloud()
{
/** @var \Illuminate\Filesystem\FilesystemManager $instance */
return $instance->cloud();
}
/**
* Build an on-demand disk.
*
* @param string|array $config
* @return \Illuminate\Filesystem\FilesystemAdapter
* @static
*/
public static function build($config)
{
/** @var \Illuminate\Filesystem\FilesystemManager $instance */
return $instance->build($config);
}
/**
* Create an instance of the local driver.
Expand Down Expand Up @@ -17533,7 +17547,7 @@ public static function isDirty($attributes = null)
return $instance->isDirty($attributes);
}
/**
* Determine if the model and all the given attribute(s) have remained the same.
* Determine if the model or all the given attribute(s) have remained the same.
*
* @param array|string|null $attributes
* @return bool
Expand Down Expand Up @@ -20492,7 +20506,7 @@ public static function where($column, $operator = null, $value = null, $boolean
* @param mixed $operator
* @param mixed $value
* @param string $boolean
* @return \Illuminate\Database\Eloquent\Model|static
* @return \Illuminate\Database\Eloquent\Model|static|null
* @static
*/
public static function firstWhere($column, $operator = null, $value = null, $boolean = 'and')
Expand Down Expand Up @@ -22185,7 +22199,7 @@ public static function whereNull($columns, $boolean = 'and', $not = false)
/**
* Add an "or where null" clause to the query.
*
* @param string $column
* @param string|array $column
* @return \Illuminate\Database\Query\Builder
* @static
*/
Expand Down
2 changes: 0 additions & 2 deletions app/Models/Aggregators/BgpSessionDataAggregator.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
* @method static Builder|BgpSessionDataAggregator whereTimestamp($value)
* @method static Builder|BgpSessionDataAggregator whereVlan($value)
* @mixin \Eloquent
* @noinspection PhpFullyQualifiedNameUsageInspection
* @noinspection PhpUnnecessaryFullyQualifiedNameInspection
*/
class BgpSessionDataAggregator extends BgpSessionData
{
Expand Down
2 changes: 0 additions & 2 deletions app/Models/Aggregators/ConsoleServerConnectionAggregatore.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@
* @method static Builder|ConsoleServerConnectionAggregatore whereStopbits($value)
* @method static Builder|ConsoleServerConnectionAggregatore whereUpdatedAt($value)
* @mixin \Eloquent
* @noinspection PhpFullyQualifiedNameUsageInspection
* @noinspection PhpUnnecessaryFullyQualifiedNameInspection
*/
class ConsoleServerConnectionAggregatore extends ConsoleServerConnection
{
Expand Down
2 changes: 0 additions & 2 deletions app/Models/Aggregators/ContactGroupAggregator.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@
* @method static Builder|ContactGroupAggregator whereType($value)
* @method static Builder|ContactGroupAggregator whereUpdatedAt($value)
* @mixin \Eloquent
* @noinspection PhpFullyQualifiedNameUsageInspection
* @noinspection PhpUnnecessaryFullyQualifiedNameInspection
*/
class ContactGroupAggregator extends ContactGroup
{
Expand Down
2 changes: 0 additions & 2 deletions app/Models/Aggregators/CustomerAggregator.php
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,6 @@
* @method static Builder|CustomerAggregator whereType($value)
* @method static Builder|CustomerAggregator whereUpdatedAt($value)
* @mixin \Eloquent
* @noinspection PhpFullyQualifiedNameUsageInspection
* @noinspection PhpUnnecessaryFullyQualifiedNameInspection
*/
class CustomerAggregator extends Customer
{
Expand Down
2 changes: 0 additions & 2 deletions app/Models/Aggregators/PatchPanelPortAggregator.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@
* @method static Builder|PatchPanelPortAggregator newQuery()
* @method static Builder|PatchPanelPortAggregator query()
* @mixin \Eloquent
* @noinspection PhpFullyQualifiedNameUsageInspection
* @noinspection PhpUnnecessaryFullyQualifiedNameInspection
*/
class PatchPanelPortAggregator extends PatchPanelPort
{
Expand Down
2 changes: 0 additions & 2 deletions app/Models/Aggregators/RouterAggregator.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@
* @method static Builder|RouterAggregator whereUpdatedAt($value)
* @method static Builder|RouterAggregator whereVlanId($value)
* @mixin \Eloquent
* @noinspection PhpFullyQualifiedNameUsageInspection
* @noinspection PhpUnnecessaryFullyQualifiedNameInspection
*/
class RouterAggregator extends Router
{
Expand Down
2 changes: 0 additions & 2 deletions app/Models/Aggregators/RsPrefixAggregator.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@
* @method static Builder|RsPrefixAggregator whereRsOrigin($value)
* @method static Builder|RsPrefixAggregator whereTimestamp($value)
* @mixin \Eloquent
* @noinspection PhpFullyQualifiedNameUsageInspection
* @noinspection PhpUnnecessaryFullyQualifiedNameInspection
*/
class RsPrefixAggregator extends RsPrefix
{
Expand Down
2 changes: 0 additions & 2 deletions app/Models/Aggregators/SwitchPortAggregator.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@
* @method static Builder|SwitchPortAggregator newQuery()
* @method static Builder|SwitchPortAggregator query()
* @mixin \Eloquent
* @noinspection PhpFullyQualifiedNameUsageInspection
* @noinspection PhpUnnecessaryFullyQualifiedNameInspection
*/
class SwitchPortAggregator extends Model
{
Expand Down
2 changes: 0 additions & 2 deletions app/Models/Aggregators/SwitcherAggregator.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,6 @@
* @method static Builder|SwitcherAggregator whereUpdatedAt($value)
* @method static Builder|SwitcherAggregator whereVendorid($value)
* @mixin \Eloquent
* @noinspection PhpFullyQualifiedNameUsageInspection
* @noinspection PhpUnnecessaryFullyQualifiedNameInspection
*/
class SwitcherAggregator extends Switcher
{
Expand Down
2 changes: 0 additions & 2 deletions app/Models/Aggregators/TrafficDailyPhysIntAggregator.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,6 @@
* @method static Builder|TrafficDailyPhysIntAggregator whereYearTotIn($value)
* @method static Builder|TrafficDailyPhysIntAggregator whereYearTotOut($value)
* @mixin \Eloquent
* @noinspection PhpFullyQualifiedNameUsageInspection
* @noinspection PhpUnnecessaryFullyQualifiedNameInspection
*/
class TrafficDailyPhysIntAggregator extends TrafficDailyPhysInt
{
Expand Down
2 changes: 0 additions & 2 deletions app/Models/Aggregators/UserAggregator.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,6 @@
* @method static \Illuminate\Database\Eloquent\Builder|UserAggregator whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserAggregator whereUsername($value)
* @mixin \Eloquent
* @noinspection PhpFullyQualifiedNameUsageInspection
* @noinspection PhpUnnecessaryFullyQualifiedNameInspection
*/
class UserAggregator extends User
{
Expand Down
2 changes: 0 additions & 2 deletions app/Models/Aggregators/VirtualInterfaceAggregator.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@
* @method static Builder|VirtualInterfaceAggregator whereTrunk($value)
* @method static Builder|VirtualInterfaceAggregator whereUpdatedAt($value)
* @mixin \Eloquent
* @noinspection PhpFullyQualifiedNameUsageInspection
* @noinspection PhpUnnecessaryFullyQualifiedNameInspection
*/
class VirtualInterfaceAggregator extends VirtualInterface
{
Expand Down
2 changes: 0 additions & 2 deletions app/Models/Aggregators/VlanAggregator.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@
* @method static \Illuminate\Database\Eloquent\Builder|VlanAggregator wherePrivate($value)
* @method static \Illuminate\Database\Eloquent\Builder|VlanAggregator whereUpdatedAt($value)
* @mixin \Eloquent
* @noinspection PhpFullyQualifiedNameUsageInspection
* @noinspection PhpUnnecessaryFullyQualifiedNameInspection
*/
class VlanAggregator extends Vlan
{
Expand Down
2 changes: 0 additions & 2 deletions app/Models/Aggregators/VlanInterfaceAggregator.php
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,6 @@
* @method static Builder|VlanInterfaceAggregator whereVirtualinterfaceid($value)
* @method static Builder|VlanInterfaceAggregator whereVlanid($value)
* @mixin \Eloquent
* @noinspection PhpFullyQualifiedNameUsageInspection
* @noinspection PhpUnnecessaryFullyQualifiedNameInspection
*/
class VlanInterfaceAggregator extends VlanInterface
{
Expand Down
2 changes: 0 additions & 2 deletions app/Models/ApiKey.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@
* @method static Builder|ApiKey whereUpdatedAt($value)
* @method static Builder|ApiKey whereUserId($value)
* @mixin \Eloquent
* @noinspection PhpFullyQualifiedNameUsageInspection
* @noinspection PhpUnnecessaryFullyQualifiedNameInspection
*/
class ApiKey extends Model
{
Expand Down
2 changes: 0 additions & 2 deletions app/Models/AtlasMeasurement.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@
* @method static Builder|AtlasMeasurement whereRunId($value)
* @method static Builder|AtlasMeasurement whereUpdatedAt($value)
* @mixin Eloquent
* @noinspection PhpFullyQualifiedNameUsageInspection
* @noinspection PhpUnnecessaryFullyQualifiedNameInspection
*/

class AtlasMeasurement extends Model
Expand Down
2 changes: 0 additions & 2 deletions app/Models/AtlasProbe.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@
* @method static Builder|AtlasProbe whereV4Enabled($value)
* @method static Builder|AtlasProbe whereV6Enabled($value)
* @mixin Eloquent
* @noinspection PhpFullyQualifiedNameUsageInspection
* @noinspection PhpUnnecessaryFullyQualifiedNameInspection
*/
class AtlasProbe extends Model
{
Expand Down
Loading

0 comments on commit 805eb31

Please sign in to comment.