Merge pull request #17 from koolkode/Cleanup2

Address Change Requests

Author: beberlei

Zend/tests/attributes/013_class_scope.phpt

@@ -40,6 +40,16 @@ class C2
 
 $ref = new \ReflectionClass(C2::class);
 print_r($ref->getMethod('foo')->getAttributes()[0]->getArguments());
+
+$ref = new \ReflectionClass(T1::class);
+$attr = $ref->getMethod('foo')->getAttributes()[0];
+
+try {
+	$attr->getArguments();
+} catch (\Error $e) {
+    var_dump('ERROR 1', $e->getMessage());
+}
+
 echo "\n";
 
 class C3
@@ -98,6 +108,8 @@ Array
     [0] => C2
     [1] => bar
 )
+string(7) "ERROR 1"
+string(36) "Undefined class constant 'self::FOO'"
 
 bool(true)
 string(3) "bar"

ext/opcache/zend_file_cache.c

@@ -411,13 +411,8 @@ static void zend_file_cache_serialize_attribute(zval                     *zv,
 	attr = Z_PTR_P(zv);
 	UNSERIALIZE_PTR(attr);
 
-	if (!IS_SERIALIZED(attr->name)) {
-		SERIALIZE_STR(attr->name);
-	}
-
-	if (!IS_SERIALIZED(attr->lcname)) {
-		SERIALIZE_STR(attr->lcname);
-	}
+	SERIALIZE_STR(attr->name);
+	SERIALIZE_STR(attr->lcname);
 
 	for (i = 0; i < attr->argc; i++) {
 		zend_file_cache_serialize_zval(&attr->argv[i], script, info, buf);
@@ -1179,13 +1174,8 @@ static void zend_file_cache_unserialize_attribute(zval *zv, zend_persistent_scri
 	UNSERIALIZE_PTR(Z_PTR_P(zv));
 	attr = Z_PTR_P(zv);
 
-	if (!IS_UNSERIALIZED(attr->name)) {
-		UNSERIALIZE_STR(attr->name);
-	}
-
-	if (!IS_UNSERIALIZED(attr->lcname)) {
-		UNSERIALIZE_STR(attr->lcname);
-	}
+	UNSERIALIZE_STR(attr->name);
+	UNSERIALIZE_STR(attr->lcname);
 
 	for (i = 0; i < attr->argc; i++) {
 		zend_file_cache_unserialize_zval(&attr->argv[i], script, buf);