Skip to content
This repository was archived by the owner on Jul 8, 2023. It is now read-only.

Commit 66dec97

Browse files
committed
Repository maintenance.
1 parent ee9ea77 commit 66dec97

File tree

105 files changed

+497
-467
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+497
-467
lines changed

.travis.install

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
#!/usr/bin/env php
22
<?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-
*/
3+
// Update composer to the latest version ...
4+
passthru('composer self-update --no-interaction');
75

6+
// Build a composer config that uses the GitHub OAuth token if it is available ...
87
$config = array(
98
'config' => array(
109
'notify-on-install' => false
@@ -16,18 +15,23 @@ if ($token = getenv('ARCHER_TOKEN')) {
1615
'github.com' => $token
1716
);
1817
$composerFlags = '--prefer-dist';
19-
passthru('curl -s -i -H "Authorization: token $ARCHER_TOKEN" https://api.github.com | grep "^X-RateLimit"');
2018
} else {
2119
$composerFlags = '--prefer-source';
2220
}
2321

2422
$file = '~/.composer/config.json';
25-
$dir = dirname($file);
23+
$dir = dirname($file);
2624
if (!is_dir($dir)) {
2725
mkdir($dir, 0755, true);
2826
}
2927
file_put_contents($file, json_encode($config));
3028

29+
// Display some information about GitHub rate limiting ...
30+
if ($token) {
31+
passthru('curl -s -i -H "Authorization: token $ARCHER_TOKEN" https://api.github.com | grep "^X-RateLimit"');
32+
}
33+
34+
// Install composer dependencies ...
3135
$exitCode = 0;
3236
passthru('composer install --dev --no-progress --no-interaction --ansi ' . $composerFlags, $exitCode);
3337
exit($exitCode);

.travis.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
1-
#
2-
# This is the default Travis CI configuration.
3-
#
4-
# It uses a GitHub OAuth token when fetching composer dependencies
5-
# to avoid IP-based API throttling.
6-
#
7-
# It also allows publication of artifacts via an additional build.
8-
#
91
language: php
102

11-
php: ["5.3", "5.4", "5.5"]
3+
php: ["5.3", "5.4", "5.5", "hhvm"]
4+
5+
matrix:
6+
allow_failures:
7+
- php: hhvm
128

139
env:
1410
global:
15-
- ARCHER_PUBLISH_VERSION=5.4
11+
- ARCHER_PUBLISH_VERSION=5.5
1612
- secure: "HNXjFjHzq5PPpooRsLe10NTc117F2SjLNzn+ZCnQxmzQdWXeHY+PlL9Nv7X2UIqxxeLddnBxzuJUmhucS7omG3dJ0q5yyf8ky3v3itBh/gd7C3mpIl5npFDSpxRFjksiQWHepISkHN5UeEivCy7ZGuF7N+QPOaiatcrLWVqCJ2s="
1713

1814
install:
1915
- ./.travis.install
16+
2017
script:
2118
- ./vendor/bin/archer travis:build

CONTRIBUTING.md

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,29 @@
44
encouraged. Please take a moment to read these guidelines before submitting
55
changes.
66

7-
### Code style
7+
## Code style
88

9-
All PHP code must adhere to the
10-
[PSR-2](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)
11-
standards.
9+
All PHP code must adhere to the [PSR-2] standards.
1210

13-
### Branching and pull requests
11+
## Branching and pull requests
1412

1513
As a guideline, please follow this process:
1614

17-
1. [Fork the repository](https://help.github.com/articles/fork-a-repo).
15+
1. [Fork the repository].
1816
2. Create a topic branch for the change:
19-
* New features should branch from **develop**.
20-
* Bug fixes to existing versions should branch from **master**.
21-
* Please ensure the branch is clearly labelled as a feature or fix.
17+
- New features should branch from **develop**.
18+
- Bug fixes to existing versions should branch from **master**.
19+
- Please ensure the branch is clearly labelled as a feature or fix.
2220
3. Make the relevant changes.
23-
4. [Squash](http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages)
24-
commits if necessary.
21+
4. [Squash] commits if necessary.
2522
4. Submit a pull request to the **develop** branch.
2623

2724
Please note this is a general guideline only. For more information on the
28-
branching structure please see the
29-
[git-flow cheatsheet](http://danielkummer.github.com/git-flow-cheatsheet/).
25+
branching structure please see the [git-flow cheatsheet].
26+
27+
<!-- References -->
28+
29+
[Fork the repository](https://help.github.com/articles/fork-a-repo)
30+
[git-flow cheatsheet](http://danielkummer.github.com/git-flow-cheatsheet/)
31+
[PSR-2](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)
32+
[Squash](http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages)

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright © 2013 Erin Millard
1+
Copyright © 2014 Erin Millard
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
*General-purpose path library for PHP.*
44

5-
[![Build status]][Latest build]
6-
[![Test coverage]][Test coverage report]
7-
[![Uses semantic versioning]][SemVer]
5+
[![The most recent stable version is 0.5.0][version-image]][Semantic versioning]
6+
[![Current build status image][build-image]][Current build status]
7+
[![Current coverage status image][coverage-image]][Current coverage status]
88

99
## Installation and documentation
1010

11-
* Available as [Composer] package [eloquent/pathogen].
12-
* [API documentation] available.
11+
- Available as [Composer] package [eloquent/pathogen].
12+
- [API documentation] available.
1313

1414
## What is Pathogen?
1515

@@ -509,11 +509,11 @@ echo $pathWithReplacement->string(); // outputs '/path/for/baz/bar'
509509
[traits]: http://php.net/traits
510510

511511
[API documentation]: http://lqnt.co/pathogen/artifacts/documentation/api/
512-
[Build status]: https://api.travis-ci.org/eloquent/pathogen.png?branch=master
513512
[Composer]: http://getcomposer.org/
513+
[build-image]: http://img.shields.io/travis/eloquent/pathogen/develop.svg "Current build status for the develop branch"
514+
[Current build status]: https://travis-ci.org/eloquent/pathogen
515+
[coverage-image]: http://img.shields.io/coveralls/eloquent/pathogen/develop.svg "Current test coverage for the develop branch"
516+
[Current coverage status]: https://coveralls.io/r/eloquent/pathogen
514517
[eloquent/pathogen]: https://packagist.org/packages/eloquent/pathogen
515-
[Latest build]: https://travis-ci.org/eloquent/pathogen
516-
[SemVer]: http://semver.org/
517-
[Test coverage report]: https://coveralls.io/r/eloquent/pathogen
518-
[Test coverage]: https://coveralls.io/repos/eloquent/pathogen/badge.png?branch=master
519-
[Uses semantic versioning]: http://b.repl.ca/v1/semver-yes-brightgreen.png
518+
[Semantic versioning]: http://semver.org/
519+
[version-image]: http://img.shields.io/:semver-0.5.0-yellow.svg "This project uses semantic versioning"

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
},
2424
"require-dev": {
2525
"icecave/archer": "~1",
26-
"eloquent/liberator": "~1"
26+
"eloquent/liberator": "~2"
2727
},
2828
"autoload": {
29-
"psr-0": {
30-
"Eloquent\\Pathogen": "src"
29+
"psr-4": {
30+
"Eloquent\\Pathogen\\": "src"
3131
}
3232
}
3333
}

0 commit comments

Comments
 (0)