Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

Commit b5f477e

Browse files
committed
[test] Use environment variables instead constants
1 parent c1b95e3 commit b5f477e

File tree

5 files changed

+17
-52
lines changed

5 files changed

+17
-52
lines changed

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@
66
.travis.yml export-ignore
77
.php_cs export-ignore
88
phpunit.xml.dist export-ignore
9-
phpunit.xml.travis export-ignore

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ install:
2727
- travis_retry composer install --no-interaction --ignore-platform-reqs
2828

2929
script:
30-
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/phpunit -c phpunit.xml.travis --coverage-clover clover.xml ; fi
31-
- if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then ./vendor/bin/phpunit -c phpunit.xml.travis ; fi
30+
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; fi
31+
- if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then ./vendor/bin/phpunit ; fi
3232
- if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/php-cs-fixer fix -v --diff --dry-run ; fi
3333

3434
after_script:

phpunit.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
functionality works as expected. Such tests include those for
2929
Zend\Soap and Zend\Session, which require that headers not be sent
3030
in order to work. -->
31-
<const name="TESTS_ZEND_OB_ENABLED" value="false" />
31+
<env name="TESTS_ZEND_OB_ENABLED" value="false" />
3232

3333
</php>
3434
</phpunit>

phpunit.xml.travis

Lines changed: 0 additions & 34 deletions
This file was deleted.
Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
<?php
2-
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
5-
* @link http://github.com/zendframework/zf2 for the canonical source repository
6-
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
7-
* @license http://framework.zend.com/license/new-bsd New BSD License
8-
*/
9-
10-
namespace ZendTest\Mvc\Controller\TestAsset;
11-
12-
interface SampleInterface
13-
{
14-
}
1+
<?php
2+
/**
3+
* Zend Framework (http://framework.zend.com/)
4+
*
5+
* @link http://github.com/zendframework/zf2 for the canonical source repository
6+
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
7+
* @license http://framework.zend.com/license/new-bsd New BSD License
8+
*/
9+
10+
namespace ZendTest\Mvc\Controller\TestAsset;
11+
12+
interface SampleInterface
13+
{
14+
}

0 commit comments

Comments
 (0)