diff --git a/README.md b/README.md
index 1ebf3b222..6b83639d6 100644
--- a/README.md
+++ b/README.md
@@ -4,13 +4,13 @@
- Stripe Integration
- Referral System
- Ticket System
-- Upgrade/Downgrade Server Ressources
+- Upgrade/Downgrade Server Resources
- Store (credit system with hourly billing and invoices)
- Email Verification
- Audit Log
- Admin Dashboard
- User/Server Management
-- Customizable server plans
+- Customisable server plans
- Vouchers
- and so much more!
diff --git a/app/Classes/Pterodactyl.php b/app/Classes/Pterodactyl.php
index 95893dca6..89ae028c4 100644
--- a/app/Classes/Pterodactyl.php
+++ b/app/Classes/Pterodactyl.php
@@ -5,8 +5,9 @@
use App\Models\Egg;
use App\Models\Nest;
use App\Models\Node;
-use App\Models\Server;
use App\Models\Product;
+use App\Models\Server;
+use App\Models\User;
use Exception;
use Illuminate\Http\Client\PendingRequest;
use Illuminate\Http\Client\Response;
@@ -22,136 +23,160 @@ class Pterodactyl
public static function client()
{
return Http::withHeaders([
- 'Authorization' => 'Bearer ' . config("SETTINGS::SYSTEM:PTERODACTYL:TOKEN"),
- 'Content-type' => 'application/json',
- 'Accept' => 'Application/vnd.pterodactyl.v1+json',
- ])->baseUrl(config("SETTINGS::SYSTEM:PTERODACTYL:URL") . '/api');
+ 'Authorization' => 'Bearer ' . config('SETTINGS::SYSTEM:PTERODACTYL:TOKEN'),
+ 'Content-type' => 'application/json',
+ 'Accept' => 'Application/vnd.pterodactyl.v1+json',
+ ])->baseUrl(config('SETTINGS::SYSTEM:PTERODACTYL:URL') . '/api');
}
public static function clientAdmin()
{
return Http::withHeaders([
- 'Authorization' => 'Bearer ' . config("SETTINGS::SYSTEM:PTERODACTYL:ADMIN_USER_TOKEN"),
- 'Content-type' => 'application/json',
- 'Accept' => 'Application/vnd.pterodactyl.v1+json',
- ])->baseUrl(config("SETTINGS::SYSTEM:PTERODACTYL:URL") . '/api');
+ 'Authorization' => 'Bearer ' . config('SETTINGS::SYSTEM:PTERODACTYL:ADMIN_USER_TOKEN'),
+ 'Content-type' => 'application/json',
+ 'Accept' => 'Application/vnd.pterodactyl.v1+json',
+ ])->baseUrl(config('SETTINGS::SYSTEM:PTERODACTYL:URL') . '/api');
}
+
/**
* @return Exception
*/
- private static function getException(string $message = "", int $status = 0): Exception
+ private static function getException(string $message = '', int $status = 0): Exception
{
if ($status == 404) {
- return new Exception("Ressource does not exist on pterodactyl - " . $message, 404);
+ return new Exception('Ressource does not exist on pterodactyl - ' . $message, 404);
}
if ($status == 403) {
- return new Exception("No permission on pterodactyl, check pterodactyl token and permissions - " . $message, 403);
+ return new Exception('No permission on pterodactyl, check pterodactyl token and permissions - ' . $message, 403);
}
if ($status == 401) {
- return new Exception("No pterodactyl token set - " . $message, 401);
+ return new Exception('No pterodactyl token set - ' . $message, 401);
}
if ($status == 500) {
- return new Exception("Pterodactyl server error - " . $message, 500);
+ return new Exception('Pterodactyl server error - ' . $message, 500);
}
return new Exception('Request Failed, is pterodactyl set-up correctly? - ' . $message);
}
/**
- * @param Nest $nest
+ * @param Nest $nest
* @return mixed
+ *
* @throws Exception
*/
public static function getEggs(Nest $nest)
{
try {
- $response = self::client()->get("/application/nests/{$nest->id}/eggs?include=nest,variables&per_page=" . config("SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT"));
+ $response = self::client()->get("/application/nests/{$nest->id}/eggs?include=nest,variables&per_page=" . config('SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT'));
} catch (Exception $e) {
throw self::getException($e->getMessage());
}
- if ($response->failed()) throw self::getException("Failed to get eggs from pterodactyl - ", $response->status());
+ if ($response->failed()) {
+ throw self::getException('Failed to get eggs from pterodactyl - ', $response->status());
+ }
+
return $response->json()['data'];
}
/**
* @return mixed
+ *
* @throws Exception
*/
public static function getNodes()
{
try {
- $response = self::client()->get('/application/nodes?per_page=' . config("SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT"));
+ $response = self::client()->get('/application/nodes?per_page=' . config('SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT'));
} catch (Exception $e) {
throw self::getException($e->getMessage());
}
- if ($response->failed()) throw self::getException("Failed to get nodes from pterodactyl - ", $response->status());
+ if ($response->failed()) {
+ throw self::getException('Failed to get nodes from pterodactyl - ', $response->status());
+ }
+
return $response->json()['data'];
}
/**
* @return mixed
+ *
* @throws Exception
* @description Returns the infos of a single node
*/
- public static function getNode($id) {
+ public static function getNode($id)
+ {
try {
$response = self::client()->get('/application/nodes/' . $id);
- } catch(Exception $e) {
+ } catch (Exception $e) {
throw self::getException($e->getMessage());
}
- if($response->failed()) throw self::getException("Failed to get node id " . $id . " - " . $response->status());
+ if ($response->failed()) {
+ throw self::getException('Failed to get node id ' . $id . ' - ' . $response->status());
+ }
+
return $response->json()['attributes'];
}
-
-
- public static function getServers() {
+ public static function getServers()
+ {
try {
- $response = self::client()->get('/application/servers?per_page=' . config("SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT"));
+ $response = self::client()->get('/application/servers?per_page=' . config('SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT'));
} catch (Exception $e) {
throw self::getException($e->getMessage());
}
- if($response->failed()) throw self::getException("Failed to get list of servers - ", $response->status());
+ if ($response->failed()) {
+ throw self::getException('Failed to get list of servers - ', $response->status());
+ }
+
return $response->json()['data'];
}
/**
* @return null
+ *
* @throws Exception
*/
public static function getNests()
{
try {
- $response = self::client()->get('/application/nests?per_page=' . config("SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT"));
+ $response = self::client()->get('/application/nests?per_page=' . config('SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT'));
} catch (Exception $e) {
throw self::getException($e->getMessage());
}
- if ($response->failed()) throw self::getException("Failed to get nests from pterodactyl", $response->status());
+ if ($response->failed()) {
+ throw self::getException('Failed to get nests from pterodactyl', $response->status());
+ }
+
return $response->json()['data'];
}
/**
* @return mixed
+ *
* @throws Exception
*/
public static function getLocations()
{
try {
- $response = self::client()->get('/application/locations?per_page=' . config("SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT"));
+ $response = self::client()->get('/application/locations?per_page=' . config('SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT'));
} catch (Exception $e) {
throw self::getException($e->getMessage());
}
- if ($response->failed()) throw self::getException("Failed to get locations from pterodactyl - ", $response->status());
+ if ($response->failed()) {
+ throw self::getException('Failed to get locations from pterodactyl - ', $response->status());
+ }
return $response->json()['data'];
}
/**
- * @param Node $node
+ * @param Node $node
* @return mixed
+ *
* @throws Exception
*/
public static function getFreeAllocationId(Node $node)
@@ -160,8 +185,9 @@ public static function getFreeAllocationId(Node $node)
}
/**
- * @param Node $node
+ * @param Node $node
* @return array|mixed|null
+ *
* @throws Exception
*/
public static function getFreeAllocations(Node $node)
@@ -172,7 +198,9 @@ public static function getFreeAllocations(Node $node)
if (isset($response['data'])) {
if (!empty($response['data'])) {
foreach ($response['data'] as $allocation) {
- if (!$allocation['attributes']['assigned']) array_push($freeAllocations, $allocation);
+ if (!$allocation['attributes']['assigned']) {
+ array_push($freeAllocations, $allocation);
+ }
}
}
}
@@ -181,8 +209,9 @@ public static function getFreeAllocations(Node $node)
}
/**
- * @param Node $node
+ * @param Node $node
* @return array|mixed
+ *
* @throws Exception
*/
public static function getAllocations(Node $node)
@@ -193,51 +222,53 @@ public static function getAllocations(Node $node)
} catch (Exception $e) {
throw self::getException($e->getMessage());
}
- if ($response->failed()) throw self::getException("Failed to get allocations from pterodactyl - ", $response->status());
+ if ($response->failed()) {
+ throw self::getException('Failed to get allocations from pterodactyl - ', $response->status());
+ }
return $response->json();
}
/**
- * @param String $route
+ * @param string $route
* @return string
*/
public static function url(string $route): string
{
- return config("SETTINGS::SYSTEM:PTERODACTYL:URL") . $route;
+ return config('SETTINGS::SYSTEM:PTERODACTYL:URL') . $route;
}
/**
- * @param Server $server
- * @param Egg $egg
- * @param int $allocationId
+ * @param Server $server
+ * @param Egg $egg
+ * @param int $allocationId
* @return Response
*/
public static function createServer(Server $server, Egg $egg, int $allocationId)
{
- return self::client()->post("/application/servers", [
- "name" => $server->name,
- "external_id" => $server->id,
- "user" => $server->user->pterodactyl_id,
- "egg" => $egg->id,
- "docker_image" => $egg->docker_image,
- "startup" => $egg->startup,
- "environment" => $egg->getEnvironmentVariables(),
- "limits" => [
- "memory" => $server->product->memory,
- "swap" => $server->product->swap,
- "disk" => $server->product->disk,
- "io" => $server->product->io,
- "cpu" => $server->product->cpu
+ return self::client()->post('/application/servers', [
+ 'name' => $server->name,
+ 'external_id' => $server->id,
+ 'user' => $server->user->pterodactyl_id,
+ 'egg' => $egg->id,
+ 'docker_image' => $egg->docker_image,
+ 'startup' => $egg->startup,
+ 'environment' => $egg->getEnvironmentVariables(),
+ 'limits' => [
+ 'memory' => $server->product->memory,
+ 'swap' => $server->product->swap,
+ 'disk' => $server->product->disk,
+ 'io' => $server->product->io,
+ 'cpu' => $server->product->cpu,
+ ],
+ 'feature_limits' => [
+ 'databases' => $server->product->databases,
+ 'backups' => $server->product->backups,
+ 'allocations' => $server->product->allocations,
],
- "feature_limits" => [
- "databases" => $server->product->databases,
- "backups" => $server->product->backups,
- "allocations" => $server->product->allocations,
+ 'allocation' => [
+ 'default' => $allocationId,
],
- "allocation" => [
- "default" => $allocationId
- ]
]);
}
@@ -248,7 +279,9 @@ public static function suspendServer(Server $server)
} catch (Exception $e) {
throw self::getException($e->getMessage());
}
- if ($response->failed()) throw self::getException("Failed to suspend server from pterodactyl - ", $response->status());
+ if ($response->failed()) {
+ throw self::getException('Failed to suspend server from pterodactyl - ', $response->status());
+ }
return $response;
}
@@ -260,14 +293,17 @@ public static function unSuspendServer(Server $server)
} catch (Exception $e) {
throw self::getException($e->getMessage());
}
- if ($response->failed()) throw self::getException("Failed to unsuspend server from pterodactyl - ", $response->status());
+ if ($response->failed()) {
+ throw self::getException('Failed to unsuspend server from pterodactyl - ', $response->status());
+ }
return $response;
}
/**
* Get user by pterodactyl id
- * @param int $pterodactylId
+ *
+ * @param int $pterodactylId
* @return mixed
*/
public function getUser(int $pterodactylId)
@@ -277,14 +313,17 @@ public function getUser(int $pterodactylId)
} catch (Exception $e) {
throw self::getException($e->getMessage());
}
- if ($response->failed()) throw self::getException("Failed to get user from pterodactyl - ", $response->status());
+ if ($response->failed()) {
+ throw self::getException('Failed to get user from pterodactyl - ', $response->status());
+ }
return $response->json()['attributes'];
}
/**
* Get serverAttributes by pterodactyl id
- * @param int $pterodactylId
+ *
+ * @param int $pterodactylId
* @return mixed
*/
public static function getServerAttributes(int $pterodactylId, bool $deleteOn404 = false)
@@ -297,51 +336,70 @@ public static function getServerAttributes(int $pterodactylId, bool $deleteOn404
//print response body
-
-
- if ($response->failed()){
- if($deleteOn404){ //Delete the server if it does not exist (server deleted on pterodactyl)
+ if ($response->failed()) {
+ if ($deleteOn404) { //Delete the server if it does not exist (server deleted on pterodactyl)
Server::where('pterodactyl_id', $pterodactylId)->first()->delete();
+
return;
+ } else {
+ throw self::getException('Failed to get server attributes from pterodactyl - ', $response->status());
}
- else throw self::getException("Failed to get server attributes from pterodactyl - ", $response->status());
}
+
return $response->json()['attributes'];
}
/**
* Update Server Resources
- * @param Server $server
- * @param Product $product
+ *
+ * @param Server $server
+ * @param Product $product
* @return Response
*/
public static function updateServer(Server $server, Product $product)
{
return self::client()->patch("/application/servers/{$server->pterodactyl_id}/build", [
- "allocation" => $server->allocation,
- "memory" => $product->memory,
- "swap" => $product->swap,
- "disk" => $product->disk,
- "io" => $product->io,
- "cpu" => $product->cpu,
- "threads" => null,
- "feature_limits" => [
- "databases" => $product->databases,
- "backups" => $product->backups,
- "allocations" => $product->allocations,
- ]
+ 'allocation' => $server->allocation,
+ 'memory' => $product->memory,
+ 'swap' => $product->swap,
+ 'disk' => $product->disk,
+ 'io' => $product->io,
+ 'cpu' => $product->cpu,
+ 'threads' => null,
+ 'feature_limits' => [
+ 'databases' => $product->databases,
+ 'backups' => $product->backups,
+ 'allocations' => $product->allocations,
+ ],
+ ]);
+ }
+
+ /**
+ * Update the owner of a server
+ *
+ * @param int $userId
+ * @param Server $server
+ * @return mixed
+ */
+ public static function updateServerOwner(Server $server, int $userId)
+ {
+ return self::client()->patch("/application/servers/{$server->pterodactyl_id}/details", [
+ 'name' => $server->name,
+ 'user' => $userId,
]);
}
+
/**
* Power Action Specific Server
- * @param Server $server
- * @param string $action
+ *
+ * @param Server $server
+ * @param string $action
* @return Response
*/
public static function powerAction(Server $server, $action)
{
return self::clientAdmin()->post("/client/servers/{$server->identifier}/power", [
- "signal" => $action
+ 'signal' => $action,
]);
}
@@ -350,16 +408,16 @@ public static function powerAction(Server $server, $action)
*/
public static function getClientUser()
{
- return self::clientAdmin()->get("/client/account");
+ return self::clientAdmin()->get('/client/account');
}
-
/**
* Check if node has enough free resources to allocate the given resources
- * @param Node $node
- * @param int $requireMemory
- * @param int $requireDisk
- * @return boolean
+ *
+ * @param Node $node
+ * @param int $requireMemory
+ * @param int $requireDisk
+ * @return bool
*/
public static function checkNodeResources(Node $node, int $requireMemory, int $requireDisk)
{
@@ -369,14 +427,15 @@ public static function checkNodeResources(Node $node, int $requireMemory, int $r
throw self::getException($e->getMessage());
}
$node = $response['attributes'];
- $freeMemory = ($node['memory']*($node['memory_overallocate']+100)/100) - $node['allocated_resources']['memory'];
- $freeDisk = ($node['disk']*($node['disk_overallocate']+100)/100) - $node['allocated_resources']['disk'];
+ $freeMemory = ($node['memory'] * ($node['memory_overallocate'] + 100) / 100) - $node['allocated_resources']['memory'];
+ $freeDisk = ($node['disk'] * ($node['disk_overallocate'] + 100) / 100) - $node['allocated_resources']['disk'];
if ($freeMemory < $requireMemory) {
return false;
- }
- if ($freeDisk < $requireDisk) {
+ }
+ if ($freeDisk < $requireDisk) {
return false;
- }
- return true;
+ }
+
+ return true;
}
}
diff --git a/app/Classes/Settings/Invoices.php b/app/Classes/Settings/Invoices.php
index 425af60c1..72a809da9 100644
--- a/app/Classes/Settings/Invoices.php
+++ b/app/Classes/Settings/Invoices.php
@@ -10,9 +10,8 @@ class Invoices
{
public function __construct()
{
- return;
- }
+ }
public function updateSettings(Request $request)
{
@@ -22,29 +21,27 @@ public function updateSettings(Request $request)
$values = [
//SETTINGS::VALUE => REQUEST-VALUE (coming from the html-form)
- "SETTINGS::INVOICE:COMPANY_NAME" => "company-name",
- "SETTINGS::INVOICE:COMPANY_ADDRESS" => "company-address",
- "SETTINGS::INVOICE:COMPANY_PHONE" => "company-phone",
- "SETTINGS::INVOICE:COMPANY_MAIL" => "company-mail",
- "SETTINGS::INVOICE:COMPANY_VAT" => "company-vat",
- "SETTINGS::INVOICE:COMPANY_WEBSITE" => "company-web",
- "SETTINGS::INVOICE:PREFIX" => "invoice-prefix",
- "SETTINGS::INVOICE:ENABLED" => "enable-invoices",
+ 'SETTINGS::INVOICE:COMPANY_NAME' => 'company-name',
+ 'SETTINGS::INVOICE:COMPANY_ADDRESS' => 'company-address',
+ 'SETTINGS::INVOICE:COMPANY_PHONE' => 'company-phone',
+ 'SETTINGS::INVOICE:COMPANY_MAIL' => 'company-mail',
+ 'SETTINGS::INVOICE:COMPANY_VAT' => 'company-vat',
+ 'SETTINGS::INVOICE:COMPANY_WEBSITE' => 'company-web',
+ 'SETTINGS::INVOICE:PREFIX' => 'invoice-prefix',
+ 'SETTINGS::INVOICE:ENABLED' => 'enable-invoices',
];
foreach ($values as $key => $value) {
$param = $request->get($value);
Settings::where('key', $key)->updateOrCreate(['key' => $key], ['value' => $param]);
- Cache::forget("setting" . ':' . $key);
+ Cache::forget('setting'.':'.$key);
}
-
if ($request->hasFile('logo')) {
$request->file('logo')->storeAs('public', 'logo.png');
}
-
- return redirect(route('admin.settings.index') . '#invoices')->with('success', __('Invoice settings updated!'));
+ return redirect(route('admin.settings.index').'#invoices')->with('success', __('Invoice settings updated!'));
}
}
diff --git a/app/Classes/Settings/Language.php b/app/Classes/Settings/Language.php
index 5f9b87fe0..4e2bc3c24 100644
--- a/app/Classes/Settings/Language.php
+++ b/app/Classes/Settings/Language.php
@@ -8,14 +8,12 @@
use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\Validator;
-
class Language
{
public function __construct()
{
- return;
- }
+ }
public function updateSettings(Request $request)
{
@@ -28,34 +26,31 @@ public function updateSettings(Request $request)
'datatable-language' => 'required|string',
]);
-
if ($validator->fails()) {
- return redirect(route('admin.settings.index') . '#language')->with('error', __('Language settings have not been updated!'))->withErrors($validator);
+ return redirect(route('admin.settings.index').'#language')->with('error', __('Language settings have not been updated!'))->withErrors($validator);
}
$values = [
//SETTINGS::VALUE => REQUEST-VALUE (coming from the html-form)
- "SETTINGS::LOCALE:DEFAULT" => "defaultLanguage",
- "SETTINGS::LOCALE:DYNAMIC" => "autotranslate",
- "SETTINGS::LOCALE:CLIENTS_CAN_CHANGE" => "canClientChangeLanguage",
- "SETTINGS::LOCALE:AVAILABLE" => "languages",
- "SETTINGS::LOCALE:DATATABLES" => "datatable-language"
+ 'SETTINGS::LOCALE:DEFAULT' => 'defaultLanguage',
+ 'SETTINGS::LOCALE:DYNAMIC' => 'autotranslate',
+ 'SETTINGS::LOCALE:CLIENTS_CAN_CHANGE' => 'canClientChangeLanguage',
+ 'SETTINGS::LOCALE:AVAILABLE' => 'languages',
+ 'SETTINGS::LOCALE:DATATABLES' => 'datatable-language',
];
-
foreach ($values as $key => $value) {
$param = $request->get($value);
if (is_array($param)) {
- $param = implode(",", $param);
+ $param = implode(',', $param);
}
Settings::where('key', $key)->updateOrCreate(['key' => $key], ['value' => $param]);
- Cache::forget("setting" . ':' . $key);
- Session::remove("locale");
+ Cache::forget('setting'.':'.$key);
+ Session::remove('locale');
}
-
- return redirect(route('admin.settings.index') . '#language')->with('success', __('Language settings updated!'));
+ return redirect(route('admin.settings.index').'#language')->with('success', __('Language settings updated!'));
}
}
diff --git a/app/Classes/Settings/Misc.php b/app/Classes/Settings/Misc.php
index 1b67b5622..d7563a902 100644
--- a/app/Classes/Settings/Misc.php
+++ b/app/Classes/Settings/Misc.php
@@ -7,12 +7,11 @@
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Validator;
-
class Misc
{
public function __construct()
{
- return;
+
}
public function updateSettings(Request $request)
@@ -40,21 +39,23 @@ public function updateSettings(Request $request)
'enable_referral' => 'nullable|string',
'referral_reward' => 'nullable|numeric',
'referral_allowed' => 'nullable|string',
+ 'always_give_commission' => 'nullable|string',
'referral_percentage' => 'nullable|numeric',
'referral_mode' => 'nullable|string',
'ticket_enabled' => 'nullable|string',
+ 'ticket_notify' => 'string',
]);
$validator->after(function ($validator) use ($request) {
// if enable-recaptcha is true then recaptcha-site-key and recaptcha-secret-key must be set
- if ($request->get('enable-recaptcha') == 'true' && (!$request->get('recaptcha-site-key') || !$request->get('recaptcha-secret-key'))) {
+ if ($request->get('enable-recaptcha') == 'true' && (! $request->get('recaptcha-site-key') || ! $request->get('recaptcha-secret-key'))) {
$validator->errors()->add('recaptcha-site-key', 'The site key is required if recaptcha is enabled.');
$validator->errors()->add('recaptcha-secret-key', 'The secret key is required if recaptcha is enabled.');
}
});
if ($validator->fails()) {
- return redirect(route('admin.settings.index') . '#misc')->with('error', __('Misc settings have not been updated!'))->withErrors($validator)
+ return redirect(route('admin.settings.index').'#misc')->with('error', __('Misc settings have not been updated!'))->withErrors($validator)
->withInput();
}
@@ -66,30 +67,31 @@ public function updateSettings(Request $request)
}
$values = [
- "SETTINGS::DISCORD:BOT_TOKEN" => "discord-bot-token",
- "SETTINGS::DISCORD:CLIENT_ID" => "discord-client-id",
- "SETTINGS::DISCORD:CLIENT_SECRET" => "discord-client-secret",
- "SETTINGS::DISCORD:GUILD_ID" => "discord-guild-id",
- "SETTINGS::DISCORD:INVITE_URL" => "discord-invite-url",
- "SETTINGS::DISCORD:ROLE_ID" => "discord-role-id",
- "SETTINGS::RECAPTCHA:SITE_KEY" => "recaptcha-site-key",
- "SETTINGS::RECAPTCHA:SECRET_KEY" => "recaptcha-secret-key",
- "SETTINGS::RECAPTCHA:ENABLED" => "enable-recaptcha",
- "SETTINGS::MAIL:MAILER" => "mailservice",
- "SETTINGS::MAIL:HOST" => "mailhost",
- "SETTINGS::MAIL:PORT" => "mailport",
- "SETTINGS::MAIL:USERNAME" => "mailusername",
- "SETTINGS::MAIL:PASSWORD" => "mailpassword",
- "SETTINGS::MAIL:ENCRYPTION" => "mailencryption",
- "SETTINGS::MAIL:FROM_ADDRESS" => "mailfromadress",
- "SETTINGS::MAIL:FROM_NAME" => "mailfromname",
- "SETTINGS::REFERRAL::ENABLED" => "enable_referral",
- "SETTINGS::REFERRAL::REWARD" => "referral_reward",
- "SETTINGS::REFERRAL::ALLOWED" => "referral_allowed",
- "SETTINGS::REFERRAL:MODE" => "referral_mode",
- "SETTINGS::REFERRAL:PERCENTAGE" => "referral_percentage",
- "SETTINGS::TICKET:ENABLED" => "ticket_enabled"
-
+ 'SETTINGS::DISCORD:BOT_TOKEN' => 'discord-bot-token',
+ 'SETTINGS::DISCORD:CLIENT_ID' => 'discord-client-id',
+ 'SETTINGS::DISCORD:CLIENT_SECRET' => 'discord-client-secret',
+ 'SETTINGS::DISCORD:GUILD_ID' => 'discord-guild-id',
+ 'SETTINGS::DISCORD:INVITE_URL' => 'discord-invite-url',
+ 'SETTINGS::DISCORD:ROLE_ID' => 'discord-role-id',
+ 'SETTINGS::RECAPTCHA:SITE_KEY' => 'recaptcha-site-key',
+ 'SETTINGS::RECAPTCHA:SECRET_KEY' => 'recaptcha-secret-key',
+ 'SETTINGS::RECAPTCHA:ENABLED' => 'enable-recaptcha',
+ 'SETTINGS::MAIL:MAILER' => 'mailservice',
+ 'SETTINGS::MAIL:HOST' => 'mailhost',
+ 'SETTINGS::MAIL:PORT' => 'mailport',
+ 'SETTINGS::MAIL:USERNAME' => 'mailusername',
+ 'SETTINGS::MAIL:PASSWORD' => 'mailpassword',
+ 'SETTINGS::MAIL:ENCRYPTION' => 'mailencryption',
+ 'SETTINGS::MAIL:FROM_ADDRESS' => 'mailfromadress',
+ 'SETTINGS::MAIL:FROM_NAME' => 'mailfromname',
+ 'SETTINGS::REFERRAL::ENABLED' => 'enable_referral',
+ 'SETTINGS::REFERRAL::REWARD' => 'referral_reward',
+ 'SETTINGS::REFERRAL::ALLOWED' => 'referral_allowed',
+ 'SETTINGS::REFERRAL:MODE' => 'referral_mode',
+ 'SETTINGS::REFERRAL::ALWAYS_GIVE_COMMISSION' => 'always_give_commission',
+ 'SETTINGS::REFERRAL:PERCENTAGE' => 'referral_percentage',
+ 'SETTINGS::TICKET:ENABLED' => 'ticket_enabled',
+ 'SETTINGS::TICKET:NOTIFY' => 'ticket_notify',
];
@@ -97,10 +99,9 @@ public function updateSettings(Request $request)
$param = $request->get($value);
Settings::where('key', $key)->updateOrCreate(['key' => $key], ['value' => $param]);
- Cache::forget("setting" . ':' . $key);
+ Cache::forget('setting'.':'.$key);
}
-
- return redirect(route('admin.settings.index') . '#misc')->with('success', __('Misc settings updated!'));
+ return redirect(route('admin.settings.index').'#misc')->with('success', __('Misc settings updated!'));
}
}
diff --git a/app/Classes/Settings/Payments.php b/app/Classes/Settings/Payments.php
index 262e2886e..0139abc66 100644
--- a/app/Classes/Settings/Payments.php
+++ b/app/Classes/Settings/Payments.php
@@ -7,55 +7,52 @@
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Validator;
-
class Payments
{
public function __construct()
{
- return;
- }
+ }
public function updateSettings(Request $request)
{
$validator = Validator::make($request->all(), [
- "paypal-client_id" => "nullable|string",
- "paypal-client-secret" => "nullable|string",
- "paypal-sandbox-secret" => "nullable|string",
- "stripe-secret-key" => "nullable|string",
- "stripe-endpoint-secret" => "nullable|string",
- "stripe-test-secret-key" => "nullable|string",
- "stripe-test-endpoint-secret" => "nullable|string",
- "stripe-methods" => "nullable|string",
- "sales-tax" => "nullable|numeric",
+ 'paypal-client_id' => 'nullable|string',
+ 'paypal-client-secret' => 'nullable|string',
+ 'paypal-sandbox-secret' => 'nullable|string',
+ 'stripe-secret-key' => 'nullable|string',
+ 'stripe-endpoint-secret' => 'nullable|string',
+ 'stripe-test-secret-key' => 'nullable|string',
+ 'stripe-test-endpoint-secret' => 'nullable|string',
+ 'stripe-methods' => 'nullable|string',
+ 'sales-tax' => 'nullable|numeric',
]);
if ($validator->fails()) {
- return redirect(route('admin.settings.index') . '#payment')->with('error', __('Payment settings have not been updated!'))->withErrors($validator)
+ return redirect(route('admin.settings.index').'#payment')->with('error', __('Payment settings have not been updated!'))->withErrors($validator)
->withInput();
}
$values = [
//SETTINGS::VALUE => REQUEST-VALUE (coming from the html-form)
- "SETTINGS::PAYMENTS:PAYPAL:SECRET" => "paypal-client-secret",
- "SETTINGS::PAYMENTS:PAYPAL:CLIENT_ID" => "paypal-client-id",
- "SETTINGS::PAYMENTS:PAYPAL:SANDBOX_SECRET" => "paypal-sandbox-secret",
- "SETTINGS::PAYMENTS:PAYPAL:SANDBOX_CLIENT_ID" => "paypal-sandbox-id",
- "SETTINGS::PAYMENTS:STRIPE:SECRET" => "stripe-secret",
- "SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET" => "stripe-endpoint-secret",
- "SETTINGS::PAYMENTS:STRIPE:TEST_SECRET" => "stripe-test-secret",
- "SETTINGS::PAYMENTS:STRIPE:ENDPOINT_TEST_SECRET" => "stripe-endpoint-test-secret",
- "SETTINGS::PAYMENTS:STRIPE:METHODS" => "stripe-methods",
- "SETTINGS::PAYMENTS:SALES_TAX" => "sales-tax"
+ 'SETTINGS::PAYMENTS:PAYPAL:SECRET' => 'paypal-client-secret',
+ 'SETTINGS::PAYMENTS:PAYPAL:CLIENT_ID' => 'paypal-client-id',
+ 'SETTINGS::PAYMENTS:PAYPAL:SANDBOX_SECRET' => 'paypal-sandbox-secret',
+ 'SETTINGS::PAYMENTS:PAYPAL:SANDBOX_CLIENT_ID' => 'paypal-sandbox-id',
+ 'SETTINGS::PAYMENTS:STRIPE:SECRET' => 'stripe-secret',
+ 'SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET' => 'stripe-endpoint-secret',
+ 'SETTINGS::PAYMENTS:STRIPE:TEST_SECRET' => 'stripe-test-secret',
+ 'SETTINGS::PAYMENTS:STRIPE:ENDPOINT_TEST_SECRET' => 'stripe-endpoint-test-secret',
+ 'SETTINGS::PAYMENTS:STRIPE:METHODS' => 'stripe-methods',
+ 'SETTINGS::PAYMENTS:SALES_TAX' => 'sales-tax',
];
-
foreach ($values as $key => $value) {
$param = $request->get($value);
Settings::where('key', $key)->updateOrCreate(['key' => $key], ['value' => $param]);
- Cache::forget("setting" . ':' . $key);
+ Cache::forget('setting'.':'.$key);
}
- return redirect(route('admin.settings.index') . '#payment')->with('success', __('Payment settings updated!'));
+ return redirect(route('admin.settings.index').'#payment')->with('success', __('Payment settings updated!'));
}
}
diff --git a/app/Classes/Settings/System.php b/app/Classes/Settings/System.php
index ed85b3b88..e278bac45 100644
--- a/app/Classes/Settings/System.php
+++ b/app/Classes/Settings/System.php
@@ -7,68 +7,84 @@
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Validator;
+use Qirolab\Theme\Theme;
+
class System
{
-
-
public function __construct()
{
- return;
+
}
-public function checkPteroClientkey(){
- $response = Pterodactyl::getClientUser();
+ public function checkPteroClientkey()
+ {
+ $response = Pterodactyl::getClientUser();
- if ($response->failed()){ return redirect()->back()->with('error', __('Your Key or URL is not correct')); }
- return redirect()->back()->with('success', __('Everything is good!'));
-}
+ if ($response->failed()) {
+ return redirect()->back()->with('error', __('Your Key or URL is not correct'));
+ }
+
+ return redirect()->back()->with('success', __('Everything is good!'));
+ }
public function updateSettings(Request $request)
{
$validator = Validator::make($request->all(), [
- "register-ip-check" => "string",
- "server-create-charge-first-hour" => "string",
- "credits-display-name" => "required|string",
- "allocation-limit" => "required|min:0|integer",
- "force-email-verification" => "string",
- "force-discord-verification" => "string",
- "initial-credits" => "required|min:0|integer",
- "initial-server-limit" => "required|min:0|integer",
- "credits-reward-amount-discord" => "required|min:0|integer",
- "credits-reward-amount-email" => "required|min:0|integer",
- "server-limit-discord" => "required|min:0|integer",
- "server-limit-email" => "required|min:0|integer",
- "server-limit-purchase" => "required|min:0|integer",
- "pterodactyl-api-key" => "required|string",
- "pterodactyl-url" => "required|string",
- "per-page-limit" => "required|min:0|integer",
- "pterodactyl-admin-api-key" => "required|string",
- "enable-upgrades" => "string",
- "enable-disable-servers" => "string",
+ 'register-ip-check' => 'string',
+ 'server-create-charge-first-hour' => 'string',
+ 'credits-display-name' => 'required|string',
+ 'allocation-limit' => 'required|min:0|integer',
+ 'force-email-verification' => 'string',
+ 'force-discord-verification' => 'string',
+ 'initial-credits' => 'required|min:0|integer',
+ 'initial-server-limit' => 'required|min:0|integer',
+ 'credits-reward-amount-discord' => 'required|min:0|integer',
+ 'credits-reward-amount-email' => 'required|min:0|integer',
+ 'server-limit-discord' => 'required|min:0|integer',
+ 'server-limit-email' => 'required|min:0|integer',
+ 'server-limit-purchase' => 'required|min:0|integer',
+ 'pterodactyl-api-key' => 'required|string',
+ 'pterodactyl-url' => 'required|string',
+ 'per-page-limit' => 'required|min:0|integer',
+ 'pterodactyl-admin-api-key' => 'required|string',
+ 'enable-upgrades' => 'string',
+ 'enable-disable-servers' => 'string',
+ 'show-imprint' => 'string',
+ 'show-privacy' => 'string',
+ 'show-tos' => 'string',
+ 'alert-enabled' => 'string',
+ 'alter-type' => 'string',
+ 'alert-message' => 'string|nullable',
+ 'motd-enabled' => 'string',
+ 'usefullinks-enabled' => 'string',
+ 'motd-message' => 'string|nullable',
+ 'seo-title' => 'string|nullable',
+ 'seo-description' => 'string|nullable',
]);
$validator->after(function ($validator) use ($request) {
// if enable-recaptcha is true then recaptcha-site-key and recaptcha-secret-key must be set
- if ($request->get('enable-upgrades') == 'true' && (!$request->get('pterodactyl-admin-api-key'))) {
+ if ($request->get('enable-upgrades') == 'true' && (! $request->get('pterodactyl-admin-api-key'))) {
$validator->errors()->add('pterodactyl-admin-api-key', 'The admin api key is required when upgrades are enabled.');
}
});
if ($validator->fails()) {
- return redirect(route('admin.settings.index') . '#system')->with('error', __('System settings have not been updated!'))->withErrors($validator)
+ return redirect(route('admin.settings.index').'#system')->with('error', __('System settings have not been updated!'))->withErrors($validator)
->withInput();
}
// update Icons from request
$this->updateIcons($request);
-
$values = [
+
"SETTINGS::SYSTEM:REGISTER_IP_CHECK" => "register-ip-check",
"SETTINGS::SYSTEM:SERVER_CREATE_CHARGE_FIRST_HOUR" => "server-create-charge-first-hour",
"SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME" => "credits-display-name",
"SETTINGS::SERVER:ALLOCATION_LIMIT" => "allocation-limit",
+ "SETTINGS::USER:MINIMUM_REQUIRED_CREDITS_TO_MAKE_SERVER" => "minimum-credits",
"SETTINGS::USER:FORCE_DISCORD_VERIFICATION" => "force-discord-verification",
"SETTINGS::USER:FORCE_EMAIL_VERIFICATION" => "force-email-verification",
"SETTINGS::USER:INITIAL_CREDITS" => "initial-credits",
@@ -87,18 +103,34 @@ public function updateSettings(Request $request)
"SETTINGS::SYSTEM:ENABLE_UPGRADE" => "enable-upgrade",
"SETTINGS::SYSTEM:CREATION_OF_NEW_SERVERS" => "enable-disable-servers",
"SETTINGS::SYSTEM:CREATION_OF_NEW_USERS" => "enable-disable-new-users",
+ "SETTINGS::SYSTEM:SHOW_IMPRINT" => "show-imprint",
+ "SETTINGS::SYSTEM:SHOW_PRIVACY" => "show-privacy",
+ "SETTINGS::SYSTEM:SHOW_TOS" => "show-tos",
+ "SETTINGS::SYSTEM:ALERT_ENABLED" => "alert-enabled",
+ "SETTINGS::SYSTEM:ALERT_TYPE" => "alert-type",
+ "SETTINGS::SYSTEM:ALERT_MESSAGE" => "alert-message",
+ "SETTINGS::SYSTEM:THEME" => "theme",
+ "SETTINGS::SYSTEM:MOTD_ENABLED" => "motd-enabled",
+ "SETTINGS::SYSTEM:MOTD_MESSAGE" => "motd-message",
+ "SETTINGS::SYSTEM:USEFULLINKS_ENABLED" => "usefullinks-enabled",
+ "SETTINGS::SYSTEM:SEO_TITLE" => "seo-title",
+ "SETTINGS::SYSTEM:SEO_DESCRIPTION" => "seo-description",
];
-
foreach ($values as $key => $value) {
$param = $request->get($value);
Settings::where('key', $key)->updateOrCreate(['key' => $key], ['value' => $param]);
- Cache::forget("setting" . ':' . $key);
+ Cache::forget('setting'.':'.$key);
}
- return redirect(route('admin.settings.index') . '#system')->with('success', __('System settings updated!'));
- }
+ //SET THEME
+ $theme = $request->get('theme');
+ Theme::set($theme);
+
+
+ return redirect(route('admin.settings.index').'#system')->with('success', __('System settings updated!'));
+ }
private function updateIcons(Request $request)
{
diff --git a/app/Console/Commands/ChargeCreditsCommand.php b/app/Console/Commands/ChargeCreditsCommand.php
index 35bfad0a4..e51bfdf99 100644
--- a/app/Console/Commands/ChargeCreditsCommand.php
+++ b/app/Console/Commands/ChargeCreditsCommand.php
@@ -24,9 +24,9 @@ class ChargeCreditsCommand extends Command
*/
protected $description = 'Charge all users with active servers';
-
/**
* A list of users that have to be notified
+ *
* @var array
*/
protected $usersToNotify = [];
@@ -56,24 +56,23 @@ public function handle()
/** @var User $user */
$user = $server->user;
- #charge credits / suspend server
+ //charge credits / suspend server
if ($user->credits >= $product->getHourlyPrice()) {
$this->line(" You received ".config('SETTINGS::REFERRAL::REWARD')." ".config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME')." because ".$this->ref_user->name." registered with your Referral-Code! You received '.config('SETTINGS::REFERRAL::REWARD').' '.config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME').' because '.$this->ref_user->name.' registered with your Referral-Code! Thank you very much for supporting us!. ".config('app.name', 'Laravel')." '.config('app.name', 'Laravel').' Hello {$this->server->User->name}, An unexpected error has occurred... There was a problem creating your server on our pterodactyl panel. There are likely no allocations or rooms left on the selected node. Please contact one of our support members through our discord server to get this resolved asap! We thank you for your patience and our deepest apologies for this inconvenience. ".config('app.name', 'Laravel')." ".config('app.name', 'Laravel').' ". __("To automatically re-enable your server/s, you need to purchase more credits.")." ". __('If you have any questions please let us know.')." ". __('Regards').", '.__('To automatically re-enable your server/s, you need to purchase more credits.').' '.__('If you have any questions please let us know.').' '.__('Regards').', Ticket With ID : {$this->ticket->ticket_id} has had a new reply posted by {$this->user->name} Ticket With ID : {$this->ticket->ticket_id} A response has been added to your ticket. Please see below for our response! ".__("Hello")." {$this->user->name}, ".__("Welcome to our dashboard")."! ".__("You can verify your e-mail address and link/verify your Discord account.")." '.__('Hello')." {$this->user->name}, ".__('Welcome to our dashboard').'! '.__('You can verify your e-mail address and link/verify your Discord account.').'
- " . $this->AdditionalLines() . "
+ '.$this->AdditionalLines().'
".__("This dashboard can be used to create and delete servers").". ".__("We hope you can enjoy this hosting experience and if you have any suggestions please let us know")."! ".__("Regards").", '.__('This dashboard can be used to create and delete servers').'. '.__('We hope you can enjoy this hosting experience and if you have any suggestions please let us know').'! '.__('Regards').', Thank you for using our Software If you have any questions, make sure to join our Discord (you can change this message in the Settings ) This installer will lead you through the most crucial Steps of Controlpanel.gg`s
setup ">HTTPS is required HTTPS is required ">Write-permissions on .env-file Write-permissions on .env-file "> php
- version: (minimum required ) "> mysql
- version: (minimum required ) php
+ version: (minimum required ) "> Missing
- php-extentions: "> mysql
+ version: (minimum required ) Missing
+ php-extentions: "> Git
+ Git
version: "> Tar
+ Tar
version: Lets start with your Database ".$_GET['message'].' Lets feed your Database and generate some security keys! This process might take a while. Please do not refresh or close this page!{$apiKey->token}
";
})
- ->editColumn('last_used' , function (ApplicationApi $apiKey) {
+ ->editColumn('last_used', function (ApplicationApi $apiKey) {
return $apiKey->last_used ? $apiKey->last_used->diffForHumans() : '';
})
- ->rawColumns(['actions' , 'token'])
+ ->rawColumns(['actions', 'token'])
->make();
}
}
diff --git a/app/Http/Controllers/Admin/InvoiceController.php b/app/Http/Controllers/Admin/InvoiceController.php
index 0ed1d45d9..e3fc0bca5 100644
--- a/app/Http/Controllers/Admin/InvoiceController.php
+++ b/app/Http/Controllers/Admin/InvoiceController.php
@@ -10,15 +10,14 @@
class InvoiceController extends Controller
{
-
public function downloadAllInvoices()
{
$zip = new ZipArchive;
$zip_safe_path = storage_path('invoices.zip');
$res = $zip->open($zip_safe_path, ZipArchive::CREATE | ZipArchive::OVERWRITE);
$result = $this::rglob(storage_path('app/invoice/*'));
- if ($res === TRUE) {
- $zip->addFromString("1. Info.txt", __("Created at") . " " . now()->format("d.m.Y"));
+ if ($res === true) {
+ $zip->addFromString('1. Info.txt', __('Created at').' '.now()->format('d.m.Y'));
foreach ($result as $file) {
if (file_exists($file) && is_file($file)) {
$zip->addFile($file, basename($file));
@@ -26,6 +25,7 @@ public function downloadAllInvoices()
}
$zip->close();
}
+
return response()->download($zip_safe_path);
}
@@ -37,9 +37,10 @@ public function downloadAllInvoices()
public function rglob($pattern, $flags = 0)
{
$files = glob($pattern, $flags);
- foreach (glob(dirname($pattern) . '/*', GLOB_ONLYDIR | GLOB_NOSORT) as $dir) {
- $files = array_merge($files, $this::rglob($dir . '/' . basename($pattern), $flags));
+ foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR | GLOB_NOSORT) as $dir) {
+ $files = array_merge($files, $this::rglob($dir.'/'.basename($pattern), $flags));
}
+
return $files;
}
@@ -53,16 +54,15 @@ public function downloadSingleInvoice(Request $request)
try {
$query = Invoice::where('payment_id', '=', $id)->firstOrFail();
} catch (Throwable $e) {
- return redirect()->back()->with("error", __("Error!"));
+ return redirect()->back()->with('error', __('Error!'));
}
- $invoice_path = storage_path('app/invoice/' . $query->invoice_user . '/' . $query->created_at->format("Y") . '/' . $query->invoice_name . '.pdf');
+ $invoice_path = storage_path('app/invoice/'.$query->invoice_user.'/'.$query->created_at->format('Y').'/'.$query->invoice_name.'.pdf');
- if (!file_exists($invoice_path)) {
- return redirect()->back()->with("error", __("Invoice does not exist on filesystem!"));
+ if (! file_exists($invoice_path)) {
+ return redirect()->back()->with('error', __('Invoice does not exist on filesystem!'));
}
-
return response()->download($invoice_path);
}
}
diff --git a/app/Http/Controllers/Admin/OverViewController.php b/app/Http/Controllers/Admin/OverViewController.php
index 20fe0c17e..280b59d4c 100644
--- a/app/Http/Controllers/Admin/OverViewController.php
+++ b/app/Http/Controllers/Admin/OverViewController.php
@@ -2,18 +2,17 @@
namespace App\Http\Controllers\Admin;
+use App\Classes\Pterodactyl;
use App\Http\Controllers\Controller;
use App\Models\Egg;
use App\Models\Location;
use App\Models\Nest;
use App\Models\Node;
use App\Models\Payment;
-use App\Models\Server;
-use App\Models\User;
-use Illuminate\Support\Facades\Cache;
-use App\Classes\Pterodactyl;
use App\Models\Product;
+use App\Models\Server;
use App\Models\Ticket;
+use App\Models\User;
use Carbon\Carbon;
class OverViewController extends Controller
@@ -26,7 +25,7 @@ public function index()
$counters = collect();
//Set basic variables in the collection
$counters->put('users', User::query()->count());
- $counters->put('credits', number_format(User::query()->where("role","!=","admin")->sum('credits'), 2, '.', ''));
+ $counters->put('credits', number_format(User::query()->where('role', '!=', 'admin')->sum('credits'), 2, '.', ''));
$counters->put('payments', Payment::query()->count());
$counters->put('eggs', Egg::query()->count());
$counters->put('nests', Nest::query()->count());
@@ -45,55 +44,109 @@ public function index()
$counters->put('payments', collect());
//Get and save payments from last 2 months for later filtering and looping
$payments = Payment::query()->where('created_at', '>=', Carbon::today()->startOfMonth()->subMonth())->where('status', 'paid')->get();
- //Prepare collections and set a few variables
+ //Prepare collections
$counters['payments']->put('thisMonth', collect());
$counters['payments']->put('lastMonth', collect());
- $counters['payments']['thisMonth']->timeStart = Carbon::today()->startOfMonth()->toDateString();
- $counters['payments']['thisMonth']->timeEnd = Carbon::today()->toDateString();
- $counters['payments']['lastMonth']->timeStart = Carbon::today()->startOfMonth()->subMonth()->toDateString();
- $counters['payments']['lastMonth']->timeEnd = Carbon::today()->endOfMonth()->subMonth()->toDateString();
-
+
+
+ //Prepare subCollection 'taxPayments'
+ $counters->put('taxPayments', collect());
+ //Get and save taxPayments from last 2 years for later filtering and looping
+ $taxPayments = Payment::query()->where('created_at', '>=', Carbon::today()->startOfYear()->subYear())->where('status', 'paid')->get();
+ //Prepare collections
+ $counters['taxPayments']->put('thisYear', collect());
+ $counters['taxPayments']->put('lastYear', collect());
+
//Fill out variables for each currency separately
- foreach($payments->where('created_at', '>=', Carbon::today()->startOfMonth()) as $payment){
+ foreach ($payments->where('created_at', '>=', Carbon::today()->startOfMonth()) as $payment) {
$paymentCurrency = $payment->currency_code;
- if(!isset($counters['payments']['thisMonth'][$paymentCurrency])){
+ if (! isset($counters['payments']['thisMonth'][$paymentCurrency])) {
$counters['payments']['thisMonth']->put($paymentCurrency, collect());
$counters['payments']['thisMonth'][$paymentCurrency]->total = 0;
$counters['payments']['thisMonth'][$paymentCurrency]->count = 0;
}
$counters['payments']['thisMonth'][$paymentCurrency]->total += $payment->total_price;
- $counters['payments']['thisMonth'][$paymentCurrency]->count ++;
+ $counters['payments']['thisMonth'][$paymentCurrency]->count++;
}
- foreach($payments->where('created_at', '<', Carbon::today()->startOfMonth()) as $payment){
+ foreach ($payments->where('created_at', '<', Carbon::today()->startOfMonth()) as $payment) {
$paymentCurrency = $payment->currency_code;
- if(!isset($counters['payments']['lastMonth'][$paymentCurrency])){
+ if (! isset($counters['payments']['lastMonth'][$paymentCurrency])) {
$counters['payments']['lastMonth']->put($paymentCurrency, collect());
$counters['payments']['lastMonth'][$paymentCurrency]->total = 0;
$counters['payments']['lastMonth'][$paymentCurrency]->count = 0;
}
$counters['payments']['lastMonth'][$paymentCurrency]->total += $payment->total_price;
- $counters['payments']['lastMonth'][$paymentCurrency]->count ++;
+ $counters['payments']['lastMonth'][$paymentCurrency]->count++;
}
+
+ //sort currencies alphabetically and set some additional variables
+ $counters['payments']['thisMonth'] = $counters['payments']['thisMonth']->sortKeys();
+ $counters['payments']['thisMonth']->timeStart = Carbon::today()->startOfMonth()->toDateString();
+ $counters['payments']['thisMonth']->timeEnd = Carbon::today()->toDateString();
+ $counters['payments']['lastMonth'] = $counters['payments']['lastMonth']->sortKeys();
+ $counters['payments']['lastMonth']->timeStart = Carbon::today()->startOfMonth()->subMonth()->toDateString();
+ $counters['payments']['lastMonth']->timeEnd = Carbon::today()->endOfMonth()->subMonth()->toDateString();
$counters['payments']->total = Payment::query()->count();
+
+ foreach($taxPayments->where('created_at', '>=', Carbon::today()->startOfYear()) as $taxPayment){
+ $paymentCurrency = $taxPayment->currency_code;
+ if(!isset($counters['taxPayments']['thisYear'][$paymentCurrency])){
+
+ $counters['taxPayments']['thisYear']->put($paymentCurrency, collect());
+ $counters['taxPayments']['thisYear'][$paymentCurrency]->total = 0;
+ $counters['taxPayments']['thisYear'][$paymentCurrency]->count = 0;
+ $counters['taxPayments']['thisYear'][$paymentCurrency]->price = 0;
+ $counters['taxPayments']['thisYear'][$paymentCurrency]->taxes = 0;
+ }
+ $counters['taxPayments']['thisYear'][$paymentCurrency]->total += $taxPayment->total_price;
+ $counters['taxPayments']['thisYear'][$paymentCurrency]->count++;
+ $counters['taxPayments']['thisYear'][$paymentCurrency]->price += $taxPayment->price;
+ $counters['taxPayments']['thisYear'][$paymentCurrency]->taxes += $taxPayment->tax_value;
+ }
+
+ foreach($taxPayments->where('created_at', '>=', Carbon::today()->startOfYear()->subYear())->where('created_at', '<', Carbon::today()->startOfYear()) as $taxPayment){
+ $paymentCurrency = $taxPayment->currency_code;
+ if(!isset($counters['taxPayments']['lastYear'][$paymentCurrency])){
+
+ $counters['taxPayments']['lastYear']->put($paymentCurrency, collect());
+ $counters['taxPayments']['lastYear'][$paymentCurrency]->total = 0;
+ $counters['taxPayments']['lastYear'][$paymentCurrency]->count = 0;
+ $counters['taxPayments']['lastYear'][$paymentCurrency]->price = 0;
+ $counters['taxPayments']['lastYear'][$paymentCurrency]->taxes = 0;
+ }
+ $counters['taxPayments']['lastYear'][$paymentCurrency]->total += $taxPayment->total_price;
+ $counters['taxPayments']['lastYear'][$paymentCurrency]->count++;
+ $counters['taxPayments']['lastYear'][$paymentCurrency]->price += $taxPayment->price;
+ $counters['taxPayments']['lastYear'][$paymentCurrency]->taxes += $taxPayment->tax_value;
+ }
+
+ //sort currencies alphabetically and set some additional variables
+ $counters['taxPayments']['thisYear'] = $counters['taxPayments']['thisYear']->sortKeys();
+ $counters['taxPayments']['thisYear']->timeStart = Carbon::today()->startOfYear()->toDateString();
+ $counters['taxPayments']['thisYear']->timeEnd = Carbon::today()->toDateString();
+ $counters['taxPayments']['lastYear'] = $counters['taxPayments']['lastYear']->sortKeys();
+ $counters['taxPayments']['lastYear']->timeStart = Carbon::today()->startOfYear()->subYear()->toDateString();
+ $counters['taxPayments']['lastYear']->timeEnd = Carbon::today()->endOfYear()->subYear()->toDateString();
+
$lastEgg = Egg::query()->latest('updated_at')->first();
$syncLastUpdate = $lastEgg ? $lastEgg->updated_at->isoFormat('LLL') : __('unknown');
-
-
//Get node information and prepare collection
$pteroNodeIds = [];
- foreach(Pterodactyl::getNodes() as $pteroNode){
+ foreach (Pterodactyl::getNodes() as $pteroNode) {
array_push($pteroNodeIds, $pteroNode['attributes']['id']);
}
$nodes = collect();
- foreach($DBnodes = Node::query()->get() as $DBnode){ //gets all node information and prepares the structure
+ foreach ($DBnodes = Node::query()->get() as $DBnode) { //gets all node information and prepares the structure
$nodeId = $DBnode['id'];
- if(!in_array($nodeId, $pteroNodeIds)) continue; //Check if node exists on pterodactyl too, if not, skip
+ if (! in_array($nodeId, $pteroNodeIds)) {
+ continue;
+ } //Check if node exists on pterodactyl too, if not, skip
$nodes->put($nodeId, collect());
$nodes[$nodeId]->name = $DBnode['name'];
$pteroNode = Pterodactyl::getNode($nodeId);
- $nodes[$nodeId]->usagePercent = round(max($pteroNode['allocated_resources']['memory']/($pteroNode['memory']*($pteroNode['memory_overallocate']+100)/100), $pteroNode['allocated_resources']['disk']/($pteroNode['disk']*($pteroNode['disk_overallocate']+100)/100))*100, 2);
+ $nodes[$nodeId]->usagePercent = round(max($pteroNode['allocated_resources']['memory'] / ($pteroNode['memory'] * ($pteroNode['memory_overallocate'] + 100) / 100), $pteroNode['allocated_resources']['disk'] / ($pteroNode['disk'] * ($pteroNode['disk_overallocate'] + 100) / 100)) * 100, 2);
$counters['totalUsagePercent'] += $nodes[$nodeId]->usagePercent;
$nodes[$nodeId]->totalServers = 0;
@@ -101,66 +154,61 @@ public function index()
$nodes[$nodeId]->totalEarnings = 0;
$nodes[$nodeId]->activeEarnings = 0;
}
- $counters['totalUsagePercent'] = ($DBnodes->count())?round($counters['totalUsagePercent']/$DBnodes->count(), 2):0;
+ $counters['totalUsagePercent'] = ($DBnodes->count()) ? round($counters['totalUsagePercent'] / $DBnodes->count(), 2) : 0;
- foreach(Pterodactyl::getServers() as $server){ //gets all servers from Pterodactyl and calculates total of credit usage for each node separately + total
+ foreach (Pterodactyl::getServers() as $server) { //gets all servers from Pterodactyl and calculates total of credit usage for each node separately + total
$nodeId = $server['attributes']['node'];
-
- if($CPServer = Server::query()->where('pterodactyl_id', $server['attributes']['id'])->first()){
+
+ if ($CPServer = Server::query()->where('pterodactyl_id', $server['attributes']['id'])->first()) {
$price = Product::query()->where('id', $CPServer->product_id)->first()->price;
- if (!$CPServer->suspended){
+ if (! $CPServer->suspended) {
$counters['earnings']->active += $price;
- $counters['servers']->active ++;
+ $counters['servers']->active++;
$nodes[$nodeId]->activeEarnings += $price;
- $nodes[$nodeId]->activeServers ++;
+ $nodes[$nodeId]->activeServers++;
}
$counters['earnings']->total += $price;
- $counters['servers']->total ++;
+ $counters['servers']->total++;
$nodes[$nodeId]->totalEarnings += $price;
- $nodes[$nodeId]->totalServers ++;
+ $nodes[$nodeId]->totalServers++;
}
}
-
-
//Get latest tickets
- $tickets = Cache::remember('tickets', self::TTL, function(){
- $output = collect();
- foreach(Ticket::query()->latest()->take(3)->get() as $ticket){
- $output->put($ticket->ticket_id, collect());
- $output[$ticket->ticket_id]->title = $ticket->title;
- $user = User::query()->where('id', $ticket->user_id)->first();
- $output[$ticket->ticket_id]->user_id = $user->id;
- $output[$ticket->ticket_id]->user = $user->name;
- $output[$ticket->ticket_id]->status = $ticket->status;
- $output[$ticket->ticket_id]->last_updated = $ticket->updated_at->diffForHumans();
- switch ($ticket->status) {
- case 'Open':
- $output[$ticket->ticket_id]->statusBadgeColor = 'badge-success';
- break;
- case 'Closed':
- $output[$ticket->ticket_id]->statusBadgeColor = 'badge-danger';
- break;
- case 'Answered':
- $output[$ticket->ticket_id]->statusBadgeColor = 'badge-info';
- break;
- default:
- $output[$ticket->ticket_id]->statusBadgeColor = 'badge-warning';
- break;
- }
+ $tickets = collect();
+ foreach (Ticket::query()->latest()->take(5)->get() as $ticket) {
+ $tickets->put($ticket->ticket_id, collect());
+ $tickets[$ticket->ticket_id]->title = $ticket->title;
+ $user = User::query()->where('id', $ticket->user_id)->first();
+ $tickets[$ticket->ticket_id]->user_id = $user->id;
+ $tickets[$ticket->ticket_id]->user = $user->name;
+ $tickets[$ticket->ticket_id]->status = $ticket->status;
+ $tickets[$ticket->ticket_id]->last_updated = $ticket->updated_at->diffForHumans();
+ switch ($ticket->status) {
+ case 'Open':
+ $tickets[$ticket->ticket_id]->statusBadgeColor = 'badge-success';
+ break;
+ case 'Closed':
+ $tickets[$ticket->ticket_id]->statusBadgeColor = 'badge-danger';
+ break;
+ case 'Answered':
+ $tickets[$ticket->ticket_id]->statusBadgeColor = 'badge-info';
+ break;
+ default:
+ $tickets[$ticket->ticket_id]->statusBadgeColor = 'badge-warning';
+ break;
}
- return $output;
- });
+ }
return view('admin.overview.index', [
- 'counters' => $counters,
- 'nodes' => $nodes,
+ 'counters' => $counters,
+ 'nodes' => $nodes,
'syncLastUpdate' => $syncLastUpdate,
- 'deletedNodesPresent'=> ($DBnodes->count() != count($pteroNodeIds))?true:false,
- 'perPageLimit' => ($counters['servers']->total != Server::query()->count())?true:false,
- 'tickets' => $tickets
+ 'deletedNodesPresent' => ($DBnodes->count() != count($pteroNodeIds)) ? true : false,
+ 'perPageLimit' => ($counters['servers']->total != Server::query()->count()) ? true : false,
+ 'tickets' => $tickets,
]);
- }
+ }
/**
* @description Sync locations,nodes,nests,eggs with the linked pterodactyl panel
diff --git a/app/Http/Controllers/Admin/PaymentController.php b/app/Http/Controllers/Admin/PaymentController.php
index 8d3a0d239..bccc64e8a 100644
--- a/app/Http/Controllers/Admin/PaymentController.php
+++ b/app/Http/Controllers/Admin/PaymentController.php
@@ -4,13 +4,10 @@
use App\Events\UserUpdateCreditsEvent;
use App\Http\Controllers\Controller;
-use App\Models\InvoiceSettings;
+use App\Models\PartnerDiscount;
use App\Models\Payment;
-use App\Models\ShopProduct;
-use App\Models\Settings;
use App\Models\User;
-use App\Notifications\InvoiceNotification;
-use App\Notifications\ConfirmPaymentNotification;
+use App\Models\ShopProduct;
use Exception;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
@@ -19,633 +16,124 @@
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Storage;
-use LaravelDaily\Invoices\Classes\Buyer;
-use LaravelDaily\Invoices\Classes\InvoiceItem;
-use LaravelDaily\Invoices\Classes\Party;
-use LaravelDaily\Invoices\Invoice;
-use PayPalCheckoutSdk\Core\PayPalHttpClient;
-use PayPalCheckoutSdk\Core\ProductionEnvironment;
-use PayPalCheckoutSdk\Core\SandboxEnvironment;
-use PayPalCheckoutSdk\Orders\OrdersCaptureRequest;
-use PayPalCheckoutSdk\Orders\OrdersCreateRequest;
-use PayPalHttp\HttpException;
-use Stripe\Stripe;
-use Symfony\Component\Intl\Currencies;
+use App\Helpers\ExtensionHelper;
class PaymentController extends Controller
{
-
/**
* @return Application|Factory|View
*/
public function index()
{
return view('admin.payments.index')->with([
- 'payments' => Payment::paginate(15)
+ 'payments' => Payment::paginate(15),
]);
}
/**
- * @param Request $request
- * @param ShopProduct $shopProduct
+ * @param Request $request
+ * @param ShopProduct $shopProduct
* @return Application|Factory|View
*/
- public function checkOut(Request $request, ShopProduct $shopProduct)
- {
- return view('store.checkout')->with([
- 'product' => $shopProduct,
- 'taxvalue' => $shopProduct->getTaxValue(),
- 'taxpercent' => $shopProduct->getTaxPercent(),
- 'total' => $shopProduct->getTotalPrice()
- ]);
- }
-
- /**
- * @param Request $request
- * @param ShopProduct $shopProduct
- * @return RedirectResponse
- */
- public function PaypalPay(Request $request, ShopProduct $shopProduct)
- {
- $request = new OrdersCreateRequest();
- $request->prefer('return=representation');
- $request->body = [
- "intent" => "CAPTURE",
- "purchase_units" => [
- [
- "reference_id" => uniqid(),
- "description" => $shopProduct->description,
- "amount" => [
- "value" => $shopProduct->getTotalPrice(),
- 'currency_code' => strtoupper($shopProduct->currency_code),
- 'breakdown' => [
- 'item_total' =>
- [
- 'currency_code' => strtoupper($shopProduct->currency_code),
- 'value' => $shopProduct->price,
- ],
- 'tax_total' =>
- [
- 'currency_code' => strtoupper($shopProduct->currency_code),
- 'value' => $shopProduct->getTaxValue(),
- ]
- ]
- ]
- ]
- ],
- "application_context" => [
- "cancel_url" => route('payment.Cancel'),
- "return_url" => route('payment.PaypalSuccess', ['product' => $shopProduct->id]),
- 'brand_name' => config('app.name', 'Laravel'),
- 'shipping_preference' => 'NO_SHIPPING'
- ]
-
-
- ];
-
-
- try {
- // Call API with your client and get a response for your call
- $response = $this->getPayPalClient()->execute($request);
- return redirect()->away($response->result->links[1]->href);
-
- // If call returns body in response, you can get the deserialized version from the result attribute of the response
- } catch (HttpException $ex) {
- echo $ex->statusCode;
- dd(json_decode($ex->getMessage()));
- }
- }
-
- /**
- * @return PayPalHttpClient
- */
- protected function getPayPalClient()
- {
- $environment = env('APP_ENV') == 'local'
- ? new SandboxEnvironment($this->getPaypalClientId(), $this->getPaypalClientSecret())
- : new ProductionEnvironment($this->getPaypalClientId(), $this->getPaypalClientSecret());
-
- return new PayPalHttpClient($environment);
- }
-
- /**
- * @return string
- */
- protected function getPaypalClientId()
- {
- return env('APP_ENV') == 'local' ? config("SETTINGS::PAYMENTS:PAYPAL:SANDBOX_CLIENT_ID") : config("SETTINGS::PAYMENTS:PAYPAL:CLIENT_ID");
- }
-
- /**
- * @return string
- */
- protected function getPaypalClientSecret()
- {
- return env('APP_ENV') == 'local' ? config("SETTINGS::PAYMENTS:PAYPAL:SANDBOX_SECRET") : config("SETTINGS::PAYMENTS:PAYPAL:SECRET");
- }
-
- /**
- * @param Request $laravelRequest
- */
- public function PaypalSuccess(Request $laravelRequest)
+ public function checkOut(ShopProduct $shopProduct)
{
- /** @var ShopProduct $shopProduct */
- $shopProduct = ShopProduct::findOrFail($laravelRequest->input('product'));
-
- /** @var User $user */
- $user = Auth::user();
-
- $request = new OrdersCaptureRequest($laravelRequest->input('token'));
- $request->prefer('return=representation');
- try {
- // Call API with your client and get a response for your call
- $response = $this->getPayPalClient()->execute($request);
- if ($response->statusCode == 201 || $response->statusCode == 200) {
-
- //update server limit
- if (config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE') !== 0) {
- if ($user->server_limit < config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')) {
- $user->update(['server_limit' => config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')]);
- }
- }
-
- //update User with bought item
- if ($shopProduct->type=="Credits") {
- $user->increment('credits', $shopProduct->quantity);
- }elseif ($shopProduct->type=="Server slots"){
- $user->increment('server_limit', $shopProduct->quantity);
- }
-
-
- //update role give Referral-reward
- if ($user->role == 'member') {
- $user->update(['role' => 'client']);
-
- if((config("SETTINGS::REFERRAL:MODE") == "commission" || config("SETTINGS::REFERRAL:MODE") == "both") && $shopProduct->type=="Credits"){
- if($ref_user = DB::table("user_referrals")->where('registered_user_id', '=', $user->id)->first()){
- $ref_user = User::findOrFail($ref_user->referral_id);
- $increment = number_format($shopProduct->quantity/100*config("SETTINGS::REFERRAL:PERCENTAGE"),0,"","");
- $ref_user->increment('credits', $increment);
-
- //LOGS REFERRALS IN THE ACTIVITY LOG
- activity()
- ->performedOn($user)
- ->causedBy($ref_user)
- ->log('gained '. $increment.' '.config("SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME").' for commission-referral of '.$user->name.' (ID:'.$user->id.')');
- }
-
- }
-
- }
-
- //store payment
- $payment = Payment::create([
- 'user_id' => $user->id,
- 'payment_id' => $response->result->id,
- 'payment_method' => 'paypal',
- 'type' => $shopProduct->type,
- 'status' => 'paid',
- 'amount' => $shopProduct->quantity,
- 'price' => $shopProduct->price,
- 'tax_value' => $shopProduct->getTaxValue(),
- 'tax_percent' => $shopProduct->getTaxPercent(),
- 'total_price' => $shopProduct->getTotalPrice(),
- 'currency_code' => $shopProduct->currency_code,
- 'shop_item_product_id' => $shopProduct->id,
- ]);
-
-
- event(new UserUpdateCreditsEvent($user));
-
- //only create invoice if SETTINGS::INVOICE:ENABLED is true
- if (config('SETTINGS::INVOICE:ENABLED') == 'true') {
- $this->createInvoice($user, $payment, 'paid', $shopProduct->currency_code);
- }
-
-
- //redirect back to home
- return redirect()->route('home')->with('success', __('Your credit balance has been increased!'));
- }
+ $extensions = ExtensionHelper::getAllExtensionsByNamespace('PaymentGateways');
-
- // If call returns body in response, you can get the deserialized version from the result attribute of the response
- if (env('APP_ENV') == 'local') {
- dd($response);
- } else {
- abort(500);
- }
- } catch (HttpException $ex) {
- if (env('APP_ENV') == 'local') {
- echo $ex->statusCode;
- dd($ex->getMessage());
- } else {
- abort(422);
- }
+ // build a paymentgateways array that contains the routes for the payment gateways and the image path for the payment gateway which lays in public/images/Extensions/PaymentGateways with the extensionname in lowercase
+ $paymentGateways = [];
+ foreach ($extensions as $extension) {
+ $extensionName = basename($extension);
+ $payment = new \stdClass();
+ $payment->name = ExtensionHelper::getExtensionConfig($extensionName, 'name');
+ $payment->image = asset('images/Extensions/PaymentGateways/' . strtolower($extensionName) . '_logo.png');
+ $paymentGateways[] = $payment;
}
- }
-
-
- /**
- * @param Request $request
- */
- public function Cancel(Request $request)
- {
- return redirect()->route('store.index')->with('success', 'Payment was Canceled');
- }
-
- /**
- * @param Request $request
- * @param ShopProduct $shopProduct
- * @return RedirectResponse
- */
- public function StripePay(Request $request, ShopProduct $shopProduct)
- {
- $stripeClient = $this->getStripeClient();
+ $discount = PartnerDiscount::getDiscount();
- $request = $stripeClient->checkout->sessions->create([
- 'line_items' => [
- [
- 'price_data' => [
- 'currency' => $shopProduct->currency_code,
- 'product_data' => [
- 'name' => $shopProduct->display,
- 'description' => $shopProduct->description,
- ],
- 'unit_amount_decimal' => round($shopProduct->price * 100, 2),
- ],
- 'quantity' => 1,
- ],
- [
- 'price_data' => [
- 'currency' => $shopProduct->currency_code,
- 'product_data' => [
- 'name' => 'Product Tax',
- 'description' => $shopProduct->getTaxPercent() . "%",
- ],
- 'unit_amount_decimal' => round($shopProduct->getTaxValue(), 2) * 100,
- ],
- 'quantity' => 1,
- ]
- ],
-
- 'mode' => 'payment',
- "payment_method_types" => str_getcsv(config("SETTINGS::PAYMENTS:STRIPE:METHODS")),
- 'success_url' => route('payment.StripeSuccess', ['product' => $shopProduct->id]) . '&session_id={CHECKOUT_SESSION_ID}',
- 'cancel_url' => route('payment.Cancel'),
+ return view('store.checkout')->with([
+ 'product' => $shopProduct,
+ 'discountpercent' => $discount,
+ 'discountvalue' => $discount * $shopProduct->price / 100,
+ 'discountedprice' => $shopProduct->getPriceAfterDiscount(),
+ 'taxvalue' => $shopProduct->getTaxValue(),
+ 'taxpercent' => $shopProduct->getTaxPercent(),
+ 'total' => $shopProduct->getTotalPrice(),
+ 'paymentGateways' => $paymentGateways,
]);
-
-
-
- return redirect($request->url, 303);
}
/**
- * @param Request $request
+ * @param Request $request
+ * @param ShopProduct $shopProduct
+ * @return RedirectResponse
*/
- public function StripeSuccess(Request $request)
+ public function FreePay(ShopProduct $shopProduct)
{
- /** @var ShopProduct $shopProduct */
- $shopProduct = ShopProduct::findOrFail($request->input('product'));
+ //check if the product is really free or the discount is 100%
+ if ($shopProduct->getTotalPrice() > 0) return redirect()->route('home')->with('error', __('An error ocured. Please try again.'));
+ //give product
/** @var User $user */
$user = Auth::user();
- $stripeClient = $this->getStripeClient();
-
- try {
- //get stripe data
- $paymentSession = $stripeClient->checkout->sessions->retrieve($request->input('session_id'));
- $paymentIntent = $stripeClient->paymentIntents->retrieve($paymentSession->payment_intent);
-
- //get DB entry of this payment ID if existing
- $paymentDbEntry = Payment::where('payment_id', $paymentSession->payment_intent)->count();
-
- // check if payment is 100% completed and payment does not exist in db already
- if ($paymentSession->status == "complete" && $paymentIntent->status == "succeeded" && $paymentDbEntry == 0) {
-
-
-
- //update server limit
- if (config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE') !== 0) {
- if ($user->server_limit < config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')) {
- $user->update(['server_limit' => config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')]);
- }
- }
-
- //update User with bought item
- if ($shopProduct->type=="Credits") {
- $user->increment('credits', $shopProduct->quantity);
- }elseif ($shopProduct->type=="Server slots"){
- $user->increment('server_limit', $shopProduct->quantity);
- }
-
- //update role give Referral-reward
- if ($user->role == 'member') {
- $user->update(['role' => 'client']);
-
- if((config("SETTINGS::REFERRAL:MODE") == "commission" || config("SETTINGS::REFERRAL:MODE") == "both") && $shopProduct->type=="Credits"){
- if($ref_user = DB::table("user_referrals")->where('registered_user_id', '=', $user->id)->first()){
- $ref_user = User::findOrFail($ref_user->referral_id);
- $increment = number_format($shopProduct->quantity/100*config("SETTINGS::REFERRAL:PERCENTAGE"),0,"","");
- $ref_user->increment('credits', $increment);
-
- //LOGS REFERRALS IN THE ACTIVITY LOG
- activity()
- ->performedOn($user)
- ->causedBy($ref_user)
- ->log('gained '. $increment.' '.config("SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME").' for commission-referral of '.$user->name.' (ID:'.$user->id.')');
- }
-
- }
-
- }
-
- //store paid payment
- $payment = Payment::create([
- 'user_id' => $user->id,
- 'payment_id' => $paymentSession->payment_intent,
- 'payment_method' => 'stripe',
- 'type' => $shopProduct->type,
- 'status' => 'paid',
- 'amount' => $shopProduct->quantity,
- 'price' => $shopProduct->price,
- 'tax_value' => $shopProduct->getTaxValue(),
- 'total_price' => $shopProduct->getTotalPrice(),
- 'tax_percent' => $shopProduct->getTaxPercent(),
- 'currency_code' => $shopProduct->currency_code,
- 'shop_item_product_id' => $shopProduct->id,
- ]);
-
- //payment notification
- $user->notify(new ConfirmPaymentNotification($payment));
-
- event(new UserUpdateCreditsEvent($user));
-
- //only create invoice if SETTINGS::INVOICE:ENABLED is true
- if (config('SETTINGS::INVOICE:ENABLED') == 'true') {
- $this->createInvoice($user, $payment, 'paid', $shopProduct->currency_code);
- }
-
- //redirect back to home
- return redirect()->route('home')->with('success', __('Your credit balance has been increased!'));
- } else {
- if ($paymentIntent->status == "processing") {
-
- //store processing payment
- $payment = Payment::create([
- 'user_id' => $user->id,
- 'payment_id' => $paymentSession->payment_intent,
- 'payment_method' => 'stripe',
- 'type' => $shopProduct->type,
- 'status' => 'processing',
- 'amount' => $shopProduct->quantity,
- 'price' => $shopProduct->price,
- 'tax_value' => $shopProduct->getTaxValue(),
- 'total_price' => $shopProduct->getTotalPrice(),
- 'tax_percent' => $shopProduct->getTaxPercent(),
- 'currency_code' => $shopProduct->currency_code,
- 'shop_item_product_id' => $shopProduct->id,
- ]);
-
- //only create invoice if SETTINGS::INVOICE:ENABLED is true
- if (config('SETTINGS::INVOICE:ENABLED') == 'true') {
- $this->createInvoice($user, $payment, 'paid', $shopProduct->currency_code);
- }
-
- //redirect back to home
- return redirect()->route('home')->with('success', __('Your payment is being processed!'));
- }
- if ($paymentDbEntry == 0 && $paymentIntent->status != "processing") {
- $stripeClient->paymentIntents->cancel($paymentIntent->id);
-
- //redirect back to home
- return redirect()->route('home')->with('success', __('Your payment has been canceled!'));
- } else {
- abort(402);
- }
- }
- } catch (HttpException $ex) {
- if (env('APP_ENV') == 'local') {
- echo $ex->statusCode;
- dd($ex->getMessage());
- } else {
- abort(422);
- }
- }
- }
-
- /**
- * @param Request $request
- */
- protected function handleStripePaymentSuccessHook($paymentIntent)
- {
- try {
- // Get payment db entry
- $payment = Payment::where('payment_id', $paymentIntent->id)->first();
- $user = User::where('id', $payment->user_id)->first();
-
- if ($paymentIntent->status == 'succeeded' && $payment->status == 'processing') {
-
-
- //update server limit
- if (config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE') !== 0) {
- if ($user->server_limit < config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')) {
- $user->update(['server_limit' => config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')]);
- }
- }
- //update User with bought item
- if ($shopProduct->type=="Credits") {
- $user->increment('credits', $shopProduct->quantity);
- }elseif ($shopProduct->type=="Server slots"){
- $user->increment('server_limit', $shopProduct->quantity);
- }
-
- //update role give Referral-reward
- if ($user->role == 'member') {
- $user->update(['role' => 'client']);
-
- if((config("SETTINGS::REFERRAL:MODE") == "commission" || config("SETTINGS::REFERRAL:MODE") == "both")&& $shopProduct->type=="Credits"){
- if($ref_user = DB::table("user_referrals")->where('registered_user_id', '=', $user->id)->first()){
- $ref_user = User::findOrFail($ref_user->referral_id);
- $increment = number_format($shopProduct->quantity/100*config("SETTINGS::REFERRAL:PERCENTAGE"),0,"","");
- $ref_user->increment('credits', $increment);
-
- //LOGS REFERRALS IN THE ACTIVITY LOG
- activity()
- ->performedOn($user)
- ->causedBy($ref_user)
- ->log('gained '. $increment.' '.config("SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME").' for commission-referral of '.$user->name.' (ID:'.$user->id.')');
- }
-
- }
-
- }
+ //not updating server limit
- //update payment db entry status
- $payment->update(['status' => 'paid']);
-
- //payment notification
- $user->notify(new ConfirmPaymentNotification($payment));
- event(new UserUpdateCreditsEvent($user));
-
- //only create invoice if SETTINGS::INVOICE:ENABLED is true
- if (config('SETTINGS::INVOICE:ENABLED') == 'true') {
- $this->createInvoice($user, $payment, 'paid', strtoupper($paymentIntent->currency));
- }
- }
- } catch (HttpException $ex) {
- abort(422);
+ //update User with bought item
+ if ($shopProduct->type == "Credits") {
+ $user->increment('credits', $shopProduct->quantity);
+ } elseif ($shopProduct->type == "Server slots") {
+ $user->increment('server_limit', $shopProduct->quantity);
}
- }
-
- /**
- * @param Request $request
- */
- public function StripeWebhooks(Request $request)
- {
- \Stripe\Stripe::setApiKey($this->getStripeSecret());
- try {
- $payload = @file_get_contents('php://input');
- $sig_header = $request->header('Stripe-Signature');
- $event = null;
- $event = \Stripe\Webhook::constructEvent(
- $payload,
- $sig_header,
- $this->getStripeEndpointSecret()
- );
- } catch (\UnexpectedValueException $e) {
- // Invalid payload
+ //skipped the referral commission, because the user did not pay anything.
+
+ //not giving client role
+
+ //store payment
+ $payment = Payment::create([
+ 'user_id' => $user->id,
+ 'payment_id' => uniqid(),
+ 'payment_method' => 'free',
+ 'type' => $shopProduct->type,
+ 'status' => 'paid',
+ 'amount' => $shopProduct->quantity,
+ 'price' => $shopProduct->price - ($shopProduct->price * PartnerDiscount::getDiscount() / 100),
+ 'tax_value' => $shopProduct->getTaxValue(),
+ 'tax_percent' => $shopProduct->getTaxPercent(),
+ 'total_price' => $shopProduct->getTotalPrice(),
+ 'currency_code' => $shopProduct->currency_code,
+ 'shop_item_product_id' => $shopProduct->id,
+ ]);
- abort(400);
- } catch (\Stripe\Exception\SignatureVerificationException $e) {
- // Invalid signature
+ event(new UserUpdateCreditsEvent($user));
- abort(400);
- }
+ //not sending an invoice
- // Handle the event
- switch ($event->type) {
- case 'payment_intent.succeeded':
- $paymentIntent = $event->data->object; // contains a \Stripe\PaymentIntent
- $this->handleStripePaymentSuccessHook($paymentIntent);
- break;
- default:
- echo 'Received unknown event type ' . $event->type;
- }
+ //redirect back to home
+ return redirect()->route('home')->with('success', __('Your credit balance has been increased!'));
}
- /**
- * @return \Stripe\StripeClient
- */
- protected function getStripeClient()
+ public function pay(Request $request)
{
- return new \Stripe\StripeClient($this->getStripeSecret());
- }
+ $product = ShopProduct::find($request->product_id);
+ $paymentGateway = $request->payment_method;
- /**
- * @return string
- */
- protected function getStripeSecret()
- {
- return env('APP_ENV') == 'local'
- ? config("SETTINGS::PAYMENTS:STRIPE:TEST_SECRET")
- : config("SETTINGS::PAYMENTS:STRIPE:SECRET");
+ return redirect()->route('payment.' . $paymentGateway . 'Pay', ['shopProduct' => $product->id]);
}
/**
- * @return string
+ * @param Request $request
*/
- protected function getStripeEndpointSecret()
- {
- return env('APP_ENV') == 'local'
- ? config("SETTINGS::PAYMENTS:STRIPE:ENDPOINT_TEST_SECRET")
- : config("SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET");
- }
-
-
- protected function createInvoice($user, $payment, $paymentStatus, $currencyCode)
+ public function Cancel(Request $request)
{
- $shopProduct = ShopProduct::where('id', $payment->shop_item_product_id)->first();
- //create invoice
- $lastInvoiceID = \App\Models\Invoice::where("invoice_name", "like", "%" . now()->format('mY') . "%")->count("id");
- $newInvoiceID = $lastInvoiceID + 1;
- $logoPath = storage_path('app/public/logo.png');
-
- $seller = new Party([
- 'name' => config("SETTINGS::INVOICE:COMPANY_NAME"),
- 'phone' => config("SETTINGS::INVOICE:COMPANY_PHONE"),
- 'address' => config("SETTINGS::INVOICE:COMPANY_ADDRESS"),
- 'vat' => config("SETTINGS::INVOICE:COMPANY_VAT"),
- 'custom_fields' => [
- 'E-Mail' => config("SETTINGS::INVOICE:COMPANY_MAIL"),
- "Web" => config("SETTINGS::INVOICE:COMPANY_WEBSITE")
- ],
- ]);
-
-
- $customer = new Buyer([
- 'name' => $user->name,
- 'custom_fields' => [
- 'E-Mail' => $user->email,
- 'Client ID' => $user->id,
- ],
- ]);
- $item = (new InvoiceItem())
- ->title($shopProduct->description)
- ->pricePerUnit($shopProduct->price);
-
- $notes = [
- __("Payment method") . ": " . $payment->payment_method,
- ];
- $notes = implode("
", $notes);
-
-
- $invoice = Invoice::make()
- ->template('controlpanel')
- ->name(__("Invoice"))
- ->buyer($customer)
- ->seller($seller)
- ->discountByPercent(0)
- ->taxRate(floatval($shopProduct->getTaxPercent()))
- ->shipping(0)
- ->addItem($item)
- ->status(__($paymentStatus))
- ->series(now()->format('mY'))
- ->delimiter("-")
- ->sequence($newInvoiceID)
- ->serialNumberFormat(config("SETTINGS::INVOICE:PREFIX") . '{DELIMITER}{SERIES}{SEQUENCE}')
- ->currencyCode($currencyCode)
- ->currencySymbol(Currencies::getSymbol($currencyCode))
- ->notes($notes);
-
- if (file_exists($logoPath)) {
- $invoice->logo($logoPath);
- }
-
- //Save the invoice in "storage\app\invoice\USER_ID\YEAR"
- $invoice->filename = $invoice->getSerialNumber() . '.pdf';
- $invoice->render();
- Storage::disk("local")->put("invoice/" . $user->id . "/" . now()->format('Y') . "/" . $invoice->filename, $invoice->output);
-
-
- \App\Models\Invoice::create([
- 'invoice_user' => $user->id,
- 'invoice_name' => $invoice->getSerialNumber(),
- 'payment_id' => $payment->payment_id,
- ]);
-
- //Send Invoice per Mail
- $user->notify(new InvoiceNotification($invoice, $user, $payment));
+ return redirect()->route('store.index')->with('info', 'Payment was Canceled');
}
/**
* @return JsonResponse|mixed
+ *
* @throws Exception
*/
public function dataTable()
@@ -653,8 +141,9 @@ public function dataTable()
$query = Payment::with('user');
return datatables($query)
- ->editColumn('user', function (Payment $payment) {
- return $payment->user->name;
+
+ ->addColumn('user', function (Payment $payment) {
+ return ($payment->user) ? '' . $payment->user->name . '' : __('Unknown user');
})
->editColumn('price', function (Payment $payment) {
return $payment->formatToCurrency($payment->price);
@@ -670,12 +159,15 @@ public function dataTable()
})
->editColumn('created_at', function (Payment $payment) {
- return $payment->created_at ? $payment->created_at->diffForHumans() : '';
+ return [
+ 'display' => $payment->created_at ? $payment->created_at->diffForHumans() : '',
+ 'raw' => $payment->created_at ? strtotime($payment->created_at) : ''
+ ];
})
->addColumn('actions', function (Payment $payment) {
- return '';
+ return '';
})
- ->rawColumns(['actions'])
+ ->rawColumns(['actions', 'user'])
->make(true);
}
}
diff --git a/app/Http/Controllers/Admin/ProductController.php b/app/Http/Controllers/Admin/ProductController.php
index 6b855f9fe..5e9157d9f 100644
--- a/app/Http/Controllers/Admin/ProductController.php
+++ b/app/Http/Controllers/Admin/ProductController.php
@@ -6,7 +6,6 @@
use App\Models\Location;
use App\Models\Nest;
use App\Models\Product;
-use App\Models\Settings;
use Exception;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
@@ -52,33 +51,33 @@ public function clone(Request $request, Product $product)
/**
* Store a newly created resource in storage.
*
- * @param Request $request
+ * @param Request $request
* @return RedirectResponse
*/
public function store(Request $request)
{
$request->validate([
- "name" => "required|max:30",
- "price" => "required|numeric|max:1000000|min:0",
- "memory" => "required|numeric|max:1000000|min:5",
- "cpu" => "required|numeric|max:1000000|min:0",
- "swap" => "required|numeric|max:1000000|min:0",
- "description" => "required|string|max:191",
- "disk" => "required|numeric|max:1000000|min:5",
- "minimum_credits" => "required|numeric|max:1000000|min:-1",
- "io" => "required|numeric|max:1000000|min:0",
- "databases" => "required|numeric|max:1000000|min:0",
- "backups" => "required|numeric|max:1000000|min:0",
- "allocations" => "required|numeric|max:1000000|min:0",
- "nodes.*" => "required|exists:nodes,id",
- "eggs.*" => "required|exists:eggs,id",
- "disabled" => "nullable",
+ 'name' => 'required|max:30',
+ 'price' => 'required|numeric|max:1000000|min:0',
+ 'memory' => 'required|numeric|max:1000000|min:5',
+ 'cpu' => 'required|numeric|max:1000000|min:0',
+ 'swap' => 'required|numeric|max:1000000|min:0',
+ 'description' => 'required|string|max:191',
+ 'disk' => 'required|numeric|max:1000000|min:5',
+ 'minimum_credits' => 'required|numeric|max:1000000|min:-1',
+ 'io' => 'required|numeric|max:1000000|min:0',
+ 'databases' => 'required|numeric|max:1000000|min:0',
+ 'backups' => 'required|numeric|max:1000000|min:0',
+ 'allocations' => 'required|numeric|max:1000000|min:0',
+ 'nodes.*' => 'required|exists:nodes,id',
+ 'eggs.*' => 'required|exists:eggs,id',
+ 'disabled' => 'nullable',
]);
- $disabled = !is_null($request->input('disabled'));
+ $disabled = ! is_null($request->input('disabled'));
$product = Product::create(array_merge($request->all(), ['disabled' => $disabled]));
- #link nodes and eggs
+ //link nodes and eggs
$product->eggs()->attach($request->input('eggs'));
$product->nodes()->attach($request->input('nodes'));
@@ -88,21 +87,21 @@ public function store(Request $request)
/**
* Display the specified resource.
*
- * @param Product $product
+ * @param Product $product
* @return Application|Factory|View
*/
public function show(Product $product)
{
return view('admin.products.show', [
'product' => $product,
- 'minimum_credits' => config("SETTINGS::USER:MINIMUM_REQUIRED_CREDITS_TO_MAKE_SERVER"),
+ 'minimum_credits' => config('SETTINGS::USER:MINIMUM_REQUIRED_CREDITS_TO_MAKE_SERVER'),
]);
}
/**
* Show the form for editing the specified resource.
*
- * @param Product $product
+ * @param Product $product
* @return Application|Factory|View
*/
public function edit(Product $product)
@@ -117,34 +116,34 @@ public function edit(Product $product)
/**
* Update the specified resource in storage.
*
- * @param Request $request
- * @param Product $product
+ * @param Request $request
+ * @param Product $product
* @return RedirectResponse
*/
public function update(Request $request, Product $product): RedirectResponse
{
$request->validate([
- "name" => "required|max:30",
- "price" => "required|numeric|max:1000000|min:0",
- "memory" => "required|numeric|max:1000000|min:5",
- "cpu" => "required|numeric|max:1000000|min:0",
- "swap" => "required|numeric|max:1000000|min:0",
- "description" => "required|string|max:191",
- "disk" => "required|numeric|max:1000000|min:5",
- "io" => "required|numeric|max:1000000|min:0",
- "minimum_credits" => "required|numeric|max:1000000|min:-1",
- "databases" => "required|numeric|max:1000000|min:0",
- "backups" => "required|numeric|max:1000000|min:0",
- "allocations" => "required|numeric|max:1000000|min:0",
- "nodes.*" => "required|exists:nodes,id",
- "eggs.*" => "required|exists:eggs,id",
- "disabled" => "nullable",
+ 'name' => 'required|max:30',
+ 'price' => 'required|numeric|max:1000000|min:0',
+ 'memory' => 'required|numeric|max:1000000|min:5',
+ 'cpu' => 'required|numeric|max:1000000|min:0',
+ 'swap' => 'required|numeric|max:1000000|min:0',
+ 'description' => 'required|string|max:191',
+ 'disk' => 'required|numeric|max:1000000|min:5',
+ 'io' => 'required|numeric|max:1000000|min:0',
+ 'minimum_credits' => 'required|numeric|max:1000000|min:-1',
+ 'databases' => 'required|numeric|max:1000000|min:0',
+ 'backups' => 'required|numeric|max:1000000|min:0',
+ 'allocations' => 'required|numeric|max:1000000|min:0',
+ 'nodes.*' => 'required|exists:nodes,id',
+ 'eggs.*' => 'required|exists:eggs,id',
+ 'disabled' => 'nullable',
]);
- $disabled = !is_null($request->input('disabled'));
+ $disabled = ! is_null($request->input('disabled'));
$product->update(array_merge($request->all(), ['disabled' => $disabled]));
- #link nodes and eggs
+ //link nodes and eggs
$product->eggs()->detach();
$product->nodes()->detach();
$product->eggs()->attach($request->input('eggs'));
@@ -154,13 +153,13 @@ public function update(Request $request, Product $product): RedirectResponse
}
/**
- * @param Request $request
- * @param Product $product
+ * @param Request $request
+ * @param Product $product
* @return RedirectResponse
*/
public function disable(Request $request, Product $product)
{
- $product->update(['disabled' => !$product->disabled]);
+ $product->update(['disabled' => ! $product->disabled]);
return redirect()->route('admin.products.index')->with('success', 'Product has been updated!');
}
@@ -168,7 +167,7 @@ public function disable(Request $request, Product $product)
/**
* Remove the specified resource from storage.
*
- * @param Product $product
+ * @param Product $product
* @return RedirectResponse
*/
public function destroy(Product $product)
@@ -179,12 +178,13 @@ public function destroy(Product $product)
}
$product->delete();
+
return redirect()->back()->with('success', __('Product has been removed!'));
}
-
/**
* @return JsonResponse|mixed
+ *
* @throws Exception|Exception
*/
public function dataTable()
@@ -194,14 +194,14 @@ public function dataTable()
return datatables($query)
->addColumn('actions', function (Product $product) {
return '
-
-
-
-
-
';
})
@@ -216,18 +216,22 @@ public function dataTable()
return $product->eggs()->count();
})
->addColumn('disabled', function (Product $product) {
- $checked = $product->disabled == false ? "checked" : "";
+ $checked = $product->disabled == false ? 'checked' : '';
+
return '
-
';
})
+ ->editColumn('minimum_credits', function (Product $product) {
+ return $product->minimum_credits==-1 ? config('SETTINGS::USER:MINIMUM_REQUIRED_CREDITS_TO_MAKE_SERVER') : $product->minimum_credits;
+ })
->editColumn('created_at', function (Product $product) {
return $product->created_at ? $product->created_at->diffForHumans() : '';
})
diff --git a/app/Http/Controllers/Admin/ServerController.php b/app/Http/Controllers/Admin/ServerController.php
index a34b097b2..06d2cc22b 100644
--- a/app/Http/Controllers/Admin/ServerController.php
+++ b/app/Http/Controllers/Admin/ServerController.php
@@ -3,10 +3,9 @@
namespace App\Http\Controllers\Admin;
use App\Classes\Pterodactyl;
-use App\Classes\PterodactylWrapper;
use App\Http\Controllers\Controller;
use App\Models\Server;
-use App\Models\Settings;
+use App\Models\User;
use Exception;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
@@ -41,7 +40,7 @@ public function create()
/**
* Store a newly created resource in storage.
*
- * @param Request $request
+ * @param Request $request
* @return Response
*/
public function store(Request $request)
@@ -52,7 +51,7 @@ public function store(Request $request)
/**
* Display the specified resource.
*
- * @param Server $server
+ * @param Server $server
* @return Response
*/
public function show(Server $server)
@@ -63,31 +62,55 @@ public function show(Server $server)
/**
* Show the form for editing the specified resource.
*
- * @param Server $server
+ * @param Server $server
* @return Response
*/
-
public function edit(Server $server)
{
+ // get all users from the database
+ $users = User::all();
+
return view('admin.servers.edit')->with([
- 'server' => $server
+ 'server' => $server,
+ 'users' => $users,
]);
}
/**
* Update the specified resource in storage.
*
- * @param Request $request
- * @param Server $server
- * @return Response
+ * @param Request $request
+ * @param Server $server
*/
public function update(Request $request, Server $server)
{
$request->validate([
- "identifier" => "required|string",
+ 'identifier' => 'required|string',
+ 'user_id' => 'required|integer',
]);
- $server->update($request->all());
+
+ if ($request->get('user_id') != $server->user_id) {
+ // find the user
+ $user = User::findOrFail($request->get('user_id'));
+
+ // try to update the owner on pterodactyl
+ try {
+ $response = Pterodactyl::updateServerOwner($server, $user->pterodactyl_id);
+ if ($response->getStatusCode() != 200) {
+ return redirect()->back()->with('error', 'Failed to update server owner on pterodactyl');
+ }
+
+ // update the owner on the database
+ $server->user_id = $user->id;
+ } catch (Exception $e) {
+ return redirect()->back()->with('error', 'Internal Server Error');
+ }
+ }
+
+ // update the identifier
+ $server->identifier = $request->get('identifier');
+ $server->save();
return redirect()->route('admin.servers.index')->with('success', 'Server updated!');
}
@@ -95,13 +118,14 @@ public function update(Request $request, Server $server)
/**
* Remove the specified resource from storage.
*
- * @param Server $server
+ * @param Server $server
* @return RedirectResponse|Response
*/
public function destroy(Server $server)
{
try {
$server->delete();
+
return redirect()->route('admin.servers.index')->with('success', __('Server removed'));
} catch (Exception $e) {
return redirect()->route('admin.servers.index')->with('error', __('An exception has occurred while trying to remove a resource "') . $e->getMessage() . '"');
@@ -109,13 +133,13 @@ public function destroy(Server $server)
}
/**
- * @param Server $server
+ * @param Server $server
* @return RedirectResponse
*/
public function toggleSuspended(Server $server)
{
try {
- $server->isSuspended() ? $server->unSuspend() : $server->suspend();
+ $server->isSuspended() ? $server->unSuspend() : $server->suspend();
} catch (Exception $exception) {
return redirect()->back()->with('error', $exception->getMessage());
}
@@ -130,20 +154,20 @@ public function syncServers()
$CPIDArray = [];
$renameCount = 0;
- foreach($CPServers as $CPServer)//go thru all CP servers and make array with IDs as keys. All values are false.
- {
- if($CPServer->pterodactyl_id) $CPIDArray[$CPServer->pterodactyl_id] = false;
+ foreach ($CPServers as $CPServer) { //go thru all CP servers and make array with IDs as keys. All values are false.
+ if ($CPServer->pterodactyl_id) {
+ $CPIDArray[$CPServer->pterodactyl_id] = false;
+ }
}
- foreach($pteroServers as $server)//go thru all ptero servers, if server exists, change value to true in array.
- {
- if(isset($CPIDArray[$server['attributes']['id']])){
- $CPIDArray[$server['attributes']['id']]=true;
+ foreach ($pteroServers as $server) { //go thru all ptero servers, if server exists, change value to true in array.
+ if (isset($CPIDArray[$server['attributes']['id']])) {
+ $CPIDArray[$server['attributes']['id']] = true;
- if(isset($server['attributes']['name'])){//failsafe
+ if (isset($server['attributes']['name'])) { //failsafe
//Check if a server got renamed
$savedServer = Server::query()->where('pterodactyl_id', $server['attributes']['id'])->first();
- if($savedServer->name != $server['attributes']['name']){
+ if ($savedServer->name != $server['attributes']['name']) {
$savedServer->name = $server['attributes']['name'];
$savedServer->save();
$renameCount++;
@@ -151,28 +175,35 @@ public function syncServers()
}
}
}
- $filteredArray = array_filter($CPIDArray, function($v, $k) { return $v == false; }, ARRAY_FILTER_USE_BOTH); //Array of servers, that dont exist on ptero (value == false)
+ $filteredArray = array_filter($CPIDArray, function ($v, $k) {
+ return $v == false;
+ }, ARRAY_FILTER_USE_BOTH); //Array of servers, that dont exist on ptero (value == false)
$deleteCount = 0;
- foreach($filteredArray as $key => $CPID)//delete servers that dont exist on ptero anymore
- {
- if(!Pterodactyl::getServerAttributes($key, true)) $deleteCount++;
+ foreach ($filteredArray as $key => $CPID) { //delete servers that dont exist on ptero anymore
+ if (!Pterodactyl::getServerAttributes($key, true)) {
+ $deleteCount++;
+ }
}
- return redirect()->back()->with('success', __('Servers synced successfully' . (($renameCount)?(',\n' . __('renamed') . ' ' . $renameCount . ' ' . __('servers')):'') . ((count($filteredArray))?(',\n' . __('deleted') . ' ' . $deleteCount . '/' . count($filteredArray) . ' ' . __('old servers')):''))) . '.';
+ return redirect()->back()->with('success', __('Servers synced successfully' . (($renameCount) ? (',\n' . __('renamed') . ' ' . $renameCount . ' ' . __('servers')) : '') . ((count($filteredArray)) ? (',\n' . __('deleted') . ' ' . $deleteCount . '/' . count($filteredArray) . ' ' . __('old servers')) : ''))) . '.';
}
/**
* @return JsonResponse|mixed
+ *
* @throws Exception
*/
public function dataTable(Request $request)
{
$query = Server::with(['user', 'product']);
- if ($request->has('product')) $query->where('product_id', '=', $request->input('product'));
- if ($request->has('user')) $query->where('user_id', '=', $request->input('user'));
+ if ($request->has('product')) {
+ $query->where('product_id', '=', $request->input('product'));
+ }
+ if ($request->has('user')) {
+ $query->where('user_id', '=', $request->input('user'));
+ }
$query->select('servers.*');
-
return datatables($query)
->addColumn('user', function (Server $server) {
return '' . $server->user->name . '';
@@ -181,12 +212,12 @@ public function dataTable(Request $request)
return $server->product->description;
})
->addColumn('actions', function (Server $server) {
- $suspendColor = $server->isSuspended() ? "btn-success" : "btn-warning";
- $suspendIcon = $server->isSuspended() ? "fa-play-circle" : "fa-pause-circle";
- $suspendText = $server->isSuspended() ? __("Unsuspend") : __("Suspend");
+ $suspendColor = $server->isSuspended() ? 'btn-success' : 'btn-warning';
+ $suspendIcon = $server->isSuspended() ? 'fa-play-circle' : 'fa-pause-circle';
+ $suspendText = $server->isSuspended() ? __('Unsuspend') : __('Suspend');
return '
-
+
';
})
->addColumn('status', function (Server $server) {
$labelColor = $server->isSuspended() ? 'text-danger' : 'text-success';
+
return '';
})
->editColumn('created_at', function (Server $server) {
@@ -211,7 +243,7 @@ public function dataTable(Request $request)
return $server->suspended ? $server->suspended->diffForHumans() : '';
})
->editColumn('name', function (Server $server) {
- return 'pterodactyl_id . '">' . strip_tags($server->name) . '';
+ return '' . strip_tags($server->name) . '';
})
->rawColumns(['user', 'actions', 'status', 'name'])
->make();
diff --git a/app/Http/Controllers/Admin/SettingsController.php b/app/Http/Controllers/Admin/SettingsController.php
index e1648eba8..ad1b3a36d 100644
--- a/app/Http/Controllers/Admin/SettingsController.php
+++ b/app/Http/Controllers/Admin/SettingsController.php
@@ -3,12 +3,11 @@
namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
-use App\Models\Settings;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
-use Illuminate\Http\Request;
use Illuminate\Http\Response;
+use Qirolab\Theme\Theme;
class SettingsController extends Controller
{
@@ -19,25 +18,32 @@ class SettingsController extends Controller
*/
public function index()
{
+
+
//Get all tabs as laravel view paths
$tabs = [];
- foreach (glob(resource_path('views/admin/settings/tabs/*.blade.php')) as $filename) {
- $tabs[] = 'admin.settings.tabs.' . basename($filename, '.blade.php');
+ foreach (glob(Theme::getViewPaths()[0] . '/admin/settings/tabs/*.blade.php') as $filename) {
+ $tabs[] = 'admin.settings.tabs.'.basename($filename, '.blade.php');
}
+
//Generate a html list item for each tab based on tabs file basename, set first tab as active
$tabListItems = [];
foreach ($tabs as $tab) {
$tabName = str_replace('admin.settings.tabs.', '', $tab);
$tabListItems[] = '". __('Your servers have been suspended!')."
-
" . config('app.name', 'Laravel') . "'.__('Your servers have been suspended!').'
+
'.config('app.name', 'Laravel').'
diff --git a/app/Notifications/Ticket/User/CreateNotification.php b/app/Notifications/Ticket/User/CreateNotification.php
index 3d2580301..6cb488328 100644
--- a/app/Notifications/Ticket/User/CreateNotification.php
+++ b/app/Notifications/Ticket/User/CreateNotification.php
@@ -10,7 +10,6 @@
class CreateNotification extends Notification implements ShouldQueue
{
-
//THIS IS BASICALLY NOT USED ANYMORE WITH INVOICENOTIFICATION IN PLACE
use Queueable;
@@ -35,7 +34,8 @@ public function __construct(Ticket $ticket)
*/
public function via($notifiable)
{
- $via = ['mail','database'];
+ $via = ['mail', 'database'];
+
return $via;
}
@@ -48,20 +48,20 @@ public function via($notifiable)
public function toMail($notifiable)
{
return (new MailMessage)
- ->subject('[Ticket ID: ' . $this->ticket->ticket_id . '] ' . $this->ticket->title)
- ->markdown('mail.ticket.user.create' , ['ticket' => $this->ticket]);
+ ->subject('[Ticket ID: '.$this->ticket->ticket_id.'] '.$this->ticket->title)
+ ->markdown('mail.ticket.user.create', ['ticket' => $this->ticket]);
}
/**
* Get the array representation of the notification.
*
- * @param mixed $notifiable
+ * @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
- 'title' => '[Ticket ID: ' . $this->ticket->ticket_id . '] ' . $this->ticket->title,
+ 'title' => '[Ticket ID: '.$this->ticket->ticket_id.'] '.$this->ticket->title,
'content' => "Your Ticket has been Created With ID : {$this->ticket->ticket_id}",
];
}
diff --git a/app/Notifications/Ticket/User/ReplyNotification.php b/app/Notifications/Ticket/User/ReplyNotification.php
index 1d2b733a5..19b52514f 100644
--- a/app/Notifications/Ticket/User/ReplyNotification.php
+++ b/app/Notifications/Ticket/User/ReplyNotification.php
@@ -2,8 +2,8 @@
namespace App\Notifications\Ticket\User;
-use App\Models\User;
use App\Models\Ticket;
+use App\Models\User;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\MailMessage;
@@ -11,13 +11,14 @@
class ReplyNotification extends Notification implements ShouldQueue
{
-
//THIS IS BASICALLY NOT USED ANYMORE WITH INVOICENOTIFICATION IN PLACE
use Queueable;
private Ticket $ticket;
+
private User $user;
+
private $newmessage;
/**
@@ -27,8 +28,8 @@ class ReplyNotification extends Notification implements ShouldQueue
*/
public function __construct(Ticket $ticket, User $user, $newmessage)
{
- $this->ticket = $ticket;
- $this->user = $user;
+ $this->ticket = $ticket;
+ $this->user = $user;
$this->newmessage = $newmessage;
}
@@ -40,7 +41,8 @@ public function __construct(Ticket $ticket, User $user, $newmessage)
*/
public function via($notifiable)
{
- $via = ['mail','database'];
+ $via = ['mail', 'database'];
+
return $via;
}
@@ -53,20 +55,20 @@ public function via($notifiable)
public function toMail($notifiable)
{
return (new MailMessage)
- ->subject('[Ticket ID: ' . $this->ticket->ticket_id . '] ' . $this->ticket->title)
- ->markdown('mail.ticket.user.reply' , ['ticket' => $this->ticket, 'user' => $this->user, 'newmessage' => $this->newmessage]);
+ ->subject('[Ticket ID: '.$this->ticket->ticket_id.'] '.$this->ticket->title)
+ ->markdown('mail.ticket.user.reply', ['ticket' => $this->ticket, 'user' => $this->user, 'newmessage' => $this->newmessage]);
}
/**
* Get the array representation of the notification.
*
- * @param mixed $notifiable
+ * @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
- 'title' => '[Ticket ID: ' . $this->ticket->ticket_id . '] ' . $this->ticket->title,
+ 'title' => '[Ticket ID: '.$this->ticket->ticket_id.'] '.$this->ticket->title,
'content' => "
diff --git a/app/Notifications/WelcomeMessage.php b/app/Notifications/WelcomeMessage.php
index 3841fc83f..d6aa073b6 100644
--- a/app/Notifications/WelcomeMessage.php
+++ b/app/Notifications/WelcomeMessage.php
@@ -2,7 +2,6 @@
namespace App\Notifications;
-use App\Models\Settings;
use App\Models\User;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
@@ -20,7 +19,7 @@ class WelcomeMessage extends Notification implements ShouldQueue
/**
* Create a new notification instance.
*
- * @param User $user
+ * @param User $user
*/
public function __construct(User $user)
{
@@ -30,56 +29,56 @@ public function __construct(User $user)
/**
* Get the notification's delivery channels.
*
- * @param mixed $notifiable
+ * @param mixed $notifiable
* @return array
*/
public function via($notifiable)
{
return ['database'];
}
+
public function AdditionalLines()
{
-
- $AdditionalLine = "";
+ $AdditionalLine = '';
if (config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_EMAIL') != 0) {
- $AdditionalLine .= __("Verifying your e-mail address will grant you ") . config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_EMAIL'). " " . __("additional") . " " . config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME') . ".
";
+ $AdditionalLine .= __('Verifying your e-mail address will grant you ').config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_EMAIL').' '.__('additional').' '.config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME').'.
';
}
if (config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_EMAIL') != 0) {
- $AdditionalLine .= __("Verifying your e-mail will also increase your Server Limit by ") . config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_EMAIL') . ".
";
+ $AdditionalLine .= __('Verifying your e-mail will also increase your Server Limit by ').config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_EMAIL').'.
';
}
- $AdditionalLine .= "
";
+ $AdditionalLine .= '
';
if (config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_DISCORD') != 0) {
- $AdditionalLine .= __("You can also verify your discord account to get another ") . config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_DISCORD') . " " . config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME') . ".
";
+ $AdditionalLine .= __('You can also verify your discord account to get another ').config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_DISCORD').' '.config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME').'.
';
}
if (config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_DISCORD') != 0) {
- $AdditionalLine .= __("Verifying your Discord account will also increase your Server Limit by ") . config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_DISCORD') . ".
";
+ $AdditionalLine .= __('Verifying your Discord account will also increase your Server Limit by ').config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_DISCORD').'.
';
}
return $AdditionalLine;
}
+
/**
* Get the array representation of the notification.
*
- * @param mixed $notifiable
+ * @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
-
return [
- 'title' => __("Getting started!"),
- 'content' => "
- ".__("Verification")."
- '.__('Verification').'
+ ".__("Information")."
-
".__("These servers can be used and managed on our pterodactyl panel").".
".__("If you have any questions, please join our Discord server and #create-a-ticket").".
" . config('app.name', 'Laravel') . "'.__('Information').'
+
'.__('These servers can be used and managed on our pterodactyl panel').'.
'.__('If you have any questions, please join our Discord server and #create-a-ticket').'.
'.config('app.name', 'Laravel').'
", $notes);
+
+
+ $invoice = Invoice::make()
+ ->template('controlpanel')
+ ->name(__("Invoice"))
+ ->buyer($customer)
+ ->seller($seller)
+ ->discountByPercent(PartnerDiscount::getDiscount())
+ ->taxRate(floatval($shopProduct->getTaxPercent()))
+ ->shipping(0)
+ ->addItem($item)
+ ->status(__($payment->status))
+ ->series(now()->format('mY'))
+ ->delimiter("-")
+ ->sequence($newInvoiceID)
+ ->serialNumberFormat(config("SETTINGS::INVOICE:PREFIX") . '{DELIMITER}{SERIES}{SEQUENCE}')
+ ->currencyCode(strtoupper($payment->currency_code))
+ ->currencySymbol(Currencies::getSymbol(strtoupper($payment->currency_code)))
+ ->notes($notes);
+
+ if (file_exists($logoPath)) {
+ $invoice->logo($logoPath);
+ }
+
+ //Save the invoice in "storage\app\invoice\USER_ID\YEAR"
+ $invoice->filename = $invoice->getSerialNumber() . '.pdf';
+ $invoice->render();
+ Storage::disk("local")->put("invoice/" . $user->id . "/" . now()->format('Y') . "/" . $invoice->filename, $invoice->output);
+
+ \App\Models\Invoice::create([
+ 'invoice_user' => $user->id,
+ 'invoice_name' => $invoice->getSerialNumber(),
+ 'payment_id' => $payment->payment_id,
+ ]);
+
+ //Send Invoice per Mail
+ $user->notify(new InvoiceNotification($invoice, $user, $payment));
+ }
+}
diff --git a/composer.json b/composer.json
index 37a657e20..6dfc73bbe 100644
--- a/composer.json
+++ b/composer.json
@@ -8,42 +8,47 @@
],
"license": "MIT",
"require": {
- "php": "^8.0|^7.4",
+ "php": "^8.1",
"ext-intl": "*",
"biscolab/laravel-recaptcha": "^5.4",
"doctrine/dbal": "^3.1",
- "fideloper/proxy": "^4.4",
- "fruitcake/laravel-cors": "^2.0",
- "guzzlehttp/guzzle": "^7.0.1",
+ "guzzlehttp/guzzle": "^7.2",
"hidehalo/nanoid-php": "^1.1",
- "kkomelin/laravel-translatable-string-exporter": "^1.14",
- "laravel/framework": "^8.12",
- "laravel/tinker": "^2.5",
- "laravel/ui": "^3.2",
- "laraveldaily/laravel-invoices": "^2.0",
+ "kkomelin/laravel-translatable-string-exporter": "^1.18",
+ "laravel/framework": "^9.46",
+ "laravel/tinker": "^2.7",
+ "laravel/ui": "^3.3",
+ "laraveldaily/laravel-invoices": "^3.0",
+ "league/flysystem-aws-s3-v3": "^3.0",
"paypal/paypal-checkout-sdk": "^1.0",
"paypal/rest-api-sdk-php": "^1.14",
+ "qirolab/laravel-themer": "^2.0",
"socialiteproviders/discord": "^4.1",
- "spatie/laravel-activitylog": "^3.16",
- "spatie/laravel-query-builder": "^3.6",
- "spatie/laravel-validation-rules": "^3.0",
+ "spatie/laravel-activitylog": "^4.4",
+ "spatie/laravel-query-builder": "^5.0",
+ "spatie/laravel-validation-rules": "^3.2",
"stripe/stripe-php": "^7.107",
- "symfony/intl": "^5.4",
- "yajra/laravel-datatables-oracle": "~9.0"
+ "symfony/http-client": "^6.2",
+ "symfony/intl": "^6.0",
+ "symfony/mailgun-mailer": "^6.2",
+ "yajra/laravel-datatables-oracle": "^9.19"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.6",
- "facade/ignition": "^2.5",
"fakerphp/faker": "^1.9.1",
- "laravel/sail": "^1.0.1",
- "mockery/mockery": "^1.4.2",
- "nunomaduro/collision": "^5.0",
- "phpunit/phpunit": "^9.3.3"
+ "laravel/sail": "^1.15",
+ "mockery/mockery": "^1.4.4",
+ "nunomaduro/collision": "^6.3",
+ "phpunit/phpunit": "^9.5.10",
+ "spatie/laravel-ignition": "^1.4"
},
"config": {
"optimize-autoloader": true,
"preferred-install": "dist",
- "sort-packages": true
+ "sort-packages": true,
+ "platform": {
+ "php": "8.1"
+ }
},
"extra": {
"laravel": {
@@ -76,6 +81,9 @@
],
"post-create-project-cmd": [
"@php artisan key:generate --ansi"
+ ],
+ "post-update-cmd": [
+ "@php artisan vendor:publish --tag=laravel-assets --ansi --force"
]
}
}
diff --git a/composer.lock b/composer.lock
index 05fc48256..22199e07c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,94 +4,189 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "275c5d5f239c60f912cf741392f4f063",
+ "content-hash": "be76c9bab8622d363a4eb843794e9e3e",
"packages": [
{
- "name": "asm89/stack-cors",
- "version": "v2.1.1",
+ "name": "aws/aws-crt-php",
+ "version": "v1.0.2",
"source": {
"type": "git",
- "url": "https://github.com/asm89/stack-cors.git",
- "reference": "73e5b88775c64ccc0b84fb60836b30dc9d92ac4a"
+ "url": "https://github.com/awslabs/aws-crt-php.git",
+ "reference": "3942776a8c99209908ee0b287746263725685732"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/asm89/stack-cors/zipball/73e5b88775c64ccc0b84fb60836b30dc9d92ac4a",
- "reference": "73e5b88775c64ccc0b84fb60836b30dc9d92ac4a",
+ "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/3942776a8c99209908ee0b287746263725685732",
+ "reference": "3942776a8c99209908ee0b287746263725685732",
"shasum": ""
},
"require": {
- "php": "^7.2|^8.0",
- "symfony/http-foundation": "^4|^5|^6",
- "symfony/http-kernel": "^4|^5|^6"
+ "php": ">=5.5"
},
"require-dev": {
- "phpunit/phpunit": "^7|^9",
- "squizlabs/php_codesniffer": "^3.5"
+ "phpunit/phpunit": "^4.8.35|^5.4.3"
+ },
+ "type": "library",
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "Apache-2.0"
+ ],
+ "authors": [
+ {
+ "name": "AWS SDK Common Runtime Team",
+ "email": "aws-sdk-common-runtime@amazon.com"
+ }
+ ],
+ "description": "AWS Common Runtime for PHP",
+ "homepage": "http://aws.amazon.com/sdkforphp",
+ "keywords": [
+ "amazon",
+ "aws",
+ "crt",
+ "sdk"
+ ],
+ "support": {
+ "issues": "https://github.com/awslabs/aws-crt-php/issues",
+ "source": "https://github.com/awslabs/aws-crt-php/tree/v1.0.2"
+ },
+ "time": "2021-09-03T22:57:30+00:00"
+ },
+ {
+ "name": "aws/aws-sdk-php",
+ "version": "3.255.9",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/aws/aws-sdk-php.git",
+ "reference": "a001ab98b9e76a6f5cae327b3316b08fab37a296"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a001ab98b9e76a6f5cae327b3316b08fab37a296",
+ "reference": "a001ab98b9e76a6f5cae327b3316b08fab37a296",
+ "shasum": ""
+ },
+ "require": {
+ "aws/aws-crt-php": "^1.0.2",
+ "ext-json": "*",
+ "ext-pcre": "*",
+ "ext-simplexml": "*",
+ "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
+ "guzzlehttp/promises": "^1.4.0",
+ "guzzlehttp/psr7": "^1.8.5 || ^2.3",
+ "mtdowling/jmespath.php": "^2.6",
+ "php": ">=5.5"
+ },
+ "require-dev": {
+ "andrewsville/php-token-reflection": "^1.4",
+ "aws/aws-php-sns-message-validator": "~1.0",
+ "behat/behat": "~3.0",
+ "composer/composer": "^1.10.22",
+ "dms/phpunit-arraysubset-asserts": "^0.4.0",
+ "doctrine/cache": "~1.4",
+ "ext-dom": "*",
+ "ext-openssl": "*",
+ "ext-pcntl": "*",
+ "ext-sockets": "*",
+ "nette/neon": "^2.3",
+ "paragonie/random_compat": ">= 2",
+ "phpunit/phpunit": "^4.8.35 || ^5.6.3 || ^9.5",
+ "psr/cache": "^1.0",
+ "psr/simple-cache": "^1.0",
+ "sebastian/comparator": "^1.2.3 || ^4.0",
+ "yoast/phpunit-polyfills": "^1.0"
+ },
+ "suggest": {
+ "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications",
+ "doctrine/cache": "To use the DoctrineCacheAdapter",
+ "ext-curl": "To send requests using cURL",
+ "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages",
+ "ext-sockets": "To use client-side monitoring"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev"
+ "dev-master": "3.0-dev"
}
},
"autoload": {
+ "files": [
+ "src/functions.php"
+ ],
"psr-4": {
- "Asm89\\Stack\\": "src/"
+ "Aws\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "Apache-2.0"
],
"authors": [
{
- "name": "Alexander",
- "email": "iam.asm89@gmail.com"
+ "name": "Amazon Web Services",
+ "homepage": "http://aws.amazon.com"
}
],
- "description": "Cross-origin resource sharing library and stack middleware",
- "homepage": "https://github.com/asm89/stack-cors",
+ "description": "AWS SDK for PHP - Use Amazon Web Services in your PHP project",
+ "homepage": "http://aws.amazon.com/sdkforphp",
"keywords": [
- "cors",
- "stack"
+ "amazon",
+ "aws",
+ "cloud",
+ "dynamodb",
+ "ec2",
+ "glacier",
+ "s3",
+ "sdk"
],
"support": {
- "issues": "https://github.com/asm89/stack-cors/issues",
- "source": "https://github.com/asm89/stack-cors/tree/v2.1.1"
+ "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
+ "issues": "https://github.com/aws/aws-sdk-php/issues",
+ "source": "https://github.com/aws/aws-sdk-php/tree/3.255.9"
},
- "time": "2022-01-18T09:12:03+00:00"
+ "time": "2023-01-04T19:24:09+00:00"
},
{
"name": "barryvdh/laravel-dompdf",
- "version": "v0.9.0",
+ "version": "v2.0.0",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-dompdf.git",
- "reference": "5b99e1f94157d74e450f4c97e8444fcaffa2144b"
+ "reference": "1d47648c6cef37f715ecb8bcc5f5a656ad372e27"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/5b99e1f94157d74e450f4c97e8444fcaffa2144b",
- "reference": "5b99e1f94157d74e450f4c97e8444fcaffa2144b",
+ "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/1d47648c6cef37f715ecb8bcc5f5a656ad372e27",
+ "reference": "1d47648c6cef37f715ecb8bcc5f5a656ad372e27",
"shasum": ""
},
"require": {
- "dompdf/dompdf": "^1",
- "illuminate/support": "^5.5|^6|^7|^8",
- "php": "^7.1 || ^8.0"
+ "dompdf/dompdf": "^2",
+ "illuminate/support": "^6|^7|^8|^9",
+ "php": "^7.2 || ^8.0"
+ },
+ "require-dev": {
+ "nunomaduro/larastan": "^1|^2",
+ "orchestra/testbench": "^4|^5|^6|^7",
+ "phpro/grumphp": "^1",
+ "squizlabs/php_codesniffer": "^3.5"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "0.9-dev"
+ "dev-master": "2.0-dev"
},
"laravel": {
"providers": [
"Barryvdh\\DomPDF\\ServiceProvider"
],
"aliases": {
- "PDF": "Barryvdh\\DomPDF\\Facade"
+ "Pdf": "Barryvdh\\DomPDF\\Facade\\Pdf",
+ "PDF": "Barryvdh\\DomPDF\\Facade\\Pdf"
}
}
},
@@ -118,15 +213,19 @@
],
"support": {
"issues": "https://github.com/barryvdh/laravel-dompdf/issues",
- "source": "https://github.com/barryvdh/laravel-dompdf/tree/v0.9.0"
+ "source": "https://github.com/barryvdh/laravel-dompdf/tree/v2.0.0"
},
"funding": [
+ {
+ "url": "https://fruitcake.nl",
+ "type": "custom"
+ },
{
"url": "https://github.com/barryvdh",
"type": "github"
}
],
- "time": "2020-12-27T12:05:53+00:00"
+ "time": "2022-07-06T11:12:10+00:00"
},
{
"name": "biscolab/laravel-recaptcha",
@@ -201,16 +300,16 @@
},
{
"name": "brick/math",
- "version": "0.10.1",
+ "version": "0.10.2",
"source": {
"type": "git",
"url": "https://github.com/brick/math.git",
- "reference": "de846578401f4e58f911b3afeb62ced56365ed87"
+ "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/brick/math/zipball/de846578401f4e58f911b3afeb62ced56365ed87",
- "reference": "de846578401f4e58f911b3afeb62ced56365ed87",
+ "url": "https://api.github.com/repos/brick/math/zipball/459f2781e1a08d52ee56b0b1444086e038561e3f",
+ "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f",
"shasum": ""
},
"require": {
@@ -245,7 +344,7 @@
],
"support": {
"issues": "https://github.com/brick/math/issues",
- "source": "https://github.com/brick/math/tree/0.10.1"
+ "source": "https://github.com/brick/math/tree/0.10.2"
},
"funding": [
{
@@ -253,20 +352,20 @@
"type": "github"
}
],
- "time": "2022-08-01T22:54:31+00:00"
+ "time": "2022-08-10T22:54:19+00:00"
},
{
"name": "dflydev/dot-access-data",
- "version": "v3.0.1",
+ "version": "v3.0.2",
"source": {
"type": "git",
"url": "https://github.com/dflydev/dflydev-dot-access-data.git",
- "reference": "0992cc19268b259a39e86f296da5f0677841f42c"
+ "reference": "f41715465d65213d644d3141a6a93081be5d3549"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/0992cc19268b259a39e86f296da5f0677841f42c",
- "reference": "0992cc19268b259a39e86f296da5f0677841f42c",
+ "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/f41715465d65213d644d3141a6a93081be5d3549",
+ "reference": "f41715465d65213d644d3141a6a93081be5d3549",
"shasum": ""
},
"require": {
@@ -277,7 +376,7 @@
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.3",
"scrutinizer/ocular": "1.6.0",
"squizlabs/php_codesniffer": "^3.5",
- "vimeo/psalm": "^3.14"
+ "vimeo/psalm": "^4.0.0"
},
"type": "library",
"extra": {
@@ -326,9 +425,9 @@
],
"support": {
"issues": "https://github.com/dflydev/dflydev-dot-access-data/issues",
- "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.1"
+ "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.2"
},
- "time": "2021-08-13T13:06:58+00:00"
+ "time": "2022-10-27T11:44:00+00:00"
},
{
"name": "doctrine/cache",
@@ -425,38 +524,38 @@
},
{
"name": "doctrine/dbal",
- "version": "3.3.7",
+ "version": "3.5.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
- "reference": "9f79d4650430b582f4598fe0954ef4d52fbc0a8a"
+ "reference": "63e513cebbbaf96a6795e5c5ee34d205831bfc85"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/9f79d4650430b582f4598fe0954ef4d52fbc0a8a",
- "reference": "9f79d4650430b582f4598fe0954ef4d52fbc0a8a",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/63e513cebbbaf96a6795e5c5ee34d205831bfc85",
+ "reference": "63e513cebbbaf96a6795e5c5ee34d205831bfc85",
"shasum": ""
},
"require": {
"composer-runtime-api": "^2",
"doctrine/cache": "^1.11|^2.0",
"doctrine/deprecations": "^0.5.3|^1",
- "doctrine/event-manager": "^1.0",
- "php": "^7.3 || ^8.0",
+ "doctrine/event-manager": "^1|^2",
+ "php": "^7.4 || ^8.0",
"psr/cache": "^1|^2|^3",
"psr/log": "^1|^2|^3"
},
"require-dev": {
- "doctrine/coding-standard": "9.0.0",
- "jetbrains/phpstorm-stubs": "2022.1",
- "phpstan/phpstan": "1.7.13",
- "phpstan/phpstan-strict-rules": "^1.2",
- "phpunit/phpunit": "9.5.20",
- "psalm/plugin-phpunit": "0.16.1",
- "squizlabs/php_codesniffer": "3.7.0",
- "symfony/cache": "^5.2|^6.0",
- "symfony/console": "^2.7|^3.0|^4.0|^5.0|^6.0",
- "vimeo/psalm": "4.23.0"
+ "doctrine/coding-standard": "11.0.0",
+ "jetbrains/phpstorm-stubs": "2022.3",
+ "phpstan/phpstan": "1.9.2",
+ "phpstan/phpstan-strict-rules": "^1.4",
+ "phpunit/phpunit": "9.5.27",
+ "psalm/plugin-phpunit": "0.18.4",
+ "squizlabs/php_codesniffer": "3.7.1",
+ "symfony/cache": "^5.4|^6.0",
+ "symfony/console": "^4.4|^5.4|^6.0",
+ "vimeo/psalm": "4.30.0"
},
"suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -516,7 +615,7 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
- "source": "https://github.com/doctrine/dbal/tree/3.3.7"
+ "source": "https://github.com/doctrine/dbal/tree/3.5.2"
},
"funding": [
{
@@ -532,7 +631,7 @@
"type": "tidelift"
}
],
- "time": "2022-06-13T21:43:03+00:00"
+ "time": "2022-12-19T08:17:34+00:00"
},
{
"name": "doctrine/deprecations",
@@ -579,34 +678,34 @@
},
{
"name": "doctrine/event-manager",
- "version": "1.1.2",
+ "version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/event-manager.git",
- "reference": "eb2ecf80e3093e8f3c2769ac838e27d8ede8e683"
+ "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/event-manager/zipball/eb2ecf80e3093e8f3c2769ac838e27d8ede8e683",
- "reference": "eb2ecf80e3093e8f3c2769ac838e27d8ede8e683",
+ "url": "https://api.github.com/repos/doctrine/event-manager/zipball/750671534e0241a7c50ea5b43f67e23eb5c96f32",
+ "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32",
"shasum": ""
},
"require": {
- "php": "^7.1 || ^8.0"
+ "php": "^8.1"
},
"conflict": {
"doctrine/common": "<2.9"
},
"require-dev": {
- "doctrine/coding-standard": "^9",
- "phpstan/phpstan": "~1.4.10 || ^1.5.4",
- "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
- "vimeo/psalm": "^4.22"
+ "doctrine/coding-standard": "^10",
+ "phpstan/phpstan": "^1.8.8",
+ "phpunit/phpunit": "^9.5",
+ "vimeo/psalm": "^4.28"
},
"type": "library",
"autoload": {
"psr-4": {
- "Doctrine\\Common\\": "lib/Doctrine/Common"
+ "Doctrine\\Common\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -650,7 +749,7 @@
],
"support": {
"issues": "https://github.com/doctrine/event-manager/issues",
- "source": "https://github.com/doctrine/event-manager/tree/1.1.2"
+ "source": "https://github.com/doctrine/event-manager/tree/2.0.0"
},
"funding": [
{
@@ -666,32 +765,32 @@
"type": "tidelift"
}
],
- "time": "2022-07-27T22:18:11+00:00"
+ "time": "2022-10-12T20:59:15+00:00"
},
{
"name": "doctrine/inflector",
- "version": "2.0.4",
+ "version": "2.0.6",
"source": {
"type": "git",
"url": "https://github.com/doctrine/inflector.git",
- "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89"
+ "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/inflector/zipball/8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89",
- "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89",
+ "url": "https://api.github.com/repos/doctrine/inflector/zipball/d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
+ "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
"shasum": ""
},
"require": {
"php": "^7.2 || ^8.0"
},
"require-dev": {
- "doctrine/coding-standard": "^8.2",
- "phpstan/phpstan": "^0.12",
- "phpstan/phpstan-phpunit": "^0.12",
- "phpstan/phpstan-strict-rules": "^0.12",
- "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
- "vimeo/psalm": "^4.10"
+ "doctrine/coding-standard": "^10",
+ "phpstan/phpstan": "^1.8",
+ "phpstan/phpstan-phpunit": "^1.1",
+ "phpstan/phpstan-strict-rules": "^1.3",
+ "phpunit/phpunit": "^8.5 || ^9.5",
+ "vimeo/psalm": "^4.25"
},
"type": "library",
"autoload": {
@@ -741,7 +840,7 @@
],
"support": {
"issues": "https://github.com/doctrine/inflector/issues",
- "source": "https://github.com/doctrine/inflector/tree/2.0.4"
+ "source": "https://github.com/doctrine/inflector/tree/2.0.6"
},
"funding": [
{
@@ -757,35 +856,37 @@
"type": "tidelift"
}
],
- "time": "2021-10-22T20:16:43+00:00"
+ "time": "2022-10-20T09:10:12+00:00"
},
{
"name": "doctrine/lexer",
- "version": "1.2.3",
+ "version": "2.1.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/lexer.git",
- "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229"
+ "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229",
- "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229",
+ "url": "https://api.github.com/repos/doctrine/lexer/zipball/39ab8fcf5a51ce4b85ca97c7a7d033eb12831124",
+ "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124",
"shasum": ""
},
"require": {
+ "doctrine/deprecations": "^1.0",
"php": "^7.1 || ^8.0"
},
"require-dev": {
- "doctrine/coding-standard": "^9.0",
+ "doctrine/coding-standard": "^9 || ^10",
"phpstan/phpstan": "^1.3",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
- "vimeo/psalm": "^4.11"
+ "psalm/plugin-phpunit": "^0.18.3",
+ "vimeo/psalm": "^4.11 || ^5.0"
},
"type": "library",
"autoload": {
"psr-4": {
- "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
+ "Doctrine\\Common\\Lexer\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -817,7 +918,7 @@
],
"support": {
"issues": "https://github.com/doctrine/lexer/issues",
- "source": "https://github.com/doctrine/lexer/tree/1.2.3"
+ "source": "https://github.com/doctrine/lexer/tree/2.1.0"
},
"funding": [
{
@@ -833,27 +934,28 @@
"type": "tidelift"
}
],
- "time": "2022-02-28T11:07:21+00:00"
+ "time": "2022-12-14T08:49:07+00:00"
},
{
"name": "dompdf/dompdf",
- "version": "v1.2.2",
+ "version": "v2.0.1",
"source": {
"type": "git",
"url": "https://github.com/dompdf/dompdf.git",
- "reference": "5031045d9640b38cfc14aac9667470df09c9e090"
+ "reference": "c5310df0e22c758c85ea5288175fc6cd777bc085"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dompdf/dompdf/zipball/5031045d9640b38cfc14aac9667470df09c9e090",
- "reference": "5031045d9640b38cfc14aac9667470df09c9e090",
+ "url": "https://api.github.com/repos/dompdf/dompdf/zipball/c5310df0e22c758c85ea5288175fc6cd777bc085",
+ "reference": "c5310df0e22c758c85ea5288175fc6cd777bc085",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-mbstring": "*",
- "phenx/php-font-lib": "^0.5.4",
- "phenx/php-svg-lib": "^0.3.3 || ^0.4.0",
+ "masterminds/html5": "^2.0",
+ "phenx/php-font-lib": ">=0.5.4 <1.0.0",
+ "phenx/php-svg-lib": ">=0.3.3 <1.0.0",
"php": "^7.1 || ^8.0"
},
"require-dev": {
@@ -884,38 +986,30 @@
],
"authors": [
{
- "name": "Fabien MĆ©nager",
- "email": "fabien.menager@gmail.com"
- },
- {
- "name": "Brian Sweeney",
- "email": "eclecticgeek@gmail.com"
- },
- {
- "name": "Gabriel Bull",
- "email": "me@gabrielbull.com"
+ "name": "The Dompdf Community",
+ "homepage": "https://github.com/dompdf/dompdf/blob/master/AUTHORS.md"
}
],
"description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter",
"homepage": "https://github.com/dompdf/dompdf",
"support": {
"issues": "https://github.com/dompdf/dompdf/issues",
- "source": "https://github.com/dompdf/dompdf/tree/v1.2.2"
+ "source": "https://github.com/dompdf/dompdf/tree/v2.0.1"
},
- "time": "2022-04-27T13:50:54+00:00"
+ "time": "2022-09-22T13:43:41+00:00"
},
{
"name": "dragonmantank/cron-expression",
- "version": "v3.3.1",
+ "version": "v3.3.2",
"source": {
"type": "git",
"url": "https://github.com/dragonmantank/cron-expression.git",
- "reference": "be85b3f05b46c39bbc0d95f6c071ddff669510fa"
+ "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/be85b3f05b46c39bbc0d95f6c071ddff669510fa",
- "reference": "be85b3f05b46c39bbc0d95f6c071ddff669510fa",
+ "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/782ca5968ab8b954773518e9e49a6f892a34b2a8",
+ "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8",
"shasum": ""
},
"require": {
@@ -955,7 +1049,7 @@
],
"support": {
"issues": "https://github.com/dragonmantank/cron-expression/issues",
- "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.1"
+ "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.2"
},
"funding": [
{
@@ -963,31 +1057,30 @@
"type": "github"
}
],
- "time": "2022-01-18T15:43:28+00:00"
+ "time": "2022-09-10T18:51:20+00:00"
},
{
"name": "egulias/email-validator",
- "version": "2.1.25",
+ "version": "3.2.5",
"source": {
"type": "git",
"url": "https://github.com/egulias/EmailValidator.git",
- "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4"
+ "reference": "b531a2311709443320c786feb4519cfaf94af796"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4",
- "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4",
+ "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/b531a2311709443320c786feb4519cfaf94af796",
+ "reference": "b531a2311709443320c786feb4519cfaf94af796",
"shasum": ""
},
"require": {
- "doctrine/lexer": "^1.0.1",
- "php": ">=5.5",
- "symfony/polyfill-intl-idn": "^1.10"
+ "doctrine/lexer": "^1.2|^2",
+ "php": ">=7.2",
+ "symfony/polyfill-intl-idn": "^1.15"
},
"require-dev": {
- "dominicsayers/isemail": "^3.0.7",
- "phpunit/phpunit": "^4.8.36|^7.5.15",
- "satooshi/php-coveralls": "^1.0.1"
+ "phpunit/phpunit": "^8.5.8|^9.3.3",
+ "vimeo/psalm": "^4"
},
"suggest": {
"ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
@@ -995,7 +1088,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1.x-dev"
+ "dev-master": "3.0.x-dev"
}
},
"autoload": {
@@ -1023,7 +1116,7 @@
],
"support": {
"issues": "https://github.com/egulias/EmailValidator/issues",
- "source": "https://github.com/egulias/EmailValidator/tree/2.1.25"
+ "source": "https://github.com/egulias/EmailValidator/tree/3.2.5"
},
"funding": [
{
@@ -1031,42 +1124,34 @@
"type": "github"
}
],
- "time": "2020-12-29T14:50:06+00:00"
+ "time": "2023-01-02T17:26:14+00:00"
},
{
- "name": "fideloper/proxy",
- "version": "4.4.2",
+ "name": "facade/ignition-contracts",
+ "version": "1.0.2",
"source": {
"type": "git",
- "url": "https://github.com/fideloper/TrustedProxy.git",
- "reference": "a751f2bc86dd8e6cfef12dc0cbdada82f5a18750"
+ "url": "https://github.com/facade/ignition-contracts.git",
+ "reference": "3c921a1cdba35b68a7f0ccffc6dffc1995b18267"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/a751f2bc86dd8e6cfef12dc0cbdada82f5a18750",
- "reference": "a751f2bc86dd8e6cfef12dc0cbdada82f5a18750",
+ "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/3c921a1cdba35b68a7f0ccffc6dffc1995b18267",
+ "reference": "3c921a1cdba35b68a7f0ccffc6dffc1995b18267",
"shasum": ""
},
"require": {
- "illuminate/contracts": "^5.0|^6.0|^7.0|^8.0|^9.0",
- "php": ">=5.4.0"
+ "php": "^7.3|^8.0"
},
"require-dev": {
- "illuminate/http": "^5.0|^6.0|^7.0|^8.0|^9.0",
- "mockery/mockery": "^1.0",
- "phpunit/phpunit": "^8.5.8|^9.3.3"
+ "friendsofphp/php-cs-fixer": "^v2.15.8",
+ "phpunit/phpunit": "^9.3.11",
+ "vimeo/psalm": "^3.17.1"
},
"type": "library",
- "extra": {
- "laravel": {
- "providers": [
- "Fideloper\\Proxy\\TrustedProxyServiceProvider"
- ]
- }
- },
"autoload": {
"psr-4": {
- "Fideloper\\Proxy\\": "src/"
+ "Facade\\IgnitionContracts\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1075,57 +1160,52 @@
],
"authors": [
{
- "name": "Chris Fidao",
- "email": "fideloper@gmail.com"
+ "name": "Freek Van der Herten",
+ "email": "freek@spatie.be",
+ "homepage": "https://flareapp.io",
+ "role": "Developer"
}
],
- "description": "Set trusted proxies for Laravel",
+ "description": "Solution contracts for Ignition",
+ "homepage": "https://github.com/facade/ignition-contracts",
"keywords": [
- "load balancing",
- "proxy",
- "trusted proxy"
+ "contracts",
+ "flare",
+ "ignition"
],
"support": {
- "issues": "https://github.com/fideloper/TrustedProxy/issues",
- "source": "https://github.com/fideloper/TrustedProxy/tree/4.4.2"
+ "issues": "https://github.com/facade/ignition-contracts/issues",
+ "source": "https://github.com/facade/ignition-contracts/tree/1.0.2"
},
- "time": "2022-02-09T13:33:34+00:00"
+ "time": "2020-10-16T08:27:54+00:00"
},
{
- "name": "fruitcake/laravel-cors",
- "version": "v2.2.0",
+ "name": "fruitcake/php-cors",
+ "version": "v1.2.0",
"source": {
"type": "git",
- "url": "https://github.com/fruitcake/laravel-cors.git",
- "reference": "783a74f5e3431d7b9805be8afb60fd0a8f743534"
+ "url": "https://github.com/fruitcake/php-cors.git",
+ "reference": "58571acbaa5f9f462c9c77e911700ac66f446d4e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fruitcake/laravel-cors/zipball/783a74f5e3431d7b9805be8afb60fd0a8f743534",
- "reference": "783a74f5e3431d7b9805be8afb60fd0a8f743534",
+ "url": "https://api.github.com/repos/fruitcake/php-cors/zipball/58571acbaa5f9f462c9c77e911700ac66f446d4e",
+ "reference": "58571acbaa5f9f462c9c77e911700ac66f446d4e",
"shasum": ""
},
"require": {
- "asm89/stack-cors": "^2.0.1",
- "illuminate/contracts": "^6|^7|^8|^9",
- "illuminate/support": "^6|^7|^8|^9",
- "php": ">=7.2"
+ "php": "^7.4|^8.0",
+ "symfony/http-foundation": "^4.4|^5.4|^6"
},
"require-dev": {
- "laravel/framework": "^6|^7.24|^8",
- "orchestra/testbench-dusk": "^4|^5|^6|^7",
- "phpunit/phpunit": "^6|^7|^8|^9",
+ "phpstan/phpstan": "^1.4",
+ "phpunit/phpunit": "^9",
"squizlabs/php_codesniffer": "^3.5"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev"
- },
- "laravel": {
- "providers": [
- "Fruitcake\\Cors\\CorsServiceProvider"
- ]
+ "dev-main": "1.1-dev"
}
},
"autoload": {
@@ -1143,20 +1223,20 @@
"homepage": "https://fruitcake.nl"
},
{
- "name": "Barry vd. Heuvel",
+ "name": "Barryvdh",
"email": "barryvdh@gmail.com"
}
],
- "description": "Adds CORS (Cross-Origin Resource Sharing) headers support in your Laravel application",
+ "description": "Cross-origin resource sharing library for the Symfony HttpFoundation",
+ "homepage": "https://github.com/fruitcake/php-cors",
"keywords": [
- "api",
"cors",
- "crossdomain",
- "laravel"
+ "laravel",
+ "symfony"
],
"support": {
- "issues": "https://github.com/fruitcake/laravel-cors/issues",
- "source": "https://github.com/fruitcake/laravel-cors/tree/v2.2.0"
+ "issues": "https://github.com/fruitcake/php-cors/issues",
+ "source": "https://github.com/fruitcake/php-cors/tree/v1.2.0"
},
"funding": [
{
@@ -1168,7 +1248,7 @@
"type": "github"
}
],
- "time": "2022-02-23T14:25:13+00:00"
+ "time": "2022-02-20T15:07:15+00:00"
},
{
"name": "graham-campbell/result-type",
@@ -1234,16 +1314,16 @@
},
{
"name": "guzzlehttp/guzzle",
- "version": "7.4.5",
+ "version": "7.5.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"
+ "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
- "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba",
+ "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba",
"shasum": ""
},
"require": {
@@ -1258,10 +1338,10 @@
"psr/http-client-implementation": "1.0"
},
"require-dev": {
- "bamarni/composer-bin-plugin": "^1.4.1",
+ "bamarni/composer-bin-plugin": "^1.8.1",
"ext-curl": "*",
"php-http/client-integration-tests": "^3.0",
- "phpunit/phpunit": "^8.5.5 || ^9.3.5",
+ "phpunit/phpunit": "^8.5.29 || ^9.5.23",
"psr/log": "^1.1 || ^2.0 || ^3.0"
},
"suggest": {
@@ -1271,8 +1351,12 @@
},
"type": "library",
"extra": {
+ "bamarni-bin": {
+ "bin-links": true,
+ "forward-command": false
+ },
"branch-alias": {
- "dev-master": "7.4-dev"
+ "dev-master": "7.5-dev"
}
},
"autoload": {
@@ -1338,7 +1422,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
- "source": "https://github.com/guzzle/guzzle/tree/7.4.5"
+ "source": "https://github.com/guzzle/guzzle/tree/7.5.0"
},
"funding": [
{
@@ -1354,20 +1438,20 @@
"type": "tidelift"
}
],
- "time": "2022-06-20T22:16:13+00:00"
+ "time": "2022-08-28T15:39:27+00:00"
},
{
"name": "guzzlehttp/promises",
- "version": "1.5.1",
+ "version": "1.5.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
- "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da"
+ "reference": "b94b2807d85443f9719887892882d0329d1e2598"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
- "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
+ "reference": "b94b2807d85443f9719887892882d0329d1e2598",
"shasum": ""
},
"require": {
@@ -1422,7 +1506,7 @@
],
"support": {
"issues": "https://github.com/guzzle/promises/issues",
- "source": "https://github.com/guzzle/promises/tree/1.5.1"
+ "source": "https://github.com/guzzle/promises/tree/1.5.2"
},
"funding": [
{
@@ -1438,20 +1522,20 @@
"type": "tidelift"
}
],
- "time": "2021-10-22T20:56:57+00:00"
+ "time": "2022-08-28T14:55:35+00:00"
},
{
"name": "guzzlehttp/psr7",
- "version": "2.4.0",
+ "version": "2.4.3",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "13388f00956b1503577598873fffb5ae994b5737"
+ "reference": "67c26b443f348a51926030c83481b85718457d3d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737",
- "reference": "13388f00956b1503577598873fffb5ae994b5737",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d",
+ "reference": "67c26b443f348a51926030c83481b85718457d3d",
"shasum": ""
},
"require": {
@@ -1465,15 +1549,19 @@
"psr/http-message-implementation": "1.0"
},
"require-dev": {
- "bamarni/composer-bin-plugin": "^1.4.1",
+ "bamarni/composer-bin-plugin": "^1.8.1",
"http-interop/http-factory-tests": "^0.9",
- "phpunit/phpunit": "^8.5.8 || ^9.3.10"
+ "phpunit/phpunit": "^8.5.29 || ^9.5.23"
},
"suggest": {
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
},
"type": "library",
"extra": {
+ "bamarni-bin": {
+ "bin-links": true,
+ "forward-command": false
+ },
"branch-alias": {
"dev-master": "2.4-dev"
}
@@ -1537,7 +1625,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
- "source": "https://github.com/guzzle/psr7/tree/2.4.0"
+ "source": "https://github.com/guzzle/psr7/tree/2.4.3"
},
"funding": [
{
@@ -1553,7 +1641,7 @@
"type": "tidelift"
}
],
- "time": "2022-06-20T21:43:11+00:00"
+ "time": "2022-10-26T14:07:24+00:00"
},
{
"name": "hidehalo/nanoid-php",
@@ -1679,56 +1767,57 @@
},
{
"name": "laravel/framework",
- "version": "v8.83.23",
+ "version": "v9.46.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "bdc707f8b9bcad289b24cd182d98ec7480ac4491"
+ "reference": "62b05b6de5733d89378a279e40230a71e5ab5d92"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/bdc707f8b9bcad289b24cd182d98ec7480ac4491",
- "reference": "bdc707f8b9bcad289b24cd182d98ec7480ac4491",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/62b05b6de5733d89378a279e40230a71e5ab5d92",
+ "reference": "62b05b6de5733d89378a279e40230a71e5ab5d92",
"shasum": ""
},
"require": {
- "doctrine/inflector": "^1.4|^2.0",
- "dragonmantank/cron-expression": "^3.0.2",
- "egulias/email-validator": "^2.1.10",
- "ext-json": "*",
+ "doctrine/inflector": "^2.0",
+ "dragonmantank/cron-expression": "^3.3.2",
+ "egulias/email-validator": "^3.2.1",
"ext-mbstring": "*",
"ext-openssl": "*",
- "laravel/serializable-closure": "^1.0",
- "league/commonmark": "^1.3|^2.0.2",
- "league/flysystem": "^1.1",
+ "fruitcake/php-cors": "^1.2",
+ "laravel/serializable-closure": "^1.2.2",
+ "league/commonmark": "^2.2.1",
+ "league/flysystem": "^3.8.0",
"monolog/monolog": "^2.0",
- "nesbot/carbon": "^2.53.1",
- "opis/closure": "^3.6",
- "php": "^7.3|^8.0",
- "psr/container": "^1.0",
- "psr/log": "^1.0|^2.0",
- "psr/simple-cache": "^1.0",
- "ramsey/uuid": "^4.2.2",
- "swiftmailer/swiftmailer": "^6.3",
- "symfony/console": "^5.4",
- "symfony/error-handler": "^5.4",
- "symfony/finder": "^5.4",
- "symfony/http-foundation": "^5.4",
- "symfony/http-kernel": "^5.4",
- "symfony/mime": "^5.4",
- "symfony/process": "^5.4",
- "symfony/routing": "^5.4",
- "symfony/var-dumper": "^5.4",
- "tijsverkoyen/css-to-inline-styles": "^2.2.2",
+ "nesbot/carbon": "^2.62.1",
+ "nunomaduro/termwind": "^1.13",
+ "php": "^8.0.2",
+ "psr/container": "^1.1.1|^2.0.1",
+ "psr/log": "^1.0|^2.0|^3.0",
+ "psr/simple-cache": "^1.0|^2.0|^3.0",
+ "ramsey/uuid": "^4.7",
+ "symfony/console": "^6.0.9",
+ "symfony/error-handler": "^6.0",
+ "symfony/finder": "^6.0",
+ "symfony/http-foundation": "^6.0",
+ "symfony/http-kernel": "^6.0",
+ "symfony/mailer": "^6.0",
+ "symfony/mime": "^6.0",
+ "symfony/process": "^6.0",
+ "symfony/routing": "^6.0",
+ "symfony/uid": "^6.0",
+ "symfony/var-dumper": "^6.0",
+ "tijsverkoyen/css-to-inline-styles": "^2.2.5",
"vlucas/phpdotenv": "^5.4.1",
- "voku/portable-ascii": "^1.6.1"
+ "voku/portable-ascii": "^2.0"
},
"conflict": {
"tightenco/collect": "<5.5.33"
},
"provide": {
- "psr/container-implementation": "1.0",
- "psr/simple-cache-implementation": "1.0"
+ "psr/container-implementation": "1.1|2.0",
+ "psr/simple-cache-implementation": "1.0|2.0|3.0"
},
"replace": {
"illuminate/auth": "self.version",
@@ -1736,6 +1825,7 @@
"illuminate/bus": "self.version",
"illuminate/cache": "self.version",
"illuminate/collections": "self.version",
+ "illuminate/conditionable": "self.version",
"illuminate/config": "self.version",
"illuminate/console": "self.version",
"illuminate/container": "self.version",
@@ -1764,21 +1854,27 @@
"illuminate/view": "self.version"
},
"require-dev": {
- "aws/aws-sdk-php": "^3.198.1",
+ "ably/ably-php": "^1.0",
+ "aws/aws-sdk-php": "^3.235.5",
"doctrine/dbal": "^2.13.3|^3.1.4",
- "filp/whoops": "^2.14.3",
- "guzzlehttp/guzzle": "^6.5.5|^7.0.1",
- "league/flysystem-cached-adapter": "^1.0",
- "mockery/mockery": "^1.4.4",
- "orchestra/testbench-core": "^6.27",
+ "fakerphp/faker": "^1.21",
+ "guzzlehttp/guzzle": "^7.5",
+ "league/flysystem-aws-s3-v3": "^3.0",
+ "league/flysystem-ftp": "^3.0",
+ "league/flysystem-path-prefixing": "^3.3",
+ "league/flysystem-read-only": "^3.3",
+ "league/flysystem-sftp-v3": "^3.0",
+ "mockery/mockery": "^1.5.1",
+ "orchestra/testbench-core": "^7.16",
"pda/pheanstalk": "^4.0",
- "phpunit/phpunit": "^8.5.19|^9.5.8",
- "predis/predis": "^1.1.9",
- "symfony/cache": "^5.4"
+ "phpstan/phpstan": "^1.4.7",
+ "phpunit/phpunit": "^9.5.8",
+ "predis/predis": "^1.1.9|^2.0.2",
+ "symfony/cache": "^6.0"
},
"suggest": {
"ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
- "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.198.1).",
+ "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.235.5).",
"brianium/paratest": "Required to run tests in parallel (^6.0).",
"doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.13.3|^3.1.4).",
"ext-bcmath": "Required to use the multiple_of validation rule.",
@@ -1790,27 +1886,31 @@
"ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).",
"fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
"filp/whoops": "Required for friendly error pages in development (^2.14.3).",
- "guzzlehttp/guzzle": "Required to use the HTTP Client, Mailgun mail driver and the ping methods on schedules (^6.5.5|^7.0.1).",
+ "guzzlehttp/guzzle": "Required to use the HTTP Client and the ping methods on schedules (^7.5).",
"laravel/tinker": "Required to use the tinker console command (^2.0).",
- "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).",
- "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).",
- "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
- "mockery/mockery": "Required to use mocking (^1.4.4).",
+ "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).",
+ "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).",
+ "league/flysystem-path-prefixing": "Required to use the scoped driver (^3.3).",
+ "league/flysystem-read-only": "Required to use read-only disks (^3.3)",
+ "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.0).",
+ "mockery/mockery": "Required to use mocking (^1.5.1).",
"nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
"pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
- "phpunit/phpunit": "Required to use assertions and run tests (^8.5.19|^9.5.8).",
- "predis/predis": "Required to use the predis connector (^1.1.9).",
+ "phpunit/phpunit": "Required to use assertions and run tests (^9.5.8).",
+ "predis/predis": "Required to use the predis connector (^1.1.9|^2.0.2).",
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
- "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0|^5.0|^6.0|^7.0).",
- "symfony/cache": "Required to PSR-6 cache bridge (^5.4).",
- "symfony/filesystem": "Required to enable support for relative symbolic links (^5.4).",
- "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0).",
- "wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)."
+ "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
+ "symfony/cache": "Required to PSR-6 cache bridge (^6.0).",
+ "symfony/filesystem": "Required to enable support for relative symbolic links (^6.0).",
+ "symfony/http-client": "Required to enable support for the Symfony API mail transports (^6.0).",
+ "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^6.0).",
+ "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^6.0).",
+ "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0)."
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "8.x-dev"
+ "dev-master": "9.x-dev"
}
},
"autoload": {
@@ -1824,7 +1924,8 @@
"Illuminate\\": "src/Illuminate/",
"Illuminate\\Support\\": [
"src/Illuminate/Macroable/",
- "src/Illuminate/Collections/"
+ "src/Illuminate/Collections/",
+ "src/Illuminate/Conditionable/"
]
}
},
@@ -1848,29 +1949,30 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2022-07-26T13:30:00+00:00"
+ "time": "2023-01-03T15:12:31+00:00"
},
{
"name": "laravel/serializable-closure",
- "version": "v1.2.0",
+ "version": "v1.2.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/serializable-closure.git",
- "reference": "09f0e9fb61829f628205b7c94906c28740ff9540"
+ "reference": "47afb7fae28ed29057fdca37e16a84f90cc62fae"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/09f0e9fb61829f628205b7c94906c28740ff9540",
- "reference": "09f0e9fb61829f628205b7c94906c28740ff9540",
+ "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/47afb7fae28ed29057fdca37e16a84f90cc62fae",
+ "reference": "47afb7fae28ed29057fdca37e16a84f90cc62fae",
"shasum": ""
},
"require": {
"php": "^7.3|^8.0"
},
"require-dev": {
- "pestphp/pest": "^1.18",
- "phpstan/phpstan": "^0.12.98",
- "symfony/var-dumper": "^5.3"
+ "nesbot/carbon": "^2.61",
+ "pestphp/pest": "^1.21.3",
+ "phpstan/phpstan": "^1.8.2",
+ "symfony/var-dumper": "^5.4.11"
},
"type": "library",
"extra": {
@@ -1907,20 +2009,20 @@
"issues": "https://github.com/laravel/serializable-closure/issues",
"source": "https://github.com/laravel/serializable-closure"
},
- "time": "2022-05-16T17:09:47+00:00"
+ "time": "2022-09-08T13:45:54+00:00"
},
{
"name": "laravel/socialite",
- "version": "v5.5.3",
+ "version": "v5.5.7",
"source": {
"type": "git",
"url": "https://github.com/laravel/socialite.git",
- "reference": "9dfc76b31ee041c45a7cae86f23339784abde46d"
+ "reference": "ee6201f539ac47c3a55132449f9d20ee928f0ee2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/socialite/zipball/9dfc76b31ee041c45a7cae86f23339784abde46d",
- "reference": "9dfc76b31ee041c45a7cae86f23339784abde46d",
+ "url": "https://api.github.com/repos/laravel/socialite/zipball/ee6201f539ac47c3a55132449f9d20ee928f0ee2",
+ "reference": "ee6201f539ac47c3a55132449f9d20ee928f0ee2",
"shasum": ""
},
"require": {
@@ -1976,20 +2078,20 @@
"issues": "https://github.com/laravel/socialite/issues",
"source": "https://github.com/laravel/socialite"
},
- "time": "2022-07-18T13:51:19+00:00"
+ "time": "2022-12-28T12:35:23+00:00"
},
{
"name": "laravel/tinker",
- "version": "v2.7.2",
+ "version": "v2.7.3",
"source": {
"type": "git",
"url": "https://github.com/laravel/tinker.git",
- "reference": "dff39b661e827dae6e092412f976658df82dbac5"
+ "reference": "5062061b4924af3392225dd482ca7b4d85d8b8ef"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/tinker/zipball/dff39b661e827dae6e092412f976658df82dbac5",
- "reference": "dff39b661e827dae6e092412f976658df82dbac5",
+ "url": "https://api.github.com/repos/laravel/tinker/zipball/5062061b4924af3392225dd482ca7b4d85d8b8ef",
+ "reference": "5062061b4924af3392225dd482ca7b4d85d8b8ef",
"shasum": ""
},
"require": {
@@ -2042,9 +2144,9 @@
],
"support": {
"issues": "https://github.com/laravel/tinker/issues",
- "source": "https://github.com/laravel/tinker/tree/v2.7.2"
+ "source": "https://github.com/laravel/tinker/tree/v2.7.3"
},
- "time": "2022-03-23T12:38:24+00:00"
+ "time": "2022-11-09T15:11:38+00:00"
},
{
"name": "laravel/ui",
@@ -2109,22 +2211,22 @@
},
{
"name": "laraveldaily/laravel-invoices",
- "version": "2.2.2",
+ "version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/LaravelDaily/laravel-invoices.git",
- "reference": "7e972624193e6a03c3e7d8cdbd9c053e82f487ca"
+ "reference": "6dabfd95ef9819b80182ebea8267b64f77c89326"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/LaravelDaily/laravel-invoices/zipball/7e972624193e6a03c3e7d8cdbd9c053e82f487ca",
- "reference": "7e972624193e6a03c3e7d8cdbd9c053e82f487ca",
+ "url": "https://api.github.com/repos/LaravelDaily/laravel-invoices/zipball/6dabfd95ef9819b80182ebea8267b64f77c89326",
+ "reference": "6dabfd95ef9819b80182ebea8267b64f77c89326",
"shasum": ""
},
"require": {
- "barryvdh/laravel-dompdf": "^0.9.0",
- "illuminate/http": "^5.5|^6|^7|^8",
- "illuminate/support": "^5.5|^6|^7|^8",
+ "barryvdh/laravel-dompdf": "^v2.0",
+ "illuminate/http": "^5.5|^6|^7|^8|^9",
+ "illuminate/support": "^5.5|^6|^7|^8|^9",
"php": "^7.3|^8.0"
},
"require-dev": {
@@ -2164,26 +2266,27 @@
"keywords": [
"invoice",
"invoices",
- "laravel"
+ "laravel",
+ "pdf"
],
"support": {
"issues": "https://github.com/LaravelDaily/laravel-invoices/issues",
- "source": "https://github.com/LaravelDaily/laravel-invoices/tree/2.2.2"
+ "source": "https://github.com/LaravelDaily/laravel-invoices/tree/3.0.2"
},
- "time": "2022-01-17T07:31:43+00:00"
+ "time": "2022-08-05T06:57:45+00:00"
},
{
"name": "league/commonmark",
- "version": "2.3.5",
+ "version": "2.3.8",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/commonmark.git",
- "reference": "84d74485fdb7074f4f9dd6f02ab957b1de513257"
+ "reference": "c493585c130544c4e91d2e0e131e6d35cb0cbc47"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/84d74485fdb7074f4f9dd6f02ab957b1de513257",
- "reference": "84d74485fdb7074f4f9dd6f02ab957b1de513257",
+ "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/c493585c130544c4e91d2e0e131e6d35cb0cbc47",
+ "reference": "c493585c130544c4e91d2e0e131e6d35cb0cbc47",
"shasum": ""
},
"require": {
@@ -2203,7 +2306,7 @@
"erusev/parsedown": "^1.0",
"ext-json": "*",
"github/gfm": "0.29.0",
- "michelf/php-markdown": "^1.4",
+ "michelf/php-markdown": "^1.4 || ^2.0",
"nyholm/psr7": "^1.5",
"phpstan/phpstan": "^1.8.2",
"phpunit/phpunit": "^9.5.21",
@@ -2211,7 +2314,7 @@
"symfony/finder": "^5.3 | ^6.0",
"symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0",
"unleashedtech/php-coding-standard": "^3.1.1",
- "vimeo/psalm": "^4.24.0"
+ "vimeo/psalm": "^4.24.0 || ^5.0.0"
},
"suggest": {
"symfony/yaml": "v2.3+ required if using the Front Matter extension"
@@ -2276,20 +2379,20 @@
"type": "tidelift"
}
],
- "time": "2022-07-29T10:59:45+00:00"
+ "time": "2022-12-10T16:02:17+00:00"
},
{
"name": "league/config",
- "version": "v1.1.1",
+ "version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/config.git",
- "reference": "a9d39eeeb6cc49d10a6e6c36f22c4c1f4a767f3e"
+ "reference": "754b3604fb2984c71f4af4a9cbe7b57f346ec1f3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/config/zipball/a9d39eeeb6cc49d10a6e6c36f22c4c1f4a767f3e",
- "reference": "a9d39eeeb6cc49d10a6e6c36f22c4c1f4a767f3e",
+ "url": "https://api.github.com/repos/thephpleague/config/zipball/754b3604fb2984c71f4af4a9cbe7b57f346ec1f3",
+ "reference": "754b3604fb2984c71f4af4a9cbe7b57f346ec1f3",
"shasum": ""
},
"require": {
@@ -2298,7 +2401,7 @@
"php": "^7.4 || ^8.0"
},
"require-dev": {
- "phpstan/phpstan": "^0.12.90",
+ "phpstan/phpstan": "^1.8.2",
"phpunit/phpunit": "^9.5.5",
"scrutinizer/ocular": "^1.8.1",
"unleashedtech/php-coding-standard": "^3.1",
@@ -2358,58 +2461,53 @@
"type": "github"
}
],
- "time": "2021-08-14T12:15:32+00:00"
+ "time": "2022-12-11T20:36:23+00:00"
},
{
"name": "league/flysystem",
- "version": "1.1.9",
+ "version": "3.12.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
- "reference": "094defdb4a7001845300334e7c1ee2335925ef99"
+ "reference": "2aef65a47e44f2d6f9938f720f6dd697e7ba7b76"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/094defdb4a7001845300334e7c1ee2335925ef99",
- "reference": "094defdb4a7001845300334e7c1ee2335925ef99",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/2aef65a47e44f2d6f9938f720f6dd697e7ba7b76",
+ "reference": "2aef65a47e44f2d6f9938f720f6dd697e7ba7b76",
"shasum": ""
},
"require": {
- "ext-fileinfo": "*",
- "league/mime-type-detection": "^1.3",
- "php": "^7.2.5 || ^8.0"
+ "league/mime-type-detection": "^1.0.0",
+ "php": "^8.0.2"
},
"conflict": {
- "league/flysystem-sftp": "<1.0.6"
+ "aws/aws-sdk-php": "3.209.31 || 3.210.0",
+ "guzzlehttp/guzzle": "<7.0",
+ "guzzlehttp/ringphp": "<1.1.1",
+ "phpseclib/phpseclib": "3.0.15",
+ "symfony/http-client": "<5.2"
},
"require-dev": {
- "phpspec/prophecy": "^1.11.1",
- "phpunit/phpunit": "^8.5.8"
- },
- "suggest": {
- "ext-ftp": "Allows you to use FTP server storage",
- "ext-openssl": "Allows you to use FTPS server storage",
- "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2",
- "league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3",
- "league/flysystem-azure": "Allows you to use Windows Azure Blob storage",
- "league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching",
- "league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem",
- "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files",
- "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib",
- "league/flysystem-webdav": "Allows you to use WebDAV storage",
- "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter",
- "spatie/flysystem-dropbox": "Allows you to use Dropbox storage",
- "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications"
+ "async-aws/s3": "^1.5",
+ "async-aws/simple-s3": "^1.1",
+ "aws/aws-sdk-php": "^3.198.1",
+ "composer/semver": "^3.0",
+ "ext-fileinfo": "*",
+ "ext-ftp": "*",
+ "ext-zip": "*",
+ "friendsofphp/php-cs-fixer": "^3.5",
+ "google/cloud-storage": "^1.23",
+ "microsoft/azure-storage-blob": "^1.1",
+ "phpseclib/phpseclib": "^3.0.14",
+ "phpstan/phpstan": "^0.12.26",
+ "phpunit/phpunit": "^9.5.11",
+ "sabre/dav": "^4.3.1"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1-dev"
- }
- },
"autoload": {
"psr-4": {
- "League\\Flysystem\\": "src/"
+ "League\\Flysystem\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2419,40 +2517,112 @@
"authors": [
{
"name": "Frank de Jonge",
- "email": "info@frenky.net"
+ "email": "info@frankdejonge.nl"
}
],
- "description": "Filesystem abstraction: Many filesystems, one API.",
+ "description": "File storage abstraction for PHP",
"keywords": [
- "Cloud Files",
"WebDAV",
- "abstraction",
"aws",
"cloud",
- "copy.com",
- "dropbox",
- "file systems",
+ "file",
"files",
"filesystem",
"filesystems",
"ftp",
- "rackspace",
- "remote",
"s3",
"sftp",
"storage"
],
"support": {
"issues": "https://github.com/thephpleague/flysystem/issues",
- "source": "https://github.com/thephpleague/flysystem/tree/1.1.9"
+ "source": "https://github.com/thephpleague/flysystem/tree/3.12.0"
},
"funding": [
{
- "url": "https://offset.earth/frankdejonge",
- "type": "other"
+ "url": "https://ecologi.com/frankdejonge",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/frankdejonge",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/league/flysystem",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2022-12-20T20:21:10+00:00"
+ },
+ {
+ "name": "league/flysystem-aws-s3-v3",
+ "version": "3.10.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
+ "reference": "f593bf91f94f2adf4f71513d29f1dfa693f2f640"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/f593bf91f94f2adf4f71513d29f1dfa693f2f640",
+ "reference": "f593bf91f94f2adf4f71513d29f1dfa693f2f640",
+ "shasum": ""
+ },
+ "require": {
+ "aws/aws-sdk-php": "^3.132.4",
+ "league/flysystem": "^3.10.0",
+ "league/mime-type-detection": "^1.0.0",
+ "php": "^8.0.2"
+ },
+ "conflict": {
+ "guzzlehttp/guzzle": "<7.0",
+ "guzzlehttp/ringphp": "<1.1.1"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "League\\Flysystem\\AwsS3V3\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Frank de Jonge",
+ "email": "info@frankdejonge.nl"
+ }
+ ],
+ "description": "AWS S3 filesystem adapter for Flysystem.",
+ "keywords": [
+ "Flysystem",
+ "aws",
+ "file",
+ "files",
+ "filesystem",
+ "s3",
+ "storage"
+ ],
+ "support": {
+ "issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues",
+ "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.10.3"
+ },
+ "funding": [
+ {
+ "url": "https://ecologi.com/frankdejonge",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/frankdejonge",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/league/flysystem",
+ "type": "tidelift"
}
],
- "time": "2021-12-09T09:40:50+00:00"
+ "time": "2022-10-26T18:15:09+00:00"
},
{
"name": "league/mime-type-detection",
@@ -2587,47 +2757,116 @@
"time": "2022-04-15T14:02:14+00:00"
},
{
- "name": "monolog/monolog",
- "version": "2.8.0",
+ "name": "masterminds/html5",
+ "version": "2.7.6",
"source": {
"type": "git",
- "url": "https://github.com/Seldaek/monolog.git",
- "reference": "720488632c590286b88b80e62aa3d3d551ad4a50"
+ "url": "https://github.com/Masterminds/html5-php.git",
+ "reference": "897eb517a343a2281f11bc5556d6548db7d93947"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/720488632c590286b88b80e62aa3d3d551ad4a50",
- "reference": "720488632c590286b88b80e62aa3d3d551ad4a50",
+ "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/897eb517a343a2281f11bc5556d6548db7d93947",
+ "reference": "897eb517a343a2281f11bc5556d6548db7d93947",
"shasum": ""
},
"require": {
- "php": ">=7.2",
- "psr/log": "^1.0.1 || ^2.0 || ^3.0"
- },
- "provide": {
- "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0"
+ "ext-ctype": "*",
+ "ext-dom": "*",
+ "ext-libxml": "*",
+ "php": ">=5.3.0"
},
"require-dev": {
- "aws/aws-sdk-php": "^2.4.9 || ^3.0",
- "doctrine/couchdb": "~1.0@dev",
- "elasticsearch/elasticsearch": "^7 || ^8",
- "ext-json": "*",
- "graylog2/gelf-php": "^1.4.2",
- "guzzlehttp/guzzle": "^7.4",
- "guzzlehttp/psr7": "^2.2",
- "mongodb/mongodb": "^1.8",
- "php-amqplib/php-amqplib": "~2.4 || ^3",
- "phpspec/prophecy": "^1.15",
- "phpstan/phpstan": "^0.12.91",
- "phpunit/phpunit": "^8.5.14",
- "predis/predis": "^1.1 || ^2.0",
- "rollbar/rollbar": "^1.3 || ^2 || ^3",
- "ruflin/elastica": "^7",
- "swiftmailer/swiftmailer": "^5.3|^6.0",
- "symfony/mailer": "^5.4 || ^6",
- "symfony/mime": "^5.4 || ^6"
+ "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7"
},
- "suggest": {
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.7-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Masterminds\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Matt Butcher",
+ "email": "technosophos@gmail.com"
+ },
+ {
+ "name": "Matt Farina",
+ "email": "matt@mattfarina.com"
+ },
+ {
+ "name": "Asmir Mustafic",
+ "email": "goetas@gmail.com"
+ }
+ ],
+ "description": "An HTML5 parser and serializer.",
+ "homepage": "http://masterminds.github.io/html5-php",
+ "keywords": [
+ "HTML5",
+ "dom",
+ "html",
+ "parser",
+ "querypath",
+ "serializer",
+ "xml"
+ ],
+ "support": {
+ "issues": "https://github.com/Masterminds/html5-php/issues",
+ "source": "https://github.com/Masterminds/html5-php/tree/2.7.6"
+ },
+ "time": "2022-08-18T16:18:26+00:00"
+ },
+ {
+ "name": "monolog/monolog",
+ "version": "2.8.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Seldaek/monolog.git",
+ "reference": "720488632c590286b88b80e62aa3d3d551ad4a50"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/720488632c590286b88b80e62aa3d3d551ad4a50",
+ "reference": "720488632c590286b88b80e62aa3d3d551ad4a50",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.2",
+ "psr/log": "^1.0.1 || ^2.0 || ^3.0"
+ },
+ "provide": {
+ "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0"
+ },
+ "require-dev": {
+ "aws/aws-sdk-php": "^2.4.9 || ^3.0",
+ "doctrine/couchdb": "~1.0@dev",
+ "elasticsearch/elasticsearch": "^7 || ^8",
+ "ext-json": "*",
+ "graylog2/gelf-php": "^1.4.2",
+ "guzzlehttp/guzzle": "^7.4",
+ "guzzlehttp/psr7": "^2.2",
+ "mongodb/mongodb": "^1.8",
+ "php-amqplib/php-amqplib": "~2.4 || ^3",
+ "phpspec/prophecy": "^1.15",
+ "phpstan/phpstan": "^0.12.91",
+ "phpunit/phpunit": "^8.5.14",
+ "predis/predis": "^1.1 || ^2.0",
+ "rollbar/rollbar": "^1.3 || ^2 || ^3",
+ "ruflin/elastica": "^7",
+ "swiftmailer/swiftmailer": "^5.3|^6.0",
+ "symfony/mailer": "^5.4 || ^6",
+ "symfony/mime": "^5.4 || ^6"
+ },
+ "suggest": {
"aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
"doctrine/couchdb": "Allow sending log messages to a CouchDB server",
"elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client",
@@ -2688,18 +2927,79 @@
],
"time": "2022-07-24T11:55:47+00:00"
},
+ {
+ "name": "mtdowling/jmespath.php",
+ "version": "2.6.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/jmespath/jmespath.php.git",
+ "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb",
+ "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.4 || ^7.0 || ^8.0",
+ "symfony/polyfill-mbstring": "^1.17"
+ },
+ "require-dev": {
+ "composer/xdebug-handler": "^1.4 || ^2.0",
+ "phpunit/phpunit": "^4.8.36 || ^7.5.15"
+ },
+ "bin": [
+ "bin/jp.php"
+ ],
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.6-dev"
+ }
+ },
+ "autoload": {
+ "files": [
+ "src/JmesPath.php"
+ ],
+ "psr-4": {
+ "JmesPath\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ }
+ ],
+ "description": "Declaratively specify how to extract elements from a JSON document",
+ "keywords": [
+ "json",
+ "jsonpath"
+ ],
+ "support": {
+ "issues": "https://github.com/jmespath/jmespath.php/issues",
+ "source": "https://github.com/jmespath/jmespath.php/tree/2.6.1"
+ },
+ "time": "2021-06-14T00:11:39+00:00"
+ },
{
"name": "nesbot/carbon",
- "version": "2.61.0",
+ "version": "2.64.1",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "bdf4f4fe3a3eac4de84dbec0738082a862c68ba6"
+ "reference": "f2e59963f4c4f4fdfb9fcfd752e8d2e2b79a4e2c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/bdf4f4fe3a3eac4de84dbec0738082a862c68ba6",
- "reference": "bdf4f4fe3a3eac4de84dbec0738082a862c68ba6",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f2e59963f4c4f4fdfb9fcfd752e8d2e2b79a4e2c",
+ "reference": "f2e59963f4c4f4fdfb9fcfd752e8d2e2b79a4e2c",
"shasum": ""
},
"require": {
@@ -2710,7 +3010,7 @@
"symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0"
},
"require-dev": {
- "doctrine/dbal": "^2.0 || ^3.0",
+ "doctrine/dbal": "^2.0 || ^3.1.4",
"doctrine/orm": "^2.7",
"friendsofphp/php-cs-fixer": "^3.0",
"kylekatarnls/multi-tester": "^2.0",
@@ -2788,29 +3088,29 @@
"type": "tidelift"
}
],
- "time": "2022-08-06T12:41:24+00:00"
+ "time": "2023-01-01T23:17:36+00:00"
},
{
"name": "nette/schema",
- "version": "v1.2.2",
+ "version": "v1.2.3",
"source": {
"type": "git",
"url": "https://github.com/nette/schema.git",
- "reference": "9a39cef03a5b34c7de64f551538cbba05c2be5df"
+ "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nette/schema/zipball/9a39cef03a5b34c7de64f551538cbba05c2be5df",
- "reference": "9a39cef03a5b34c7de64f551538cbba05c2be5df",
+ "url": "https://api.github.com/repos/nette/schema/zipball/abbdbb70e0245d5f3bf77874cea1dfb0c930d06f",
+ "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f",
"shasum": ""
},
"require": {
"nette/utils": "^2.5.7 || ^3.1.5 || ^4.0",
- "php": ">=7.1 <8.2"
+ "php": ">=7.1 <8.3"
},
"require-dev": {
"nette/tester": "^2.3 || ^2.4",
- "phpstan/phpstan-nette": "^0.12",
+ "phpstan/phpstan-nette": "^1.0",
"tracy/tracy": "^2.7"
},
"type": "library",
@@ -2848,26 +3148,26 @@
],
"support": {
"issues": "https://github.com/nette/schema/issues",
- "source": "https://github.com/nette/schema/tree/v1.2.2"
+ "source": "https://github.com/nette/schema/tree/v1.2.3"
},
- "time": "2021-10-15T11:40:02+00:00"
+ "time": "2022-10-13T01:24:26+00:00"
},
{
"name": "nette/utils",
- "version": "v3.2.7",
+ "version": "v3.2.8",
"source": {
"type": "git",
"url": "https://github.com/nette/utils.git",
- "reference": "0af4e3de4df9f1543534beab255ccf459e7a2c99"
+ "reference": "02a54c4c872b99e4ec05c4aec54b5a06eb0f6368"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nette/utils/zipball/0af4e3de4df9f1543534beab255ccf459e7a2c99",
- "reference": "0af4e3de4df9f1543534beab255ccf459e7a2c99",
+ "url": "https://api.github.com/repos/nette/utils/zipball/02a54c4c872b99e4ec05c4aec54b5a06eb0f6368",
+ "reference": "02a54c4c872b99e4ec05c4aec54b5a06eb0f6368",
"shasum": ""
},
"require": {
- "php": ">=7.2 <8.2"
+ "php": ">=7.2 <8.3"
},
"conflict": {
"nette/di": "<3.0.6"
@@ -2933,22 +3233,22 @@
],
"support": {
"issues": "https://github.com/nette/utils/issues",
- "source": "https://github.com/nette/utils/tree/v3.2.7"
+ "source": "https://github.com/nette/utils/tree/v3.2.8"
},
- "time": "2022-01-24T11:29:14+00:00"
+ "time": "2022-09-12T23:36:20+00:00"
},
{
"name": "nikic/php-parser",
- "version": "v4.14.0",
+ "version": "v4.15.2",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1"
+ "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1",
- "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
+ "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
"shasum": ""
},
"require": {
@@ -2989,43 +3289,55 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v4.14.0"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2"
},
- "time": "2022-05-31T20:59:12+00:00"
+ "time": "2022-11-12T15:38:23+00:00"
},
{
- "name": "opis/closure",
- "version": "3.6.3",
+ "name": "nunomaduro/termwind",
+ "version": "v1.15.0",
"source": {
"type": "git",
- "url": "https://github.com/opis/closure.git",
- "reference": "3d81e4309d2a927abbe66df935f4bb60082805ad"
+ "url": "https://github.com/nunomaduro/termwind.git",
+ "reference": "594ab862396c16ead000de0c3c38f4a5cbe1938d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/opis/closure/zipball/3d81e4309d2a927abbe66df935f4bb60082805ad",
- "reference": "3d81e4309d2a927abbe66df935f4bb60082805ad",
+ "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/594ab862396c16ead000de0c3c38f4a5cbe1938d",
+ "reference": "594ab862396c16ead000de0c3c38f4a5cbe1938d",
"shasum": ""
},
"require": {
- "php": "^5.4 || ^7.0 || ^8.0"
+ "ext-mbstring": "*",
+ "php": "^8.0",
+ "symfony/console": "^5.3.0|^6.0.0"
},
"require-dev": {
- "jeremeamia/superclosure": "^2.0",
- "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
+ "ergebnis/phpstan-rules": "^1.0.",
+ "illuminate/console": "^8.0|^9.0",
+ "illuminate/support": "^8.0|^9.0",
+ "laravel/pint": "^1.0.0",
+ "pestphp/pest": "^1.21.0",
+ "pestphp/pest-plugin-mock": "^1.0",
+ "phpstan/phpstan": "^1.4.6",
+ "phpstan/phpstan-strict-rules": "^1.1.0",
+ "symfony/var-dumper": "^5.2.7|^6.0.0",
+ "thecodingmachine/phpstan-strict-rules": "^1.0.0"
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-master": "3.6.x-dev"
+ "laravel": {
+ "providers": [
+ "Termwind\\Laravel\\TermwindServiceProvider"
+ ]
}
},
"autoload": {
"files": [
- "functions.php"
+ "src/Functions.php"
],
"psr-4": {
- "Opis\\Closure\\": "src/"
+ "Termwind\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -3034,29 +3346,38 @@
],
"authors": [
{
- "name": "Marius Sarca",
- "email": "marius.sarca@gmail.com"
- },
- {
- "name": "Sorin Sarca",
- "email": "sarca_sorin@hotmail.com"
+ "name": "Nuno Maduro",
+ "email": "enunomaduro@gmail.com"
}
],
- "description": "A library that can be used to serialize closures (anonymous functions) and arbitrary objects.",
- "homepage": "https://opis.io/closure",
+ "description": "Its like Tailwind CSS, but for the console.",
"keywords": [
- "anonymous functions",
- "closure",
- "function",
- "serializable",
- "serialization",
- "serialize"
+ "cli",
+ "console",
+ "css",
+ "package",
+ "php",
+ "style"
],
"support": {
- "issues": "https://github.com/opis/closure/issues",
- "source": "https://github.com/opis/closure/tree/3.6.3"
+ "issues": "https://github.com/nunomaduro/termwind/issues",
+ "source": "https://github.com/nunomaduro/termwind/tree/v1.15.0"
},
- "time": "2022-01-27T09:35:39+00:00"
+ "funding": [
+ {
+ "url": "https://www.paypal.com/paypalme/enunomaduro",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/nunomaduro",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/xiCO2k",
+ "type": "github"
+ }
+ ],
+ "time": "2022-12-20T19:00:15+00:00"
},
{
"name": "paragonie/random_compat",
@@ -3158,6 +3479,7 @@
"support": {
"source": "https://github.com/paypal/Checkout-PHP-SDK/tree/1.0.2"
},
+ "abandoned": true,
"time": "2021-09-21T20:57:38+00:00"
},
{
@@ -3303,21 +3625,21 @@
},
{
"name": "phenx/php-svg-lib",
- "version": "0.4.1",
+ "version": "0.5.0",
"source": {
"type": "git",
"url": "https://github.com/dompdf/php-svg-lib.git",
- "reference": "4498b5df7b08e8469f0f8279651ea5de9626ed02"
+ "reference": "76876c6cf3080bcb6f249d7d59705108166a6685"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/4498b5df7b08e8469f0f8279651ea5de9626ed02",
- "reference": "4498b5df7b08e8469f0f8279651ea5de9626ed02",
+ "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/76876c6cf3080bcb6f249d7d59705108166a6685",
+ "reference": "76876c6cf3080bcb6f249d7d59705108166a6685",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
- "php": "^7.1 || ^7.2 || ^7.3 || ^7.4 || ^8.0",
+ "php": "^7.1 || ^8.0",
"sabberworm/php-css-parser": "^8.4"
},
"require-dev": {
@@ -3343,9 +3665,9 @@
"homepage": "https://github.com/PhenX/php-svg-lib",
"support": {
"issues": "https://github.com/dompdf/php-svg-lib/issues",
- "source": "https://github.com/dompdf/php-svg-lib/tree/0.4.1"
+ "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.0"
},
- "time": "2022-03-07T12:52:04+00:00"
+ "time": "2022-09-06T12:16:56+00:00"
},
{
"name": "phpoption/phpoption",
@@ -3473,22 +3795,27 @@
},
{
"name": "psr/container",
- "version": "1.1.2",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/container.git",
- "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
+ "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
- "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
+ "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+ "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
"shasum": ""
},
"require": {
"php": ">=7.4.0"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
+ },
"autoload": {
"psr-4": {
"Psr\\Container\\": "src/"
@@ -3515,9 +3842,9 @@
],
"support": {
"issues": "https://github.com/php-fig/container/issues",
- "source": "https://github.com/php-fig/container/tree/1.1.2"
+ "source": "https://github.com/php-fig/container/tree/2.0.2"
},
- "time": "2021-11-05T16:50:12+00:00"
+ "time": "2021-11-05T16:47:00+00:00"
},
{
"name": "psr/event-dispatcher",
@@ -3781,25 +4108,25 @@
},
{
"name": "psr/simple-cache",
- "version": "1.0.1",
+ "version": "3.0.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/simple-cache.git",
- "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
+ "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
- "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
+ "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865",
+ "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865",
"shasum": ""
},
"require": {
- "php": ">=5.3.0"
+ "php": ">=8.0.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "3.0.x-dev"
}
},
"autoload": {
@@ -3814,7 +4141,7 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
"description": "Common interfaces for simple caching",
@@ -3826,22 +4153,22 @@
"simple-cache"
],
"support": {
- "source": "https://github.com/php-fig/simple-cache/tree/master"
+ "source": "https://github.com/php-fig/simple-cache/tree/3.0.0"
},
- "time": "2017-10-23T01:57:42+00:00"
+ "time": "2021-10-29T13:26:27+00:00"
},
{
"name": "psy/psysh",
- "version": "v0.11.8",
+ "version": "v0.11.10",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
- "reference": "f455acf3645262ae389b10e9beba0c358aa6994e"
+ "reference": "e9eadffbed9c9deb5426fd107faae0452bf20a36"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/f455acf3645262ae389b10e9beba0c358aa6994e",
- "reference": "f455acf3645262ae389b10e9beba0c358aa6994e",
+ "url": "https://api.github.com/repos/bobthecow/psysh/zipball/e9eadffbed9c9deb5426fd107faae0452bf20a36",
+ "reference": "e9eadffbed9c9deb5426fd107faae0452bf20a36",
"shasum": ""
},
"require": {
@@ -3902,9 +4229,79 @@
],
"support": {
"issues": "https://github.com/bobthecow/psysh/issues",
- "source": "https://github.com/bobthecow/psysh/tree/v0.11.8"
+ "source": "https://github.com/bobthecow/psysh/tree/v0.11.10"
+ },
+ "time": "2022-12-23T17:47:18+00:00"
+ },
+ {
+ "name": "qirolab/laravel-themer",
+ "version": "2.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/qirolab/laravel-themer.git",
+ "reference": "9c4e17fe7334c921bf5c57395d926154cc25a1e8"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/qirolab/laravel-themer/zipball/9c4e17fe7334c921bf5c57395d926154cc25a1e8",
+ "reference": "9c4e17fe7334c921bf5c57395d926154cc25a1e8",
+ "shasum": ""
+ },
+ "require": {
+ "facade/ignition-contracts": "^1.0",
+ "illuminate/support": "^9.19",
+ "php": ">=7.1.0"
+ },
+ "require-dev": {
+ "orchestra/testbench": "^7.0",
+ "phpunit/phpunit": "^8.3|^9.0",
+ "vimeo/psalm": "^4.0"
+ },
+ "type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "Qirolab\\Theme\\ThemeServiceProvider"
+ ]
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Qirolab\\Theme\\": "src",
+ "Qirolab\\Theme\\Database\\Factories\\": "database/factories"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Harish Kumar",
+ "email": "harish@qirolab.com",
+ "homepage": "https://qirolab.com",
+ "role": "Developer"
+ }
+ ],
+ "description": "A Laravel theme manager, that will help you organize and maintain your themes inside Laravel projects.",
+ "homepage": "https://qirolab.com",
+ "keywords": [
+ "laravel",
+ "laravel-theme",
+ "qirolab",
+ "theme"
+ ],
+ "support": {
+ "issues": "https://github.com/qirolab/laravel-themer/issues",
+ "source": "https://github.com/qirolab/laravel-themer/tree/2.0.2"
},
- "time": "2022-07-28T14:25:11+00:00"
+ "funding": [
+ {
+ "url": "https://www.buymeacoffee.com/qirolab",
+ "type": "other"
+ }
+ ],
+ "time": "2022-09-03T21:30:32+00:00"
},
{
"name": "ralouphie/getallheaders",
@@ -3952,42 +4349,52 @@
},
{
"name": "ramsey/collection",
- "version": "1.2.2",
+ "version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/ramsey/collection.git",
- "reference": "cccc74ee5e328031b15640b51056ee8d3bb66c0a"
+ "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ramsey/collection/zipball/cccc74ee5e328031b15640b51056ee8d3bb66c0a",
- "reference": "cccc74ee5e328031b15640b51056ee8d3bb66c0a",
+ "url": "https://api.github.com/repos/ramsey/collection/zipball/a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
+ "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
"shasum": ""
},
"require": {
- "php": "^7.3 || ^8",
- "symfony/polyfill-php81": "^1.23"
+ "php": "^8.1"
},
"require-dev": {
- "captainhook/captainhook": "^5.3",
- "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
- "ergebnis/composer-normalize": "^2.6",
- "fakerphp/faker": "^1.5",
- "hamcrest/hamcrest-php": "^2",
- "jangregor/phpstan-prophecy": "^0.8",
- "mockery/mockery": "^1.3",
+ "captainhook/plugin-composer": "^5.3",
+ "ergebnis/composer-normalize": "^2.28.3",
+ "fakerphp/faker": "^1.21",
+ "hamcrest/hamcrest-php": "^2.0",
+ "jangregor/phpstan-prophecy": "^1.0",
+ "mockery/mockery": "^1.5",
+ "php-parallel-lint/php-console-highlighter": "^1.0",
+ "php-parallel-lint/php-parallel-lint": "^1.3",
+ "phpcsstandards/phpcsutils": "^1.0.0-rc1",
"phpspec/prophecy-phpunit": "^2.0",
- "phpstan/extension-installer": "^1",
- "phpstan/phpstan": "^0.12.32",
- "phpstan/phpstan-mockery": "^0.12.5",
- "phpstan/phpstan-phpunit": "^0.12.11",
- "phpunit/phpunit": "^8.5 || ^9",
- "psy/psysh": "^0.10.4",
- "slevomat/coding-standard": "^6.3",
- "squizlabs/php_codesniffer": "^3.5",
- "vimeo/psalm": "^4.4"
+ "phpstan/extension-installer": "^1.2",
+ "phpstan/phpstan": "^1.9",
+ "phpstan/phpstan-mockery": "^1.1",
+ "phpstan/phpstan-phpunit": "^1.3",
+ "phpunit/phpunit": "^9.5",
+ "psalm/plugin-mockery": "^1.1",
+ "psalm/plugin-phpunit": "^0.18.4",
+ "ramsey/coding-standard": "^2.0.3",
+ "ramsey/conventional-commits": "^1.3",
+ "vimeo/psalm": "^5.4"
},
"type": "library",
+ "extra": {
+ "captainhook": {
+ "force-install": true
+ },
+ "ramsey/conventional-commits": {
+ "configFile": "conventional-commits.json"
+ }
+ },
"autoload": {
"psr-4": {
"Ramsey\\Collection\\": "src/"
@@ -4015,7 +4422,7 @@
],
"support": {
"issues": "https://github.com/ramsey/collection/issues",
- "source": "https://github.com/ramsey/collection/tree/1.2.2"
+ "source": "https://github.com/ramsey/collection/tree/2.0.0"
},
"funding": [
{
@@ -4027,28 +4434,27 @@
"type": "tidelift"
}
],
- "time": "2021-10-10T03:01:02+00:00"
+ "time": "2022-12-31T21:50:55+00:00"
},
{
"name": "ramsey/uuid",
- "version": "4.4.0",
+ "version": "4.7.1",
"source": {
"type": "git",
"url": "https://github.com/ramsey/uuid.git",
- "reference": "373f7bacfcf3de038778ff27dcce5672ddbf4c8a"
+ "reference": "a1acf96007170234a8399586a6e2ab8feba109d1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ramsey/uuid/zipball/373f7bacfcf3de038778ff27dcce5672ddbf4c8a",
- "reference": "373f7bacfcf3de038778ff27dcce5672ddbf4c8a",
+ "url": "https://api.github.com/repos/ramsey/uuid/zipball/a1acf96007170234a8399586a6e2ab8feba109d1",
+ "reference": "a1acf96007170234a8399586a6e2ab8feba109d1",
"shasum": ""
},
"require": {
- "brick/math": "^0.8 || ^0.9 || ^0.10",
- "ext-ctype": "*",
+ "brick/math": "^0.8.8 || ^0.9 || ^0.10",
"ext-json": "*",
"php": "^8.0",
- "ramsey/collection": "^1.0"
+ "ramsey/collection": "^1.2 || ^2.0"
},
"replace": {
"rhumsaa/uuid": "self.version"
@@ -4065,18 +4471,18 @@
"php-mock/php-mock-mockery": "^1.3",
"php-parallel-lint/php-parallel-lint": "^1.1",
"phpbench/phpbench": "^1.0",
- "phpstan/extension-installer": "^1.0",
- "phpstan/phpstan": "^0.12",
- "phpstan/phpstan-mockery": "^0.12",
- "phpstan/phpstan-phpunit": "^0.12",
+ "phpstan/extension-installer": "^1.1",
+ "phpstan/phpstan": "^1.8",
+ "phpstan/phpstan-mockery": "^1.1",
+ "phpstan/phpstan-phpunit": "^1.1",
"phpunit/phpunit": "^8.5 || ^9",
- "slevomat/coding-standard": "^7.0",
+ "ramsey/composer-repl": "^1.4",
+ "slevomat/coding-standard": "^8.4",
"squizlabs/php_codesniffer": "^3.5",
"vimeo/psalm": "^4.9"
},
"suggest": {
"ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.",
- "ext-ctype": "Enables faster processing of character classification using ctype functions.",
"ext-gmp": "Enables faster math with arbitrary-precision integers using GMP.",
"ext-uuid": "Enables the use of PeclUuidTimeGenerator and PeclUuidRandomGenerator.",
"paragonie/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
@@ -4108,7 +4514,7 @@
],
"support": {
"issues": "https://github.com/ramsey/uuid/issues",
- "source": "https://github.com/ramsey/uuid/tree/4.4.0"
+ "source": "https://github.com/ramsey/uuid/tree/4.7.1"
},
"funding": [
{
@@ -4120,7 +4526,7 @@
"type": "tidelift"
}
],
- "time": "2022-08-05T17:58:37+00:00"
+ "time": "2022-12-31T22:20:34+00:00"
},
{
"name": "sabberworm/php-css-parser",
@@ -4218,22 +4624,22 @@
},
{
"name": "socialiteproviders/manager",
- "version": "v4.1.0",
+ "version": "v4.2.0",
"source": {
"type": "git",
"url": "https://github.com/SocialiteProviders/Manager.git",
- "reference": "4e63afbd26dc45ff263591de2a0970436a6a0bf9"
+ "reference": "738276dfbc2b68a9145db7b3df1588d53db528a1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/4e63afbd26dc45ff263591de2a0970436a6a0bf9",
- "reference": "4e63afbd26dc45ff263591de2a0970436a6a0bf9",
+ "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/738276dfbc2b68a9145db7b3df1588d53db528a1",
+ "reference": "738276dfbc2b68a9145db7b3df1588d53db528a1",
"shasum": ""
},
"require": {
"illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0",
- "laravel/socialite": "~4.0 || ~5.0",
- "php": "^7.2 || ^8.0"
+ "laravel/socialite": "~5.0",
+ "php": "^7.4 || ^8.0"
},
"require-dev": {
"mockery/mockery": "^1.2",
@@ -4288,32 +4694,33 @@
"issues": "https://github.com/socialiteproviders/manager/issues",
"source": "https://github.com/socialiteproviders/manager"
},
- "time": "2022-01-23T22:40:23+00:00"
+ "time": "2022-09-02T10:20:10+00:00"
},
{
"name": "spatie/laravel-activitylog",
- "version": "3.17.0",
+ "version": "4.7.2",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-activitylog.git",
- "reference": "bdc44862aaca39ecbd824133b80dbd7c8017ed7f"
+ "reference": "eee61436e2984119fd71fc338a45ec7d68e3b548"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/laravel-activitylog/zipball/bdc44862aaca39ecbd824133b80dbd7c8017ed7f",
- "reference": "bdc44862aaca39ecbd824133b80dbd7c8017ed7f",
+ "url": "https://api.github.com/repos/spatie/laravel-activitylog/zipball/eee61436e2984119fd71fc338a45ec7d68e3b548",
+ "reference": "eee61436e2984119fd71fc338a45ec7d68e3b548",
"shasum": ""
},
"require": {
- "illuminate/config": "^6.0 || ^7.0 || ^8.0",
- "illuminate/database": "^6.0 || ^7.0 || ^8.0",
- "illuminate/support": "^6.0 || ^7.0 || ^8.0",
- "php": "^7.3 || ^8.0"
+ "illuminate/config": "^8.0 || ^9.0",
+ "illuminate/database": "^8.69 || ^9.27",
+ "illuminate/support": "^8.0 || ^9.0",
+ "php": "^8.0",
+ "spatie/laravel-package-tools": "^1.6.3"
},
"require-dev": {
"ext-json": "*",
- "orchestra/testbench": "^4.0 || ^5.0 || ^6.0",
- "phpunit/phpunit": "^9.3"
+ "orchestra/testbench": "^6.23 || ^7.0",
+ "pestphp/pest": "^1.20"
},
"type": "library",
"extra": {
@@ -4366,7 +4773,7 @@
],
"support": {
"issues": "https://github.com/spatie/laravel-activitylog/issues",
- "source": "https://github.com/spatie/laravel-activitylog/tree/3.17.0"
+ "source": "https://github.com/spatie/laravel-activitylog/tree/4.7.2"
},
"funding": [
{
@@ -4378,46 +4785,37 @@
"type": "github"
}
],
- "time": "2021-03-02T16:49:06+00:00"
+ "time": "2022-11-14T12:16:46+00:00"
},
{
- "name": "spatie/laravel-query-builder",
- "version": "3.6.2",
+ "name": "spatie/laravel-package-tools",
+ "version": "1.13.8",
"source": {
"type": "git",
- "url": "https://github.com/spatie/laravel-query-builder.git",
- "reference": "3768381e9f2f80b01f0088eca49f061c269e0e8b"
+ "url": "https://github.com/spatie/laravel-package-tools.git",
+ "reference": "781a2f637237e69c277eb401063acf15e2b4156b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/laravel-query-builder/zipball/3768381e9f2f80b01f0088eca49f061c269e0e8b",
- "reference": "3768381e9f2f80b01f0088eca49f061c269e0e8b",
+ "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/781a2f637237e69c277eb401063acf15e2b4156b",
+ "reference": "781a2f637237e69c277eb401063acf15e2b4156b",
"shasum": ""
},
"require": {
- "illuminate/database": "^6.20.13|^7.30.4|^8.22.2",
- "illuminate/http": "^6.20.13|^7.30.4|^8.22.2",
- "illuminate/support": "^6.20.13|^7.30.4|^8.22.2",
- "php": "^7.3|^8.0"
+ "illuminate/contracts": "^9.28",
+ "php": "^8.0"
},
"require-dev": {
- "ext-json": "*",
- "laravel/legacy-factories": "^1.0.4",
- "mockery/mockery": "^1.4",
- "orchestra/testbench": "^4.9|^5.8|^6.3",
- "phpunit/phpunit": "^9.0"
+ "mockery/mockery": "^1.5",
+ "orchestra/testbench": "^7.7",
+ "pestphp/pest": "^1.22",
+ "phpunit/phpunit": "^9.5.24",
+ "spatie/pest-plugin-test-time": "^1.1"
},
"type": "library",
- "extra": {
- "laravel": {
- "providers": [
- "Spatie\\QueryBuilder\\QueryBuilderServiceProvider"
- ]
- }
- },
"autoload": {
"psr-4": {
- "Spatie\\QueryBuilder\\": "src"
+ "Spatie\\LaravelPackageTools\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -4426,41 +4824,112 @@
],
"authors": [
{
- "name": "Alex Vanderbist",
- "email": "alex@spatie.be",
- "homepage": "https://spatie.be",
+ "name": "Freek Van der Herten",
+ "email": "freek@spatie.be",
"role": "Developer"
}
],
- "description": "Easily build Eloquent queries from API requests",
- "homepage": "https://github.com/spatie/laravel-query-builder",
+ "description": "Tools for creating Laravel packages",
+ "homepage": "https://github.com/spatie/laravel-package-tools",
"keywords": [
- "laravel-query-builder",
+ "laravel-package-tools",
"spatie"
],
"support": {
- "issues": "https://github.com/spatie/laravel-query-builder/issues",
- "source": "https://github.com/spatie/laravel-query-builder"
+ "issues": "https://github.com/spatie/laravel-package-tools/issues",
+ "source": "https://github.com/spatie/laravel-package-tools/tree/1.13.8"
},
"funding": [
{
- "url": "https://spatie.be/open-source/support-us",
- "type": "custom"
+ "url": "https://github.com/spatie",
+ "type": "github"
}
],
- "time": "2022-01-09T15:39:13+00:00"
+ "time": "2022-12-20T14:09:05+00:00"
},
{
- "name": "spatie/laravel-validation-rules",
- "version": "3.2.1",
+ "name": "spatie/laravel-query-builder",
+ "version": "5.1.1",
"source": {
"type": "git",
- "url": "https://github.com/spatie/laravel-validation-rules.git",
- "reference": "47a63a724e10d72432d0dcdf438d1fecbc963bae"
+ "url": "https://github.com/spatie/laravel-query-builder.git",
+ "reference": "14a6802cd513cfd2abf68044cca5fd7391eb543d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/laravel-validation-rules/zipball/47a63a724e10d72432d0dcdf438d1fecbc963bae",
+ "url": "https://api.github.com/repos/spatie/laravel-query-builder/zipball/14a6802cd513cfd2abf68044cca5fd7391eb543d",
+ "reference": "14a6802cd513cfd2abf68044cca5fd7391eb543d",
+ "shasum": ""
+ },
+ "require": {
+ "illuminate/database": "^9.0",
+ "illuminate/http": "^9.0",
+ "illuminate/support": "^9.0",
+ "php": "^8.0",
+ "spatie/laravel-package-tools": "^1.11"
+ },
+ "require-dev": {
+ "ext-json": "*",
+ "mockery/mockery": "^1.4",
+ "orchestra/testbench": "^7.0",
+ "pestphp/pest": "^1.20",
+ "spatie/laravel-ray": "^1.28"
+ },
+ "type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "Spatie\\QueryBuilder\\QueryBuilderServiceProvider"
+ ]
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Spatie\\QueryBuilder\\": "src",
+ "Spatie\\QueryBuilder\\Database\\Factories\\": "database/factories"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Alex Vanderbist",
+ "email": "alex@spatie.be",
+ "homepage": "https://spatie.be",
+ "role": "Developer"
+ }
+ ],
+ "description": "Easily build Eloquent queries from API requests",
+ "homepage": "https://github.com/spatie/laravel-query-builder",
+ "keywords": [
+ "laravel-query-builder",
+ "spatie"
+ ],
+ "support": {
+ "issues": "https://github.com/spatie/laravel-query-builder/issues",
+ "source": "https://github.com/spatie/laravel-query-builder"
+ },
+ "funding": [
+ {
+ "url": "https://spatie.be/open-source/support-us",
+ "type": "custom"
+ }
+ ],
+ "time": "2022-12-02T21:28:40+00:00"
+ },
+ {
+ "name": "spatie/laravel-validation-rules",
+ "version": "3.2.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/spatie/laravel-validation-rules.git",
+ "reference": "47a63a724e10d72432d0dcdf438d1fecbc963bae"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/spatie/laravel-validation-rules/zipball/47a63a724e10d72432d0dcdf438d1fecbc963bae",
"reference": "47a63a724e10d72432d0dcdf438d1fecbc963bae",
"shasum": ""
},
@@ -4582,124 +5051,45 @@
},
"time": "2022-05-05T17:18:02+00:00"
},
- {
- "name": "swiftmailer/swiftmailer",
- "version": "v6.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/swiftmailer/swiftmailer.git",
- "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c",
- "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c",
- "shasum": ""
- },
- "require": {
- "egulias/email-validator": "^2.0|^3.1",
- "php": ">=7.0.0",
- "symfony/polyfill-iconv": "^1.0",
- "symfony/polyfill-intl-idn": "^1.10",
- "symfony/polyfill-mbstring": "^1.0"
- },
- "require-dev": {
- "mockery/mockery": "^1.0",
- "symfony/phpunit-bridge": "^4.4|^5.4"
- },
- "suggest": {
- "ext-intl": "Needed to support internationalized email addresses"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "6.2-dev"
- }
- },
- "autoload": {
- "files": [
- "lib/swift_required.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Chris Corbyn"
- },
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- }
- ],
- "description": "Swiftmailer, free feature-rich PHP mailer",
- "homepage": "https://swiftmailer.symfony.com",
- "keywords": [
- "email",
- "mail",
- "mailer"
- ],
- "support": {
- "issues": "https://github.com/swiftmailer/swiftmailer/issues",
- "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.3.0"
- },
- "funding": [
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/swiftmailer/swiftmailer",
- "type": "tidelift"
- }
- ],
- "abandoned": "symfony/mailer",
- "time": "2021-10-18T15:26:12+00:00"
- },
{
"name": "symfony/console",
- "version": "v5.4.11",
+ "version": "v6.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "535846c7ee6bc4dd027ca0d93220601456734b10"
+ "reference": "0f579613e771dba2dbb8211c382342a641f5da06"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/535846c7ee6bc4dd027ca0d93220601456734b10",
- "reference": "535846c7ee6bc4dd027ca0d93220601456734b10",
+ "url": "https://api.github.com/repos/symfony/console/zipball/0f579613e771dba2dbb8211c382342a641f5da06",
+ "reference": "0f579613e771dba2dbb8211c382342a641f5da06",
"shasum": ""
},
"require": {
- "php": ">=7.2.5",
+ "php": ">=8.1",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/polyfill-mbstring": "~1.0",
- "symfony/polyfill-php73": "^1.9",
- "symfony/polyfill-php80": "^1.16",
"symfony/service-contracts": "^1.1|^2|^3",
- "symfony/string": "^5.1|^6.0"
+ "symfony/string": "^5.4|^6.0"
},
"conflict": {
- "psr/log": ">=3",
- "symfony/dependency-injection": "<4.4",
- "symfony/dotenv": "<5.1",
- "symfony/event-dispatcher": "<4.4",
- "symfony/lock": "<4.4",
- "symfony/process": "<4.4"
+ "symfony/dependency-injection": "<5.4",
+ "symfony/dotenv": "<5.4",
+ "symfony/event-dispatcher": "<5.4",
+ "symfony/lock": "<5.4",
+ "symfony/process": "<5.4"
},
"provide": {
- "psr/log-implementation": "1.0|2.0"
+ "psr/log-implementation": "1.0|2.0|3.0"
},
"require-dev": {
- "psr/log": "^1|^2",
- "symfony/config": "^4.4|^5.0|^6.0",
- "symfony/dependency-injection": "^4.4|^5.0|^6.0",
- "symfony/event-dispatcher": "^4.4|^5.0|^6.0",
- "symfony/lock": "^4.4|^5.0|^6.0",
- "symfony/process": "^4.4|^5.0|^6.0",
- "symfony/var-dumper": "^4.4|^5.0|^6.0"
+ "psr/log": "^1|^2|^3",
+ "symfony/config": "^5.4|^6.0",
+ "symfony/dependency-injection": "^5.4|^6.0",
+ "symfony/event-dispatcher": "^5.4|^6.0",
+ "symfony/lock": "^5.4|^6.0",
+ "symfony/process": "^5.4|^6.0",
+ "symfony/var-dumper": "^5.4|^6.0"
},
"suggest": {
"psr/log": "For using the console logger",
@@ -4739,7 +5129,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v5.4.11"
+ "source": "https://github.com/symfony/console/tree/v6.2.3"
},
"funding": [
{
@@ -4755,24 +5145,24 @@
"type": "tidelift"
}
],
- "time": "2022-07-22T10:42:43+00:00"
+ "time": "2022-12-28T14:26:22+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v6.0.11",
+ "version": "v6.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "ab2746acddc4f03a7234c8441822ac5d5c63efe9"
+ "reference": "ab1df4ba3ded7b724766ba3a6e0eca0418e74f80"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/ab2746acddc4f03a7234c8441822ac5d5c63efe9",
- "reference": "ab2746acddc4f03a7234c8441822ac5d5c63efe9",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/ab1df4ba3ded7b724766ba3a6e0eca0418e74f80",
+ "reference": "ab1df4ba3ded7b724766ba3a6e0eca0418e74f80",
"shasum": ""
},
"require": {
- "php": ">=8.0.2"
+ "php": ">=8.1"
},
"type": "library",
"autoload": {
@@ -4804,7 +5194,7 @@
"description": "Converts CSS selectors to XPath expressions",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/css-selector/tree/v6.0.11"
+ "source": "https://github.com/symfony/css-selector/tree/v6.2.3"
},
"funding": [
{
@@ -4820,29 +5210,29 @@
"type": "tidelift"
}
],
- "time": "2022-06-27T17:10:44+00:00"
+ "time": "2022-12-28T14:26:22+00:00"
},
{
"name": "symfony/deprecation-contracts",
- "version": "v3.0.2",
+ "version": "v3.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
- "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c"
+ "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
- "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
+ "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/1ee04c65529dea5d8744774d474e7cbd2f1206d3",
+ "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3",
"shasum": ""
},
"require": {
- "php": ">=8.0.2"
+ "php": ">=8.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.0-dev"
+ "dev-main": "3.3-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -4871,7 +5261,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.2"
+ "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.0"
},
"funding": [
{
@@ -4887,31 +5277,31 @@
"type": "tidelift"
}
],
- "time": "2022-01-02T09:55:41+00:00"
+ "time": "2022-11-25T10:21:52+00:00"
},
{
"name": "symfony/error-handler",
- "version": "v5.4.11",
+ "version": "v6.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
- "reference": "f75d17cb4769eb38cd5fccbda95cd80a054d35c8"
+ "reference": "0926124c95d220499e2baf0fb465772af3a4eddb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/error-handler/zipball/f75d17cb4769eb38cd5fccbda95cd80a054d35c8",
- "reference": "f75d17cb4769eb38cd5fccbda95cd80a054d35c8",
+ "url": "https://api.github.com/repos/symfony/error-handler/zipball/0926124c95d220499e2baf0fb465772af3a4eddb",
+ "reference": "0926124c95d220499e2baf0fb465772af3a4eddb",
"shasum": ""
},
"require": {
- "php": ">=7.2.5",
+ "php": ">=8.1",
"psr/log": "^1|^2|^3",
- "symfony/var-dumper": "^4.4|^5.0|^6.0"
+ "symfony/var-dumper": "^5.4|^6.0"
},
"require-dev": {
"symfony/deprecation-contracts": "^2.1|^3",
- "symfony/http-kernel": "^4.4|^5.0|^6.0",
- "symfony/serializer": "^4.4|^5.0|^6.0"
+ "symfony/http-kernel": "^5.4|^6.0",
+ "symfony/serializer": "^5.4|^6.0"
},
"bin": [
"Resources/bin/patch-type-declarations"
@@ -4942,7 +5332,7 @@
"description": "Provides tools to manage errors and ease debugging PHP code",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/error-handler/tree/v5.4.11"
+ "source": "https://github.com/symfony/error-handler/tree/v6.2.3"
},
"funding": [
{
@@ -4958,24 +5348,24 @@
"type": "tidelift"
}
],
- "time": "2022-07-29T07:37:50+00:00"
+ "time": "2022-12-19T14:33:49+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v6.0.9",
+ "version": "v6.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "5c85b58422865d42c6eb46f7693339056db098a8"
+ "reference": "3ffeb31139b49bf6ef0bc09d1db95eac053388d1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/5c85b58422865d42c6eb46f7693339056db098a8",
- "reference": "5c85b58422865d42c6eb46f7693339056db098a8",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3ffeb31139b49bf6ef0bc09d1db95eac053388d1",
+ "reference": "3ffeb31139b49bf6ef0bc09d1db95eac053388d1",
"shasum": ""
},
"require": {
- "php": ">=8.0.2",
+ "php": ">=8.1",
"symfony/event-dispatcher-contracts": "^2|^3"
},
"conflict": {
@@ -5025,7 +5415,7 @@
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/event-dispatcher/tree/v6.0.9"
+ "source": "https://github.com/symfony/event-dispatcher/tree/v6.2.2"
},
"funding": [
{
@@ -5041,24 +5431,24 @@
"type": "tidelift"
}
],
- "time": "2022-05-05T16:45:52+00:00"
+ "time": "2022-12-14T16:11:27+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
- "version": "v3.0.2",
+ "version": "v3.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
- "reference": "7bc61cc2db649b4637d331240c5346dcc7708051"
+ "reference": "0782b0b52a737a05b4383d0df35a474303cabdae"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7bc61cc2db649b4637d331240c5346dcc7708051",
- "reference": "7bc61cc2db649b4637d331240c5346dcc7708051",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0782b0b52a737a05b4383d0df35a474303cabdae",
+ "reference": "0782b0b52a737a05b4383d0df35a474303cabdae",
"shasum": ""
},
"require": {
- "php": ">=8.0.2",
+ "php": ">=8.1",
"psr/event-dispatcher": "^1"
},
"suggest": {
@@ -5067,7 +5457,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.0-dev"
+ "dev-main": "3.3-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -5104,7 +5494,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.0.2"
+ "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.2.0"
},
"funding": [
{
@@ -5120,26 +5510,27 @@
"type": "tidelift"
}
],
- "time": "2022-01-02T09:55:41+00:00"
+ "time": "2022-11-25T10:21:52+00:00"
},
{
"name": "symfony/finder",
- "version": "v5.4.11",
+ "version": "v6.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c"
+ "reference": "81eefbddfde282ee33b437ba5e13d7753211ae8e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/7872a66f57caffa2916a584db1aa7f12adc76f8c",
- "reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/81eefbddfde282ee33b437ba5e13d7753211ae8e",
+ "reference": "81eefbddfde282ee33b437ba5e13d7753211ae8e",
"shasum": ""
},
"require": {
- "php": ">=7.2.5",
- "symfony/deprecation-contracts": "^2.1|^3",
- "symfony/polyfill-php80": "^1.16"
+ "php": ">=8.1"
+ },
+ "require-dev": {
+ "symfony/filesystem": "^6.0"
},
"type": "library",
"autoload": {
@@ -5167,7 +5558,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v5.4.11"
+ "source": "https://github.com/symfony/finder/tree/v6.2.3"
},
"funding": [
{
@@ -5183,41 +5574,53 @@
"type": "tidelift"
}
],
- "time": "2022-07-29T07:37:50+00:00"
+ "time": "2022-12-22T17:55:15+00:00"
},
{
- "name": "symfony/http-foundation",
- "version": "v5.4.11",
+ "name": "symfony/http-client",
+ "version": "v6.2.2",
"source": {
"type": "git",
- "url": "https://github.com/symfony/http-foundation.git",
- "reference": "0a5868e0999e9d47859ba3d918548ff6943e6389"
+ "url": "https://github.com/symfony/http-client.git",
+ "reference": "7054ad466f836309aef511789b9c697bc986d8ce"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/0a5868e0999e9d47859ba3d918548ff6943e6389",
- "reference": "0a5868e0999e9d47859ba3d918548ff6943e6389",
+ "url": "https://api.github.com/repos/symfony/http-client/zipball/7054ad466f836309aef511789b9c697bc986d8ce",
+ "reference": "7054ad466f836309aef511789b9c697bc986d8ce",
"shasum": ""
},
"require": {
- "php": ">=7.2.5",
+ "php": ">=8.1",
+ "psr/log": "^1|^2|^3",
"symfony/deprecation-contracts": "^2.1|^3",
- "symfony/polyfill-mbstring": "~1.1",
- "symfony/polyfill-php80": "^1.16"
+ "symfony/http-client-contracts": "^3",
+ "symfony/service-contracts": "^1.0|^2|^3"
},
- "require-dev": {
- "predis/predis": "~1.0",
- "symfony/cache": "^4.4|^5.0|^6.0",
- "symfony/expression-language": "^4.4|^5.0|^6.0",
- "symfony/mime": "^4.4|^5.0|^6.0"
+ "provide": {
+ "php-http/async-client-implementation": "*",
+ "php-http/client-implementation": "*",
+ "psr/http-client-implementation": "1.0",
+ "symfony/http-client-implementation": "3.0"
},
- "suggest": {
- "symfony/mime": "To use the file extension guesser"
+ "require-dev": {
+ "amphp/amp": "^2.5",
+ "amphp/http-client": "^4.2.1",
+ "amphp/http-tunnel": "^1.0",
+ "amphp/socket": "^1.1",
+ "guzzlehttp/promises": "^1.4",
+ "nyholm/psr7": "^1.0",
+ "php-http/httplug": "^1.0|^2.0",
+ "psr/http-client": "^1.0",
+ "symfony/dependency-injection": "^5.4|^6.0",
+ "symfony/http-kernel": "^5.4|^6.0",
+ "symfony/process": "^5.4|^6.0",
+ "symfony/stopwatch": "^5.4|^6.0"
},
"type": "library",
"autoload": {
"psr-4": {
- "Symfony\\Component\\HttpFoundation\\": ""
+ "Symfony\\Component\\HttpClient\\": ""
},
"exclude-from-classmap": [
"/Tests/"
@@ -5229,18 +5632,18 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Defines an object-oriented layer for the HTTP specification",
+ "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-foundation/tree/v5.4.11"
+ "source": "https://github.com/symfony/http-client/tree/v6.2.2"
},
"funding": [
{
@@ -5256,83 +5659,44 @@
"type": "tidelift"
}
],
- "time": "2022-07-20T13:00:38+00:00"
+ "time": "2022-12-14T16:11:27+00:00"
},
{
- "name": "symfony/http-kernel",
- "version": "v5.4.11",
+ "name": "symfony/http-client-contracts",
+ "version": "v3.1.1",
"source": {
"type": "git",
- "url": "https://github.com/symfony/http-kernel.git",
- "reference": "4fd590a2ef3f62560dbbf6cea511995dd77321ee"
+ "url": "https://github.com/symfony/http-client-contracts.git",
+ "reference": "fd038f08c623ab5d22b26e9ba35afe8c79071800"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4fd590a2ef3f62560dbbf6cea511995dd77321ee",
- "reference": "4fd590a2ef3f62560dbbf6cea511995dd77321ee",
+ "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/fd038f08c623ab5d22b26e9ba35afe8c79071800",
+ "reference": "fd038f08c623ab5d22b26e9ba35afe8c79071800",
"shasum": ""
},
"require": {
- "php": ">=7.2.5",
- "psr/log": "^1|^2",
- "symfony/deprecation-contracts": "^2.1|^3",
- "symfony/error-handler": "^4.4|^5.0|^6.0",
- "symfony/event-dispatcher": "^5.0|^6.0",
- "symfony/http-foundation": "^5.3.7|^6.0",
- "symfony/polyfill-ctype": "^1.8",
- "symfony/polyfill-php73": "^1.9",
- "symfony/polyfill-php80": "^1.16"
- },
- "conflict": {
- "symfony/browser-kit": "<5.4",
- "symfony/cache": "<5.0",
- "symfony/config": "<5.0",
- "symfony/console": "<4.4",
- "symfony/dependency-injection": "<5.3",
- "symfony/doctrine-bridge": "<5.0",
- "symfony/form": "<5.0",
- "symfony/http-client": "<5.0",
- "symfony/mailer": "<5.0",
- "symfony/messenger": "<5.0",
- "symfony/translation": "<5.0",
- "symfony/twig-bridge": "<5.0",
- "symfony/validator": "<5.0",
- "twig/twig": "<2.13"
- },
- "provide": {
- "psr/log-implementation": "1.0|2.0"
- },
- "require-dev": {
- "psr/cache": "^1.0|^2.0|^3.0",
- "symfony/browser-kit": "^5.4|^6.0",
- "symfony/config": "^5.0|^6.0",
- "symfony/console": "^4.4|^5.0|^6.0",
- "symfony/css-selector": "^4.4|^5.0|^6.0",
- "symfony/dependency-injection": "^5.3|^6.0",
- "symfony/dom-crawler": "^4.4|^5.0|^6.0",
- "symfony/expression-language": "^4.4|^5.0|^6.0",
- "symfony/finder": "^4.4|^5.0|^6.0",
- "symfony/http-client-contracts": "^1.1|^2|^3",
- "symfony/process": "^4.4|^5.0|^6.0",
- "symfony/routing": "^4.4|^5.0|^6.0",
- "symfony/stopwatch": "^4.4|^5.0|^6.0",
- "symfony/translation": "^4.4|^5.0|^6.0",
- "symfony/translation-contracts": "^1.1|^2|^3",
- "twig/twig": "^2.13|^3.0.4"
+ "php": ">=8.1"
},
"suggest": {
- "symfony/browser-kit": "",
- "symfony/config": "",
- "symfony/console": "",
- "symfony/dependency-injection": ""
+ "symfony/http-client-implementation": ""
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-main": "3.1-dev"
+ },
+ "thanks": {
+ "name": "symfony/contracts",
+ "url": "https://github.com/symfony/contracts"
+ }
+ },
"autoload": {
"psr-4": {
- "Symfony\\Component\\HttpKernel\\": ""
+ "Symfony\\Contracts\\HttpClient\\": ""
},
"exclude-from-classmap": [
- "/Tests/"
+ "/Test/"
]
},
"notification-url": "https://packagist.org/downloads/",
@@ -5341,18 +5705,26 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Provides a structured process for converting a Request into a Response",
+ "description": "Generic abstractions related to HTTP clients",
"homepage": "https://symfony.com",
+ "keywords": [
+ "abstractions",
+ "contracts",
+ "decoupling",
+ "interfaces",
+ "interoperability",
+ "standards"
+ ],
"support": {
- "source": "https://github.com/symfony/http-kernel/tree/v5.4.11"
+ "source": "https://github.com/symfony/http-client-contracts/tree/v3.1.1"
},
"funding": [
{
@@ -5368,41 +5740,47 @@
"type": "tidelift"
}
],
- "time": "2022-07-29T12:30:22+00:00"
+ "time": "2022-04-22T07:30:54+00:00"
},
{
- "name": "symfony/intl",
- "version": "v5.4.11",
+ "name": "symfony/http-foundation",
+ "version": "v6.2.2",
"source": {
"type": "git",
- "url": "https://github.com/symfony/intl.git",
- "reference": "d305c0c1d31b30b3876e041804c35e49e5f8a96e"
+ "url": "https://github.com/symfony/http-foundation.git",
+ "reference": "ddf4dd35de1623e7c02013523e6c2137b67b636f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/intl/zipball/d305c0c1d31b30b3876e041804c35e49e5f8a96e",
- "reference": "d305c0c1d31b30b3876e041804c35e49e5f8a96e",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ddf4dd35de1623e7c02013523e6c2137b67b636f",
+ "reference": "ddf4dd35de1623e7c02013523e6c2137b67b636f",
"shasum": ""
},
"require": {
- "php": ">=7.2.5",
+ "php": ">=8.1",
"symfony/deprecation-contracts": "^2.1|^3",
- "symfony/polyfill-php80": "^1.16"
+ "symfony/polyfill-mbstring": "~1.1"
+ },
+ "conflict": {
+ "symfony/cache": "<6.2"
},
"require-dev": {
- "symfony/filesystem": "^4.4|^5.0|^6.0"
+ "predis/predis": "~1.0",
+ "symfony/cache": "^5.4|^6.0",
+ "symfony/dependency-injection": "^5.4|^6.0",
+ "symfony/expression-language": "^5.4|^6.0",
+ "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4",
+ "symfony/mime": "^5.4|^6.0",
+ "symfony/rate-limiter": "^5.2|^6.0"
+ },
+ "suggest": {
+ "symfony/mime": "To use the file extension guesser"
},
"type": "library",
"autoload": {
- "files": [
- "Resources/functions.php"
- ],
"psr-4": {
- "Symfony\\Component\\Intl\\": ""
+ "Symfony\\Component\\HttpFoundation\\": ""
},
- "classmap": [
- "Resources/stubs"
- ],
"exclude-from-classmap": [
"/Tests/"
]
@@ -5413,34 +5791,18 @@
],
"authors": [
{
- "name": "Bernhard Schussek",
- "email": "bschussek@gmail.com"
- },
- {
- "name": "Eriksen Costa",
- "email": "eriksen.costa@infranology.com.br"
- },
- {
- "name": "Igor Wiedler",
- "email": "igor@wiedler.ch"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Provides a PHP replacement layer for the C intl extension that includes additional data from the ICU library",
+ "description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
- "keywords": [
- "i18n",
- "icu",
- "internationalization",
- "intl",
- "l10n",
- "localization"
- ],
"support": {
- "source": "https://github.com/symfony/intl/tree/v5.4.11"
+ "source": "https://github.com/symfony/http-foundation/tree/v6.2.2"
},
"funding": [
{
@@ -5456,47 +5818,79 @@
"type": "tidelift"
}
],
- "time": "2022-07-20T11:34:24+00:00"
+ "time": "2022-12-14T16:11:27+00:00"
},
{
- "name": "symfony/mime",
- "version": "v5.4.11",
+ "name": "symfony/http-kernel",
+ "version": "v6.2.4",
"source": {
"type": "git",
- "url": "https://github.com/symfony/mime.git",
- "reference": "3cd175cdcdb6db2e589e837dd46aff41027d9830"
+ "url": "https://github.com/symfony/http-kernel.git",
+ "reference": "74f2e638ec3fa0315443bd85fab7fc8066b77f83"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/mime/zipball/3cd175cdcdb6db2e589e837dd46aff41027d9830",
- "reference": "3cd175cdcdb6db2e589e837dd46aff41027d9830",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/74f2e638ec3fa0315443bd85fab7fc8066b77f83",
+ "reference": "74f2e638ec3fa0315443bd85fab7fc8066b77f83",
"shasum": ""
},
"require": {
- "php": ">=7.2.5",
+ "php": ">=8.1",
+ "psr/log": "^1|^2|^3",
"symfony/deprecation-contracts": "^2.1|^3",
- "symfony/polyfill-intl-idn": "^1.10",
- "symfony/polyfill-mbstring": "^1.0",
- "symfony/polyfill-php80": "^1.16"
+ "symfony/error-handler": "^6.1",
+ "symfony/event-dispatcher": "^5.4|^6.0",
+ "symfony/http-foundation": "^5.4|^6.0",
+ "symfony/polyfill-ctype": "^1.8"
},
"conflict": {
- "egulias/email-validator": "~3.0.0",
- "phpdocumentor/reflection-docblock": "<3.2.2",
- "phpdocumentor/type-resolver": "<1.4.0",
- "symfony/mailer": "<4.4"
+ "symfony/browser-kit": "<5.4",
+ "symfony/cache": "<5.4",
+ "symfony/config": "<6.1",
+ "symfony/console": "<5.4",
+ "symfony/dependency-injection": "<6.2",
+ "symfony/doctrine-bridge": "<5.4",
+ "symfony/form": "<5.4",
+ "symfony/http-client": "<5.4",
+ "symfony/mailer": "<5.4",
+ "symfony/messenger": "<5.4",
+ "symfony/translation": "<5.4",
+ "symfony/twig-bridge": "<5.4",
+ "symfony/validator": "<5.4",
+ "twig/twig": "<2.13"
+ },
+ "provide": {
+ "psr/log-implementation": "1.0|2.0|3.0"
},
"require-dev": {
- "egulias/email-validator": "^2.1.10|^3.1",
- "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
- "symfony/dependency-injection": "^4.4|^5.0|^6.0",
- "symfony/property-access": "^4.4|^5.1|^6.0",
- "symfony/property-info": "^4.4|^5.1|^6.0",
- "symfony/serializer": "^5.2|^6.0"
+ "psr/cache": "^1.0|^2.0|^3.0",
+ "symfony/browser-kit": "^5.4|^6.0",
+ "symfony/config": "^6.1",
+ "symfony/console": "^5.4|^6.0",
+ "symfony/css-selector": "^5.4|^6.0",
+ "symfony/dependency-injection": "^6.2",
+ "symfony/dom-crawler": "^5.4|^6.0",
+ "symfony/expression-language": "^5.4|^6.0",
+ "symfony/finder": "^5.4|^6.0",
+ "symfony/http-client-contracts": "^1.1|^2|^3",
+ "symfony/process": "^5.4|^6.0",
+ "symfony/routing": "^5.4|^6.0",
+ "symfony/stopwatch": "^5.4|^6.0",
+ "symfony/translation": "^5.4|^6.0",
+ "symfony/translation-contracts": "^1.1|^2|^3",
+ "symfony/uid": "^5.4|^6.0",
+ "twig/twig": "^2.13|^3.0.4"
+ },
+ "suggest": {
+ "symfony/browser-kit": "",
+ "symfony/config": "",
+ "symfony/console": "",
+ "symfony/dependency-injection": ""
},
"type": "library",
"autoload": {
"psr-4": {
- "Symfony\\Component\\Mime\\": ""
+ "Symfony\\Component\\HttpKernel\\": ""
},
"exclude-from-classmap": [
"/Tests/"
@@ -5516,14 +5910,91 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Allows manipulating MIME messages",
+ "description": "Provides a structured process for converting a Request into a Response",
+ "homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/http-kernel/tree/v6.2.4"
+ },
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2022-12-29T19:05:08+00:00"
+ },
+ {
+ "name": "symfony/intl",
+ "version": "v6.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/intl.git",
+ "reference": "04726ae6cec43582f7dfbfc67a313d1ecdd81c0f"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/intl/zipball/04726ae6cec43582f7dfbfc67a313d1ecdd81c0f",
+ "reference": "04726ae6cec43582f7dfbfc67a313d1ecdd81c0f",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=8.1"
+ },
+ "require-dev": {
+ "symfony/filesystem": "^5.4|^6.0",
+ "symfony/finder": "^5.4|^6.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\Intl\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Bernhard Schussek",
+ "email": "bschussek@gmail.com"
+ },
+ {
+ "name": "Eriksen Costa",
+ "email": "eriksen.costa@infranology.com.br"
+ },
+ {
+ "name": "Igor Wiedler",
+ "email": "igor@wiedler.ch"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Provides a PHP replacement layer for the C intl extension that includes additional data from the ICU library",
"homepage": "https://symfony.com",
"keywords": [
- "mime",
- "mime-type"
+ "i18n",
+ "icu",
+ "internationalization",
+ "intl",
+ "l10n",
+ "localization"
],
"support": {
- "source": "https://github.com/symfony/mime/tree/v5.4.11"
+ "source": "https://github.com/symfony/intl/tree/v6.2.0"
},
"funding": [
{
@@ -5539,48 +6010,195 @@
"type": "tidelift"
}
],
- "time": "2022-07-20T11:34:24+00:00"
+ "time": "2022-11-02T09:08:04+00:00"
},
{
- "name": "symfony/polyfill-ctype",
- "version": "v1.26.0",
+ "name": "symfony/mailer",
+ "version": "v6.2.2",
"source": {
"type": "git",
- "url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"
+ "url": "https://github.com/symfony/mailer.git",
+ "reference": "b355ad81f1d2987c47dcd3b04d5dce669e1e62e6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
- "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
+ "url": "https://api.github.com/repos/symfony/mailer/zipball/b355ad81f1d2987c47dcd3b04d5dce669e1e62e6",
+ "reference": "b355ad81f1d2987c47dcd3b04d5dce669e1e62e6",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "egulias/email-validator": "^2.1.10|^3",
+ "php": ">=8.1",
+ "psr/event-dispatcher": "^1",
+ "psr/log": "^1|^2|^3",
+ "symfony/event-dispatcher": "^5.4|^6.0",
+ "symfony/mime": "^6.2",
+ "symfony/service-contracts": "^1.1|^2|^3"
},
- "provide": {
- "ext-ctype": "*"
+ "conflict": {
+ "symfony/http-kernel": "<5.4",
+ "symfony/messenger": "<6.2",
+ "symfony/mime": "<6.2",
+ "symfony/twig-bridge": "<6.2.1"
},
- "suggest": {
- "ext-ctype": "For best performance"
+ "require-dev": {
+ "symfony/console": "^5.4|^6.0",
+ "symfony/http-client-contracts": "^1.1|^2|^3",
+ "symfony/messenger": "^6.2",
+ "symfony/twig-bridge": "^6.2"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "1.26-dev"
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\Mailer\\": ""
},
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
+ ],
+ "description": "Helps sending emails",
+ "homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/mailer/tree/v6.2.2"
},
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2022-12-14T16:11:27+00:00"
+ },
+ {
+ "name": "symfony/mailgun-mailer",
+ "version": "v6.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/mailgun-mailer.git",
+ "reference": "c5364fbcf5581ba9eae569db12b380b9255ce238"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/c5364fbcf5581ba9eae569db12b380b9255ce238",
+ "reference": "c5364fbcf5581ba9eae569db12b380b9255ce238",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=8.1",
+ "symfony/mailer": "^5.4|^6.0"
+ },
+ "require-dev": {
+ "symfony/http-client": "^5.4|^6.0"
+ },
+ "type": "symfony-mailer-bridge",
"autoload": {
- "files": [
- "bootstrap.php"
- ],
"psr-4": {
- "Symfony\\Polyfill\\Ctype\\": ""
+ "Symfony\\Component\\Mailer\\Bridge\\Mailgun\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
+ ],
+ "description": "Symfony Mailgun Mailer Bridge",
+ "homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/mailgun-mailer/tree/v6.2.0"
+ },
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2022-10-09T08:55:40+00:00"
+ },
+ {
+ "name": "symfony/mime",
+ "version": "v6.2.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/mime.git",
+ "reference": "8c98bf40406e791043890a163f6f6599b9cfa1ed"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/mime/zipball/8c98bf40406e791043890a163f6f6599b9cfa1ed",
+ "reference": "8c98bf40406e791043890a163f6f6599b9cfa1ed",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=8.1",
+ "symfony/polyfill-intl-idn": "^1.10",
+ "symfony/polyfill-mbstring": "^1.0"
+ },
+ "conflict": {
+ "egulias/email-validator": "~3.0.0",
+ "phpdocumentor/reflection-docblock": "<3.2.2",
+ "phpdocumentor/type-resolver": "<1.4.0",
+ "symfony/mailer": "<5.4",
+ "symfony/serializer": "<6.2"
+ },
+ "require-dev": {
+ "egulias/email-validator": "^2.1.10|^3.1",
+ "league/html-to-markdown": "^5.0",
+ "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
+ "symfony/dependency-injection": "^5.4|^6.0",
+ "symfony/property-access": "^5.4|^6.0",
+ "symfony/property-info": "^5.4|^6.0",
+ "symfony/serializer": "^6.2"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\Mime\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -5588,24 +6206,22 @@
],
"authors": [
{
- "name": "Gert de Pagter",
- "email": "BackEndTea@gmail.com"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony polyfill for ctype functions",
+ "description": "Allows manipulating MIME messages",
"homepage": "https://symfony.com",
"keywords": [
- "compatibility",
- "ctype",
- "polyfill",
- "portable"
+ "mime",
+ "mime-type"
],
"support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0"
+ "source": "https://github.com/symfony/mime/tree/v6.2.2"
},
"funding": [
{
@@ -5621,35 +6237,35 @@
"type": "tidelift"
}
],
- "time": "2022-05-24T11:49:31+00:00"
+ "time": "2022-12-14T16:38:10+00:00"
},
{
- "name": "symfony/polyfill-iconv",
- "version": "v1.26.0",
+ "name": "symfony/polyfill-ctype",
+ "version": "v1.27.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/polyfill-iconv.git",
- "reference": "143f1881e655bebca1312722af8068de235ae5dc"
+ "url": "https://github.com/symfony/polyfill-ctype.git",
+ "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/143f1881e655bebca1312722af8068de235ae5dc",
- "reference": "143f1881e655bebca1312722af8068de235ae5dc",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
+ "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
"provide": {
- "ext-iconv": "*"
+ "ext-ctype": "*"
},
"suggest": {
- "ext-iconv": "For best performance"
+ "ext-ctype": "For best performance"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.26-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -5661,7 +6277,7 @@
"bootstrap.php"
],
"psr-4": {
- "Symfony\\Polyfill\\Iconv\\": ""
+ "Symfony\\Polyfill\\Ctype\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -5670,25 +6286,24 @@
],
"authors": [
{
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
+ "name": "Gert de Pagter",
+ "email": "BackEndTea@gmail.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony polyfill for the Iconv extension",
+ "description": "Symfony polyfill for ctype functions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
- "iconv",
+ "ctype",
"polyfill",
- "portable",
- "shim"
+ "portable"
],
"support": {
- "source": "https://github.com/symfony/polyfill-iconv/tree/v1.26.0"
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
},
"funding": [
{
@@ -5704,20 +6319,20 @@
"type": "tidelift"
}
],
- "time": "2022-05-24T11:49:31+00:00"
+ "time": "2022-11-03T14:55:06+00:00"
},
{
"name": "symfony/polyfill-intl-grapheme",
- "version": "v1.26.0",
+ "version": "v1.27.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
- "reference": "433d05519ce6990bf3530fba6957499d327395c2"
+ "reference": "511a08c03c1960e08a883f4cffcacd219b758354"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2",
- "reference": "433d05519ce6990bf3530fba6957499d327395c2",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354",
+ "reference": "511a08c03c1960e08a883f4cffcacd219b758354",
"shasum": ""
},
"require": {
@@ -5729,7 +6344,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.26-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -5769,7 +6384,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0"
+ "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0"
},
"funding": [
{
@@ -5785,20 +6400,20 @@
"type": "tidelift"
}
],
- "time": "2022-05-24T11:49:31+00:00"
+ "time": "2022-11-03T14:55:06+00:00"
},
{
"name": "symfony/polyfill-intl-idn",
- "version": "v1.26.0",
+ "version": "v1.27.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
- "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8"
+ "reference": "639084e360537a19f9ee352433b84ce831f3d2da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8",
- "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da",
+ "reference": "639084e360537a19f9ee352433b84ce831f3d2da",
"shasum": ""
},
"require": {
@@ -5812,7 +6427,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.26-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -5856,7 +6471,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.26.0"
+ "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.27.0"
},
"funding": [
{
@@ -5872,20 +6487,20 @@
"type": "tidelift"
}
],
- "time": "2022-05-24T11:49:31+00:00"
+ "time": "2022-11-03T14:55:06+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
- "version": "v1.26.0",
+ "version": "v1.27.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
- "reference": "219aa369ceff116e673852dce47c3a41794c14bd"
+ "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd",
- "reference": "219aa369ceff116e673852dce47c3a41794c14bd",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6",
+ "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6",
"shasum": ""
},
"require": {
@@ -5897,7 +6512,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.26-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -5940,7 +6555,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0"
+ "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0"
},
"funding": [
{
@@ -5956,20 +6571,20 @@
"type": "tidelift"
}
],
- "time": "2022-05-24T11:49:31+00:00"
+ "time": "2022-11-03T14:55:06+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.26.0",
+ "version": "v1.27.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"
+ "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
- "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
+ "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
"shasum": ""
},
"require": {
@@ -5984,7 +6599,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.26-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -6023,7 +6638,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
},
"funding": [
{
@@ -6039,20 +6654,20 @@
"type": "tidelift"
}
],
- "time": "2022-05-24T11:49:31+00:00"
+ "time": "2022-11-03T14:55:06+00:00"
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.26.0",
+ "version": "v1.27.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2"
+ "reference": "869329b1e9894268a8a61dabb69153029b7a8c97"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2",
- "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97",
+ "reference": "869329b1e9894268a8a61dabb69153029b7a8c97",
"shasum": ""
},
"require": {
@@ -6061,7 +6676,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.26-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -6099,7 +6714,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php72/tree/v1.26.0"
+ "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0"
},
"funding": [
{
@@ -6115,99 +6730,20 @@
"type": "tidelift"
}
],
- "time": "2022-05-24T11:49:31+00:00"
- },
- {
- "name": "symfony/polyfill-php73",
- "version": "v1.26.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php73.git",
- "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85",
- "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "1.26-dev"
- },
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- },
- "autoload": {
- "files": [
- "bootstrap.php"
- ],
- "psr-4": {
- "Symfony\\Polyfill\\Php73\\": ""
- },
- "classmap": [
- "Resources/stubs"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "support": {
- "source": "https://github.com/symfony/polyfill-php73/tree/v1.26.0"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2022-05-24T11:49:31+00:00"
+ "time": "2022-11-03T14:55:06+00:00"
},
{
"name": "symfony/polyfill-php80",
- "version": "v1.26.0",
+ "version": "v1.27.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace"
+ "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace",
- "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace",
+ "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
+ "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
"shasum": ""
},
"require": {
@@ -6216,7 +6752,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.26-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -6261,7 +6797,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0"
+ "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0"
},
"funding": [
{
@@ -6277,29 +6813,35 @@
"type": "tidelift"
}
],
- "time": "2022-05-10T07:21:04+00:00"
+ "time": "2022-11-03T14:55:06+00:00"
},
{
- "name": "symfony/polyfill-php81",
- "version": "v1.26.0",
+ "name": "symfony/polyfill-uuid",
+ "version": "v1.27.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/polyfill-php81.git",
- "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1"
+ "url": "https://github.com/symfony/polyfill-uuid.git",
+ "reference": "f3cf1a645c2734236ed1e2e671e273eeb3586166"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1",
- "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1",
+ "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/f3cf1a645c2734236ed1e2e671e273eeb3586166",
+ "reference": "f3cf1a645c2734236ed1e2e671e273eeb3586166",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
+ "provide": {
+ "ext-uuid": "*"
+ },
+ "suggest": {
+ "ext-uuid": "For best performance"
+ },
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.26-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -6311,11 +6853,8 @@
"bootstrap.php"
],
"psr-4": {
- "Symfony\\Polyfill\\Php81\\": ""
- },
- "classmap": [
- "Resources/stubs"
- ]
+ "Symfony\\Polyfill\\Uuid\\": ""
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -6323,24 +6862,24 @@
],
"authors": [
{
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
+ "name": "GrƩgoire Pineau",
+ "email": "lyrixx@lyrixx.info"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
+ "description": "Symfony polyfill for uuid functions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"polyfill",
"portable",
- "shim"
+ "uuid"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0"
+ "source": "https://github.com/symfony/polyfill-uuid/tree/v1.27.0"
},
"funding": [
{
@@ -6356,25 +6895,24 @@
"type": "tidelift"
}
],
- "time": "2022-05-24T11:49:31+00:00"
+ "time": "2022-11-03T14:55:06+00:00"
},
{
"name": "symfony/process",
- "version": "v5.4.11",
+ "version": "v6.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "6e75fe6874cbc7e4773d049616ab450eff537bf1"
+ "reference": "ba6e55359f8f755fe996c58a81e00eaa67a35877"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/6e75fe6874cbc7e4773d049616ab450eff537bf1",
- "reference": "6e75fe6874cbc7e4773d049616ab450eff537bf1",
+ "url": "https://api.github.com/repos/symfony/process/zipball/ba6e55359f8f755fe996c58a81e00eaa67a35877",
+ "reference": "ba6e55359f8f755fe996c58a81e00eaa67a35877",
"shasum": ""
},
"require": {
- "php": ">=7.2.5",
- "symfony/polyfill-php80": "^1.16"
+ "php": ">=8.1"
},
"type": "library",
"autoload": {
@@ -6402,7 +6940,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v5.4.11"
+ "source": "https://github.com/symfony/process/tree/v6.2.0"
},
"funding": [
{
@@ -6418,41 +6956,39 @@
"type": "tidelift"
}
],
- "time": "2022-06-27T16:58:25+00:00"
+ "time": "2022-11-02T09:08:04+00:00"
},
{
"name": "symfony/routing",
- "version": "v5.4.11",
+ "version": "v6.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "3e01ccd9b2a3a4167ba2b3c53612762300300226"
+ "reference": "35fec764f3e2c8c08fb340d275c84bc78ca7e0c9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/3e01ccd9b2a3a4167ba2b3c53612762300300226",
- "reference": "3e01ccd9b2a3a4167ba2b3c53612762300300226",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/35fec764f3e2c8c08fb340d275c84bc78ca7e0c9",
+ "reference": "35fec764f3e2c8c08fb340d275c84bc78ca7e0c9",
"shasum": ""
},
"require": {
- "php": ">=7.2.5",
- "symfony/deprecation-contracts": "^2.1|^3",
- "symfony/polyfill-php80": "^1.16"
+ "php": ">=8.1"
},
"conflict": {
"doctrine/annotations": "<1.12",
- "symfony/config": "<5.3",
- "symfony/dependency-injection": "<4.4",
- "symfony/yaml": "<4.4"
+ "symfony/config": "<6.2",
+ "symfony/dependency-injection": "<5.4",
+ "symfony/yaml": "<5.4"
},
"require-dev": {
- "doctrine/annotations": "^1.12",
+ "doctrine/annotations": "^1.12|^2",
"psr/log": "^1|^2|^3",
- "symfony/config": "^5.3|^6.0",
- "symfony/dependency-injection": "^4.4|^5.0|^6.0",
- "symfony/expression-language": "^4.4|^5.0|^6.0",
- "symfony/http-foundation": "^4.4|^5.0|^6.0",
- "symfony/yaml": "^4.4|^5.0|^6.0"
+ "symfony/config": "^6.2",
+ "symfony/dependency-injection": "^5.4|^6.0",
+ "symfony/expression-language": "^5.4|^6.0",
+ "symfony/http-foundation": "^5.4|^6.0",
+ "symfony/yaml": "^5.4|^6.0"
},
"suggest": {
"symfony/config": "For using the all-in-one router or any loader",
@@ -6492,7 +7028,7 @@
"url"
],
"support": {
- "source": "https://github.com/symfony/routing/tree/v5.4.11"
+ "source": "https://github.com/symfony/routing/tree/v6.2.3"
},
"funding": [
{
@@ -6508,26 +7044,25 @@
"type": "tidelift"
}
],
- "time": "2022-07-20T13:00:38+00:00"
+ "time": "2022-12-20T16:41:15+00:00"
},
{
"name": "symfony/service-contracts",
- "version": "v2.5.2",
+ "version": "v3.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
+ "reference": "aac98028c69df04ee77eb69b96b86ee51fbf4b75"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
- "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/aac98028c69df04ee77eb69b96b86ee51fbf4b75",
+ "reference": "aac98028c69df04ee77eb69b96b86ee51fbf4b75",
"shasum": ""
},
"require": {
- "php": ">=7.2.5",
- "psr/container": "^1.1",
- "symfony/deprecation-contracts": "^2.1|^3"
+ "php": ">=8.1",
+ "psr/container": "^2.0"
},
"conflict": {
"ext-psr": "<1.1|>=2"
@@ -6538,7 +7073,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "2.5-dev"
+ "dev-main": "3.3-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -6548,7 +7083,10 @@
"autoload": {
"psr-4": {
"Symfony\\Contracts\\Service\\": ""
- }
+ },
+ "exclude-from-classmap": [
+ "/Test/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -6575,7 +7113,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/service-contracts/tree/v2.5.2"
+ "source": "https://github.com/symfony/service-contracts/tree/v3.2.0"
},
"funding": [
{
@@ -6591,24 +7129,24 @@
"type": "tidelift"
}
],
- "time": "2022-05-30T19:17:29+00:00"
+ "time": "2022-11-25T10:21:52+00:00"
},
{
"name": "symfony/string",
- "version": "v6.0.11",
+ "version": "v6.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "042b6bf0f6ccca6d456a0572eb788cfb8b1ff809"
+ "reference": "863219fd713fa41cbcd285a79723f94672faff4d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/042b6bf0f6ccca6d456a0572eb788cfb8b1ff809",
- "reference": "042b6bf0f6ccca6d456a0572eb788cfb8b1ff809",
+ "url": "https://api.github.com/repos/symfony/string/zipball/863219fd713fa41cbcd285a79723f94672faff4d",
+ "reference": "863219fd713fa41cbcd285a79723f94672faff4d",
"shasum": ""
},
"require": {
- "php": ">=8.0.2",
+ "php": ">=8.1",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-intl-grapheme": "~1.0",
"symfony/polyfill-intl-normalizer": "~1.0",
@@ -6620,6 +7158,7 @@
"require-dev": {
"symfony/error-handler": "^5.4|^6.0",
"symfony/http-client": "^5.4|^6.0",
+ "symfony/intl": "^6.2",
"symfony/translation-contracts": "^2.0|^3.0",
"symfony/var-exporter": "^5.4|^6.0"
},
@@ -6660,7 +7199,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v6.0.11"
+ "source": "https://github.com/symfony/string/tree/v6.2.2"
},
"funding": [
{
@@ -6676,24 +7215,24 @@
"type": "tidelift"
}
],
- "time": "2022-07-27T15:50:26+00:00"
+ "time": "2022-12-14T16:11:27+00:00"
},
{
"name": "symfony/translation",
- "version": "v6.0.11",
+ "version": "v6.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "55ffbe4b690156100af1ae42e1f94c5873085bca"
+ "reference": "a2a15404ef4c15d92c205718eb828b225a144379"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/55ffbe4b690156100af1ae42e1f94c5873085bca",
- "reference": "55ffbe4b690156100af1ae42e1f94c5873085bca",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/a2a15404ef4c15d92c205718eb828b225a144379",
+ "reference": "a2a15404ef4c15d92c205718eb828b225a144379",
"shasum": ""
},
"require": {
- "php": ">=8.0.2",
+ "php": ">=8.1",
"symfony/polyfill-mbstring": "~1.0",
"symfony/translation-contracts": "^2.3|^3.0"
},
@@ -6709,6 +7248,7 @@
"symfony/translation-implementation": "2.3|3.0"
},
"require-dev": {
+ "nikic/php-parser": "^4.13",
"psr/log": "^1|^2|^3",
"symfony/config": "^5.4|^6.0",
"symfony/console": "^5.4|^6.0",
@@ -6718,10 +7258,12 @@
"symfony/http-kernel": "^5.4|^6.0",
"symfony/intl": "^5.4|^6.0",
"symfony/polyfill-intl-icu": "^1.21",
+ "symfony/routing": "^5.4|^6.0",
"symfony/service-contracts": "^1.1.2|^2|^3",
"symfony/yaml": "^5.4|^6.0"
},
"suggest": {
+ "nikic/php-parser": "To use PhpAstExtractor",
"psr/log-implementation": "To use logging capability in translator",
"symfony/config": "",
"symfony/yaml": ""
@@ -6755,7 +7297,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/translation/tree/v6.0.11"
+ "source": "https://github.com/symfony/translation/tree/v6.2.3"
},
"funding": [
{
@@ -6771,24 +7313,24 @@
"type": "tidelift"
}
],
- "time": "2022-07-20T13:45:53+00:00"
+ "time": "2022-12-23T14:11:11+00:00"
},
{
"name": "symfony/translation-contracts",
- "version": "v3.0.2",
+ "version": "v3.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation-contracts.git",
- "reference": "acbfbb274e730e5a0236f619b6168d9dedb3e282"
+ "reference": "68cce71402305a015f8c1589bfada1280dc64fe7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/acbfbb274e730e5a0236f619b6168d9dedb3e282",
- "reference": "acbfbb274e730e5a0236f619b6168d9dedb3e282",
+ "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/68cce71402305a015f8c1589bfada1280dc64fe7",
+ "reference": "68cce71402305a015f8c1589bfada1280dc64fe7",
"shasum": ""
},
"require": {
- "php": ">=8.0.2"
+ "php": ">=8.1"
},
"suggest": {
"symfony/translation-implementation": ""
@@ -6796,7 +7338,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.0-dev"
+ "dev-main": "3.3-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -6806,7 +7348,10 @@
"autoload": {
"psr-4": {
"Symfony\\Contracts\\Translation\\": ""
- }
+ },
+ "exclude-from-classmap": [
+ "/Test/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -6833,7 +7378,81 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/translation-contracts/tree/v3.0.2"
+ "source": "https://github.com/symfony/translation-contracts/tree/v3.2.0"
+ },
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2022-11-25T10:21:52+00:00"
+ },
+ {
+ "name": "symfony/uid",
+ "version": "v6.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/uid.git",
+ "reference": "4f9f537e57261519808a7ce1d941490736522bbc"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/uid/zipball/4f9f537e57261519808a7ce1d941490736522bbc",
+ "reference": "4f9f537e57261519808a7ce1d941490736522bbc",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=8.1",
+ "symfony/polyfill-uuid": "^1.15"
+ },
+ "require-dev": {
+ "symfony/console": "^5.4|^6.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\Uid\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "GrƩgoire Pineau",
+ "email": "lyrixx@lyrixx.info"
+ },
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Provides an object-oriented API to generate and represent UIDs",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "UID",
+ "ulid",
+ "uuid"
+ ],
+ "support": {
+ "source": "https://github.com/symfony/uid/tree/v6.2.0"
},
"funding": [
{
@@ -6849,36 +7468,35 @@
"type": "tidelift"
}
],
- "time": "2022-06-27T17:10:44+00:00"
+ "time": "2022-10-09T08:55:40+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v5.4.11",
+ "version": "v6.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "b8f306d7b8ef34fb3db3305be97ba8e088fb4861"
+ "reference": "fdbadd4803bc3c96ef89238c9c9e2ebe424ec2e0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b8f306d7b8ef34fb3db3305be97ba8e088fb4861",
- "reference": "b8f306d7b8ef34fb3db3305be97ba8e088fb4861",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/fdbadd4803bc3c96ef89238c9c9e2ebe424ec2e0",
+ "reference": "fdbadd4803bc3c96ef89238c9c9e2ebe424ec2e0",
"shasum": ""
},
"require": {
- "php": ">=7.2.5",
- "symfony/polyfill-mbstring": "~1.0",
- "symfony/polyfill-php80": "^1.16"
+ "php": ">=8.1",
+ "symfony/polyfill-mbstring": "~1.0"
},
"conflict": {
"phpunit/phpunit": "<5.4.3",
- "symfony/console": "<4.4"
+ "symfony/console": "<5.4"
},
"require-dev": {
"ext-iconv": "*",
- "symfony/console": "^4.4|^5.0|^6.0",
- "symfony/process": "^4.4|^5.0|^6.0",
- "symfony/uid": "^5.1|^6.0",
+ "symfony/console": "^5.4|^6.0",
+ "symfony/process": "^5.4|^6.0",
+ "symfony/uid": "^5.4|^6.0",
"twig/twig": "^2.13|^3.0.4"
},
"suggest": {
@@ -6922,7 +7540,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v5.4.11"
+ "source": "https://github.com/symfony/var-dumper/tree/v6.2.3"
},
"funding": [
{
@@ -6938,20 +7556,20 @@
"type": "tidelift"
}
],
- "time": "2022-07-20T13:00:38+00:00"
+ "time": "2022-12-22T17:55:15+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
- "version": "2.2.4",
+ "version": "2.2.6",
"source": {
"type": "git",
"url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",
- "reference": "da444caae6aca7a19c0c140f68c6182e337d5b1c"
+ "reference": "c42125b83a4fa63b187fdf29f9c93cb7733da30c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/da444caae6aca7a19c0c140f68c6182e337d5b1c",
- "reference": "da444caae6aca7a19c0c140f68c6182e337d5b1c",
+ "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/c42125b83a4fa63b187fdf29f9c93cb7733da30c",
+ "reference": "c42125b83a4fa63b187fdf29f9c93cb7733da30c",
"shasum": ""
},
"require": {
@@ -6989,22 +7607,22 @@
"homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
"support": {
"issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues",
- "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.4"
+ "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.6"
},
- "time": "2021-12-08T09:12:39+00:00"
+ "time": "2023-01-03T09:29:04+00:00"
},
{
"name": "vlucas/phpdotenv",
- "version": "v5.4.1",
+ "version": "v5.5.0",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
- "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f"
+ "reference": "1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/264dce589e7ce37a7ba99cb901eed8249fbec92f",
- "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f",
+ "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7",
+ "reference": "1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7",
"shasum": ""
},
"require": {
@@ -7019,15 +7637,19 @@
"require-dev": {
"bamarni/composer-bin-plugin": "^1.4.1",
"ext-filter": "*",
- "phpunit/phpunit": "^7.5.20 || ^8.5.21 || ^9.5.10"
+ "phpunit/phpunit": "^7.5.20 || ^8.5.30 || ^9.5.25"
},
"suggest": {
"ext-filter": "Required to use the boolean validator."
},
"type": "library",
"extra": {
+ "bamarni-bin": {
+ "bin-links": true,
+ "forward-command": true
+ },
"branch-alias": {
- "dev-master": "5.4-dev"
+ "dev-master": "5.5-dev"
}
},
"autoload": {
@@ -7059,7 +7681,7 @@
],
"support": {
"issues": "https://github.com/vlucas/phpdotenv/issues",
- "source": "https://github.com/vlucas/phpdotenv/tree/v5.4.1"
+ "source": "https://github.com/vlucas/phpdotenv/tree/v5.5.0"
},
"funding": [
{
@@ -7071,20 +7693,20 @@
"type": "tidelift"
}
],
- "time": "2021-12-12T23:22:04+00:00"
+ "time": "2022-10-16T01:01:54+00:00"
},
{
"name": "voku/portable-ascii",
- "version": "1.6.1",
+ "version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/voku/portable-ascii.git",
- "reference": "87337c91b9dfacee02452244ee14ab3c43bc485a"
+ "reference": "b56450eed252f6801410d810c8e1727224ae0743"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/voku/portable-ascii/zipball/87337c91b9dfacee02452244ee14ab3c43bc485a",
- "reference": "87337c91b9dfacee02452244ee14ab3c43bc485a",
+ "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b56450eed252f6801410d810c8e1727224ae0743",
+ "reference": "b56450eed252f6801410d810c8e1727224ae0743",
"shasum": ""
},
"require": {
@@ -7121,7 +7743,7 @@
],
"support": {
"issues": "https://github.com/voku/portable-ascii/issues",
- "source": "https://github.com/voku/portable-ascii/tree/1.6.1"
+ "source": "https://github.com/voku/portable-ascii/tree/2.0.1"
},
"funding": [
{
@@ -7145,7 +7767,7 @@
"type": "tidelift"
}
],
- "time": "2022-01-24T18:55:24+00:00"
+ "time": "2022-03-08T17:03:00+00:00"
},
{
"name": "webmozart/assert",
@@ -7318,246 +7940,19 @@
"mockery/mockery": "^1.3.3",
"orchestra/testbench-dusk": "^5|^6|^7",
"phpunit/phpunit": "^8.5|^9.0",
- "squizlabs/php_codesniffer": "^3.5"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.6-dev"
- },
- "laravel": {
- "providers": [
- "Barryvdh\\Debugbar\\ServiceProvider"
- ],
- "aliases": {
- "Debugbar": "Barryvdh\\Debugbar\\Facades\\Debugbar"
- }
- }
- },
- "autoload": {
- "files": [
- "src/helpers.php"
- ],
- "psr-4": {
- "Barryvdh\\Debugbar\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Barry vd. Heuvel",
- "email": "barryvdh@gmail.com"
- }
- ],
- "description": "PHP Debugbar integration for Laravel",
- "keywords": [
- "debug",
- "debugbar",
- "laravel",
- "profiler",
- "webprofiler"
- ],
- "support": {
- "issues": "https://github.com/barryvdh/laravel-debugbar/issues",
- "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.7.0"
- },
- "funding": [
- {
- "url": "https://fruitcake.nl",
- "type": "custom"
- },
- {
- "url": "https://github.com/barryvdh",
- "type": "github"
- }
- ],
- "time": "2022-07-11T09:26:42+00:00"
- },
- {
- "name": "doctrine/instantiator",
- "version": "1.4.1",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/instantiator.git",
- "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
- "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
- "shasum": ""
- },
- "require": {
- "php": "^7.1 || ^8.0"
- },
- "require-dev": {
- "doctrine/coding-standard": "^9",
- "ext-pdo": "*",
- "ext-phar": "*",
- "phpbench/phpbench": "^0.16 || ^1",
- "phpstan/phpstan": "^1.4",
- "phpstan/phpstan-phpunit": "^1",
- "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
- "vimeo/psalm": "^4.22"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Marco Pivetta",
- "email": "ocramius@gmail.com",
- "homepage": "https://ocramius.github.io/"
- }
- ],
- "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
- "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
- "keywords": [
- "constructor",
- "instantiate"
- ],
- "support": {
- "issues": "https://github.com/doctrine/instantiator/issues",
- "source": "https://github.com/doctrine/instantiator/tree/1.4.1"
- },
- "funding": [
- {
- "url": "https://www.doctrine-project.org/sponsorship.html",
- "type": "custom"
- },
- {
- "url": "https://www.patreon.com/phpdoctrine",
- "type": "patreon"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
- "type": "tidelift"
- }
- ],
- "time": "2022-03-03T08:28:38+00:00"
- },
- {
- "name": "facade/flare-client-php",
- "version": "1.9.1",
- "source": {
- "type": "git",
- "url": "https://github.com/facade/flare-client-php.git",
- "reference": "b2adf1512755637d0cef4f7d1b54301325ac78ed"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/facade/flare-client-php/zipball/b2adf1512755637d0cef4f7d1b54301325ac78ed",
- "reference": "b2adf1512755637d0cef4f7d1b54301325ac78ed",
- "shasum": ""
- },
- "require": {
- "facade/ignition-contracts": "~1.0",
- "illuminate/pipeline": "^5.5|^6.0|^7.0|^8.0",
- "php": "^7.1|^8.0",
- "symfony/http-foundation": "^3.3|^4.1|^5.0",
- "symfony/mime": "^3.4|^4.0|^5.1",
- "symfony/var-dumper": "^3.4|^4.0|^5.0"
- },
- "require-dev": {
- "friendsofphp/php-cs-fixer": "^2.14",
- "phpunit/phpunit": "^7.5.16",
- "spatie/phpunit-snapshot-assertions": "^2.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0-dev"
- }
- },
- "autoload": {
- "files": [
- "src/helpers.php"
- ],
- "psr-4": {
- "Facade\\FlareClient\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "description": "Send PHP errors to Flare",
- "homepage": "https://github.com/facade/flare-client-php",
- "keywords": [
- "exception",
- "facade",
- "flare",
- "reporting"
- ],
- "support": {
- "issues": "https://github.com/facade/flare-client-php/issues",
- "source": "https://github.com/facade/flare-client-php/tree/1.9.1"
- },
- "funding": [
- {
- "url": "https://github.com/spatie",
- "type": "github"
- }
- ],
- "time": "2021-09-13T12:16:46+00:00"
- },
- {
- "name": "facade/ignition",
- "version": "2.17.6",
- "source": {
- "type": "git",
- "url": "https://github.com/facade/ignition.git",
- "reference": "6acd82e986a2ecee89e2e68adfc30a1936d1ab7c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/facade/ignition/zipball/6acd82e986a2ecee89e2e68adfc30a1936d1ab7c",
- "reference": "6acd82e986a2ecee89e2e68adfc30a1936d1ab7c",
- "shasum": ""
- },
- "require": {
- "ext-curl": "*",
- "ext-json": "*",
- "ext-mbstring": "*",
- "facade/flare-client-php": "^1.9.1",
- "facade/ignition-contracts": "^1.0.2",
- "illuminate/support": "^7.0|^8.0",
- "monolog/monolog": "^2.0",
- "php": "^7.2.5|^8.0",
- "symfony/console": "^5.0",
- "symfony/var-dumper": "^5.0"
- },
- "require-dev": {
- "friendsofphp/php-cs-fixer": "^2.14",
- "livewire/livewire": "^2.4",
- "mockery/mockery": "^1.3",
- "orchestra/testbench": "^5.0|^6.0",
- "psalm/plugin-laravel": "^1.2"
- },
- "suggest": {
- "laravel/telescope": "^3.1"
+ "squizlabs/php_codesniffer": "^3.5"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.x-dev"
+ "dev-master": "3.6-dev"
},
"laravel": {
"providers": [
- "Facade\\Ignition\\IgnitionServiceProvider"
+ "Barryvdh\\Debugbar\\ServiceProvider"
],
"aliases": {
- "Flare": "Facade\\Ignition\\Facades\\Flare"
+ "Debugbar": "Barryvdh\\Debugbar\\Facades\\Debugbar"
}
}
},
@@ -7566,55 +7961,74 @@
"src/helpers.php"
],
"psr-4": {
- "Facade\\Ignition\\": "src"
+ "Barryvdh\\Debugbar\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
- "description": "A beautiful error page for Laravel applications.",
- "homepage": "https://github.com/facade/ignition",
+ "authors": [
+ {
+ "name": "Barry vd. Heuvel",
+ "email": "barryvdh@gmail.com"
+ }
+ ],
+ "description": "PHP Debugbar integration for Laravel",
"keywords": [
- "error",
- "flare",
+ "debug",
+ "debugbar",
"laravel",
- "page"
+ "profiler",
+ "webprofiler"
],
"support": {
- "docs": "https://flareapp.io/docs/ignition-for-laravel/introduction",
- "forum": "https://twitter.com/flareappio",
- "issues": "https://github.com/facade/ignition/issues",
- "source": "https://github.com/facade/ignition"
+ "issues": "https://github.com/barryvdh/laravel-debugbar/issues",
+ "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.7.0"
},
- "time": "2022-06-30T18:26:59+00:00"
+ "funding": [
+ {
+ "url": "https://fruitcake.nl",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/barryvdh",
+ "type": "github"
+ }
+ ],
+ "time": "2022-07-11T09:26:42+00:00"
},
{
- "name": "facade/ignition-contracts",
- "version": "1.0.2",
+ "name": "doctrine/instantiator",
+ "version": "1.5.0",
"source": {
"type": "git",
- "url": "https://github.com/facade/ignition-contracts.git",
- "reference": "3c921a1cdba35b68a7f0ccffc6dffc1995b18267"
+ "url": "https://github.com/doctrine/instantiator.git",
+ "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/3c921a1cdba35b68a7f0ccffc6dffc1995b18267",
- "reference": "3c921a1cdba35b68a7f0ccffc6dffc1995b18267",
+ "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
+ "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
"shasum": ""
},
"require": {
- "php": "^7.3|^8.0"
+ "php": "^7.1 || ^8.0"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "^v2.15.8",
- "phpunit/phpunit": "^9.3.11",
- "vimeo/psalm": "^3.17.1"
+ "doctrine/coding-standard": "^9 || ^11",
+ "ext-pdo": "*",
+ "ext-phar": "*",
+ "phpbench/phpbench": "^0.16 || ^1",
+ "phpstan/phpstan": "^1.4",
+ "phpstan/phpstan-phpunit": "^1",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+ "vimeo/psalm": "^4.30 || ^5.4"
},
"type": "library",
"autoload": {
"psr-4": {
- "Facade\\IgnitionContracts\\": "src"
+ "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -7623,41 +8037,53 @@
],
"authors": [
{
- "name": "Freek Van der Herten",
- "email": "freek@spatie.be",
- "homepage": "https://flareapp.io",
- "role": "Developer"
+ "name": "Marco Pivetta",
+ "email": "ocramius@gmail.com",
+ "homepage": "https://ocramius.github.io/"
}
],
- "description": "Solution contracts for Ignition",
- "homepage": "https://github.com/facade/ignition-contracts",
+ "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+ "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
"keywords": [
- "contracts",
- "flare",
- "ignition"
+ "constructor",
+ "instantiate"
],
"support": {
- "issues": "https://github.com/facade/ignition-contracts/issues",
- "source": "https://github.com/facade/ignition-contracts/tree/1.0.2"
+ "issues": "https://github.com/doctrine/instantiator/issues",
+ "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
},
- "time": "2020-10-16T08:27:54+00:00"
+ "funding": [
+ {
+ "url": "https://www.doctrine-project.org/sponsorship.html",
+ "type": "custom"
+ },
+ {
+ "url": "https://www.patreon.com/phpdoctrine",
+ "type": "patreon"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2022-12-30T00:15:36+00:00"
},
{
"name": "fakerphp/faker",
- "version": "v1.20.0",
+ "version": "v1.21.0",
"source": {
"type": "git",
"url": "https://github.com/FakerPHP/Faker.git",
- "reference": "37f751c67a5372d4e26353bd9384bc03744ec77b"
+ "reference": "92efad6a967f0b79c499705c69b662f738cc9e4d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/37f751c67a5372d4e26353bd9384bc03744ec77b",
- "reference": "37f751c67a5372d4e26353bd9384bc03744ec77b",
+ "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/92efad6a967f0b79c499705c69b662f738cc9e4d",
+ "reference": "92efad6a967f0b79c499705c69b662f738cc9e4d",
"shasum": ""
},
"require": {
- "php": "^7.1 || ^8.0",
+ "php": "^7.4 || ^8.0",
"psr/container": "^1.0 || ^2.0",
"symfony/deprecation-contracts": "^2.2 || ^3.0"
},
@@ -7668,7 +8094,8 @@
"bamarni/composer-bin-plugin": "^1.4.1",
"doctrine/persistence": "^1.3 || ^2.0",
"ext-intl": "*",
- "symfony/phpunit-bridge": "^4.4 || ^5.2"
+ "phpunit/phpunit": "^9.5.26",
+ "symfony/phpunit-bridge": "^5.4.16"
},
"suggest": {
"doctrine/orm": "Required to use Faker\\ORM\\Doctrine",
@@ -7680,7 +8107,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "v1.20-dev"
+ "dev-main": "v1.21-dev"
}
},
"autoload": {
@@ -7705,22 +8132,22 @@
],
"support": {
"issues": "https://github.com/FakerPHP/Faker/issues",
- "source": "https://github.com/FakerPHP/Faker/tree/v1.20.0"
+ "source": "https://github.com/FakerPHP/Faker/tree/v1.21.0"
},
- "time": "2022-07-20T13:12:54+00:00"
+ "time": "2022-12-13T13:54:32+00:00"
},
{
"name": "filp/whoops",
- "version": "2.14.5",
+ "version": "2.14.6",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
- "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc"
+ "reference": "f7948baaa0330277c729714910336383286305da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/filp/whoops/zipball/a63e5e8f26ebbebf8ed3c5c691637325512eb0dc",
- "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc",
+ "url": "https://api.github.com/repos/filp/whoops/zipball/f7948baaa0330277c729714910336383286305da",
+ "reference": "f7948baaa0330277c729714910336383286305da",
"shasum": ""
},
"require": {
@@ -7770,7 +8197,7 @@
],
"support": {
"issues": "https://github.com/filp/whoops/issues",
- "source": "https://github.com/filp/whoops/tree/2.14.5"
+ "source": "https://github.com/filp/whoops/tree/2.14.6"
},
"funding": [
{
@@ -7778,7 +8205,7 @@
"type": "github"
}
],
- "time": "2022-01-07T12:00:00+00:00"
+ "time": "2022-11-02T16:23:29+00:00"
},
{
"name": "hamcrest/hamcrest-php",
@@ -7833,16 +8260,16 @@
},
{
"name": "laravel/sail",
- "version": "v1.15.1",
+ "version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/sail.git",
- "reference": "2fe64c0b45a3af56cac0af638c8020a8adc860d7"
+ "reference": "7d69da7b2bdb8cbe8da6663eb2ae0e00c884bf80"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/sail/zipball/2fe64c0b45a3af56cac0af638c8020a8adc860d7",
- "reference": "2fe64c0b45a3af56cac0af638c8020a8adc860d7",
+ "url": "https://api.github.com/repos/laravel/sail/zipball/7d69da7b2bdb8cbe8da6663eb2ae0e00c884bf80",
+ "reference": "7d69da7b2bdb8cbe8da6663eb2ae0e00c884bf80",
"shasum": ""
},
"require": {
@@ -7889,20 +8316,20 @@
"issues": "https://github.com/laravel/sail/issues",
"source": "https://github.com/laravel/sail"
},
- "time": "2022-07-21T14:33:56+00:00"
+ "time": "2022-12-22T14:46:08+00:00"
},
{
"name": "maximebf/debugbar",
- "version": "v1.18.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/maximebf/php-debugbar.git",
- "reference": "0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6"
+ "reference": "ba0af68dd4316834701ecb30a00ce9604ced3ee9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6",
- "reference": "0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6",
+ "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/ba0af68dd4316834701ecb30a00ce9604ced3ee9",
+ "reference": "ba0af68dd4316834701ecb30a00ce9604ced3ee9",
"shasum": ""
},
"require": {
@@ -7922,7 +8349,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.17-dev"
+ "dev-master": "1.18-dev"
}
},
"autoload": {
@@ -7953,22 +8380,22 @@
],
"support": {
"issues": "https://github.com/maximebf/php-debugbar/issues",
- "source": "https://github.com/maximebf/php-debugbar/tree/v1.18.0"
+ "source": "https://github.com/maximebf/php-debugbar/tree/v1.18.1"
},
- "time": "2021-12-27T18:49:48+00:00"
+ "time": "2022-03-31T14:55:54+00:00"
},
{
"name": "mockery/mockery",
- "version": "1.5.0",
+ "version": "1.5.1",
"source": {
"type": "git",
"url": "https://github.com/mockery/mockery.git",
- "reference": "c10a5f6e06fc2470ab1822fa13fa2a7380f8fbac"
+ "reference": "e92dcc83d5a51851baf5f5591d32cb2b16e3684e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mockery/mockery/zipball/c10a5f6e06fc2470ab1822fa13fa2a7380f8fbac",
- "reference": "c10a5f6e06fc2470ab1822fa13fa2a7380f8fbac",
+ "url": "https://api.github.com/repos/mockery/mockery/zipball/e92dcc83d5a51851baf5f5591d32cb2b16e3684e",
+ "reference": "e92dcc83d5a51851baf5f5591d32cb2b16e3684e",
"shasum": ""
},
"require": {
@@ -8025,9 +8452,9 @@
],
"support": {
"issues": "https://github.com/mockery/mockery/issues",
- "source": "https://github.com/mockery/mockery/tree/1.5.0"
+ "source": "https://github.com/mockery/mockery/tree/1.5.1"
},
- "time": "2022-01-20T13:18:17+00:00"
+ "time": "2022-09-07T15:32:08+00:00"
},
{
"name": "myclabs/deep-copy",
@@ -8090,37 +8517,38 @@
},
{
"name": "nunomaduro/collision",
- "version": "v5.11.0",
+ "version": "v6.4.0",
"source": {
"type": "git",
"url": "https://github.com/nunomaduro/collision.git",
- "reference": "8b610eef8582ccdc05d8f2ab23305e2d37049461"
+ "reference": "f05978827b9343cba381ca05b8c7deee346b6015"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nunomaduro/collision/zipball/8b610eef8582ccdc05d8f2ab23305e2d37049461",
- "reference": "8b610eef8582ccdc05d8f2ab23305e2d37049461",
+ "url": "https://api.github.com/repos/nunomaduro/collision/zipball/f05978827b9343cba381ca05b8c7deee346b6015",
+ "reference": "f05978827b9343cba381ca05b8c7deee346b6015",
"shasum": ""
},
"require": {
- "facade/ignition-contracts": "^1.0",
- "filp/whoops": "^2.14.3",
- "php": "^7.3 || ^8.0",
- "symfony/console": "^5.0"
+ "filp/whoops": "^2.14.5",
+ "php": "^8.0.0",
+ "symfony/console": "^6.0.2"
},
"require-dev": {
- "brianium/paratest": "^6.1",
- "fideloper/proxy": "^4.4.1",
- "fruitcake/laravel-cors": "^2.0.3",
- "laravel/framework": "8.x-dev",
- "nunomaduro/larastan": "^0.6.2",
- "nunomaduro/mock-final-classes": "^1.0",
- "orchestra/testbench": "^6.0",
- "phpstan/phpstan": "^0.12.64",
- "phpunit/phpunit": "^9.5.0"
+ "brianium/paratest": "^6.4.1",
+ "laravel/framework": "^9.26.1",
+ "laravel/pint": "^1.1.1",
+ "nunomaduro/larastan": "^1.0.3",
+ "nunomaduro/mock-final-classes": "^1.1.0",
+ "orchestra/testbench": "^7.7",
+ "phpunit/phpunit": "^9.5.23",
+ "spatie/ignition": "^1.4.1"
},
"type": "library",
"extra": {
+ "branch-alias": {
+ "dev-develop": "6.x-dev"
+ },
"laravel": {
"providers": [
"NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider"
@@ -8173,7 +8601,7 @@
"type": "patreon"
}
],
- "time": "2022-01-10T16:22:52+00:00"
+ "time": "2023-01-03T12:54:54+00:00"
},
{
"name": "phar-io/manifest",
@@ -8233,305 +8661,78 @@
"issues": "https://github.com/phar-io/manifest/issues",
"source": "https://github.com/phar-io/manifest/tree/2.0.3"
},
- "time": "2021-07-20T11:28:43+00:00"
- },
- {
- "name": "phar-io/version",
- "version": "3.2.1",
- "source": {
- "type": "git",
- "url": "https://github.com/phar-io/version.git",
- "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
- "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
- "shasum": ""
- },
- "require": {
- "php": "^7.2 || ^8.0"
- },
- "type": "library",
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Arne Blankerts",
- "email": "arne@blankerts.de",
- "role": "Developer"
- },
- {
- "name": "Sebastian Heuer",
- "email": "sebastian@phpeople.de",
- "role": "Developer"
- },
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "Developer"
- }
- ],
- "description": "Library for handling version information and constraints",
- "support": {
- "issues": "https://github.com/phar-io/version/issues",
- "source": "https://github.com/phar-io/version/tree/3.2.1"
- },
- "time": "2022-02-21T01:04:05+00:00"
- },
- {
- "name": "phpdocumentor/reflection-common",
- "version": "2.2.0",
- "source": {
- "type": "git",
- "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
- "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
- "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
- "shasum": ""
- },
- "require": {
- "php": "^7.2 || ^8.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-2.x": "2.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "phpDocumentor\\Reflection\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jaap van Otterdijk",
- "email": "opensource@ijaap.nl"
- }
- ],
- "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
- "homepage": "http://www.phpdoc.org",
- "keywords": [
- "FQSEN",
- "phpDocumentor",
- "phpdoc",
- "reflection",
- "static analysis"
- ],
- "support": {
- "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
- "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
- },
- "time": "2020-06-27T09:03:43+00:00"
- },
- {
- "name": "phpdocumentor/reflection-docblock",
- "version": "5.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
- "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
- "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
- "shasum": ""
- },
- "require": {
- "ext-filter": "*",
- "php": "^7.2 || ^8.0",
- "phpdocumentor/reflection-common": "^2.2",
- "phpdocumentor/type-resolver": "^1.3",
- "webmozart/assert": "^1.9.1"
- },
- "require-dev": {
- "mockery/mockery": "~1.3.2",
- "psalm/phar": "^4.8"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "phpDocumentor\\Reflection\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Mike van Riel",
- "email": "me@mikevanriel.com"
- },
- {
- "name": "Jaap van Otterdijk",
- "email": "account@ijaap.nl"
- }
- ],
- "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
- "support": {
- "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
- "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
- },
- "time": "2021-10-19T17:43:47+00:00"
- },
- {
- "name": "phpdocumentor/type-resolver",
- "version": "1.6.1",
- "source": {
- "type": "git",
- "url": "https://github.com/phpDocumentor/TypeResolver.git",
- "reference": "77a32518733312af16a44300404e945338981de3"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
- "reference": "77a32518733312af16a44300404e945338981de3",
- "shasum": ""
- },
- "require": {
- "php": "^7.2 || ^8.0",
- "phpdocumentor/reflection-common": "^2.0"
- },
- "require-dev": {
- "ext-tokenizer": "*",
- "psalm/phar": "^4.8"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-1.x": "1.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "phpDocumentor\\Reflection\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Mike van Riel",
- "email": "me@mikevanriel.com"
- }
- ],
- "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
- "support": {
- "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
- "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1"
- },
- "time": "2022-03-15T21:29:03+00:00"
+ "time": "2021-07-20T11:28:43+00:00"
},
{
- "name": "phpspec/prophecy",
- "version": "v1.15.0",
+ "name": "phar-io/version",
+ "version": "3.2.1",
"source": {
"type": "git",
- "url": "https://github.com/phpspec/prophecy.git",
- "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
+ "url": "https://github.com/phar-io/version.git",
+ "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
- "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
+ "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+ "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
"shasum": ""
},
"require": {
- "doctrine/instantiator": "^1.2",
- "php": "^7.2 || ~8.0, <8.2",
- "phpdocumentor/reflection-docblock": "^5.2",
- "sebastian/comparator": "^3.0 || ^4.0",
- "sebastian/recursion-context": "^3.0 || ^4.0"
- },
- "require-dev": {
- "phpspec/phpspec": "^6.0 || ^7.0",
- "phpunit/phpunit": "^8.0 || ^9.0"
+ "php": "^7.2 || ^8.0"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.x-dev"
- }
- },
"autoload": {
- "psr-4": {
- "Prophecy\\": "src/Prophecy"
- }
+ "classmap": [
+ "src/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
"authors": [
{
- "name": "Konstantin Kudryashov",
- "email": "ever.zet@gmail.com",
- "homepage": "http://everzet.com"
+ "name": "Arne Blankerts",
+ "email": "arne@blankerts.de",
+ "role": "Developer"
+ },
+ {
+ "name": "Sebastian Heuer",
+ "email": "sebastian@phpeople.de",
+ "role": "Developer"
},
{
- "name": "Marcello Duarte",
- "email": "marcello.duarte@gmail.com"
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de",
+ "role": "Developer"
}
],
- "description": "Highly opinionated mocking framework for PHP 5.3+",
- "homepage": "https://github.com/phpspec/prophecy",
- "keywords": [
- "Double",
- "Dummy",
- "fake",
- "mock",
- "spy",
- "stub"
- ],
+ "description": "Library for handling version information and constraints",
"support": {
- "issues": "https://github.com/phpspec/prophecy/issues",
- "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
+ "issues": "https://github.com/phar-io/version/issues",
+ "source": "https://github.com/phar-io/version/tree/3.2.1"
},
- "time": "2021-12-08T12:19:24+00:00"
+ "time": "2022-02-21T01:04:05+00:00"
},
{
"name": "phpunit/php-code-coverage",
- "version": "9.2.15",
+ "version": "9.2.23",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f"
+ "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
- "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c",
+ "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
"ext-xmlwriter": "*",
- "nikic/php-parser": "^4.13.0",
+ "nikic/php-parser": "^4.14",
"php": ">=7.3",
"phpunit/php-file-iterator": "^3.0.3",
"phpunit/php-text-template": "^2.0.2",
@@ -8580,7 +8781,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15"
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.23"
},
"funding": [
{
@@ -8588,7 +8789,7 @@
"type": "github"
}
],
- "time": "2022-03-07T09:28:20+00:00"
+ "time": "2022-12-28T12:41:10+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -8833,16 +9034,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.5.21",
+ "version": "9.5.27",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1"
+ "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0e32b76be457de00e83213528f6bb37e2a38fcb1",
- "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38",
+ "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38",
"shasum": ""
},
"require": {
@@ -8857,7 +9058,6 @@
"phar-io/manifest": "^2.0.3",
"phar-io/version": "^3.0.2",
"php": ">=7.3",
- "phpspec/prophecy": "^1.12.1",
"phpunit/php-code-coverage": "^9.2.13",
"phpunit/php-file-iterator": "^3.0.5",
"phpunit/php-invoker": "^3.1.1",
@@ -8865,19 +9065,16 @@
"phpunit/php-timer": "^5.0.2",
"sebastian/cli-parser": "^1.0.1",
"sebastian/code-unit": "^1.0.6",
- "sebastian/comparator": "^4.0.5",
+ "sebastian/comparator": "^4.0.8",
"sebastian/diff": "^4.0.3",
"sebastian/environment": "^5.1.3",
- "sebastian/exporter": "^4.0.3",
+ "sebastian/exporter": "^4.0.5",
"sebastian/global-state": "^5.0.1",
"sebastian/object-enumerator": "^4.0.3",
"sebastian/resource-operations": "^3.0.3",
- "sebastian/type": "^3.0",
+ "sebastian/type": "^3.2",
"sebastian/version": "^3.0.2"
},
- "require-dev": {
- "phpspec/prophecy-phpunit": "^2.0.1"
- },
"suggest": {
"ext-soap": "*",
"ext-xdebug": "*"
@@ -8919,7 +9116,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.21"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27"
},
"funding": [
{
@@ -8929,9 +9126,13 @@
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
+ "type": "tidelift"
}
],
- "time": "2022-06-19T12:14:25+00:00"
+ "time": "2022-12-09T07:31:23+00:00"
},
{
"name": "sebastian/cli-parser",
@@ -9102,16 +9303,16 @@
},
{
"name": "sebastian/comparator",
- "version": "4.0.6",
+ "version": "4.0.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "55f4261989e546dc112258c7a75935a81a7ce382"
+ "reference": "fa0f136dd2334583309d32b62544682ee972b51a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382",
- "reference": "55f4261989e546dc112258c7a75935a81a7ce382",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a",
+ "reference": "fa0f136dd2334583309d32b62544682ee972b51a",
"shasum": ""
},
"require": {
@@ -9164,7 +9365,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/comparator/issues",
- "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6"
+ "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8"
},
"funding": [
{
@@ -9172,7 +9373,7 @@
"type": "github"
}
],
- "time": "2020-10-26T15:49:45+00:00"
+ "time": "2022-09-14T12:41:17+00:00"
},
{
"name": "sebastian/complexity",
@@ -9362,16 +9563,16 @@
},
{
"name": "sebastian/exporter",
- "version": "4.0.4",
+ "version": "4.0.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9"
+ "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9",
- "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
+ "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
"shasum": ""
},
"require": {
@@ -9427,7 +9628,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/exporter/issues",
- "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4"
+ "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
},
"funding": [
{
@@ -9435,7 +9636,7 @@
"type": "github"
}
],
- "time": "2021-11-11T14:18:36+00:00"
+ "time": "2022-09-14T06:03:37+00:00"
},
{
"name": "sebastian/global-state",
@@ -9790,16 +9991,16 @@
},
{
"name": "sebastian/type",
- "version": "3.0.0",
+ "version": "3.2.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/type.git",
- "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad"
+ "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
- "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
+ "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
+ "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
"shasum": ""
},
"require": {
@@ -9811,7 +10012,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -9834,7 +10035,7 @@
"homepage": "https://github.com/sebastianbergmann/type",
"support": {
"issues": "https://github.com/sebastianbergmann/type/issues",
- "source": "https://github.com/sebastianbergmann/type/tree/3.0.0"
+ "source": "https://github.com/sebastianbergmann/type/tree/3.2.0"
},
"funding": [
{
@@ -9842,7 +10043,7 @@
"type": "github"
}
],
- "time": "2022-03-15T09:54:48+00:00"
+ "time": "2022-09-12T14:47:03+00:00"
},
{
"name": "sebastian/version",
@@ -9897,6 +10098,302 @@
],
"time": "2020-09-28T06:39:44+00:00"
},
+ {
+ "name": "spatie/backtrace",
+ "version": "1.2.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/spatie/backtrace.git",
+ "reference": "4ee7d41aa5268107906ea8a4d9ceccde136dbd5b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/spatie/backtrace/zipball/4ee7d41aa5268107906ea8a4d9ceccde136dbd5b",
+ "reference": "4ee7d41aa5268107906ea8a4d9ceccde136dbd5b",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.3|^8.0"
+ },
+ "require-dev": {
+ "ext-json": "*",
+ "phpunit/phpunit": "^9.3",
+ "symfony/var-dumper": "^5.1"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Spatie\\Backtrace\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Freek Van de Herten",
+ "email": "freek@spatie.be",
+ "homepage": "https://spatie.be",
+ "role": "Developer"
+ }
+ ],
+ "description": "A better backtrace",
+ "homepage": "https://github.com/spatie/backtrace",
+ "keywords": [
+ "Backtrace",
+ "spatie"
+ ],
+ "support": {
+ "issues": "https://github.com/spatie/backtrace/issues",
+ "source": "https://github.com/spatie/backtrace/tree/1.2.1"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sponsors/spatie",
+ "type": "github"
+ },
+ {
+ "url": "https://spatie.be/open-source/support-us",
+ "type": "other"
+ }
+ ],
+ "time": "2021-11-09T10:57:15+00:00"
+ },
+ {
+ "name": "spatie/flare-client-php",
+ "version": "1.3.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/spatie/flare-client-php.git",
+ "reference": "609903bd154ba3d71f5e23a91c3b431fa8f71868"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/609903bd154ba3d71f5e23a91c3b431fa8f71868",
+ "reference": "609903bd154ba3d71f5e23a91c3b431fa8f71868",
+ "shasum": ""
+ },
+ "require": {
+ "illuminate/pipeline": "^8.0|^9.0",
+ "php": "^8.0",
+ "spatie/backtrace": "^1.2",
+ "symfony/http-foundation": "^5.0|^6.0",
+ "symfony/mime": "^5.2|^6.0",
+ "symfony/process": "^5.2|^6.0",
+ "symfony/var-dumper": "^5.2|^6.0"
+ },
+ "require-dev": {
+ "dms/phpunit-arraysubset-asserts": "^0.3.0",
+ "pestphp/pest": "^1.20",
+ "phpstan/extension-installer": "^1.1",
+ "phpstan/phpstan-deprecation-rules": "^1.0",
+ "phpstan/phpstan-phpunit": "^1.0",
+ "spatie/phpunit-snapshot-assertions": "^4.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-main": "1.1.x-dev"
+ }
+ },
+ "autoload": {
+ "files": [
+ "src/helpers.php"
+ ],
+ "psr-4": {
+ "Spatie\\FlareClient\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "description": "Send PHP errors to Flare",
+ "homepage": "https://github.com/spatie/flare-client-php",
+ "keywords": [
+ "exception",
+ "flare",
+ "reporting",
+ "spatie"
+ ],
+ "support": {
+ "issues": "https://github.com/spatie/flare-client-php/issues",
+ "source": "https://github.com/spatie/flare-client-php/tree/1.3.2"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/spatie",
+ "type": "github"
+ }
+ ],
+ "time": "2022-12-26T14:36:46+00:00"
+ },
+ {
+ "name": "spatie/ignition",
+ "version": "1.4.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/spatie/ignition.git",
+ "reference": "dd3d456779108d7078baf4e43f8c2b937d9794a1"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/spatie/ignition/zipball/dd3d456779108d7078baf4e43f8c2b937d9794a1",
+ "reference": "dd3d456779108d7078baf4e43f8c2b937d9794a1",
+ "shasum": ""
+ },
+ "require": {
+ "ext-json": "*",
+ "ext-mbstring": "*",
+ "monolog/monolog": "^2.0",
+ "php": "^8.0",
+ "spatie/flare-client-php": "^1.1",
+ "symfony/console": "^5.4|^6.0",
+ "symfony/var-dumper": "^5.4|^6.0"
+ },
+ "require-dev": {
+ "mockery/mockery": "^1.4",
+ "pestphp/pest": "^1.20",
+ "phpstan/extension-installer": "^1.1",
+ "phpstan/phpstan-deprecation-rules": "^1.0",
+ "phpstan/phpstan-phpunit": "^1.0",
+ "symfony/process": "^5.4|^6.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-main": "1.2.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Spatie\\Ignition\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Spatie",
+ "email": "info@spatie.be",
+ "role": "Developer"
+ }
+ ],
+ "description": "A beautiful error page for PHP applications.",
+ "homepage": "https://flareapp.io/ignition",
+ "keywords": [
+ "error",
+ "flare",
+ "laravel",
+ "page"
+ ],
+ "support": {
+ "docs": "https://flareapp.io/docs/ignition-for-laravel/introduction",
+ "forum": "https://twitter.com/flareappio",
+ "issues": "https://github.com/spatie/ignition/issues",
+ "source": "https://github.com/spatie/ignition"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/spatie",
+ "type": "github"
+ }
+ ],
+ "time": "2022-08-26T11:51:15+00:00"
+ },
+ {
+ "name": "spatie/laravel-ignition",
+ "version": "1.6.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/spatie/laravel-ignition.git",
+ "reference": "1a2b4bd3d48c72526c0ba417687e5c56b5cf49bc"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/1a2b4bd3d48c72526c0ba417687e5c56b5cf49bc",
+ "reference": "1a2b4bd3d48c72526c0ba417687e5c56b5cf49bc",
+ "shasum": ""
+ },
+ "require": {
+ "ext-curl": "*",
+ "ext-json": "*",
+ "ext-mbstring": "*",
+ "illuminate/support": "^8.77|^9.27",
+ "monolog/monolog": "^2.3",
+ "php": "^8.0",
+ "spatie/flare-client-php": "^1.0.1",
+ "spatie/ignition": "^1.4.1",
+ "symfony/console": "^5.0|^6.0",
+ "symfony/var-dumper": "^5.0|^6.0"
+ },
+ "require-dev": {
+ "filp/whoops": "^2.14",
+ "livewire/livewire": "^2.8|dev-develop",
+ "mockery/mockery": "^1.4",
+ "nunomaduro/larastan": "^1.0",
+ "orchestra/testbench": "^6.23|^7.0",
+ "pestphp/pest": "^1.20",
+ "phpstan/extension-installer": "^1.1",
+ "phpstan/phpstan-deprecation-rules": "^1.0",
+ "phpstan/phpstan-phpunit": "^1.0",
+ "spatie/laravel-ray": "^1.27"
+ },
+ "type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "Spatie\\LaravelIgnition\\IgnitionServiceProvider"
+ ],
+ "aliases": {
+ "Flare": "Spatie\\LaravelIgnition\\Facades\\Flare"
+ }
+ }
+ },
+ "autoload": {
+ "files": [
+ "src/helpers.php"
+ ],
+ "psr-4": {
+ "Spatie\\LaravelIgnition\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Spatie",
+ "email": "info@spatie.be",
+ "role": "Developer"
+ }
+ ],
+ "description": "A beautiful error page for Laravel applications.",
+ "homepage": "https://flareapp.io/ignition",
+ "keywords": [
+ "error",
+ "flare",
+ "laravel",
+ "page"
+ ],
+ "support": {
+ "docs": "https://flareapp.io/docs/ignition-for-laravel/introduction",
+ "forum": "https://twitter.com/flareappio",
+ "issues": "https://github.com/spatie/laravel-ignition/issues",
+ "source": "https://github.com/spatie/laravel-ignition"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/spatie",
+ "type": "github"
+ }
+ ],
+ "time": "2023-01-03T19:28:04+00:00"
+ },
{
"name": "theseer/tokenizer",
"version": "1.2.1",
diff --git a/config/activitylog.php b/config/activitylog.php
new file mode 100644
index 000000000..5f6afcfa1
--- /dev/null
+++ b/config/activitylog.php
@@ -0,0 +1,52 @@
+ env('ACTIVITY_LOGGER_ENABLED', true),
+
+ /*
+ * When the clean-command is executed, all recording activities older than
+ * the number of days specified here will be deleted.
+ */
+ 'delete_records_older_than_days' => 365,
+
+ /*
+ * If no log name is passed to the activity() helper
+ * we use this default log name.
+ */
+ 'default_log_name' => 'default',
+
+ /*
+ * You can specify an auth driver here that gets user models.
+ * If this is null we'll use the current Laravel auth driver.
+ */
+ 'default_auth_driver' => null,
+
+ /*
+ * If set to true, the subject returns soft deleted models.
+ */
+ 'subject_returns_soft_deleted_models' => false,
+
+ /*
+ * This model will be used to log activity.
+ * It should implement the Spatie\Activitylog\Contracts\Activity interface
+ * and extend Illuminate\Database\Eloquent\Model.
+ */
+ 'activity_model' => \Spatie\Activitylog\Models\Activity::class,
+
+ /*
+ * This is the name of the table that will be created by the migration and
+ * used by the Activity model shipped with this package.
+ */
+ 'table_name' => 'activity_log',
+
+ /*
+ * This is the database connection that will be used by the migration and
+ * the Activity model shipped with this package. In case it's not set
+ * Laravel's database.default will be used instead.
+ */
+ 'database_connection' => env('ACTIVITY_LOGGER_DB_CONNECTION'),
+];
diff --git a/config/app.php b/config/app.php
index 19e226d86..208e87ba2 100644
--- a/config/app.php
+++ b/config/app.php
@@ -1,8 +1,10 @@
'0.8.3.2',
+ 'version' => '0.9',
/*
|--------------------------------------------------------------------------
@@ -41,7 +43,7 @@
|
*/
- 'debug' => (bool)env('APP_DEBUG', false),
+ 'debug' => (bool) env('APP_DEBUG', false),
/*
|--------------------------------------------------------------------------
@@ -71,7 +73,6 @@
'timezone' => env('APP_TIMEZONE', 'UTC'),
-
/*
|--------------------------------------------------------------------------
| Application Locale Configuration
@@ -83,7 +84,7 @@
|
*/
- 'locale' => "en",
+ 'locale' => 'en',
/*
|--------------------------------------------------------------------------
@@ -96,8 +97,7 @@
|
*/
- 'available_locales' => array_map('basename', preg_replace('/\\.[^.\\s]{3,4}$/', '', glob(resource_path() . "/lang/*.json", GLOB_BRACE))),
-
+ 'available_locales' => array_map('basename', preg_replace('/\\.[^.\\s]{3,4}$/', '', glob(base_path("lang").'/*.json', GLOB_BRACE))),
/*
|--------------------------------------------------------------------------
@@ -140,6 +140,24 @@
'cipher' => 'AES-256-CBC',
+ /*
+ |--------------------------------------------------------------------------
+ | Maintenance Mode Driver
+ |--------------------------------------------------------------------------
+ |
+ | These configuration options determine the driver used to determine and
+ | manage Laravel's "maintenance mode" status. The "cache" driver will
+ | allow maintenance mode to be controlled across multiple machines.
+ |
+ | Supported drivers: "file", "cache"
+ |
+ */
+
+ 'maintenance' => [
+ 'driver' => 'file',
+ // 'store' => 'redis',
+ ],
+
/*
|--------------------------------------------------------------------------
| Autoloaded Service Providers
@@ -179,7 +197,6 @@
Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class,
-
/*
* Package Service Providers...
*/
@@ -196,7 +213,6 @@
KKomelin\TranslatableStringExporter\Providers\ExporterServiceProvider::class,
-
],
/*
@@ -210,46 +226,8 @@
|
*/
- 'aliases' => [
-
- 'App' => Illuminate\Support\Facades\App::class,
- 'Arr' => Illuminate\Support\Arr::class,
- 'Artisan' => Illuminate\Support\Facades\Artisan::class,
- 'Auth' => Illuminate\Support\Facades\Auth::class,
- 'Blade' => Illuminate\Support\Facades\Blade::class,
- 'Broadcast' => Illuminate\Support\Facades\Broadcast::class,
- 'Bus' => Illuminate\Support\Facades\Bus::class,
- 'Cache' => Illuminate\Support\Facades\Cache::class,
- 'Config' => Illuminate\Support\Facades\Config::class,
- 'Cookie' => Illuminate\Support\Facades\Cookie::class,
- 'Crypt' => Illuminate\Support\Facades\Crypt::class,
- 'DB' => Illuminate\Support\Facades\DB::class,
- 'Eloquent' => Illuminate\Database\Eloquent\Model::class,
- 'Event' => Illuminate\Support\Facades\Event::class,
- 'File' => Illuminate\Support\Facades\File::class,
- 'Gate' => Illuminate\Support\Facades\Gate::class,
- 'Hash' => Illuminate\Support\Facades\Hash::class,
- 'Http' => Illuminate\Support\Facades\Http::class,
- 'Lang' => Illuminate\Support\Facades\Lang::class,
- 'Log' => Illuminate\Support\Facades\Log::class,
- 'Mail' => Illuminate\Support\Facades\Mail::class,
- 'Notification' => Illuminate\Support\Facades\Notification::class,
- 'Password' => Illuminate\Support\Facades\Password::class,
- 'Queue' => Illuminate\Support\Facades\Queue::class,
- 'Redirect' => Illuminate\Support\Facades\Redirect::class,
- // 'Redis' => Illuminate\Support\Facades\Redis::class,
- 'Request' => Illuminate\Support\Facades\Request::class,
- 'Response' => Illuminate\Support\Facades\Response::class,
- 'Route' => Illuminate\Support\Facades\Route::class,
- 'Schema' => Illuminate\Support\Facades\Schema::class,
- 'Session' => Illuminate\Support\Facades\Session::class,
- 'Storage' => Illuminate\Support\Facades\Storage::class,
- 'Str' => Illuminate\Support\Str::class,
- 'URL' => Illuminate\Support\Facades\URL::class,
- 'Validator' => Illuminate\Support\Facades\Validator::class,
- 'View' => Illuminate\Support\Facades\View::class,
+ 'aliases' => Facade::defaultAliases()->merge([
'DataTables' => Yajra\DataTables\Facades\DataTables::class,
-
- ],
+ ])->toArray(),
];
diff --git a/config/auth.php b/config/auth.php
index ba1a4d8cb..963c5ee73 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -31,7 +31,7 @@
| users are actually retrieved out of your database or other storage
| mechanisms used by this application to persist your user's data.
|
- | Supported: "session", "token"
+ | Supported: "session"
|
*/
@@ -86,7 +86,7 @@
| than one user table or model in the application and you want to have
| separate password reset settings based on the specific user types.
|
- | The expire time is the number of minutes that the reset token should be
+ | The expire time is the number of minutes that each reset token will be
| considered valid. This security feature keeps tokens short-lived so
| they have less time to be guessed. You may change this as needed.
|
diff --git a/config/broadcasting.php b/config/broadcasting.php
index ef2085985..9e4d4aa44 100644
--- a/config/broadcasting.php
+++ b/config/broadcasting.php
@@ -11,7 +11,7 @@
| framework when an event needs to be broadcast. You may set this to
| any of the connections defined in the "connections" array below.
|
- | Supported: "pusher", "redis", "log", "null"
+ | Supported: "pusher", "ably", "redis", "log", "null"
|
*/
@@ -36,8 +36,14 @@
'secret' => env('PUSHER_APP_SECRET'),
'app_id' => env('PUSHER_APP_ID'),
'options' => [
- 'cluster' => env('PUSHER_APP_CLUSTER'),
- 'useTLS' => true,
+ 'host' => env('PUSHER_HOST') ?: 'api-'.env('PUSHER_APP_CLUSTER', 'mt1').'.pusher.com',
+ 'port' => env('PUSHER_PORT', 443),
+ 'scheme' => env('PUSHER_SCHEME', 'https'),
+ 'encrypted' => true,
+ 'useTLS' => env('PUSHER_SCHEME', 'https') === 'https',
+ ],
+ 'client_options' => [
+ // Guzzle client options: https://docs.guzzlephp.org/en/stable/request-options.html
],
],
diff --git a/config/cache.php b/config/cache.php
index e32a2fd3b..33bb29546 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -27,7 +27,7 @@
| same cache driver to group types of items stored in your caches.
|
| Supported drivers: "apc", "array", "database", "file",
- | "memcached", "redis", "dynamodb", "null"
+ | "memcached", "redis", "dynamodb", "octane", "null"
|
*/
@@ -88,6 +88,10 @@
'endpoint' => env('DYNAMODB_ENDPOINT'),
],
+ 'octane' => [
+ 'driver' => 'octane',
+ ],
+
],
/*
@@ -95,12 +99,12 @@
| Cache Key Prefix
|--------------------------------------------------------------------------
|
- | When utilizing a RAM based store such as APC or Memcached, there might
- | be other applications utilizing the same cache. So, we'll specify a
- | value to get prefixed to all our keys so we can avoid collisions.
+ | When utilizing the APC, database, memcached, Redis, or DynamoDB cache
+ | stores there might be other applications using the same cache. For
+ | that reason, you may prefix every cache key to avoid collisions.
|
*/
- 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),
+ 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache_'),
];
diff --git a/config/currency_codes.php b/config/currency_codes.php
index 6fee59c72..5c3800f4b 100644
--- a/config/currency_codes.php
+++ b/config/currency_codes.php
@@ -1,5 +1,5 @@
'utf8',
'prefix' => '',
'prefix_indexes' => true,
- 'schema' => 'public',
+ 'search_path' => 'public',
'sslmode' => 'prefer',
],
diff --git a/config/filesystems.php b/config/filesystems.php
index 2f9c7e7c1..f7483fdf5 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -13,7 +13,7 @@
|
*/
- 'default' => env('FILESYSTEM_DRIVER', 'local'),
+ 'default' => env('FILESYSTEM_DISK', 'local'),
/*
|--------------------------------------------------------------------------
@@ -22,7 +22,7 @@
|
| Here you may configure as many filesystem "disks" as you wish, and you
| may even configure multiple disks of the same driver. Defaults have
- | been setup for each driver as an example of the required options.
+ | been set up for each driver as an example of the required values.
|
| Supported Drivers: "local", "ftp", "sftp", "s3"
|
@@ -33,6 +33,7 @@
'local' => [
'driver' => 'local',
'root' => storage_path('app'),
+ 'throw' => false,
],
'logs' => [
@@ -45,9 +46,9 @@
'root' => storage_path('app/public'),
'url' => env('APP_URL').'/storage',
'visibility' => 'public',
+ 'throw' => false,
],
-
's3' => [
'driver' => 's3',
'key' => env('AWS_ACCESS_KEY_ID'),
@@ -56,6 +57,8 @@
'bucket' => env('AWS_BUCKET'),
'url' => env('AWS_URL'),
'endpoint' => env('AWS_ENDPOINT'),
+ 'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
+ 'throw' => false,
],
],
diff --git a/config/hashing.php b/config/hashing.php
index 842577087..bcd3be4c2 100644
--- a/config/hashing.php
+++ b/config/hashing.php
@@ -44,9 +44,9 @@
*/
'argon' => [
- 'memory' => 1024,
- 'threads' => 2,
- 'time' => 2,
+ 'memory' => 65536,
+ 'threads' => 1,
+ 'time' => 4,
],
];
diff --git a/config/invoices.php b/config/invoices.php
index 772ef1fde..7944c13d9 100644
--- a/config/invoices.php
+++ b/config/invoices.php
@@ -13,13 +13,13 @@
],
'serial_number' => [
- 'series' => 'AA',
+ 'series' => 'AA',
'sequence' => 1,
/*
* Sequence will be padded accordingly, for ex. 00001
*/
'sequence_padding' => 5,
- 'delimiter' => '.',
+ 'delimiter' => '.',
/*
* Supported tags {SERIES}, {DELIMITER}, {SEQUENCE}
* Example: AA.00001
@@ -36,7 +36,7 @@
* Example: Amount in words: Eight hundred fifty thousand sixty-eight EUR and fifteen ct.
*/
'fraction' => 'ct.',
- 'symbol' => 'ā¬',
+ 'symbol' => 'ā¬',
/*
* Example: 19.00
*/
@@ -59,7 +59,7 @@
'paper' => [
// A4 = 210 mm x 297 mm = 595 pt x 842 pt
- 'size' => 'a4',
+ 'size' => 'a4',
'orientation' => 'portrait',
],
@@ -78,11 +78,11 @@
* Default attributes for Seller::class
*/
'attributes' => [
- 'name' => 'Towne, Smith and Ebert',
- 'address' => '89982 Pfeffer Falls Damianstad, CO 66972-8160',
- 'code' => '41-1985581',
- 'vat' => '123456789',
- 'phone' => '760-355-3930',
+ 'name' => 'Towne, Smith and Ebert',
+ 'address' => '89982 Pfeffer Falls Damianstad, CO 66972-8160',
+ 'code' => '41-1985581',
+ 'vat' => '123456789',
+ 'phone' => '760-355-3930',
'custom_fields' => [
/*
* Custom attributes for Seller::class
diff --git a/config/logging.php b/config/logging.php
index 6aa77fe28..5aa1dbb78 100644
--- a/config/logging.php
+++ b/config/logging.php
@@ -19,6 +19,22 @@
'default' => env('LOG_CHANNEL', 'stack'),
+ /*
+ |--------------------------------------------------------------------------
+ | Deprecations Log Channel
+ |--------------------------------------------------------------------------
+ |
+ | This option controls the log channel that should be used to log warnings
+ | regarding deprecated PHP and library features. This allows you to get
+ | your application ready for upcoming major versions of dependencies.
+ |
+ */
+
+ 'deprecations' => [
+ 'channel' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
+ 'trace' => false,
+ ],
+
/*
|--------------------------------------------------------------------------
| Log Channels
@@ -65,15 +81,17 @@
'papertrail' => [
'driver' => 'monolog',
'level' => env('LOG_LEVEL', 'debug'),
- 'handler' => SyslogUdpHandler::class,
+ 'handler' => env('LOG_PAPERTRAIL_HANDLER', SyslogUdpHandler::class),
'handler_with' => [
'host' => env('PAPERTRAIL_URL'),
'port' => env('PAPERTRAIL_PORT'),
+ 'connectionString' => 'tls://'.env('PAPERTRAIL_URL').':'.env('PAPERTRAIL_PORT'),
],
],
'stderr' => [
'driver' => 'monolog',
+ 'level' => env('LOG_LEVEL', 'debug'),
'handler' => StreamHandler::class,
'formatter' => env('LOG_STDERR_FORMATTER'),
'with' => [
diff --git a/config/mail.php b/config/mail.php
index 3addd6aa8..534395a36 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -29,7 +29,7 @@
| mailers below. You are free to add additional mailers as required.
|
| Supported: "smtp", "sendmail", "mailgun", "ses",
- | "postmark", "log", "array"
+ | "postmark", "log", "array", "failover"
|
*/
@@ -42,25 +42,42 @@
'username' => env('MAIL_USERNAME'),
'password' => env('MAIL_PASSWORD'),
'timeout' => null,
- 'auth_mode' => null,
+ 'local_domain' => env('MAIL_EHLO_DOMAIN'),
],
- // 'ses' => [
- // 'transport' => 'ses',
- // ],
- //
- // 'mailgun' => [
- // 'transport' => 'mailgun',
- // ],
- //
- // 'postmark' => [
- // 'transport' => 'postmark',
- // ],
- //
- // 'sendmail' => [
- // 'transport' => 'sendmail',
- // 'path' => '/usr/sbin/sendmail -bs',
- // ],
+ 'ses' => [
+ 'transport' => 'ses',
+ ],
+
+ 'mailgun' => [
+ 'transport' => 'mailgun',
+ ],
+
+ 'postmark' => [
+ 'transport' => 'postmark',
+ ],
+
+ 'sendmail' => [
+ 'transport' => 'sendmail',
+ 'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -bs -i'),
+ ],
+
+ 'log' => [
+ 'transport' => 'log',
+ 'channel' => env('MAIL_LOG_CHANNEL'),
+ ],
+
+ 'array' => [
+ 'transport' => 'array',
+ ],
+
+ 'failover' => [
+ 'transport' => 'failover',
+ 'mailers' => [
+ 'smtp',
+ 'log',
+ ],
+ ],
],
/*
diff --git a/config/queue.php b/config/queue.php
index 122229666..25ea5a819 100644
--- a/config/queue.php
+++ b/config/queue.php
@@ -39,6 +39,7 @@
'table' => 'jobs',
'queue' => 'default',
'retry_after' => 90,
+ 'after_commit' => false,
],
'beanstalkd' => [
@@ -47,6 +48,7 @@
'queue' => 'default',
'retry_after' => 90,
'block_for' => 0,
+ 'after_commit' => false,
],
'sqs' => [
@@ -54,9 +56,10 @@
'key' => env('AWS_ACCESS_KEY_ID'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
- 'queue' => env('SQS_QUEUE', 'your-queue-name'),
+ 'queue' => env('SQS_QUEUE', 'default'),
'suffix' => env('SQS_SUFFIX'),
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
+ 'after_commit' => false,
],
'redis' => [
@@ -65,6 +68,7 @@
'queue' => env('REDIS_QUEUE', 'default'),
'retry_after' => 90,
'block_for' => null,
+ 'after_commit' => false,
],
],
diff --git a/config/recaptcha.php b/config/recaptcha.php
index be52269fc..ce76c3e17 100644
--- a/config/recaptcha.php
+++ b/config/recaptcha.php
@@ -14,134 +14,119 @@
return [
/**
- *
* The site key
* get site key @ www.google.com/recaptcha/admin
- *
*/
- 'api_site_key' => env('RECAPTCHA_SITE_KEY', ''),
+ 'api_site_key' => env('RECAPTCHA_SITE_KEY', ''),
/**
- *
* The secret key
* get secret key @ www.google.com/recaptcha/admin
- *
*/
- 'api_secret_key' => env('RECAPTCHA_SECRET_KEY', ''),
+ 'api_secret_key' => env('RECAPTCHA_SECRET_KEY', ''),
/**
- *
* ReCATCHA version
* Supported: "v2", "invisible", "v3",
*
* get more info @ https://developers.google.com/recaptcha/docs/versions
- *
*/
- 'version' => 'v2',
+ 'version' => 'v2',
/**
- *
* The curl timout in seconds to validate a recaptcha token
- * @since v3.5.0
*
+ * @since v3.5.0
*/
- 'curl_timeout' => 10,
+ 'curl_timeout' => 10,
/**
- *
* IP addresses for which validation will be skipped
- *
*/
- 'skip_ip' => [],
+ 'skip_ip' => [],
/**
- *
* Default route called to check the Google reCAPTCHA token
- * @since v3.2.0
*
+ * @since v3.2.0
*/
- 'default_validation_route' => 'biscolab-recaptcha/validate',
+ 'default_validation_route' => 'biscolab-recaptcha/validate',
/**
- *
* The name of the parameter used to send Google reCAPTCHA token to verify route
- * @since v3.2.0
*
+ * @since v3.2.0
*/
'default_token_parameter_name' => 'token',
/**
- *
* The default Google reCAPTCHA language code
* It has no effect with v3
+ *
* @see https://developers.google.com/recaptcha/docs/language
* @since v3.6.0
- *
*/
- 'default_language' => null,
+ 'default_language' => null,
/**
- *
* The default form ID. Only for "invisible" reCAPTCHA
- * @since v4.0.0
*
+ * @since v4.0.0
*/
- 'default_form_id' => 'biscolab-recaptcha-invisible-form',
+ 'default_form_id' => 'biscolab-recaptcha-invisible-form',
/**
- *
* Deferring the render can be achieved by specifying your onload callback function and adding parameters to the JavaScript resource.
* It has no effect with v3 and invisible
+ *
* @see https://developers.google.com/recaptcha/docs/display#explicit_render
* @since v4.0.0
* Supported true, false
- *
*/
- 'explicit' => false,
+ 'explicit' => false,
/**
- *
* Set API domain. You can use "www.recaptcha.net" in case "www.google.com" is not accessible.
* (no check will be made on the entered value)
+ *
* @see https://developers.google.com/recaptcha/docs/faq#can-i-use-recaptcha-globally
* @since v4.3.0
* Default 'www.google.com' (ReCaptchaBuilder::DEFAULT_RECAPTCHA_API_DOMAIN)
- *
*/
- 'api_domain' => 'www.google.com',
+ 'api_domain' => 'www.google.com',
/**
- *
* g-recaptcha tag attributes and grecaptcha.render parameters (v2 only)
+ *
* @see https://developers.google.com/recaptcha/docs/display#render_param
* @since v4.0.0
*/
- 'tag_attributes' => [
+ 'tag_attributes' => [
/**
* The color theme of the widget.
* Supported "light", "dark"
*/
- 'theme' => 'dark',
+ 'theme' => 'dark',
/**
* The size of the widget.
* Supported "normal", "compact"
*/
- 'size' => 'normal',
+ 'size' => 'normal',
/**
* The tabindex of the widget and challenge.
* If other elements in your page use tabindex, it should be set to make user navigation easier.
*/
- 'tabindex' => 0,
+ 'tabindex' => 0,
/**
* The name of your callback function, executed when the user submits a successful response.
* The g-recaptcha-response token is passed to your callback.
* DO NOT SET "biscolabOnloadCallback"
*/
- 'callback' => null,
+ 'callback' => null,
/**
* The name of your callback function, executed when the reCAPTCHA response expires and the user needs to re-verify.
@@ -154,6 +139,6 @@
* If you specify a function here, you are responsible for informing the user that they should retry.
* DO NOT SET "biscolabOnloadCallback"
*/
- 'error-callback' => null,
- ]
+ 'error-callback' => null,
+ ],
];
diff --git a/config/services.php b/config/services.php
index 5cfe58405..aedb7007c 100644
--- a/config/services.php
+++ b/config/services.php
@@ -18,6 +18,7 @@
'domain' => env('MAILGUN_DOMAIN'),
'secret' => env('MAILGUN_SECRET'),
'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
+ 'scheme' => 'https',
],
'postmark' => [
@@ -33,10 +34,10 @@
'discord' => [
'client_id' => env('DISCORD_CLIENT_ID'),
'client_secret' => env('DISCORD_CLIENT_SECRET'),
- 'redirect' => env('APP_URL' , 'http://localhost') . "/auth/callback",
+ 'redirect' => env('APP_URL', 'http://localhost').'/auth/callback',
// optional
- 'allow_gif_avatars' => (bool)env('DISCORD_AVATAR_GIF', true),
+ 'allow_gif_avatars' => (bool) env('DISCORD_AVATAR_GIF', true),
'avatar_default_extension' => env('DISCORD_EXTENSION_DEFAULT', 'jpg'), // only pick from jpg, png, webp
],
diff --git a/config/session.php b/config/session.php
index a9ea6ba79..8fed97c01 100644
--- a/config/session.php
+++ b/config/session.php
@@ -31,7 +31,7 @@
|
*/
- 'lifetime' => env('SESSION_LIFETIME', 240),
+ 'lifetime' => env('SESSION_LIFETIME', 120),
'expire_on_close' => false,
@@ -72,7 +72,7 @@
|
*/
- 'connection' => env('SESSION_CONNECTION', null),
+ 'connection' => env('SESSION_CONNECTION'),
/*
|--------------------------------------------------------------------------
@@ -100,7 +100,7 @@
|
*/
- 'store' => env('SESSION_STORE', null),
+ 'store' => env('SESSION_STORE'),
/*
|--------------------------------------------------------------------------
@@ -155,7 +155,7 @@
|
*/
- 'domain' => env('SESSION_DOMAIN', null),
+ 'domain' => env('SESSION_DOMAIN'),
/*
|--------------------------------------------------------------------------
@@ -164,7 +164,7 @@
|
| By setting this option to true, session cookies will only be sent back
| to the server if the browser has a HTTPS connection. This will keep
- | the cookie from being sent to you if it can not be done securely.
+ | the cookie from being sent to you when it can't be done securely.
|
*/
diff --git a/config/theme.php b/config/theme.php
new file mode 100644
index 000000000..6cabba755
--- /dev/null
+++ b/config/theme.php
@@ -0,0 +1,34 @@
+ null,
+
+ /*
+ |--------------------------------------------------------------------------
+ | Parent Theme
+ |--------------------------------------------------------------------------
+ |
+ | This is a parent theme for the theme specified in the active config
+ | option. It works like the WordPress style theme hierarchy, if the blade
+ | file is not found in the currently active theme, then it will look for it
+ | in the parent theme.
+ */
+ 'parent' => "default",
+
+ /*
+ |--------------------------------------------------------------------------
+ | Base Path
+ |--------------------------------------------------------------------------
+ |
+ | The base path where all the themes are located.
+ */
+ 'base_path' => base_path('themes')
+];
diff --git a/config/trustedproxy.php b/config/trustedproxy.php
index 8cfd785e7..dc46c31ba 100644
--- a/config/trustedproxy.php
+++ b/config/trustedproxy.php
@@ -1,5 +1,7 @@
\Illuminate\Http\Request::HEADER_X_FORWARDED_ALL,
-];
\ No newline at end of file
+ 'headers' => \Illuminate\Http\Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_AWS_ELB,
+];
diff --git a/database/factories/ApplicationApiFactory.php b/database/factories/ApplicationApiFactory.php
index 13c666db3..c85149ae6 100644
--- a/database/factories/ApplicationApiFactory.php
+++ b/database/factories/ApplicationApiFactory.php
@@ -2,18 +2,10 @@
namespace Database\Factories;
-use App\Models\ApplicationApi;
use Illuminate\Database\Eloquent\Factories\Factory;
class ApplicationApiFactory extends Factory
{
- /**
- * The name of the factory's corresponding model.
- *
- * @var string
- */
- protected $model = ApplicationApi::class;
-
/**
* Define the model's default state.
*
@@ -22,7 +14,7 @@ class ApplicationApiFactory extends Factory
public function definition()
{
return [
- 'memo' => $this->faker->word()
+ 'memo' => $this->faker->word(),
];
}
}
diff --git a/database/factories/DiscordUserFactory.php b/database/factories/DiscordUserFactory.php
index e4a7345b9..760aaad7d 100644
--- a/database/factories/DiscordUserFactory.php
+++ b/database/factories/DiscordUserFactory.php
@@ -2,20 +2,12 @@
namespace Database\Factories;
-use App\Models\DiscordUser;
use App\Models\User;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Support\Str;
class DiscordUserFactory extends Factory
{
- /**
- * The name of the factory's corresponding model.
- *
- * @var string
- */
- protected $model = DiscordUser::class;
-
/**
* Define the model's default state.
*
@@ -24,18 +16,18 @@ class DiscordUserFactory extends Factory
public function definition()
{
return [
- 'id' => $this->faker->numberBetween(186902438396035072 , 986902438396035072),
+ 'id' => $this->faker->numberBetween(186902438396035072, 986902438396035072),
'user_id' => function () {
return User::factory()->create()->id;
},
- 'username' => $this->faker->userName,
- 'avatar' => $this->faker->uuid,
+ 'username' => $this->faker->userName(),
+ 'avatar' => $this->faker->uuid(),
'discriminator' => $this->faker->randomNumber(4),
- 'email' => $this->faker->safeEmail,
- 'verified' => $this->faker->boolean,
+ 'email' => $this->faker->safeEmail(),
+ 'verified' => $this->faker->boolean(),
'public_flags' => $this->faker->randomNumber(1),
'locale' => Str::random(2),
- 'mfa_enabled' => $this->faker->boolean,
+ 'mfa_enabled' => $this->faker->boolean(),
'premium_type' => $this->faker->randomNumber(1),
];
}
diff --git a/database/factories/PaymentFactory.php b/database/factories/PaymentFactory.php
index ad85e7258..5a6312a2a 100644
--- a/database/factories/PaymentFactory.php
+++ b/database/factories/PaymentFactory.php
@@ -2,20 +2,12 @@
namespace Database\Factories;
-use App\Models\Payment;
use App\Models\User;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Support\Str;
class PaymentFactory extends Factory
{
- /**
- * The name of the factory's corresponding model.
- *
- * @var string
- */
- protected $model = Payment::class;
-
/**
* Define the model's default state.
*
@@ -27,11 +19,11 @@ public function definition()
'payment_id' => Str::random(30),
'payer_id' => Str::random(30),
'user_id' => User::factory(),
- 'type' => "Credits",
- 'status' => "Completed",
+ 'type' => 'Credits',
+ 'status' => 'Completed',
'amount' => $this->faker->numberBetween(10, 10000),
'price' => $this->faker->numerify('##.##'),
- 'currency_code' => ['EUR', 'USD'][rand(0,1)],
+ 'currency_code' => ['EUR', 'USD'][rand(0, 1)],
'payer' => '{}',
];
}
diff --git a/database/factories/ProductFactory.php b/database/factories/ProductFactory.php
index 323317cb3..abf3ae48d 100644
--- a/database/factories/ProductFactory.php
+++ b/database/factories/ProductFactory.php
@@ -2,18 +2,10 @@
namespace Database\Factories;
-use App\Models\Product;
use Illuminate\Database\Eloquent\Factories\Factory;
class ProductFactory extends Factory
{
- /**
- * The name of the factory's corresponding model.
- *
- * @var string
- */
- protected $model = Product::class;
-
/**
* Define the model's default state.
*
@@ -22,12 +14,12 @@ class ProductFactory extends Factory
public function definition()
{
return [
- 'name' => $this->faker->name,
+ 'name' => $this->faker->name(),
'description' => $this->faker->text(60),
- 'price' => $this->faker->numberBetween(0 , 1000),
- 'memory' => $this->faker->numberBetween(32 , 1024),
- 'disk' => $this->faker->numberBetween(500 , 5000),
- 'databases' => $this->faker->numberBetween(1 , 10)
+ 'price' => $this->faker->numberBetween(0, 1000),
+ 'memory' => $this->faker->numberBetween(32, 1024),
+ 'disk' => $this->faker->numberBetween(500, 5000),
+ 'databases' => $this->faker->numberBetween(1, 10),
];
}
}
diff --git a/database/factories/ServerFactory.php b/database/factories/ServerFactory.php
index b15e981c4..96c8e586e 100644
--- a/database/factories/ServerFactory.php
+++ b/database/factories/ServerFactory.php
@@ -3,19 +3,11 @@
namespace Database\Factories;
use App\Models\Product;
-use App\Models\Server;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Support\Str;
class ServerFactory extends Factory
{
- /**
- * The name of the factory's corresponding model.
- *
- * @var string
- */
- protected $model = Server::class;
-
/**
* Define the model's default state.
*
@@ -24,11 +16,11 @@ class ServerFactory extends Factory
public function definition()
{
return [
- 'name' => $this->faker->name,
+ 'name' => $this->faker->name(),
'description' => $this->faker->text(60),
'identifier' => Str::random(30),
- 'pterodactyl_id' => $this->faker->numberBetween(1000000,1000000000),
- 'product_id' => Product::factory()
+ 'pterodactyl_id' => $this->faker->numberBetween(1000000, 1000000000),
+ 'product_id' => Product::factory(),
];
}
}
diff --git a/database/factories/UsefulLinkFactory.php b/database/factories/UsefulLinkFactory.php
index 1bfde9674..5c7722c70 100644
--- a/database/factories/UsefulLinkFactory.php
+++ b/database/factories/UsefulLinkFactory.php
@@ -2,18 +2,10 @@
namespace Database\Factories;
-use App\Models\UsefulLink;
use Illuminate\Database\Eloquent\Factories\Factory;
class UsefulLinkFactory extends Factory
{
- /**
- * The name of the factory's corresponding model.
- *
- * @var string
- */
- protected $model = UsefulLink::class;
-
/**
* Define the model's default state.
*
@@ -24,8 +16,8 @@ public function definition()
return [
'icon' => 'fas fa-user',
'title' => $this->faker->text(30),
- 'link' => $this->faker->url,
- 'description' => $this->faker->text,
+ 'link' => $this->faker->url(),
+ 'description' => $this->faker->text(),
];
}
}
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 822e4978a..b0ae6fc60 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -2,19 +2,11 @@
namespace Database\Factories;
-use App\Models\User;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Support\Str;
class UserFactory extends Factory
{
- /**
- * The name of the factory's corresponding model.
- *
- * @var string
- */
- protected $model = User::class;
-
/**
* Define the model's default state.
*
@@ -23,14 +15,13 @@ class UserFactory extends Factory
public function definition()
{
return [
- 'name' => $this->faker->name,
- 'email' => $this->faker->unique()->safeEmail,
+ 'name' => $this->faker->name(),
+ 'email' => $this->faker->unique()->safeEmail(),
'credits' => $this->faker->numberBetween(0, 1500),
'last_seen' => $this->faker->dateTimeBetween(now(), '+30 days'),
'email_verified_at' => $this->faker->dateTimeBetween('-30 days', now()),
'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
'remember_token' => Str::random(10),
- 'email_verified' => true,
];
}
}
diff --git a/database/factories/VoucherFactory.php b/database/factories/VoucherFactory.php
index 9a381296c..02cbf6140 100644
--- a/database/factories/VoucherFactory.php
+++ b/database/factories/VoucherFactory.php
@@ -23,12 +23,11 @@ class VoucherFactory extends Factory
public function definition()
{
return [
- 'memo' => $this->faker->word(),
- 'code' => Str::random(36),
- 'credits' => $this->faker->numberBetween(100, 1000),
- 'uses' => $this->faker->numberBetween(1, 1000),
- 'expires_at' => now()->addDays($this->faker->numberBetween(1, 90))->format('d-m-Y')
+ 'memo' => $this->faker->word(),
+ 'code' => Str::random(36),
+ 'credits' => $this->faker->numberBetween(100, 1000),
+ 'uses' => $this->faker->numberBetween(1, 1000),
+ 'expires_at' => now()->addDays($this->faker->numberBetween(1, 90))->format('d-m-Y'),
];
-
}
}
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
index d37bbc762..c28f40d8e 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -4,9 +4,10 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class CreateUsersTable extends Migration
+return new class extends Migration
{
protected $defaultAvatar = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAgAElEQVR4Xu3dCbht5RgH8HUUGqRBqO6gwi1xhZIGlCYSUlGmkjGVaFJCSinNhWgwplCh2ayQoQxFGg0paUaDBlMcz+97+p9n3d05Z9179tn3nnP2Ws9znrP3XtO3vvf/zu/7rYHZs2cP/utf/6r++c9/Vv/973+rRzziEeVvcHCwfB8YGKjabfLOADoutNBChY7/+9//yp/viyyySPXoRz+6Gpg1a9bgf/7zn+rf//53IbqdAYCD223yzwB6BgBh6kc96lHVIx/5yGpg5syZg37MjoUXXrgFwOSn+RxPUAfAgw8+OMToRTJMmzZtEOf7i/iHFt9JgFYFTG40hK51moaufhuYPn36YB6x/PCQzo++AIp2m7wzgI5hbE8RZh+iORXQ+Xjhfr+3EmDyEj8E9z9qoPNpBmbMmDEYIj8MHQ+pgsk9Bf09+oj+4aQ8es+hAoZDTOsJTG4AdXp0nRL9YQCY3I/bjn5eZ6AFwLzO2BQ7vgXAFCPovD5OC4B5nbEpdnwLgClG0Hl9nBYA8zpjU+z4FgBTjKDz+jgtAOZ1xqbY8ZMeADJaIlr1IFb9u1qHRRddtJLlTH5D5tPm3GRBBUikSP3/xz/+Ua65xBJLlM+jbbnXZMXFpAdAklWdhMh3xEfov/zlL4XYyy23XKX+4d57762WXnrpavHFF69uu+22sg8A7FMoATB33313tdhii7UAmAzofliI86Gs5n333VeIueSSSxYJ8Pe//71UwwDFHXfcUT3wwAPVSiutVI65//77yz7FMYDw+Mc/vrrnnntaAExkAJSExkPEHu6//Spf7rrrrvJ/qaWWKtIAcbfZZptqlVVWqY466qjqN7/5TbXyyiuXY4DEeZEGrQqYwAhoAgARjssRVt0jm+BFL3pRteuuu1bPf/7zKxKCOvj0pz9dHX/88YX4j3vc4wqoSAXSoAXABAZAhjaSCkDQxz72sUWfz5o1q9p///2rl73sZeU0wKDvEdn/yy+/vEiDb3zjG0VFMAKVULUAmMAAaDICifGZM2dWr3nNa6o3vvGNhbtxPXsAMCJBIvIZgxdddFH1sY99rABhxowZLQAmMP0Lp47mBm677bbVDjvsUM2ePbs8BhXgnJRK+07U2+IJ+Pz73/++uuCCC6pDDjmkBcCCBADXjI7GsUSy74iGsxExNW9EuO1vf/tb0d+vfOUrq3e84x3Vc5/73CEut59IR2jnuYZrcQddy+d66RS74dprr61OOeWU6stf/nIxHnkT7hXVECBRJ67L7fTftXkUTXGCpv29nvsJHwcQiFlmmWUK4elzrhrChODx1xPweeYzn1m96U1vqrbYYosCGBtiIKxjnOvvpz/9aeHuv/71r9W+++5bjkfU2Ayuy2hERMS98MILq89//vPlPODxewAUW8EYAQQIeR3UTYJOIxGyBUADxE00X9xkm+j46Qw3RDXpJtHEb7XVVtXOO+9cLbvssoWQaXJxLqLjzt/97nfVkUceWZ155plDFbIISlLsueee1Ute8pIyIgQEAvfM+X4//fTTy/m//e1vi21hu/POO4ekgtgCF9PfrbfeWsY3kY3IBS4BmqqO66HciG/nIAoORdjNNtus2nvvvaunP/3p5XcEJSHqLiIQfeELX6g+8pGPFA5dccUVi2oBIoQGGMQGore+9a3lWjYSCHDqnx37qU99qjrssMOKRCKhjMMGdH4DUNdrJUADhzcBgB/PanccQsRvnz59evWsZz2r2mWXXap11123EBKRhXZ9RjjnIgAdfswxx1Q33HBDNW3atAIQx5Ia9qcM3meAI7oFidgQPgNeJM5jHvOYMhZqAbefcMIJ1ec+97kiMZ785CcXULqee99+++1lPK0EGGUGmhpPEMRWGhkHBgoAVlhhheotb3lLtdNOOxXuxckm2mdExIWIJrpHMhD7fnMNcX/cyvATG4g+d24kCw52PSJeXEC0EJfbACF9dgkd//CHP6xOPPHE6vvf/365XuyMuJwtALoAgMmMcYZo2223XfXud7+7EBAYEARxTDwuRLibbrqpcOVpp51WOJUedtxwngSOxrFA5D5J/uBkGwAKHG2//fbV8573vMrxjovrGDVjLF/96lerz3zmM8U+cM9kIFsAdAEAXMrwe/GLX1zttttu1XOe85xCTIQV148ljjB+/9KXvlTE/TXXXFNAQswHBKQNQvkfYxIxo7/9jw73e8Q9QFEdb3vb2woQfLY/QAAsQCBhbrnllurjH/94deqppxZbwDX6GgAmO3l4ojONCp3tZ6VVeWBgKD+PsIytF7zgBdUb3vCGEslDHMSMOI91jhDf/va3q6OPPrr6+c9/XvR2dHBTOrfBRClEfsITnlDUxY033lg94xnPqPbYY49iLCbDGJuDtABKG3UgdnD22WcPeSuZC/vr/fokReIJ7ue5ckyTimwaf9P+nnsBsYY9MIKGs3ALfe17dDZQZLGKNddcsxAdx+FWm0CMz8R8Jkmg5vDDD6/OOOOMQnTGIc4LMXB8N1vGLWz8xCc+sYxB7EBC6c1vfnP18pe/vEieAM39PBtAG4NoIon0s5/9bCjJZHxURAJZqUOIVwJYiUP0ujNrvgAAATxkCMlCR/h0rWYCAcIxuOvtb397sapNaKpzYoS5Fosedx100EFDq11kf66NCN1OYIiUNRSi8xNjYB9QTQxF0sn+ANRz+czj4IkwFMUGqCYA9jvgpBopQDA/MSa7Ae/cnNtzAJgoW8Sfh/PwHpy4NLEmwu+CMPvss0+J2zPC4kLFSEvyhqHFB//DH/5QOD6hXZwXNxA3EdvO6WZLriE99UDlWRDXGD2L8YkdvO997yvE9TxZgsW9SQzBKR4IwAom2e83YycZE9PwDO4FxAlzdzP+pnN7DoBwYdw5BEF8FvvNN99cJIPw7bve9a5qyy23LNxgQiMtTELWLuJuITxxaqITdzd5zouNELeQyHafbjbXRexEEmObGDdbI4RDXGDkdkpAJWcR/e4ZjMuzc09FEwHBmJWpmRdzRIo4x595aAokdfNsxc6oLxDR7cWGOz++e3xvyBY69Z1xtfvuu1eveMUrCjeYTBMXaz0+Oj9ewOUrX/lKIQYuNzkAgNtY2s4xef6bZPchAZqs8KZnNgZjcr0QB7F8T7jYMcbvN1FGgSlAYCfYZxwAmziDZ6fafvSjH1UHH3xwMS6Bg+53L/sQvm7rNI1zrPt7DoBYszjaQyU6xsCj51ddddXy8ESfY8JRCGmC+fMnn3xydeWVVxb3K7kB+02QyaQ+XDt+d7yDVAONdXKcFxsifn241H2TmwCMGHaOZyguv/zy1UYbbVQSTcLOyTY6FhAydjYB24DbGKC4r/vEU+hm/E3n9hwAMZZwvclhNEm6rLHGGmVsibXjbJ8TnmU0KdH61a9+VSYT4VOijdBZ2SwuYbjL/6gdYErApmkiRtrvev7ingFCQsyIntKx3DN5iEggYxdWFkNI/CBjQnAg8gzsGWqBlEuKOupwrGOfm/O6BsBwg8ykZXKgfK211iouXfxnho+JJMoRKqlbbtNHP/rR6ic/+UmZmCRiRnqYbq38uZmk0Y5pymWkBP3Zz352sXOoO9IOmJNSdkzUmudn5J577rllfurP31n4EunazTP0HAD0mbj9O9/5zqHyqvj7SeUiND0vkHPOOecUSZEoX5MRNNEBUI9heG51ByQgw5c6AATGZPIK5oJKBID3vve9c6zRNCkBQMzR4yx8D8kGYPVCN+IxmqRWHWMfY4mIrLuLoyF8ogMgnO55STrPKHdBGlILYh02mUXGJcBQAULKgkwkpa2zcCTfmyRQk3TouQSAZlG6DTfccMjAQ2AP/N3vfrf65Cc/WYIjuCF+v4d2jIly/mhbtxU13U5g0wQjfJpL4j1gCmoAI7zuda8rUuGpT31quZR5iI3ht0Q8m+4z1v09BwAXBwBe+tKXDoVLEf/AAw8s1n09YMIQJAJjG+CeJGpGesCJDgDc7Hl4LakVoPqoNhIRwTfddNPquOOOK8auOTAnJOPqq6/etRHbBIyeAwCHyY6RAImXC+PuuOOOlcDOk570pPLQCfawnlOcmUBP00N0s7/bZEsTAEkyRPZcnid2jzFnWV6fzzrrrOppT3vakGdEVahm5h0MZ+xFcjXdv2lueg4AXCwZwvqF7Oh3NsEVV1wxFNCJN4DjqQIgwAXxDpoeZKz7ew0AKkx9oGf32XPVu5D9hgkUnSbRZQ5EFgWU6p1JIXpdbU14ANB/jLxXvepVhQsMnijceOONq+uvv36odDqESPuWyaAziclebr0GQFrS0nOQeIVnSl7BsypSFUoGeEQH/he+8IVztKdPSAB0iqcgMpm+eAEMnUTrGHnq9kkALhAp4aEjElOnlzSxewgQiQwyioRd0xtQD/SMxU2K6knMwdh4FkLIidq5f6zzFJsaS7qHAdW4EtRKCXqsd+NCbGPlFrsXQruG65EIDGIRQ+e6lnkjATBAagWSkApojb1bI7ZrFdAtAEyMCUp1bsKfSbum5s+kqAUEFC4SfZq8eyTEWADgukBIUqWkDEGTm2e3pFyMakrQCgjFLjJ+0g1IADV2jPElYpkqpMQ1EsJOKrhvAZDFGBJuDcoR1WeTjgtwjHAyrhRVFC+47LLL5vCPxwIAQMK5rs1OkckDCEGYP/7xj0N9ASQOqeD/n/70pzIu1UHCu/H15QCErhGddHBssnyeBScnPZ74hTH3tQQwQdGL9QpgHINb6MJU+eAa5Vg8CJMunawnoBsJYPIRTq0ht1Ql8NVXX11qExApqWCAY7OIUGoyVaOomcRGShgP9cFqP+mkk6pvfetbJY4RNYLwyWWk8MPzxDboWwlAbKYAwmSSCNGz6a9Lo4UcAVvCpBLBMoSbb755VwAgATSCahPD9XT0XnvtVSKTVg5JQunPf/5z0dEaS+QzgBXBcXpqFhA4BSiMOi1qSW+TKsYNUCSJ68bG6WsJAAB0pi0p1+hQ3BG3UMpULCG2AX1Nb6+//vpdAcA9if9vfvObpRIJlwvTpuQ89QA4X8UP9xUhjRsAfvnLX1a//vWviw+/3nrrFY4OCH784x+XHAhVojglxaPxbqIW+hoA0ZHUQMCQ0m161m+XXHJJIXIKP4SORc0YYZtssklXAAAkUkQPge3YY4+t9ttvv2JjIDSjDgGlaiVxWOe2X/ziF0UVGAvuZiiuttpq5VxRT89DkpEsonykmfGnYynFK6RAXwMg7hbuII5T509/0sfCyJECVAFRLHDi2PFQAQiBaIpTeBziFQCHKMYGIGLysnNAQXQrSSMJgNM4U9xJkhgXNfH617++SAgif+utty5t5uH8NKo41v6+BgAxKCmCs5IHYEjhtve///1l0hINUz5GKhx66KFFnDqOBHCNWNWdUbLUCaYqOR1C8bdZ8VYCUZ5GDSjujM8PEIiLoPoEk77F4bp/SCGcn/qHlKipctIllKJPxqVuJsYiUNVtnhSwMAIB27hSTEKlJG4Q99j/KRUHMIm4OsYfLldKpSgiuXREs6jTZz/72bJ0i8840XkSKaMBIO5k3C8TSE/T6US7km7rBpEyjD+qIGKZuAYM9+UlMPw0oCCmfWkTy/oDniG1fVQJT8G1FLdoacs5iBrJZ7979y0ATABOS308t4/oP+KII4rRxyXTAZy8AYK95z3vKRMrIJTCy5EkQJIw6fyNmiG6AQjXr7322sX4QzBEBji6n34HMGVa8fVV9eDodA2n1q8exQQCksQzpLZRWZhqYBKNqmAUki59DwCE94cYJgfHXXfddaVQ4tWvfnUh0FVXXVUCLrKIiI9jTbKMWZMKwJ3pD0zzZ4is+whxqRX5CpztPq5tLO7nN4RMx7D7XXzxxUX8ZxFKnkk6eZwn3S1Y9Z3vfGdocQnA5VoCXlLE6SnoawkQTjDBaRSpu3p+15Ur6KO2QGqZa2USiXD6eDQVgPNFERE17VjUByJRM1w+HMlnZ9wlqENSAJgyNSVtyVaSSgCakrW4iVQLO4Y9w/ij/wGFBKAaqBHjFjfwPeXsqWDuWxWQUikTatIZVybJdyIepxHP6c8nWkUD6VAAYC802QAmHJBShpawrrp8ANTIyaVLG1cCUkDzxS9+sQDQeBBeuBh4UuSRtra0epFg6W/43ve+N7SMjHQvz4HqYNtI9/Iq0p3ctwBInz8LOz1zCEG8AgQi4D6umAWaROtY5Vmho8kGqJd1kwDAAgAIrssI4dTuWwAKyHBvAlLuLaKnhB3B2SGigOnwSbkWEZ6ilvQiGLtzrWJi/MDmXM/oWGNIxLOvVYCJimVu8ohR3JZFnUNABMdZH/zgB0t5NeOJtJALGE0C1N2nRIyyjgDpQbXgTGsA2NJngGhyBF/72tdK7YLv1hwgAYwjMQLcbF9Ku43F2D0Dj0K+wG84nCcAAHoFkzVMXUDfSoDU/yV3Xk8vh3jJh/MQSAANpCkl7zQC6dx6uZTvxD/dTO8iHq7k++M8zSeuSdWk9Sv/EdWCEww6dgSVwzdHvHQtBwiInNoG3E2NSQrpBwByncxsgCxFkyLYvlcBYwEAgiGsUHBnHKATAAERYiIE7tSPx5bwmwigoE2s/ywC6VjGoUWkRfIAx3ccjXhsB/9tVIJaBQBzP4CzX/QwZd84nMHpuukudq7Pfa0CxgsA9Tr5ugTwe4xAXIpQmk/EGqwmIv9PsmQVkDSW4nJuoICO9DOi4voNNtigGKckStYDSP4fQCLBSAzXTxEJl5DdQQXUy98QvwVAxytf6rVvCBgVkFU9qQCTKI07XBzA+c7LHz3tz/FCzOwInPihD32o+PhZiRSBU4CCUES+cLTj2Q2kh6ZWtkBUlusaH+7PK2YYkQDFDaQOHCN8bW0AwEkpV4pfWgDMJQBiA6Rlqg6AlFrFaAzxASUNqoh0/vnnF72Mo6kPsQU+u+/OAQwJIADgqkkOiRdkUSj5CK6h/YkBICCDkeHn/s4T+eP7R9czNLmbaYM3XvdqbYCHGkRHMgLrEmA4AMQGqAMg10oxpu/CujwGxMOR6vBl7Bh/CBivI6uGJnOnKIT+TtGodQqsTyjhg7vTxh2XFQgAU9SPzjcugLLYFQnjXsl41pehbb2AWv9bZ/nzcF6AY2QDxe/jBiaCWAdAzhXV04am2YKriYhsASI5PjwiImhqEf2OQ4WJ3Qc4xPNFDYExmTsGYhaQ8hvQWJbWK2iMU4xBoilxhnQFZxWQVgWMogLim5vIugTwOwAIBWeNoE4AIGTi9CYZ11sDWG5BEYj9adlC/KR/064GDAw7/jt3kTiP7WBlMq5eUsDOcS3xhAMOOKC4limDf+1rX1udd955xdMgiZxnSwdUXwOAHx0Cpo0qTSGqb5POZZ2bMG6b6hybghBBGhwoW5eiEscm/ZtVSRh/In6se8Rj3HkbSMrRhsqKOj4gDhCQFur0E/ThRn79618vIOJREPtEOwNVwipLxWt/0wCaWgcg5olk7aJUDlkXwHVSIMte6Yt6gIjDFH6EI02E9mhiE4ETYvWiJyFVhGV4SdYgQiJx9CzxG2Mr8X9LsCTtSzcT5cR/04shXTvEcF3WfRaalhbm68sNsAm4lMLGWVMIWEgaEodaYGjyZNL1zOOgZripfQsAhGeAsaoR1AQjokn8wQ9+UKpkEMkkpa06vjWwOM6WrBq1gFNxmes5B1HE5YECEVnyKUdvkgAASmTLQ+BkgaF0LqVvMcvAGQcweAaeAJdR7aD7GrPjSBSg9MzpM+hrACB8LHCiNmVWJkcGTU8AItUXZ8ZZ9HHKq9KKZXKpBQYbLkME54r8CcPaLDvL4nZuVvUcSfz7PW8PBQIqiZhW6CknkCggIMSecD+SQdpaniGvowFG40xdIXWWJti+BkAWQ0h0zKTQkwiewssUcsS6j/WNO9NTmAaLlHinpczkKirxyjjFnsK6pEUWnZwbCeAayRKmH0CJGNdOOXikkwAR1aIAlNTiElJfxuY+QJnGTwDMYld9DYAs146j84YNk5eIXAI60fOx9LNqV6xv3wHDcQy9LEerduADH/hAsc65gfzzuhhuWoSKBHCM+2YFk5SfCSIhchZ0SKjZWOh7qgBgEuyhrlzPOJ2X/sO+BoCJwBUpuUpghd7ku6er1uTWF1RIW1UaS10jFrpzk6gBKtxPN+sldA33TNNniDmSGsC1CkGoIpKDdAIwRCRFWPPGzKBk6RP77pmCFedlgQjSIOdFjaViqG+NQIRAPBOBw0xWauaynkAWgKyv2JmmUscmoIITs75AQsB1yZEVOvxGQqQgdTQbIF2/7AWfsyIoVWO8afi0j6j3PUZiGk95NBm7c9zf+WkXm9QSIImX+iQmHu+/wAcdzKdNUMfD86NZ+Ymf19O2aQlLanY0AiULONIxsS1G2t8kAUa799zsA0jPARjulZJzzwiEwAu4Ygp5i7nfqQoxjqwSNjf3GssxXa8P0AQADyB+zqePOKf7fFeEGXGahE0IZrJwVQI6Iz3cRAdAun8CtOQP/A78XENhZOliaiNShcoS82iKU4yF6HMwa7eLRTcBAMKlQYVD4yoBAAufxeyBs5BC6v/8lsKKNIdMVgAkkhn1kJBzVhRBfGlnNoAydRID8BFeqpvN0cut5xLAA2jrloRJxk4kzds2xMdjJAFKpEFW5ACMpq1JAiSxNFYANd2/aX/8/bi7eTcCIDAihZAVtkoYCU3Hy2ELPeUpT2mUgE33b9rfcwAgpuibVCxkJ3LnVe1y8zpnY5zhivpaeo71vRsbYEEDIG4mjk5IO4UjxLywtqXldRbzhBxPUgpiqT6qrxLWRMyx7O85ALhJXp4ka4cbSIS87AHaiT/VMkBCCmTdQMCZGyu9SQKMZVLG8xzPQM+TAMR93itsBRItbww9W95ZnG4hgAEA5/Zy6zkAIFgmjshHeFteBcfgS2UMjwAQ1M8LoOASHkRToGaiAwBBxQgAWuBI5FBZu4qhJMCoBZ9Tu0jyWXSC1Gx6/m7B0XMAeHAPwerX6wfVKdWOLx9Xia9tPQAZProxeYBuVEC3E9Tt+dHzQK3FXJuZfAfgp7GkvkyOQJJopfoDxnDspm7HMdL5XQOgaWCx8IkygQ/VNKpsZesi7hIk8bCOl3T5xCc+UerqqQ3Bl8T93S8hX9zfWQuYGETG1a2fTy1lUae8ICJL3jLUiHiSjchOx5DxZZ/fZBFJQEvEZ6lYxxh/7CLXlmlUfaTqGHAcE5A0zfNY9/ccAEmKpHnSA2nz4hWYlJRhZb29LKGCcDqGZd4UUzKKZORMmslyPLD4n7BvYvZ55479TUZg08QZr7+sGOL+eZl11gegv1MaDhxUF2BYRo76U4SK621ZdMp+n41ZrQLia4W3JT+Sl2E3jbGb/T0HQMKhJi4191KjxBvLV1k2zkixpP+2FFACgi4e6w1feumlpawqlbs4hCVNVbi2CGO4MNZ0tyI0/YQIbCwpMWfbJG4RYBoLogK4ohN9AGlq9UzGZ5yRZhpbVCbxiOxL6jggcWyvl8rtOQA8eOLxWUnTA7KGM6mCRMq1dNEAhwcHkOQCwi04RWMoyYDoKctGiHT+hPC5djfc4VwSJNk84ARMHM9IpcYQiNTi7VBxysiVrXmRpM3+1P8nwMUY5PV4bRx1FzUSglN7TRHQbp8r5/ccADgla+kSaanbA4aI/3gF7AP1dERgXvkWfYqgqdVX4OGlUlmDz/EBSfIIJA7CJO4w1gnLCiPOT+IpQZ30BwIg41baWdmZDcCpoHrVj7lQmKqm0YqinodEC4iSCU2lEanQ7Wvvmp675wAIkhHQ51TBZFHmcCxOM0HEp9U01NfZEkL1OSFSk6JEi7fAfQwQ6hm52AfdBlJcO4WaqfJN8SqQcutUAPNwbKx4Mf68BCrSg3vLnlGNJOLJJkh6OXrfmIEWeHPfrJ7aRMix7u85AMKFJjEWdVbqSmrUJCVTlgUgvV6OfjTBWVnTceEO1wAojR46cCzKSCQLtqgjwJ28h26TKe7heqQYtcNCZ5CyX/IyrCz1VjfsIrmIeNFOreIIKyaA8FldzPNkXcTYQSll79aDmRtQ9BwABpF35eB6QEhqNBZ6OCueQDifdc9lBIZ11lmnPE/EIg7JIguqfUwwt9GEi6lTMazxuGxzMxnDHYOQAEhMM/IATFmZ2kJt5vUt3IqTNZYqJZcHCVfXVz2LKkyRiDkBjKw4kpK2GMVjHX/TefMFAKMNoilfHxtCG5dAioBKCi5wiP0p1WJNM64s6sDeiJhNWDleSIzL+OAmP7WBKUvHhUS1fQzThGbF7bM8bcK3sQ+y4odgluXs6HlSaLRtQUcyJzwAEA8XIIyuHoUkLO2syoWr6nYCwiuu4DFYny+Wd2IEeQFDJENeS4MQwOR6WfIFwEghhhq7RNzCcdRUwGF/spaKTgWw3N8WL6EFwCgz0CQBsnATIiMQ4ij71ttHLSBGLOW6xU78Kzj58Ic/XApC86IHqiPXQjz9e6KUgIGoiInj3Yu4J+qpIbo72brkMKgwnyW0qB/SB2C5gylTa4rk9b0EaIrUEb0IEV8f5yIoguDIqIXYB/4n+MJeIBGsNG49wFT4pjIJ8ZKpi9VOz9ukafUSiOIlZA1g9DzDDYEBxXsBJLGsVySTGfVC4rhW1NNIPNACYGBgVB1pQpNHT3IEaACDdW7SdfpQDcmmxcBKcYUbiCKKs/PDERGX2g8kRDxJgqDazbl1av5tLPQUdcSI85taBmpGlFKzSELSAXTcvyaA9z0AmqxU3Mf9oqsRnBGY6t/U/yMci5yBljeIpOsnXMs3twGAZV9SIg5A2slIFHF7QEJMkoO6SDo2fQiikNw64t5vopckEqngj5uI6HllTIzLVgI0UXqE/YhBTNPzJpgYN8EIg8hZ0DkulKXfSASLOcXFSgbOuaQI8S0MK6LIXUN4NkXWCsgqYe5J9aSMW8xBy5d74nog4QmwI9gH4h6Dl00AAALgSURBVAPUj/OM2fjquYDhHrGVAA3AiMGF6xE+L1oAjMQBEkfwP/X2wsqIigAIGH86nUYIy1B0DXF710dQ4IjeToAKWEgNRaxUR7051XmuAWxJFAGDc927KZnTAmCMkmG406Jv63r3qKOOKquOBwh5V49jEniKJ5JmERID9/LjJamI+CwCFfWTGEK32cZxfPwxXWqBxwHGNOoRThoOAHQyi179neaUepYtLeUIj5BxJzV5cuv8adZAfG4hteP8LCMzN40r4/l8vbjWlAdAxDhwCCnjaETNGgRZWMLkSuQozBDJY3AieDicakgIO4Zd+hN7QZj5dc0pDwA6NoRjH/Ai2AYqkuhzwMDh3gSC40UPGZt5FxBiJ7OYpWwQJyVd84tQvbrPlAdA3vSB09OTz/JfffXVS/4esaWVBXTk57NgBWJLYsUjSP0eQmSxCuBoimT2inDjdd0pD4C4jiaMJEhpGmNQ5hAoiPqkpgMYv0XUp08RKBA8Yd4WAOMFw3G6znBGYN7uGVdNKDlGn7QxNy3VvkQ9Iqdkm6sooBPRj/jpYjbk4foix+lR5ttlprwEQCTER0QuXN7Zl1Ct7wCAqxl1AQeJ4HggCOfHbUyVURJL841aPbjRlAJAD+Znyl+yBcCUJ/HoD9gCoAXA9ME+n4O+fvxWAvQ1+auqBUALgFYF9DMGWgnQz9QXzOpcJSwFCp1Rrz6fp0n7+Elapcuos0ZxYMaMGYP5MdUyedqpEOqctJQbp4F30rC+gEYpmp05c+bD3EA7RkLMOI2rvcx8moFOid552zlUQB0dAJCFHefTWNvb9GAGQsOkrR8m5adNmzaYHx0U3R8p0FTX3oMxt5ccxxlAx06aZsGKwvBUQFKgaeHuNBzGcTztpRbADNQNelnQVEmpjxiYNWvWYGrqs6MFwAKgUg9vWQcAZsfoUtnS2wOzZ88eTLFE8t4BQA7u4djaS/d4BsLUKWTJQhx5N+L/AfjNYarLl7XXAAAAAElFTkSuQmCC';
+
/**
* Run the migrations.
*
@@ -39,4 +40,4 @@ public function down()
{
Schema::dropIfExists('users');
}
-}
+};
diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php
index 0ee0a36a4..fcacb80b3 100644
--- a/database/migrations/2014_10_12_100000_create_password_resets_table.php
+++ b/database/migrations/2014_10_12_100000_create_password_resets_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class CreatePasswordResetsTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -29,4 +29,4 @@ public function down()
{
Schema::dropIfExists('password_resets');
}
-}
+};
diff --git a/database/migrations/2019_08_19_000000_create_failed_jobs_table.php b/database/migrations/2019_08_19_000000_create_failed_jobs_table.php
index 6aa6d743e..17191986b 100644
--- a/database/migrations/2019_08_19_000000_create_failed_jobs_table.php
+++ b/database/migrations/2019_08_19_000000_create_failed_jobs_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class CreateFailedJobsTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -33,4 +33,4 @@ public function down()
{
Schema::dropIfExists('failed_jobs');
}
-}
+};
diff --git a/database/migrations/2021_02_06_182407_create_notifications_table.php b/database/migrations/2021_02_06_182407_create_notifications_table.php
index 9797596dc..4357c9efa 100644
--- a/database/migrations/2021_02_06_182407_create_notifications_table.php
+++ b/database/migrations/2021_02_06_182407_create_notifications_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class CreateNotificationsTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -32,4 +32,4 @@ public function down()
{
Schema::dropIfExists('notifications');
}
-}
+};
diff --git a/database/migrations/2021_02_07_173938_create_locations_table.php b/database/migrations/2021_02_07_173938_create_locations_table.php
index 921f766ae..cbb839090 100644
--- a/database/migrations/2021_02_07_173938_create_locations_table.php
+++ b/database/migrations/2021_02_07_173938_create_locations_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class CreateLocationsTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -30,4 +30,4 @@ public function down()
{
Schema::dropIfExists('locations');
}
-}
+};
diff --git a/database/migrations/2021_02_07_173939_create_nodes_table.php b/database/migrations/2021_02_07_173939_create_nodes_table.php
index e24a2b5dc..839afb3ea 100644
--- a/database/migrations/2021_02_07_173939_create_nodes_table.php
+++ b/database/migrations/2021_02_07_173939_create_nodes_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class CreateNodesTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -31,4 +31,4 @@ public function down()
{
Schema::dropIfExists('nodes');
}
-}
+};
diff --git a/database/migrations/2021_02_07_173940_create_nests_table.php b/database/migrations/2021_02_07_173940_create_nests_table.php
index d9ced4173..fe06c8da6 100644
--- a/database/migrations/2021_02_07_173940_create_nests_table.php
+++ b/database/migrations/2021_02_07_173940_create_nests_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class CreateNestsTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -30,4 +30,4 @@ public function down()
{
Schema::dropIfExists('nests');
}
-}
+};
diff --git a/database/migrations/2021_02_07_173941_create_eggs_table.php b/database/migrations/2021_02_07_173941_create_eggs_table.php
index 57aba4e30..20ad4243d 100644
--- a/database/migrations/2021_02_07_173941_create_eggs_table.php
+++ b/database/migrations/2021_02_07_173941_create_eggs_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class CreateEggsTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -34,4 +34,4 @@ public function down()
{
Schema::dropIfExists('eggs');
}
-}
+};
diff --git a/database/migrations/2021_02_07_173942_create_products_table.php b/database/migrations/2021_02_07_173942_create_products_table.php
index 1cb9ef677..7cbacb49c 100644
--- a/database/migrations/2021_02_07_173942_create_products_table.php
+++ b/database/migrations/2021_02_07_173942_create_products_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class CreateProductsTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -39,4 +39,4 @@ public function down()
{
Schema::dropIfExists('products');
}
-}
+};
diff --git a/database/migrations/2021_02_07_173943_create_servers_table.php b/database/migrations/2021_02_07_173943_create_servers_table.php
index 6a90c693d..e5f03205c 100644
--- a/database/migrations/2021_02_07_173943_create_servers_table.php
+++ b/database/migrations/2021_02_07_173943_create_servers_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class CreateServersTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -37,4 +37,4 @@ public function down()
{
Schema::dropIfExists('servers');
}
-}
+};
diff --git a/database/migrations/2021_02_08_190205_create_activity_log_table.php b/database/migrations/2021_02_08_190205_create_activity_log_table.php
index cb4f3cc5c..69a504e1e 100644
--- a/database/migrations/2021_02_08_190205_create_activity_log_table.php
+++ b/database/migrations/2021_02_08_190205_create_activity_log_table.php
@@ -1,10 +1,10 @@
dropIfExists(config('activitylog.table_name'));
}
-}
+};
diff --git a/database/migrations/2021_02_16_162655_create_payments_table.php b/database/migrations/2021_02_16_162655_create_payments_table.php
index 7c7d6f073..39710646c 100644
--- a/database/migrations/2021_02_16_162655_create_payments_table.php
+++ b/database/migrations/2021_02_16_162655_create_payments_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class CreatePaymentsTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -17,12 +17,12 @@ public function up()
$table->uuid('id');
$table->foreignId('user_id')->references('id')->on('users');
$table->string('payment_id')->nullable();
- $table->string('payer_id')->nullable();;
- $table->string('type')->nullable();;
- $table->string('status')->nullable();;
- $table->string('amount')->nullable();;
- $table->string('price')->nullable();;
- $table->text('payer')->nullable();;
+ $table->string('payer_id')->nullable();
+ $table->string('type')->nullable();
+ $table->string('status')->nullable();
+ $table->string('amount')->nullable();
+ $table->string('price')->nullable();
+ $table->text('payer')->nullable();
$table->timestamps();
});
}
@@ -36,4 +36,4 @@ public function down()
{
Schema::dropIfExists('payments');
}
-}
+};
diff --git a/database/migrations/2021_03_24_073828_add_ip_and_last_seen_to_users_table.php b/database/migrations/2021_03_24_073828_add_ip_and_last_seen_to_users_table.php
index 88f16ddd6..30efcff8a 100644
--- a/database/migrations/2021_03_24_073828_add_ip_and_last_seen_to_users_table.php
+++ b/database/migrations/2021_03_24_073828_add_ip_and_last_seen_to_users_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class AddIpAndLastSeenToUsersTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -31,4 +31,4 @@ public function down()
$table->dropColumn('last_seen');
});
}
-}
+};
diff --git a/database/migrations/2021_04_11_190944_create_discord_users_table.php b/database/migrations/2021_04_11_190944_create_discord_users_table.php
index 6d556704e..dcbccc704 100644
--- a/database/migrations/2021_04_11_190944_create_discord_users_table.php
+++ b/database/migrations/2021_04_11_190944_create_discord_users_table.php
@@ -3,9 +3,8 @@
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-use Illuminate\Support\Str;
-class CreateDiscordUsersTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -40,4 +39,4 @@ public function down()
{
Schema::dropIfExists('discord_users');
}
-}
+};
diff --git a/database/migrations/2021_04_11_195141_add_discord_verified_at_to_users_table.php b/database/migrations/2021_04_11_195141_add_discord_verified_at_to_users_table.php
index fc5520650..406e708f1 100644
--- a/database/migrations/2021_04_11_195141_add_discord_verified_at_to_users_table.php
+++ b/database/migrations/2021_04_11_195141_add_discord_verified_at_to_users_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class AddDiscordVerifiedAtToUsersTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -29,4 +29,4 @@ public function down()
$table->removeColumn('discord_verified_at');
});
}
-}
+};
diff --git a/database/migrations/2021_05_04_155305_add_disabled_to_products_table.php b/database/migrations/2021_05_04_155305_add_disabled_to_products_table.php
index 8889e0bfc..d10d893f2 100644
--- a/database/migrations/2021_05_04_155305_add_disabled_to_products_table.php
+++ b/database/migrations/2021_05_04_155305_add_disabled_to_products_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class AddDisabledToProductsTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -29,4 +29,4 @@ public function down()
$table->dropColumn('disabled');
});
}
-}
+};
diff --git a/database/migrations/2021_05_06_123125_update_make_description_nullable_to_locations_table.php b/database/migrations/2021_05_06_123125_update_make_description_nullable_to_locations_table.php
index 141c1756b..f5d5a7508 100644
--- a/database/migrations/2021_05_06_123125_update_make_description_nullable_to_locations_table.php
+++ b/database/migrations/2021_05_06_123125_update_make_description_nullable_to_locations_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class UpdateMakeDescriptionNullableToLocationsTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -29,4 +29,4 @@ public function down()
$table->string('description')->nullable(false)->change();
});
}
-}
+};
diff --git a/database/migrations/2021_05_06_131634_update_make_description_nullable_add_disabled_to_nodes_table.php b/database/migrations/2021_05_06_131634_update_make_description_nullable_add_disabled_to_nodes_table.php
index 152c39acf..a56167804 100644
--- a/database/migrations/2021_05_06_131634_update_make_description_nullable_add_disabled_to_nodes_table.php
+++ b/database/migrations/2021_05_06_131634_update_make_description_nullable_add_disabled_to_nodes_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class UpdateMakeDescriptionNullableAddDisabledToNodesTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -31,4 +31,4 @@ public function down()
$table->dropColumn('disabled');
});
}
-}
+};
diff --git a/database/migrations/2021_05_06_140859_update_make_description_nullable_add_disabled_to_nest_table.php b/database/migrations/2021_05_06_140859_update_make_description_nullable_add_disabled_to_nest_table.php
index 5bbc48d61..02111c504 100644
--- a/database/migrations/2021_05_06_140859_update_make_description_nullable_add_disabled_to_nest_table.php
+++ b/database/migrations/2021_05_06_140859_update_make_description_nullable_add_disabled_to_nest_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class UpdateMakeDescriptionNullableAddDisabledToNestTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -31,4 +31,4 @@ public function down()
$table->dropColumn('disabled');
});
}
-}
+};
diff --git a/database/migrations/2021_05_06_150709_update_make_description_nullable_to_eggs_table.php b/database/migrations/2021_05_06_150709_update_make_description_nullable_to_eggs_table.php
index 23958ae94..5c42ff099 100644
--- a/database/migrations/2021_05_06_150709_update_make_description_nullable_to_eggs_table.php
+++ b/database/migrations/2021_05_06_150709_update_make_description_nullable_to_eggs_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class UpdateMakeDescriptionNullableToEggsTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -29,4 +29,4 @@ public function down()
$table->text('description')->nullable(false)->change();
});
}
-}
+};
diff --git a/database/migrations/2021_05_07_065911_update_to_servers_table.php b/database/migrations/2021_05_07_065911_update_to_servers_table.php
index 862b81f5a..90e6c050d 100644
--- a/database/migrations/2021_05_07_065911_update_to_servers_table.php
+++ b/database/migrations/2021_05_07_065911_update_to_servers_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class UpdateToServersTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -35,4 +35,4 @@ public function down()
$table->dropColumn('config');
});
}
-}
+};
diff --git a/database/migrations/2021_05_07_162701_remove_config_from_servers_table.php b/database/migrations/2021_05_07_162701_remove_config_from_servers_table.php
index 1fb904fa2..e519f45d1 100644
--- a/database/migrations/2021_05_07_162701_remove_config_from_servers_table.php
+++ b/database/migrations/2021_05_07_162701_remove_config_from_servers_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class RemoveConfigFromServersTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -29,4 +29,4 @@ public function down()
$table->string('config')->nullable();
});
}
-}
+};
diff --git a/database/migrations/2021_05_08_081218_create_paypal_products_table.php b/database/migrations/2021_05_08_081218_create_paypal_products_table.php
index 207e4313b..2fd8f2f41 100644
--- a/database/migrations/2021_05_08_081218_create_paypal_products_table.php
+++ b/database/migrations/2021_05_08_081218_create_paypal_products_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class CreatePaypalProductsTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -34,4 +34,4 @@ public function down()
{
Schema::dropIfExists('paypal_products');
}
-}
+};
diff --git a/database/migrations/2021_05_08_164658_create_configurations_table.php b/database/migrations/2021_05_08_164658_create_configurations_table.php
index ca5cb6f01..0c0f03ec8 100644
--- a/database/migrations/2021_05_08_164658_create_configurations_table.php
+++ b/database/migrations/2021_05_08_164658_create_configurations_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class CreateConfigurationsTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -21,6 +21,7 @@ public function up()
$table->timestamps();
});
}
+
/**
* Reverse the migrations.
*
@@ -30,4 +31,4 @@ public function down()
{
Schema::dropIfExists('configurations');
}
-}
+};
diff --git a/database/migrations/2021_05_09_153742_add_display_to_paypal_products_table.php b/database/migrations/2021_05_09_153742_add_display_to_paypal_products_table.php
index 26d614922..ff78e519d 100644
--- a/database/migrations/2021_05_09_153742_add_display_to_paypal_products_table.php
+++ b/database/migrations/2021_05_09_153742_add_display_to_paypal_products_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class AddDisplayToPayPalProductsTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -29,4 +29,4 @@ public function down()
$table->dropColumn('display');
});
}
-}
+};
diff --git a/database/migrations/2021_05_15_211643_create_jobs_table.php b/database/migrations/2021_05_15_211643_create_jobs_table.php
index 1be9e8a80..a786a8910 100644
--- a/database/migrations/2021_05_15_211643_create_jobs_table.php
+++ b/database/migrations/2021_05_15_211643_create_jobs_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class CreateJobsTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -33,4 +33,4 @@ public function down()
{
Schema::dropIfExists('jobs');
}
-}
+};
diff --git a/database/migrations/2021_06_06_144120_create_application_apis_table.php b/database/migrations/2021_06_06_144120_create_application_apis_table.php
index f429fecc2..470a36b1c 100644
--- a/database/migrations/2021_06_06_144120_create_application_apis_table.php
+++ b/database/migrations/2021_06_06_144120_create_application_apis_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class CreateApplicationApisTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -30,4 +30,4 @@ public function down()
{
Schema::dropIfExists('application_apis');
}
-}
+};
diff --git a/database/migrations/2021_06_09_213306_create_useful_links_table.php b/database/migrations/2021_06_09_213306_create_useful_links_table.php
index c6fc73373..64ed052ab 100644
--- a/database/migrations/2021_06_09_213306_create_useful_links_table.php
+++ b/database/migrations/2021_06_09_213306_create_useful_links_table.php
@@ -2,10 +2,9 @@
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
-class CreateUsefulLinksTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -33,4 +32,4 @@ public function down()
{
Schema::dropIfExists('useful_links');
}
-}
+};
diff --git a/database/migrations/2021_06_23_090026_update_price_to_payments_table.php b/database/migrations/2021_06_23_090026_update_price_to_payments_table.php
index a3bb56afe..6686007ab 100644
--- a/database/migrations/2021_06_23_090026_update_price_to_payments_table.php
+++ b/database/migrations/2021_06_23_090026_update_price_to_payments_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class UpdatePriceToPaymentsTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -26,7 +26,7 @@ public function up()
public function down()
{
Schema::table('payments', function (Blueprint $table) {
- $table->string('price')->change()->nullable();;
+ $table->string('price')->change()->nullable();
});
}
-}
+};
diff --git a/database/migrations/2021_06_23_090806_add__currency_code_to_payments_table.php b/database/migrations/2021_06_23_090806_add__currency_code_to_payments_table.php
index 3e6710bb9..4e3cbd81d 100644
--- a/database/migrations/2021_06_23_090806_add__currency_code_to_payments_table.php
+++ b/database/migrations/2021_06_23_090806_add__currency_code_to_payments_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class AddCurrencyCodeToPaymentsTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -14,7 +14,7 @@ class AddCurrencyCodeToPaymentsTable extends Migration
public function up()
{
Schema::table('payments', function (Blueprint $table) {
- $table->string('currency_code' , 3)->default('USD')->after('price');
+ $table->string('currency_code', 3)->default('USD')->after('price');
});
}
@@ -29,4 +29,4 @@ public function down()
$table->dropColumn('currency_code');
});
}
-}
+};
diff --git a/database/migrations/2021_07_06_152319_create_egg_product_table.php b/database/migrations/2021_07_06_152319_create_egg_product_table.php
index 4271f80b7..0ebd0dc05 100644
--- a/database/migrations/2021_07_06_152319_create_egg_product_table.php
+++ b/database/migrations/2021_07_06_152319_create_egg_product_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class CreateEggProductTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -29,4 +29,4 @@ public function down()
{
Schema::dropIfExists('egg_product');
}
-}
+};
diff --git a/database/migrations/2021_07_06_154314_create_node_product_table.php b/database/migrations/2021_07_06_154314_create_node_product_table.php
index 0bb798c67..b0d2c57c3 100644
--- a/database/migrations/2021_07_06_154314_create_node_product_table.php
+++ b/database/migrations/2021_07_06_154314_create_node_product_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class CreateNodeProductTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -29,4 +29,4 @@ public function down()
{
Schema::dropIfExists('node_product');
}
-}
+};
diff --git a/database/migrations/2021_07_06_154658_add_disabled_to_eggs_table.php b/database/migrations/2021_07_06_154658_add_disabled_to_eggs_table.php
index 353cf99b1..bbc9ff158 100644
--- a/database/migrations/2021_07_06_154658_add_disabled_to_eggs_table.php
+++ b/database/migrations/2021_07_06_154658_add_disabled_to_eggs_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class AddDisabledToEggsTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -29,4 +29,4 @@ public function down()
$table->dropColumn('disabled');
});
}
-}
+};
diff --git a/database/migrations/2021_07_09_190453_create_vouchers_table.php b/database/migrations/2021_07_09_190453_create_vouchers_table.php
index 30a58d92b..481674b38 100644
--- a/database/migrations/2021_07_09_190453_create_vouchers_table.php
+++ b/database/migrations/2021_07_09_190453_create_vouchers_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class CreateVouchersTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -33,4 +33,4 @@ public function down()
{
Schema::dropIfExists('vouchers');
}
-}
+};
diff --git a/database/migrations/2021_07_09_191913_create_user_voucher_table.php b/database/migrations/2021_07_09_191913_create_user_voucher_table.php
index b75f7d262..bebf1bb1c 100644
--- a/database/migrations/2021_07_09_191913_create_user_voucher_table.php
+++ b/database/migrations/2021_07_09_191913_create_user_voucher_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class CreateUserVoucherTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -29,4 +29,4 @@ public function down()
{
Schema::dropIfExists('user_voucher');
}
-}
+};
diff --git a/database/migrations/2021_07_10_062140_update_credits_to_users_table.php b/database/migrations/2021_07_10_062140_update_credits_to_users_table.php
index bce7b3441..ef4e069d7 100644
--- a/database/migrations/2021_07_10_062140_update_credits_to_users_table.php
+++ b/database/migrations/2021_07_10_062140_update_credits_to_users_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class UpdateCreditsToUsersTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -29,4 +29,4 @@ public function down()
$table->unsignedFloat('credits')->change();
});
}
-}
+};
diff --git a/database/migrations/2021_09_26_150114_add_suspended_to_users_table.php b/database/migrations/2021_09_26_150114_add_suspended_to_users_table.php
index f3b83a556..9f95c4864 100644
--- a/database/migrations/2021_09_26_150114_add_suspended_to_users_table.php
+++ b/database/migrations/2021_09_26_150114_add_suspended_to_users_table.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class AddSuspendedToUsersTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -29,4 +29,4 @@ public function down()
$table->dropColumn('suspended');
});
}
-}
+};
diff --git a/database/migrations/2021_10_01_200844_add_product_minimum_credits.php b/database/migrations/2021_10_01_200844_add_product_minimum_credits.php
index 162b52e8d..8fcd83ff9 100644
--- a/database/migrations/2021_10_01_200844_add_product_minimum_credits.php
+++ b/database/migrations/2021_10_01_200844_add_product_minimum_credits.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class AddProductMinimumCredits extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -29,4 +29,4 @@ public function down()
$table->dropColumn('minimum_credits');
});
}
-}
+};
diff --git a/database/migrations/2021_11_05_071456_add_tax_to_paymentlogs.php b/database/migrations/2021_11_05_071456_add_tax_to_paymentlogs.php
index 3796ee9ed..3ce272bf2 100644
--- a/database/migrations/2021_11_05_071456_add_tax_to_paymentlogs.php
+++ b/database/migrations/2021_11_05_071456_add_tax_to_paymentlogs.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class AddTaxToPaymentlogs extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -14,9 +14,9 @@ class AddTaxToPaymentlogs extends Migration
public function up()
{
Schema::table('payments', function (Blueprint $table) {
- $table->decimal('tax_value',8,2)->after('price')->nullable();
+ $table->decimal('tax_value', 8, 2)->after('price')->nullable();
$table->integer('tax_percent')->after('tax_value')->nullable();
- $table->decimal('total_price',8,2)->after('tax_percent')->nullable();
+ $table->decimal('total_price', 8, 2)->after('tax_percent')->nullable();
});
}
@@ -33,4 +33,4 @@ public function down()
$table->dropColumn('total_price');
});
}
-}
+};
diff --git a/database/migrations/2021_11_27_014226_create_invoices.php b/database/migrations/2021_11_27_014226_create_invoices.php
index f2716c05b..eeb365e0c 100644
--- a/database/migrations/2021_11_27_014226_create_invoices.php
+++ b/database/migrations/2021_11_27_014226_create_invoices.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class CreateInvoices extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -31,4 +31,4 @@ public function down()
{
Schema::dropIfExists('invoices');
}
-}
+};
diff --git a/database/migrations/2021_12_15_120346_update_to_payments_table.php b/database/migrations/2021_12_15_120346_update_to_payments_table.php
index 50900f298..cfca690db 100644
--- a/database/migrations/2021_12_15_120346_update_to_payments_table.php
+++ b/database/migrations/2021_12_15_120346_update_to_payments_table.php
@@ -2,11 +2,10 @@
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
-
-class UpdateToPaymentsTable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -39,4 +38,4 @@ public function down()
$table->dropColumn('credit_product_id');
});
}
-}
+};
diff --git a/database/migrations/2021_12_28_203515_rename_paypal_products_table.php b/database/migrations/2021_12_28_203515_rename_paypal_products_table.php
index b3b64dca5..460983b63 100644
--- a/database/migrations/2021_12_28_203515_rename_paypal_products_table.php
+++ b/database/migrations/2021_12_28_203515_rename_paypal_products_table.php
@@ -1,10 +1,9 @@
where('key', 'SETTINGS::SERVER:CREDITS_DISPLAY_NAME')->update(['key' => 'SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME']);
DB::table('configurations')->where('key', 'SETTINGS::PAYMENTS:SALES_TAX')->update(['key' => 'SALES_TAX']);
}
-}
+};
diff --git a/database/migrations/2022_01_14_234418_update_settings_table_allow_nullable.php b/database/migrations/2022_01_14_234418_update_settings_table_allow_nullable.php
index 20d5a0c98..c30da2741 100644
--- a/database/migrations/2022_01_14_234418_update_settings_table_allow_nullable.php
+++ b/database/migrations/2022_01_14_234418_update_settings_table_allow_nullable.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class UpdateSettingsTableAllowNullable extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -31,4 +31,4 @@ public function down()
$table->string('value')->nullable(false)->change();
});
}
-}
+};
diff --git a/database/migrations/2022_05_30_085900_rename_credits_product.php b/database/migrations/2022_05_30_085900_rename_credits_product.php
index af4759b21..deaadcc9b 100644
--- a/database/migrations/2022_05_30_085900_rename_credits_product.php
+++ b/database/migrations/2022_05_30_085900_rename_credits_product.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class RenameCreditsProduct extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -14,7 +14,7 @@ class RenameCreditsProduct extends Migration
public function up()
{
Schema::rename('credit_products', 'shop_products');
- Schema::table('payments', function(Blueprint $table) {
+ Schema::table('payments', function (Blueprint $table) {
$table->renameColumn('credit_product_id', 'shop_item_product_id');
});
}
@@ -28,8 +28,8 @@ public function down()
{
Schema::rename('shop_products', 'credit_products');
- Schema::table('payments', function(Blueprint $table) {
+ Schema::table('payments', function (Blueprint $table) {
$table->renameColumn('shop_item_product_id', 'credit_product_id');
});
}
-}
+};
diff --git a/database/migrations/2022_06_02_081655_referral_code.php b/database/migrations/2022_06_02_081655_referral_code.php
index 15cca0b7f..8c86d2ec7 100644
--- a/database/migrations/2022_06_02_081655_referral_code.php
+++ b/database/migrations/2022_06_02_081655_referral_code.php
@@ -7,20 +7,20 @@
use Illuminate\Support\Facades\Schema;
use Illuminate\Support\Str;
-class ReferralCode extends Migration
+return new class extends Migration
{
-
- public function generateCode($userid){
-
- $random = STR::random(8);
- if (User::where('referral_code', '=', $random)->doesntExist()) {
- DB::table("users")
- ->where("id", "=", $userid)
+ public function generateCode($userid)
+ {
+ $random = STR::random(8);
+ if (User::where('referral_code', '=', $random)->doesntExist()) {
+ DB::table('users')
+ ->where('id', '=', $userid)
->update(['referral_code' => $random]);
- }else{
- $this->generateCode($userid);
- }
+ } else {
+ $this->generateCode($userid);
+ }
}
+
/**
* Run the migrations.
*
@@ -32,14 +32,12 @@ public function up()
$table->string('referral_code')->lenght(8)->nullable();
});
- $existing_user = User::where('referral_code', '')->orWhere('referral_code', NULL)->get();
+ $existing_user = User::where('referral_code', '')->orWhere('referral_code', null)->get();
foreach ($existing_user as $user) {
$this->generateCode($user->id);
- }
}
-
-
+ }
/**
* Reverse the migrations.
@@ -52,5 +50,4 @@ public function down()
$table->dropColumn('referral_code');
});
}
-
-}
+};
diff --git a/database/migrations/2022_06_02_091921_table-user-referrals.php b/database/migrations/2022_06_02_091921_table-user-referrals.php
index a6fdbd836..8f377d091 100644
--- a/database/migrations/2022_06_02_091921_table-user-referrals.php
+++ b/database/migrations/2022_06_02_091921_table-user-referrals.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class TableUserReferrals extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -16,11 +16,10 @@ public function up()
Schema::create('user_referrals', function (Blueprint $table) {
$table->unsignedBigInteger('referral_id');
$table->unsignedBigInteger('registered_user_id');
- $table->foreign('referral_id')->references('id')->on('users')->onDelete('cascade');;
- $table->foreign('registered_user_id')->references('id')->on('users')->onDelete('cascade');;
+ $table->foreign('referral_id')->references('id')->on('users')->onDelete('cascade');
+ $table->foreign('registered_user_id')->references('id')->on('users')->onDelete('cascade');
$table->timestamps();
});
-
}
/**
@@ -32,4 +31,4 @@ public function down()
{
Schema::dropIfExists('user_referrals');
}
-}
+};
diff --git a/database/migrations/2022_07_12_051152_decimals-in-price.php b/database/migrations/2022_07_12_051152_decimals-in-price.php
index 4b5fff4a5..cf1a35b4c 100644
--- a/database/migrations/2022_07_12_051152_decimals-in-price.php
+++ b/database/migrations/2022_07_12_051152_decimals-in-price.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class DecimalsInPrice extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -14,7 +14,7 @@ class DecimalsInPrice extends Migration
public function up()
{
Schema::table('products', function (Blueprint $table) {
- $table->decimal('price',['11','2'])->change();
+ $table->decimal('price', ['11', '2'])->change();
});
}
@@ -29,4 +29,4 @@ public function down()
$table->integer('price')->change();
});
}
-}
+};
diff --git a/database/migrations/2022_08_01_170819_create_tickets_table.php b/database/migrations/2022_08_01_170819_create_tickets_table.php
index 5ae8cda7d..265984d02 100644
--- a/database/migrations/2022_08_01_170819_create_tickets_table.php
+++ b/database/migrations/2022_08_01_170819_create_tickets_table.php
@@ -1,16 +1,16 @@
increments('id');
- $table->string('name');
+ $table->string('name');
$table->timestamps();
});
DB::table('ticket_categories')->insert(
- array(
+ [
'name' => 'Technical',
- )
+ ]
);
DB::table('ticket_categories')->insert(
- array(
+ [
'name' => 'Billing',
- )
+ ]
);
DB::table('ticket_categories')->insert(
- array(
+ [
'name' => 'Issue',
- )
+ ]
);
DB::table('ticket_categories')->insert(
- array(
+ [
'name' => 'Request',
- )
+ ]
);
DB::table('ticket_categories')->insert(
- array(
+ [
'name' => 'Other',
- )
+ ]
);
}
-
/**
* Reverse the migrations.
@@ -56,4 +55,4 @@ public function down()
{
Schema::dropIfExists('ticket_categories');
}
-}
+};
diff --git a/database/migrations/2022_08_01_181607_create_ticketcomments_table.php b/database/migrations/2022_08_01_181607_create_ticketcomments_table.php
index 58886b457..0893e7207 100644
--- a/database/migrations/2022_08_01_181607_create_ticketcomments_table.php
+++ b/database/migrations/2022_08_01_181607_create_ticketcomments_table.php
@@ -1,15 +1,15 @@
id();
$table->unsignedBigInteger('user_id')->unsigned();
- $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');;
+ $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
$table->string('status');
$table->string('reason');
$table->timestamps();
@@ -32,4 +32,4 @@ public function down()
{
Schema::dropIfExists('ticket_blacklists');
}
-}
+};
diff --git a/database/migrations/2022_08_25_202109_create_partner_discounts_table.php b/database/migrations/2022_08_25_202109_create_partner_discounts_table.php
new file mode 100644
index 000000000..b1fcdf97d
--- /dev/null
+++ b/database/migrations/2022_08_25_202109_create_partner_discounts_table.php
@@ -0,0 +1,35 @@
+id();
+ $table->foreignId('user_id');
+ $table->integer('partner_discount');
+ $table->integer('registered_user_discount');
+ $table->integer('referral_system_commission');
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('partner_discounts');
+ }
+};
diff --git a/database/migrations/2022_11_29_075851_email_verify_d_b.php b/database/migrations/2022_11_29_075851_email_verify_d_b.php
index 04e2663b0..86708aadf 100644
--- a/database/migrations/2022_11_29_075851_email_verify_d_b.php
+++ b/database/migrations/2022_11_29_075851_email_verify_d_b.php
@@ -5,7 +5,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class EmailVerifyDB extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
@@ -26,7 +26,6 @@ public function up()
}
}
-
/**
* Reverse the migrations.
*
@@ -38,4 +37,4 @@ public function down()
$table->dropColumn('email_verified_reward');
});
}
-}
+};
diff --git a/database/migrations/2023_01_03_185102_update_make_description_text_in_nests_table.php b/database/migrations/2023_01_03_185102_update_make_description_text_in_nests_table.php
new file mode 100644
index 000000000..e007ad5ee
--- /dev/null
+++ b/database/migrations/2023_01_03_185102_update_make_description_text_in_nests_table.php
@@ -0,0 +1,32 @@
+text('description')->change();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('nests', function (Blueprint $table) {
+ $table->string('description')->change();
+ });
+ }
+};
diff --git a/database/migrations/2023_01_05_180333_add_event_column_to_activity_log_table.php b/database/migrations/2023_01_05_180333_add_event_column_to_activity_log_table.php
new file mode 100644
index 000000000..7b797fd5e
--- /dev/null
+++ b/database/migrations/2023_01_05_180333_add_event_column_to_activity_log_table.php
@@ -0,0 +1,22 @@
+table(config('activitylog.table_name'), function (Blueprint $table) {
+ $table->string('event')->nullable()->after('subject_type');
+ });
+ }
+
+ public function down()
+ {
+ Schema::connection(config('activitylog.database_connection'))->table(config('activitylog.table_name'), function (Blueprint $table) {
+ $table->dropColumn('event');
+ });
+ }
+}
diff --git a/database/migrations/2023_01_05_180334_add_batch_uuid_column_to_activity_log_table.php b/database/migrations/2023_01_05_180334_add_batch_uuid_column_to_activity_log_table.php
new file mode 100644
index 000000000..8f7db6654
--- /dev/null
+++ b/database/migrations/2023_01_05_180334_add_batch_uuid_column_to_activity_log_table.php
@@ -0,0 +1,22 @@
+table(config('activitylog.table_name'), function (Blueprint $table) {
+ $table->uuid('batch_uuid')->nullable()->after('properties');
+ });
+ }
+
+ public function down()
+ {
+ Schema::connection(config('activitylog.database_connection'))->table(config('activitylog.table_name'), function (Blueprint $table) {
+ $table->dropColumn('batch_uuid');
+ });
+ }
+}
diff --git a/database/migrations/2023_01_12_135936_settings_to_text.php b/database/migrations/2023_01_12_135936_settings_to_text.php
new file mode 100644
index 000000000..2b907b079
--- /dev/null
+++ b/database/migrations/2023_01_12_135936_settings_to_text.php
@@ -0,0 +1,32 @@
+text('value')->change();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('nests', function (Blueprint $table) {
+ $table->string('value')->change();
+ });
+ }
+};
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index e759a5959..6ed3baa03 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -17,6 +17,5 @@ public function run()
$this->call([
SettingsSeeder::class,
]);
-
}
}
diff --git a/database/seeders/ExampleItemsSeeder.php b/database/seeders/ExampleItemsSeeder.php
index 42fb4bbc8..925fda7df 100644
--- a/database/seeders/ExampleItemsSeeder.php
+++ b/database/seeders/ExampleItemsSeeder.php
@@ -2,9 +2,9 @@
namespace Database\Seeders;
+use Database\Seeders\Seeds\ApplicationApiSeeder;
use Database\Seeders\Seeds\ProductSeeder;
use Database\Seeders\Seeds\ShopProductSeeder;
-use Database\Seeders\Seeds\ApplicationApiSeeder;
use Database\Seeders\Seeds\UsefulLinksSeeder;
use Illuminate\Database\Seeder;
@@ -21,8 +21,7 @@ public function run()
ProductSeeder::class,
ShopProductSeeder::class,
ApplicationApiSeeder::class,
- UsefulLinksSeeder::class
+ UsefulLinksSeeder::class,
]);
-
}
}
diff --git a/database/seeders/Seeds/ApplicationApiSeeder.php b/database/seeders/Seeds/ApplicationApiSeeder.php
index da66c937c..963f848fc 100644
--- a/database/seeders/Seeds/ApplicationApiSeeder.php
+++ b/database/seeders/Seeds/ApplicationApiSeeder.php
@@ -15,7 +15,7 @@ class ApplicationApiSeeder extends Seeder
public function run()
{
ApplicationApi::create([
- 'memo' => 'admin'
+ 'memo' => 'admin',
]);
}
}
diff --git a/database/seeders/Seeds/ProductSeeder.php b/database/seeders/Seeds/ProductSeeder.php
index 7664dc867..4f5e43754 100644
--- a/database/seeders/Seeds/ProductSeeder.php
+++ b/database/seeders/Seeds/ProductSeeder.php
@@ -20,7 +20,7 @@ public function run()
'price' => 140,
'memory' => 64,
'disk' => 1000,
- 'databases' => 1
+ 'databases' => 1,
]);
Product::create([
@@ -29,7 +29,7 @@ public function run()
'price' => 210,
'memory' => 128,
'disk' => 2000,
- 'databases' => 2
+ 'databases' => 2,
]);
Product::create([
@@ -38,7 +38,7 @@ public function run()
'price' => 280,
'memory' => 256,
'disk' => 5000,
- 'databases' => 5
+ 'databases' => 5,
]);
}
}
diff --git a/database/seeders/Seeds/SettingsSeeder.php b/database/seeders/Seeds/SettingsSeeder.php
index 9e6f00356..d0179896b 100644
--- a/database/seeders/Seeds/SettingsSeeder.php
+++ b/database/seeders/Seeds/SettingsSeeder.php
@@ -18,523 +18,639 @@ public function run()
Settings::firstOrCreate([
'key' => 'SETTINGS::USER:INITIAL_CREDITS',
], [
- 'value' => '250',
- 'type' => 'integer',
- 'description' => 'The initial amount of credits the user starts with.'
+ 'value' => '250',
+ 'type' => 'integer',
+ 'description' => 'The initial amount of credits the user starts with.',
]);
Settings::firstOrCreate([
'key' => 'SETTINGS::USER:INITIAL_SERVER_LIMIT',
], [
- 'value' => '1',
- 'type' => 'integer',
- 'description' => 'The initial server limit the user starts with.'
+ 'value' => '1',
+ 'type' => 'integer',
+ 'description' => 'The initial server limit the user starts with.',
]);
//verify email event
Settings::firstOrCreate([
'key' => 'SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_EMAIL',
], [
- 'value' => '250',
- 'type' => 'integer',
- 'description' => 'Increase in credits after the user has verified their email account.'
+ 'value' => '250',
+ 'type' => 'integer',
+ 'description' => 'Increase in credits after the user has verified their email account.',
]);
Settings::firstOrCreate([
'key' => 'SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_EMAIL',
], [
- 'value' => '2',
- 'type' => 'integer',
- 'description' => 'Increase in server limit after the user has verified their email account.'
+ 'value' => '2',
+ 'type' => 'integer',
+ 'description' => 'Increase in server limit after the user has verified their email account.',
]);
//verify discord event
Settings::firstOrCreate([
'key' => 'SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_DISCORD',
], [
- 'value' => '375',
- 'type' => 'integer',
- 'description' => 'Increase in credits after the user has verified their discord account.'
+ 'value' => '375',
+ 'type' => 'integer',
+ 'description' => 'Increase in credits after the user has verified their discord account.',
]);
Settings::firstOrCreate([
'key' => 'SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_DISCORD',
], [
- 'value' => '2',
- 'type' => 'integer',
- 'description' => 'Increase in server limit after the user has verified their discord account.'
+ 'value' => '2',
+ 'type' => 'integer',
+ 'description' => 'Increase in server limit after the user has verified their discord account.',
]);
//other
Settings::firstOrCreate([
'key' => 'SETTINGS::USER:MINIMUM_REQUIRED_CREDITS_TO_MAKE_SERVER',
], [
- 'value' => '50',
- 'type' => 'integer',
- 'description' => 'The minimum amount of credits the user would need to make a server.'
+ 'value' => '50',
+ 'type' => 'integer',
+ 'description' => 'The minimum amount of credits the user would need to make a server.',
]);
//purchasing
Settings::firstOrCreate([
'key' => 'SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE',
], [
- 'value' => '10',
- 'type' => 'integer',
+ 'value' => '10',
+ 'type' => 'integer',
'description' => 'updates the users server limit to this amount (unless the user already has a higher server limit) after making a purchase with real money, set to 0 to ignore this.',
]);
-
//force email and discord verification
Settings::firstOrCreate([
'key' => 'SETTINGS::USER:FORCE_EMAIL_VERIFICATION',
], [
- 'value' => 'false',
- 'type' => 'boolean',
- 'description' => 'Force an user to verify the email adress before creating a server / buying credits.'
+ 'value' => 'false',
+ 'type' => 'boolean',
+ 'description' => 'Force an user to verify the email adress before creating a server / buying credits.',
]);
Settings::firstOrCreate([
'key' => 'SETTINGS::USER:FORCE_DISCORD_VERIFICATION',
], [
- 'value' => 'false',
- 'type' => 'boolean',
- 'description' => 'Force an user to link an Discord Account before creating a server / buying credits.'
+ 'value' => 'false',
+ 'type' => 'boolean',
+ 'description' => 'Force an user to link an Discord Account before creating a server / buying credits.',
]);
//disable ip check on register
Settings::firstOrCreate([
'key' => 'SETTINGS::SYSTEM:REGISTER_IP_CHECK',
], [
- 'value' => 'true',
- 'type' => 'boolean',
- 'description' => 'Prevent users from making multiple accounts using the same IP address'
+ 'value' => 'true',
+ 'type' => 'boolean',
+ 'description' => 'Prevent users from making multiple accounts using the same IP address',
]);
//per_page on allocations request
Settings::firstOrCreate([
'key' => 'SETTINGS::SERVER:ALLOCATION_LIMIT',
], [
- 'value' => '200',
+ 'value' => '200',
+ 'type' => 'integer',
+ 'description' => 'The maximum amount of allocations to pull per node for automatic deployment, if more allocations are being used than this limit is set to, no new servers can be created!',
+ ]);
+ Settings::firstOrCreate([
+ 'key' => 'SETTINGS::USER:MINIMUM_REQUIRED_CREDITS_TO_MAKE_SERVER',
+ ], [
+ 'value' => '0',
'type' => 'integer',
- 'description' => 'The maximum amount of allocations to pull per node for automatic deployment, if more allocations are being used than this limit is set to, no new servers can be created!'
+ 'description' => 'The minimum amount of credits user has to have to create a server. Can be overridden by package limits.'
]);
//credits display name
Settings::firstOrCreate([
'key' => 'SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME',
], [
- 'value' => 'Credits',
- 'type' => 'string',
- 'description' => 'Set the display name of your currency :)'
+ 'value' => 'Credits',
+ 'type' => 'string',
+ 'description' => 'Set the display name of your currency :)',
]);
//credits display name
Settings::firstOrCreate([
'key' => 'SETTINGS::SYSTEM:SERVER_CREATE_CHARGE_FIRST_HOUR',
], [
- 'value' => 'true',
- 'type' => 'boolean',
- 'description' => 'Charges the first hour worth of credits upon creating a server.'
+ 'value' => 'true',
+ 'type' => 'boolean',
+ 'description' => 'Charges the first hour worth of credits upon creating a server.',
]);
//sales tax
Settings::firstOrCreate([
- 'key' => 'SETTINGS::PAYMENTS:SALES_TAX',
+ 'key' => 'SETTINGS::PAYMENTS:SALES_TAX',
], [
'value' => '0',
- 'type' => 'integer',
- 'description' => 'The %-value of tax that will be added to the product price on checkout'
+ 'type' => 'integer',
+ 'description' => 'The %-value of tax that will be added to the product price on checkout',
]);
//Invoices enabled
Settings::firstOrCreate([
- 'key' => 'SETTINGS::INVOICE:ENABLED',
+ 'key' => 'SETTINGS::INVOICE:ENABLED',
], [
'value' => 'false',
- 'type' => 'boolean',
- 'description' => 'Enables or disables the invoice feature for payments'
+ 'type' => 'boolean',
+ 'description' => 'Enables or disables the invoice feature for payments',
]);
//Invoice company name
Settings::firstOrCreate([
- 'key' => 'SETTINGS::INVOICE:COMPANY_NAME',
+ 'key' => 'SETTINGS::INVOICE:COMPANY_NAME',
], [
'value' => '',
- 'type' => 'string',
- 'description' => 'The name of the Company on the Invoices'
+ 'type' => 'string',
+ 'description' => 'The name of the Company on the Invoices',
]);
//Invoice company address
Settings::firstOrCreate([
- 'key' => 'SETTINGS::INVOICE:COMPANY_ADDRESS',
+ 'key' => 'SETTINGS::INVOICE:COMPANY_ADDRESS',
], [
'value' => '',
- 'type' => 'string',
- 'description' => 'The address of the Company on the Invoices'
+ 'type' => 'string',
+ 'description' => 'The address of the Company on the Invoices',
]);
//Invoice company phone
Settings::firstOrCreate([
- 'key' => 'SETTINGS::INVOICE:COMPANY_PHONE',
+ 'key' => 'SETTINGS::INVOICE:COMPANY_PHONE',
], [
'value' => '',
- 'type' => 'string',
- 'description' => 'The phone number of the Company on the Invoices'
+ 'type' => 'string',
+ 'description' => 'The phone number of the Company on the Invoices',
]);
//Invoice company mail
Settings::firstOrCreate([
- 'key' => 'SETTINGS::INVOICE:COMPANY_MAIL',
+ 'key' => 'SETTINGS::INVOICE:COMPANY_MAIL',
], [
'value' => '',
- 'type' => 'string',
- 'description' => 'The email address of the Company on the Invoices'
+ 'type' => 'string',
+ 'description' => 'The email address of the Company on the Invoices',
]);
//Invoice VAT
Settings::firstOrCreate([
- 'key' => 'SETTINGS::INVOICE:COMPANY_VAT',
+ 'key' => 'SETTINGS::INVOICE:COMPANY_VAT',
], [
'value' => '',
- 'type' => 'string',
- 'description' => 'The VAT-Number of the Company on the Invoices'
+ 'type' => 'string',
+ 'description' => 'The VAT-Number of the Company on the Invoices',
]);
//Invoice Website
Settings::firstOrCreate([
- 'key' => 'SETTINGS::INVOICE:COMPANY_WEBSITE',
+ 'key' => 'SETTINGS::INVOICE:COMPANY_WEBSITE',
], [
'value' => '',
- 'type' => 'string',
- 'description' => 'The Website of the Company on the Invoices'
+ 'type' => 'string',
+ 'description' => 'The Website of the Company on the Invoices',
]);
//Invoice Website
Settings::firstOrCreate([
- 'key' => 'SETTINGS::INVOICE:PREFIX',
+ 'key' => 'SETTINGS::INVOICE:PREFIX',
], [
'value' => 'INV',
- 'type' => 'string',
- 'description' => 'The invoice prefix'
+ 'type' => 'string',
+ 'description' => 'The invoice prefix',
]);
//Locale
Settings::firstOrCreate([
- 'key' => 'SETTINGS::LOCALE:DEFAULT',
+ 'key' => 'SETTINGS::LOCALE:DEFAULT',
], [
'value' => 'en',
- 'type' => 'string',
- 'description' => 'The default Language the dashboard will be shown in'
+ 'type' => 'string',
+ 'description' => 'The default Language the dashboard will be shown in',
]);
//Dynamic locale
Settings::firstOrCreate([
- 'key' => 'SETTINGS::LOCALE:DYNAMIC',
+ 'key' => 'SETTINGS::LOCALE:DYNAMIC',
], [
'value' => 'false',
- 'type' => 'boolean',
- 'description' => 'If this is true, the Language will change to the Clients browserlanguage or default.'
+ 'type' => 'boolean',
+ 'description' => 'If this is true, the Language will change to the Clients browserlanguage or default.',
]);
//User can change Locale
Settings::firstOrCreate([
- 'key' => 'SETTINGS::LOCALE:CLIENTS_CAN_CHANGE',
+ 'key' => 'SETTINGS::LOCALE:CLIENTS_CAN_CHANGE',
], [
'value' => 'false',
- 'type' => 'boolean',
- 'description' => 'If this is true, the clients will be able to change their Locale.'
+ 'type' => 'boolean',
+ 'description' => 'If this is true, the clients will be able to change their Locale.',
]);
//Locale
Settings::firstOrCreate([
- 'key' => 'SETTINGS::LOCALE:AVAILABLE',
+ 'key' => 'SETTINGS::LOCALE:AVAILABLE',
], [
'value' => '',
- 'type' => 'string',
- 'description' => 'The available languages'
+ 'type' => 'string',
+ 'description' => 'The available languages',
]);
//Locale
Settings::firstOrCreate([
- 'key' => 'SETTINGS::LOCALE:DATATABLES',
+ 'key' => 'SETTINGS::LOCALE:DATATABLES',
], [
'value' => 'en-gb',
- 'type' => 'string',
- 'description' => 'The Language of the Datatables. Grab the Language-Codes from here https://datatables.net/plug-ins/i18n/'
+ 'type' => 'string',
+ 'description' => 'The Language of the Datatables. Grab the Language-Codes from here https://datatables.net/plug-ins/i18n/',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::PAYMENTS:PAYPAL:SECRET',
+ 'key' => 'SETTINGS::PAYMENTS:PAYPAL:SECRET',
], [
'value' => env('PAYPAL_SECRET', ''),
- 'type' => 'string',
- 'description' => 'Your PayPal Secret-Key ( https://developer.paypal.com/docs/integration/direct/rest/)'
+ 'type' => 'string',
+ 'description' => 'Your PayPal Secret-Key ( https://developer.paypal.com/docs/integration/direct/rest/)',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::PAYMENTS:PAYPAL:CLIENT_ID',
+ 'key' => 'SETTINGS::PAYMENTS:PAYPAL:CLIENT_ID',
], [
'value' => env('PAYPAL_CLIENT_ID', ''),
- 'type' => 'string',
- 'description' => 'Your PayPal Client_ID'
+ 'type' => 'string',
+ 'description' => 'Your PayPal Client_ID',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::PAYMENTS:PAYPAL:SANDBOX_SECRET',
+ 'key' => 'SETTINGS::PAYMENTS:PAYPAL:SANDBOX_SECRET',
], [
'value' => env('PAYPAL_SANDBOX_SECRET', ''),
- 'type' => 'string',
- 'description' => 'Your PayPal SANDBOX Secret-Key used for testing '
+ 'type' => 'string',
+ 'description' => 'Your PayPal SANDBOX Secret-Key used for testing ',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::PAYMENTS:PAYPAL:SANDBOX_CLIENT_ID',
+ 'key' => 'SETTINGS::PAYMENTS:PAYPAL:SANDBOX_CLIENT_ID',
], [
'value' => env('PAYPAL_SANDBOX_CLIENT_ID', ''),
- 'type' => 'string',
- 'description' => 'Your PayPal SANDBOX Client-ID used for testing '
+ 'type' => 'string',
+ 'description' => 'Your PayPal SANDBOX Client-ID used for testing ',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::PAYMENTS:STRIPE:SECRET',
+ 'key' => 'SETTINGS::PAYMENTS:STRIPE:SECRET',
], [
'value' => env('STRIPE_SECRET', ''),
- 'type' => 'string',
- 'description' => 'Your Stripe Secret-Key ( https://dashboard.stripe.com/account/apikeys )'
+ 'type' => 'string',
+ 'description' => 'Your Stripe Secret-Key ( https://dashboard.stripe.com/account/apikeys )',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET',
+ 'key' => 'SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET',
], [
'value' => env('STRIPE_ENDPOINT_SECRET', ''),
- 'type' => 'string',
- 'description' => 'Your Stripe endpoint secret-key'
+ 'type' => 'string',
+ 'description' => 'Your Stripe endpoint secret-key',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::PAYMENTS:STRIPE:TEST_SECRET',
+ 'key' => 'SETTINGS::PAYMENTS:STRIPE:TEST_SECRET',
], [
'value' => env('STRIPE_TEST_SECRET', ''),
- 'type' => 'string',
- 'description' => 'Your Stripe test secret-key'
+ 'type' => 'string',
+ 'description' => 'Your Stripe test secret-key',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::PAYMENTS:STRIPE:ENDPOINT_TEST_SECRET',
+ 'key' => 'SETTINGS::PAYMENTS:STRIPE:ENDPOINT_TEST_SECRET',
], [
'value' => env('STRIPE_ENDPOINT_TEST_SECRET', ''),
- 'type' => 'string',
- 'description' => 'Your Stripe endpoint test secret-key'
+ 'type' => 'string',
+ 'description' => 'Your Stripe endpoint test secret-key',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::PAYMENTS:STRIPE:METHODS',
+ 'key' => 'SETTINGS::PAYMENTS:STRIPE:METHODS',
], [
'value' => env('STRIPE_METHODS', 'card,sepa_debit'),
- 'type' => 'string',
- 'description' => 'Comma seperated list of payment methods that are enabled (https://stripe.com/docs/payments/payment-methods/integration-options)'
+ 'type' => 'string',
+ 'description' => 'Comma seperated list of payment methods that are enabled (https://stripe.com/docs/payments/payment-methods/integration-options)',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::DISCORD:CLIENT_ID',
+ 'key' => 'SETTINGS::DISCORD:CLIENT_ID',
], [
'value' => env('DISCORD_CLIENT_ID', ''),
- 'type' => 'string',
- 'description' => 'Discord API Credentials - https://discordapp.com/developers/applications/'
+ 'type' => 'string',
+ 'description' => 'Discord API Credentials - https://discordapp.com/developers/applications/',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::DISCORD:CLIENT_SECRET',
+ 'key' => 'SETTINGS::DISCORD:CLIENT_SECRET',
], [
'value' => env('DISCORD_CLIENT_SECRET', ''),
- 'type' => 'string',
- 'description' => 'Discord API Credentials - https://discordapp.com/developers/applications/'
+ 'type' => 'string',
+ 'description' => 'Discord API Credentials - https://discordapp.com/developers/applications/',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::DISCORD:BOT_TOKEN',
+ 'key' => 'SETTINGS::DISCORD:BOT_TOKEN',
], [
- 'value' => env('DISCORD_BOT_TOKEN', ''),
- 'type' => 'string',
- 'description' => 'Discord API Credentials - https://discordapp.com/developers/applications/'
+ 'value' => env('DISCORD_BOT_TOKEN', ''),
+ 'type' => 'string',
+ 'description' => 'Discord API Credentials - https://discordapp.com/developers/applications/',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::DISCORD:GUILD_ID',
+ 'key' => 'SETTINGS::DISCORD:GUILD_ID',
], [
- 'value' => env('DISCORD_GUILD_ID', ''),
- 'type' => 'string',
- 'description' => 'Discord API Credentials - https://discordapp.com/developers/applications/'
+ 'value' => env('DISCORD_GUILD_ID', ''),
+ 'type' => 'string',
+ 'description' => 'Discord API Credentials - https://discordapp.com/developers/applications/',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::DISCORD:ROLE_ID',
+ 'key' => 'SETTINGS::DISCORD:ROLE_ID',
], [
'value' => env('DISCORD_ROLE_ID', ''),
- 'type' => 'string',
- 'description' => 'Discord role that will be assigned to users when they register'
+ 'type' => 'string',
+ 'description' => 'Discord role that will be assigned to users when they register',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::DISCORD:INVITE_URL',
+ 'key' => 'SETTINGS::DISCORD:INVITE_URL',
], [
'value' => env('DISCORD_INVITE_URL', ''),
- 'type' => 'string',
- 'description' => 'The invite URL to your Discord Server'
+ 'type' => 'string',
+ 'description' => 'The invite URL to your Discord Server',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::SYSTEM:PTERODACTYL:TOKEN',
+ 'key' => 'SETTINGS::SYSTEM:PTERODACTYL:TOKEN',
], [
'value' => env('PTERODACTYL_TOKEN', ''),
- 'type' => 'string',
- 'description' => 'Admin API Token from Pterodactyl Panel - necessary for the Panel to work. The Key needs all read&write permissions!'
+ 'type' => 'string',
+ 'description' => 'Admin API Token from Pterodactyl Panel - necessary for the Panel to work. The Key needs all read&write permissions!',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::SYSTEM:PTERODACTYL:URL',
+ 'key' => 'SETTINGS::SYSTEM:PTERODACTYL:URL',
], [
'value' => env('PTERODACTYL_URL', ''),
- 'type' => 'string',
- 'description' => 'The URL to your Pterodactyl Panel. Must not end with a / '
+ 'type' => 'string',
+ 'description' => 'The URL to your Pterodactyl Panel. Must not end with a / ',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT',
+ 'key' => 'SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT',
], [
'value' => 200,
- 'type' => 'integer',
- 'description' => 'The Pterodactyl API perPage limit. It is necessary to set it higher than your server count.'
+ 'type' => 'integer',
+ 'description' => 'The Pterodactyl API perPage limit. It is necessary to set it higher than your server count.',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::MISC:PHPMYADMIN:URL',
+ 'key' => 'SETTINGS::MISC:PHPMYADMIN:URL',
], [
'value' => env('PHPMYADMIN_URL', ''),
- 'type' => 'string',
- 'description' => 'The URL to your PHPMYADMIN Panel. Must not end with a /, remove to remove database button'
+ 'type' => 'string',
+ 'description' => 'The URL to your PHPMYADMIN Panel. Must not end with a /, remove to remove database button',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::RECAPTCHA:SITE_KEY',
+ 'key' => 'SETTINGS::RECAPTCHA:SITE_KEY',
], [
'value' => env('RECAPTCHA_SITE_KEY', '6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI'),
- 'type' => 'string',
- 'description' => 'Google Recaptcha API Credentials - https://www.google.com/recaptcha/admin - reCaptcha V2 (not v3)'
+ 'type' => 'string',
+ 'description' => 'Google Recaptcha API Credentials - https://www.google.com/recaptcha/admin - reCaptcha V2 (not v3)',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::RECAPTCHA:SECRET_KEY',
+ 'key' => 'SETTINGS::RECAPTCHA:SECRET_KEY',
], [
'value' => env('RECAPTCHA_SECRET_KEY', '6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe'),
- 'type' => 'string',
- 'description' => 'Google Recaptcha API Credentials - https://www.google.com/recaptcha/admin - reCaptcha V2 (not v3)'
+ 'type' => 'string',
+ 'description' => 'Google Recaptcha API Credentials - https://www.google.com/recaptcha/admin - reCaptcha V2 (not v3)',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::RECAPTCHA:ENABLED',
+ 'key' => 'SETTINGS::RECAPTCHA:ENABLED',
], [
'value' => 'true',
- 'type' => 'boolean',
- 'description' => 'Enables or disables the ReCaptcha feature on the registration/login page'
+ 'type' => 'boolean',
+ 'description' => 'Enables or disables the ReCaptcha feature on the registration/login page',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::MAIL:MAILER',
+ 'key' => 'SETTINGS::MAIL:MAILER',
], [
'value' => env('MAIL_MAILER', 'smtp'),
- 'type' => 'string',
- 'description' => 'Selected Mailer (smtp, mailgun, sendgrid, mailtrap)'
+ 'type' => 'string',
+ 'description' => 'Selected Mailer (smtp, mailgun, sendgrid, mailtrap)',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::MAIL:HOST',
+ 'key' => 'SETTINGS::MAIL:HOST',
], [
'value' => env('MAIL_HOST', 'localhost'),
- 'type' => 'string',
- 'description' => 'Mailer Host Adress'
+ 'type' => 'string',
+ 'description' => 'Mailer Host Address',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::MAIL:PORT',
+ 'key' => 'SETTINGS::MAIL:PORT',
], [
- 'value' => env('MAIL_PORT', '25'),
- 'type' => 'string',
- 'description' => 'Mailer Server Port'
+ 'value' => env('MAIL_PORT', '25'),
+ 'type' => 'string',
+ 'description' => 'Mailer Server Port',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::MAIL:USERNAME',
+ 'key' => 'SETTINGS::MAIL:USERNAME',
], [
- 'value' => env('MAIL_USERNAME', ''),
- 'type' => 'string',
- 'description' => 'Mailer Username'
+ 'value' => env('MAIL_USERNAME', ''),
+ 'type' => 'string',
+ 'description' => 'Mailer Username',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::MAIL:PASSWORD',
+ 'key' => 'SETTINGS::MAIL:PASSWORD',
], [
- 'value' => env('MAIL_PASSWORD', ''),
- 'type' => 'string',
- 'description' => 'Mailer Password'
+ 'value' => env('MAIL_PASSWORD', ''),
+ 'type' => 'string',
+ 'description' => 'Mailer Password',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::MAIL:ENCRYPTION',
+ 'key' => 'SETTINGS::MAIL:ENCRYPTION',
], [
- 'value' => env('MAIL_ENCRYPTION', 'tls'),
- 'type' => 'string',
- 'description' => 'Mailer Encryption (tls, ssl)'
+ 'value' => env('MAIL_ENCRYPTION', 'tls'),
+ 'type' => 'string',
+ 'description' => 'Mailer Encryption (tls, ssl)',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::MAIL:FROM_ADDRESS',
+ 'key' => 'SETTINGS::MAIL:FROM_ADDRESS',
], [
- 'value' => env('MAIL_FROM_ADDRESS', ''),
- 'type' => 'string',
- 'description' => 'Mailer From Address'
+ 'value' => env('MAIL_FROM_ADDRESS', ''),
+ 'type' => 'string',
+ 'description' => 'Mailer From Address',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::MAIL:FROM_NAME',
+ 'key' => 'SETTINGS::MAIL:FROM_NAME',
], [
'value' => env('APP_NAME', 'Controlpanel'),
- 'type' => 'string',
- 'description' => 'Mailer From Name'
+ 'type' => 'string',
+ 'description' => 'Mailer From Name',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::REFERRAL::ENABLED',
+ 'key' => 'SETTINGS::REFERRAL::ENABLED',
], [
- 'value' =>"true",
- 'type' => 'string',
- 'description' => 'Enable or disable the referral system'
+ 'value' => 'false',
+ 'type' => 'string',
+ 'description' => 'Enable or disable the referral system',
+ ]);
+ Settings::firstOrCreate([
+ 'key' => 'SETTINGS::REFERRAL::ALWAYS_GIVE_COMMISSION',
+ ], [
+ 'value' => 'false',
+ 'type' => 'string',
+ 'description' => 'Whether referrals get percentage commission only on first purchase or on every purchase',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::REFERRAL::REWARD',
+ 'key' => 'SETTINGS::REFERRAL::REWARD',
], [
- 'value' =>100,
- 'type' => 'integer',
- 'description' => 'Credit reward a user should receive when a user registers with his referral code'
+ 'value' => 100,
+ 'type' => 'integer',
+ 'description' => 'Credit reward a user should receive when a user registers with his referral code',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::REFERRAL::ALLOWED',
+ 'key' => 'SETTINGS::REFERRAL::ALLOWED',
], [
- 'value' =>"client",
- 'type' => 'string',
- 'description' => 'Who should be allowed to to use the referral code. all/client'
+ 'value' => 'client',
+ 'type' => 'string',
+ 'description' => 'Who should be allowed to to use the referral code. all/client',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::REFERRAL:MODE',
+ 'key' => 'SETTINGS::REFERRAL:MODE',
], [
- 'value' =>"sign-up",
- 'type' => 'string',
- 'description' => 'Whether referrals get Credits on User-Registration or if a User buys credits'
+ 'value' => 'sign-up',
+ 'type' => 'string',
+ 'description' => 'Whether referrals get Credits on User-Registration or if a User buys credits',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::REFERRAL:PERCENTAGE',
+ 'key' => 'SETTINGS::REFERRAL:PERCENTAGE',
], [
- 'value' =>100,
- 'type' => 'integer',
- 'description' => 'The Percentage Value a referred user gets'
+ 'value' => 100,
+ 'type' => 'integer',
+ 'description' => 'The Percentage Value a referred user gets',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::SYSTEM:PTERODACTYL:ADMIN_USER_TOKEN',
+ 'key' => 'SETTINGS::SYSTEM:PTERODACTYL:ADMIN_USER_TOKEN',
], [
- 'value' =>"",
- 'type' => 'string',
- 'description' => 'The Client API Key of an Pterodactyl Admin Account'
+ 'value' => '',
+ 'type' => 'string',
+ 'description' => 'The Client API Key of an Pterodactyl Admin Account',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::SYSTEM:ENABLE_UPGRADE',
+ 'key' => 'SETTINGS::SYSTEM:ENABLE_UPGRADE',
], [
- 'value' => "false",
- 'type' => 'boolean',
- 'description' => 'Enables the updgrade/downgrade feature for servers'
+ 'value' => 'false',
+ 'type' => 'boolean',
+ 'description' => 'Enables the updgrade/downgrade feature for servers',
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::SYSTEM:CREATION_OF_NEW_SERVERS',
+ 'key' => 'SETTINGS::SYSTEM:CREATION_OF_NEW_SERVERS',
], [
- 'value' => "true",
+ 'value' => 'true',
+ 'type' => 'boolean',
+ 'description' => 'Enable/disable the creation of new servers',
+ ]);
+ Settings::firstOrCreate([
+ 'key' => 'SETTINGS::SYSTEM:CREATION_OF_NEW_USERS',
+ ], [
+ 'value' => 'false',
+ 'type' => 'boolean',
+ 'description' => 'Enable/disable the creation of new users',
+ ]);
+ Settings::firstOrCreate([
+ 'key' => 'SETTINGS::SYSTEM:SHOW_IMPRINT',
+ ], [
+
+ 'value' => "false",
'type' => 'boolean',
- 'description' => 'Enable/disable the creation of new servers'
+ 'description' => 'Enable/disable imprint in footer'
+
]);
Settings::firstOrCreate([
- 'key' => 'SETTINGS::SYSTEM:CREATION_OF_NEW_USERS',
+ 'key' => 'SETTINGS::SYSTEM:SHOW_PRIVACY',
], [
- 'value' => "true",
+
+ 'value' => "false",
'type' => 'boolean',
- 'description' => 'Enable/disable the creation of new users'
+ 'description' => 'Enable/disable privacy policy in footer'
+
+ ]);
+ Settings::firstOrCreate([
+ 'key' => 'SETTINGS::SYSTEM:SHOW_TOS',
+ ], [
+ 'value' => 'false',
+ 'type' => 'boolean',
+ 'description' => 'Enable/disable Terms of Service in footer',
+ ]);
+
+ Settings::firstOrCreate([
+ 'key' => 'SETTINGS::SYSTEM:ALERT_ENABLED',
+ ], [
+ 'value' => 'false',
+ 'type' => 'boolean',
+ 'description' => 'Enable/disable Alerts on Homepage',
+ ]);
+ Settings::firstOrCreate([
+ 'key' => 'SETTINGS::SYSTEM:ALERT_TYPE',
+ ], [
+ 'value' => 'dark',
+ 'type' => 'text',
+ 'description' => 'Changes the Color of the Alert',
+ ]);
+
+ Settings::firstOrCreate([
+ 'key' => 'SETTINGS::SYSTEM:ALERT_MESSAGE',
+ ], [
+ 'value' => '',
+ 'type' => 'text',
+ 'description' => 'Changes the Content the Alert',
+ ]);
+ Settings::firstOrCreate([
+ 'key' => 'SETTINGS::SYSTEM:THEME',
+ ], [
+ 'value' => 'default',
+ 'type' => 'text',
+ 'description' => 'Current active theme',
+ ]);
+
+ Settings::firstOrCreate([
+ 'key' => 'SETTINGS::SYSTEM:USEFULLINKS_ENABLED',
+ ], [
+ 'value' => 'true',
+ 'type' => 'boolean',
+ 'description' => 'Enable/disable Useful Links on Homepage',
+ ]);
+
+ Settings::firstOrCreate([
+ 'key' => 'SETTINGS::SYSTEM:MOTD_ENABLED',
+ ], [
+ 'value' => 'true',
+ 'type' => 'boolean',
+ 'description' => 'Enable/disable MOTD on Homepage',
+ ]);
+ Settings::firstOrCreate([
+ 'key' => 'SETTINGS::SYSTEM:MOTD_MESSAGE',
+ ], [
+ 'value' => 'Controlpanel.gg
+
Example:<\/strong> en-gb, fr_fr, de_de
More Information: ": "Der Sprachcode der Tabellensprache.
Beispiel:<\/strong> en-gb, fr_fr, de_de
Weitere Informationen: ",
+ "The datatables lang-code.
Example: en-gb, fr_fr, de_de
More Information: ": "Der Sprachcode der Tabellensprache.
Beispiel: en-gb, fr_fr, de_de
Weitere Informationen: ",
"Auto-translate": "Automatisches Ć¼bersetzen",
"If this is checked, the Dashboard will translate itself to the Clients language, if available": "Wenn dies aktiviert ist, Ć¼bersetzt sich das Dashboard selbst in die Sprache des Clients, sofern diese verfĆ¼gbar ist",
"Client Language-Switch": "Nutzer Sprachumschaltung",
@@ -199,7 +199,7 @@
"Mail Username": "E-Mail Nutzername",
"Mail Password": "E-Mail Passwort",
"Mail Encryption": "E-Mail VerschlĆ¼sselungsart",
- "Mail From Adress": "Absender E-Mailadresse",
+ "Mail From Address": "Absender E-Mailadresse",
"Mail From Name": "Absender E-Mailname",
"Discord Client-ID": "Discord Client-ID",
"Discord Client-Secret": "DIscord Client-Secret",
@@ -243,9 +243,9 @@
"Charges the first hour worth of credits upon creating a server.": "Rechne den ersten stĆ¼ndlichen Anteil direkt bei Erstellung des Servers ab.",
"Credits Display Name": "Credits Anzeigename",
"PHPMyAdmin URL": "PHPMyAdmin URL",
- "Enter the URL to your PHPMyAdmin installation. Without a trailing slash!<\/strong>": "Geben Sie die URL zu Ihrer PHPMyAdmin-Installation ein. Ohne abschlieĆendendes Slash!<\/strong>",
+ "Enter the URL to your PHPMyAdmin installation. Without a trailing slash!": "Geben Sie die URL zu Ihrer PHPMyAdmin-Installation ein. Ohne abschlieĆendendes Slash!",
"Pterodactyl URL": "Pterodactyl URL",
- "Enter the URL to your Pterodactyl installation. Without a trailing slash!<\/strong>": "Geben Sie die URL zu Ihrer Pterodactyl-Installation ein. Ohne abschlieĆendendes Slash!<\/strong>",
+ "Enter the URL to your Pterodactyl installation. Without a trailing slash!": "Geben Sie die URL zu Ihrer Pterodactyl-Installation ein. Ohne abschlieĆendendes Slash!",
"Pterodactyl API Key": "Pterodactyl API SchlĆ¼ssel",
"Enter the API Key to your Pterodactyl installation.": "Geben Sie den API-SchlĆ¼ssel zu Ihrer Pterodactyl-Installation ein.",
"Force Discord verification": "Discord Verifikation erzwingen",
@@ -316,7 +316,7 @@
"A voucher can only be used one time per user. Uses specifies the number of different users that can use this voucher.": "Ein Gutschein kann von einem User nur einmal eingelƶst werden. \"Benutzungen\" setzt die Anzahl an Usern die diesen Gutschein einlƶsen kƶnnen.",
"Max": "Max",
"Expires at": "LƤuft ab am",
- "Used \/ Uses": "Benutzungen",
+ "Used / Uses": "Benutzungen",
"Expires": "Ablauf",
"Sign in to start your session": "Melde dich an um das Dashboard zu benutzen",
"Password": "Passwort",
@@ -388,7 +388,7 @@
"No nodes have been linked!": "Es wurde keine Nodes verknĆ¼pft",
"No nests available!": "Keine Nests verfĆ¼gbar",
"No eggs have been linked!": "Es wurde keine Eggs verknĆ¼pft",
- "Software \/ Games": "Software \/ Spiele",
+ "Software / Games": "Software / Spiele",
"Please select software ...": "Bitte Software auswƤhlen",
"---": "--",
"Specification ": "Spezifikation",
@@ -460,5 +460,8 @@
"tr": "TĆ¼rkisch",
"ru": "Russisch",
"sv": "Schwedisch",
- "sk": "Slowakisch"
-}
\ No newline at end of file
+ "sk": "Slowakisch",
+ "Imprint": "Impressum",
+ "Privacy": "Datenschutz",
+ "Privacy Policy": "DatenschutzerklƤrung"
+}
diff --git a/resources/lang/de/auth.php b/lang/de/auth.php
similarity index 85%
rename from resources/lang/de/auth.php
rename to lang/de/auth.php
index 26860b5b7..25dba8797 100644
--- a/resources/lang/de/auth.php
+++ b/lang/de/auth.php
@@ -12,7 +12,7 @@
*/
return [
- 'failed' => 'Diese Kombination aus Zugangsdaten wurde nicht in unserer Datenbank gefunden.',
+ 'failed' => 'Diese Kombination aus Zugangsdaten wurde nicht in unserer Datenbank gefunden.',
'password' => 'Das eingegebene Passwort ist nicht korrekt.',
'throttle' => 'Zu viele Loginversuche. Versuchen Sie es bitte in :seconds Sekunden nochmal.',
];
diff --git a/resources/lang/de/pagination.php b/lang/de/pagination.php
similarity index 92%
rename from resources/lang/de/pagination.php
rename to lang/de/pagination.php
index 0fbc2a8c8..d6ef8d092 100644
--- a/resources/lang/de/pagination.php
+++ b/lang/de/pagination.php
@@ -12,6 +12,6 @@
*/
return [
- 'next' => 'Weiter »',
+ 'next' => 'Weiter »',
'previous' => '« ZurĆ¼ck',
];
diff --git a/resources/lang/de/passwords.php b/lang/de/passwords.php
similarity index 62%
rename from resources/lang/de/passwords.php
rename to lang/de/passwords.php
index 429ee9d97..b86e4bad8 100644
--- a/resources/lang/de/passwords.php
+++ b/lang/de/passwords.php
@@ -12,9 +12,9 @@
*/
return [
- 'reset' => 'Das Passwort wurde zurĆ¼ckgesetzt!',
- 'sent' => 'Passworterinnerung wurde gesendet!',
+ 'reset' => 'Das Passwort wurde zurĆ¼ckgesetzt!',
+ 'sent' => 'Passworterinnerung wurde gesendet!',
'throttled' => 'Bitte warten Sie, bevor Sie es erneut versuchen.',
- 'token' => 'Der Passwort-Wiederherstellungs-SchlĆ¼ssel ist ungĆ¼ltig oder abgelaufen.',
- 'user' => 'Es konnte leider kein Nutzer mit dieser E-Mail-Adresse gefunden werden.',
+ 'token' => 'Der Passwort-Wiederherstellungs-SchlĆ¼ssel ist ungĆ¼ltig oder abgelaufen.',
+ 'user' => 'Es konnte leider kein Nutzer mit dieser E-Mail-Adresse gefunden werden.',
];
diff --git a/lang/de/validation.php b/lang/de/validation.php
new file mode 100644
index 000000000..ddd642164
--- /dev/null
+++ b/lang/de/validation.php
@@ -0,0 +1,135 @@
+ ':attribute muss akzeptiert werden.',
+ 'accepted_if' => ':attribute muss akzeptiert werden, wenn :other :value ist.',
+ 'active_url' => ':attribute ist keine gĆ¼ltige Internet-Adresse.',
+ 'after' => ':attribute muss ein Datum nach :date sein.',
+ 'after_or_equal' => ':attribute muss ein Datum nach :date oder gleich :date sein.',
+ 'alpha' => ':attribute darf nur aus Buchstaben bestehen.',
+ 'alpha_dash' => ':attribute darf nur aus Buchstaben, Zahlen, Binde- und Unterstrichen bestehen.',
+ 'alpha_num' => ':attribute darf nur aus Buchstaben und Zahlen bestehen.',
+ 'array' => ':attribute muss ein Array sein.',
+ 'attached' => ':attribute ist bereits angehƤngt.',
+ 'before' => ':attribute muss ein Datum vor :date sein.',
+ 'before_or_equal' => ':attribute muss ein Datum vor :date oder gleich :date sein.',
+ 'between' => [
+ 'array' => ':attribute muss zwischen :min & :max Elemente haben.',
+ 'file' => ':attribute muss zwischen :min & :max Kilobytes groĆ sein.',
+ 'numeric' => ':attribute muss zwischen :min & :max liegen.',
+ 'string' => ':attribute muss zwischen :min & :max Zeichen lang sein.',
+ ],
+ 'boolean' => ':attribute muss entweder \'true\' oder \'false\' sein.',
+ 'confirmed' => ':attribute stimmt nicht mit der BestƤtigung Ć¼berein.',
+ 'current_password' => 'Das Passwort ist falsch.',
+ 'date' => ':attribute muss ein gĆ¼ltiges Datum sein.',
+ 'date_equals' => ':attribute muss ein Datum gleich :date sein.',
+ 'date_format' => ':attribute entspricht nicht dem gĆ¼ltigen Format fĆ¼r :format.',
+ 'declined' => 'The :attribute must be declined.',
+ 'declined_if' => 'The :attribute must be declined when :other is :value.',
+ 'different' => ':attribute und :other mĆ¼ssen sich unterscheiden.',
+ 'digits' => ':attribute muss :digits Stellen haben.',
+ 'digits_between' => ':attribute muss zwischen :min und :max Stellen haben.',
+ 'dimensions' => ':attribute hat ungĆ¼ltige Bildabmessungen.',
+ 'distinct' => ':attribute beinhaltet einen bereits vorhandenen Wert.',
+ 'email' => ':attribute muss eine gĆ¼ltige E-Mail-Adresse sein.',
+ 'ends_with' => ':attribute muss eine der folgenden Endungen aufweisen: :values',
+ 'exists' => 'Der gewƤhlte Wert fĆ¼r :attribute ist ungĆ¼ltig.',
+ 'file' => ':attribute muss eine Datei sein.',
+ 'filled' => ':attribute muss ausgefĆ¼llt sein.',
+ 'gt' => [
+ 'array' => ':attribute muss mehr als :value Elemente haben.',
+ 'file' => ':attribute muss grƶĆer als :value Kilobytes sein.',
+ 'numeric' => ':attribute muss grƶĆer als :value sein.',
+ 'string' => ':attribute muss lƤnger als :value Zeichen sein.',
+ ],
+ 'gte' => [
+ 'array' => ':attribute muss mindestens :value Elemente haben.',
+ 'file' => ':attribute muss grƶĆer oder gleich :value Kilobytes sein.',
+ 'numeric' => ':attribute muss grƶĆer oder gleich :value sein.',
+ 'string' => ':attribute muss mindestens :value Zeichen lang sein.',
+ ],
+ 'image' => ':attribute muss ein Bild sein.',
+ 'in' => 'Der gewƤhlte Wert fĆ¼r :attribute ist ungĆ¼ltig.',
+ 'in_array' => 'Der gewƤhlte Wert fĆ¼r :attribute kommt nicht in :other vor.',
+ 'integer' => ':attribute muss eine ganze Zahl sein.',
+ 'ip' => ':attribute muss eine gĆ¼ltige IP-Adresse sein.',
+ 'ipv4' => ':attribute muss eine gĆ¼ltige IPv4-Adresse sein.',
+ 'ipv6' => ':attribute muss eine gĆ¼ltige IPv6-Adresse sein.',
+ 'json' => ':attribute muss ein gĆ¼ltiger JSON-String sein.',
+ 'lt' => [
+ 'array' => ':attribute muss weniger als :value Elemente haben.',
+ 'file' => ':attribute muss kleiner als :value Kilobytes sein.',
+ 'numeric' => ':attribute muss kleiner als :value sein.',
+ 'string' => ':attribute muss kĆ¼rzer als :value Zeichen sein.',
+ ],
+ 'lte' => [
+ 'array' => ':attribute darf maximal :value Elemente haben.',
+ 'file' => ':attribute muss kleiner oder gleich :value Kilobytes sein.',
+ 'numeric' => ':attribute muss kleiner oder gleich :value sein.',
+ 'string' => ':attribute darf maximal :value Zeichen lang sein.',
+ ],
+ 'max' => [
+ 'array' => ':attribute darf maximal :max Elemente haben.',
+ 'file' => ':attribute darf maximal :max Kilobytes groĆ sein.',
+ 'numeric' => ':attribute darf maximal :max sein.',
+ 'string' => ':attribute darf maximal :max Zeichen haben.',
+ ],
+ 'mimes' => ':attribute muss den Dateityp :values haben.',
+ 'mimetypes' => ':attribute muss den Dateityp :values haben.',
+ 'min' => [
+ 'array' => ':attribute muss mindestens :min Elemente haben.',
+ 'file' => ':attribute muss mindestens :min Kilobytes groĆ sein.',
+ 'numeric' => ':attribute muss mindestens :min sein.',
+ 'string' => ':attribute muss mindestens :min Zeichen lang sein.',
+ ],
+ 'multiple_of' => ':attribute muss ein Vielfaches von :value sein.',
+ 'not_in' => 'Der gewƤhlte Wert fĆ¼r :attribute ist ungĆ¼ltig.',
+ 'not_regex' => ':attribute hat ein ungĆ¼ltiges Format.',
+ 'numeric' => ':attribute muss eine Zahl sein.',
+ 'password' => 'Das Passwort ist falsch.',
+ 'present' => ':attribute muss vorhanden sein.',
+ 'prohibited' => ':attribute ist unzulƤssig.',
+ 'prohibited_if' => ':attribute ist unzulƤssig, wenn :other :value ist.',
+ 'prohibited_unless' => ':attribute ist unzulƤssig, wenn :other nicht :values ist.',
+ 'prohibits' => ':attribute verbietet die Angabe von :other.',
+ 'regex' => ':attribute Format ist ungĆ¼ltig.',
+ 'relatable' => ':attribute kann nicht mit dieser Ressource verbunden werden.',
+ 'required' => ':attribute muss ausgefĆ¼llt werden.',
+ 'required_if' => ':attribute muss ausgefĆ¼llt werden, wenn :other den Wert :value hat.',
+ 'required_unless' => ':attribute muss ausgefĆ¼llt werden, wenn :other nicht den Wert :values hat.',
+ 'required_with' => ':attribute muss ausgefĆ¼llt werden, wenn :values ausgefĆ¼llt wurde.',
+ 'required_with_all' => ':attribute muss ausgefĆ¼llt werden, wenn :values ausgefĆ¼llt wurde.',
+ 'required_without' => ':attribute muss ausgefĆ¼llt werden, wenn :values nicht ausgefĆ¼llt wurde.',
+ 'required_without_all' => ':attribute muss ausgefĆ¼llt werden, wenn keines der Felder :values ausgefĆ¼llt wurde.',
+ 'same' => ':attribute und :other mĆ¼ssen Ć¼bereinstimmen.',
+ 'size' => [
+ 'array' => ':attribute muss genau :size Elemente haben.',
+ 'file' => ':attribute muss :size Kilobyte groĆ sein.',
+ 'numeric' => ':attribute muss gleich :size sein.',
+ 'string' => ':attribute muss :size Zeichen lang sein.',
+ ],
+ 'starts_with' => ':attribute muss mit einem der folgenden AnfƤnge aufweisen: :values',
+ 'string' => ':attribute muss ein String sein.',
+ 'timezone' => ':attribute muss eine gĆ¼ltige Zeitzone sein.',
+ 'unique' => ':attribute ist bereits vergeben.',
+ 'uploaded' => ':attribute konnte nicht hochgeladen werden.',
+ 'url' => ':attribute muss eine URL sein.',
+ 'uuid' => ':attribute muss ein UUID sein.',
+ 'custom' => [
+ 'attribute-name' => [
+ 'rule-name' => 'custom-message',
+ ],
+ ],
+];
diff --git a/resources/lang/en.json b/lang/en.json
similarity index 74%
rename from resources/lang/en.json
rename to lang/en.json
index 2aa72dbc7..c0aa64314 100644
--- a/resources/lang/en.json
+++ b/lang/en.json
@@ -10,6 +10,10 @@
"Everything is good!": "Everything is good!",
"System settings have not been updated!": "System settings have not been updated!",
"System settings updated!": "System settings updated!",
+ "Discount": "Discount",
+ "The product you chose can't be purchased with this payment method. The total amount is too small. Please buy a bigger amount or try a different payment method.": "The product you chose can't be purchased with this payment method. The total amount is too small. Please buy a bigger amount or try a different payment method.",
+ "Tax": "Tax",
+ "Your payment has been canceled!": "Your payment has been canceled!",
"api key created!": "api key created!",
"api key updated!": "api key updated!",
"api key has been removed!": "api key has been removed!",
@@ -20,11 +24,9 @@
"Invoice does not exist on filesystem!": "Invoice does not exist on filesystem!",
"unknown": "unknown",
"Pterodactyl synced": "Pterodactyl synced",
+ "An error ocured. Please try again.": "An error ocured. Please try again.",
"Your credit balance has been increased!": "Your credit balance has been increased!",
- "Your payment is being processed!": "Your payment is being processed!",
- "Your payment has been canceled!": "Your payment has been canceled!",
- "Payment method": "Payment method",
- "Invoice": "Invoice",
+ "Unknown user": "Unknown user",
"Download": "Download",
"Product has been created!": "Product has been created!",
"Product has been updated!": "Product has been updated!",
@@ -34,6 +36,10 @@
"Server removed": "Server removed",
"An exception has occurred while trying to remove a resource \"": "An exception has occurred while trying to remove a resource \"",
"Server has been updated!": "Server has been updated!",
+ "renamed": "renamed",
+ "servers": "servers",
+ "deleted": "deleted",
+ "old servers": "old servers",
"Unsuspend": "Unsuspend",
"Suspend": "Suspend",
"Store item has been created!": "Store item has been created!",
@@ -69,10 +75,15 @@
"Close": "Close",
"Target User already in blacklist. Reason updated": "Target User already in blacklist. Reason updated",
"Change Status": "Change Status",
+ "partner has been created!": "partner has been created!",
+ "partner has been updated!": "partner has been updated!",
+ "partner has been removed!": "partner has been removed!",
+ "Default": "Default",
+ "Account permanently deleted!": "Account permanently deleted!",
"Profile updated": "Profile updated",
"Server limit reached!": "Server limit reached!",
- "The node '\" . $nodeName . \"' doesn't have the required memory or disk left to allocate this product.": "The node '\" . $nodeName . \"' doesn't have the required memory or disk left to allocate this product.",
"You are required to verify your email address before you can create a server.": "You are required to verify your email address before you can create a server.",
+ "The system administrator has blocked the creation of new servers.": "The system administrator has blocked the creation of new servers.",
"You are required to link your discord account before you can create a server.": "You are required to link your discord account before you can create a server.",
"Server created": "Server created",
"No allocations satisfying the requirements for automatic deployment on this node were found.": "No allocations satisfying the requirements for automatic deployment on this node were found.",
@@ -82,9 +93,7 @@
"Not Enough Balance for Upgrade": "Not Enough Balance for Upgrade",
"You are required to verify your email address before you can purchase credits.": "You are required to verify your email address before you can purchase credits.",
"You are required to link your discord account before you can purchase Credits": "You are required to link your discord account before you can purchase Credits",
- "You can't make a ticket because you're on the blacklist for a reason: '\" . $check->reason . \"": "You can't make a ticket because you're on the blacklist for a reason: '\" . $check->reason . \"",
"A ticket has been opened, ID: #": "A ticket has been opened, ID: #",
- "You can't reply a ticket because you're on the blacklist for a reason: '\" . $check->reason . \"": "You can't reply a ticket because you're on the blacklist for a reason: '\" . $check->reason . \"",
"EXPIRED": "EXPIRED",
"Payment Confirmation": "Payment Confirmation",
"Payment Confirmed!": "Payment Confirmed!",
@@ -118,6 +127,8 @@
"These servers can be used and managed on our pterodactyl panel": "These servers can be used and managed on our pterodactyl panel",
"If you have any questions, please join our Discord server and #create-a-ticket": "If you have any questions, please join our Discord server and #create-a-ticket",
"We hope you can enjoy this hosting experience and if you have any suggestions please let us know": "We hope you can enjoy this hosting experience and if you have any suggestions please let us know",
+ "Payment method": "Payment method",
+ "Invoice": "Invoice",
"Activity Logs": "Activity Logs",
"Dashboard": "Dashboard",
"No recent activity from cronjobs": "No recent activity from cronjobs",
@@ -142,6 +153,10 @@
"Nodes": "Nodes",
"Location": "Location",
"Admin Overview": "Admin Overview",
+ "Version Outdated:": "Version Outdated:",
+ "You are running on": "You are running on",
+ "The latest Version is": "The latest Version is",
+ "Consider updating now": "Consider updating now",
"Support server": "Support server",
"Documentation": "Documentation",
"Github": "Github",
@@ -150,11 +165,59 @@
"Total": "Total",
"Payments": "Payments",
"Pterodactyl": "Pterodactyl",
+ "Warning!": "Warning!",
+ "Some nodes got deleted on pterodactyl only. Please click the sync button above.": "Some nodes got deleted on pterodactyl only. Please click the sync button above.",
"Resources": "Resources",
"Count": "Count",
"Locations": "Locations",
"Eggs": "Eggs",
"Last updated :date": "Last updated :date",
+ "Latest tickets": "Latest tickets",
+ "There are no tickets": "There are no tickets",
+ "Title": "Title",
+ "User": "User",
+ "Last updated": "Last updated",
+ "Controlpanel.gg": "Controlpanel.gg",
+ "Version": "Version",
+ "Individual nodes": "Individual nodes",
+ "You reached the Pterodactyl perPage limit. Please make sure to set it higher than your server count.": "You reached the Pterodactyl perPage limit. Please make sure to set it higher than your server count.",
+ "You can do that in settings.": "You can do that in settings.",
+ "Note": "Note",
+ "If this error persists even after changing the limit, it might mean a server was deleted on Pterodactyl, but not on ControlPanel. Try clicking the button below.": "If this error persists even after changing the limit, it might mean a server was deleted on Pterodactyl, but not on ControlPanel. Try clicking the button below.",
+ "Sync servers": "Sync servers",
+ "Node": "Node",
+ "Server count": "Server count",
+ "Resource usage": "Resource usage",
+ "Usage": "Usage",
+ "active": "active",
+ "total": "total",
+ "Latest payments": "Latest payments",
+ "Last month": "Last month",
+ "Payments in this time window": "Payments in this time window",
+ "Currency": "Currency",
+ "Number of payments": "Number of payments",
+ "Total amount": "Total amount",
+ "This month": "This month",
+ "Tax overview": "Tax overview",
+ "Last year": "Last year",
+ "Base amount": "Base amount",
+ "Total taxes": "Total taxes",
+ "This year": "This year",
+ "Vouchers": "Vouchers",
+ "Partner details": "Partner details",
+ "Partner discount": "Partner discount",
+ "The discount in percent given to the partner when purchasing credits.": "The discount in percent given to the partner when purchasing credits.",
+ "Discount in percent": "Discount in percent",
+ "Registered user discount": "Registered user discount",
+ "The discount in percent given to all users registered using the partners referral link when purchasing credits.": "The discount in percent given to all users registered using the partners referral link when purchasing credits.",
+ "Referral system commission": "Referral system commission",
+ "Override value for referral system commission. You can set it to -1 to get the default commission from settings.": "Override value for referral system commission. You can set it to -1 to get the default commission from settings.",
+ "Commission in percent": "Commission in percent",
+ "Partners": "Partners",
+ "The discount in percent given to the partner at checkout.": "The discount in percent given to the partner at checkout.",
+ "The discount in percent given to all users registered using the partners referral link.": "The discount in percent given to all users registered using the partners referral link.",
+ "Created": "Created",
+ "Actions": "Actions",
"Download all Invoices": "Download all Invoices",
"Product Price": "Product Price",
"Tax Value": "Tax Value",
@@ -182,6 +245,9 @@
"Link your products to nodes and eggs to create dynamic pricing for each option": "Link your products to nodes and eggs to create dynamic pricing for each option",
"This product will only be available for these nodes": "This product will only be available for these nodes",
"This product will only be available for these eggs": "This product will only be available for these eggs",
+ "No Eggs or Nodes shown?": "No Eggs or Nodes shown?",
+ "Sync now": "Sync now",
+ "Min Credits": "Min Credits",
"Product": "Product",
"CPU": "CPU",
"Updated at": "Updated at",
@@ -190,7 +256,9 @@
"You usually do not need to change anything here": "You usually do not need to change anything here",
"Edit Server": "Edit Server",
"Server identifier": "Server identifier",
- "User": "User",
+ "Change the server identifier on controlpanel to match a pterodactyl server.": "Change the server identifier on controlpanel to match a pterodactyl server.",
+ "Server owner": "Server owner",
+ "Change the current server owner on controlpanel and pterodactyl.": "Change the current server owner on controlpanel and pterodactyl.",
"Server id": "Server id",
"Config": "Config",
"Suspended at": "Suspended at",
@@ -199,10 +267,10 @@
"please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!": "please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!",
"or click here": "or click here",
"Company Name": "Company Name",
- "Company Adress": "Company Adress",
+ "Company Address": "Company Address",
"Company Phonenumber": "Company Phonenumber",
"VAT ID": "VAT ID",
- "Company E-Mail Adress": "Company E-Mail Adress",
+ "Company E-Mail Address": "Company E-Mail Address",
"Company Website": "Company Website",
"Invoice Prefix": "Invoice Prefix",
"Enable Invoices": "Enable Invoices",
@@ -224,7 +292,7 @@
"Mail Username": "Mail Username",
"Mail Password": "Mail Password",
"Mail Encryption": "Mail Encryption",
- "Mail From Adress": "Mail From Adress",
+ "Mail From Address": "Mail From Address",
"Mail From Name": "Mail From Name",
"Discord Client-ID": "Discord Client-ID",
"Discord Client-Secret": "Discord Client-Secret",
@@ -235,7 +303,11 @@
"Enable ReCaptcha": "Enable ReCaptcha",
"ReCaptcha Site-Key": "ReCaptcha Site-Key",
"ReCaptcha Secret-Key": "ReCaptcha Secret-Key",
+ "Your Recaptcha": "Your Recaptcha",
+ "Referral System": "Referral System",
"Enable Referral": "Enable Referral",
+ "Always give commission": "Always give commission",
+ "Should users recieve the commission only for the first payment, or for every payment?": "Should users recieve the commission only for the first payment, or for every payment?",
"Mode": "Mode",
"Should a reward be given if a new User registers or if a new user buys credits": "Should a reward be given if a new User registers or if a new user buys credits",
"Commission": "Commission",
@@ -251,6 +323,10 @@
"Everyone": "Everyone",
"Clients": "Clients",
"Enable Ticketsystem": "Enable Ticketsystem",
+ "Notify on Ticket creation": "Notify on Ticket creation",
+ "Who will receive an E-Mail when a new Ticket is created": "Who will receive an E-Mail when a new Ticket is created",
+ "Admins": "Admins",
+ "Moderators": "Moderators",
"PayPal Client-ID": "PayPal Client-ID",
"PayPal Secret-Key": "PayPal Secret-Key",
"PayPal Sandbox Client-ID": "PayPal Sandbox Client-ID",
@@ -263,6 +339,9 @@
"Payment Methods": "Payment Methods",
"Tax Value in %": "Tax Value in %",
"System": "System",
+ "Show Terms of Service": "Show Terms of Service",
+ "Show Imprint": "Show Imprint",
+ "Show Privacy Policy": "Show Privacy Policy",
"Register IP Check": "Register IP Check",
"Prevent users from making multiple accounts using the same IP address.": "Prevent users from making multiple accounts using the same IP address.",
"Charge first hour at creation": "Charge first hour at creation",
@@ -272,6 +351,8 @@
"Enter the URL to your PHPMyAdmin installation. Without a trailing slash!<\/strong>": "Enter the URL to your PHPMyAdmin installation. Without a trailing slash!<\/strong>",
"Pterodactyl URL": "Pterodactyl URL",
"Enter the URL to your Pterodactyl installation. Without a trailing slash!<\/strong>": "Enter the URL to your Pterodactyl installation. Without a trailing slash!<\/strong>",
+ "Pterodactyl API perPage limit": "Pterodactyl API perPage limit",
+ "The Pterodactyl API perPage limit. It is necessary to set it higher than your server count.": "The Pterodactyl API perPage limit. It is necessary to set it higher than your server count.",
"Pterodactyl API Key": "Pterodactyl API Key",
"Enter the API Key to your Pterodactyl installation.": "Enter the API Key to your Pterodactyl installation.",
"Pterodactyl Admin-Account API Key": "Pterodactyl Admin-Account API Key",
@@ -279,6 +360,8 @@
"Test API": "Test API",
"Force Discord verification": "Force Discord verification",
"Force E-Mail verification": "Force E-Mail verification",
+ "Creation of new users": "Creation of new users",
+ "If unchecked, it will disable the registration of new users in the system, and this will also apply to the API.": "If unchecked, it will disable the registration of new users in the system, and this will also apply to the API.",
"Initial Credits": "Initial Credits",
"Initial Server Limit": "Initial Server Limit",
"Credits Reward Amount - Discord": "Credits Reward Amount - Discord",
@@ -287,13 +370,38 @@
"Server Limit Increase - E-Mail": "Server Limit Increase - E-Mail",
"Server Limit after Credits Purchase": "Server Limit after Credits Purchase",
"Server": "Server",
+ "Enable upgrade\/downgrade of servers": "Enable upgrade\/downgrade of servers",
+ "Allow upgrade\/downgrade to a new product for the given server": "Allow upgrade\/downgrade to a new product for the given server",
+ "Creation of new servers": "Creation of new servers",
+ "If unchecked, it will disable the creation of new servers for regular users and system moderators, this has no effect for administrators.": "If unchecked, it will disable the creation of new servers for regular users and system moderators, this has no effect for administrators.",
"Server Allocation Limit": "Server Allocation Limit",
"The maximum amount of allocations to pull per node for automatic deployment, if more allocations are being used than this limit is set to, no new servers can be created!": "The maximum amount of allocations to pull per node for automatic deployment, if more allocations are being used than this limit is set to, no new servers can be created!",
+ "Minimum credits": "Minimum credits",
+ "The minimum amount of credits user has to have to create a server. Can be overridden by package limits.": "The minimum amount of credits user has to have to create a server. Can be overridden by package limits.",
+ "SEO": "SEO",
+ "SEO Title": "SEO Title",
+ "An SEO title tag must contain your target keyword. This tells both Google and searchers that your web page is relevant to this search query!": "An SEO title tag must contain your target keyword. This tells both Google and searchers that your web page is relevant to this search query!",
+ "SEO Description": "SEO Description",
+ "The SEO site description represents your homepage. Search engines show this description in search results for your homepage if they dont find content more relevant to a visitors search terms.": "The SEO site description represents your homepage. Search engines show this description in search results for your homepage if they dont find content more relevant to a visitors search terms.",
"Design": "Design",
+ "Theme": "Theme",
"Enable Logo on Loginpage": "Enable Logo on Loginpage",
"Select panel icon": "Select panel icon",
"Select Login-page Logo": "Select Login-page Logo",
"Select panel favicon": "Select panel favicon",
+ "Enable the Alert Message on Homepage": "Enable the Alert Message on Homepage",
+ "Alert Color": "Alert Color",
+ "Blue": "Blue",
+ "Grey": "Grey",
+ "Green": "Green",
+ "Red": "Red",
+ "Orange": "Orange",
+ "Cyan": "Cyan",
+ "Alert Message (HTML might be used)": "Alert Message (HTML might be used)",
+ "Message of the day": "Message of the day",
+ "Enable the MOTD on the Homepage": "Enable the MOTD on the Homepage",
+ "Enable the Useful-Links section": "Enable the Useful-Links section",
+ "MOTD-Text": "MOTD-Text",
"Store": "Store",
"Server Slots": "Server Slots",
"Currency code": "Currency code",
@@ -309,7 +417,6 @@
"Useful Links": "Useful Links",
"Icon class name": "Icon class name",
"You can find available free icons": "You can find available free icons",
- "Title": "Title",
"Link": "Link",
"description": "description",
"Icon": "Icon",
@@ -339,11 +446,9 @@
"Content": "Content",
"Server limit": "Server limit",
"Discord": "Discord",
- "Usage": "Usage",
"IP": "IP",
"Referals": "Referals",
"referral-code": "referral-code",
- "Vouchers": "Vouchers",
"Voucher details": "Voucher details",
"Summer break voucher": "Summer break voucher",
"Code": "Code",
@@ -355,11 +460,15 @@
"Used \/ Uses": "Used \/ Uses",
"Expires": "Expires",
"Sign in to start your session": "Sign in to start your session",
+ "Email or Username": "Email or Username",
"Password": "Password",
"Remember Me": "Remember Me",
"Sign In": "Sign In",
"Forgot Your Password?": "Forgot Your Password?",
"Register a new membership": "Register a new membership",
+ "Imprint": "Imprint",
+ "Privacy": "Privacy",
+ "Terms of Service": "Terms of Service",
"Please confirm your password before continuing.": "Please confirm your password before continuing.",
"You forgot your password? Here you can easily retrieve a new password.": "You forgot your password? Here you can easily retrieve a new password.",
"Request new password": "Request new password",
@@ -367,7 +476,10 @@
"You are only one step a way from your new password, recover your password now.": "You are only one step a way from your new password, recover your password now.",
"Retype password": "Retype password",
"Change password": "Change password",
+ "The system administrator has blocked the registration of new users": "The system administrator has blocked the registration of new users",
+ "Back": "Back",
"Referral code": "Referral code",
+ "I agree to the": "I agree to the",
"Register": "Register",
"I already have a membership": "I already have a membership",
"Verify Your Email Address": "Verify Your Email Address",
@@ -377,6 +489,17 @@
"click here to request another": "click here to request another",
"per month": "per month",
"Out of Credits in": "Out of Credits in",
+ "Partner program": "Partner program",
+ "Your referral URL": "Your referral URL",
+ "Click to copy": "Click to copy",
+ "Number of referred users:": "Number of referred users:",
+ "Your discount": "Your discount",
+ "Discount for your new users": "Discount for your new users",
+ "Reward per registered user": "Reward per registered user",
+ "New user payment commision": "New user payment commision",
+ "Make a purchase to reveal your referral-URL": "Make a purchase to reveal your referral-URL",
+ "URL copied to clipboard": "URL copied to clipboard",
+ "Privacy Policy": "Privacy Policy",
"Home": "Home",
"Language": "Language",
"See all Notifications": "See all Notifications",
@@ -394,7 +517,6 @@
"Management": "Management",
"Other": "Other",
"Logs": "Logs",
- "Warning!": "Warning!",
"You have not yet verified your email address": "You have not yet verified your email address",
"Click here to resend verification email": "Click here to resend verification email",
"Please contact support If you didnt receive your verification email.": "Please contact support If you didnt receive your verification email.",
@@ -406,12 +528,12 @@
"Blacklist List": "Blacklist List",
"Reason": "Reason",
"Created At": "Created At",
- "Actions": "Actions",
"Add To Blacklist": "Add To Blacklist",
"please make the best of it": "please make the best of it",
"Please note, the blacklist will make the user unable to make a ticket\/reply again": "Please note, the blacklist will make the user unable to make a ticket\/reply again",
"Ticket": "Ticket",
"Category": "Category",
+ "Priority": "Priority",
"Last Updated": "Last Updated",
"Comment": "Comment",
"All notifications": "All notifications",
@@ -422,6 +544,7 @@
"Please contact support If you face any issues.": "Please contact support If you face any issues.",
"Due to system settings you are required to verify your discord account!": "Due to system settings you are required to verify your discord account!",
"It looks like this hasnt been set-up correctly! Please contact support.": "It looks like this hasnt been set-up correctly! Please contact support.",
+ "Permanently delete my account": "Permanently delete my account",
"Change Password": "Change Password",
"Current Password": "Current Password",
"Link your discord account!": "Link your discord account!",
@@ -430,11 +553,14 @@
"You are verified!": "You are verified!",
"Re-Sync Discord": "Re-Sync Discord",
"Save Changes": "Save Changes",
- "URL copied to clipboard": "URL copied to clipboard",
+ "Are you sure you want to permanently delete your account and all of your servers?": "Are you sure you want to permanently delete your account and all of your servers?",
+ "Delete my account": "Delete my account",
+ "Account has been destroyed": "Account has been destroyed",
+ "Account was NOT deleted.": "Account was NOT deleted.",
"Server configuration": "Server configuration",
+ "here": "here",
"Make sure to link your products to nodes and eggs.": "Make sure to link your products to nodes and eggs.",
"There has to be at least 1 valid product for server creation": "There has to be at least 1 valid product for server creation",
- "Sync now": "Sync now",
"No products available!": "No products available!",
"No nodes have been linked!": "No nodes have been linked!",
"No nests available!": "No nests available!",
@@ -443,12 +569,14 @@
"Please select software ...": "Please select software ...",
"---": "---",
"Specification ": "Specification ",
- "Node": "Node",
"Resource Data:": "Resource Data:",
"vCores": "vCores",
"MB": "MB",
"MySQL": "MySQL",
"ports": "ports",
+ "Required": "Required",
+ "to create this server": "to create this server",
+ "Server cant fit on this Node": "Server cant fit on this Node",
"Not enough": "Not enough",
"Create server": "Create server",
"Please select a node ...": "Please select a node ...",
@@ -472,20 +600,20 @@
"Hourly Price": "Hourly Price",
"Monthly Price": "Monthly Price",
"MySQL Database": "MySQL Database",
- "To enable the upgrade\/downgrade system, please set your Ptero Admin-User API Key in the Settings!": "To enable the upgrade\/downgrade system, please set your Ptero Admin-User API Key in the Settings!",
"Upgrade \/ Downgrade": "Upgrade \/ Downgrade",
"Upgrade\/Downgrade Server": "Upgrade\/Downgrade Server",
"FOR DOWNGRADE PLEASE CHOOSE A PLAN BELOW YOUR PLAN": "FOR DOWNGRADE PLEASE CHOOSE A PLAN BELOW YOUR PLAN",
"YOUR PRODUCT": "YOUR PRODUCT",
"Select the product": "Select the product",
+ "Server canĀ“t fit on this node": "Server canĀ“t fit on this node",
"Once the Upgrade button is pressed, we will automatically deduct the amount for the first hour according to the new product from your credits": "Once the Upgrade button is pressed, we will automatically deduct the amount for the first hour according to the new product from your credits",
+ "Server will be automatically restarted once upgraded": "Server will be automatically restarted once upgraded",
"Change Product": "Change Product",
"Delete Server": "Delete Server",
"This is an irreversible action, all files of this server will be removed!": "This is an irreversible action, all files of this server will be removed!",
"Date": "Date",
"Subtotal": "Subtotal",
"Amount Due": "Amount Due",
- "Tax": "Tax",
"Submit Payment": "Submit Payment",
"Purchase": "Purchase",
"There are no store products!": "There are no store products!",
@@ -504,13 +632,10 @@
"VAT Code": "VAT Code",
"Phone": "Phone",
"Units": "Units",
- "Discount": "Discount",
"Total discount": "Total discount",
"Taxable amount": "Taxable amount",
"Tax rate": "Tax rate",
- "Total taxes": "Total taxes",
"Shipping": "Shipping",
- "Total amount": "Total amount",
"Notes": "Notes",
"Amount in words": "Amount in words",
"Please pay until": "Please pay until",
diff --git a/resources/lang/en/auth.php b/lang/en/auth.php
similarity index 100%
rename from resources/lang/en/auth.php
rename to lang/en/auth.php
diff --git a/resources/lang/en/pagination.php b/lang/en/pagination.php
similarity index 100%
rename from resources/lang/en/pagination.php
rename to lang/en/pagination.php
diff --git a/resources/lang/en/passwords.php b/lang/en/passwords.php
similarity index 100%
rename from resources/lang/en/passwords.php
rename to lang/en/passwords.php
diff --git a/resources/lang/en/validation.php b/lang/en/validation.php
similarity index 70%
rename from resources/lang/en/validation.php
rename to lang/en/validation.php
index c77e41ce4..af94bd426 100644
--- a/resources/lang/en/validation.php
+++ b/lang/en/validation.php
@@ -14,47 +14,56 @@
*/
'accepted' => 'The :attribute must be accepted.',
+ 'accepted_if' => 'The :attribute must be accepted when :other is :value.',
'active_url' => 'The :attribute is not a valid URL.',
'after' => 'The :attribute must be a date after :date.',
'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
- 'alpha' => 'The :attribute may only contain letters.',
- 'alpha_dash' => 'The :attribute may only contain letters, numbers, dashes and underscores.',
- 'alpha_num' => 'The :attribute may only contain letters and numbers.',
+ 'alpha' => 'The :attribute must only contain letters.',
+ 'alpha_dash' => 'The :attribute must only contain letters, numbers, dashes and underscores.',
+ 'alpha_num' => 'The :attribute must only contain letters and numbers.',
'array' => 'The :attribute must be an array.',
+ 'ascii' => 'The :attribute must only contain single-byte alphanumeric characters and symbols.',
'before' => 'The :attribute must be a date before :date.',
'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
'between' => [
- 'numeric' => 'The :attribute must be between :min and :max.',
+ 'array' => 'The :attribute must have between :min and :max items.',
'file' => 'The :attribute must be between :min and :max kilobytes.',
+ 'numeric' => 'The :attribute must be between :min and :max.',
'string' => 'The :attribute must be between :min and :max characters.',
- 'array' => 'The :attribute must have between :min and :max items.',
],
'boolean' => 'The :attribute field must be true or false.',
'confirmed' => 'The :attribute confirmation does not match.',
+ 'current_password' => 'The password is incorrect.',
'date' => 'The :attribute is not a valid date.',
'date_equals' => 'The :attribute must be a date equal to :date.',
'date_format' => 'The :attribute does not match the format :format.',
+ 'decimal' => 'The :attribute must have :decimal decimal places.',
+ 'declined' => 'The :attribute must be declined.',
+ 'declined_if' => 'The :attribute must be declined when :other is :value.',
'different' => 'The :attribute and :other must be different.',
'digits' => 'The :attribute must be :digits digits.',
'digits_between' => 'The :attribute must be between :min and :max digits.',
'dimensions' => 'The :attribute has invalid image dimensions.',
'distinct' => 'The :attribute field has a duplicate value.',
+ 'doesnt_end_with' => 'The :attribute may not end with one of the following: :values.',
+ 'doesnt_start_with' => 'The :attribute may not start with one of the following: :values.',
'email' => 'The :attribute must be a valid email address.',
'ends_with' => 'The :attribute must end with one of the following: :values.',
+ 'enum' => 'The selected :attribute is invalid.',
'exists' => 'The selected :attribute is invalid.',
'file' => 'The :attribute must be a file.',
'filled' => 'The :attribute field must have a value.',
'gt' => [
- 'numeric' => 'The :attribute must be greater than :value.',
+ 'array' => 'The :attribute must have more than :value items.',
'file' => 'The :attribute must be greater than :value kilobytes.',
+ 'numeric' => 'The :attribute must be greater than :value.',
'string' => 'The :attribute must be greater than :value characters.',
- 'array' => 'The :attribute must have more than :value items.',
],
'gte' => [
- 'numeric' => 'The :attribute must be greater than or equal :value.',
- 'file' => 'The :attribute must be greater than or equal :value kilobytes.',
- 'string' => 'The :attribute must be greater than or equal :value characters.',
'array' => 'The :attribute must have :value items or more.',
+ 'file' => 'The :attribute must be greater than or equal to :value kilobytes.',
+ 'numeric' => 'The :attribute must be greater than or equal to :value.',
+ 'string' => 'The :attribute must be greater than or equal to :value characters.',
],
'image' => 'The :attribute must be an image.',
'in' => 'The selected :attribute is invalid.',
@@ -64,41 +73,57 @@
'ipv4' => 'The :attribute must be a valid IPv4 address.',
'ipv6' => 'The :attribute must be a valid IPv6 address.',
'json' => 'The :attribute must be a valid JSON string.',
+ 'lowercase' => 'The :attribute must be lowercase.',
'lt' => [
- 'numeric' => 'The :attribute must be less than :value.',
+ 'array' => 'The :attribute must have less than :value items.',
'file' => 'The :attribute must be less than :value kilobytes.',
+ 'numeric' => 'The :attribute must be less than :value.',
'string' => 'The :attribute must be less than :value characters.',
- 'array' => 'The :attribute must have less than :value items.',
],
'lte' => [
- 'numeric' => 'The :attribute must be less than or equal :value.',
- 'file' => 'The :attribute must be less than or equal :value kilobytes.',
- 'string' => 'The :attribute must be less than or equal :value characters.',
'array' => 'The :attribute must not have more than :value items.',
+ 'file' => 'The :attribute must be less than or equal to :value kilobytes.',
+ 'numeric' => 'The :attribute must be less than or equal to :value.',
+ 'string' => 'The :attribute must be less than or equal to :value characters.',
],
+ 'mac_address' => 'The :attribute must be a valid MAC address.',
'max' => [
- 'numeric' => 'The :attribute may not be greater than :max.',
- 'file' => 'The :attribute may not be greater than :max kilobytes.',
- 'string' => 'The :attribute may not be greater than :max characters.',
- 'array' => 'The :attribute may not have more than :max items.',
+ 'array' => 'The :attribute must not have more than :max items.',
+ 'file' => 'The :attribute must not be greater than :max kilobytes.',
+ 'numeric' => 'The :attribute must not be greater than :max.',
+ 'string' => 'The :attribute must not be greater than :max characters.',
],
+ 'max_digits' => 'The :attribute must not have more than :max digits.',
'mimes' => 'The :attribute must be a file of type: :values.',
'mimetypes' => 'The :attribute must be a file of type: :values.',
'min' => [
- 'numeric' => 'The :attribute must be at least :min.',
+ 'array' => 'The :attribute must have at least :min items.',
'file' => 'The :attribute must be at least :min kilobytes.',
+ 'numeric' => 'The :attribute must be at least :min.',
'string' => 'The :attribute must be at least :min characters.',
- 'array' => 'The :attribute must have at least :min items.',
],
+ 'min_digits' => 'The :attribute must have at least :min digits.',
'multiple_of' => 'The :attribute must be a multiple of :value.',
'not_in' => 'The selected :attribute is invalid.',
'not_regex' => 'The :attribute format is invalid.',
'numeric' => 'The :attribute must be a number.',
- 'password' => 'The password is incorrect.',
+ 'password' => [
+ 'letters' => 'The :attribute must contain at least one letter.',
+ 'mixed' => 'The :attribute must contain at least one uppercase and one lowercase letter.',
+ 'numbers' => 'The :attribute must contain at least one number.',
+ 'symbols' => 'The :attribute must contain at least one symbol.',
+ 'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+ ],
'present' => 'The :attribute field must be present.',
+ 'prohibited' => 'The :attribute field is prohibited.',
+ 'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+ 'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+ 'prohibits' => 'The :attribute field prohibits :other from being present.',
'regex' => 'The :attribute format is invalid.',
'required' => 'The :attribute field is required.',
+ 'required_array_keys' => 'The :attribute field must contain entries for: :values.',
'required_if' => 'The :attribute field is required when :other is :value.',
+ 'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
'required_unless' => 'The :attribute field is required unless :other is in :values.',
'required_with' => 'The :attribute field is required when :values is present.',
'required_with_all' => 'The :attribute field is required when :values are present.',
@@ -106,17 +131,19 @@
'required_without_all' => 'The :attribute field is required when none of :values are present.',
'same' => 'The :attribute and :other must match.',
'size' => [
- 'numeric' => 'The :attribute must be :size.',
+ 'array' => 'The :attribute must contain :size items.',
'file' => 'The :attribute must be :size kilobytes.',
+ 'numeric' => 'The :attribute must be :size.',
'string' => 'The :attribute must be :size characters.',
- 'array' => 'The :attribute must contain :size items.',
],
'starts_with' => 'The :attribute must start with one of the following: :values.',
'string' => 'The :attribute must be a string.',
- 'timezone' => 'The :attribute must be a valid zone.',
+ 'timezone' => 'The :attribute must be a valid timezone.',
'unique' => 'The :attribute has already been taken.',
'uploaded' => 'The :attribute failed to upload.',
- 'url' => 'The :attribute format is invalid.',
+ 'uppercase' => 'The :attribute must be uppercase.',
+ 'url' => 'The :attribute must be a valid URL.',
+ 'ulid' => 'The :attribute must be a valid ULID.',
'uuid' => 'The :attribute must be a valid UUID.',
/*
diff --git a/resources/lang/es.json b/lang/es.json
similarity index 99%
rename from resources/lang/es.json
rename to lang/es.json
index af47f9bc3..400a46f49 100644
--- a/resources/lang/es.json
+++ b/lang/es.json
@@ -174,10 +174,10 @@
"please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!": "cree un archivo llamado \"install.lock\" en el directorio RaĆz de su tablero. Ā”De lo contrario, no se cargarĆ” ninguna configuraciĆ³n!",
"or click here": "o haga clic aquĆ",
"Company Name": "Nombre Empresa",
- "Company Adress": "DirecciĆ³n de la Empresa",
+ "Company Address": "DirecciĆ³n de la Empresa",
"Company Phonenumber": "NĆŗmero de telĆ©fono de la empresa",
"VAT ID": "ID de IVA",
- "Company E-Mail Adress": "DirecciĆ³n de correo electrĆ³nico de la empresa",
+ "Company E-Mail Address": "DirecciĆ³n de correo electrĆ³nico de la empresa",
"Company Website": "PƔgina Web de la empresa",
"Invoice Prefix": "Prefijo de factura",
"Enable Invoices": "Habilitar facturas",
@@ -199,7 +199,7 @@
"Mail Username": "Nombre de usuario del correo",
"Mail Password": "ContraseƱa de correo",
"Mail Encryption": "Cifrado de correo",
- "Mail From Adress": "DirecciĆ³n del correo",
+ "Mail From Address": "DirecciĆ³n del correo",
"Mail From Name": "Nombre del correo",
"Discord Client-ID": "Discord ID-Cliente",
"Discord Client-Secret": "Discord Secreto-Cliente",
@@ -461,4 +461,4 @@
"ru": "Ruso",
"sv": "Sueco",
"sk": "Eslovaco"
-}
\ No newline at end of file
+}
diff --git a/resources/lang/es/auth.php b/lang/es/auth.php
similarity index 88%
rename from resources/lang/es/auth.php
rename to lang/es/auth.php
index b84524757..08f81942a 100644
--- a/resources/lang/es/auth.php
+++ b/lang/es/auth.php
@@ -12,7 +12,7 @@
*/
return [
- 'failed' => 'Estas credenciales no coinciden con nuestros registros.',
+ 'failed' => 'Estas credenciales no coinciden con nuestros registros.',
'password' => 'La contraseƱa ingresada no es correcta.',
'throttle' => 'Demasiados intentos de acceso. Por favor intente nuevamente en :seconds segundos.',
];
diff --git a/resources/lang/es/pagination.php b/lang/es/pagination.php
similarity index 92%
rename from resources/lang/es/pagination.php
rename to lang/es/pagination.php
index d8f0d1940..7fda4d4ac 100644
--- a/resources/lang/es/pagination.php
+++ b/lang/es/pagination.php
@@ -12,6 +12,6 @@
*/
return [
- 'next' => 'Siguiente »',
+ 'next' => 'Siguiente »',
'previous' => '« Anterior',
];
diff --git a/resources/lang/es/passwords.php b/lang/es/passwords.php
similarity index 59%
rename from resources/lang/es/passwords.php
rename to lang/es/passwords.php
index 7745e6465..2d80b4ac2 100644
--- a/resources/lang/es/passwords.php
+++ b/lang/es/passwords.php
@@ -12,9 +12,9 @@
*/
return [
- 'reset' => 'Ā”Su contraseƱa ha sido restablecida!',
- 'sent' => 'Ā”Le hemos enviado por correo electrĆ³nico el enlace para restablecer su contraseƱa!',
+ 'reset' => 'Ā”Su contraseƱa ha sido restablecida!',
+ 'sent' => 'Ā”Le hemos enviado por correo electrĆ³nico el enlace para restablecer su contraseƱa!',
'throttled' => 'Por favor espere antes de intentar de nuevo.',
- 'token' => 'El token de restablecimiento de contraseƱa es invƔlido.',
- 'user' => 'No encontramos ningĆŗn usuario con ese correo electrĆ³nico.',
+ 'token' => 'El token de restablecimiento de contraseƱa es invƔlido.',
+ 'user' => 'No encontramos ningĆŗn usuario con ese correo electrĆ³nico.',
];
diff --git a/lang/es/validation.php b/lang/es/validation.php
new file mode 100644
index 000000000..43631f27d
--- /dev/null
+++ b/lang/es/validation.php
@@ -0,0 +1,138 @@
+ ':attribute debe ser aceptado.',
+ 'accepted_if' => ':attribute debe ser aceptado cuando :other sea :value.',
+ 'active_url' => ':attribute no es una URL vƔlida.',
+ 'after' => ':attribute debe ser una fecha posterior a :date.',
+ 'after_or_equal' => ':attribute debe ser una fecha posterior o igual a :date.',
+ 'alpha' => ':attribute sĆ³lo debe contener letras.',
+ 'alpha_dash' => ':attribute sĆ³lo debe contener letras, nĆŗmeros, guiones y guiones bajos.',
+ 'alpha_num' => ':attribute sĆ³lo debe contener letras y nĆŗmeros.',
+ 'array' => ':attribute debe ser un conjunto.',
+ 'attached' => 'Este :attribute ya se adjuntĆ³.',
+ 'before' => ':attribute debe ser una fecha anterior a :date.',
+ 'before_or_equal' => ':attribute debe ser una fecha anterior o igual a :date.',
+ 'between' => [
+ 'array' => ':attribute tiene que tener entre :min - :max elementos.',
+ 'file' => ':attribute debe pesar entre :min - :max kilobytes.',
+ 'numeric' => ':attribute tiene que estar entre :min - :max.',
+ 'string' => ':attribute tiene que tener entre :min - :max caracteres.',
+ ],
+ 'boolean' => 'El campo :attribute debe tener un valor verdadero o falso.',
+ 'confirmed' => 'La confirmaciĆ³n de :attribute no coincide.',
+ 'current_password' => 'La contraseƱa es incorrecta.',
+ 'date' => ':attribute no es una fecha vƔlida.',
+ 'date_equals' => ':attribute debe ser una fecha igual a :date.',
+ 'date_format' => ':attribute no corresponde al formato :format.',
+ 'declined' => ':attribute debe ser rechazado.',
+ 'declined_if' => ':attribute debe ser rechazado cuando :other sea :value.',
+ 'different' => ':attribute y :other deben ser diferentes.',
+ 'digits' => ':attribute debe tener :digits dĆgitos.',
+ 'digits_between' => ':attribute debe tener entre :min y :max dĆgitos.',
+ 'dimensions' => 'Las dimensiones de la imagen :attribute no son vƔlidas.',
+ 'distinct' => 'El campo :attribute contiene un valor duplicado.',
+ 'email' => ':attribute no es un correo vƔlido.',
+ 'ends_with' => 'El campo :attribute debe finalizar con uno de los siguientes valores: :values',
+ 'exists' => ':attribute es invƔlido.',
+ 'file' => 'El campo :attribute debe ser un archivo.',
+ 'filled' => 'El campo :attribute es obligatorio.',
+ 'gt' => [
+ 'array' => 'El campo :attribute debe tener mƔs de :value elementos.',
+ 'file' => 'El campo :attribute debe tener mƔs de :value kilobytes.',
+ 'numeric' => 'El campo :attribute debe ser mayor que :value.',
+ 'string' => 'El campo :attribute debe tener mƔs de :value caracteres.',
+ ],
+ 'gte' => [
+ 'array' => 'El campo :attribute debe tener como mĆnimo :value elementos.',
+ 'file' => 'El campo :attribute debe tener como mĆnimo :value kilobytes.',
+ 'numeric' => 'El campo :attribute debe ser como mĆnimo :value.',
+ 'string' => 'El campo :attribute debe tener como mĆnimo :value caracteres.',
+ ],
+ 'image' => ':attribute debe ser una imagen.',
+ 'in' => ':attribute es invƔlido.',
+ 'in_array' => 'El campo :attribute no existe en :other.',
+ 'integer' => ':attribute debe ser un nĆŗmero entero.',
+ 'ip' => ':attribute debe ser una direcciĆ³n IP vĆ”lida.',
+ 'ipv4' => ':attribute debe ser una direcciĆ³n IPv4 vĆ”lida.',
+ 'ipv6' => ':attribute debe ser una direcciĆ³n IPv6 vĆ”lida.',
+ 'json' => 'El campo :attribute debe ser una cadena JSON vƔlida.',
+ 'lt' => [
+ 'array' => 'El campo :attribute debe tener menos de :value elementos.',
+ 'file' => 'El campo :attribute debe tener menos de :value kilobytes.',
+ 'numeric' => 'El campo :attribute debe ser menor que :value.',
+ 'string' => 'El campo :attribute debe tener menos de :value caracteres.',
+ ],
+ 'lte' => [
+ 'array' => 'El campo :attribute debe tener como mƔximo :value elementos.',
+ 'file' => 'El campo :attribute debe tener como mƔximo :value kilobytes.',
+ 'numeric' => 'El campo :attribute debe ser como mƔximo :value.',
+ 'string' => 'El campo :attribute debe tener como mƔximo :value caracteres.',
+ ],
+ 'max' => [
+ 'array' => ':attribute no debe tener mƔs de :max elementos.',
+ 'file' => ':attribute no debe ser mayor que :max kilobytes.',
+ 'numeric' => ':attribute no debe ser mayor que :max.',
+ 'string' => ':attribute no debe ser mayor que :max caracteres.',
+ ],
+ 'mimes' => ':attribute debe ser un archivo con formato: :values.',
+ 'mimetypes' => ':attribute debe ser un archivo con formato: :values.',
+ 'min' => [
+ 'array' => ':attribute debe tener al menos :min elementos.',
+ 'file' => 'El tamaƱo de :attribute debe ser de al menos :min kilobytes.',
+ 'numeric' => 'El tamaƱo de :attribute debe ser de al menos :min.',
+ 'string' => ':attribute debe contener al menos :min caracteres.',
+ ],
+ 'multiple_of' => 'El campo :attribute debe ser mĆŗltiplo de :value',
+ 'not_in' => ':attribute es invƔlido.',
+ 'not_regex' => 'El formato del campo :attribute no es vƔlido.',
+ 'numeric' => ':attribute debe ser numƩrico.',
+ 'password' => 'La contraseƱa es incorrecta.',
+ 'present' => 'El campo :attribute debe estar presente.',
+ 'prohibited' => 'El campo :attribute estĆ” prohibido.',
+ 'prohibited_if' => 'El campo :attribute estĆ” prohibido cuando :other es :value.',
+ 'prohibited_unless' => 'El campo :attribute estĆ” prohibido a menos que :other sea :values.',
+ 'prohibits' => 'El campo :attribute prohibe que :other estƩ presente.',
+ 'regex' => 'El formato de :attribute es invƔlido.',
+ 'relatable' => 'Este :attribute no se puede asociar con este recurso',
+ 'required' => 'El campo :attribute es obligatorio.',
+ 'required_if' => 'El campo :attribute es obligatorio cuando :other es :value.',
+ 'required_unless' => 'El campo :attribute es obligatorio a menos que :other estƩ en :values.',
+ 'required_with' => 'El campo :attribute es obligatorio cuando :values estĆ” presente.',
+ 'required_with_all' => 'El campo :attribute es obligatorio cuando :values estƔn presentes.',
+ 'required_without' => 'El campo :attribute es obligatorio cuando :values no estĆ” presente.',
+ 'required_without_all' => 'El campo :attribute es obligatorio cuando ninguno de :values estĆ” presente.',
+ 'same' => ':attribute y :other deben coincidir.',
+ 'size' => [
+ 'array' => ':attribute debe contener :size elementos.',
+ 'file' => 'El tamaƱo de :attribute debe ser :size kilobytes.',
+ 'numeric' => 'El tamaƱo de :attribute debe ser :size.',
+ 'string' => ':attribute debe contener :size caracteres.',
+ ],
+ 'starts_with' => 'El campo :attribute debe comenzar con uno de los siguientes valores: :values',
+ 'string' => 'El campo :attribute debe ser una cadena de caracteres.',
+ 'timezone' => ':Attribute debe ser una zona horaria vƔlida.',
+ 'unique' => 'El campo :attribute ya ha sido registrado.',
+ 'uploaded' => 'Subir :attribute ha fallado.',
+ 'url' => ':Attribute debe ser una URL vƔlida.',
+ 'uuid' => 'El campo :attribute debe ser un UUID vƔlido.',
+ 'custom' => [
+ 'email' => [
+ 'unique' => 'El :attribute ya ha sido registrado.',
+ ],
+ 'password' => [
+ 'min' => 'La :attribute debe contener mƔs de :min caracteres',
+ ],
+ ],
+];
diff --git a/resources/lang/fr.json b/lang/fr.json
similarity index 99%
rename from resources/lang/fr.json
rename to lang/fr.json
index 7c21a7359..f415e5c62 100644
--- a/resources/lang/fr.json
+++ b/lang/fr.json
@@ -174,10 +174,10 @@
"please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!": "veuillez crĆ©er un fichier appelĆ© \"install.lock\" dans le rĆ©pertoire racine de votre tableau de bord. Sinon, aucun paramĆØtre ne sera chargĆ©!",
"or click here": "ou cliquez ici",
"Company Name": "Nom de la compagnie",
- "Company Adress": "Adresse de la compagnie",
+ "Company Address": "Adresse de la compagnie",
"Company Phonenumber": "NumƩro de tƩlƩphone de l'entreprise",
"VAT ID": "VAT ID",
- "Company E-Mail Adress": "Adresse Ć©lectronique de l'entreprise",
+ "Company E-Mail Address": "Adresse Ć©lectronique de l'entreprise",
"Company Website": "Site Web de l'entreprise",
"Invoice Prefix": "PrƩfixe de facturation",
"Enable Invoices": "Activer les factures",
@@ -199,7 +199,7 @@
"Mail Username": "Mail Username",
"Mail Password": "Mail Password",
"Mail Encryption": "Mail Encryption",
- "Mail From Adress": "Mail From Adress",
+ "Mail From Address": "Mail From Address",
"Mail From Name": "Mail From Name",
"Discord Client-ID": "Discord Client-ID",
"Discord Client-Secret": "Discord Client-Secret",
@@ -461,4 +461,4 @@
"ru": "Russian",
"sv": "Swedish",
"sk": "Slovakish"
-}
\ No newline at end of file
+}
diff --git a/resources/lang/fr/auth.php b/lang/fr/auth.php
similarity index 87%
rename from resources/lang/fr/auth.php
rename to lang/fr/auth.php
index e808c61b4..cb661c966 100644
--- a/resources/lang/fr/auth.php
+++ b/lang/fr/auth.php
@@ -12,7 +12,7 @@
*/
return [
- 'failed' => 'Ces identifiants ne correspondent pas Ć nos enregistrements.',
+ 'failed' => 'Ces identifiants ne correspondent pas Ć nos enregistrements.',
'password' => 'Le mot de passe fourni est incorrect.',
'throttle' => 'Tentatives de connexion trop nombreuses. Veuillez essayer de nouveau dans :seconds secondes.',
];
diff --git a/resources/lang/fr/pagination.php b/lang/fr/pagination.php
similarity index 92%
rename from resources/lang/fr/pagination.php
rename to lang/fr/pagination.php
index efa11ec19..a5542c328 100644
--- a/resources/lang/fr/pagination.php
+++ b/lang/fr/pagination.php
@@ -12,6 +12,6 @@
*/
return [
- 'next' => 'Suivant »',
+ 'next' => 'Suivant »',
'previous' => '« PrĆ©cĆ©dent',
];
diff --git a/resources/lang/fr/passwords.php b/lang/fr/passwords.php
similarity index 58%
rename from resources/lang/fr/passwords.php
rename to lang/fr/passwords.php
index dd0681866..99a48b1db 100644
--- a/resources/lang/fr/passwords.php
+++ b/lang/fr/passwords.php
@@ -12,9 +12,9 @@
*/
return [
- 'reset' => 'Votre mot de passe a ƩtƩ rƩinitialisƩ !',
- 'sent' => 'Nous vous avons envoyƩ par email le lien de rƩinitialisation du mot de passe !',
+ 'reset' => 'Votre mot de passe a ƩtƩ rƩinitialisƩ !',
+ 'sent' => 'Nous vous avons envoyƩ par email le lien de rƩinitialisation du mot de passe !',
'throttled' => 'Veuillez patienter avant de rƩessayer.',
- 'token' => 'Ce jeton de rƩinitialisation du mot de passe n\'est pas valide.',
- 'user' => 'Aucun utilisateur n\'a ƩtƩ trouvƩ avec cette adresse email.',
+ 'token' => 'Ce jeton de rƩinitialisation du mot de passe n\'est pas valide.',
+ 'user' => 'Aucun utilisateur n\'a ƩtƩ trouvƩ avec cette adresse email.',
];
diff --git a/lang/fr/validation.php b/lang/fr/validation.php
new file mode 100644
index 000000000..e776c24c0
--- /dev/null
+++ b/lang/fr/validation.php
@@ -0,0 +1,135 @@
+ 'Le champ :attribute doit ĆŖtre acceptĆ©.',
+ 'accepted_if' => 'Le champ :attribute doit ĆŖtre acceptĆ© quand :other a la valeur :value.',
+ 'active_url' => 'Le champ :attribute n\'est pas une URL valide.',
+ 'after' => 'Le champ :attribute doit ĆŖtre une date postĆ©rieure au :date.',
+ 'after_or_equal' => 'Le champ :attribute doit ĆŖtre une date postĆ©rieure ou Ć©gale au :date.',
+ 'alpha' => 'Le champ :attribute doit contenir uniquement des lettres.',
+ 'alpha_dash' => 'Le champ :attribute doit contenir uniquement des lettres, des chiffres et des tirets.',
+ 'alpha_num' => 'Le champ :attribute doit contenir uniquement des chiffres et des lettres.',
+ 'array' => 'Le champ :attribute doit ĆŖtre un tableau.',
+ 'attached' => ':attribute est dĆ©jĆ attachĆ©(e).',
+ 'before' => 'Le champ :attribute doit ĆŖtre une date antĆ©rieure au :date.',
+ 'before_or_equal' => 'Le champ :attribute doit ĆŖtre une date antĆ©rieure ou Ć©gale au :date.',
+ 'between' => [
+ 'array' => 'Le tableau :attribute doit contenir entre :min et :max ƩlƩments.',
+ 'file' => 'La taille du fichier de :attribute doit ĆŖtre comprise entre :min et :max kilo-octets.',
+ 'numeric' => 'La valeur de :attribute doit ĆŖtre comprise entre :min et :max.',
+ 'string' => 'Le texte :attribute doit contenir entre :min et :max caractĆØres.',
+ ],
+ 'boolean' => 'Le champ :attribute doit ĆŖtre vrai ou faux.',
+ 'confirmed' => 'Le champ de confirmation :attribute ne correspond pas.',
+ 'current_password' => 'Le mot de passe est incorrect.',
+ 'date' => 'Le champ :attribute n\'est pas une date valide.',
+ 'date_equals' => 'Le champ :attribute doit ĆŖtre une date Ć©gale Ć :date.',
+ 'date_format' => 'Le champ :attribute ne correspond pas au format :format.',
+ 'declined' => 'Le champ :attribute doit ĆŖtre dĆ©clinĆ©.',
+ 'declined_if' => 'Le champ :attribute doit ĆŖtre dĆ©clinĆ© quand :other a la valeur :value.',
+ 'different' => 'Les champs :attribute et :other doivent ĆŖtre diffĆ©rents.',
+ 'digits' => 'Le champ :attribute doit contenir :digits chiffres.',
+ 'digits_between' => 'Le champ :attribute doit contenir entre :min et :max chiffres.',
+ 'dimensions' => 'La taille de l\'image :attribute n\'est pas conforme.',
+ 'distinct' => 'Le champ :attribute a une valeur en double.',
+ 'email' => 'Le champ :attribute doit ĆŖtre une adresse e-mail valide.',
+ 'ends_with' => 'Le champ :attribute doit se terminer par une des valeurs suivantes : :values',
+ 'exists' => 'Le champ :attribute sƩlectionnƩ est invalide.',
+ 'file' => 'Le champ :attribute doit ĆŖtre un fichier.',
+ 'filled' => 'Le champ :attribute doit avoir une valeur.',
+ 'gt' => [
+ 'array' => 'Le tableau :attribute doit contenir plus de :value ƩlƩments.',
+ 'file' => 'La taille du fichier de :attribute doit ĆŖtre supĆ©rieure Ć :value kilo-octets.',
+ 'numeric' => 'La valeur de :attribute doit ĆŖtre supĆ©rieure Ć :value.',
+ 'string' => 'Le texte :attribute doit contenir plus de :value caractĆØres.',
+ ],
+ 'gte' => [
+ 'array' => 'Le tableau :attribute doit contenir au moins :value ƩlƩments.',
+ 'file' => 'La taille du fichier de :attribute doit ĆŖtre supĆ©rieure ou Ć©gale Ć :value kilo-octets.',
+ 'numeric' => 'La valeur de :attribute doit ĆŖtre supĆ©rieure ou Ć©gale Ć :value.',
+ 'string' => 'Le texte :attribute doit contenir au moins :value caractĆØres.',
+ ],
+ 'image' => 'Le champ :attribute doit ĆŖtre une image.',
+ 'in' => 'Le champ :attribute est invalide.',
+ 'in_array' => 'Le champ :attribute n\'existe pas dans :other.',
+ 'integer' => 'Le champ :attribute doit ĆŖtre un entier.',
+ 'ip' => 'Le champ :attribute doit ĆŖtre une adresse IP valide.',
+ 'ipv4' => 'Le champ :attribute doit ĆŖtre une adresse IPv4 valide.',
+ 'ipv6' => 'Le champ :attribute doit ĆŖtre une adresse IPv6 valide.',
+ 'json' => 'Le champ :attribute doit ĆŖtre un document JSON valide.',
+ 'lt' => [
+ 'array' => 'Le tableau :attribute doit contenir moins de :value ƩlƩments.',
+ 'file' => 'La taille du fichier de :attribute doit ĆŖtre infĆ©rieure Ć :value kilo-octets.',
+ 'numeric' => 'La valeur de :attribute doit ĆŖtre infĆ©rieure Ć :value.',
+ 'string' => 'Le texte :attribute doit contenir moins de :value caractĆØres.',
+ ],
+ 'lte' => [
+ 'array' => 'Le tableau :attribute doit contenir au plus :value ƩlƩments.',
+ 'file' => 'La taille du fichier de :attribute doit ĆŖtre infĆ©rieure ou Ć©gale Ć :value kilo-octets.',
+ 'numeric' => 'La valeur de :attribute doit ĆŖtre infĆ©rieure ou Ć©gale Ć :value.',
+ 'string' => 'Le texte :attribute doit contenir au plus :value caractĆØres.',
+ ],
+ 'max' => [
+ 'array' => 'Le tableau :attribute ne peut contenir plus de :max ƩlƩments.',
+ 'file' => 'La taille du fichier de :attribute ne peut pas dƩpasser :max kilo-octets.',
+ 'numeric' => 'La valeur de :attribute ne peut ĆŖtre supĆ©rieure Ć :max.',
+ 'string' => 'Le texte de :attribute ne peut contenir plus de :max caractĆØres.',
+ ],
+ 'mimes' => 'Le champ :attribute doit ĆŖtre un fichier de type : :values.',
+ 'mimetypes' => 'Le champ :attribute doit ĆŖtre un fichier de type : :values.',
+ 'min' => [
+ 'array' => 'Le tableau :attribute doit contenir au moins :min ƩlƩments.',
+ 'file' => 'La taille du fichier de :attribute doit ĆŖtre supĆ©rieure Ć :min kilo-octets.',
+ 'numeric' => 'La valeur de :attribute doit ĆŖtre supĆ©rieure ou Ć©gale Ć :min.',
+ 'string' => 'Le texte :attribute doit contenir au moins :min caractĆØres.',
+ ],
+ 'multiple_of' => 'La valeur de :attribute doit ĆŖtre un multiple de :value',
+ 'not_in' => 'Le champ :attribute sƩlectionnƩ n\'est pas valide.',
+ 'not_regex' => 'Le format du champ :attribute n\'est pas valide.',
+ 'numeric' => 'Le champ :attribute doit contenir un nombre.',
+ 'password' => 'Le mot de passe est incorrect',
+ 'present' => 'Le champ :attribute doit ĆŖtre prĆ©sent.',
+ 'prohibited' => 'Le champ :attribute est interdit.',
+ 'prohibited_if' => 'Le champ :attribute est interdit quand :other a la valeur :value.',
+ 'prohibited_unless' => 'Le champ :attribute est interdit Ć moins que :other est l\'une des valeurs :values.',
+ 'prohibits' => 'Le champ :attribute interdit :other d\'ĆŖtre prĆ©sent.',
+ 'regex' => 'Le format du champ :attribute est invalide.',
+ 'relatable' => ':attribute n\'est sans doute pas associƩ(e) avec cette donnƩe.',
+ 'required' => 'Le champ :attribute est obligatoire.',
+ 'required_if' => 'Le champ :attribute est obligatoire quand la valeur de :other est :value.',
+ 'required_unless' => 'Le champ :attribute est obligatoire sauf si :other est :values.',
+ 'required_with' => 'Le champ :attribute est obligatoire quand :values est prƩsent.',
+ 'required_with_all' => 'Le champ :attribute est obligatoire quand :values sont prƩsents.',
+ 'required_without' => 'Le champ :attribute est obligatoire quand :values n\'est pas prƩsent.',
+ 'required_without_all' => 'Le champ :attribute est requis quand aucun de :values n\'est prƩsent.',
+ 'same' => 'Les champs :attribute et :other doivent ĆŖtre identiques.',
+ 'size' => [
+ 'array' => 'Le tableau :attribute doit contenir :size ƩlƩments.',
+ 'file' => 'La taille du fichier de :attribute doit ĆŖtre de :size kilo-octets.',
+ 'numeric' => 'La valeur de :attribute doit ĆŖtre :size.',
+ 'string' => 'Le texte de :attribute doit contenir :size caractĆØres.',
+ ],
+ 'starts_with' => 'Le champ :attribute doit commencer avec une des valeurs suivantes : :values',
+ 'string' => 'Le champ :attribute doit ĆŖtre une chaĆ®ne de caractĆØres.',
+ 'timezone' => 'Le champ :attribute doit ĆŖtre un fuseau horaire valide.',
+ 'unique' => 'La valeur du champ :attribute est dĆ©jĆ utilisĆ©e.',
+ 'uploaded' => 'Le fichier du champ :attribute n\'a pu ĆŖtre tĆ©lĆ©versĆ©.',
+ 'url' => 'Le format de l\'URL de :attribute n\'est pas valide.',
+ 'uuid' => 'Le champ :attribute doit ĆŖtre un UUID valide',
+ 'custom' => [
+ 'attribute-name' => [
+ 'rule-name' => 'custom-message',
+ ],
+ ],
+];
diff --git a/resources/lang/he.json b/lang/he.json
similarity index 99%
rename from resources/lang/he.json
rename to lang/he.json
index da4d205bd..a1524d6fb 100644
--- a/resources/lang/he.json
+++ b/lang/he.json
@@ -174,10 +174,10 @@
"please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!": "×× × ×¦××Ø ×§××ׄ ××©× \"install.lock\" ×הפ×Ø×××Ŗ ×ש××Øש ×©× dashboard ש××. ×××Ø×Ŗ ×× ××××¢× × ××××Ø××Ŗ!",
"or click here": "×× ××ׄ ×××",
"Company Name": "×©× ××××Ø×",
- "Company Adress": "××Ŗ×××Ŗ ××××Ø×",
+ "Company Address": "××Ŗ×××Ŗ ××××Ø×",
"Company Phonenumber": "×הפ×Ø ××פ×× ×©× ××××Ø×",
"VAT ID": "×××× ××¢×",
- "Company E-Mail Adress": "××Ŗ×××Ŗ ×××× ×©× ××××Ø×",
+ "Company E-Mail Address": "××Ŗ×××Ŗ ×××× ×©× ××××Ø×",
"Company Website": "××Ŗ×Ø ××××Ø×",
"Invoice Prefix": "ק×××××Ŗ ××ש××× ××",
"Enable Invoices": "×פש×Ø ×ש××× ×××Ŗ",
@@ -199,7 +199,7 @@
"Mail Username": "×©× ×××××",
"Mail Password": "×”××”××Ŗ ×××××",
"Mail Encryption": "××¦×¤× ×Ŗ ×××××",
- "Mail From Adress": "×××× ×××Ŗ×××Ŗ",
+ "Mail From Address": "×××× ×××Ŗ×××Ŗ",
"Mail From Name": "×××× ×ש×",
"Discord Client-ID": "×××× ×©× ××× ××הק××Ø×",
"Discord Client-Secret": "×××× ×”××× ×©× ××× ××הק××Ø×",
@@ -461,4 +461,4 @@
"ru": "×Ø××”××Ŗ",
"sv": "ש×××××Ŗ",
"sk": "×”×××ק××Ŗ"
-}
\ No newline at end of file
+}
diff --git a/resources/lang/hi.json b/lang/hi.json
similarity index 99%
rename from resources/lang/hi.json
rename to lang/hi.json
index 68eba9f93..e7b950b14 100644
--- a/resources/lang/hi.json
+++ b/lang/hi.json
@@ -174,10 +174,10 @@
"please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!": "ą¤ą„ą¤Ŗą¤Æą¤¾ ą¤
ą¤Ŗą¤Øą„ ą¤”ą„ą¤¶ą¤¬ą„ą¤°ą„ą¤” ą¤°ą„ą¤ ą¤Øą¤æą¤°ą„ą¤¦ą„ą¤¶ą¤æą¤ą¤¾ ą¤®ą„ą¤ \"install.lock\" ą¤Øą¤¾ą¤®ą¤ ą¤ą¤ ą¤«ą¤¼ą¤¾ą¤ą¤² ą¤¬ą¤Øą¤¾ą¤ą¤ą„¤ ą¤
ą¤Øą„ą¤Æą¤„ą¤¾ ą¤ą„ą¤ ą¤øą„ą¤ą¤æą¤ą¤ ą¤²ą„ą¤” ą¤Øą¤¹ą„ą¤ ą¤¹ą„ą¤ą„!",
"or click here": "ą¤Æą¤¾ ą¤Æą¤¹ą¤¾ą¤ ą¤ą„ą¤²ą¤æą¤ ą¤ą¤°ą„ą¤",
"Company Name": "ą¤ą¤ą¤Ŗą¤Øą„ ą¤ą¤¾ ą¤Øą¤¾ą¤®",
- "Company Adress": "ą¤ą¤®ą„ą¤Ŗą¤Øą„ ą¤ą¤¾ ą¤Ŗą¤¤ą¤¾",
+ "Company Address": "ą¤ą¤®ą„ą¤Ŗą¤Øą„ ą¤ą¤¾ ą¤Ŗą¤¤ą¤¾",
"Company Phonenumber": "ą¤ą¤ą¤Ŗą¤Øą„ ą¤«ą„ą¤Øą¤Øą¤ą¤¬ą¤°",
"VAT ID": "ą¤ą„ą¤ą„ą¤ø ą¤ą¤ą¤”ą„",
- "Company E-Mail Adress": "ą¤ą¤ą¤Ŗą¤Øą„ ą¤ą¤®ą„ą¤² ą¤Ŗą¤¤ą¤¾",
+ "Company E-Mail Address": "ą¤ą¤ą¤Ŗą¤Øą„ ą¤ą¤®ą„ą¤² ą¤Ŗą¤¤ą¤¾",
"Company Website": "ą¤ą¤ą¤Ŗą¤Øą„ ą¤ą„ ą¤µą„ą¤¬ą¤øą¤¾ą¤ą¤",
"Invoice Prefix": "ą¤ą¤¾ą¤²ą¤¾ą¤Ø ą¤ą¤Ŗą¤øą¤°ą„ą¤",
"Enable Invoices": "ą¤ą¤¾ą¤²ą¤¾ą¤Ø ą¤øą¤ą„ą¤·ą¤® ą¤ą¤°ą„ą¤",
@@ -199,7 +199,7 @@
"Mail Username": "ą¤®ą„ą¤² ą¤ą¤Ŗą¤Æą„ą¤ą¤ą¤°ą„ą¤¤ą¤¾ ą¤Øą¤¾ą¤®",
"Mail Password": "ą¤®ą„ą¤² ą¤Ŗą¤¾ą¤øą¤µą¤°ą„ą¤”",
"Mail Encryption": "ą¤®ą„ą¤² ą¤Ŗą¤¾ą¤øą¤µą¤°ą„ą¤”",
- "Mail From Adress": "ą¤Ŗą¤¤ą„ ą¤øą„ ą¤®ą„ą¤²",
+ "Mail From Address": "ą¤Ŗą¤¤ą„ ą¤øą„ ą¤®ą„ą¤²",
"Mail From Name": "ą¤Øą¤¾ą¤® ą¤øą„ ą¤®ą„ą¤²",
"Discord Client-ID": "ą¤ą¤²ą¤¹ ą¤ą„ą¤²ą¤¾ą¤ą¤ą¤-ą¤ą¤ą¤”ą„",
"Discord Client-Secret": "ą¤ą¤²ą¤¹ ą¤ą„ą¤°ą¤¾ą¤¹ą¤-ą¤ą„ą¤Ŗą„ą¤¤",
@@ -461,4 +461,4 @@
"ru": "ą¤°ą„ą¤øą„",
"sv": "Swedish",
"sk": "Slovakish"
-}
\ No newline at end of file
+}
diff --git a/resources/lang/hi/auth.php b/lang/hi/auth.php
similarity index 82%
rename from resources/lang/hi/auth.php
rename to lang/hi/auth.php
index 25c616e79..58ce4f7fe 100644
--- a/resources/lang/hi/auth.php
+++ b/lang/hi/auth.php
@@ -12,7 +12,7 @@
*/
return [
- 'failed' => 'ą¤Æą„ ą¤øą¤¾ą¤ ą¤¹ą¤®ą¤¾ą¤°ą„ ą¤°ą¤æą¤ą„ą¤°ą„ą¤” ą¤øą„ ą¤®ą„ą¤² ą¤Øą¤¹ą„ą¤ ą¤ą¤¾ ą¤°ą¤¹ą„ ą¤¹ą„ą¤ą„¤',
+ 'failed' => 'ą¤Æą„ ą¤øą¤¾ą¤ ą¤¹ą¤®ą¤¾ą¤°ą„ ą¤°ą¤æą¤ą„ą¤°ą„ą¤” ą¤øą„ ą¤®ą„ą¤² ą¤Øą¤¹ą„ą¤ ą¤ą¤¾ ą¤°ą¤¹ą„ ą¤¹ą„ą¤ą„¤',
'password' => 'The provided password is incorrect.',
'throttle' => 'ą¤¬ą¤¹ą„ą¤¤ ą¤øą¤¾ą¤°ą„ ą¤²ą„ą¤ą¤æą¤Ø ą¤Ŗą„ą¤°ą¤Æą¤¾ą¤øą„¤ :seconds ą¤øą„ą¤ą¤ą¤” ą¤®ą„ą¤ ą¤«ą¤æą¤° ą¤øą„ ą¤ą„ą¤¶ą¤æą¤¶ ą¤ą¤°ą„ą¤ą„¤',
];
diff --git a/resources/lang/hi/pagination.php b/lang/hi/pagination.php
similarity index 91%
rename from resources/lang/hi/pagination.php
rename to lang/hi/pagination.php
index 2f71e2759..56f43e76d 100644
--- a/resources/lang/hi/pagination.php
+++ b/lang/hi/pagination.php
@@ -12,6 +12,6 @@
*/
return [
- 'next' => 'ą¤
ą¤ą¤²ą¤¾ »',
+ 'next' => 'ą¤
ą¤ą¤²ą¤¾ »',
'previous' => '« ą¤Ŗą¤æą¤ą¤²ą¤¾',
];
diff --git a/resources/lang/hi/passwords.php b/lang/hi/passwords.php
similarity index 52%
rename from resources/lang/hi/passwords.php
rename to lang/hi/passwords.php
index b37ae7e32..2b655c1b4 100644
--- a/resources/lang/hi/passwords.php
+++ b/lang/hi/passwords.php
@@ -12,9 +12,9 @@
*/
return [
- 'reset' => 'ą¤ą¤Ŗą¤ą¤¾ ą¤Ŗą¤¾ą¤øą¤µą¤°ą„ą¤” ą¤°ą„ą¤øą„ą¤ ą¤ą¤° ą¤¦ą¤æą¤Æą¤¾ ą¤ą¤Æą¤¾ ą¤¹ą„!',
- 'sent' => 'ą¤¹ą¤®ą¤Øą„ ą¤ą¤Ŗą¤ą„ ą¤ą¤ ą¤Ŗą¤¾ą¤øą¤µą¤°ą„ą¤” ą¤°ą„ą¤øą„ą¤ ą¤²ą¤æą¤ą¤ ą¤-ą¤®ą„ą¤² ą¤ą¤æą¤Æą¤¾ ą¤¹ą„!',
+ 'reset' => 'ą¤ą¤Ŗą¤ą¤¾ ą¤Ŗą¤¾ą¤øą¤µą¤°ą„ą¤” ą¤°ą„ą¤øą„ą¤ ą¤ą¤° ą¤¦ą¤æą¤Æą¤¾ ą¤ą¤Æą¤¾ ą¤¹ą„!',
+ 'sent' => 'ą¤¹ą¤®ą¤Øą„ ą¤ą¤Ŗą¤ą„ ą¤ą¤ ą¤Ŗą¤¾ą¤øą¤µą¤°ą„ą¤” ą¤°ą„ą¤øą„ą¤ ą¤²ą¤æą¤ą¤ ą¤-ą¤®ą„ą¤² ą¤ą¤æą¤Æą¤¾ ą¤¹ą„!',
'throttled' => 'ą¤ą„ą¤Ŗą¤Æą¤¾ ą¤Ŗą„ą¤Ø: ą¤Ŗą„ą¤°ą¤Æą¤¾ą¤ø ą¤ą¤°ą¤Øą„ ą¤øą„ ą¤Ŗą¤¹ą¤²ą„ ą¤Ŗą„ą¤°ą¤¤ą„ą¤ą„ą¤·ą¤¾ ą¤ą¤°ą„ą¤ ą„¤ ',
- 'token' => 'ą¤Æą¤¹ ą¤Ŗą¤¾ą¤øą¤µą¤°ą„ą¤” ą¤°ą„ą¤øą„ą¤ ą¤ą„ą¤ą¤Ø ą¤
ą¤®ą¤¾ą¤Øą„ą¤Æ ą¤¹ą„ą„¤',
- 'user' => 'ą¤¹ą¤®ą„ą¤ ą¤ą¤ø ą¤-ą¤®ą„ą¤² ą¤Ŗą¤¤ą„ ą¤ą„ ą¤øą¤¾ą¤„ ą¤ą¤ ą¤ą¤Ŗą¤Æą„ą¤ą¤ą¤°ą„ą¤¤ą¤¾ ą¤Øą¤¹ą„ą¤ ą¤®ą¤æą¤² ą¤øą¤ą¤¤ą¤¾ ą¤¹ą„ą„¤',
+ 'token' => 'ą¤Æą¤¹ ą¤Ŗą¤¾ą¤øą¤µą¤°ą„ą¤” ą¤°ą„ą¤øą„ą¤ ą¤ą„ą¤ą¤Ø ą¤
ą¤®ą¤¾ą¤Øą„ą¤Æ ą¤¹ą„ą„¤',
+ 'user' => 'ą¤¹ą¤®ą„ą¤ ą¤ą¤ø ą¤-ą¤®ą„ą¤² ą¤Ŗą¤¤ą„ ą¤ą„ ą¤øą¤¾ą¤„ ą¤ą¤ ą¤ą¤Ŗą¤Æą„ą¤ą¤ą¤°ą„ą¤¤ą¤¾ ą¤Øą¤¹ą„ą¤ ą¤®ą¤æą¤² ą¤øą¤ą¤¤ą¤¾ ą¤¹ą„ą„¤',
];
diff --git a/lang/hi/validation.php b/lang/hi/validation.php
new file mode 100644
index 000000000..302119f03
--- /dev/null
+++ b/lang/hi/validation.php
@@ -0,0 +1,135 @@
+ ':attribute ą¤ą„ ą¤øą„ą¤µą„ą¤ą¤¾ą¤° ą¤ą¤æą¤Æą¤¾ ą¤ą¤¾ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'accepted_if' => 'The :attribute must be accepted when :other is :value.',
+ 'active_url' => ':attribute ą¤ą¤ ą¤®ą¤¾ą¤Øą„ą¤Æ URL ą¤Øą¤¹ą„ą¤ ą¤¹ą„ą„¤',
+ 'after' => ':attribute, :date ą¤ą„ ą¤¬ą¤¾ą¤¦ ą¤ą„ ą¤ą¤ ą¤¤ą¤¾ą¤°ą„ą¤ ą¤¹ą„ą¤Øą„ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'after_or_equal' => ':attribute, :date ą¤ą„ ą¤¬ą¤¾ą¤¦ ą¤Æą¤¾ ą¤ą¤øą¤ą„ ą¤¬ą¤°ą¤¾ą¤¬ą¤° ą¤ą„ ą¤¤ą¤¾ą¤°ą„ą¤ ą¤¹ą„ą¤Øą„ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'alpha' => ':attribute ą¤®ą„ą¤ ą¤ą„ą¤µą¤² ą¤
ą¤ą„ą¤·ą¤° ą¤¹ą„ ą¤øą¤ą¤¤ą„ ą¤¹ą„ą¤ą„¤',
+ 'alpha_dash' => ':attribute ą¤®ą„ą¤ ą¤ą„ą¤µą¤² ą¤
ą¤ą„ą¤·ą¤°, ą¤øą¤ą¤ą„ą¤Æą¤¾, ą¤ą¤° ą¤”ą„ą¤¶ ą¤¹ą„ ą¤øą¤ą¤¤ą„ ą¤¹ą„ą¤ą„¤',
+ 'alpha_num' => ':attribute ą¤®ą„ą¤ ą¤ą„ą¤µą¤² ą¤
ą¤ą„ą¤·ą¤° ą¤ą¤° ą¤øą¤ą¤ą„ą¤Æą¤¾ą¤ą¤ ą¤¹ą„ ą¤øą¤ą¤¤ą„ ą¤¹ą„ą¤ą„¤',
+ 'array' => ':attribute ą¤ą¤ ą¤øą¤°ą¤£ą„ ą¤¹ą„ą¤Øą„ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'attached' => 'ą¤Æą¤¹ :attribute ą¤Ŗą¤¹ą¤²ą„ ą¤øą„ ą¤¹ą„ ą¤øą¤ą¤²ą¤ą„ą¤Ø ą¤¹ą„ ą„¤ ',
+ 'before' => ':attribute, :date ą¤øą„ ą¤Ŗą¤¹ą¤²ą„ ą¤ą„ ą¤ą¤ ą¤¤ą¤¾ą¤°ą„ą¤ ą¤¹ą„ą¤Øą„ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'before_or_equal' => ':attribute, :date ą¤ą¤øą¤øą„ ą¤Ŗą¤¹ą¤²ą„ ą¤Æą¤¾ ą¤ą¤øą¤ą„ ą¤¬ą¤°ą¤¾ą¤¬ą¤° ą¤ą„ ą¤¤ą¤¾ą¤°ą„ą¤ ą¤¹ą„ą¤Øą„ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'between' => [
+ 'array' => ':attribute, :min ą¤ą¤° :max ą¤ą¤ą¤ą¤®ą„ą¤ ą¤ą„ ą¤¬ą„ą¤ ą¤¹ą„ą¤Øą„ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'file' => ':attribute, :min ą¤ą¤° :max ą¤ą¤æą¤²ą„ą¤¬ą¤¾ą¤ą¤ ą¤ą„ ą¤¬ą„ą¤ ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'numeric' => ':attribute, :min ą¤ą¤° :max ą¤ą„ ą¤¬ą„ą¤ ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'string' => ':attribute, :min ą¤ą¤° :max ą¤µą¤°ą„ą¤£ą„ą¤ ą¤ą„ ą¤¬ą„ą¤ ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ ],
+ 'boolean' => ':attribute ą¤«ą„ą¤²ą„ą¤” ą¤øą¤¹ą„ ą¤Æą¤¾ ą¤ą¤²ą¤¤ ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'confirmed' => ':attribute ą¤Ŗą„ą¤·ą„ą¤ą¤æą¤ą¤°ą¤£ ą¤®ą„ą¤² ą¤Øą¤¹ą„ą¤ ą¤ą¤¾ ą¤°ą¤¹ą¤¾ ą¤¹ą„ą„¤',
+ 'current_password' => 'The password is incorrect.',
+ 'date' => ':attribute ą¤ą¤ ą¤®ą¤¾ą¤Øą„ą¤Æ ą¤¦ą¤æą¤Øą¤¾ą¤ą¤ ą¤Øą¤¹ą„ą¤ ą¤¹ą„ą„¤',
+ 'date_equals' => ':attribute, :date ą¤ą„ ą¤¬ą¤°ą¤¾ą¤¬ą¤° ą¤¤ą¤¾ą¤°ą„ą¤ ą¤¹ą„ą¤Øą„ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'date_format' => ':attribute ą¤«ą„ą¤°ą„ą¤®ą„ą¤ :format ą¤øą„ ą¤®ą„ą¤² ą¤Øą¤¹ą„ą¤ ą¤ą¤¾ ą¤°ą¤¹ą¤¾ ą¤¹ą„ą„¤',
+ 'declined' => 'The :attribute must be declined.',
+ 'declined_if' => 'The :attribute must be declined when :other is :value.',
+ 'different' => ':attribute ą¤ą¤° :other ą¤
ą¤²ą¤ ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'digits' => ':attribute, :digits ą¤
ą¤ą¤ ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'digits_between' => ':attribute, :min ą¤ą¤° :max ą¤
ą¤ą¤ą„ą¤ ą¤ą„ ą¤¬ą„ą¤ ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'dimensions' => ':attribute ą¤ą¤¾ ą¤
ą¤®ą¤¾ą¤Øą„ą¤Æ ą¤ą¤æą¤¤ą„ą¤¤ ą¤®ą¤¾ą¤Ŗ ą¤¹ą„ą„¤',
+ 'distinct' => ':attribute ą¤«ą„ą¤²ą„ą¤” ą¤ą¤¾ ą¤ą¤ ą¤”ą„ą¤Ŗą„ą¤²ą¤æą¤ą„ą¤ ą¤®ą¤¾ą¤Ø ą¤¹ą„ą¤¤ą¤¾ ą¤¹ą„ą„¤',
+ 'email' => ':attribute ą¤ą¤ ą¤®ą¤¾ą¤Øą„ą¤Æ ą¤ą¤®ą„ą¤² ą¤Ŗą¤¤ą¤¾ ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'ends_with' => ':attribute ą¤ą„ ą¤Øą¤æą¤®ą„ą¤Øą¤²ą¤æą¤ą¤æą¤¤ ą¤®ą„ą¤ ą¤øą„ ą¤ą¤ ą¤ą„ ą¤øą¤¾ą¤„ ą¤øą¤®ą¤¾ą¤Ŗą„ą¤¤ ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤: :values ą„¤ ',
+ 'exists' => 'ą¤ą„ą¤Øą¤¾ ą¤ą¤Æą¤¾ :attribute ą¤
ą¤®ą¤¾ą¤Øą„ą¤Æ ą¤¹ą„ą„¤',
+ 'file' => ':attribute ą¤ą¤ ą¤«ą¤¼ą¤¾ą¤ą¤² ą¤¹ą„ą¤Øą„ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'filled' => ':attribute ą¤«ą„ą¤²ą„ą¤” ą¤ą¤µą¤¶ą„ą¤Æą¤ ą¤¹ą„ą¤¤ą¤¾ ą¤¹ą„ą„¤',
+ 'gt' => [
+ 'array' => ':attribute, :value ą¤®ą¤¦ ą¤øą„ ą¤
ą¤§ą¤æą¤ ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'file' => ':attribute, :value kilobytes ą¤øą„ ą¤
ą¤§ą¤æą¤ ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'numeric' => ':attribute, :value ą¤øą„ ą¤
ą¤§ą¤æą¤ ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'string' => ':attribute, :value characters ą¤øą„ ą¤
ą¤§ą¤æą¤ ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ ],
+ 'gte' => [
+ 'array' => 'The :attribute must have :value items or more.',
+ 'file' => 'The :attribute must be greater than or equal :value kilobytes.',
+ 'numeric' => 'The :attribute must be greater than or equal :value.',
+ 'string' => 'The :attribute must be greater than or equal :value characters.',
+ ],
+ 'image' => ':attribute ą¤ą¤ ą¤ą¤µą¤æ ą¤¹ą„ą¤Øą„ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'in' => 'ą¤ą„ą¤Øą¤¾ ą¤ą¤Æą¤¾ :attribute ą¤
ą¤®ą¤¾ą¤Øą„ą¤Æ ą¤¹ą„ą„¤',
+ 'in_array' => ':attribute ą¤«ą„ą¤²ą„ą¤”, :other ą¤®ą„ą¤ ą¤®ą„ą¤ą„ą¤¦ ą¤Øą¤¹ą„ą¤ ą¤¹ą„ą„¤',
+ 'integer' => ':attribute ą¤ą¤ ą¤Ŗą„ą¤°ą„ą¤£ą¤¾ą¤ą¤ ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'ip' => ':attribute ą¤ą¤ ą¤®ą¤¾ą¤Øą„ą¤Æ IP address ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'ipv4' => ':attribute ą¤ą¤ ą¤µą„ą¤§ IPv4 address ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'ipv6' => ':attribute ą¤ą¤ ą¤µą„ą¤§ IPv6 address ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'json' => ':attribute ą¤ą¤ ą¤®ą¤¾ą¤Øą„ą¤Æ JSON ą¤øą„ą¤ą„ą¤°ą¤æą¤ą¤ ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'lt' => [
+ 'array' => 'The :attribute must have less than :value items.',
+ 'file' => 'The :attribute must be less than :value kilobytes.',
+ 'numeric' => 'The :attribute must be less than :value.',
+ 'string' => 'The :attribute must be less than :value characters.',
+ ],
+ 'lte' => [
+ 'array' => 'The :attribute must not have more than :value items.',
+ 'file' => 'The :attribute must be less than or equal :value kilobytes.',
+ 'numeric' => 'The :attribute must be less than or equal :value.',
+ 'string' => 'The :attribute must be less than or equal :value characters.',
+ ],
+ 'max' => [
+ 'array' => ':attribute, :max ą¤ą¤ą¤ą¤®ą„ą¤ ą¤øą„ ą¤
ą¤§ą¤æą¤ ą¤Øą¤¹ą„ą¤ ą¤¹ą„ ą¤øą¤ą¤¤ą¤¾ ą¤¹ą„ą„¤',
+ 'file' => ':attribute :max ą¤ą¤æą¤²ą„ą¤¬ą¤¾ą¤ą¤ ą¤øą„ ą¤¬ą¤”ą¤¼ą¤¾ ą¤Øą¤¹ą„ą¤ ą¤¹ą„ ą¤øą¤ą¤¤ą¤¾ ą¤¹ą„ą„¤',
+ 'numeric' => ':attribute, :max ą¤øą„ ą¤¬ą¤”ą¤¼ą¤¾ ą¤Øą¤¹ą„ą¤ ą¤¹ą„ ą¤øą¤ą¤¤ą¤¾ ą¤¹ą„ą„¤',
+ 'string' => ':attribute, :max ą¤µą¤°ą„ą¤£ą„ą¤ ą¤øą„ ą¤¬ą¤”ą¤¼ą¤¾ ą¤Øą¤¹ą„ą¤ ą¤¹ą„ ą¤øą¤ą¤¤ą¤¾ ą¤¹ą„ą„¤',
+ ],
+ 'mimes' => ':attribute ą¤ą¤ ą¤Ŗą„ą¤°ą¤ą¤¾ą¤° ą¤ą„ ą¤«ą¤¼ą¤¾ą¤ą¤²: :values ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'mimetypes' => ':attribute ą¤ą¤ ą¤Ŗą„ą¤°ą¤ą¤¾ą¤° ą¤ą„ ą¤«ą¤¼ą¤¾ą¤ą¤²: :values ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'min' => [
+ 'array' => ':attribute ą¤ą¤® ą¤øą„ ą¤ą¤® :min ą¤ą¤ą¤ą¤® ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'file' => ':attribute ą¤ą¤® ą¤øą„ ą¤ą¤® :min ą¤ą¤æą¤²ą„ą¤¬ą¤¾ą¤ą¤ ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'numeric' => ':attribute ą¤ą¤® ą¤øą„ ą¤ą¤® :min ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'string' => ':attribute ą¤ą¤® ą¤øą„ ą¤ą¤® :min ą¤µą¤°ą„ą¤£ ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ ],
+ 'multiple_of' => ':attribute :value ą¤ą¤¾ ą¤ą¤ ą¤¬ą¤¹ą„ ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤',
+ 'not_in' => 'ą¤ą„ą¤Øą¤¾ ą¤ą¤Æą¤¾ :attribute ą¤
ą¤®ą¤¾ą¤Øą„ą¤Æ ą¤¹ą„ą„¤',
+ 'not_regex' => ':attribute ą¤Ŗą„ą¤°ą¤¾ą¤°ą„ą¤Ŗ ą¤
ą¤®ą¤¾ą¤Øą„ą¤Æ ą¤¹ą„ą„¤',
+ 'numeric' => ':attribute ą¤ą¤ ą¤øą¤ą¤ą„ą¤Æą¤¾ ą¤¹ą„ą¤Øą„ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'password' => 'ą¤Ŗą¤¾ą¤øą¤µą¤°ą„ą¤” ą¤ą¤²ą¤¤ ą¤¹ą„ ą„¤ ',
+ 'present' => ':attribute ą¤«ą„ą¤²ą„ą¤” ą¤®ą„ą¤ą„ą¤¦ ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'prohibited' => ':attribute ą¤ą„ą¤·ą„ą¤¤ą„ą¤° ą¤Øą¤æą¤·ą¤æą¤¦ą„ą¤§ ą¤¹ą„ ą„¤ ',
+ 'prohibited_if' => ':attribute ą¤ą„ą¤·ą„ą¤¤ą„ą¤° ą¤Øą¤æą¤·ą¤æą¤¦ą„ą¤§ ą¤¹ą„ ą¤ą¤¬ :other :value ą¤¹ą„ ą„¤ ',
+ 'prohibited_unless' => ':attribute ą¤ą„ą¤·ą„ą¤¤ą„ą¤° ą¤¤ą¤¬ ą¤¤ą¤ ą¤Øą¤æą¤·ą¤æą¤¦ą„ą¤§ ą¤¹ą„ ą¤ą¤¬ ą¤¤ą¤ ą¤ą¤æ :other :values ą¤®ą„ą¤ ą¤Ø ą¤¹ą„ ą„¤ ',
+ 'prohibits' => 'The :attribute field prohibits :other from being present.',
+ 'regex' => ':attribute ą¤«ą„ą¤°ą„ą¤®ą„ą¤ ą¤
ą¤®ą¤¾ą¤Øą„ą¤Æ ą¤¹ą„ą„¤',
+ 'relatable' => 'ą¤Æą¤¹ :attribute ą¤ą¤ø ą¤øą¤ą¤øą¤¾ą¤§ą¤Ø ą¤øą„ ą¤øą¤ą¤¬ą¤¦ą„ą¤§ ą¤Øą¤¹ą„ą¤ ą¤¹ą„ ą¤øą¤ą¤¤ą¤¾ ą¤¹ą„ ą„¤ ',
+ 'required' => ':attribute ą¤«ą„ą¤²ą„ą¤” ą¤ą¤µą¤¶ą„ą¤Æą¤ ą¤¹ą„ą¤¤ą¤¾ ą¤¹ą„ą„¤',
+ 'required_if' => ':attribute ą¤«ą¤¼ą„ą¤²ą„ą¤” ą¤ą¤µą¤¶ą„ą¤Æą¤ ą¤¹ą„ą¤¤ą¤¾ ą¤¹ą„ ą¤ą¤¬ :other :value ą¤¹ą„ą¤¤ą¤¾ ą¤¹ą„ą„¤',
+ 'required_unless' => ':attribute ą¤«ą„ą¤²ą„ą¤” ą¤ą¤µą¤¶ą„ą¤Æą¤ ą¤¹ą„ą¤¤ą¤¾ ą¤¹ą„ ą¤ą¤¬ :other, :values ą¤®ą„ą¤ ą¤Øą¤¹ą„ą¤ ą¤¹ą„ą¤¤ą¤¾ ą¤¹ą„ą„¤',
+ 'required_with' => ':attribute ą¤«ą¤¼ą„ą¤²ą„ą¤” ą¤ą¤µą¤¶ą„ą¤Æą¤ ą¤¹ą„ą¤¤ą¤¾ ą¤¹ą„ ą¤ą¤¬ :values ą¤®ą„ą¤ą„ą¤¦ ą¤¹ą„ą¤¤ą¤¾ ą¤¹ą„ą„¤',
+ 'required_with_all' => ':attribute ą¤«ą¤¼ą„ą¤²ą„ą¤” ą¤ą¤µą¤¶ą„ą¤Æą¤ ą¤¹ą„ą¤¤ą¤¾ ą¤¹ą„ ą¤ą¤¬ :values ą¤®ą„ą¤ą„ą¤¦ ą¤¹ą„ą¤¤ą¤¾ ą¤¹ą„ą„¤',
+ 'required_without' => ':attribute ą¤«ą„ą¤²ą„ą¤” ą¤ą¤µą¤¶ą„ą¤Æą¤ ą¤¹ą„ą¤¤ą¤¾ ą¤¹ą„ ą¤ą¤¬ :values ą¤®ą„ą¤ą„ą¤¦ ą¤Øą¤¹ą„ą¤ ą¤¹ą„ą¤¤ą¤¾ ą¤¹ą„ą„¤',
+ 'required_without_all' => ':attribute ą¤«ą„ą¤²ą„ą¤” ą¤ą¤µą¤¶ą„ą¤Æą¤ ą¤¹ą„ą¤¤ą¤¾ ą¤¹ą„ ą¤ą¤¬ ą¤ą¤ ą¤ą„ :values ą¤®ą„ą¤ą„ą¤¦ ą¤Øą¤¹ą„ą¤ ą¤¹ą„ą¤¤ą¤¾ ą¤¹ą„ą„¤',
+ 'same' => ':attribute ą¤ą¤° :other ą¤®ą„ą¤² ą¤ą¤¾ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'size' => [
+ 'array' => ':attribute ą¤®ą„ą¤ :size ą¤ą¤ą¤ą¤® ą¤¹ą„ą¤Øą„ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'file' => ':attribute, :size ą¤ą¤æą¤²ą„ą¤¬ą¤¾ą¤ą¤ ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'numeric' => ':attribute, :size ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'string' => ':attribute, :size ą¤µą¤°ą„ą¤£ ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ ],
+ 'starts_with' => ':attribute ą¤Øą¤æą¤®ą„ą¤Øą¤²ą¤æą¤ą¤æą¤¤ ą¤®ą„ą¤ ą¤øą„ ą¤ą¤æą¤øą„ ą¤ą¤ ą¤øą„ ą¤¶ą„ą¤°ą„ ą¤ą¤°ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤: :values',
+ 'string' => ':attribute ą¤ą¤ ą¤øą„ą¤ą„ą¤°ą¤æą¤ą¤ ą¤¹ą„ą¤Øą„ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'timezone' => ':attribute ą¤ą¤ ą¤®ą¤¾ą¤Øą„ą¤Æ ą¤ą„ą¤·ą„ą¤¤ą„ą¤° ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'unique' => ':attribute ą¤ą„ ą¤Ŗą¤¹ą¤²ą„ ą¤¹ą„ ą¤²ą„ ą¤²ą¤æą¤Æą¤¾ ą¤ą¤Æą¤¾ ą¤¹ą„ą„¤',
+ 'uploaded' => ':attribute ą¤
ą¤Ŗą¤²ą„ą¤” ą¤ą¤°ą¤Øą„ ą¤®ą„ą¤ ą¤µą¤æą¤«ą¤²ą„¤',
+ 'url' => ':attribute ą¤«ą„ą¤°ą„ą¤®ą„ą¤ ą¤
ą¤®ą¤¾ą¤Øą„ą¤Æ ą¤¹ą„ą„¤',
+ 'uuid' => ':attribute ą¤ą¤ ą¤µą„ą¤§ UUID ą¤¹ą„ą¤Øą¤¾ ą¤ą¤¾ą¤¹ą¤æą¤ą„¤',
+ 'custom' => [
+ 'attribute-name' => [
+ 'rule-name' => 'ą¤
ą¤Øą„ą¤ą„ą¤²-ą¤øą¤ą¤¦ą„ą¤¶',
+ ],
+ ],
+];
diff --git a/resources/lang/hu.json b/lang/hu.json
similarity index 99%
rename from resources/lang/hu.json
rename to lang/hu.json
index d6fbef0c3..744fcf0c3 100644
--- a/resources/lang/hu.json
+++ b/lang/hu.json
@@ -174,10 +174,10 @@
"please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!": "kĆ©rlek hozz lĆ©tre egy fĆ”jlt 'install.lock' nĆ©ven az IrĆ”nyĆtĆ³pult gyƶker kƶnyvtĆ”rĆ”ban, kĆ¼lƶnben a beĆ”llĆtĆ”said nem lesznek betƶltve!",
"or click here": "vagy kattints ide",
"Company Name": "CĆ©g neve",
- "Company Adress": "CĆ©g cĆme",
+ "Company Address": "CĆ©g cĆme",
"Company Phonenumber": "CƩg telefonszƔma",
"VAT ID": "ĆFA AzonosĆtĆ³",
- "Company E-Mail Adress": "CĆ©g email cĆme",
+ "Company E-Mail Address": "CĆ©g email cĆme",
"Company Website": "CĆ©g weboldala",
"Invoice Prefix": "SzĆ”mlĆ”zĆ”si elÅtag",
"Enable Invoices": "SzƔmlƔzƔs engedƩlyezƩse",
@@ -199,7 +199,7 @@
"Mail Username": "LevĆ©l FelhasznĆ”lĆ³nĆ©v",
"Mail Password": "LevĆ©l JelszĆ³",
"Mail Encryption": "LevĆ©l TitkosĆtĆ”s",
- "Mail From Adress": "LevĆ©l CĆmrÅl",
+ "Mail From Address": "LevĆ©l CĆmrÅl",
"Mail From Name": "LevĆ©l NĆ©vrÅl",
"Discord Client-ID": "Discord Kliens AzonosĆtĆ³",
"Discord Client-Secret": "Discord Kliens Titok",
@@ -461,4 +461,4 @@
"ru": "Orosz",
"sv": "SvƩd",
"sk": "SzlovƔk"
-}
\ No newline at end of file
+}
diff --git a/resources/lang/it.json b/lang/it.json
similarity index 99%
rename from resources/lang/it.json
rename to lang/it.json
index 379bad4f3..5bc51c875 100644
--- a/resources/lang/it.json
+++ b/lang/it.json
@@ -174,10 +174,10 @@
"please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!": "sei pregato di creare un file chiamato \"install.lock\" nella cartella di Root del tuo pannello di controllo. Altrimenti non sarĆ caricata alcun'impostazione!",
"or click here": "o clicca qui",
"Company Name": "Nome azienda",
- "Company Adress": "Indirizzo Azienda",
+ "Company Address": "Indirizzo Azienda",
"Company Phonenumber": "Numero di telefono dell'azienda",
"VAT ID": "Partita IVA",
- "Company E-Mail Adress": "E-Mail dell'azienda",
+ "Company E-Mail Address": "E-Mail dell'azienda",
"Company Website": "Sito web dell'azienda",
"Invoice Prefix": "Prefisso della Fattura",
"Enable Invoices": "Attiva fatture",
@@ -199,7 +199,7 @@
"Mail Username": "Mail Username",
"Mail Password": "Mail Password",
"Mail Encryption": "Tipo di cifratura Mail",
- "Mail From Adress": "Mail dall'indirizzo",
+ "Mail From Address": "Mail dall'indirizzo",
"Mail From Name": "Mail dal nome",
"Discord Client-ID": "Client-ID di Discord",
"Discord Client-Secret": "Client-Secret di Discord",
@@ -461,4 +461,4 @@
"ru": "Russo",
"sv": "Swedish",
"sk": "Slovakish"
-}
\ No newline at end of file
+}
diff --git a/resources/lang/it/auth.php b/lang/it/auth.php
similarity index 92%
rename from resources/lang/it/auth.php
rename to lang/it/auth.php
index ff58e1316..897c35e3a 100644
--- a/resources/lang/it/auth.php
+++ b/lang/it/auth.php
@@ -12,7 +12,7 @@
*/
return [
- 'failed' => 'Credenziali non valide.',
+ 'failed' => 'Credenziali non valide.',
'password' => 'La password non ĆØ valida.',
'throttle' => 'Troppi tentativi di accesso. Riprova tra :seconds secondi.',
];
diff --git a/resources/lang/it/pagination.php b/lang/it/pagination.php
similarity index 92%
rename from resources/lang/it/pagination.php
rename to lang/it/pagination.php
index 371ac01ae..4bc78592e 100644
--- a/resources/lang/it/pagination.php
+++ b/lang/it/pagination.php
@@ -12,6 +12,6 @@
*/
return [
- 'next' => 'Successivo »',
+ 'next' => 'Successivo »',
'previous' => '« Precedente',
];
diff --git a/resources/lang/it/passwords.php b/lang/it/passwords.php
similarity index 61%
rename from resources/lang/it/passwords.php
rename to lang/it/passwords.php
index 4aa5b4129..5d03d8cb0 100644
--- a/resources/lang/it/passwords.php
+++ b/lang/it/passwords.php
@@ -12,9 +12,9 @@
*/
return [
- 'reset' => 'La password ĆØ stata reimpostata!',
- 'sent' => 'Ti abbiamo inviato una email con il link per il reset della password!',
+ 'reset' => 'La password ĆØ stata reimpostata!',
+ 'sent' => 'Ti abbiamo inviato una email con il link per il reset della password!',
'throttled' => 'Per favore, attendi prima di riprovare.',
- 'token' => 'Questo token di reset della password non ĆØ valido.',
- 'user' => 'Non riusciamo a trovare un utente con questo indirizzo email.',
+ 'token' => 'Questo token di reset della password non ĆØ valido.',
+ 'user' => 'Non riusciamo a trovare un utente con questo indirizzo email.',
];
diff --git a/lang/it/validation.php b/lang/it/validation.php
new file mode 100644
index 000000000..6ace1e502
--- /dev/null
+++ b/lang/it/validation.php
@@ -0,0 +1,135 @@
+ ':attribute deve essere accettato.',
+ 'accepted_if' => ':attribute deve essere accettato quando :other ĆØ :value.',
+ 'active_url' => ':attribute non ĆØ un URL valido.',
+ 'after' => ':attribute deve essere una data successiva al :date.',
+ 'after_or_equal' => ':attribute deve essere una data successiva o uguale al :date.',
+ 'alpha' => ':attribute puĆ² contenere solo lettere.',
+ 'alpha_dash' => ':attribute puĆ² contenere solo lettere, numeri e trattini.',
+ 'alpha_num' => ':attribute puĆ² contenere solo lettere e numeri.',
+ 'array' => ':attribute deve essere un array.',
+ 'attached' => ':attribute ĆØ giĆ associato.',
+ 'before' => ':attribute deve essere una data precedente al :date.',
+ 'before_or_equal' => ':attribute deve essere una data precedente o uguale al :date.',
+ 'between' => [
+ 'array' => ':attribute deve avere tra :min - :max elementi.',
+ 'file' => ':attribute deve trovarsi tra :min - :max kilobyte.',
+ 'numeric' => ':attribute deve trovarsi tra :min - :max.',
+ 'string' => ':attribute deve trovarsi tra :min - :max caratteri.',
+ ],
+ 'boolean' => 'Il campo :attribute deve essere vero o falso.',
+ 'confirmed' => 'Il campo di conferma per :attribute non coincide.',
+ 'current_password' => 'Password non valida.',
+ 'date' => ':attribute non ĆØ una data valida.',
+ 'date_equals' => ':attribute deve essere una data e uguale a :date.',
+ 'date_format' => ':attribute non coincide con il formato :format.',
+ 'declined' => ':attribute deve essere rifiutato.',
+ 'declined_if' => ':attribute deve essere rifiutato quando :other ĆØ :value.',
+ 'different' => ':attribute e :other devono essere differenti.',
+ 'digits' => ':attribute deve essere di :digits cifre.',
+ 'digits_between' => ':attribute deve essere tra :min e :max cifre.',
+ 'dimensions' => 'Le dimensioni dell\'immagine di :attribute non sono valide.',
+ 'distinct' => ':attribute contiene un valore duplicato.',
+ 'email' => ':attribute non ĆØ valido.',
+ 'ends_with' => ':attribute deve finire con uno dei seguenti valori: :values',
+ 'exists' => ':attribute selezionato non ĆØ valido.',
+ 'file' => ':attribute deve essere un file.',
+ 'filled' => 'Il campo :attribute deve contenere un valore.',
+ 'gt' => [
+ 'array' => ':attribute deve contenere piĆ¹ di :value elementi.',
+ 'file' => ':attribute deve essere maggiore di :value kilobyte.',
+ 'numeric' => ':attribute deve essere maggiore di :value.',
+ 'string' => ':attribute deve contenere piĆ¹ di :value caratteri.',
+ ],
+ 'gte' => [
+ 'array' => ':attribute deve contenere un numero di elementi uguale o maggiore di :value.',
+ 'file' => ':attribute deve essere uguale o maggiore di :value kilobyte.',
+ 'numeric' => ':attribute deve essere uguale o maggiore di :value.',
+ 'string' => ':attribute deve contenere un numero di caratteri uguale o maggiore di :value.',
+ ],
+ 'image' => ':attribute deve essere un\'immagine.',
+ 'in' => ':attribute selezionato non ĆØ valido.',
+ 'in_array' => 'Il valore del campo :attribute non esiste in :other.',
+ 'integer' => ':attribute deve essere un numero intero.',
+ 'ip' => ':attribute deve essere un indirizzo IP valido.',
+ 'ipv4' => ':attribute deve essere un indirizzo IPv4 valido.',
+ 'ipv6' => ':attribute deve essere un indirizzo IPv6 valido.',
+ 'json' => ':attribute deve essere una stringa JSON valida.',
+ 'lt' => [
+ 'array' => ':attribute deve contenere meno di :value elementi.',
+ 'file' => ':attribute deve essere minore di :value kilobyte.',
+ 'numeric' => ':attribute deve essere minore di :value.',
+ 'string' => ':attribute deve contenere meno di :value caratteri.',
+ ],
+ 'lte' => [
+ 'array' => ':attribute deve contenere un numero di elementi minore o uguale a :value.',
+ 'file' => ':attribute deve essere minore o uguale a :value kilobyte.',
+ 'numeric' => ':attribute deve essere minore o uguale a :value.',
+ 'string' => ':attribute deve contenere un numero di caratteri minore o uguale a :value.',
+ ],
+ 'max' => [
+ 'array' => ':attribute non puĆ² avere piĆ¹ di :max elementi.',
+ 'file' => ':attribute non puĆ² essere superiore a :max kilobyte.',
+ 'numeric' => ':attribute non puĆ² essere superiore a :max.',
+ 'string' => ':attribute non puĆ² contenere piĆ¹ di :max caratteri.',
+ ],
+ 'mimes' => ':attribute deve essere del tipo: :values.',
+ 'mimetypes' => ':attribute deve essere del tipo: :values.',
+ 'min' => [
+ 'array' => ':attribute deve avere almeno :min elementi.',
+ 'file' => ':attribute deve essere almeno di :min kilobyte.',
+ 'numeric' => ':attribute deve essere almeno :min.',
+ 'string' => ':attribute deve contenere almeno :min caratteri.',
+ ],
+ 'multiple_of' => ':attribute deve essere un multiplo di :value',
+ 'not_in' => 'Il valore selezionato per :attribute non ĆØ valido.',
+ 'not_regex' => 'Il formato di :attribute non ĆØ valido.',
+ 'numeric' => ':attribute deve essere un numero.',
+ 'password' => 'Il campo :attribute non ĆØ corretto.',
+ 'present' => 'Il campo :attribute deve essere presente.',
+ 'prohibited' => ':attribute non consentito.',
+ 'prohibited_if' => ':attribute non consentito quando :other ĆØ :value.',
+ 'prohibited_unless' => ':attribute non consentito a meno che :other sia contenuto in :values.',
+ 'prohibits' => ':attribute impedisce a :other di essere presente.',
+ 'regex' => 'Il formato del campo :attribute non ĆØ valido.',
+ 'relatable' => ':attribute non puĆ² essere associato a questa risorsa.',
+ 'required' => 'Il campo :attribute ĆØ richiesto.',
+ 'required_if' => 'Il campo :attribute ĆØ richiesto quando :other ĆØ :value.',
+ 'required_unless' => 'Il campo :attribute ĆØ richiesto a meno che :other sia in :values.',
+ 'required_with' => 'Il campo :attribute ĆØ richiesto quando :values ĆØ presente.',
+ 'required_with_all' => 'Il campo :attribute ĆØ richiesto quando :values sono presenti.',
+ 'required_without' => 'Il campo :attribute ĆØ richiesto quando :values non ĆØ presente.',
+ 'required_without_all' => 'Il campo :attribute ĆØ richiesto quando nessuno di :values ĆØ presente.',
+ 'same' => ':attribute e :other devono coincidere.',
+ 'size' => [
+ 'array' => ':attribute deve contenere :size elementi.',
+ 'file' => ':attribute deve essere :size kilobyte.',
+ 'numeric' => ':attribute deve essere :size.',
+ 'string' => ':attribute deve contenere :size caratteri.',
+ ],
+ 'starts_with' => ':attribute deve iniziare con uno dei seguenti: :values',
+ 'string' => ':attribute deve essere una stringa.',
+ 'timezone' => ':attribute deve essere una zona valida.',
+ 'unique' => ':attribute ĆØ stato giĆ utilizzato.',
+ 'uploaded' => ':attribute non ĆØ stato caricato.',
+ 'url' => 'Il formato del campo :attribute non ĆØ valido.',
+ 'uuid' => ':attribute deve essere un UUID valido.',
+ 'custom' => [
+ 'attribute-name' => [
+ 'rule-name' => 'custom-message',
+ ],
+ ],
+];
diff --git a/resources/lang/nl.json b/lang/nl.json
similarity index 99%
rename from resources/lang/nl.json
rename to lang/nl.json
index fa8eeed64..5e72fc395 100644
--- a/resources/lang/nl.json
+++ b/lang/nl.json
@@ -174,10 +174,10 @@
"please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!": "maak a.u.b. een bestand aan met de naam \"install.lock\" in de hoofdmap van uw dashboard. Anders worden er geen instellingen geladen!",
"or click here": "of klik hier",
"Company Name": "Bedrijfsnaam",
- "Company Adress": "Bedrijfsadres",
+ "Company Address": "Bedrijfsadres",
"Company Phonenumber": "Telefoonnummer bedrijf",
"VAT ID": "Btw-nummer",
- "Company E-Mail Adress": "Bedrijf e-mailadres",
+ "Company E-Mail Address": "Bedrijf e-mailadres",
"Company Website": "Bedrijfswebsite",
"Invoice Prefix": "Factuurvoorvoegsel",
"Enable Invoices": "Facturen inschakelen",
@@ -199,7 +199,7 @@
"Mail Username": "Mail Gebruikersnaam",
"Mail Password": "Mail Wachtwoord",
"Mail Encryption": "Mail Encryptie",
- "Mail From Adress": "Mail van adres",
+ "Mail From Address": "Mail van adres",
"Mail From Name": "Mail namens naam",
"Discord Client-ID": "Discord Client-ID",
"Discord Client-Secret": "Discord Client-Secret",
@@ -461,4 +461,4 @@
"ru": "Russisch",
"sv": "Zweeds",
"sk": "Slovakish"
-}
\ No newline at end of file
+}
diff --git a/resources/lang/nl/auth.php b/lang/nl/auth.php
similarity index 87%
rename from resources/lang/nl/auth.php
rename to lang/nl/auth.php
index 062343fbe..d20693a91 100644
--- a/resources/lang/nl/auth.php
+++ b/lang/nl/auth.php
@@ -12,7 +12,7 @@
*/
return [
- 'failed' => 'Deze combinatie van e-mailadres en wachtwoord is niet geldig.',
+ 'failed' => 'Deze combinatie van e-mailadres en wachtwoord is niet geldig.',
'password' => 'Het opgegeven wachtwoord is onjuist.',
'throttle' => 'Te veel mislukte loginpogingen. Probeer het over :seconds seconden nogmaals.',
];
diff --git a/resources/lang/nl/pagination.php b/lang/nl/pagination.php
similarity index 92%
rename from resources/lang/nl/pagination.php
rename to lang/nl/pagination.php
index 1381d2b75..2c22cc71f 100644
--- a/resources/lang/nl/pagination.php
+++ b/lang/nl/pagination.php
@@ -12,6 +12,6 @@
*/
return [
- 'next' => 'Volgende »',
+ 'next' => 'Volgende »',
'previous' => '« Vorige',
];
diff --git a/resources/lang/nl/passwords.php b/lang/nl/passwords.php
similarity index 62%
rename from resources/lang/nl/passwords.php
rename to lang/nl/passwords.php
index c9a7a8432..f1d83bb75 100644
--- a/resources/lang/nl/passwords.php
+++ b/lang/nl/passwords.php
@@ -12,9 +12,9 @@
*/
return [
- 'reset' => 'Het wachtwoord van uw account is gewijzigd.',
- 'sent' => 'We hebben een e-mail verstuurd met instructies om een nieuw wachtwoord in te stellen.',
+ 'reset' => 'Het wachtwoord van uw account is gewijzigd.',
+ 'sent' => 'We hebben een e-mail verstuurd met instructies om een nieuw wachtwoord in te stellen.',
'throttled' => 'Gelieve even te wachten voor u het opnieuw probeert.',
- 'token' => 'Dit wachtwoordhersteltoken is niet geldig.',
- 'user' => 'Geen gebruiker bekend met het e-mailadres.',
+ 'token' => 'Dit wachtwoordhersteltoken is niet geldig.',
+ 'user' => 'Geen gebruiker bekend met het e-mailadres.',
];
diff --git a/lang/nl/validation.php b/lang/nl/validation.php
new file mode 100644
index 000000000..e08ef11f9
--- /dev/null
+++ b/lang/nl/validation.php
@@ -0,0 +1,135 @@
+ ':Attribute moet geaccepteerd zijn.',
+ 'accepted_if' => ':Attribute moet worden geaccepteerd als :other :value is.',
+ 'active_url' => ':Attribute is geen geldige URL.',
+ 'after' => ':Attribute moet een datum na :date zijn.',
+ 'after_or_equal' => ':Attribute moet een datum na of gelijk aan :date zijn.',
+ 'alpha' => ':Attribute mag alleen letters bevatten.',
+ 'alpha_dash' => ':Attribute mag alleen letters, nummers, underscores (_) en streepjes (-) bevatten.',
+ 'alpha_num' => ':Attribute mag alleen letters en nummers bevatten.',
+ 'array' => ':Attribute moet geselecteerde elementen bevatten.',
+ 'attached' => ':Attribute is reeds gekoppeld.',
+ 'before' => ':Attribute moet een datum voor :date zijn.',
+ 'before_or_equal' => ':Attribute moet een datum voor of gelijk aan :date zijn.',
+ 'between' => [
+ 'array' => ':Attribute moet tussen :min en :max items bevatten.',
+ 'file' => ':Attribute moet tussen :min en :max kilobytes zijn.',
+ 'numeric' => ':Attribute moet tussen :min en :max zijn.',
+ 'string' => ':Attribute moet tussen :min en :max karakters zijn.',
+ ],
+ 'boolean' => ':Attribute moet ja of nee zijn.',
+ 'confirmed' => ':Attribute bevestiging komt niet overeen.',
+ 'current_password' => 'Huidig wachtwoord is onjuist.',
+ 'date' => ':Attribute moet een datum bevatten.',
+ 'date_equals' => ':Attribute moet een datum gelijk aan :date zijn.',
+ 'date_format' => ':Attribute moet een geldig datum formaat bevatten.',
+ 'declined' => ':attribute moet afgewezen worden.',
+ 'declined_if' => ':attribute moet afgewezen worden wanneer :other gelijk is aan :value.',
+ 'different' => ':Attribute en :other moeten verschillend zijn.',
+ 'digits' => ':Attribute moet bestaan uit :digits cijfers.',
+ 'digits_between' => ':Attribute moet bestaan uit minimaal :min en maximaal :max cijfers.',
+ 'dimensions' => ':Attribute heeft geen geldige afmetingen voor afbeeldingen.',
+ 'distinct' => ':Attribute heeft een dubbele waarde.',
+ 'email' => ':Attribute is geen geldig e-mailadres.',
+ 'ends_with' => ':Attribute moet met Ć©Ć©n van de volgende waarden eindigen: :values.',
+ 'exists' => ':Attribute bestaat niet.',
+ 'file' => ':Attribute moet een bestand zijn.',
+ 'filled' => ':Attribute is verplicht.',
+ 'gt' => [
+ 'array' => 'De :attribute moet meer dan :value waardes bevatten.',
+ 'file' => 'De :attribute moet groter zijn dan :value kilobytes.',
+ 'numeric' => 'De :attribute moet groter zijn dan :value.',
+ 'string' => 'De :attribute moet meer dan :value tekens bevatten.',
+ ],
+ 'gte' => [
+ 'array' => 'De :attribute moet :value waardes of meer bevatten.',
+ 'file' => 'De :attribute moet groter of gelijk zijn aan :value kilobytes.',
+ 'numeric' => 'De :attribute moet groter of gelijk zijn aan :value.',
+ 'string' => 'De :attribute moet minimaal :value tekens bevatten.',
+ ],
+ 'image' => ':Attribute moet een afbeelding zijn.',
+ 'in' => ':Attribute is ongeldig.',
+ 'in_array' => ':Attribute bestaat niet in :other.',
+ 'integer' => ':Attribute moet een getal zijn.',
+ 'ip' => ':Attribute moet een geldig IP-adres zijn.',
+ 'ipv4' => ':Attribute moet een geldig IPv4-adres zijn.',
+ 'ipv6' => ':Attribute moet een geldig IPv6-adres zijn.',
+ 'json' => ':Attribute moet een geldige JSON-string zijn.',
+ 'lt' => [
+ 'array' => 'De :attribute moet minder dan :value waardes bevatten.',
+ 'file' => 'De :attribute moet kleiner zijn dan :value kilobytes.',
+ 'numeric' => 'De :attribute moet kleiner zijn dan :value.',
+ 'string' => 'De :attribute moet minder dan :value tekens bevatten.',
+ ],
+ 'lte' => [
+ 'array' => 'De :attribute moet :value waardes of minder bevatten.',
+ 'file' => 'De :attribute moet kleiner of gelijk zijn aan :value kilobytes.',
+ 'numeric' => 'De :attribute moet kleiner of gelijk zijn aan :value.',
+ 'string' => 'De :attribute moet maximaal :value tekens bevatten.',
+ ],
+ 'max' => [
+ 'array' => ':Attribute mag niet meer dan :max items bevatten.',
+ 'file' => ':Attribute mag niet meer dan :max kilobytes zijn.',
+ 'numeric' => ':Attribute mag niet hoger dan :max zijn.',
+ 'string' => ':Attribute mag niet uit meer dan :max tekens bestaan.',
+ ],
+ 'mimes' => ':Attribute moet een bestand zijn van het bestandstype :values.',
+ 'mimetypes' => ':Attribute moet een bestand zijn van het bestandstype :values.',
+ 'min' => [
+ 'array' => ':Attribute moet minimaal :min items bevatten.',
+ 'file' => ':Attribute moet minimaal :min kilobytes zijn.',
+ 'numeric' => ':Attribute moet minimaal :min zijn.',
+ 'string' => ':Attribute moet minimaal :min tekens zijn.',
+ ],
+ 'multiple_of' => ':Attribute moet een veelvoud van :value zijn.',
+ 'not_in' => 'Het formaat van :attribute is ongeldig.',
+ 'not_regex' => 'De :attribute formaat is ongeldig.',
+ 'numeric' => ':Attribute moet een nummer zijn.',
+ 'password' => 'Wachtwoord is onjuist.',
+ 'present' => ':Attribute moet bestaan.',
+ 'prohibited' => ':Attribute veld is verboden.',
+ 'prohibited_if' => ':Attribute veld is verboden indien :other gelijk is aan :value.',
+ 'prohibited_unless' => ':Attribute veld is verboden tenzij :other gelijk is aan :values.',
+ 'prohibits' => 'Het veld :attribute verbiedt de aanwezigheid van :other.',
+ 'regex' => ':Attribute formaat is ongeldig.',
+ 'relatable' => ':Attribute mag niet gekoppeld worden aan deze bron.',
+ 'required' => ':Attribute is verplicht.',
+ 'required_if' => ':Attribute is verplicht indien :other gelijk is aan :value.',
+ 'required_unless' => ':Attribute is verplicht tenzij :other gelijk is aan :values.',
+ 'required_with' => ':Attribute is verplicht i.c.m. :values',
+ 'required_with_all' => ':Attribute is verplicht i.c.m. :values',
+ 'required_without' => ':Attribute is verplicht als :values niet ingevuld is.',
+ 'required_without_all' => ':Attribute is verplicht als :values niet ingevuld zijn.',
+ 'same' => ':Attribute en :other moeten overeenkomen.',
+ 'size' => [
+ 'array' => ':Attribute moet :size items bevatten.',
+ 'file' => ':Attribute moet :size kilobyte zijn.',
+ 'numeric' => ':Attribute moet :size zijn.',
+ 'string' => ':Attribute moet :size tekens zijn.',
+ ],
+ 'starts_with' => ':Attribute moet starten met een van de volgende: :values.',
+ 'string' => ':Attribute moet een tekst zijn.',
+ 'timezone' => ':Attribute moet een geldige tijdzone zijn.',
+ 'unique' => ':Attribute is al in gebruik.',
+ 'uploaded' => 'Het uploaden van :attribute is mislukt.',
+ 'url' => ':Attribute moet een geldig URL zijn.',
+ 'uuid' => ':Attribute moet een geldig UUID zijn.',
+ 'custom' => [
+ 'attribute-name' => [
+ 'rule-name' => 'custom-message',
+ ],
+ ],
+];
diff --git a/resources/lang/pl.json b/lang/pl.json
similarity index 99%
rename from resources/lang/pl.json
rename to lang/pl.json
index df5538e94..14bfaee38 100644
--- a/resources/lang/pl.json
+++ b/lang/pl.json
@@ -174,10 +174,10 @@
"please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!": "utwĆ³rz plik o nazwie āinstall.lockā w katalogu gÅĆ³wnym pulpitu nawigacyjnego. W przeciwnym razie żadne ustawienia nie zostanÄ
zaÅadowane!",
"or click here": "lub kliknij tutaj",
"Company Name": "Nazwa firmy",
- "Company Adress": "Adres firmy",
+ "Company Address": "Adres firmy",
"Company Phonenumber": "Numer telefonu",
"VAT ID": "NIP",
- "Company E-Mail Adress": "Firmowy adres e-mail",
+ "Company E-Mail Address": "Firmowy adres e-mail",
"Company Website": "Strona firmy",
"Invoice Prefix": "Prefiks faktury",
"Enable Invoices": "WÅÄ
cz faktury",
@@ -199,7 +199,7 @@
"Mail Username": "Nazwa użytkownika poczty",
"Mail Password": "HasÅo użytkownika poczty",
"Mail Encryption": "Szyfrowanie poczty",
- "Mail From Adress": "Mail From Adress",
+ "Mail From Address": "Mail From Address",
"Mail From Name": "Od Nazwy",
"Discord Client-ID": "Discord Client-ID",
"Discord Client-Secret": "Discord Client-Secret",
@@ -461,4 +461,4 @@
"ru": "Rosyjski",
"sv": "Swedish",
"sk": "Slovakish"
-}
\ No newline at end of file
+}
diff --git a/resources/lang/pl/auth.php b/lang/pl/auth.php
similarity index 92%
rename from resources/lang/pl/auth.php
rename to lang/pl/auth.php
index 162be3c35..1873ded48 100644
--- a/resources/lang/pl/auth.php
+++ b/lang/pl/auth.php
@@ -12,7 +12,7 @@
*/
return [
- 'failed' => 'BÅÄdny login lub hasÅo.',
+ 'failed' => 'BÅÄdny login lub hasÅo.',
'password' => 'Podane hasÅo jest nieprawidÅowe.',
'throttle' => 'Za dużo nieudanych prĆ³b logowania. ProszÄ sprĆ³bowaÄ za :seconds sekund.',
];
diff --git a/resources/lang/pl/pagination.php b/lang/pl/pagination.php
similarity index 92%
rename from resources/lang/pl/pagination.php
rename to lang/pl/pagination.php
index 831b8ff6c..0e793d6b9 100644
--- a/resources/lang/pl/pagination.php
+++ b/lang/pl/pagination.php
@@ -12,6 +12,6 @@
*/
return [
- 'next' => 'NastÄpna »',
+ 'next' => 'NastÄpna »',
'previous' => '« Poprzednia',
];
diff --git a/resources/lang/pl/passwords.php b/lang/pl/passwords.php
similarity index 65%
rename from resources/lang/pl/passwords.php
rename to lang/pl/passwords.php
index 3ea9171ea..8f6dac38b 100644
--- a/resources/lang/pl/passwords.php
+++ b/lang/pl/passwords.php
@@ -12,9 +12,9 @@
*/
return [
- 'reset' => 'HasÅo zostaÅo zresetowane!',
- 'sent' => 'Przypomnienie hasÅa zostaÅo wysÅane!',
+ 'reset' => 'HasÅo zostaÅo zresetowane!',
+ 'sent' => 'Przypomnienie hasÅa zostaÅo wysÅane!',
'throttled' => 'ProszÄ zaczekaÄ zanim sprĆ³bujesz ponownie.',
- 'token' => 'Token resetowania hasÅa jest nieprawidÅowy.',
- 'user' => 'Nie znaleziono użytkownika z takim adresem e-mail.',
+ 'token' => 'Token resetowania hasÅa jest nieprawidÅowy.',
+ 'user' => 'Nie znaleziono użytkownika z takim adresem e-mail.',
];
diff --git a/lang/pl/validation.php b/lang/pl/validation.php
new file mode 100644
index 000000000..fba0f778a
--- /dev/null
+++ b/lang/pl/validation.php
@@ -0,0 +1,135 @@
+ 'Pole :attribute musi zostaÄ zaakceptowane.',
+ 'accepted_if' => 'Pole :attribute musi zostaÄ zaakceptowane gdy :other ma wartoÅÄ :value.',
+ 'active_url' => 'Pole :attribute jest nieprawidÅowym adresem URL.',
+ 'after' => 'Pole :attribute musi byÄ datÄ
pĆ³ÅŗniejszÄ
od :date.',
+ 'after_or_equal' => 'Pole :attribute musi byÄ datÄ
nie wczeÅniejszÄ
niż :date.',
+ 'alpha' => 'Pole :attribute może zawieraÄ jedynie litery.',
+ 'alpha_dash' => 'Pole :attribute może zawieraÄ jedynie litery, cyfry i myÅlniki.',
+ 'alpha_num' => 'Pole :attribute może zawieraÄ jedynie litery i cyfry.',
+ 'array' => 'Pole :attribute musi byÄ tablicÄ
.',
+ 'attached' => 'Ten :attribute jest już doÅÄ
czony.',
+ 'before' => 'Pole :attribute musi byÄ datÄ
wczeÅniejszÄ
od :date.',
+ 'before_or_equal' => 'Pole :attribute musi byÄ datÄ
nie pĆ³ÅŗniejszÄ
niż :date.',
+ 'between' => [
+ 'array' => 'Pole :attribute musi skÅadaÄ siÄ z :min - :max elementĆ³w.',
+ 'file' => 'Pole :attribute musi zawieraÄ siÄ w granicach :min - :max kilobajtĆ³w.',
+ 'numeric' => 'Pole :attribute musi zawieraÄ siÄ w granicach :min - :max.',
+ 'string' => 'Pole :attribute musi zawieraÄ siÄ w granicach :min - :max znakĆ³w.',
+ ],
+ 'boolean' => 'Pole :attribute musi mieÄ wartoÅÄ logicznÄ
prawda albo faÅsz.',
+ 'confirmed' => 'Potwierdzenie pola :attribute nie zgadza siÄ.',
+ 'current_password' => 'HasÅo jest nieprawidÅowe.',
+ 'date' => 'Pole :attribute nie jest prawidÅowÄ
datÄ
.',
+ 'date_equals' => 'Pole :attribute musi byÄ datÄ
rĆ³wnÄ
:date.',
+ 'date_format' => 'Pole :attribute nie jest w formacie :format.',
+ 'declined' => 'Pole :attribute musi zostaÄ odrzucony.',
+ 'declined_if' => 'Pole :attribute musi zostaÄ odrzucony, gdy :other ma wartoÅÄ :value.',
+ 'different' => 'Pole :attribute oraz :other muszÄ
siÄ rĆ³Å¼niÄ.',
+ 'digits' => 'Pole :attribute musi skÅadaÄ siÄ z :digits cyfr.',
+ 'digits_between' => 'Pole :attribute musi mieÄ od :min do :max cyfr.',
+ 'dimensions' => 'Pole :attribute ma niepoprawne wymiary.',
+ 'distinct' => 'Pole :attribute ma zduplikowane wartoÅci.',
+ 'email' => 'Pole :attribute nie jest poprawnym adresem e-mail.',
+ 'ends_with' => 'Pole :attribute musi koÅczyÄ siÄ jednÄ
z nastÄpujÄ
cych wartoÅci: :values.',
+ 'exists' => 'Zaznaczone pole :attribute jest nieprawidÅowe.',
+ 'file' => 'Pole :attribute musi byÄ plikiem.',
+ 'filled' => 'Pole :attribute nie może byÄ puste.',
+ 'gt' => [
+ 'array' => 'Pole :attribute musi mieÄ wiÄcej niż :value elementĆ³w.',
+ 'file' => 'Pole :attribute musi byÄ wiÄksze niż :value kilobajtĆ³w.',
+ 'numeric' => 'Pole :attribute musi byÄ wiÄksze niż :value.',
+ 'string' => 'Pole :attribute musi byÄ dÅuższe niż :value znakĆ³w.',
+ ],
+ 'gte' => [
+ 'array' => 'Pole :attribute musi mieÄ :value lub wiÄcej elementĆ³w.',
+ 'file' => 'Pole :attribute musi byÄ wiÄksze lub rĆ³wne :value kilobajtĆ³w.',
+ 'numeric' => 'Pole :attribute musi byÄ wiÄksze lub rĆ³wne :value.',
+ 'string' => 'Pole :attribute musi byÄ dÅuższe lub rĆ³wne :value znakĆ³w.',
+ ],
+ 'image' => 'Pole :attribute musi byÄ obrazkiem.',
+ 'in' => 'Zaznaczony element :attribute jest nieprawidÅowy.',
+ 'in_array' => 'Pole :attribute nie znajduje siÄ w :other.',
+ 'integer' => 'Pole :attribute musi byÄ liczbÄ
caÅkowitÄ
.',
+ 'ip' => 'Pole :attribute musi byÄ prawidÅowym adresem IP.',
+ 'ipv4' => 'Pole :attribute musi byÄ prawidÅowym adresem IPv4.',
+ 'ipv6' => 'Pole :attribute musi byÄ prawidÅowym adresem IPv6.',
+ 'json' => 'Pole :attribute musi byÄ poprawnym ciÄ
giem znakĆ³w JSON.',
+ 'lt' => [
+ 'array' => 'Pole :attribute musi mieÄ mniej niż :value elementĆ³w.',
+ 'file' => 'Pole :attribute musi byÄ mniejsze niż :value kilobajtĆ³w.',
+ 'numeric' => 'Pole :attribute musi byÄ mniejsze niż :value.',
+ 'string' => 'Pole :attribute musi byÄ krĆ³tsze niż :value znakĆ³w.',
+ ],
+ 'lte' => [
+ 'array' => 'Pole :attribute musi mieÄ :value lub mniej elementĆ³w.',
+ 'file' => 'Pole :attribute musi byÄ mniejsze lub rĆ³wne :value kilobajtĆ³w.',
+ 'numeric' => 'Pole :attribute musi byÄ mniejsze lub rĆ³wne :value.',
+ 'string' => 'Pole :attribute musi byÄ krĆ³tsze lub rĆ³wne :value znakĆ³w.',
+ ],
+ 'max' => [
+ 'array' => 'Pole :attribute nie może mieÄ wiÄcej niż :max elementĆ³w.',
+ 'file' => 'Pole :attribute nie może byÄ wiÄksze niż :max kilobajtĆ³w.',
+ 'numeric' => 'Pole :attribute nie może byÄ wiÄksze niż :max.',
+ 'string' => 'Pole :attribute nie może byÄ dÅuższe niż :max znakĆ³w.',
+ ],
+ 'mimes' => 'Pole :attribute musi byÄ plikiem typu :values.',
+ 'mimetypes' => 'Pole :attribute musi byÄ plikiem typu :values.',
+ 'min' => [
+ 'array' => 'Pole :attribute musi mieÄ przynajmniej :min elementĆ³w.',
+ 'file' => 'Pole :attribute musi mieÄ przynajmniej :min kilobajtĆ³w.',
+ 'numeric' => 'Pole :attribute musi byÄ nie mniejsze od :min.',
+ 'string' => 'Pole :attribute musi mieÄ przynajmniej :min znakĆ³w.',
+ ],
+ 'multiple_of' => 'Pole :attribute musi byÄ wielokrotnoÅciÄ
wartoÅci :value',
+ 'not_in' => 'Zaznaczony :attribute jest nieprawidÅowy.',
+ 'not_regex' => 'Format pola :attribute jest nieprawidÅowy.',
+ 'numeric' => 'Pole :attribute musi byÄ liczbÄ
.',
+ 'password' => 'HasÅo jest nieprawidÅowe.',
+ 'present' => 'Pole :attribute musi byÄ obecne.',
+ 'prohibited' => 'Pole :attribute jest zabronione.',
+ 'prohibited_if' => 'Pole :attribute jest zabronione, gdy :other to :value.',
+ 'prohibited_unless' => 'Pole :attribute jest zabronione, chyba że :other jest w :values.',
+ 'prohibits' => 'Pole :attribute zabrania obecnoÅci :other.',
+ 'regex' => 'Format pola :attribute jest nieprawidÅowy.',
+ 'relatable' => 'Ten :attribute może nie byÄ powiÄ
zany z tym zasobem.',
+ 'required' => 'Pole :attribute jest wymagane.',
+ 'required_if' => 'Pole :attribute jest wymagane gdy :other ma wartoÅÄ :value.',
+ 'required_unless' => 'Pole :attribute jest wymagane jeżeli :other nie znajduje siÄ w :values.',
+ 'required_with' => 'Pole :attribute jest wymagane gdy :values jest obecny.',
+ 'required_with_all' => 'Pole :attribute jest wymagane gdy wszystkie :values sÄ
obecne.',
+ 'required_without' => 'Pole :attribute jest wymagane gdy :values nie jest obecny.',
+ 'required_without_all' => 'Pole :attribute jest wymagane gdy żadne z :values nie sÄ
obecne.',
+ 'same' => 'Pole :attribute i :other muszÄ
byÄ takie same.',
+ 'size' => [
+ 'array' => 'Pole :attribute musi zawieraÄ :size elementĆ³w.',
+ 'file' => 'Pole :attribute musi mieÄ :size kilobajtĆ³w.',
+ 'numeric' => 'Pole :attribute musi mieÄ :size.',
+ 'string' => 'Pole :attribute musi mieÄ :size znakĆ³w.',
+ ],
+ 'starts_with' => 'Pole :attribute musi zaczynaÄ siÄ jednÄ
z nastÄpujÄ
cych wartoÅci: :values.',
+ 'string' => 'Pole :attribute musi byÄ ciÄ
giem znakĆ³w.',
+ 'timezone' => 'Pole :attribute musi byÄ prawidÅowÄ
strefÄ
czasowÄ
.',
+ 'unique' => 'Taki :attribute już wystÄpuje.',
+ 'uploaded' => 'Nie udaÅo siÄ wgraÄ pliku :attribute.',
+ 'url' => 'Format pola :attribute jest nieprawidÅowy.',
+ 'uuid' => 'Pole :attribute musi byÄ poprawnym identyfikatorem UUID.',
+ 'custom' => [
+ 'attribute-name' => [
+ 'rule-name' => 'custom-message',
+ ],
+ ],
+];
diff --git a/resources/lang/pt.json b/lang/pt.json
similarity index 99%
rename from resources/lang/pt.json
rename to lang/pt.json
index 2313dc326..1ce81866a 100644
--- a/resources/lang/pt.json
+++ b/lang/pt.json
@@ -174,10 +174,10 @@
"please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!": "Favor criar um arquivo chamado \"install.lock\" no diretĆ³rio Root do seu painel. Caso contrĆ”rio, nenhuma configuraĆ§Ć£o serĆ” carregada!",
"or click here": "Ou clique aqui",
"Company Name": "Nome da empresa",
- "Company Adress": "EndereƧo da empresa",
+ "Company Address": "EndereƧo da empresa",
"Company Phonenumber": "NĆŗmero da empresa",
"VAT ID": "ID do VAT",
- "Company E-Mail Adress": "EndereƧo eletrĆ³nico da empresa",
+ "Company E-Mail Address": "EndereƧo eletrĆ³nico da empresa",
"Company Website": "SĆtio āwebā da empresa",
"Invoice Prefix": "Prefixo da fatura",
"Enable Invoices": "Ativar Faturas",
@@ -199,7 +199,7 @@
"Mail Username": "Utilizador de correio",
"Mail Password": "Senha do correio",
"Mail Encryption": "Criptografia de correio",
- "Mail From Adress": "EndereƧo de correio",
+ "Mail From Address": "EndereƧo de correio",
"Mail From Name": "Correio de Nome",
"Discord Client-ID": "Cliente-ID Discord",
"Discord Client-Secret": "Cliente-Secreto Discord",
@@ -461,4 +461,4 @@
"ru": "Russo",
"sv": "Sueco",
"sk": "Eslovaco"
-}
\ No newline at end of file
+}
diff --git a/resources/lang/ro.json b/lang/ro.json
similarity index 99%
rename from resources/lang/ro.json
rename to lang/ro.json
index b897bbd07..f4c9004c1 100644
--- a/resources/lang/ro.json
+++ b/lang/ro.json
@@ -174,10 +174,10 @@
"please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!": "please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!",
"or click here": "or click here",
"Company Name": "Company Name",
- "Company Adress": "Company Adress",
+ "Company Address": "Company Address",
"Company Phonenumber": "Company Phonenumber",
"VAT ID": "VAT ID",
- "Company E-Mail Adress": "Company E-Mail Adress",
+ "Company E-Mail Address": "Company E-Mail Address",
"Company Website": "Company Website",
"Invoice Prefix": "Invoice Prefix",
"Enable Invoices": "Enable Invoices",
@@ -199,7 +199,7 @@
"Mail Username": "Mail Username",
"Mail Password": "Mail Password",
"Mail Encryption": "Mail Encryption",
- "Mail From Adress": "Mail From Adress",
+ "Mail From Address": "Mail From Address",
"Mail From Name": "Mail From Name",
"Discord Client-ID": "Discord Client-ID",
"Discord Client-Secret": "Discord Client-Secret",
@@ -461,4 +461,4 @@
"ru": "Russian",
"sv": "Swedish",
"sk": "Slovakish"
-}
\ No newline at end of file
+}
diff --git a/resources/lang/ru.json b/lang/ru.json
similarity index 99%
rename from resources/lang/ru.json
rename to lang/ru.json
index 90daf537e..68755fabd 100644
--- a/resources/lang/ru.json
+++ b/lang/ru.json
@@ -174,10 +174,10 @@
"please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!": "ŠæŠ¾Š¶Š°Š»ŃŠ¹ŃŃŠ°, ŃŠ¾Š·Š“Š°Š¹ŃŠµ ŃŠ°Š¹Š» Ń ŠøŠ¼ŠµŠ½ŠµŠ¼ \"install.lock\" Š² ŠŗŠ¾ŃŠ½ŠµŠ²Š¾Š¼ ŠŗŠ°ŃŠ°Š»Š¾Š³Šµ ŠæŠ°Š½ŠµŠ»Šø ŠøŠ½ŃŃŃŃŠ¼ŠµŠ½ŃŠ¾Š². Š ŠæŃŠ¾ŃŠøŠ²Š½Š¾Š¼ ŃŠ»ŃŃŠ°Šµ Š½ŠøŠŗŠ°ŠŗŠøŠµ Š½Š°ŃŃŃŠ¾Š¹ŠŗŠø Š½Šµ Š±ŃŠ“ŃŃ Š·Š°Š³ŃŃŠ¶ŠµŠ½Ń!",
"or click here": "Š½Š°Š¶Š¼ŠøŃŠµ Š·Š“ŠµŃŃ",
"Company Name": "ŠŠ°Š·Š²Š°Š½ŠøŠµ ŠŠ¾Š¼ŠæŠ°Š½ŠøŠø",
- "Company Adress": "ŠŠ¾Š½ŃŠ°ŠŗŃŠ½ŃŠ¹ Š°Š“ŃŠµŃ ŠŗŠ¾Š¼ŠæŠ°Š½ŠøŠø",
+ "Company Address": "ŠŠ¾Š½ŃŠ°ŠŗŃŠ½ŃŠ¹ Š°Š“ŃŠµŃ ŠŗŠ¾Š¼ŠæŠ°Š½ŠøŠø",
"Company Phonenumber": "ŠŠ¾Š½ŃŠ°ŠŗŃŠ½ŃŠ¹ ŃŠµŠ»ŠµŃŠ¾Š½ ŠŗŠ¾Š¼ŠæŠ°Š½ŠøŠø",
"VAT ID": "ŠŠŠ",
- "Company E-Mail Adress": "ŠŠ“ŃŠµŃ ŃŠ»ŠµŠŗŃŃŠ¾Š½Š½Š¾Š¹ ŠæŠ¾ŃŃŃ ŠŗŠ¾Š¼ŠæŠ°Š½ŠøŠø",
+ "Company E-Mail Address": "ŠŠ“ŃŠµŃ ŃŠ»ŠµŠŗŃŃŠ¾Š½Š½Š¾Š¹ ŠæŠ¾ŃŃŃ ŠŗŠ¾Š¼ŠæŠ°Š½ŠøŠø",
"Company Website": "Š”Š°Š¹Ń ŠŗŠ¾Š¼ŠæŠ°Š½ŠøŠø",
"Invoice Prefix": "ŠŃŠµŃŠøŠŗŃ ŃŃŠµŃŠ°-ŃŠ°ŠŗŃŃŃŃ",
"Enable Invoices": "ŠŠŗŠ»ŃŃŠøŃŃ ŃŃŠµŃŠ°",
@@ -199,7 +199,7 @@
"Mail Username": "ŠŠ¼Ń ŠæŠ¾Š»ŃŠ·Š¾Š²Š°ŃŠµŠ»Ń",
"Mail Password": "ŠŠ¾ŃŃŠ¾Š²ŃŠ¹ ŠæŠ°ŃŠ¾Š»Ń",
"Mail Encryption": "Š¢ŠøŠæ ŃŠøŃŃŠ¾Š²Š°Š½ŠøŃ (SSL)",
- "Mail From Adress": "ŠŠ¾ŃŃŠ° Ń Š°Š“ŃŠµŃŠ°",
+ "Mail From Address": "ŠŠ¾ŃŃŠ° Ń Š°Š“ŃŠµŃŠ°",
"Mail From Name": "ŠŠ¼Ń Š¾ŃŠæŃŠ°Š²ŠøŃŠµŠ»Ń",
"Discord Client-ID": "Discord Client-ID",
"Discord Client-Secret": "Discord Client-Secret",
@@ -461,4 +461,4 @@
"ru": "Š ŃŃŃŠŗŠøŠ¹",
"sv": "Swedish",
"sk": "Slovakish"
-}
\ No newline at end of file
+}
diff --git a/resources/lang/sh.json b/lang/sh.json
similarity index 99%
rename from resources/lang/sh.json
rename to lang/sh.json
index 56c63ac36..2755ad282 100644
--- a/resources/lang/sh.json
+++ b/lang/sh.json
@@ -160,10 +160,10 @@
"please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!": "please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!",
"or click here": "or click here",
"Company Name": "Company Name",
- "Company Adress": "Company Adress",
+ "Company Address": "Company Address",
"Company Phonenumber": "Company Phonenumber",
"VAT ID": "VAT ID",
- "Company E-Mail Adress": "Company E-Mail Adress",
+ "Company E-Mail Address": "Company E-Mail Address",
"Company Website": "Company Website",
"Invoice Prefix": "Invoice Prefix",
"Enable Invoices": "Enable Invoices",
@@ -185,7 +185,7 @@
"Mail Username": "Mail Username",
"Mail Password": "Mail Password",
"Mail Encryption": "Mail Encryption",
- "Mail From Adress": "Mail From Adress",
+ "Mail From Address": "Mail From Address",
"Mail From Name": "Mail From Name",
"Discord Client-ID": "Discord Client-ID",
"Discord Client-Secret": "Discord Client-Secret",
@@ -442,4 +442,4 @@
"zh": "Chinese",
"tr": "Turkish",
"ru": "Russian"
-}
\ No newline at end of file
+}
diff --git a/resources/lang/sk.json b/lang/sk.json
similarity index 99%
rename from resources/lang/sk.json
rename to lang/sk.json
index f002840db..136d498de 100644
--- a/resources/lang/sk.json
+++ b/lang/sk.json
@@ -174,10 +174,10 @@
"please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!": "please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!",
"or click here": "or click here",
"Company Name": "Company Name",
- "Company Adress": "Company Adress",
+ "Company Address": "Company Address",
"Company Phonenumber": "Company Phonenumber",
"VAT ID": "VAT ID",
- "Company E-Mail Adress": "Company E-Mail Adress",
+ "Company E-Mail Address": "Company E-Mail Address",
"Company Website": "Company Website",
"Invoice Prefix": "Invoice Prefix",
"Enable Invoices": "Enable Invoices",
@@ -199,7 +199,7 @@
"Mail Username": "Mail Username",
"Mail Password": "Mail Password",
"Mail Encryption": "Mail Encryption",
- "Mail From Adress": "Mail From Adress",
+ "Mail From Address": "Mail From Address",
"Mail From Name": "Mail From Name",
"Discord Client-ID": "Discord Client-ID",
"Discord Client-Secret": "Discord Client-Secret",
@@ -461,4 +461,4 @@
"ru": "Russian",
"sv": "Swedish",
"sk": "Slovakish"
-}
\ No newline at end of file
+}
diff --git a/resources/lang/sr.json b/lang/sr.json
similarity index 99%
rename from resources/lang/sr.json
rename to lang/sr.json
index 0c51bf979..6e23c5260 100644
--- a/resources/lang/sr.json
+++ b/lang/sr.json
@@ -174,10 +174,10 @@
"please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!": "molimo napravite fajl sa nazivom \"install.lock\" u glavnom direktoriju svoje kontrolne table inaÄe niti jedno podeÅ”avanje neÄe biti uÄitano!",
"or click here": "ili kliknite ovdje",
"Company Name": "Naziv firme",
- "Company Adress": "Kontakt adresa",
+ "Company Address": "Kontakt adresa",
"Company Phonenumber": "Telefonski broj firme",
"VAT ID": "Poreski identifikacioni broj (PIB)",
- "Company E-Mail Adress": "E-Mail adresa firme",
+ "Company E-Mail Address": "E-Mail adresa firme",
"Company Website": "Web portal firme",
"Invoice Prefix": "Prefiks faktura",
"Enable Invoices": "Aktiviraj fakture",
@@ -199,7 +199,7 @@
"Mail Username": "Mail Username",
"Mail Password": "Mail Password",
"Mail Encryption": "Mail Encryption",
- "Mail From Adress": "Mail From Adress",
+ "Mail From Address": "Mail From Address",
"Mail From Name": "Mail From Name",
"Discord Client-ID": "Discord Client-ID",
"Discord Client-Secret": "Discord Client-Secret",
@@ -461,4 +461,4 @@
"ru": "Russian",
"sv": "Swedish",
"sk": "Slovakish"
-}
\ No newline at end of file
+}
diff --git a/resources/lang/sv.json b/lang/sv.json
similarity index 99%
rename from resources/lang/sv.json
rename to lang/sv.json
index f6a377f12..805887ef8 100644
--- a/resources/lang/sv.json
+++ b/lang/sv.json
@@ -174,10 +174,10 @@
"please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!": "var vƤnlig och skapa en fil som heter \"install.lock\" i din panels huvudmapp. Annars kommer inga instƤllningar att laddas!",
"or click here": "eller klicka hƤr",
"Company Name": "Fƶretagsnamn",
- "Company Adress": "Fƶretagsadress",
+ "Company Address": "Fƶretagsadress",
"Company Phonenumber": "Fƶretags telefonnummer",
"VAT ID": "Momsreg. nr.",
- "Company E-Mail Adress": "Fƶretagsepost",
+ "Company E-Mail Address": "Fƶretagsepost",
"Company Website": "Fƶretagets Hemsida",
"Invoice Prefix": "Prefix fƶr fakturor",
"Enable Invoices": "Aktivera fakturor",
@@ -199,7 +199,7 @@
"Mail Username": "Mail Username",
"Mail Password": "Mail Password",
"Mail Encryption": "Mail Encryption",
- "Mail From Adress": "Mail From Adress",
+ "Mail From Address": "Mail From Address",
"Mail From Name": "Mail From Name",
"Discord Client-ID": "Discord Client-ID",
"Discord Client-Secret": "Discord Client-Secret",
@@ -461,4 +461,4 @@
"ru": "Russian",
"sv": "Swedish",
"sk": "Slovakish"
-}
\ No newline at end of file
+}
diff --git a/resources/lang/tr.json b/lang/tr.json
similarity index 99%
rename from resources/lang/tr.json
rename to lang/tr.json
index 385a8dffb..f712fd680 100644
--- a/resources/lang/tr.json
+++ b/lang/tr.json
@@ -174,10 +174,10 @@
"please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!": "lĆ¼tfen ana klasƶrde \"install.lock\" adında bir dosya oluÅturun yoksa hiƧbir ayar yĆ¼klenmeyecek!",
"or click here": "veya buraya tıklayın",
"Company Name": "Firma Adı",
- "Company Adress": "Firma Adresi",
+ "Company Address": "Firma Adresi",
"Company Phonenumber": "Firma Telefon numarası",
"VAT ID": "Vergi kimlik numarası",
- "Company E-Mail Adress": "Firma e-posta adresi",
+ "Company E-Mail Address": "Firma e-posta adresi",
"Company Website": "Firma Web Sitesi",
"Invoice Prefix": "Fatura ƶneki",
"Enable Invoices": "Faturalandırmayı EtkinleÅtir",
@@ -199,7 +199,7 @@
"Mail Username": "Posta Kullanıcı Adı",
"Mail Password": "Posta Parolası",
"Mail Encryption": "Posta Åifrelemesi",
- "Mail From Adress": "Posta gƶnderen adresi",
+ "Mail From Address": "Posta gƶnderen adresi",
"Mail From Name": "Posta gƶnderen ismi",
"Discord Client-ID": "Discord client id'si",
"Discord Client-Secret": "Discord Client Secret'ı",
@@ -461,4 +461,4 @@
"ru": "RusƧa",
"sv": "İsveƧƧe",
"sk": "SlovakƧa"
-}
\ No newline at end of file
+}
diff --git a/resources/lang/zh.json b/lang/zh.json
similarity index 99%
rename from resources/lang/zh.json
rename to lang/zh.json
index efae58c6e..0e665123e 100644
--- a/resources/lang/zh.json
+++ b/lang/zh.json
@@ -174,10 +174,10 @@
"please create a file called \"install.lock\" in your dashboard Root directory. Otherwise no settings will be loaded!": "čÆ·åØä½ ēDashboardę ¹ē®å½äøåå»ŗäøäøŖåäøŗ \"install.lock \"ēę件ļ¼å¦åå°ę ę³å č½½ä»»ä½č®¾ē½®!",
"or click here": "ęē¹å»ę¤å¤",
"Company Name": "å
¬åøåē§°",
- "Company Adress": "å
¬åøå°å",
+ "Company Address": "å
¬åøå°å",
"Company Phonenumber": "å
¬åøēµčÆå·ē ",
"VAT ID": "å¢å¼ēØå·",
- "Company E-Mail Adress": "å
¬åøēµé®",
+ "Company E-Mail Address": "å
¬åøēµé®",
"Company Website": "å
¬åøē½ē«",
"Invoice Prefix": "åē„Øå·åē¼",
"Enable Invoices": "åÆēØåē„Ø",
@@ -199,7 +199,7 @@
"Mail Username": "ēµé®ęå”åØēØę·å",
"Mail Password": "ēµé®ęå”åØåÆē ",
"Mail Encryption": "ēµé®ęå”åØå åÆę¹ę³",
- "Mail From Adress": "åéč
é®ē®±",
+ "Mail From Address": "åéč
é®ē®±",
"Mail From Name": "åéč
åē§°",
"Discord Client-ID": "Discord Client-ID",
"Discord Client-Secret": "Discord Client-Secret",
@@ -461,4 +461,4 @@
"ru": "äæčÆ",
"sv": "ä¹å
å
°čÆ",
"sk": "ęÆę“ä¼å
čÆ"
-}
\ No newline at end of file
+}
diff --git a/package-lock.json b/package-lock.json
index e9cdc1474..632f719ac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,20 +1,23 @@
{
- "name": "controllpanelgg",
+ "name": "dashboard",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
+ "dependencies": {
+ "tinymce": "^6.3.1"
+ },
"devDependencies": {
- "axios": "^0.21",
- "bootstrap": "^4.0.0",
- "jquery": "^3.2",
+ "axios": "^0.25",
+ "bootstrap": "^4.6.0",
+ "jquery": "^3.5",
"laravel-mix": "^6.0.6",
"lodash": "^4.17.19",
- "popper.js": "^1.12",
+ "popper.js": "^1.16",
"postcss": "^8.1.14",
"resolve-url-loader": "^3.1.2",
- "sass": "^1.15.2",
- "sass-loader": "^8.0.0"
+ "sass": "^1.32.1",
+ "sass-loader": "^10.1.1"
}
},
"node_modules/@babel/code-frame": {
@@ -1633,9 +1636,9 @@
}
},
"node_modules/@types/json-schema": {
- "version": "7.0.7",
- "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
- "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
+ "version": "7.0.11",
+ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
+ "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
"dev": true
},
"node_modules/@types/micromatch": {
@@ -2262,12 +2265,12 @@
}
},
"node_modules/axios": {
- "version": "0.21.1",
- "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
- "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
+ "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
"dev": true,
"dependencies": {
- "follow-redirects": "^1.10.0"
+ "follow-redirects": "^1.14.7"
}
},
"node_modules/babel-loader": {
@@ -5454,9 +5457,9 @@
}
},
"node_modules/follow-redirects": {
- "version": "1.13.2",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz",
- "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==",
+ "version": "1.15.2",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+ "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
"dev": true,
"funding": [
{
@@ -11728,19 +11731,19 @@
}
},
"node_modules/sass-loader": {
- "version": "8.0.2",
- "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
- "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
+ "version": "10.4.1",
+ "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.4.1.tgz",
+ "integrity": "sha512-aX/iJZTTpNUNx/OSYzo2KsjIUQHqvWsAhhUijFjAPdZTEhstjZI9zTNvkTTwsx+uNUJqUwOw5gacxQMx4hJxGQ==",
"dev": true,
"dependencies": {
- "clone-deep": "^4.0.1",
- "loader-utils": "^1.2.3",
- "neo-async": "^2.6.1",
- "schema-utils": "^2.6.1",
- "semver": "^6.3.0"
+ "klona": "^2.0.4",
+ "loader-utils": "^2.0.0",
+ "neo-async": "^2.6.2",
+ "schema-utils": "^3.0.0",
+ "semver": "^7.3.2"
},
"engines": {
- "node": ">= 8.9.0"
+ "node": ">= 10.13.0"
},
"funding": {
"type": "opencollective",
@@ -11748,7 +11751,7 @@
},
"peerDependencies": {
"fibers": ">= 3.1.0",
- "node-sass": "^4.0.0",
+ "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",
"sass": "^1.3.0",
"webpack": "^4.36.0 || ^5.0.0"
},
@@ -11764,13 +11767,51 @@
}
}
},
+ "node_modules/sass-loader/node_modules/loader-utils": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+ "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+ "dev": true,
+ "dependencies": {
+ "big.js": "^5.2.2",
+ "emojis-list": "^3.0.0",
+ "json5": "^2.1.2"
+ },
+ "engines": {
+ "node": ">=8.9.0"
+ }
+ },
+ "node_modules/sass-loader/node_modules/schema-utils": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+ "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+ "dev": true,
+ "dependencies": {
+ "@types/json-schema": "^7.0.8",
+ "ajv": "^6.12.5",
+ "ajv-keywords": "^3.5.2"
+ },
+ "engines": {
+ "node": ">= 10.13.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/webpack"
+ }
+ },
"node_modules/sass-loader/node_modules/semver": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
- "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "version": "7.3.8",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+ "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
"dev": true,
+ "dependencies": {
+ "lru-cache": "^6.0.0"
+ },
"bin": {
"semver": "bin/semver.js"
+ },
+ "engines": {
+ "node": ">=10"
}
},
"node_modules/sax": {
@@ -12829,6 +12870,11 @@
"integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
"dev": true
},
+ "node_modules/tinymce": {
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.3.1.tgz",
+ "integrity": "sha512-+oCwXuTxAdJXVJ0130OxQz0JDNsqg3deuzgeUo8X5Vb27EzCJgXwO5eWvCxvkxpQo4oiHMVlM4tUIpTUHufHGQ=="
+ },
"node_modules/to-arraybuffer": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
@@ -15169,9 +15215,9 @@
}
},
"@types/json-schema": {
- "version": "7.0.7",
- "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
- "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
+ "version": "7.0.11",
+ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
+ "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
"dev": true
},
"@types/micromatch": {
@@ -15705,12 +15751,12 @@
}
},
"axios": {
- "version": "0.21.1",
- "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
- "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
+ "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
"dev": true,
"requires": {
- "follow-redirects": "^1.10.0"
+ "follow-redirects": "^1.14.7"
}
},
"babel-loader": {
@@ -18293,9 +18339,9 @@
}
},
"follow-redirects": {
- "version": "1.13.2",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz",
- "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==",
+ "version": "1.15.2",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+ "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
"dev": true
},
"for-in": {
@@ -23134,23 +23180,48 @@
}
},
"sass-loader": {
- "version": "8.0.2",
- "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
- "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
+ "version": "10.4.1",
+ "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.4.1.tgz",
+ "integrity": "sha512-aX/iJZTTpNUNx/OSYzo2KsjIUQHqvWsAhhUijFjAPdZTEhstjZI9zTNvkTTwsx+uNUJqUwOw5gacxQMx4hJxGQ==",
"dev": true,
"requires": {
- "clone-deep": "^4.0.1",
- "loader-utils": "^1.2.3",
- "neo-async": "^2.6.1",
- "schema-utils": "^2.6.1",
- "semver": "^6.3.0"
+ "klona": "^2.0.4",
+ "loader-utils": "^2.0.0",
+ "neo-async": "^2.6.2",
+ "schema-utils": "^3.0.0",
+ "semver": "^7.3.2"
},
"dependencies": {
+ "loader-utils": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+ "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+ "dev": true,
+ "requires": {
+ "big.js": "^5.2.2",
+ "emojis-list": "^3.0.0",
+ "json5": "^2.1.2"
+ }
+ },
+ "schema-utils": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+ "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+ "dev": true,
+ "requires": {
+ "@types/json-schema": "^7.0.8",
+ "ajv": "^6.12.5",
+ "ajv-keywords": "^3.5.2"
+ }
+ },
"semver": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
- "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
- "dev": true
+ "version": "7.3.8",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+ "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+ "dev": true,
+ "requires": {
+ "lru-cache": "^6.0.0"
+ }
}
}
},
@@ -24035,6 +24106,11 @@
"integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
"dev": true
},
+ "tinymce": {
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.3.1.tgz",
+ "integrity": "sha512-+oCwXuTxAdJXVJ0130OxQz0JDNsqg3deuzgeUo8X5Vb27EzCJgXwO5eWvCxvkxpQo4oiHMVlM4tUIpTUHufHGQ=="
+ },
"to-arraybuffer": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
diff --git a/package.json b/package.json
index 331b12d4f..1e38ffe3d 100644
--- a/package.json
+++ b/package.json
@@ -7,18 +7,25 @@
"watch-poll": "mix watch -- --watch-options-poll=1000",
"hot": "mix watch --hot",
"prod": "npm run production",
- "production": "mix --production"
+ "production": "mix --production",
+ "dev:default": "vite --config themes/default/vite.config.js",
+ "build:default": "vite build --config themes/default/vite.config.js",
+ "dev:1day2die": "vite --config themes/1day2die/vite.config.js",
+ "build:1day2die": "vite build --config themes/1day2die/vite.config.js"
},
"devDependencies": {
- "axios": "^0.21",
- "bootstrap": "^4.0.0",
- "jquery": "^3.2",
+ "axios": "^0.25",
+ "bootstrap": "^4.6.0",
+ "jquery": "^3.5",
"laravel-mix": "^6.0.6",
"lodash": "^4.17.19",
- "popper.js": "^1.12",
+ "popper.js": "^1.16",
"postcss": "^8.1.14",
"resolve-url-loader": "^3.1.2",
- "sass": "^1.15.2",
- "sass-loader": "^8.0.0"
+ "sass": "^1.32.1",
+ "sass-loader": "^10.1.1"
+ },
+ "dependencies": {
+ "tinymce": "^6.3.1"
}
}
diff --git a/phpunit.xml b/phpunit.xml
index 1581b5980..fc15f97bc 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -18,15 +18,15 @@
".$_GET['message'].'
'; + } ?>