@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\EntityMergeBundle\Model\Step; |
4 | 4 | |
5 | 5 | use Symfony\Component\EventDispatcher\EventDispatcherInterface; |
6 | - |
|
7 | 6 | use Oro\Bundle\EntityMergeBundle\Data\EntityData; |
8 | 7 | use Oro\Bundle\EntityMergeBundle\Event\FieldDataEvent; |
9 | 8 | use Oro\Bundle\EntityMergeBundle\MergeEvents; |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\EntityMergeBundle\Model\Step; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityManager; |
6 | - |
|
7 | 6 | use Oro\Bundle\EntityMergeBundle\Data\EntityData; |
8 | 7 | use Oro\Bundle\EntityMergeBundle\Doctrine\DoctrineHelper; |
9 | 8 |
@@ -178,6 +178,9 @@ discard block |
||
178 | 178 | $this->accessor->setValue($entity, $metadata, $value); |
179 | 179 | } |
180 | 180 | |
181 | + /** |
|
182 | + * @param string $name |
|
183 | + */ |
|
181 | 184 | protected function createAccessor($name) |
182 | 185 | { |
183 | 186 | $result = $this->getMock('Oro\Bundle\EntityMergeBundle\Model\Accessor\AccessorInterface'); |
@@ -195,6 +198,9 @@ discard block |
||
195 | 198 | ->getMock(); |
196 | 199 | } |
197 | 200 | |
201 | + /** |
|
202 | + * @param integer $id |
|
203 | + */ |
|
198 | 204 | protected function createTestEntity($id) |
199 | 205 | { |
200 | 206 | $result = new \stdClass(); |
@@ -160,6 +160,9 @@ discard block |
||
160 | 160 | ]; |
161 | 161 | } |
162 | 162 | |
163 | + /** |
|
164 | + * @param string $fieldName |
|
165 | + */ |
|
163 | 166 | protected function getFieldMetadata($fieldName = null, array $options = []) |
164 | 167 | { |
165 | 168 | $result = $this->createFieldMetadata(); |
@@ -179,6 +182,10 @@ discard block |
||
179 | 182 | ->method('get') |
180 | 183 | ->will( |
181 | 184 | $this->returnCallback( |
185 | + |
|
186 | + /** |
|
187 | + * @param string $code |
|
188 | + */ |
|
182 | 189 | function ($code) use ($options) { |
183 | 190 | $this->assertArrayHasKey($code, $options); |
184 | 191 | return $options[$code]; |
@@ -190,6 +197,10 @@ discard block |
||
190 | 197 | ->method('has') |
191 | 198 | ->will( |
192 | 199 | $this->returnCallback( |
200 | + |
|
201 | + /** |
|
202 | + * @param string $code |
|
203 | + */ |
|
193 | 204 | function ($code) use ($options) { |
194 | 205 | return isset($options[$code]); |
195 | 206 | } |
@@ -211,11 +222,18 @@ discard block |
||
211 | 222 | ->disableOriginalConstructor()->getMock(); |
212 | 223 | } |
213 | 224 | |
225 | + /** |
|
226 | + * @param string $id |
|
227 | + * @param EntityStub $parent |
|
228 | + */ |
|
214 | 229 | protected function createEntity($id = null, $parent = null) |
215 | 230 | { |
216 | 231 | return new EntityStub($id, $parent); |
217 | 232 | } |
218 | 233 | |
234 | + /** |
|
235 | + * @param string $id |
|
236 | + */ |
|
219 | 237 | protected function createRelatedEntity($id = null) |
220 | 238 | { |
221 | 239 | return new CollectionItemStub($id); |
@@ -4,9 +4,7 @@ |
||
4 | 4 | |
5 | 5 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
6 | 6 | use Symfony\Component\HttpFoundation\JsonResponse; |
7 | - |
|
8 | 7 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
9 | - |
|
10 | 8 | use Oro\Bundle\EntityPaginationBundle\Navigation\EntityPaginationNavigation; |
11 | 9 | use Oro\Bundle\EntityPaginationBundle\Navigation\NavigationResult; |
12 | 10 |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | } |
61 | 61 | |
62 | 62 | /** |
63 | - * @param object $entity |
|
63 | + * @param \stdClass $entity |
|
64 | 64 | * @param string $scope |
65 | 65 | * @return string |
66 | 66 | */ |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | } |
79 | 79 | |
80 | 80 | /** |
81 | - * @param object $entity |
|
81 | + * @param \stdClass $entity |
|
82 | 82 | * @param string $scope |
83 | 83 | * @return string |
84 | 84 | */ |
@@ -4,9 +4,7 @@ |
||
4 | 4 | |
5 | 5 | use Symfony\Component\HttpFoundation\Session\Session; |
6 | 6 | use Symfony\Component\Translation\TranslatorInterface; |
7 | - |
|
8 | 7 | use Doctrine\Common\Util\ClassUtils; |
9 | - |
|
10 | 8 | use Oro\Bundle\EntityPaginationBundle\Navigation\EntityPaginationNavigation; |
11 | 9 | use Oro\Bundle\EntityPaginationBundle\Storage\EntityPaginationStorage; |
12 | 10 |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | } |
83 | 83 | |
84 | 84 | /** |
85 | - * @param $entity |
|
85 | + * @param \stdClass $entity |
|
86 | 86 | * @param string $scope |
87 | 87 | * @return NavigationResult |
88 | 88 | */ |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | } |
93 | 93 | |
94 | 94 | /** |
95 | - * @param object $entity |
|
95 | + * @param \stdClass $entity |
|
96 | 96 | * @param string $scope |
97 | 97 | * @return NavigationResult |
98 | 98 | */ |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | } |
103 | 103 | |
104 | 104 | /** |
105 | - * @param object $entity |
|
105 | + * @param \stdClass $entity |
|
106 | 106 | * @param string $scope |
107 | 107 | * @return NavigationResult |
108 | 108 | */ |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | } |
113 | 113 | |
114 | 114 | /** |
115 | - * @param object $entity |
|
115 | + * @param \stdClass $entity |
|
116 | 116 | * @param string $scope |
117 | 117 | * @return NavigationResult |
118 | 118 | */ |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | |
160 | 160 | /** |
161 | 161 | * @param object $entity |
162 | - * @param $resultType |
|
162 | + * @param string $resultType |
|
163 | 163 | * @param string $scope |
164 | 164 | * @return bool |
165 | 165 | */ |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\EntityPaginationBundle\Navigation; |
4 | 4 | |
5 | 5 | use Doctrine\Common\Util\ClassUtils; |
6 | - |
|
7 | 6 | use Oro\Bundle\EntityBundle\ORM\DoctrineHelper; |
8 | 7 | use Oro\Bundle\EntityPaginationBundle\Manager\EntityPaginationManager; |
9 | 8 | use Oro\Bundle\EntityPaginationBundle\Storage\EntityPaginationStorage; |
@@ -3,9 +3,7 @@ |
||
3 | 3 | namespace Oro\Bundle\EntityPaginationBundle\Storage; |
4 | 4 | |
5 | 5 | use Symfony\Component\HttpFoundation\Request; |
6 | - |
|
7 | 6 | use Doctrine\Common\Util\ClassUtils; |
8 | - |
|
9 | 7 | use Oro\Bundle\EntityPaginationBundle\Manager\EntityPaginationManager; |
10 | 8 | use Oro\Bundle\EntityBundle\ORM\DoctrineHelper; |
11 | 9 |
@@ -47,7 +47,7 @@ |
||
47 | 47 | protected $paginationManager; |
48 | 48 | |
49 | 49 | /** |
50 | - * @param DataGridManager $dataGridManager |
|
50 | + * @param DatagridManager $dataGridManager |
|
51 | 51 | * @param DoctrineHelper $doctrineHelper |
52 | 52 | * @param AclHelper $aclHelper |
53 | 53 | * @param Pager $pager |
@@ -3,16 +3,13 @@ |
||
3 | 3 | namespace Oro\Bundle\EntityPaginationBundle\Storage; |
4 | 4 | |
5 | 5 | use Symfony\Component\HttpFoundation\Request; |
6 | - |
|
7 | 6 | use Oro\Bundle\DataGridBundle\Datasource\ResultRecord; |
8 | 7 | use Oro\Bundle\EntityPaginationBundle\Manager\EntityPaginationManager; |
9 | 8 | use Oro\Bundle\DataGridBundle\Datagrid\DatagridInterface; |
10 | 9 | use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource; |
11 | 10 | use Oro\Bundle\DataGridBundle\Extension\Pager\Orm\Pager; |
12 | -use Oro\Bundle\EntityPaginationBundle\Datagrid\EntityPaginationExtension; |
|
13 | 11 | use Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper; |
14 | 12 | use Oro\Bundle\EntityBundle\ORM\DoctrineHelper; |
15 | -use Oro\Bundle\DataGridBundle\Datagrid\Manager as DatagridManager; |
|
16 | 13 | |
17 | 14 | class StorageDataCollector |
18 | 15 | { |