Skip to content

Make widget classes with the Illuminate Container #103

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

Merged
merged 3 commits into from
Apr 15, 2018
Merged

Make widget classes with the Illuminate Container #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae0a86b
Make widget classes with the Illuminate Container
RobertBoes Apr 12, 2018
54a91f7
StyleCI changes
RobertBoes Apr 12, 2018
b6ca8ae
Use makeWith instead of make
RobertBoes Apr 12, 2018
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
2 changes: 1 addition & 1 deletion src/Factories/AbstractWidgetFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ protected function instantiateWidget(array $params = [])
throw new InvalidWidgetClassException('Class "'.$widgetClass.'" must extend "Arrilot\Widgets\AbstractWidget" class');
}

$this->widget = new $widgetClass($this->widgetConfig);
$this->widget = $this->app->make($widgetClass, ['config' => $this->widgetConfig]);

if (static::$allowOnlyWidgetsWithDisabledEncryption && $this->widget->encryptParams) {
throw new EncryptException('Widget "'.$widgetClass.'" was not called properly');
Expand Down
7 changes: 7 additions & 0 deletions tests/Support/TestApplicationWrapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Arrilot\Widgets\Test\Support;

use Arrilot\Widgets\AbstractWidget;
use Arrilot\Widgets\Contracts\ApplicationWrapperContract;
use Arrilot\Widgets\Factories\AsyncWidgetFactory;
use Arrilot\Widgets\Factories\WidgetFactory;
Expand Down Expand Up @@ -97,6 +98,12 @@ public function make($abstract, array $parameters = [])
return new TestEncrypter();
}

if (is_subclass_of($abstract, AbstractWidget::class)) {
$app = \Illuminate\Container\Container::getInstance();

return $app->makeWith($abstract, $parameters);
}

throw new InvalidArgumentException("Binding {$abstract} cannot be resolved while testing");
}
}