Skip to content

Commit 0af9016

Browse files
authored
more annotation fix (#8)
1 parent 9576ca0 commit 0af9016

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

Changelog.md

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

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

5+
## 1.2.2
6+
7+
### Changed
8+
9+
- Only disable annotations if they are not installed.
10+
511
## 1.2.1
612

713
### Fixed

src/config/parameters.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22

3-
if (\Symfony\Component\HttpKernel\Kernel::VERSION_ID >= 30300) {
3+
// If sf 3.3 and no annotations is installed, then disable it.
4+
if (\Symfony\Component\HttpKernel\Kernel::VERSION_ID >= 30300 && !class_exists('Doctrine\Common\Annotations\Annotation')) {
45
$container->loadFromExtension('framework', [
56
'annotations' => ['enabled' => false],
67
]);

0 commit comments

Comments
 (0)