Skip to content

Commit

Permalink
support Symfony 5 (#27)
Browse files Browse the repository at this point in the history
* support Symfony 5

* removed end of life versions of PHP and added PHP7.4 to CI

* updated PHPUnit to a supported version
  • Loading branch information
kuraobi authored and foaly-nr1 committed Dec 6, 2019
1 parent 0f85ab5 commit 137db2e
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 30 deletions.
39 changes: 12 additions & 27 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,48 +1,33 @@
language: php

php:
- 7.1
- 7.2
- 7.3
- 7.4snapshot

env:
- SYMFONY_VERSION=~4.1.0

matrix:
include:
- php: 5.5
env: SYMFONY_VERSION=~3.1.0
- php: 5.6
env: SYMFONY_VERSION=~3.1.0
- php: 7.0
env: SYMFONY_VERSION=~3.1.0
- php: 7.1
env: SYMFONY_VERSION=~3.1.0
- php: 7.2
env: SYMFONY_VERSION=~3.1.0
- php: 5.5
env: SYMFONY_VERSION=~3.0.0
- php: 5.6
env: SYMFONY_VERSION=~3.0.0
- php: 7.0
env: SYMFONY_VERSION=~3.0.0
- php: 7.1
env: SYMFONY_VERSION=~3.0.0
- php: 7.2
env: SYMFONY_VERSION=~3.0.0
- php: 5.5
env: SYMFONY_VERSION=~2.4
- php: 5.6
env: SYMFONY_VERSION=~2.4
- php: 7.0
env: SYMFONY_VERSION=~2.4
- php: 7.1
env: SYMFONY_VERSION=~2.4
- php: 7.2
env: SYMFONY_VERSION=~2.4
- php: 7.1
env: SYMFONY_VERSION=~4.2.0
- php: 7.2
env: SYMFONY_VERSION=~4.2.0
- php: 7.3
env: SYMFONY_VERSION=~4.2.0
- php: 7.4snapshot
env: SYMFONY_VERSION=~4.2.0
- php: 7.2
env: SYMFONY_VERSION=~5.0.0
- php: 7.3
env: SYMFONY_VERSION=~5.0.0
- php: 7.4snapshot
env: SYMFONY_VERSION=~5.0.0

before_script:
- composer require "symfony/framework-bundle:${SYMFONY_VERSION}" --no-update
Expand Down
2 changes: 1 addition & 1 deletion Tests/AnalyticsFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ final class AnalyticsFactoryTest extends TestCase
*/
protected $requestStack;

protected function setUp()
protected function setUp(): void
{
$this->requestStack = new RequestStack();
$this->factory = new AnalyticsFactory($this->requestStack, 1, 'UA-XXXXXXXX-X', true, false, true, true, false);
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"require": {
"php": ">=5.5",
"theiconic/php-ga-measurement-protocol": "^2.7",
"symfony/framework-bundle": "~2.4||~3.0||~4.0"
"symfony/framework-bundle": "~2.4||~3.0||~4.0||~5.0"
},
"require-dev": {
"phpunit/phpunit": "4.8.*"
"phpunit/phpunit": "^8.4"
},
"autoload": {
"psr-4": { "FourLabs\\GampBundle\\": "" }
Expand Down

0 comments on commit 137db2e

Please sign in to comment.