Skip to content

Commit 06546e8

Browse files
authored
Merge pull request #1 from prooph/php_72
allow php 7.2
2 parents 2c76f87 + df67f4d commit 06546e8

File tree

5 files changed

+16
-9
lines changed

5 files changed

+16
-9
lines changed

.travis.yml

+7
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ matrix:
1010
- php: 7.1
1111
env:
1212
- DEPENDENCIES="--prefer-lowest --prefer-stable"
13+
- php: 7.2
14+
env:
15+
- DEPENDENCIES=""
16+
- TEST_COVERAGE=true
17+
- php: 7.2
18+
env:
19+
- DEPENDENCIES="--prefer-lowest --prefer-stable"
1320

1421
cache:
1522
directories:

LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Copyright (c) 2014-2015, prooph software GmbH
2-
Copyright (c) 2015-2016, Sascha-Oliver Prolic
1+
Copyright (c) 2016-2017, prooph software GmbH
2+
Copyright (c) 2016-2017, Sascha-Oliver Prolic
33
All rights reserved.
44

55
Redistribution and use in source and binary forms, with or without

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
],
1717
"require": {
1818
"php": "^7.1",
19-
"friendsofphp/php-cs-fixer": "2.0.0"
19+
"friendsofphp/php-cs-fixer": "2.8.1"
2020
},
2121
"require-dev": {
22-
"phpunit/phpunit": "^5.6",
22+
"phpunit/phpunit": "^6.0",
2323
"satooshi/php-coveralls": "^1.0",
2424
"malukenho/docheader": "^0.1.4"
2525
},
@@ -33,4 +33,4 @@
3333
"ProophTest\\CS\\Config\\": "test"
3434
}
3535
}
36-
}
36+
}

src/Prooph.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22
/**
33
* This file is part of the prooph/php-cs-fixer-config.
4-
* (c) 2016-2016 prooph software GmbH <contact@prooph.de>
5-
* (c) 2016-2016 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
4+
* (c) 2016-2017 prooph software GmbH <contact@prooph.de>
5+
* (c) 2016-2017 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
66
*
77
* For the full copyright and license information, please view the LICENSE
88
* file that was distributed with this source code.

tests/ProophTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22
/**
33
* This file is part of the prooph/php-cs-fixer-config.
4-
* (c) 2016-2016 prooph software GmbH <contact@prooph.de>
5-
* (c) 2016-2016 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
4+
* (c) 2016-2017 prooph software GmbH <contact@prooph.de>
5+
* (c) 2016-2017 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
66
*
77
* For the full copyright and license information, please view the LICENSE
88
* file that was distributed with this source code.

0 commit comments

Comments
 (0)