Skip to content

Commit 9576ca0

Browse files
authored
Fixed annotation config for sf3.3
Fixed annotation config for sf3.3
1 parent d68b1b1 commit 9576ca0

File tree

4 files changed

+29
-3
lines changed

4 files changed

+29
-3
lines changed

.travis.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: php
2-
dist: trusty
2+
dist: precise
33

44
cache:
55
directories:
@@ -12,7 +12,7 @@ branches:
1212
php:
1313
- 5.5
1414
- 7.1
15-
- hhvm
15+
1616
env:
1717
global:
1818
- TEST_COMMAND="composer test"
@@ -25,6 +25,11 @@ matrix:
2525
include:
2626
- php: 5.5
2727
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION=2.3.*
28+
- php: hhvm
29+
env: SYMFONY_VERSION=2.7.*
30+
dist: trusty
31+
- php: 7.0
32+
env: SYMFONY_VERSION=2.8.*
2833
- php: 7.1
2934
env: SYMFONY_VERSION=4.0.*
3035

Changelog.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22

33
The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
44

5+
## 1.2.1
6+
7+
### Fixed
8+
9+
- Better fix for annotation issue with Symfony 3.3.
10+
11+
## 1.2.0
12+
13+
### Added
14+
15+
- Allow tests with PHPUnit6
16+
517
## 1.1.0
618

719
### Added

src/config/framework.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
imports:
2+
- { resource: parameters.php }
3+
14
framework:
25
secret: test
36
test: ~
@@ -8,5 +11,4 @@ framework:
811
validation:
912
enabled: false
1013
annotations:
11-
enabled: false
1214
cache: none

src/config/parameters.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?php
2+
3+
if (\Symfony\Component\HttpKernel\Kernel::VERSION_ID >= 30300) {
4+
$container->loadFromExtension('framework', [
5+
'annotations' => ['enabled' => false],
6+
]);
7+
}

0 commit comments

Comments
 (0)