Skip to content

Commit

Permalink
Merge branch '1.2'
Browse files Browse the repository at this point in the history
* 1.2:
  Apply coding standard fixes
  • Loading branch information
pamil committed May 31, 2018
2 parents 0107bce + 92568ab commit 8bcfe43
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
3 changes: 1 addition & 2 deletions src/Sylius/Behat/Context/Cli/InstallerContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
use Sylius\Bundle\CoreBundle\Command\InstallSampleDataCommand;
use Sylius\Bundle\CoreBundle\Command\SetupCommand;
use Symfony\Bundle\FrameworkBundle\Console\Application;
use Symfony\Component\Console\Helper\QuestionHelper;
use Symfony\Component\Console\Tester\CommandTester;
use Symfony\Component\HttpKernel\KernelInterface;
use Webmozart\Assert\Assert;
Expand All @@ -38,7 +37,7 @@ final class InstallerContext implements Context
* @var CommandTester
*/
private $tester;

/**
* @var SetupCommand
*/
Expand Down
1 change: 0 additions & 1 deletion src/Sylius/Behat/Page/Shop/Checkout/SelectShippingPage.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ public function getSelectedShippingMethodName(): ?string
return null;
}


/**
* {@inheritdoc}
*/
Expand Down

0 comments on commit 8bcfe43

Please sign in to comment.