Skip to content

Commit

Permalink
Improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
dazza-dev committed May 12, 2024
1 parent 6ad0246 commit a6fd995
Show file tree
Hide file tree
Showing 19 changed files with 71 additions and 71 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CAPTCHA_SOLVER_API_KEY=your_captcha_solver_api_key
### reCaptcha Google with AntiCaptcha.com

```php
use LaravelCaptchaSolver\Anticaptcha\NoCaptchaProxyless;
use DazzaDev\LaravelCaptchaSolver\NoCaptcha;

public function solveReCaptcha(): mixed
{
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
],
"autoload": {
"psr-4": {
"LaravelCaptchaSolver\\": "src/"
"DazzaDev\\LaravelCaptchaSolver\\": "src/"
}
},
"extra": {
"laravel": {
"providers": [
"LaravelCaptchaSolver\\CaptchaSolverServiceProvider"
"DazzaDev\\LaravelCaptchaSolver\\CaptchaSolverServiceProvider"
]
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/CaptchaSolver.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace LaravelCaptchaSolver;
namespace DazzaDev\LaravelCaptchaSolver;

use LaravelCaptchaSolver\Exceptions\CaptchaSolverException;
use DazzaDev\LaravelCaptchaSolver\Exceptions\CaptchaSolverException;

class CaptchaSolver
{
Expand Down Expand Up @@ -141,7 +141,7 @@ public function jsonPostRequest($methodName, $postData)
curl_setopt($ch, CURLOPT_HTTPHEADER, [
'Content-Type: application/json; charset=utf-8',
'Accept: application/json',
'Content-Length: '.strlen($postDataEncoded),
'Content-Length: ' . strlen($postDataEncoded),
]);
curl_setopt($ch, CURLOPT_TIMEOUT, 30);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 30);
Expand All @@ -164,7 +164,7 @@ public function setVerboseMode($mode)

public function debout($message, $color = 'white')
{
if (! $this->verboseMode) {
if (!$this->verboseMode) {
return false;
}
if ($color != 'white' and $color != '') {
Expand All @@ -176,11 +176,11 @@ public function debout($message, $color = 'white')
'yellow' => '1;33',
];

$CLIMsg = "\033[".$CLIcolors[$color]."m$message\033[0m";
$CLIMsg = "\033[" . $CLIcolors[$color] . "m$message\033[0m";
} else {
$CLIMsg = $message;
}
echo $CLIMsg."\n";
echo $CLIMsg . "\n";
}

public function setErrorMessage($message)
Expand Down
6 changes: 3 additions & 3 deletions src/CaptchaSolverServiceProvider.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace LaravelCaptchaSolver;
namespace DazzaDev\LaravelCaptchaSolver;

use Illuminate\Support\ServiceProvider;

Expand All @@ -9,11 +9,11 @@ class CaptchaSolverServiceProvider extends ServiceProvider
public function boot()
{
$this->publishes([
__DIR__.'/../config/captcha-solver.php' => config_path('captcha-solver.php'),
__DIR__ . '/../config/captcha-solver.php' => config_path('captcha-solver.php'),
], 'captcha-solver');

$this->mergeConfigFrom(
__DIR__.'/../config/captcha-solver.php',
__DIR__ . '/../config/captcha-solver.php',
'captcha-solver'
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/CaptchaTaskProtocol.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace LaravelCaptchaSolver;
namespace DazzaDev\LaravelCaptchaSolver;

interface CaptchaTaskProtocol
{
Expand Down
2 changes: 1 addition & 1 deletion src/Exceptions/CaptchaSolverException.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace LaravelCaptchaSolver\Exceptions;
namespace DazzaDev\LaravelCaptchaSolver\Exceptions;

use Exception;

Expand Down
6 changes: 3 additions & 3 deletions src/Tasks/CustomCaptcha.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace LaravelCaptchaSolver\Tasks;
namespace DazzaDev\LaravelCaptchaSolver\Tasks;

use LaravelCaptchaSolver\CaptchaSolver;
use LaravelCaptchaSolver\CaptchaTaskProtocol;
use DazzaDev\LaravelCaptchaSolver\CaptchaSolver;
use DazzaDev\LaravelCaptchaSolver\CaptchaTaskProtocol;

class CustomCaptcha extends CaptchaSolver implements CaptchaTaskProtocol
{
Expand Down
10 changes: 5 additions & 5 deletions src/Tasks/FunCaptcha.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace LaravelCaptchaSolver\Tasks;
namespace DazzaDev\LaravelCaptchaSolver\Tasks;

use LaravelCaptchaSolver\CaptchaSolver;
use LaravelCaptchaSolver\CaptchaTaskProtocol;
use LaravelCaptchaSolver\Traits\CaptchaSolverTrait;
use LaravelCaptchaSolver\Traits\ProxyTrait;
use DazzaDev\LaravelCaptchaSolver\CaptchaSolver;
use DazzaDev\LaravelCaptchaSolver\CaptchaTaskProtocol;
use DazzaDev\LaravelCaptchaSolver\Traits\CaptchaSolverTrait;
use DazzaDev\LaravelCaptchaSolver\Traits\ProxyTrait;

class FunCaptcha extends CaptchaSolver implements CaptchaTaskProtocol
{
Expand Down
10 changes: 5 additions & 5 deletions src/Tasks/GeeTest.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace LaravelCaptchaSolver\Tasks;
namespace DazzaDev\LaravelCaptchaSolver\Tasks;

use LaravelCaptchaSolver\CaptchaSolver;
use LaravelCaptchaSolver\CaptchaTaskProtocol;
use LaravelCaptchaSolver\Traits\CaptchaSolverTrait;
use LaravelCaptchaSolver\Traits\ProxyTrait;
use DazzaDev\LaravelCaptchaSolver\CaptchaSolver;
use DazzaDev\LaravelCaptchaSolver\CaptchaTaskProtocol;
use DazzaDev\LaravelCaptchaSolver\Traits\CaptchaSolverTrait;
use DazzaDev\LaravelCaptchaSolver\Traits\ProxyTrait;

class GeeTest extends CaptchaSolver implements CaptchaTaskProtocol
{
Expand Down
10 changes: 5 additions & 5 deletions src/Tasks/HCaptcha.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace LaravelCaptchaSolver\Capmonster;
namespace DazzaDev\LaravelCaptchaSolver\Capmonster;

use LaravelCaptchaSolver\CaptchaSolver;
use LaravelCaptchaSolver\CaptchaTaskProtocol;
use LaravelCaptchaSolver\Traits\CaptchaSolverTrait;
use LaravelCaptchaSolver\Traits\ProxyTrait;
use DazzaDev\LaravelCaptchaSolver\CaptchaSolver;
use DazzaDev\LaravelCaptchaSolver\CaptchaTaskProtocol;
use DazzaDev\LaravelCaptchaSolver\Traits\CaptchaSolverTrait;
use DazzaDev\LaravelCaptchaSolver\Traits\ProxyTrait;

class HCaptcha extends CaptchaSolver implements CaptchaTaskProtocol
{
Expand Down
6 changes: 3 additions & 3 deletions src/Tasks/ImageToText.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace LaravelCaptchaSolver\Tasks;
namespace DazzaDev\LaravelCaptchaSolver\Tasks;

use LaravelCaptchaSolver\CaptchaSolver;
use LaravelCaptchaSolver\CaptchaTaskProtocol;
use DazzaDev\LaravelCaptchaSolver\CaptchaSolver;
use DazzaDev\LaravelCaptchaSolver\CaptchaTaskProtocol;

class ImageToText extends CaptchaSolver implements CaptchaTaskProtocol
{
Expand Down
10 changes: 5 additions & 5 deletions src/Tasks/NoCaptcha.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace LaravelCaptchaSolver\Tasks;
namespace DazzaDev\LaravelCaptchaSolver\Tasks;

use LaravelCaptchaSolver\CaptchaSolver;
use LaravelCaptchaSolver\CaptchaTaskProtocol;
use LaravelCaptchaSolver\Traits\CaptchaSolverTrait;
use LaravelCaptchaSolver\Traits\ProxyTrait;
use DazzaDev\LaravelCaptchaSolver\CaptchaSolver;
use DazzaDev\LaravelCaptchaSolver\CaptchaTaskProtocol;
use DazzaDev\LaravelCaptchaSolver\Traits\CaptchaSolverTrait;
use DazzaDev\LaravelCaptchaSolver\Traits\ProxyTrait;

class NoCaptcha extends CaptchaSolver implements CaptchaTaskProtocol
{
Expand Down
12 changes: 6 additions & 6 deletions src/Tasks/RecaptchaV2.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace LaravelCaptchaSolver\Tasks;
namespace DazzaDev\LaravelCaptchaSolver\Tasks;

use LaravelCaptchaSolver\CaptchaSolver;
use LaravelCaptchaSolver\CaptchaTaskProtocol;
use LaravelCaptchaSolver\Traits\CaptchaSolverTrait;
use LaravelCaptchaSolver\Traits\ProxyTrait;
use DazzaDev\LaravelCaptchaSolver\CaptchaSolver;
use DazzaDev\LaravelCaptchaSolver\CaptchaTaskProtocol;
use DazzaDev\LaravelCaptchaSolver\Traits\CaptchaSolverTrait;
use DazzaDev\LaravelCaptchaSolver\Traits\ProxyTrait;

class RecaptchaV2 extends CaptchaSolver implements CaptchaTaskProtocol
{
Expand All @@ -23,7 +23,7 @@ public function getPostData()
'isInvisible' => $this->isInvisible,
];

if (! empty($this->proxy)) {
if (!empty($this->proxy)) {
$postData['type'] = 'ReCaptchaV2Task';
$postData['proxy'] = $this->proxy;
} else {
Expand Down
12 changes: 6 additions & 6 deletions src/Tasks/RecaptchaV2Enterprise.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace LaravelCaptchaSolver\Tasks;
namespace DazzaDev\LaravelCaptchaSolver\Tasks;

use LaravelCaptchaSolver\CaptchaSolver;
use LaravelCaptchaSolver\CaptchaTaskProtocol;
use LaravelCaptchaSolver\Traits\CaptchaSolverTrait;
use LaravelCaptchaSolver\Traits\ProxyTrait;
use DazzaDev\LaravelCaptchaSolver\CaptchaSolver;
use DazzaDev\LaravelCaptchaSolver\CaptchaTaskProtocol;
use DazzaDev\LaravelCaptchaSolver\Traits\CaptchaSolverTrait;
use DazzaDev\LaravelCaptchaSolver\Traits\ProxyTrait;

class RecaptchaV2Enterprise extends CaptchaSolver implements CaptchaTaskProtocol
{
Expand All @@ -28,7 +28,7 @@ public function getPostData()
'apiDomain' => $this->apiDomain,
];

if (! empty($this->proxy)) {
if (!empty($this->proxy)) {
$postData['type'] = 'ReCaptchaV2EnterpriseTask';
$postData['proxy'] = $this->proxy;
} else {
Expand Down
12 changes: 6 additions & 6 deletions src/Tasks/RecaptchaV3.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace LaravelCaptchaSolver\Tasks;
namespace DazzaDev\LaravelCaptchaSolver\Tasks;

use LaravelCaptchaSolver\CaptchaSolver;
use LaravelCaptchaSolver\CaptchaTaskProtocol;
use LaravelCaptchaSolver\Traits\CaptchaSolverTrait;
use LaravelCaptchaSolver\Traits\ProxyTrait;
use DazzaDev\LaravelCaptchaSolver\CaptchaSolver;
use DazzaDev\LaravelCaptchaSolver\CaptchaTaskProtocol;
use DazzaDev\LaravelCaptchaSolver\Traits\CaptchaSolverTrait;
use DazzaDev\LaravelCaptchaSolver\Traits\ProxyTrait;

class RecaptchaV3 extends CaptchaSolver implements CaptchaTaskProtocol
{
Expand All @@ -29,7 +29,7 @@ public function getPostData()
'apiDomain' => $this->apiDomain,
];

if (! empty($this->proxy)) {
if (!empty($this->proxy)) {
$postData['type'] = 'ReCaptchaV3Task';
$postData['proxy'] = $this->proxy;
} else {
Expand Down
12 changes: 6 additions & 6 deletions src/Tasks/RecaptchaV3Enterprise.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace LaravelCaptchaSolver\Tasks;
namespace DazzaDev\LaravelCaptchaSolver\Tasks;

use LaravelCaptchaSolver\CaptchaSolver;
use LaravelCaptchaSolver\CaptchaTaskProtocol;
use LaravelCaptchaSolver\Traits\CaptchaSolverTrait;
use LaravelCaptchaSolver\Traits\ProxyTrait;
use DazzaDev\LaravelCaptchaSolver\CaptchaSolver;
use DazzaDev\LaravelCaptchaSolver\CaptchaTaskProtocol;
use DazzaDev\LaravelCaptchaSolver\Traits\CaptchaSolverTrait;
use DazzaDev\LaravelCaptchaSolver\Traits\ProxyTrait;

class RecaptchaV3Enterprise extends CaptchaSolver implements CaptchaTaskProtocol
{
Expand All @@ -32,7 +32,7 @@ public function getPostData()
'cookies' => $this->cookies,
];

if (! empty($this->proxy)) {
if (!empty($this->proxy)) {
$postData['type'] = 'ReCaptchaV3EnterpriseTask';
$postData['proxy'] = $this->proxy;
} else {
Expand Down
10 changes: 5 additions & 5 deletions src/Tasks/Turnstile.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace LaravelCaptchaSolver\Tasks;
namespace DazzaDev\LaravelCaptchaSolver\Tasks;

use LaravelCaptchaSolver\CaptchaSolver;
use LaravelCaptchaSolver\CaptchaTaskProtocol;
use LaravelCaptchaSolver\Traits\CaptchaSolverTrait;
use LaravelCaptchaSolver\Traits\ProxyTrait;
use DazzaDev\LaravelCaptchaSolver\CaptchaSolver;
use DazzaDev\LaravelCaptchaSolver\CaptchaTaskProtocol;
use DazzaDev\LaravelCaptchaSolver\Traits\CaptchaSolverTrait;
use DazzaDev\LaravelCaptchaSolver\Traits\ProxyTrait;

class Turnstile extends CaptchaSolver implements CaptchaTaskProtocol
{
Expand Down
2 changes: 1 addition & 1 deletion src/Traits/CaptchaSolverTrait.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace LaravelCaptchaSolver\Traits;
namespace DazzaDev\LaravelCaptchaSolver\Traits;

trait CaptchaSolverTrait
{
Expand Down
2 changes: 1 addition & 1 deletion src/Traits/ProxyTrait.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace LaravelCaptchaSolver\Traits;
namespace DazzaDev\LaravelCaptchaSolver\Traits;

trait ProxyTrait
{
Expand Down

0 comments on commit a6fd995

Please sign in to comment.