Skip to content

Commit 4dbf451

Browse files
committed
Update test suite
1 parent be8f77a commit 4dbf451

5 files changed

Lines changed: 22 additions & 11 deletions

File tree

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.* export-ignore
2+
*.md export-ignore
3+
tests export-ignore
4+
docs export-ignore

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
/Tests/Functional/cache
33
/Tests/Functional/logs
44
composer.lock
5+
phpunit.xml
56
.php_cs.cache
7+
.phpunit.result.cache

.travis.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@ language: php
22
warnings_are_errors: false
33

44
php:
5-
- 5.6
6-
- 7.0
75
- 7.1
86
- 7.2
97
- 7.3
10-
- 7.4snapshot
8+
- 7.4
119
- nightly
1210

1311
env:
@@ -31,13 +29,13 @@ matrix:
3129
env: SYMFONY_VERSION="~3.2.0" SYMFONY_PHPUNIT_VERSION="5.7.27"
3230
- php: 5.6
3331
env: INSTALL_VICH_UPLOADER_BUNDLE=true SYMFONY_PHPUNIT_VERSION="5.7.27"
34-
- php: 7.2
35-
- php: 7.3
36-
env: SYMFONY_VERSION="^4.4@dev" SYMFONY_PHPUNIT_VERSION="7.4.4"
32+
- php: 7.0
33+
env: SYMFONY_PHPUNIT_VERSION="5.7.27"
34+
- php: 7.4
35+
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_PHPUNIT_VERSION="5.7.27"
3736
allow_failures:
38-
- php: 7.4snapshot
3937
- php: nightly
40-
- env: SYMFONY_VERSION="^4.4@dev" SYMFONY_PHPUNIT_VERSION="7.4.4"
38+
- env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_PHPUNIT_VERSION="5.7.27"
4139

4240
sudo: false
4341

@@ -46,7 +44,7 @@ cache:
4644
- $HOME/.composer/cache
4745

4846
before_script:
49-
- if [[ $TRAVIS_PHP_VERSION != hhvm && -f xdebug.ini ]]; then phpenv config-rm xdebug.ini; fi
47+
- if [ -f xdebug.ini ]; then phpenv config-rm xdebug.ini; fi
5048
- if [ "$GITHUB_OAUTH_TOKEN" != "" ]; then echo -e $GITHUB_OAUTH_TOKEN && composer config -g github-oauth.github.com $GITHUB_OAUTH_TOKEN; fi;
5149
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
5250
- if [ -n $INSTALL_VICH_UPLOADER_BUNDLE ]; then composer require "vich/uploader-bundle" --no-update; fi;

Tests/Functional/TestKernel.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,15 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
144144
*/
145145
public function getCacheDir()
146146
{
147-
return parent::getCacheDir().'/'.(int) $this->useVichUploaderBundle;
147+
return $this->getBaseDir().'cache';
148148
}
149149

150150
/**
151151
* {@inheritdoc}
152152
*/
153153
public function getLogDir()
154154
{
155-
return parent::getLogDir().'/'.(int) $this->useVichUploaderBundle;
155+
return $this->getBaseDir().'log';
156156
}
157157

158158
public function serialize()
@@ -164,4 +164,9 @@ public function unserialize($str)
164164
{
165165
$this->__construct(unserialize($str));
166166
}
167+
168+
private function getBaseDir()
169+
{
170+
return sys_get_temp_dir().'/hackzilla-ticket-bundle/var/'.(int) $this->useVichUploaderBundle.'/';
171+
}
167172
}

phpunit.xml.dist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
>
1313
<php>
1414
<env name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=1" />
15+
<env name="SYMFONY_PHPUNIT_REMOVE" value="symfony/yaml" />
16+
<env name="SYMFONY_PHPUNIT_VERSION" value="7.4.4" />
1517
</php>
1618
<testsuites>
1719
<testsuite name="HackzillaTicketBundle test suite">

0 commit comments

Comments
 (0)