Skip to content

Commit e9e242d

Browse files
authored
Merge pull request #14 from texdc/feature-psr4
Add psr-4 support
2 parents 24af172 + cf0f075 commit e9e242d

40 files changed

+1874
-23
lines changed

.gitattributes

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/test export-ignore
2+
/.gitattributes export-ignore
3+
/.gitignore export-ignore
4+
/.coveralls.yml export-ignore
5+
/.travis.yml export-ignore
6+
/composer.lock export-ignore
7+
/phpunit.xml.dist export-ignore

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
composer.lock
21
vendor/
32
build/
3+
phpunit.xml

.travis.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
11
language: php
2+
23
php:
4+
- 7.0
5+
- 5.6
36
- 5.5
47
- 5.4
58
- 5.3
9+
- hhvm
10+
11+
matrix:
12+
fast_finish: true
13+
allow_failures:
14+
- php: 5.5
15+
- php: 5.4
16+
- php: 5.3
17+
- php: hhvm
618

719
before_script:
8-
- composer install --prefer-dist --dev
20+
- composer update --prefer-dist
921

1022
after_script:
1123
- php vendor/bin/coveralls -v

composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
}
1313
],
1414
"require": {
15-
"php": ">=5.3.0"
15+
"php": "^5.3 || ^7.0"
1616
},
1717
"require-dev": {
18-
"phpunit/phpunit": "~3.0",
19-
"satooshi/php-coveralls": "*"
18+
"phpunit/phpunit": "*",
19+
"satooshi/php-coveralls": "*"
2020
},
2121
"autoload": {
22-
"psr-0": {
23-
"ZxcvbnPhp": "src/"
24-
}
22+
"psr-4": { "ZxcvbnPhp\\": "src/" }
23+
},
24+
"autoload-dev": {
25+
"psr-4": { "ZxcvbnPhp\\Test\\": "test/" }
2526
}
2627
}
27-

0 commit comments

Comments
 (0)