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.

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

Add invade() helper instead of ObjectPrybar #4649

Merged
merged 1 commit into from Feb 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 3 additions & 8 deletions src/ComponentConcerns/ValidatesInput.php
Expand Up @@ -5,11 +5,10 @@
use function collect;
use function count;
use function explode;
use function Livewire\str;
use Livewire\ObjectPrybar;
use Livewire\Wireable;
use Illuminate\Support\Collection;
use Illuminate\Support\MessageBag;
use function Livewire\{str, invade};
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\ValidationException;
Expand Down Expand Up @@ -268,13 +267,9 @@ public function validateOnly($field, $rules = null, $messages = [], $attributes
$result = $validator->validate();
} catch (ValidationException $e) {
$messages = $e->validator->getMessageBag();
$target = new ObjectPrybar($e->validator);

$target->setProperty(
'messages',
$messages->merge(
$this->errorBagExcept($ruleKeysForField)
)
invade($e->validator)->messages = $messages->merge(
$this->errorBagExcept($ruleKeysForField)
);

throw $e;
Expand Down
9 changes: 4 additions & 5 deletions src/LivewireServiceProvider.php
Expand Up @@ -421,11 +421,10 @@ protected function bypassTheseMiddlewaresDuringLivewireRequests(array $middlewar

$kernel = $this->app->make(\Illuminate\Contracts\Http\Kernel::class);

$openKernel = new ObjectPrybar($kernel);

$middleware = $openKernel->getProperty('middleware');

$openKernel->setProperty('middleware', array_diff($middleware, $middlewareToExclude));
invade($kernel)->middleware = array_diff(
invade($kernel)->middleware,
$middlewareToExclude
);
}

protected function publishesToGroups(array $paths, $groups = null)
Expand Down
44 changes: 44 additions & 0 deletions src/helpers.php
Expand Up @@ -2,6 +2,7 @@

namespace Livewire;

use ReflectionClass;
use Illuminate\Support\Str;

if (! function_exists('Livewire\str')) {
Expand All @@ -16,3 +17,46 @@ public function __call($method, $params) {
return Str::of($string);
}
}

if (! function_exists('Livewire\invade')) {
function invade($obj)
{
return new class($obj) {
public $obj;
public $reflected;

public function __construct($obj)
{
$this->obj = $obj;
$this->reflected = new ReflectionClass($obj);
}

public function __get($name)
{
$property = $this->reflected->getProperty($name);

$property->setAccessible(true);

return $property->getValue($this->obj);
}

public function __set($name, $value)
{
$property = $this->reflected->getProperty($name);

$property->setAccessible(true);

$property->setValue($this->obj, $value);
}

public function __call($name, $params)
{
$method = $this->reflected->getMethod($name);

$method->setAccessible(true);

return $method->invoke($this->obj, ...$params);
}
};
}
}
13 changes: 6 additions & 7 deletions tests/Unit/ComponentHasRulesPropertyTest.php
Expand Up @@ -5,8 +5,8 @@
use Illuminate\Database\Eloquent\Model;
use Livewire\Livewire;
use Livewire\Component;
use function Livewire\invade;
use Livewire\Exceptions\MissingRulesException;
use Livewire\ObjectPrybar;
use Sushi\Sushi;

class ComponentHasRulesPropertyTest extends TestCase
Expand Down Expand Up @@ -156,10 +156,10 @@ public function save()
// Sorry about this chunk of ridiculousness. It's Sushi's fault.
$connection = $this->foo::resolveConnection();
$db = app('db');
$prybar = new ObjectPrybar($db);
$connections = $prybar->getProperty('connections');

$connections = invade($db)->connections;
$connections['foo-connection'] = $connection;
$prybar->setProperty('connections', $connections);
invade($db)->connections = $connections;

$this->validate();
}
Expand Down Expand Up @@ -190,10 +190,9 @@ public function save()
// Sorry about this chunk of ridiculousness. It's Sushi's fault.
$connection = $this->foo::resolveConnection();
$db = app('db');
$prybar = new ObjectPrybar($db);
$connections = $prybar->getProperty('connections');
$connections = invade($db)->connections;
$connections['foo-connection'] = $connection;
$prybar->setProperty('connections', $connections);
invade($db)->connections = $connections;

$this->validate();
}
Expand Down
48 changes: 48 additions & 0 deletions tests/Unit/InvadeHelperTest.php
@@ -0,0 +1,48 @@
<?php

namespace Tests\Unit;

use function Livewire\invade;
use Livewire\Component;
use Illuminate\Support\Facades\Route;
use Livewire\Request;
use Livewire\Response;

class InvadeHelperTest extends TestCase
{
/** @test */
public function get_property()
{
$thing = new class {
private $foo = 'bar';
};

$this->assertEquals('bar', invade($thing)->foo);
}

/** @test */
public function set_property()
{
$thing = new class {
private $foo = 'bar';
};

invade($thing)->foo = 'baz';

$this->assertEquals('baz', invade($thing)->foo);
}

/** @test */
public function call_method()
{
$thing = new class {
private $foo = 'bar';

private function getFoo() {
return $this->foo;
}
};

$this->assertEquals('bar', invade($thing)->getFoo());
}
}