Skip to content

Commit 9f1f47e

Browse files
committed
Merge pull request #47 from php-http/puli_phar
Add puli.phar, remove cli dependency, closes #41
2 parents 4d0fcc3 + 9ccaca9 commit 9f1f47e

File tree

6 files changed

+39
-7
lines changed

6 files changed

+39
-7
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
.puli/
2+
bin/*
3+
!bin/puli.phar
24
build/
35
vendor/
46
composer.lock

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ branches:
2121
- /^analysis-.*$/
2222

2323
matrix:
24+
allow_failures:
25+
- php: hhvm
2426
fast_finish: true
2527
include:
2628
- php: 5.5

CHANGELOG.md

+17
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
11
# Change Log
22

33

4+
## 0.7.0 - 2016-01-15
5+
6+
### Added
7+
8+
- Temporary puli.phar (Beta 10) executable
9+
10+
### Changed
11+
12+
- Updated HTTPlug dependencies
13+
- Updated Puli dependencies
14+
- Local configuration to make tests passing
15+
16+
### Removed
17+
18+
- Puli CLI dependency
19+
20+
421
## 0.6.4 - 2016-01-07
522

623
### Fixed

README.md

+7
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@
99

1010
**Finds installed HTTPlug implementations and PSR-7 message factories.**
1111

12+
> **Note for 0.7.x releases**
13+
>
14+
> Puli binary is added to this repository until [puli/issues#165](https://github.com/puli/issues/issues/165) is resolved.
15+
>
16+
> However, if you have puli globally installed, it will be used.
17+
> Make sure that your puli binary is at least beta10
18+
1219

1320
## Install
1421

bin/puli.phar

398 KB
Binary file not shown.

composer.json

+11-7
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
],
1313
"require": {
1414
"php": "^5.4|7.*",
15-
"puli/composer-plugin": "1.0.0-beta9",
16-
"puli/discovery": "1.0.0-beta9",
17-
"puli/cli": "~1.0.0-beta10"
15+
"puli/composer-plugin": "1.0.0-beta9"
1816
},
1917
"require-dev": {
2018
"php-http/httplug": "^1.0",
@@ -36,14 +34,20 @@
3634
}
3735
},
3836
"scripts": {
39-
"test": "vendor/bin/phpspec run",
40-
"test-ci": "vendor/bin/phpspec run -c phpspec.yml.ci"
37+
"test": "bin/phpspec run",
38+
"test-ci": "bin/phpspec run -c phpspec.yml.ci"
4139
},
40+
"bin": [
41+
"bin/puli.phar"
42+
],
4243
"extra": {
4344
"branch-alias": {
44-
"dev-master": "0.7-dev"
45+
"dev-master": "0.8-dev"
4546
}
4647
},
48+
"config": {
49+
"bin-dir": "bin"
50+
},
4751
"prefer-stable": true,
48-
"minimum-stability": "dev"
52+
"minimum-stability": "beta"
4953
}

0 commit comments

Comments
 (0)