Skip to content
This repository has been archived by the owner on Jan 16, 2019. It is now read-only.

Commit

Permalink
Merge pull request #11 from mikey179/master
Browse files Browse the repository at this point in the history
integrate latest changes
  • Loading branch information
mikey179 committed May 1, 2013
2 parents 87b306b + 95da8e6 commit 2396209
Show file tree
Hide file tree
Showing 30 changed files with 548 additions and 124 deletions.
7 changes: 7 additions & 0 deletions .travis.composer.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"config": {
"github-oauth": {
"github.com": "3ad7a75770e929abda16a304fac238662b3530d4"
}
}
}
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ php:
- 5.5

before_script:
- "mkdir -p ~/.composer"
- cp .travis.composer.config.json ~/.composer/config.json
- composer install --dev

script: phpunit
script: vendor/bin/phpunit --coverage-text
13 changes: 13 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
2.2.?, 2013-??-??
==================
- upgraded stubbles/core to ~3.0


2.1.0, 2012-07-31
==================
- changed stubbles-core to 2.*


2.0.0, 2012-07-10
==================
- Initial release.
1 change: 0 additions & 1 deletion cache/.gitignore

This file was deleted.

16 changes: 10 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,22 @@
"description": "Stubbles Log provides support for writing log data.",
"require": {
"php": ">=5.3.0",
"stubbles/core": "2.*"
"stubbles/core": "~3.0"
},
"require-dev": {
"mikey179/vfsStream": "1.1.*"
"mikey179/vfsStream": "~1.2",
"phpunit/phpunit": "~3.7"
},
"autoload": {
"psr-0": {
"net\\stubbles\\log": "src/main/php"
}
},
"scripts": {
"post-install-cmd": "org\\stubbles\\scripts\\ComposerScripts::postInstall",
"post-update-cmd": "org\\stubbles\\scripts\\ComposerScripts::postUpdate"
}
"extra": {
"branch-alias": {
"dev-master": "2.2.x-dev"
}
},
"minimum-stability": "dev",
"prefer-stable": true
}
Loading

0 comments on commit 2396209

Please sign in to comment.