Skip to content

Commit

Permalink
PHP 7 and increasing min PHP to 5.5 (#10)
Browse files Browse the repository at this point in the history
* Allowing PHP 7 and increasing min PHP to 5.5
* Updating php-onehydra dependency to PHP7 version
* Increased minimum required twig dependency
* Fixing use of deprecated twig functionality
  • Loading branch information
rossmotley committed Jul 13, 2017
1 parent c9e3d1b commit 9d2e7bc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Expand Up @@ -2,14 +2,14 @@ language: php
php:
- 5.5
- 5.6
# - 7.0
# - hhvm
- 7.0
- 7.1

env: COVERAGE=0

matrix:
include:
- php: 5.6
- php: 7.1
env: COVERAGE=1

before_script:
Expand Down
2 changes: 1 addition & 1 deletion Tests/Twig/Extension/OneHydraExtensionTest.php
Expand Up @@ -40,7 +40,7 @@ public function testCheckThatTwigFunctionsAreRegistered()
$twig->addExtension($extension);

/** @var OneHydraExtension $ext */
$ext = $twig->getExtension('onehydra_extension');
$ext = $twig->getExtension(OneHydraExtension::class);

$this->assertInstanceOf(OneHydraExtension::class, $ext);

Expand Down
6 changes: 3 additions & 3 deletions composer.json
Expand Up @@ -19,12 +19,12 @@
}
],
"require": {
"php": ">=5.3.9",
"amara/onehydra": "~0.2.0",
"php": ">=5.5.0,<8.0",
"amara/onehydra": "~0.3.0",
"symfony/framework-bundle": "~2.3|~3.0",
"doctrine/orm": "~2.2,>=2.2.3,<2.5",
"doctrine/doctrine-bundle": "~1.4",
"twig/twig": "~1.23|~2.0"
"twig/twig": "~1.26|~2.0"
},
"require-dev": {
"phpunit/phpunit": "~4.8"
Expand Down

0 comments on commit 9d2e7bc

Please sign in to comment.