Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
henriquemoody committed Jan 7, 2015
2 parents 1d7689c + 1c8c11b commit 7ba5338
Show file tree
Hide file tree
Showing 7 changed files with 191 additions and 97 deletions.
16 changes: 16 additions & 0 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
filter:
excluded_paths:
- tests/*

checks:
php:
code_rating: true

tools:
external_code_coverage: true
php_analyzer: true
php_changetracking: true
php_cpd: true
php_mess_detector: true
php_pdepend: true
sensiolabs_security_checker: true
28 changes: 19 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,29 @@
language: php
sudo:
false

language:
php

php:
- 5.3
- 5.4

env: FOUNDATION_NO_WAIT=1
cache:
directories:
- vendor

before_script:
- "make composer-install-dev"
- "phpenv rehash"
- composer install --dev --no-interaction --prefer-source

script:
- "make testdox"
- vendor/bin/phpunit --configuration tests/phpunit.xml --colors --coverage-clover=coverage.clover tests/

after_script:
- wget https://scrutinizer-ci.com/ocular.phar
- php ocular.phar code-coverage:upload --format=php-clover coverage.clover

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

Redistribution and use in source and binary forms, with or without modification,
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
Respect\Config [![Build Status](https://travis-ci.org/Respect/Config.png?branch=develop)](https://travis-ci.org/Respect/Config)
Respect\Config
==============

[![Total Downloads](https://poser.pugx.org/respect/config/downloads.png)](https://packagist.org/packages/respect/config)
[![Latest Stable Version](https://poser.pugx.org/respect/config/v/stable.png)](https://packagist.org/packages/respect/config)

[![Build Status](https://travis-ci.org/Respect/Config.png?branch=develop)](https://travis-ci.org/Respect/Config) [![Latest Stable Version](https://poser.pugx.org/respect/config/v/stable.png)](https://packagist.org/packages/respect/config) [![Total Downloads](https://poser.pugx.org/respect/config/downloads.png)](https://packagist.org/packages/respect/config) [![Latest Unstable Version](https://poser.pugx.org/respect/config/v/unstable.png)](https://packagist.org/packages/respect/config) [![License](https://poser.pugx.org/respect/config/license.png)](https://packagist.org/packages/respect/config)

A powerful, small, deadly simple configurator and dependency injection container made to be easy. Featuring:

Expand All @@ -17,6 +15,8 @@ Installation

Packages available on [PEAR](http://respect.li/pear) and [Composer](http://packagist.org/packages/Respect/Config). Autoloading is [PSR-0](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md) compatible.

Works on PHP 5.3 and 5.4 only.

Autoloading
-----------

Expand Down Expand Up @@ -277,7 +277,7 @@ good work and you'll never face them.
License Information
===================

Copyright (c) 2009-2012, Alexandre Gomes Gaigalas.
Copyright (c) 2009-2015, Alexandre Gomes Gaigalas.
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
Expand Down
Loading

0 comments on commit 7ba5338

Please sign in to comment.