Dropped php-test-helpers for uopz
Seems that uopz has superseded php-test-helpers. Updated the exit overloading and adjusted some tests based on the new behavior of not echoing out the argument passed to exit().
This commit is contained in:
parent
018ae0edc1
commit
260b532a66
3 changed files with 7 additions and 21 deletions
16
.travis.yml
16
.travis.yml
|
@ -22,20 +22,14 @@ services:
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- composer install
|
- composer install
|
||||||
- mkdir vendor/php-test-helpers
|
- pecl install uopz
|
||||||
- git clone https://github.com/php-test-helpers/php-test-helpers.git vendor/php-test-helpers
|
|
||||||
- cd vendor/php-test-helpers
|
|
||||||
- phpize
|
|
||||||
- ./configure --enable-test-helpers
|
|
||||||
- make
|
|
||||||
- sudo make install
|
|
||||||
- cd -
|
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
|
- echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
|
||||||
- echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
|
- echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
|
||||||
- echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
|
- echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
|
||||||
- echo "zend_extension = /home/travis/build/joshtronic/pickles/vendor/php-test-helpers/modules/test_helpers.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
|
- echo "zend_extension = uopz.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
|
||||||
|
- echo "uopz.overloads=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
|
||||||
- mysql test < tests/schema.sql
|
- mysql test < tests/schema.sql
|
||||||
- mkdir -p build/logs
|
- mkdir -p build/logs
|
||||||
|
|
||||||
|
|
|
@ -1,14 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
set_exit_overload(function($status = false)
|
uopz_overload(ZEND_EXIT, function(){});
|
||||||
{
|
|
||||||
if ($status)
|
|
||||||
{
|
|
||||||
echo $status;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
});
|
|
||||||
|
|
||||||
ob_start();
|
ob_start();
|
||||||
@session_start();
|
@session_start();
|
||||||
|
|
|
@ -29,7 +29,7 @@ class ModuleTest extends PHPUnit_Framework_TestCase
|
||||||
|
|
||||||
public function testAutoRunParentError()
|
public function testAutoRunParentError()
|
||||||
{
|
{
|
||||||
$this->expectOutputString('Errors encountered, this is a @todo for form validation when calling modules from inside of modules');
|
$this->expectOutputString('');
|
||||||
$model = new MockChildModule(true);
|
$model = new MockChildModule(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue