Skip to content

Commit

Permalink
Merge branch '2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
crynobone committed May 4, 2014
2 parents 6d7cfcf + b6be918 commit 13f3bd8
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions tests/FactoryTest.php
Expand Up @@ -37,7 +37,7 @@ public function testConstructMethod()
$this->assertEquals('foo', $name->getValue($stub));
$this->assertInstanceOf('\Orchestra\Support\Nesty', $nesty->getValue($stub));
$this->assertEquals('stub', $type->getValue($stub));
$this->assertInstanceOf('\Illuminate\Support\Collection', $stub->getIterator());
$this->assertInstanceOf('\Orchestra\Support\Collection', $stub->getIterator());
$this->assertEquals(0, count($stub));
}

Expand All @@ -50,7 +50,7 @@ public function testGetItemMethod()
{
$stub = new FactoryStub('foo', array());

$this->assertInstanceOf('\Illuminate\Support\Collection', $stub->getItems());
$this->assertInstanceOf('\Orchestra\Support\Collection', $stub->getItems());
$this->assertNull($stub->is('foo'));

$stub->add('foobar')->hello('world');
Expand Down
2 changes: 1 addition & 1 deletion tests/MenuWidgetHandlerTest.php
Expand Up @@ -2,7 +2,7 @@

use Mockery as m;
use Orchestra\Widget\MenuWidgetHandler;
use Illuminate\Support\Collection;
use Orchestra\Support\Collection;
use Illuminate\Support\Fluent;

class MenuWidgetHandlerTest extends \PHPUnit_Framework_TestCase
Expand Down
2 changes: 1 addition & 1 deletion tests/PaneWidgetHandlerTest.php
Expand Up @@ -2,7 +2,7 @@

use Mockery as m;
use Orchestra\Widget\PaneWidgetHandler;
use Illuminate\Support\Collection;
use Orchestra\Support\Collection;
use Illuminate\Support\Fluent;

class PaneWidgetHandlerTest extends \PHPUnit_Framework_TestCase
Expand Down
2 changes: 1 addition & 1 deletion tests/PlaceholderWidgetHandlerTest.php
Expand Up @@ -2,7 +2,7 @@

use Mockery as m;
use Orchestra\Widget\PlaceholderWidgetHandler;
use Illuminate\Support\Collection;
use Orchestra\Support\Collection;
use Illuminate\Support\Fluent;

class PlaceholderWidgetHandlerTest extends \PHPUnit_Framework_TestCase
Expand Down
2 changes: 1 addition & 1 deletion tests/WidgetManagerTest.php
Expand Up @@ -2,7 +2,7 @@

use Mockery as m;
use Illuminate\Container\Container;
use Illuminate\Support\Collection;
use Orchestra\Support\Collection;
use Illuminate\Support\Fluent;
use Orchestra\Widget\WidgetManager;

Expand Down

0 comments on commit 13f3bd8

Please sign in to comment.