Skip to content

Commit

Permalink
Merge pull request #14 from holantomas/fix-ambiguous-class
Browse files Browse the repository at this point in the history
Fix Ambiguous class, fixes #13
  • Loading branch information
paveljanda authored Jan 9, 2018
2 parents 13bab98 + 19d2dba commit 0a6a935
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tests/Cases/NetteDatabaseDataSourceTest.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ final class NetteDatabaseDataSourceTest extends TestCase
$structure = new Structure($connection, new DevNullStorage);
$this->db = new Context($connection, $structure);

$factory = new Ublaboo\DataGrid\Tests\Files\XTestingDataGridFactory;
$factory = new Ublaboo\DataGrid\Nette\Database\Tests\Files\XTestingDataGridFactory;
$this->grid = $factory->createXTestingDataGrid();
}

Expand Down
2 changes: 1 addition & 1 deletion tests/Files/ExportTestingPresenter.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Ublaboo\DataGrid\Tests\Files;
namespace Ublaboo\DataGrid\Nette\Database\Tests\Files;

use Nette;
use Ublaboo\DataGrid\DataGrid;
Expand Down
4 changes: 2 additions & 2 deletions tests/Files/XTestingDataGridFactory.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Ublaboo\DataGrid\Tests\Files;
namespace Ublaboo\DataGrid\Nette\Database\Tests\Files;

use Nette\Http,
Nette;
Expand All @@ -11,7 +11,7 @@ class XTestingDataGridFactory
public function createXTestingDataGrid($presenterName = 'XTesting')
{
$presenterFactory = new Nette\Application\PresenterFactory;
$presenterFactory->setMapping(['*' => 'Ublaboo\DataGrid\Tests\Files\*Presenter']);
$presenterFactory->setMapping(['*' => 'Ublaboo\DataGrid\Nette\Database\Tests\Files\*Presenter']);

$presenter = $presenterFactory->createPresenter($presenterName);

Expand Down
2 changes: 1 addition & 1 deletion tests/Files/XTestingPresenter.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Ublaboo\DataGrid\Tests\Files;
namespace Ublaboo\DataGrid\Nette\Database\Tests\Files;

use Nette;
use Ublaboo\DataGrid\DataGrid;
Expand Down

0 comments on commit 0a6a935

Please sign in to comment.