[Debug] workaround opcache bug mutating "$this" !?!

Merge branch '2.8' into 3.4
* 2.8: [Form] Hardened test suite for empty data Bump phpunit XSD version to 5.2 Add required key attribute
2026-03-25 01:32:09 +01:00 · 2018-11-27 13:43:10 +01:00 · 2018-11-11 20:48:54 +01:00 · 2018-11-11 12:18:13 +01:00
2 changed files with 7 additions and 7 deletions
--- a/DebugClassLoader.php
+++ b/DebugClassLoader.php
@@ -138,14 +138,14 @@ class DebugClassLoader
        try {
            if ($this->isFinder && !isset($this->loaded[$class])) {
                $this->loaded[$class] = true;
-                if ($file = $this->classLoader[0]->findFile($class) ?: false) {
-                    $wasCached = \function_exists('opcache_is_script_cached') && @opcache_is_script_cached($file);
-
+                if (!$file = $this->classLoader[0]->findFile($class) ?: false) {
+                    // no-op
+                } elseif (\function_exists('opcache_is_script_cached') && @opcache_is_script_cached($file)) {
                    require $file;

-                    if ($wasCached) {
-                        return;
-                    }
+                    return;
+                } else {
+                    require $file;
                }
            } else {
                \call_user_func($this->classLoader, $class);
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
         backupGlobals="false"
         colors="true"
         bootstrap="vendor/autoload.php"