Skip to content

Commit

Permalink
Merge pull request #16 from atoum/update-atoum-3
Browse files Browse the repository at this point in the history
Bump dependencies to support atoum 3.x
  • Loading branch information
jubianchi authored Feb 24, 2017
2 parents 510af21 + 49f2523 commit 8494d83
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 9 deletions.
18 changes: 13 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,31 @@ php:
- 5.5
- 5.6
- 7.0
- 7.1
- nightly

cache:
directories:
- vendor

matrix:
allow_failures:
- php: nightly
sudo: false

env:
matrix:
- COMPOSER_PREFER="--prefer-stable"
- COMPOSER_PREFER="--prefer-lowest"

sudo: false
matrix:
allow_failures:
- php: nightly
exclude:
- php: 7.0
env: COMPOSER_PREFER="--prefer-lowest"
- php: 7.1
env: COMPOSER_PREFER="--prefer-lowest"
- php: nightly
env: COMPOSER_PREFER="--prefer-lowest"

script:
- composer update $COMPOSER_PREFER
- ./vendor/bin/atoum --test-ext -p 'php -n -ddate.timezone=UTC'
- vendor/bin/atoum --test-ext
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 1.3.0 - 2017-02-24

* [#16](https://github.com/atoum/autoloop-extension/pull/16) Support atoum 3.x ([@jubianchi])

# 0.2.0 - 2017-02-16

* [#10](https://github.com/atoum/autoloop-extension/pull/10) The extension now self-registers on atoum (needs atoum >=2.9) ([@agallou])
Expand All @@ -21,3 +25,4 @@

[@vonglasow]: https://github.com/vonglasow
[@agallou]: https://github.com/agallou
[@jubianchi]: https://github.com/jubianchi
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"minimum-stability": "beta",
"require": {
"atoum/atoum": "^2.9.0",
"atoum/atoum": "^2.9 | ^3.0",
"henrikbjorn/lurker": "^1.1"
}
}
11 changes: 8 additions & 3 deletions configuration.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
<?php

if (defined('mageekguy\atoum\scripts\runner') === true && version_compare(constant('mageekguy\atoum\version'), '2.9.0-beta', '>=') === true) {
\mageekguy\atoum\scripts\runner::addConfigurationCallable(function($script, $runner) {
$runner->addExtension(new \mageekguy\atoum\autoloop\extension($script));
use mageekguy\atoum;
use mageekguy\atoum\scripts;

if (defined('mageekguy\atoum\scripts\runner') === true) {
scripts\runner::addConfigurationCallable(function(atoum\configurator $script, atoum\runner $runner) {
$extension = new atoum\autoloop\extension($script);

$extension->addToRunner($runner);
});
}

0 comments on commit 8494d83

Please sign in to comment.