mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1799 from mcustiel/feature-component-autowiring

Browse Source 
Added the ability to inject dependencies into components
This commit is contained in:
Samuel Georges 2016-02-27 14:09:14 +11:00
commit fbed1dd2ed
6 changed files with 128 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/cms/classes/ComponentManager.php
View File

@ -4,6 +4,7 @@ use Str;
use Illuminate\Container\Container;
use System\Classes\PluginManager;
use SystemException;
use Illuminate\Support\Facades\App;
/**
* Component manager
@ -132,7 +133,7 @@ class ComponentManager
return $this->codeMap;
}
/**
/**
* Returns an array of all component detail definitions.
* @return array Array keys are component codes, values are the details defined in the component.
*/
@ -210,7 +211,7 @@ class ComponentManager
));
}
$component = new $className($cmsObject, $properties);
$component = App::make($className, [$cmsObject, $properties]);
$component->name = $name;
return $component;

3
tests/fixtures/plugins/october/tester/Plugin.php vendored
View File

@ -20,7 +20,8 @@ class Plugin extends PluginBase
'October\Tester\Components\Archive' => 'testArchive',
'October\Tester\Components\Post' => 'testPost',
'October\Tester\Components\MainMenu' => 'testMainMenu',
'October\Tester\Components\ContentBlock' => 'testContentBlock'
'October\Tester\Components\ContentBlock' => 'testContentBlock',
'October\Tester\Components\Comments' => 'testComments',
];
}

12
tests/fixtures/plugins/october/tester/classes/Users.php vendored Normal file
View File

@ -0,0 +1,12 @@
<?php namespace October\Tester\Classes;
class Users
{
public function getUsers()
{
return [
'Art Vandelay' => 'Arquitecht and Importer/Exporter',
'Carl' => 'where is he?',
];
}
}

34
tests/fixtures/plugins/october/tester/components/Categories.php vendored Normal file
View File

@ -0,0 +1,34 @@
<?php namespace October\Tester\Components;
use Cms\Classes\ComponentBase;
use Cms\Classes\CodeBase;
class Categories extends ComponentBase
{
public function __construct(CodeBase $cmsObject = null, $properties = [])
{
parent::__construct($cmsObject, $properties);
}
public function componentDetails()
{
return [
'name' => 'Blog Categories Dummy Component',
'description' => 'Displays the list of categories in the blog.'
];
}
public function posts()
{
return [
['title' => 'Lorum ipsum', 'content' => 'Post Content #1'],
['title' => 'La Playa Nudista', 'content' => 'Second Post Content']
];
}
public function onTestAjax()
{
$this->page['var'] = 'page';
}
}

43
tests/fixtures/plugins/october/tester/components/Comments.php vendored Normal file
View File

@ -0,0 +1,43 @@
<?php namespace October\Tester\Components;
use Cms\Classes\ComponentBase;
use Cms\Classes\CodeBase;
use October\Tester\Classes\Users;
class Comments extends ComponentBase
{
private $users;
public function __construct(CodeBase $cmsObject = null, $properties = [], Users $users)
{
parent::__construct($cmsObject, $properties);
$this->users = $users;
}
public function componentDetails()
{
return [
'name' => 'Blog Comments Dummy Component',
'description' => 'Displays the list of comments on a post.'
];
}
public function posts()
{
return [
['title' => 'Lorum ipsum', 'content' => 'Post Content #1'],
['title' => 'La Playa Nudista', 'content' => 'Second Post Content']
];
}
public function onTestAjax()
{
$this->page['var'] = 'page';
}
public function getUsers()
{
return $this->users;
}
}

41
tests/unit/cms/classes/ComponentManagerTest.php
View File

@ -9,6 +9,19 @@ use Cms\Classes\ComponentManager;
class ComponentManagerTest extends TestCase
{
public function setUp()
{
parent::setUp();
include_once base_path() . '/tests/fixtures/plugins/october/tester/components/Archive.php';
include_once base_path() . '/tests/fixtures/plugins/october/tester/components/Post.php';
include_once base_path() . '/tests/fixtures/plugins/october/tester/components/MainMenu.php';
include_once base_path() . '/tests/fixtures/plugins/october/tester/components/ContentBlock.php';
include_once base_path() . '/tests/fixtures/plugins/october/tester/components/Comments.php';
include_once base_path() . '/tests/fixtures/plugins/october/tester/classes/Users.php';
}
public function testListComponents()
{
$manager = ComponentManager::instance();
@ -20,14 +33,9 @@ class ComponentManagerTest extends TestCase
public function testListComponentDetails()
{
include_once base_path() . '/tests/fixtures/plugins/october/tester/components/Archive.php';
include_once base_path() . '/tests/fixtures/plugins/october/tester/components/Post.php';
include_once base_path() . '/tests/fixtures/plugins/october/tester/components/MainMenu.php';
include_once base_path() . '/tests/fixtures/plugins/october/tester/components/ContentBlock.php';
$manager = ComponentManager::instance();
$components = $manager->listComponentDetails();
$this->assertArrayHasKey('testArchive', $components);
$this->assertArrayHasKey('name', $components['testArchive']);
$this->assertArrayHasKey('description', $components['testArchive']);
@ -41,6 +49,26 @@ class ComponentManagerTest extends TestCase
$this->assertEquals('Displays a blog post.', $components['testPost']['description']);
}
public function testGetComponentWithFactoryUsingAutomaticResolution()
{
$manager = ComponentManager::instance();
$components = $manager->listComponentDetails();
$this->assertArrayHasKey('testComments', $components);
$this->assertArrayHasKey('name', $components['testComments']);
$this->assertArrayHasKey('description', $components['testComments']);
$this->assertEquals('Blog Comments Dummy Component', $components['testComments']['name']);
$this->assertEquals('Displays the list of comments on a post.', $components['testComments']['description']);
$comments = $manager->makeComponent('testComments', $this->spoofPageCode(), []);
$users = $comments->getUsers()->getUsers();
$this->assertArrayHasKey('Art Vandelay', $users);
$this->assertArrayHasKey('Carl', $users);
$this->assertEquals('Arquitecht and Importer/Exporter', $users['Art Vandelay']);
$this->assertEquals('where is he?', $users['Carl']);
}
public function testFindByAlias()
{
$manager = ComponentManager::instance();
@ -50,7 +78,6 @@ class ComponentManagerTest extends TestCase
$component = $manager->resolve('testPost');
$this->assertEquals('\October\Tester\Components\Post', $component);
}
public function testHasComponent()