Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix broken merge on Zend Opcache check.
  • Loading branch information
beberlei committed Jun 17, 2015
1 parent 735b6c5 commit 6eeadf5
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions lib/Doctrine/Common/Annotations/AnnotationReader.php
Expand Up @@ -154,20 +154,12 @@ static public function addGlobalIgnoredName($name)
*/
public function __construct()
{
if (extension_loaded('Zend Optimizer+') && (ini_get('zend_optimizerplus.save_comments') === "0" || ini_get('opcache.save_comments') === "0")) {
throw AnnotationException::optimizerPlusSaveComments();
}

if (extension_loaded('Zend OPcache') && ini_get('opcache.save_comments') == 0) {
throw AnnotationException::optimizerPlusSaveComments();
}

if (PHP_VERSION_ID < 70000) {
if (extension_loaded('Zend Optimizer+') && (ini_get('zend_optimizerplus.load_comments') === "0" || ini_get('opcache.load_comments') === "0")) {
throw AnnotationException::optimizerPlusLoadComments();
}

if (extension_loaded('Zend OPcache') && ini_get('opcache.load_comments') == 0) {
if (extension_loaded('Zend OPcache') && ini_get('opcache.load_comments') === "0") {
throw AnnotationException::optimizerPlusLoadComments();
}
}
Expand Down

0 comments on commit 6eeadf5

Please sign in to comment.