@@ -5,7 +5,6 @@ |
||
5 | 5 | use Doctrine\Common\Collections\ArrayCollection; |
6 | 6 | use Doctrine\Common\DataFixtures\AbstractFixture; |
7 | 7 | use Doctrine\Common\Persistence\ObjectManager; |
8 | - |
|
9 | 8 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; |
10 | 9 | use Symfony\Component\DependencyInjection\ContainerInterface; |
11 | 10 |
@@ -72,6 +72,9 @@ |
||
72 | 72 | $this->doTestGuess('guessFilter'); |
73 | 73 | } |
74 | 74 | |
75 | + /** |
|
76 | + * @param string $guessMethodName |
|
77 | + */ |
|
75 | 78 | public function doTestGuess($guessMethodName) |
76 | 79 | { |
77 | 80 | $class = 'TestClass'; |
@@ -99,6 +99,9 @@ |
||
99 | 99 | ); |
100 | 100 | } |
101 | 101 | |
102 | + /** |
|
103 | + * @param string $entityClass |
|
104 | + */ |
|
102 | 105 | protected function prepareEntityManagerForTestHints($entityClass) |
103 | 106 | { |
104 | 107 | $connection = $this->getMockBuilder('Doctrine\DBAL\Connection') |
@@ -6,9 +6,7 @@ |
||
6 | 6 | use Doctrine\ORM\Configuration; |
7 | 7 | use Doctrine\ORM\Mapping\ClassMetadata; |
8 | 8 | use Doctrine\DBAL\Platforms\MySqlPlatform; |
9 | - |
|
10 | 9 | use Oro\Component\DoctrineUtils\ORM\QueryHintResolver; |
11 | - |
|
12 | 10 | use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource; |
13 | 11 | |
14 | 12 | class OrmDatasourceTest extends \PHPUnit_Framework_TestCase |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\DatagridBundle\Tests\Unit\DependencyInjection\CompilerPass; |
4 | 4 | |
5 | 5 | use Symfony\Component\DependencyInjection\ContainerBuilder; |
6 | - |
|
7 | 6 | use Oro\Bundle\DataGridBundle\DependencyInjection\CompilerPass\InlineEditColumnOptionsGuesserPass; |
8 | 7 | |
9 | 8 | /** |
@@ -134,6 +134,9 @@ |
||
134 | 134 | $this->assertEquals($config->offsetGet($key), $expectedResult->offsetGet($key)); |
135 | 135 | } |
136 | 136 | |
137 | + /** |
|
138 | + * @param string $entityName |
|
139 | + */ |
|
137 | 140 | protected function getProcessConfigsExpectedValues($entityName) |
138 | 141 | { |
139 | 142 | return [ |
@@ -2,19 +2,12 @@ |
||
2 | 2 | |
3 | 3 | namespace Oro\Bundle\DataGridBundle\Tests\Unit\Extension\Totals; |
4 | 4 | |
5 | -use Doctrine\Common\Annotations\AnnotationReader; |
|
6 | -use Doctrine\ORM\Mapping\Driver\AnnotationDriver; |
|
7 | -use Doctrine\ORM\QueryBuilder; |
|
8 | - |
|
9 | 5 | use Oro\Bundle\DataGridBundle\Datagrid\Builder; |
10 | 6 | use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; |
11 | 7 | use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject; |
12 | 8 | use Oro\Bundle\DataGridBundle\Datagrid\Common\ResultsObject; |
13 | -use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource; |
|
14 | 9 | use Oro\Bundle\DataGridBundle\Extension\Totals\OrmTotalsExtension; |
15 | 10 | use Oro\Bundle\DataGridBundle\Extension\Totals\Configuration; |
16 | - |
|
17 | -use Oro\Bundle\TestFrameworkBundle\Test\Doctrine\ORM\Mocks\EntityManagerMock; |
|
18 | 11 | use Oro\Bundle\TestFrameworkBundle\Test\Doctrine\ORM\OrmTestCase; |
19 | 12 | |
20 | 13 | class OrmTotalsExtensionTest extends OrmTestCase |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Oro\Bundle\DataGridBundle\Datagrid\DatagridInterface; |
6 | 6 | use Symfony\Component\Routing\RouterInterface; |
7 | - |
|
8 | 7 | use Oro\Bundle\DataGridBundle\Datagrid\Builder; |
9 | 8 | use Oro\Bundle\DataGridBundle\Datagrid\ManagerInterface; |
10 | 9 | use Oro\Bundle\DataGridBundle\Datagrid\NameStrategyInterface; |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | * Generate grid element id. |
125 | 125 | * |
126 | 126 | * @param DatagridInterface $grid |
127 | - * @return array |
|
127 | + * @return string |
|
128 | 128 | */ |
129 | 129 | public function generateGridElementId(DatagridInterface $grid) |
130 | 130 | { |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | * |
143 | 143 | * @param string $name |
144 | 144 | * @param string $scope |
145 | - * @return array |
|
145 | + * @return string |
|
146 | 146 | */ |
147 | 147 | public function buildGridFullName($name, $scope) |
148 | 148 | { |
@@ -3,12 +3,10 @@ |
||
3 | 3 | namespace Oro\Bundle\DataGridBundle\Twig; |
4 | 4 | |
5 | 5 | use Symfony\Component\Routing\RouterInterface; |
6 | - |
|
7 | 6 | use Oro\Bundle\DataGridBundle\Datagrid\Builder; |
8 | 7 | use Oro\Bundle\DataGridBundle\Datagrid\DatagridInterface; |
9 | 8 | use Oro\Bundle\DataGridBundle\Datagrid\ManagerInterface; |
10 | 9 | use Oro\Bundle\DataGridBundle\Datagrid\NameStrategyInterface; |
11 | - |
|
12 | 10 | use Oro\Bundle\SecurityBundle\SecurityFacade; |
13 | 11 | |
14 | 12 | class DataGridExtension extends \Twig_Extension |
@@ -236,7 +236,7 @@ |
||
236 | 236 | /** |
237 | 237 | * @param array $params |
238 | 238 | * @param string $paramName |
239 | - * @param mixed $defaultValue |
|
239 | + * @param null|false $defaultValue |
|
240 | 240 | * |
241 | 241 | * @return mixed |
242 | 242 | */ |