@@ -14,8 +14,8 @@ |
||
| 14 | 14 | use Doctrine\ORM\AbstractQuery; |
| 15 | 15 | use Doctrine\ORM\EntityManager; |
| 16 | 16 | use Doctrine\ORM\Mapping\ClassMetadata; |
| 17 | -use Doctrine\ORM\Query\Expr; |
|
| 18 | 17 | use Doctrine\ORM\QueryBuilder; |
| 18 | +use Doctrine\ORM\Query\Expr; |
|
| 19 | 19 | use PhpSpec\ObjectBehavior; |
| 20 | 20 | use Prophecy\Argument; |
| 21 | 21 | use Sylius\Component\Rbac\Model\RoleInterface; |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | * |
| 49 | 49 | * @param string $permissionCode |
| 50 | 50 | * |
| 51 | - * @return string |
|
| 51 | + * @return boolean |
|
| 52 | 52 | */ |
| 53 | 53 | public function isGranted($permissionCode) |
| 54 | 54 | { |
@@ -101,7 +101,7 @@ |
||
| 101 | 101 | * @param string $interval |
| 102 | 102 | * @param string $periodFormat |
| 103 | 103 | * @param string $presentationFormat |
| 104 | - * @param array $groupBy |
|
| 104 | + * @param string[] $groupBy |
|
| 105 | 105 | */ |
| 106 | 106 | private function setExtraConfiguration( |
| 107 | 107 | array &$configuration, |
@@ -102,7 +102,7 @@ |
||
| 102 | 102 | * @param string $label |
| 103 | 103 | * @param string $collectionSelector |
| 104 | 104 | * |
| 105 | - * @return NodeElement|null |
|
| 105 | + * @return NodeElement |
|
| 106 | 106 | */ |
| 107 | 107 | protected function isInvalidCollectionField($position, $label, $collectionSelector = null) |
| 108 | 108 | { |
@@ -11,11 +11,11 @@ |
||
| 11 | 11 | |
| 12 | 12 | namespace Sylius\Bundle\ResourceBundle\Behat; |
| 13 | 13 | |
| 14 | +use Behat\MinkExtension\Context\RawMinkContext; |
|
| 14 | 15 | use Behat\Mink\Element\Element; |
| 15 | 16 | use Behat\Mink\Element\NodeElement; |
| 16 | 17 | use Behat\Mink\Exception\ElementNotFoundException; |
| 17 | 18 | use Behat\Mink\Selector\Xpath\Escaper; |
| 18 | -use Behat\MinkExtension\Context\RawMinkContext; |
|
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | 21 | * @author Arnaud Langlade <[email protected]> |
@@ -46,6 +46,8 @@ discard block |
||
| 46 | 46 | /** |
| 47 | 47 | * @Given /^I am on the page of ([^""]*) with ([^""]*) "([^""]*)"$/ |
| 48 | 48 | * @Given /^I go to the page of ([^""]*) with ([^""]*) "([^""]*)"$/ |
| 49 | + * @param string $type |
|
| 50 | + * @param string $property |
|
| 49 | 51 | */ |
| 50 | 52 | public function iAmOnTheResourcePage($type, $property, $value) |
| 51 | 53 | { |
@@ -82,6 +84,8 @@ discard block |
||
| 82 | 84 | /** |
| 83 | 85 | * @Then /^I should be on the page of ([^""]*) with ([^""]*) "([^""]*)"$/ |
| 84 | 86 | * @Then /^I should still be on the page of ([^""]*) with ([^""]*) "([^""]*)"$/ |
| 87 | + * @param string $type |
|
| 88 | + * @param string $property |
|
| 85 | 89 | */ |
| 86 | 90 | public function iShouldBeOnTheResourcePage($type, $property, $value) |
| 87 | 91 | { |
@@ -125,6 +129,7 @@ discard block |
||
| 125 | 129 | |
| 126 | 130 | /** |
| 127 | 131 | * @Given /^I am (building|viewing|editing) ([^""]*) with ([^""]*) "([^""]*)"$/ |
| 132 | + * @param string $property |
|
| 128 | 133 | */ |
| 129 | 134 | public function iAmDoingSomethingWithResource($action, $type, $property, $value) |
| 130 | 135 | { |
@@ -167,6 +172,9 @@ discard block |
||
| 167 | 172 | |
| 168 | 173 | /** |
| 169 | 174 | * @Then /^I should be (building|viewing|editing) ([^"]*) with ([^"]*) "([^""]*)"$/ |
| 175 | + * @param string $action |
|
| 176 | + * @param string $type |
|
| 177 | + * @param string $property |
|
| 170 | 178 | */ |
| 171 | 179 | public function iShouldBeDoingSomethingWithResource($action, $type, $property, $value) |
| 172 | 180 | { |
@@ -221,6 +229,7 @@ discard block |
||
| 221 | 229 | |
| 222 | 230 | /** |
| 223 | 231 | * @When /^I click "([^"]+)"$/ |
| 232 | + * @param string $link |
|
| 224 | 233 | */ |
| 225 | 234 | public function iClick($link) |
| 226 | 235 | { |
@@ -470,6 +479,7 @@ discard block |
||
| 470 | 479 | |
| 471 | 480 | /** |
| 472 | 481 | * @Given /^I wait (\d+) (seconds|second)$/ |
| 482 | + * @param integer $time |
|
| 473 | 483 | */ |
| 474 | 484 | public function iWait($time) |
| 475 | 485 | { |
@@ -540,6 +550,8 @@ discard block |
||
| 540 | 550 | |
| 541 | 551 | /** |
| 542 | 552 | * @Then /^I should see ([\w\s]+) "([^""]*)" as available choice$/ |
| 553 | + * @param string $fieldName |
|
| 554 | + * @param string $fieldOption |
|
| 543 | 555 | */ |
| 544 | 556 | public function iShouldSeeSelectWithOption($fieldName, $fieldOption) |
| 545 | 557 | { |
@@ -625,6 +637,8 @@ discard block |
||
| 625 | 637 | |
| 626 | 638 | /** |
| 627 | 639 | * @Then /^I should see select "([^"]*)" with "([^"]*)" option selected$/ |
| 640 | + * @param string $fieldName |
|
| 641 | + * @param string $fieldOption |
|
| 628 | 642 | */ |
| 629 | 643 | public function iShouldSeeSelectWithOptionSelected($fieldName, $fieldOption) |
| 630 | 644 | { |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | return; |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | - if('product option' === $type) { |
|
| 152 | + if ('product option' === $type) { |
|
| 153 | 153 | $this->iAmDoingSomethingWithResource($action, $type, 'code', $name); |
| 154 | 154 | |
| 155 | 155 | return; |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | { |
| 328 | 328 | $tableNode = new TableNode([ |
| 329 | 329 | [trim($columnName)], |
| 330 | - [trim('%'.$value.'%')], |
|
| 330 | + [trim('%' . $value . '%')], |
|
| 331 | 331 | ]); |
| 332 | 332 | |
| 333 | 333 | $this->iShouldSeeTheFollowingRow($tableNode); |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | { |
| 343 | 343 | $tableNode = new TableNode([ |
| 344 | 344 | [trim($columnName)], |
| 345 | - [trim('%'.$value.'%')], |
|
| 345 | + [trim('%' . $value . '%')], |
|
| 346 | 346 | ]); |
| 347 | 347 | |
| 348 | 348 | $this->iShouldNotSeeTheFollowingRow($tableNode); |
@@ -441,7 +441,7 @@ discard block |
||
| 441 | 441 | $this->waitForModalToAppear($attributesModalContainer); |
| 442 | 442 | |
| 443 | 443 | foreach ($attributes as $attribute) { |
| 444 | - $this->getSession()->getPage()->checkField($attribute.' attribute'); |
|
| 444 | + $this->getSession()->getPage()->checkField($attribute . ' attribute'); |
|
| 445 | 445 | } |
| 446 | 446 | |
| 447 | 447 | $addAttributesButton->press(); |
@@ -461,7 +461,7 @@ discard block |
||
| 461 | 461 | $this->assertSession()->elementExists('css', '#attribute-types-modal'); |
| 462 | 462 | |
| 463 | 463 | $attributeTypesModalContainer = $this->getSession()->getPage()->find('css', '#attribute-types-modal'); |
| 464 | - $typeButton = $attributeTypesModalContainer->find('css', 'a#'.$type); |
|
| 464 | + $typeButton = $attributeTypesModalContainer->find('css', 'a#' . $type); |
|
| 465 | 465 | |
| 466 | 466 | $this->waitForModalToAppear($attributeTypesModalContainer); |
| 467 | 467 | |
@@ -80,6 +80,7 @@ |
||
| 80 | 80 | |
| 81 | 81 | /** |
| 82 | 82 | * {@inheritdoc} |
| 83 | + * @param string|null $url |
|
| 83 | 84 | */ |
| 84 | 85 | public function redirect(RequestConfiguration $configuration, $url, $status = 302) |
| 85 | 86 | { |
@@ -85,11 +85,11 @@ |
||
| 85 | 85 | { |
| 86 | 86 | if ($configuration->isHeaderRedirection()) { |
| 87 | 87 | return new Response('', 200, [ |
| 88 | - 'X-SYLIUS-LOCATION' => $url.$configuration->getRedirectHash(), |
|
| 88 | + 'X-SYLIUS-LOCATION' => $url . $configuration->getRedirectHash(), |
|
| 89 | 89 | ]); |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | - return new RedirectResponse($url.$configuration->getRedirectHash(), $status); |
|
| 92 | + return new RedirectResponse($url . $configuration->getRedirectHash(), $status); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | /** |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | /** |
| 95 | 95 | * @param $name |
| 96 | 96 | * |
| 97 | - * @return null|string |
|
| 97 | + * @return string |
|
| 98 | 98 | */ |
| 99 | 99 | public function getDefaultTemplate($name) |
| 100 | 100 | { |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | } |
| 227 | 227 | |
| 228 | 228 | /** |
| 229 | - * @param object|null $resource |
|
| 229 | + * @param \Sylius\Component\Resource\Model\ResourceInterface|null $resource |
|
| 230 | 230 | * |
| 231 | 231 | * @return array |
| 232 | 232 | */ |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | } |
| 346 | 346 | |
| 347 | 347 | /** |
| 348 | - * @param $parameter |
|
| 348 | + * @param string $parameter |
|
| 349 | 349 | * @param array $defaults |
| 350 | 350 | * |
| 351 | 351 | * @return array |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | } |
| 406 | 406 | |
| 407 | 407 | /** |
| 408 | - * @return array |
|
| 408 | + * @return callable |
|
| 409 | 409 | */ |
| 410 | 410 | public function getFactoryArguments() |
| 411 | 411 | { |
@@ -449,7 +449,7 @@ discard block |
||
| 449 | 449 | } |
| 450 | 450 | |
| 451 | 451 | /** |
| 452 | - * @return mixed|null |
|
| 452 | + * @return string |
|
| 453 | 453 | */ |
| 454 | 454 | public function getSerializationVersion() |
| 455 | 455 | { |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | */ |
| 159 | 159 | public function getRouteName($name) |
| 160 | 160 | { |
| 161 | - $sectionPrefix = $this->getSection() ? $this->getSection().'_' : ''; |
|
| 161 | + $sectionPrefix = $this->getSection() ? $this->getSection() . '_' : ''; |
|
| 162 | 162 | |
| 163 | 163 | return sprintf('%s_%s%s_%s', $this->metadata->getApplicationName(), $sectionPrefix, $this->metadata->getName(), $name); |
| 164 | 164 | } |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | return null; |
| 201 | 201 | } |
| 202 | 202 | |
| 203 | - return '#'.$redirect['hash']; |
|
| 203 | + return '#' . $redirect['hash']; |
|
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | /** |
@@ -433,7 +433,7 @@ |
||
| 433 | 433 | |
| 434 | 434 | /** |
| 435 | 435 | * @param Request $request |
| 436 | - * @param $enabled |
|
| 436 | + * @param boolean $enabled |
|
| 437 | 437 | * |
| 438 | 438 | * @return RedirectResponse |
| 439 | 439 | */ |
@@ -13,14 +13,12 @@ |
||
| 13 | 13 | |
| 14 | 14 | use Sylius\Bundle\ResourceBundle\DependencyInjection\Driver\DriverProvider; |
| 15 | 15 | use Sylius\Component\Resource\Metadata\Metadata; |
| 16 | -use Symfony\Component\Config\Definition\Processor; |
|
| 17 | 16 | use Symfony\Component\Config\FileLocator; |
| 17 | +use Symfony\Component\Config\Loader\LoaderInterface; |
|
| 18 | 18 | use Symfony\Component\DependencyInjection\ContainerBuilder; |
| 19 | +use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; |
|
| 19 | 20 | use Symfony\Component\DependencyInjection\Extension\Extension; |
| 20 | -use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface; |
|
| 21 | 21 | use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; |
| 22 | -use Symfony\Component\Config\Loader\LoaderInterface; |
|
| 23 | -use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; |
|
| 24 | 22 | |
| 25 | 23 | /** |
| 26 | 24 | * @author Paweł Jędrzejewski <[email protected]> |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | public function load(array $config, ContainerBuilder $container) |
| 35 | 35 | { |
| 36 | 36 | $config = $this->processConfiguration($this->getConfiguration($config, $container), $config); |
| 37 | - $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); |
|
| 37 | + $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config')); |
|
| 38 | 38 | |
| 39 | 39 | $configFiles = [ |
| 40 | 40 | 'services.xml', |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | DriverProvider::get($metadata)->load($container, $metadata); |
| 98 | 98 | |
| 99 | 99 | if ($metadata->hasParameter('translation')) { |
| 100 | - $alias = $alias.'_translation'; |
|
| 100 | + $alias = $alias . '_translation'; |
|
| 101 | 101 | $resourceConfig = array_merge(['driver' => $resourceConfig['driver']], $resourceConfig['translation']); |
| 102 | 102 | |
| 103 | 103 | $resources = $container->hasParameter('sylius.resources') ? $container->getParameter('sylius.resources') : []; |