Skip to content

Commit 6eeadf5

Browse files
committed
Fix broken merge on Zend Opcache check.
1 parent 735b6c5 commit 6eeadf5

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

lib/Doctrine/Common/Annotations/AnnotationReader.php

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -154,20 +154,12 @@ static public function addGlobalIgnoredName($name)
154154
*/
155155
public function __construct()
156156
{
157-
if (extension_loaded('Zend Optimizer+') && (ini_get('zend_optimizerplus.save_comments') === "0" || ini_get('opcache.save_comments') === "0")) {
158-
throw AnnotationException::optimizerPlusSaveComments();
159-
}
160-
161-
if (extension_loaded('Zend OPcache') && ini_get('opcache.save_comments') == 0) {
162-
throw AnnotationException::optimizerPlusSaveComments();
163-
}
164-
165157
if (PHP_VERSION_ID < 70000) {
166158
if (extension_loaded('Zend Optimizer+') && (ini_get('zend_optimizerplus.load_comments') === "0" || ini_get('opcache.load_comments') === "0")) {
167159
throw AnnotationException::optimizerPlusLoadComments();
168160
}
169161

170-
if (extension_loaded('Zend OPcache') && ini_get('opcache.load_comments') == 0) {
162+
if (extension_loaded('Zend OPcache') && ini_get('opcache.load_comments') === "0") {
171163
throw AnnotationException::optimizerPlusLoadComments();
172164
}
173165
}

0 commit comments

Comments
 (0)