Skip to content

Commit

Permalink
Merge branch '3.1'
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.json

Signed-off-by: crynobone <crynobone@gmail.com>
  • Loading branch information
crynobone committed Nov 14, 2015
2 parents 3e469aa + 267b149 commit 8310ea2
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 31 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,5 @@ matrix:
allow_failures:
- env: setup=stable
- env: setup=coveralls coverage=yes
- php: 7.0
- php: hhvm
fast_finish: true
61 changes: 31 additions & 30 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,33 @@
{
"name": "orchestra/parser",
"description": "XML Document Parser for Laravel and PHP",
"keywords": ["laravel", "orchestral", "orchestra-platform", "xml", "parser"],
"license": "MIT",
"authors": [
{
"name": "Mior Muhammad Zaki",
"email": "crynobone@gmail.com",
"homepage": "https://github.com/crynobone"
}
],
"autoload": {
"psr-4": {
"Orchestra\\Parser\\": "src/"
}
},
"require": {
"php": ">=5.5.0",
"illuminate/container": "~5.2.0",
"illuminate/support": "~5.2.0"
},
"require-dev": {
"mockery/mockery": "0.9.*"
},
"extra": {
"branch-alias": {
"dev-master": "3.2-dev"
}
},
"minimum-stability": "dev"
"name": "orchestra/parser",
"description": "XML Document Parser for Laravel and PHP",
"keywords": ["laravel", "orchestral", "orchestra-platform", "xml", "parser"],
"license": "MIT",
"authors": [
{
"name": "Mior Muhammad Zaki",
"email": "crynobone@gmail.com",
"homepage": "https://github.com/crynobone"
}
],
"autoload": {
"psr-4": {
"Orchestra\\Parser\\": "src/"
}
},
"require": {
"php": ">=5.5.0",
"illuminate/container": "~5.2.0",
"illuminate/support": "~5.2.0",
"paragonie/random_compat": "~1.1"
},
"require-dev": {
"mockery/mockery": "0.9.*"
},
"extra": {
"branch-alias": {
"dev-master": "3.2-dev"
}
},
"minimum-stability": "dev"
}
4 changes: 4 additions & 0 deletions docs/changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ title: Parser Change Log

## Version 3.1 {#v3-1}

### v3.1.3 {#v3-1-3}

* Add `paragonie/random_compat` as dependencies.

### v3.1.2 {#v3-1-2}

* Introduce `Orchestra\Parser\Xml\Document::rebase()` in order to change the parent node for faster parsing.
Expand Down

0 comments on commit 8310ea2

Please sign in to comment.