Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: add additional Telescope state check #447

Merged
merged 8 commits into from
Mar 15, 2024
Merged

refactor: add additional Telescope state check #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
366ca0e
Add verification if telescope is enabled using config helper
samuelhgf Mar 11, 2024
0c77a60
CS Fixer
samuelhgf Mar 11, 2024
dab42c0
Merge branch 'main' into refactor/add-telescope-enabled-config-verifi…
evansims Mar 11, 2024
a5a0c28
chore: fix linter warning
evansims Mar 11, 2024
e7cd3bf
Change Telescope class to CONST and add check telescope enabled in Us…
samuelhgf Mar 12, 2024
ab86127
Pull from origin and resolve conflicts
samuelhgf Mar 12, 2024
162f2bd
Merge branch 'main' into refactor/add-telescope-enabled-config-verifi…
samuelhgf Mar 12, 2024
29c710a
Merge branch 'main' into refactor/add-telescope-enabled-config-verifi…
evansims Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Guards/AuthenticationGuard.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
*/
final class AuthenticationGuard extends GuardAbstract implements AuthenticationGuardContract
{
/**
* @var string
*/
protected const TELESCOPE = '\Laravel\Telescope\Telescope';

public function find(): ?CredentialEntityContract
{
if ($this->isImpersonating()) {
Expand Down Expand Up @@ -283,7 +288,7 @@ public function user(): ?Authenticatable
* @var ?Authenticatable $lastResponse
*/
// @codeCoverageIgnoreStart
if (class_exists('\Laravel\Telescope\Telescope') && true === config('telescope.enabled')) {
if (class_exists(self::TELESCOPE) && true === config('telescope.enabled')) {
static $depth = 0;
static $lastCalled = null;

Expand Down
2 changes: 1 addition & 1 deletion src/UserProviderAbstract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ final public function retrieveByCredentials(array $credentials): ?Authenticatabl
return $lastResponse;
}

if (class_exists('\Laravel\Telescope\Telescope')) {
if (class_exists(self::TELESCOPE) && true === config('telescope.enabled')) {
static $depth = 0;
static $lastCalled = null;

Expand Down
Loading