Merge branch '8.5' into 9.5

sebastianbergmann · Feb 18, 2022 · 82368f6 · 82368f6
2 parents 4283903 + d4f823e
commit 82368f6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -5,6 +5,6 @@
   <phar name="phpdox" version="^0.12" installed="0.12.0" location="./tools/phpdox" copy="true"/>
   <phar name="phploc" version="^4.0" installed="4.0.1" location="./tools/phploc" copy="true"/>
   <phar name="psalm" version="^4.0" installed="4.20.0" location="./tools/psalm" copy="true"/>
-  <phar name="humbug/php-scoper" version="^0.15.0" installed="0.15.0" location="./tools/php-scoper" copy="true"/>
+  <phar name="humbug/php-scoper" version="^0.17.0" installed="0.17.0" location="./tools/php-scoper" copy="true"/>
   <phar name="composer" version="^2.0.3" installed="2.2.6" location="./tools/composer" copy="true"/>
 </phive>
diff --git a/build/config/php-scoper.php b/build/config/php-scoper.php
@@ -9,8 +9,11 @@
  */
 
 return [
-    'whitelist' => [
-        'PHPUnit\*',
-        'Prophecy\*',
+    'exclude-namespaces' => [
+        'PHPUnit',
+        'Prophecy'
+    ],
+    'expose-constants' => [
+        '/^__PHPUNIT_.+$/'
     ],
 ];
diff --git a/tools/php-scoper b/tools/php-scoper