Skip to content

Commit

Permalink
Merge 32bc363 into 07a9af2
Browse files Browse the repository at this point in the history
  • Loading branch information
FabioBatSilva committed Jun 22, 2016
2 parents 07a9af2 + 32bc363 commit 66ed696
Show file tree
Hide file tree
Showing 203 changed files with 7,085 additions and 6,583 deletions.
3 changes: 3 additions & 0 deletions .coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# for php-coveralls
service_name: travis-ci
coverage_clover: build/logs/clover.xml
27 changes: 16 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
language: php

sudo: false

language: php

cache:
directory:
directories:
- $HOME/.composer/cache

php:
- 5.3
- 5.4
- 5.5
- 5.6
- 7
- hhvm
- 7

before_install:
- composer self-update

install:
- composer install --prefer-dist

script:
- ./vendor/bin/phpcs -p --extensions=php --standard=ruleset.xml src
- ./vendor/bin/phpunit -v --coverage-clover ./build/logs/clover.xml

before_script:
- composer install -n
after_script:
- ./vendor/bin/coveralls -v
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Doctrine Annotations

[![Build Status](https://travis-ci.org/doctrine/annotations.png?branch=master)](https://travis-ci.org/doctrine/annotations)
[![Build Status](https://travis-ci.org/doctrine/annotations.svg?branch=master)](https://travis-ci.org/doctrine/annotations)

Docblock Annotations Parser library (extracted from [Doctrine Common](https://github.com/doctrine/common)).

Expand Down
27 changes: 20 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,35 @@
{"name": "Roman Borschel", "email": "roman@code-factory.org"},
{"name": "Benjamin Eberlei", "email": "kontakt@beberlei.de"},
{"name": "Jonathan Wage", "email": "jonwage@gmail.com"},
{"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
{"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"},
{"name": "Fabio B. Silva", "email": "fabio.bat.silva@gmail.com"}
],
"require": {
"php": ">=5.3.2",
"doctrine/lexer": "1.*"
"php": ">=7.0.0",
"hoa/compiler": "3.*"
},
"require-dev": {
"doctrine/cache": "1.*",
"phpunit/phpunit": "4.*"
"phpunit/phpunit": "5.*",
"satooshi/php-coveralls": "~1.0",
"squizlabs/php_codesniffer": "~1.5",
"instaclick/coding-standard": "~1.1",
"instaclick/object-calisthenics-sniffs": "dev-master",
"instaclick/symfony2-coding-standard": "dev-remaster"
},
"autoload": {
"psr-0": { "Doctrine\\Common\\Annotations\\": "lib/" }
"psr-4": {
"Doctrine\\Annotations\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"Doctrine\\AnnotationsTests\\": "tests/"
}
},
"extra": {
"branch-alias": {
"dev-master": "1.3.x-dev"
"dev-master": "2.0.x-dev"
}
}
}
}
197 changes: 0 additions & 197 deletions lib/Doctrine/Common/Annotations/AnnotationException.php

This file was deleted.

0 comments on commit 66ed696

Please sign in to comment.