@@ -3,18 +3,13 @@ |
||
3 | 3 | namespace Oro\Bundle\ConfigBundle\Controller\Api\Rest; |
4 | 4 | |
5 | 5 | use Symfony\Component\HttpFoundation\Response; |
6 | - |
|
7 | 6 | use FOS\RestBundle\Util\Codes; |
8 | 7 | use FOS\RestBundle\Controller\FOSRestController; |
9 | - |
|
10 | 8 | use FOS\RestBundle\Controller\Annotations\Get; |
11 | 9 | use FOS\RestBundle\Controller\Annotations\NamePrefix; |
12 | 10 | use FOS\RestBundle\Controller\Annotations\RouteResource; |
13 | - |
|
14 | 11 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
15 | - |
|
16 | 12 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
17 | - |
|
18 | 13 | use Oro\Bundle\ConfigBundle\Exception\ItemNotFoundException; |
19 | 14 | |
20 | 15 | /** |
@@ -3,10 +3,8 @@ |
||
3 | 3 | namespace Oro\Bundle\ConfigBundle\Controller; |
4 | 4 | |
5 | 5 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
6 | - |
|
7 | 6 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
8 | 7 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
9 | - |
|
10 | 8 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
11 | 9 | |
12 | 10 | class ConfigurationController extends Controller |
@@ -119,7 +119,7 @@ |
||
119 | 119 | } |
120 | 120 | |
121 | 121 | /** |
122 | - * @param $values |
|
122 | + * @param ArrayCollection $values |
|
123 | 123 | * |
124 | 124 | * @return $this |
125 | 125 | */ |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | /** |
136 | 136 | * Get config |
137 | 137 | * |
138 | - * @return string |
|
138 | + * @return Config[] |
|
139 | 139 | */ |
140 | 140 | public function getConfig() |
141 | 141 | { |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | } |
169 | 169 | |
170 | 170 | /** |
171 | - * @return mixed |
|
171 | + * @return string|null |
|
172 | 172 | */ |
173 | 173 | public function getValue() |
174 | 174 | { |
@@ -246,8 +246,9 @@ discard block |
||
246 | 246 | |
247 | 247 | /** |
248 | 248 | * @param \DateTime |
249 | + * @param \DateTime $updatedAt |
|
249 | 250 | * |
250 | - * @return Config |
|
251 | + * @return ConfigValue |
|
251 | 252 | */ |
252 | 253 | public function setUpdatedAt($updatedAt) |
253 | 254 | { |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Symfony\Component\Form\FormBuilderInterface; |
6 | 6 | use Symfony\Component\Form\FormFactoryInterface; |
7 | - |
|
8 | 7 | use Oro\Bundle\ConfigBundle\Utils\TreeUtils; |
9 | 8 | use Oro\Bundle\ConfigBundle\Config\ConfigBag; |
10 | 9 | use Oro\Bundle\ConfigBundle\Config\ConfigManager; |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | const URL = '/config/system/platform/language_settings'; |
15 | 15 | |
16 | 16 | /** |
17 | - * @param $language string |
|
17 | + * @param string $language string |
|
18 | 18 | * @return $this |
19 | 19 | */ |
20 | 20 | public function download($language) |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | } |
34 | 34 | |
35 | 35 | /** |
36 | - * @param $language string |
|
36 | + * @param string $language string |
|
37 | 37 | * @return $this |
38 | 38 | */ |
39 | 39 | public function enable($language) |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | } |
53 | 53 | |
54 | 54 | /** |
55 | - * @param $language string |
|
55 | + * @param string $language string |
|
56 | 56 | * @return $this |
57 | 57 | */ |
58 | 58 | public function disable($language) |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\ConfigBundle\Tests\Unit\DependencyInjection\Compiler; |
4 | 4 | |
5 | 5 | use Oro\Bundle\ConfigBundle\DependencyInjection\Compiler\ListenerExcludeConfigConnectionPass; |
6 | - |
|
7 | 6 | use Symfony\Component\DependencyInjection\ContainerBuilder; |
8 | 7 | |
9 | 8 | class ListenerExcludeConfigConnectionPassTest extends \PHPUnit_Framework_TestCase |
@@ -85,6 +85,9 @@ |
||
85 | 85 | $this->assertInstanceOf('Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition', $list['value']); |
86 | 86 | } |
87 | 87 | |
88 | + /** |
|
89 | + * @param string $field |
|
90 | + */ |
|
88 | 91 | protected function getField($object, $field) |
89 | 92 | { |
90 | 93 | $reflection = new \ReflectionProperty($object, $field); |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityManager; |
6 | 6 | use Doctrine\ORM\Mapping\ClassMetadata; |
7 | - |
|
8 | 7 | use Oro\Bundle\ConfigBundle\Entity\Repository\ConfigValueRepository; |
9 | 8 | |
10 | 9 | class ConfigValueRepositoryTest extends \PHPUnit_Framework_TestCase |