Skip to content

Commit 8494d83

Browse files
authored
Merge pull request #16 from atoum/update-atoum-3
Bump dependencies to support atoum 3.x
2 parents 510af21 + 49f2523 commit 8494d83

File tree

4 files changed

+27
-9
lines changed

4 files changed

+27
-9
lines changed

.travis.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,31 @@ php:
66
- 5.5
77
- 5.6
88
- 7.0
9+
- 7.1
910
- nightly
1011

1112
cache:
1213
directories:
1314
- vendor
1415

15-
matrix:
16-
allow_failures:
17-
- php: nightly
16+
sudo: false
1817

1918
env:
2019
matrix:
2120
- COMPOSER_PREFER="--prefer-stable"
2221
- COMPOSER_PREFER="--prefer-lowest"
2322

24-
sudo: false
23+
matrix:
24+
allow_failures:
25+
- php: nightly
26+
exclude:
27+
- php: 7.0
28+
env: COMPOSER_PREFER="--prefer-lowest"
29+
- php: 7.1
30+
env: COMPOSER_PREFER="--prefer-lowest"
31+
- php: nightly
32+
env: COMPOSER_PREFER="--prefer-lowest"
2533

2634
script:
2735
- composer update $COMPOSER_PREFER
28-
- ./vendor/bin/atoum --test-ext -p 'php -n -ddate.timezone=UTC'
36+
- vendor/bin/atoum --test-ext

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 1.3.0 - 2017-02-24
2+
3+
* [#16](https://github.com/atoum/autoloop-extension/pull/16) Support atoum 3.x ([@jubianchi])
4+
15
# 0.2.0 - 2017-02-16
26

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

2226
[@vonglasow]: https://github.com/vonglasow
2327
[@agallou]: https://github.com/agallou
28+
[@jubianchi]: https://github.com/jubianchi

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"minimum-stability": "beta",
2121
"require": {
22-
"atoum/atoum": "^2.9.0",
22+
"atoum/atoum": "^2.9 | ^3.0",
2323
"henrikbjorn/lurker": "^1.1"
2424
}
2525
}

configuration.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
<?php
22

3-
if (defined('mageekguy\atoum\scripts\runner') === true && version_compare(constant('mageekguy\atoum\version'), '2.9.0-beta', '>=') === true) {
4-
\mageekguy\atoum\scripts\runner::addConfigurationCallable(function($script, $runner) {
5-
$runner->addExtension(new \mageekguy\atoum\autoloop\extension($script));
3+
use mageekguy\atoum;
4+
use mageekguy\atoum\scripts;
5+
6+
if (defined('mageekguy\atoum\scripts\runner') === true) {
7+
scripts\runner::addConfigurationCallable(function(atoum\configurator $script, atoum\runner $runner) {
8+
$extension = new atoum\autoloop\extension($script);
9+
10+
$extension->addToRunner($runner);
611
});
712
}

0 commit comments

Comments
 (0)