Merge pull request #59 from mpalourdio/opcache.load_comments

opcache.load_comments has been removed from PHP 7

Author: guilhermeblanco

.travis.yml

@@ -11,6 +11,7 @@ php:
  - 5.4
  - 5.5
  - 5.6
+ - 7
  - hhvm
 
 before_script:

lib/Doctrine/Common/Annotations/AnnotationReader.php

@@ -162,13 +162,14 @@ public function __construct()
  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 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) {
- throw AnnotationException::optimizerPlusLoadComments();
+ if (extension_loaded('Zend OPcache') && ini_get('opcache.load_comments') == 0) {
+ throw AnnotationException::optimizerPlusLoadComments();
+ }
  }
 
  AnnotationRegistry::registerFile(__DIR__ . '/Annotation/IgnoreAnnotation.php');

tests/Doctrine/Tests/Common/Annotations/DocParserTest.php

@@ -1180,6 +1180,11 @@ public function testCastNegativeFloat()
 
  public function testReservedKeywordsInAnnotations()
  {
+ if (PHP_VERSION_ID >= 70000) {
+ $this->markTestSkipped('This test requires PHP 5.6 or lower.');
+ }
+ require 'ReservedKeywordsClasses.php';
+
  $parser = $this->createTestParser();
 
  $result = $parser->parse('@Doctrine\Tests\Common\Annotations\True');
@@ -1356,15 +1361,6 @@ class Marker {
  public $value;
 }
 
-/** @Annotation */
-class True {}
-
-/** @Annotation */
-class False {}
-
-/** @Annotation */
-class Null {}
-
 namespace Doctrine\Tests\Common\Annotations\FooBar;
 
 /** @Annotation */

tests/Doctrine/Tests/Common/Annotations/ReservedKeywordsClasses.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Doctrine\Tests\Common\Annotations;
+
+/** @Annotation */
+class True {}
+
+/** @Annotation */
+class False {}
+
+/** @Annotation */
+class Null {}