From ae88a243e43d7201b2c654d1c4b26ea34f052512 Mon Sep 17 00:00:00 2001
From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 15 Jun 2015 14:01:26 +0300
Subject: [PATCH] Rmoved opcache.load_comments.

---
 Zend/tests/bug55156.phpt                                     | 1 -
 ext/reflection/tests/005.phpt                                | 1 -
 ext/reflection/tests/009.phpt                                | 1 -
 ext/reflection/tests/025.phpt                                | 1 -
 ext/reflection/tests/ReflectionClass_getDocComment_001.phpt  | 1 -
 .../tests/ReflectionFunction_getDocComment.001.phpt          | 1 -
 .../tests/ReflectionMethod_getDocComment_basic.phpt          | 1 -
 ext/reflection/tests/ReflectionProperty_basic2.phpt          | 1 -
 .../tests/ReflectionProperty_getDocComment_basic.phpt        | 1 -
 ext/reflection/tests/bug36308.phpt                           | 1 -
 ext/reflection/tests/bug64936.phpt                           | 1 -
 php.ini-development                                          | 5 -----
 php.ini-production                                           | 5 -----
 13 files changed, 21 deletions(-)

diff --git a/Zend/tests/bug55156.phpt b/Zend/tests/bug55156.phpt
index 7d75ce3e94..137a43fcaa 100644
--- a/Zend/tests/bug55156.phpt
+++ b/Zend/tests/bug55156.phpt
@@ -2,7 +2,6 @@
 Bug #55156 (ReflectionClass::getDocComment() returns comment even though the class has none)
 --INI--
 opcache.save_comments=1
-opcache.load_comments=1
 --FILE--
 <?php
 
diff --git a/ext/reflection/tests/005.phpt b/ext/reflection/tests/005.phpt
index e257699b6f..e40fcc3099 100644
--- a/ext/reflection/tests/005.phpt
+++ b/ext/reflection/tests/005.phpt
@@ -2,7 +2,6 @@
 ReflectionMethod::getDocComment() uses wrong comment block
 --INI--
 opcache.save_comments=1
-opcache.load_comments=1
 --FILE--
 <?php
 
diff --git a/ext/reflection/tests/009.phpt b/ext/reflection/tests/009.phpt
index 81fe93a255..c6a252cfca 100644
--- a/ext/reflection/tests/009.phpt
+++ b/ext/reflection/tests/009.phpt
@@ -2,7 +2,6 @@
 ReflectionFunction basic tests
 --INI--
 opcache.save_comments=1
-opcache.load_comments=1
 --FILE--
 <?php
 
diff --git a/ext/reflection/tests/025.phpt b/ext/reflection/tests/025.phpt
index cd375454b5..0259d66bd3 100644
--- a/ext/reflection/tests/025.phpt
+++ b/ext/reflection/tests/025.phpt
@@ -4,7 +4,6 @@ ReflectionFunction basic tests
 <?php extension_loaded('reflection') or die('skip'); ?>
 --INI--
 opcache.save_comments=1
-opcache.load_comments=1
 --FILE--
 <?php
 
diff --git a/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt b/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt
index efa7e9a10a..624829f014 100644
--- a/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt
@@ -5,7 +5,6 @@ Robin Fernandes <robinf@php.net>
 Steve Seear <stevseea@php.net>
 --INI--
 opcache.save_comments=1
-opcache.load_comments=1
 --FILE--
 <?php
 /**
diff --git a/ext/reflection/tests/ReflectionFunction_getDocComment.001.phpt b/ext/reflection/tests/ReflectionFunction_getDocComment.001.phpt
index 68d1d9d3a1..2d5bb928b2 100644
--- a/ext/reflection/tests/ReflectionFunction_getDocComment.001.phpt
+++ b/ext/reflection/tests/ReflectionFunction_getDocComment.001.phpt
@@ -5,7 +5,6 @@ Robin Fernandes <robinf@php.net>
 Steve Seear <stevseea@php.net>
 --INI--
 opcache.save_comments=1
-opcache.load_comments=1
 --FILE--
 <?php
 
diff --git a/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt b/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt
index b04fb6c9fc..e79092421d 100644
--- a/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt
+++ b/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt
@@ -2,7 +2,6 @@
 ReflectionMethod::getDocComment()
 --INI--
 opcache.save_comments=1
-opcache.load_comments=1
 --FILE--
 <?php
 /**
diff --git a/ext/reflection/tests/ReflectionProperty_basic2.phpt b/ext/reflection/tests/ReflectionProperty_basic2.phpt
index bc42d3f828..62938df100 100644
--- a/ext/reflection/tests/ReflectionProperty_basic2.phpt
+++ b/ext/reflection/tests/ReflectionProperty_basic2.phpt
@@ -2,7 +2,6 @@
 Test usage of ReflectionProperty methods isDefault(), getModifiers(), getDeclaringClass() and getDocComment().
 --INI--
 opcache.save_comments=1
-opcache.load_comments=1
 --FILE--
 <?php
 
diff --git a/ext/reflection/tests/ReflectionProperty_getDocComment_basic.phpt b/ext/reflection/tests/ReflectionProperty_getDocComment_basic.phpt
index f94ee8ca4c..8491f32597 100644
--- a/ext/reflection/tests/ReflectionProperty_getDocComment_basic.phpt
+++ b/ext/reflection/tests/ReflectionProperty_getDocComment_basic.phpt
@@ -2,7 +2,6 @@
 Test ReflectionProperty::getDocComment() usage.
 --INI--
 opcache.save_comments=1
-opcache.load_comments=1
 --FILE--
 <?php
 
diff --git a/ext/reflection/tests/bug36308.phpt b/ext/reflection/tests/bug36308.phpt
index f923ee31ab..17d3cf1026 100644
--- a/ext/reflection/tests/bug36308.phpt
+++ b/ext/reflection/tests/bug36308.phpt
@@ -2,7 +2,6 @@
 Reflection Bug #36308 (ReflectionProperty::getDocComment() does not reflect extended class commentary)
 --INI--
 opcache.save_comments=1
-opcache.load_comments=1
 --FILE--
 <?php
 class Base {
diff --git a/ext/reflection/tests/bug64936.phpt b/ext/reflection/tests/bug64936.phpt
index 363a17f509..a4a66d4f48 100644
--- a/ext/reflection/tests/bug64936.phpt
+++ b/ext/reflection/tests/bug64936.phpt
@@ -2,7 +2,6 @@
 ReflectionMethod::getDocComment() uses left over doc comment from previous scanner run
 --INI--
 opcache.save_comments=1
-opcache.load_comments=1
 --SKIPIF--
 <?php
 if (!extension_loaded('reflection') || !extension_loaded('tokenizer')) print 'skip missing reflection of tokernizer extension';
diff --git a/php.ini-development b/php.ini-development
index 902d4b6b88..e81f288a46 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -1767,11 +1767,6 @@ ldap.max_links = -1
 ; size of the optimized code.
 ;opcache.save_comments=1
 
-; If disabled, PHPDoc comments are not loaded from SHM, so "Doc Comments"
-; may be always stored (save_comments=1), but not loaded by applications
-; that don't need them anyway.
-;opcache.load_comments=1
-
 ; If enabled, a fast shutdown sequence is used for the accelerated code
 ;opcache.fast_shutdown=0
 
diff --git a/php.ini-production b/php.ini-production
index 539a89aa20..f4bdf7bf7f 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -1767,11 +1767,6 @@ ldap.max_links = -1
 ; size of the optimized code.
 ;opcache.save_comments=1
 
-; If disabled, PHPDoc comments are not loaded from SHM, so "Doc Comments"
-; may be always stored (save_comments=1), but not loaded by applications
-; that don't need them anyway.
-;opcache.load_comments=1
-
 ; If enabled, a fast shutdown sequence is used for the accelerated code
 ;opcache.fast_shutdown=0
 
-- 
2.50.1