Skip to content
This repository was archived by the owner on Mar 27, 2019. It is now read-only.

Commit 5ef82d0

Browse files
committed
Merge branch 'release/0.9.1'
2 parents ea8c1d9 + 133f4c2 commit 5ef82d0

10 files changed

+122
-107
lines changed

Diff for: .gitattributes

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
# archer start
12
.gitattributes export-ignore
23
.gitignore export-ignore
34
.travis.* export-ignore
45
.archer.* export-ignore
5-
test export-ignore
6+
test export-ignore
7+
# archer end

Diff for: .gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
# archer start
12
/artifacts/
23
/vendor/
4+
# archer end

Diff for: .travis.before-install

-23
This file was deleted.

Diff for: .travis.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
bsW+y6xirKrqXRkj6f9EjresV6KznYAOwlvfIxrghfOviLgM5f58dMElij2EQ5ehGtWWwhhHBnHhuDkrWV2pNNDl2jXisKf9Zx1qA30tOTDNLwEpi6FCYjel00NZTj/stLZFDxX5atubnOjIFPv/Xkn03X0vdh+x5mPFwkurkFM=
1+
V2jsDDzcMcIgpIlExVYdAIqdeavTsb3BGu2Me9LyFkDenRckZc74VpvwvnayGJUG5n/UMOBjn02ExLps5y/jy8fmqMGh724azS8e/dU0ObCi2jmebrsfyJMOneWaMJEGGqxJOwsNnuXNVfMzowA8Rw7yZ2LXL+bHXS5U/QMbN14=

Diff for: .travis.install

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/usr/bin/env php
2+
<?php
3+
/**
4+
* This script is executed before composer dependencies are installed,
5+
* and as such must be included in each project as part of the skeleton.
6+
*/
7+
if ($token = getenv('ARCHER_TOKEN')) {
8+
$config = array(
9+
'config' => array(
10+
'github-oauth' => array('github.com' => $token)
11+
)
12+
);
13+
14+
$file = '~/.composer/config.json';
15+
$dir = dirname($file);
16+
if (!is_dir($dir)) {
17+
mkdir($dir, 0755, true);
18+
}
19+
file_put_contents($file, json_encode($config));
20+
21+
$composerFlags = '--prefer-dist';
22+
} else {
23+
$composerFlags = '--prefer-source';
24+
}
25+
26+
passthru('composer install --dev --no-progress --no-interaction --ansi ' . $composerFlags);

Diff for: .travis.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,19 @@
99
language: php
1010

1111
php:
12-
- 5.3.3
1312
- 5.3
1413
- 5.4
1514
- 5.5
1615

1716
env:
1817
global:
1918
- ARCHER_PUBLISH_VERSION=5.4
20-
- secure: "bsW+y6xirKrqXRkj6f9EjresV6KznYAOwlvfIxrghfOviLgM5f58dMElij2EQ5ehGtWWwhhHBnHhuDkrWV2pNNDl2jXisKf9Zx1qA30tOTDNLwEpi6FCYjel00NZTj/stLZFDxX5atubnOjIFPv/Xkn03X0vdh+x5mPFwkurkFM="
19+
- secure: "V2jsDDzcMcIgpIlExVYdAIqdeavTsb3BGu2Me9LyFkDenRckZc74VpvwvnayGJUG5n/UMOBjn02ExLps5y/jy8fmqMGh724azS8e/dU0ObCi2jmebrsfyJMOneWaMJEGGqxJOwsNnuXNVfMzowA8Rw7yZ2LXL+bHXS5U/QMbN14="
2120

22-
before_install:
23-
- ./.travis.before-install
2421
install:
25-
- composer install --dev --prefer-dist --no-interaction
22+
- ./.travis.install
2623
script:
27-
- ./vendor/bin/archer travis:build
24+
- ./vendor/bin/archer travis:build
2825

2926
matrix:
3027
# PHP 5.5 is still in alpha, so ignore build failures.

Diff for: CHANGELOG.md

+2-6
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,5 @@
22

33
### 0.9.1
44

5-
* Implemented icecave/archer integration
6-
* General maintenance tasks (minor documentation updates, copyright year bump etc.)
7-
8-
### 0.9.0
9-
10-
* Removed icecave/visita integration
5+
* [Archer](https://github.com/IcecaveStudios/archer) integration
6+
* Implemented changelog

Diff for: README.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
*A flexible PHP type hinting syntax.*
44

5-
[![Build status](https://raw.github.com/eloquent/typhax/gh-pages/artifacts/images/icecave/regular/build-status.png)](http://travis-ci.org/eloquent/typhax)
6-
[![Test coverage](https://raw.github.com/eloquent/typhax/gh-pages/artifacts/images/icecave/regular/coverage.png)](http://eloquent.github.com/typhax/artifacts/tests/coverage)
5+
[![Build Status]](http://travis-ci.org/eloquent/typhax)
6+
[![Test Coverage]](http://eloquent-software.com/typhax/artifacts/tests/coverage/)
77

88
## Installation
99

@@ -266,3 +266,7 @@ For an example of how extensions can be utilized, see the
266266
In general, Typhax does not care whether white space is used in type
267267
specifications. However, the above documentation should serve as a recommended
268268
style guide.
269+
270+
<!-- references -->
271+
[Build Status]: https://raw.github.com/eloquent/typhax/gh-pages/artifacts/images/icecave/regular/build-status.png
272+
[Test Coverage]: https://raw.github.com/eloquent/typhax/gh-pages/artifacts/images/icecave/regular/coverage.png

Diff for: composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"eloquent/cosmos": "~2"
1818
},
1919
"require-dev": {
20-
"icecave/archer": "dev-release/0.1.0"
20+
"icecave/archer": "~0.2"
2121
},
2222
"autoload": {
2323
"psr-0": {

0 commit comments

Comments
 (0)