Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
Conflicts:
	Makefile (Respect/Foundation update)
	composer.json (Contributors merged)

Intended to be the release 0.5.0 as pointed out on #137 and #134.
  • Loading branch information
Augusto Pascutti committed Dec 10, 2013
2 parents 8b0aa6a + 7002c64 commit c9bae83
Show file tree
Hide file tree
Showing 274 changed files with 4,685 additions and 2,182 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ tests/reports
*.deb
*.rpm
*.tgz
vendor/
26 changes: 16 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
# a Courtesy of Respect/Foundation

language: php
script: make test

env: FOUNDATION_NO_WAIT=1

php:
- 5.3
- 5.4
- 5.5

before_script:
- "pyrus channel-discover pear.symfony.com"
- "pyrus channel-discover packages.zendframework.com"
- "pyrus install -f pear.symfony.com/Validator"
- "pyrus install -f packages.zendframework.com/Zend_Locale-beta"
- "pyrus install -f packages.zendframework.com/Zend_Validator-beta"
- "pyrus install -f packages.zendframework.com/Zend_Filter-beta"
- "pyrus install -f packages.zendframework.com/Zend_Registry-beta"
- "make foundation"
- "phpenv rehash"
- make composer-install-dev
- phpenv rehash

script:
- make testdox

notifications:
irc:
channels:
- "irc.freenode.org#php-respect"
use_notice: true
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2009-2011, Alexandre Gomes Gaigalas.
Copyright (c) 2009-2013, Alexandre Gomes Gaigalas.
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
Expand All @@ -24,4 +24,4 @@ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Loading

0 comments on commit c9bae83

Please sign in to comment.