Skip to content

Commit 4036cf1

Browse files
hackzillahackzilla
authored
Merge pull request #121 from phansys/phpunit
[Tests] Some improvements for test suite
2 parents 853bf55 + 5fa5860 commit 4036cf1

23 files changed

+187
-81
lines changed

‎.php_cs‎

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,41 @@
11
<?php
22

3-
require_once __DIR__.'/vendor/sllh/php-cs-fixer-styleci-bridge/autoload.php';
3+
// Use PHP-CS-Fixer 2+ if it is available
4+
if (\class_exists(PhpCsFixer\Config::class, false)) {
5+
return PhpCsFixer\Config::create()
6+
->setUsingCache(true)
7+
->setRiskyAllowed(true)
8+
->setRules([
9+
'@Symfony' => true,
10+
'array_syntax' => ['syntax' => 'short'],
11+
'binary_operator_spaces' => [
12+
'align_double_arrow' => true,
13+
'align_equals' => true,
14+
],
15+
'blank_line_after_opening_tag' => true,
16+
'ordered_imports' => true,
17+
'php_unit_construct' => true,
18+
])
19+
->setFinder(
20+
PhpCsFixer\Finder::create()->exclude(['Tests/Functional/cache'])->in(__DIR__)
21+
)
22+
;
23+
}
424

5-
use SLLH\StyleCIBridge\ConfigBridge;
6-
7-
return ConfigBridge::create()
8-
->setUsingCache(true) // Enable the cache
25+
return Symfony\CS\Config\Config::create()
26+
->setUsingCache(true)
27+
->fixers([
28+
'align_double_arrow',
29+
'newline_after_open_tag',
30+
'ordered_use',
31+
'php_unit_construct',
32+
'short_array_syntax',
33+
'-unalign_double_arrow',
34+
'-unalign_equals',
35+
])
36+
->finder(
37+
Symfony\CS\Finder\DefaultFinder::create()
38+
->exclude(['Tests/Functional/cache'])
39+
->in(__DIR__)
40+
)
941
;

‎.travis.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,21 @@ matrix:
2020
- php: 5.6
2121
env: COMPOSER_FLAGS="--prefer-lowest"
2222
- php: 5.6
23-
env: SYMFONY_VERSION=2.8.*
23+
env: SYMFONY_VERSION="~2.8.0"
2424
- php: 5.6
25-
env: SYMFONY_VERSION=3.0.*
25+
env: SYMFONY_VERSION="~3.0.0"
2626
- php: 5.6
27-
env: SYMFONY_VERSION="3.1.*"
27+
env: SYMFONY_VERSION="~3.1.0"
2828
- php: 5.6
29-
env: SYMFONY_VERSION="3.2.*@dev"
29+
env: SYMFONY_VERSION="~3.2.0"
3030
- php: 5.6
3131
env: INSTALL_VICH_UPLOADER_BUNDLE=true
32+
- php: 7.2
33+
env: SYMFONY_VERSION="^4.1@dev"
3234
allow_failures:
3335
- php: nightly
3436
- php: hhvm
35-
- env: SYMFONY_VERSION="3.2.*@dev"
37+
- env: SYMFONY_VERSION="^4.1@dev"
3638

3739
sudo: false
3840

‎Command/AutoClosingCommand.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ protected function configure()
3939
*/
4040
protected function execute(InputInterface $input, OutputInterface $output)
4141
{
42-
$ticket_manager = $this->getContainer()->get('hackzilla_ticket.ticket_manager');
43-
$userManager = $this->getContainer()->get('fos_user.user_manager');
42+
$ticket_manager = $this->getContainer()->get('hackzilla_ticket.ticket_manager');
43+
$userManager = $this->getContainer()->get('fos_user.user_manager');
4444
$ticketRepository = $this->getContainer()->get('doctrine')->getRepository('HackzillaTicketBundle:Ticket');
4545

46-
$locale = $this->getContainer()->getParameter('locale') ? $this->getContainer()->getParameter('locale') : 'en';
46+
$locale = $this->getContainer()->getParameter('locale') ? $this->getContainer()->getParameter('locale') : 'en';
4747
$translator = $this->getContainer()->get('translator');
4848
$translator->setLocale($locale);
4949

‎Controller/TicketController.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ class TicketController extends Controller
2727
*/
2828
public function indexAction(Request $request)
2929
{
30-
$userManager = $this->getUserManager();
30+
$userManager = $this->getUserManager();
3131
$ticketManager = $this->get('hackzilla_ticket.ticket_manager');
3232

33-
$ticketState = $request->get('state', $this->get('translator')->trans('STATUS_OPEN'));
33+
$ticketState = $request->get('state', $this->get('translator')->trans('STATUS_OPEN'));
3434
$ticketPriority = $request->get('priority', null);
3535

3636
$query = $ticketManager->getTicketList(
@@ -67,7 +67,7 @@ public function createAction(Request $request)
6767
$ticketManager = $this->get('hackzilla_ticket.ticket_manager');
6868

6969
$ticket = $ticketManager->createTicket();
70-
$form = $this->createForm(TicketType::class, $ticket);
70+
$form = $this->createForm(TicketType::class, $ticket);
7171
$form->handleRequest($request);
7272

7373
if ($form->isValid()) {
@@ -96,7 +96,7 @@ public function createAction(Request $request)
9696
public function newAction()
9797
{
9898
$ticketManager = $this->get('hackzilla_ticket.ticket_manager');
99-
$entity = $ticketManager->createTicket();
99+
$entity = $ticketManager->createTicket();
100100

101101
$form = $this->createForm(TicketType::class, $entity);
102102

@@ -119,7 +119,7 @@ public function newAction()
119119
public function showAction($ticketId)
120120
{
121121
$ticketManager = $this->get('hackzilla_ticket.ticket_manager');
122-
$ticket = $ticketManager->getTicketById($ticketId);
122+
$ticket = $ticketManager->getTicketById($ticketId);
123123

124124
if (!$ticket) {
125125
return $this->redirect($this->generateUrl('hackzilla_ticket'));
@@ -154,7 +154,7 @@ public function showAction($ticketId)
154154
public function replyAction(Request $request, $ticketId)
155155
{
156156
$ticketManager = $this->get('hackzilla_ticket.ticket_manager');
157-
$ticket = $ticketManager->getTicketById($ticketId);
157+
$ticket = $ticketManager->getTicketById($ticketId);
158158

159159
if (!$ticket) {
160160
throw $this->createNotFoundException($this->get('translator')->trans('ERROR_FIND_TICKET_ENTITY'));
@@ -196,7 +196,7 @@ public function replyAction(Request $request, $ticketId)
196196
public function deleteAction(Request $request, $ticketId)
197197
{
198198
$userManager = $this->getUserManager();
199-
$user = $userManager->getCurrentUser();
199+
$user = $userManager->getCurrentUser();
200200

201201
if (!\is_object($user) || !$userManager->hasRole($user, TicketRole::ADMIN)) {
202202
throw new \Symfony\Component\HttpKernel\Exception\HttpException(403);
@@ -209,7 +209,7 @@ public function deleteAction(Request $request, $ticketId)
209209

210210
if ($form->isValid()) {
211211
$ticketManager = $this->get('hackzilla_ticket.ticket_manager');
212-
$ticket = $ticketManager->getTicketById($ticketId);
212+
$ticket = $ticketManager->getTicketById($ticketId);
213213

214214
if (!$ticket) {
215215
throw $this->createNotFoundException($this->get('translator')->trans('ERROR_FIND_TICKET_ENTITY'));

‎DependencyInjection/Compiler/DoctrineOrmMappingsPass.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,25 @@ public function __construct($driver = null, array $namespaces = [], $managerPara
1616
public function process(ContainerBuilder $container)
1717
{
1818
$bundleDirectory = HackzillaTicketExtension::bundleDirectory();
19-
$namespaces = [];
19+
$namespaces = [];
2020

2121
if (
22-
$container->getParameter('hackzilla_ticket.model.ticket.class') === 'Hackzilla\Bundle\TicketBundle\Entity\TicketWithAttachment'
22+
'Hackzilla\Bundle\TicketBundle\Entity\TicketWithAttachment' === $container->getParameter('hackzilla_ticket.model.ticket.class')
2323
||
24-
$container->getParameter('hackzilla_ticket.model.message.class') === 'Hackzilla\Bundle\TicketBundle\Entity\TicketMessageWithAttachment'
24+
'Hackzilla\Bundle\TicketBundle\Entity\TicketMessageWithAttachment' === $container->getParameter('hackzilla_ticket.model.message.class')
2525
) {
2626
$namespaces[realpath($bundleDirectory.'/Resources/config/doctrine/model/attachment')] = 'Hackzilla\Bundle\TicketBundle\Entity';
2727
} elseif (
28-
$container->getParameter('hackzilla_ticket.model.ticket.class') === 'Hackzilla\Bundle\TicketBundle\Entity\Ticket'
28+
'Hackzilla\Bundle\TicketBundle\Entity\Ticket' === $container->getParameter('hackzilla_ticket.model.ticket.class')
2929
||
30-
$container->getParameter('hackzilla_ticket.model.message.class') === 'Hackzilla\Bundle\TicketBundle\Entity\TicketMessage'
30+
'Hackzilla\Bundle\TicketBundle\Entity\TicketMessage' === $container->getParameter('hackzilla_ticket.model.message.class')
3131
) {
3232
$namespaces[realpath($bundleDirectory.'/Resources/config/doctrine/model/plain')] = 'Hackzilla\Bundle\TicketBundle\Entity';
3333
}
3434

35-
$arguments = [$namespaces, '.orm.xml'];
36-
$locator = new Definition('Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator', $arguments);
37-
$this->driver = new Definition('Doctrine\ORM\Mapping\Driver\XmlDriver', [$locator]);
35+
$arguments = [$namespaces, '.orm.xml'];
36+
$locator = new Definition('Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator', $arguments);
37+
$this->driver = new Definition('Doctrine\ORM\Mapping\Driver\XmlDriver', [$locator]);
3838
$this->namespaces = $namespaces;
3939

4040
parent::process($container);

‎DependencyInjection/HackzillaTicketExtension.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class HackzillaTicketExtension extends Extension
2020
public function load(array $configs, ContainerBuilder $container)
2121
{
2222
$configuration = new Configuration();
23-
$config = $this->processConfiguration($configuration, $configs);
23+
$config = $this->processConfiguration($configuration, $configs);
2424

2525
$loader = new Loader\YamlFileLoader($container, new FileLocator(self::bundleDirectory().'/Resources/config'));
2626
$loader->load('services.yml');

‎Entity/Traits/TicketMessageTrait.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ trait TicketMessageTrait
1818
* @var int
1919
*/
2020
protected $user;
21+
2122
protected $userObject;
2223

2324
/**
@@ -170,10 +171,10 @@ public function setUser($user)
170171
{
171172
if (\is_object($user)) {
172173
$this->userObject = $user;
173-
$this->user = $user->getId();
174+
$this->user = $user->getId();
174175
} else {
175176
$this->userObject = null;
176-
$this->user = $user;
177+
$this->user = $user;
177178
}
178179

179180
return $this;

‎Entity/Traits/TicketTrait.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ trait TicketTrait
1616
* @var int
1717
*/
1818
protected $userCreated;
19+
1920
protected $userCreatedObject;
2021

2122
/**
2223
* @var int
2324
*/
2425
protected $lastUser;
26+
2527
protected $lastUserObject;
2628

2729
/**
@@ -46,7 +48,6 @@ trait TicketTrait
4648
*/
4749
protected $priority;
4850

49-
5051
/**
5152
* @Assert\Count(min = "1")
5253
* @Assert\Valid()
@@ -189,10 +190,10 @@ public function setUserCreated($userCreated)
189190
{
190191
if (\is_object($userCreated)) {
191192
$this->userCreatedObject = $userCreated;
192-
$this->userCreated = $userCreated->getId();
193+
$this->userCreated = $userCreated->getId();
193194
} else {
194195
$this->userCreatedObject = null;
195-
$this->userCreated = $userCreated;
196+
$this->userCreated = $userCreated;
196197
}
197198

198199
return $this;
@@ -229,10 +230,10 @@ public function setLastUser($lastUser)
229230
{
230231
if (\is_object($lastUser)) {
231232
$this->lastUserObject = $lastUser;
232-
$this->lastUser = $lastUser->getId();
233+
$this->lastUser = $lastUser->getId();
233234
} else {
234235
$this->lastUserObject = null;
235-
$this->lastUser = $lastUser;
236+
$this->lastUser = $lastUser;
236237
}
237238

238239
return $this;

‎Form/DataTransformer/StatusTransformer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class StatusTransformer implements DataTransformerInterface
1616
*/
1717
public function transform($number)
1818
{
19-
if ($number == TicketMessage::STATUS_CLOSED) {
19+
if (TicketMessage::STATUS_CLOSED == $number) {
2020
return 1;
2121
}
2222

@@ -32,7 +32,7 @@ public function transform($number)
3232
*/
3333
public function reverseTransform($number)
3434
{
35-
if ($number == 1) {
35+
if (1 == $number) {
3636
return TicketMessage::STATUS_CLOSED;
3737
}
3838

‎Form/Type/TicketMessageType.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@
1616
class TicketMessageType extends AbstractType
1717
{
1818
protected $userManager;
19+
1920
protected $features;
21+
2022
protected $messageClass;
2123

2224
public function __construct(UserManagerInterface $userManager, TicketFeatures $features, $messageClass)
2325
{
24-
$this->userManager = $userManager;
25-
$this->features = $features;
26+
$this->userManager = $userManager;
27+
$this->features = $features;
2628
$this->messageClass = $messageClass;
2729
}
2830

0 commit comments

Comments
 (0)