Skip to content

Commit 6776750

Browse files
committed
Implement PSR2, PSR4
1 parent 9b1afa6 commit 6776750

10 files changed

+181
-136
lines changed

.scrutinizer.yml

+5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ filter:
22
paths: [src/*]
33

44
tools:
5+
php_code_sniffer:
6+
config:
7+
standard: PSR2
8+
php_cs_fixer:
9+
config: { level: all }
510
external_code_coverage: true
611
php_cpd: true
712
php_hhvm: true

.travis.yml

+16-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
11
language: php
22

3+
sudo: false
4+
35
php:
4-
- 5.3
56
- 5.4
7+
- 5.5
8+
- 5.6
9+
- 7
10+
- hhvm
11+
12+
cache:
13+
directories:
14+
- $HOME/.composer/cache
615

716
notifications:
817
email: false
918
slack:
1019
secure: ixWu6kWtNIlzzdImpu4MdvGYpA6ZPp/dQpMAp6FDO2oHHB55J9ossBYtVtBXPCDs9OxqfQl2yqbE+TkhfIfkZqIbhvX2+CiIomvYSKZDvryUlCfbfV29behmSVIVYvg3b8Tba+nAyZeJA2guUyAy02WGr3n4I+PDgZC3Wa/mv94=
1120

12-
install:
21+
before_install:
1322
- composer selfupdate
14-
- composer install --no-interaction
23+
24+
install:
25+
- composer install
1526

1627
before_script:
1728
- mkdir -p build/logs
@@ -20,6 +31,6 @@ script:
2031
- phpunit --coverage-clover build/logs/clover.xml
2132

2233
after_script:
23-
- wget https://scrutinizer-ci.com/ocular.phar
24-
- php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
34+
- test -e build/logs/clover.xml && wget https://scrutinizer-ci.com/ocular.phar
35+
- test -e build/logs/clover.xml && php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
2536

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Swiftmailer Css Inliner Plugin
1+
# Swiftmailer Css Inliner Plugin
22

33
[![Build Status](https://travis-ci.org/OpenBuildings/swiftmailer-css-inliner.svg)](https://travis-ci.org/OpenBuildings/swiftmailer-css-inliner)
44
[![Code Coverage](https://scrutinizer-ci.com/g/OpenBuildings/swiftmailer-css-inliner/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/OpenBuildings/swiftmailer-css-inliner/?branch=master)
@@ -26,13 +26,13 @@ use TijsVerkoyen\CssToInlineStyles\CssToInlineStyles;
2626
$mailer = Swift_Mailer::newInstance();
2727

2828
$converter = new CssToInlineStyles();
29-
$converter->setUseInlineStylesBlock(FALSE);
29+
$converter->setUseInlineStylesBlock(false);
3030

3131
$mailer->registerPLugin(new CssInlinerPlugin($converter));
3232
```
3333

3434
## License
3535

36-
Copyright (c) 2013, OpenBuildings Ltd. Developed by Ivan Kerin as part of [clippings.com](http://clippings.com)
36+
Copyright (c) 2015, Clippings Ltd. Developed by Ivan Kerin as part of [clippings.com](http://clippings.com)
3737

3838
Under BSD-3-Clause license, read LICENSE file.

composer.json

+13-5
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,26 @@
55
"authors": [
66
{
77
"name": "Ivan Kerin",
8-
"email": "ivan@openbuildings.com",
8+
"email": "ikerin@gmail.com",
99
"role": "Author"
1010
}
1111
],
1212
"require" : {
13-
"php": ">=5.3.2",
14-
"tijsverkoyen/css-to-inline-styles": "~1.5"
13+
"php": ">=5.4",
14+
"tijsverkoyen/css-to-inline-styles": "^1.5"
1515
},
1616
"require-dev" : {
17-
"swiftmailer/swiftmailer": "~5.1"
17+
"swiftmailer/swiftmailer": "^5.1"
1818
},
1919
"autoload": {
20-
"psr-0": {"Openbuildings\\Swiftmailer\\": "src/"}
20+
"psr-4": {
21+
"Openbuildings\\Swiftmailer\\": "src/"
22+
}
23+
},
24+
"autoload-dev": {
25+
"psr-4": {
26+
"Openbuildings\\Swiftmailer\\Test\\": "tests/src/"
27+
}
2128
}
29+
2230
}

composer.lock

+50-51
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

phpunit.xml

+15-12
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
<phpunit colors="true" bootstrap="vendor/autoload.php">
2-
<testsuites>
3-
<testsuite>
4-
<directory>tests/tests</directory>
5-
</testsuite>
6-
</testsuites>
7-
<filter>
8-
<blacklist>
9-
<directory suffix=".php">vendor/</directory>
10-
<directory suffix=".php">tests/</directory>
11-
</blacklist>
12-
</filter>
1+
<phpunit
2+
colors="true"
3+
bootstrap="vendor/autoload.php"
4+
backupGlobals="false"
5+
forceCoversAnnotation="true">
6+
<testsuites>
7+
<testsuite>
8+
<directory>tests/src</directory>
9+
</testsuite>
10+
</testsuites>
11+
<filter>
12+
<whitelist>
13+
<directory suffix=".php">src/</directory>
14+
</whitelist>
15+
</filter>
1316
</phpunit>

0 commit comments

Comments
 (0)