Skip to content

Commit

Permalink
Revert to App namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
ericwang401 committed Oct 12, 2024
1 parent 3ed6bbd commit 393c86a
Show file tree
Hide file tree
Showing 360 changed files with 1,503 additions and 1,406 deletions.
4 changes: 2 additions & 2 deletions app/Actions/Fortify/CreateNewUser.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Convoy\Actions\Fortify;
namespace App\Actions\Fortify;

use Convoy\Models\User;
use App\Models\User;
use Illuminate\Validation\Rule;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
Expand Down
2 changes: 1 addition & 1 deletion app/Actions/Fortify/PasswordValidationRules.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Convoy\Actions\Fortify;
namespace App\Actions\Fortify;

use Laravel\Fortify\Rules\Password;

Expand Down
2 changes: 1 addition & 1 deletion app/Actions/Fortify/ResetUserPassword.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Convoy\Actions\Fortify;
namespace App\Actions\Fortify;

use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
Expand Down
2 changes: 1 addition & 1 deletion app/Actions/Fortify/UpdateUserPassword.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Convoy\Actions\Fortify;
namespace App\Actions\Fortify;

use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
Expand Down
2 changes: 1 addition & 1 deletion app/Actions/Fortify/UpdateUserProfileInformation.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Convoy\Actions\Fortify;
namespace App\Actions\Fortify;

use Illuminate\Validation\Rule;
use Illuminate\Support\Facades\Validator;
Expand Down
2 changes: 1 addition & 1 deletion app/Casts/NullableEncrypter.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Convoy\Casts;
namespace App\Casts;

use Illuminate\Database\Eloquent\Model;
use Illuminate\Contracts\Encryption\Encrypter;
Expand Down
2 changes: 1 addition & 1 deletion app/Casts/StorageSizeCast.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Convoy\Casts;
namespace App\Casts;

use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
use Illuminate\Database\Eloquent\Model;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace Convoy\Console\Commands\Maintenance;
namespace App\Console\Commands\Maintenance;

use Carbon\CarbonImmutable;
use InvalidArgumentException;
use Illuminate\Console\Command;
use Convoy\Repositories\Eloquent\BackupRepository;
use App\Repositories\Eloquent\BackupRepository;

class PruneOrphanedBackupsCommand extends Command
{
Expand Down
6 changes: 3 additions & 3 deletions app/Console/Commands/Maintenance/PruneUsersCommand.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php

namespace Convoy\Console\Commands\Maintenance;
namespace App\Console\Commands\Maintenance;

use Convoy\Models\Node;
use App\Models\Node;
use Illuminate\Console\Command;
use Convoy\Jobs\Node\PruneUsersJob;
use App\Jobs\Node\PruneUsersJob;
use Illuminate\Console\View\Components\Task;

class PruneUsersCommand extends Command
Expand Down
4 changes: 2 additions & 2 deletions app/Console/Commands/Server/ResetUsagesCommand.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Convoy\Console\Commands\Server;
namespace App\Console\Commands\Server;

use Convoy\Models\Server;
use App\Models\Server;
use Illuminate\Console\Command;

class ResetUsagesCommand extends Command
Expand Down
6 changes: 3 additions & 3 deletions app/Console/Commands/Server/UpdateRateLimitsCommand.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace Convoy\Console\Commands\Server;
namespace App\Console\Commands\Server;

use Convoy\Models\Node;
use App\Models\Node;
use Illuminate\Console\Command;
use Illuminate\Console\View\Components\Task;
use Convoy\Jobs\Node\SyncServerRateLimitsJob;
use App\Jobs\Node\SyncServerRateLimitsJob;

class UpdateRateLimitsCommand extends Command
{
Expand Down
6 changes: 3 additions & 3 deletions app/Console/Commands/Server/UpdateUsagesCommand.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php

namespace Convoy\Console\Commands\Server;
namespace App\Console\Commands\Server;

use Convoy\Models\Node;
use App\Models\Node;
use Illuminate\Console\Command;
use Convoy\Jobs\Node\SyncServerUsagesJob;
use App\Jobs\Node\SyncServerUsagesJob;
use Illuminate\Console\View\Components\Task;

class UpdateUsagesCommand extends Command
Expand Down
6 changes: 3 additions & 3 deletions app/Console/Commands/User/MakeUserCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
SOFTWARE.
*/

namespace Convoy\Console\Commands\User;
namespace App\Console\Commands\User;

use Exception;
use Convoy\Models\User;
use App\Models\User;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Hash;
use Convoy\Exceptions\Model\DataValidationException;
use App\Exceptions\Model\DataValidationException;

class MakeUserCommand extends Command
{
Expand Down
14 changes: 7 additions & 7 deletions app/Console/Kernel.php
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?php

namespace Convoy\Console;
namespace App\Console;

use Convoy\Models\ActivityLog;
use App\Models\ActivityLog;
use Illuminate\Console\Scheduling\Schedule;
use Illuminate\Database\Console\PruneCommand;
use Convoy\Console\Commands\Server\ResetUsagesCommand;
use Convoy\Console\Commands\Server\UpdateUsagesCommand;
use App\Console\Commands\Server\ResetUsagesCommand;
use App\Console\Commands\Server\UpdateUsagesCommand;
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
use Convoy\Console\Commands\Maintenance\PruneUsersCommand;
use Convoy\Console\Commands\Server\UpdateRateLimitsCommand;
use Convoy\Console\Commands\Maintenance\PruneOrphanedBackupsCommand;
use App\Console\Commands\Maintenance\PruneUsersCommand;
use App\Console\Commands\Server\UpdateRateLimitsCommand;
use App\Console\Commands\Maintenance\PruneOrphanedBackupsCommand;

class Kernel extends ConsoleKernel
{
Expand Down
6 changes: 3 additions & 3 deletions app/Contracts/Repository/ActivityRepositoryInterface.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace Convoy\Contracts\Repository;
namespace App\Contracts\Repository;

use Convoy\Models\Server;
use Convoy\Models\ActivityLog;
use App\Models\Server;
use App\Models\ActivityLog;

interface ActivityRepositoryInterface extends RepositoryInterface
{
Expand Down
6 changes: 3 additions & 3 deletions app/Contracts/Repository/RepositoryInterface.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?php

namespace Convoy\Contracts\Repository;
namespace App\Contracts\Repository;

use Closure;
use Illuminate\Support\Collection;
use Convoy\Exceptions\Model\DataValidationException;
use App\Exceptions\Model\DataValidationException;
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
use Convoy\Exceptions\Repository\RecordNotFoundException;
use App\Exceptions\Repository\RecordNotFoundException;

interface RepositoryInterface
{
Expand Down
6 changes: 3 additions & 3 deletions app/Contracts/Repository/ServerRepositoryInterface.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace Convoy\Contracts\Repository;
namespace App\Contracts\Repository;

use Convoy\Models\Server;
use Convoy\Exceptions\Repository\RecordNotFoundException;
use App\Models\Server;
use App\Exceptions\Repository\RecordNotFoundException;

interface ServerRepositoryInterface extends RepositoryInterface
{
Expand Down
7 changes: 3 additions & 4 deletions app/Data/Helpers/ChecksumData.php
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
<?php

namespace Convoy\Data\Helpers;
namespace App\Data\Helpers;

use Spatie\LaravelData\Data;
use Convoy\Enums\Helpers\ChecksumAlgorithm;
use App\Enums\Helpers\ChecksumAlgorithm;

class ChecksumData extends Data
{
public function __construct(
public string $checksum,
public ChecksumAlgorithm $algorithm,
)
{
) {
}
}
7 changes: 3 additions & 4 deletions app/Data/Node/Access/CreateUserData.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace Convoy\Data\Node\Access;
namespace App\Data\Node\Access;

use Carbon\Carbon;
use Spatie\LaravelData\Data;
use Spatie\LaravelData\Casts\EnumCast;
use Convoy\Enums\Node\Access\RealmType;
use App\Enums\Node\Access\RealmType;
use Spatie\LaravelData\Attributes\WithCast;
use Spatie\LaravelData\Attributes\Validation\Min;
use Spatie\LaravelData\Attributes\Validation\Max;
Expand All @@ -21,7 +21,6 @@ public function __construct(
#[Min(1), Max(64)]
public ?string $password = null,
public ?Carbon $expires_at = null,
)
{
) {
}
}
9 changes: 4 additions & 5 deletions app/Data/Node/Access/UserCredentialsData.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace Convoy\Data\Node\Access;
namespace App\Data\Node\Access;

use Spatie\LaravelData\Data;
use Convoy\Enums\Node\Access\RealmType;
use App\Enums\Node\Access\RealmType;

class UserCredentialsData extends Data
{
Expand All @@ -12,8 +12,7 @@ public function __construct(
public RealmType $realm_type,
public string $ticket,
public string $csrf_token,
)
{
) {

}

Expand All @@ -26,4 +25,4 @@ public static function fromRaw(array $raw): UserCredentialsData
'csrf_token' => $raw['CSRFPreventionToken'],
]);
}
}
}
7 changes: 3 additions & 4 deletions app/Data/Node/Access/UserData.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?php

namespace Convoy\Data\Node\Access;
namespace App\Data\Node\Access;

use Carbon\Carbon;
use Illuminate\Support\Arr;
use Spatie\LaravelData\Data;
use Spatie\LaravelData\Casts\EnumCast;
use Convoy\Enums\Node\Access\RealmType;
use App\Enums\Node\Access\RealmType;
use Spatie\LaravelData\Attributes\WithCast;

class UserData extends Data
Expand All @@ -18,8 +18,7 @@ public function __construct(
public RealmType $realm_type,
public bool $enabled,
public ?Carbon $expires_at,
)
{
) {
}

public static function fromRaw(array $raw): UserData
Expand Down
5 changes: 2 additions & 3 deletions app/Data/Node/Storage/FileMetaData.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Convoy\Data\Node\Storage;
namespace App\Data\Node\Storage;

use Spatie\LaravelData\Data;

Expand All @@ -10,7 +10,6 @@ public function __construct(
public string $file_name,
public string $mime_type,
public int $size,
)
{
) {
}
}
5 changes: 2 additions & 3 deletions app/Data/Node/Storage/IsoData.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Convoy\Data\Node\Storage;
namespace App\Data\Node\Storage;

use Carbon\CarbonInterface;
use Spatie\LaravelData\Data;
Expand All @@ -11,7 +11,6 @@ public function __construct(
public string $file_name,
public int $size,
public CarbonInterface $created_at,
)
{
) {
}
}
7 changes: 3 additions & 4 deletions app/Data/Server/Deployments/CloudinitAddressConfigData.php
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
<?php

namespace Convoy\Data\Server\Deployments;
namespace App\Data\Server\Deployments;

use Spatie\LaravelData\Data;
use Convoy\Data\Server\Eloquent\AddressData;
use App\Data\Server\Eloquent\AddressData;

class CloudinitAddressConfigData extends Data
{
public function __construct(
public ?AddressData $ipv4,
public ?AddressData $ipv6,
)
{
) {
}
}
9 changes: 4 additions & 5 deletions app/Data/Server/Deployments/ServerDeploymentData.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace Convoy\Data\Server\Deployments;
namespace App\Data\Server\Deployments;

use Convoy\Models\Server;
use Convoy\Models\Template;
use App\Models\Server;
use App\Models\Template;
use Spatie\LaravelData\Data;

class ServerDeploymentData extends Data
Expand All @@ -14,7 +14,6 @@ public function __construct(
public string $account_password,
public bool $should_create_server,
public bool $start_on_completion,
)
{
) {
}
}
5 changes: 2 additions & 3 deletions app/Data/Server/Eloquent/AddressData.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Convoy\Data\Server\Eloquent;
namespace App\Data\Server\Eloquent;

use Spatie\LaravelData\Data;
use Spatie\LaravelData\Attributes\Validation\IP;
Expand All @@ -19,7 +19,6 @@ public function __construct(
public int $cidr,
public string $gateway,
public ?string $mac_address,
)
{
) {
}
}
Loading

0 comments on commit 393c86a

Please sign in to comment.