Merge branch '6.x' into namespace-select

redaxo · Apr 17, 2024 · b1e4595 · b1e4595
2 parents a9cd07a + ef01003
commit b1e4595
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/.tools/psalm/baseline.xml b/.tools/psalm/baseline.xml
@@ -1485,11 +1485,6 @@
       <code><![CDATA[$this->getParsedArg('suffix')]]></code>
     </PossiblyNullOperand>
   </file>
-  <file src="redaxo/src/core/lib/var_dumper.php">
-    <ArgumentTypeCoercion>
-      <code><![CDATA[$line]]></code>
-    </ArgumentTypeCoercion>
-  </file>
   <file src="redaxo/src/core/lib/view.php">
     <MixedArgument>
       <code><![CDATA[$pageObj]]></code>
@@ -4671,6 +4666,11 @@
       <code><![CDATA[$cast[2]]]></code>
     </PossiblyUndefinedArrayOffset>
   </file>
+  <file src="src/Util/VarDumper.php">
+    <ArgumentTypeCoercion>
+      <code><![CDATA[$line]]></code>
+    </ArgumentTypeCoercion>
+  </file>
   <file src="src/Util/Version.php">
     <FalsableReturnStatement>
       <code><![CDATA[0 === $exitCode ? $version : null]]></code>

diff --git a/rector.php b/rector.php
@@ -272,6 +272,7 @@
         'rex_string' => Util\Str::class,
         'rex_timer' => Util\Timer::class,
         'rex_type' => Util\Type::class,
+        'rex_var_dumper' => Util\VarDumper::class,
         'rex_factory_trait' => Base\FactoryTrait::class,
         'rex_instance_list_pool_trait' => Base\InstanceListPoolTrait::class,
         'rex_instance_pool_trait' => Base\InstancePoolTrait::class,

diff --git a/redaxo/src/core/boot.php b/redaxo/src/core/boot.php
@@ -21,6 +21,7 @@
 use Redaxo\Core\Security\UserRole;
 use Redaxo\Core\Translation\I18n;
 use Redaxo\Core\Util\Timer;
+use Redaxo\Core\Util\VarDumper;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -132,7 +133,7 @@
 }
 
 rex_error_handler::register();
-rex_var_dumper::register();
+VarDumper::register();
 
 // ----------------- REX PERMS
 

diff --git a/redaxo/src/core/lib/var_dumper.php → src/Util/VarDumper.php b/redaxo/src/core/lib/var_dumper.php → src/Util/VarDumper.php
@@ -1,17 +1,20 @@
 <?php
 
+namespace Redaxo\Core\Util;
+
 use Redaxo\Core\Core;
 use Redaxo\Core\Filesystem\Path;
 use Redaxo\Core\Security\BackendLogin;
-use Redaxo\Core\Util\Editor;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
 use Symfony\Component\VarDumper\Dumper\CliDumper;
 use Symfony\Component\VarDumper\Dumper\ContextProvider\SourceContextProvider;
 use Symfony\Component\VarDumper\Dumper\ContextualizedDumper;
 use Symfony\Component\VarDumper\Dumper\HtmlDumper;
-use Symfony\Component\VarDumper\VarDumper;
+use Symfony\Component\VarDumper\VarDumper as BaseVarDumper;
+
+use const PHP_SAPI;
 
-abstract class rex_var_dumper
+abstract class VarDumper
 {
     private static ?VarCloner $cloner = null;
     private static ?ContextualizedDumper $dumper = null;
@@ -21,16 +24,16 @@ abstract class rex_var_dumper
      */
     public static function register()
     {
-        VarDumper::setHandler(static function ($var, ?string $label = null) {
+        BaseVarDumper::setHandler(static function ($var, ?string $label = null) {
             if (Core::isDebugMode() || ($user = BackendLogin::createUser()) && $user->isAdmin()) {
-                VarDumper::setHandler(self::dump(...));
+                BaseVarDumper::setHandler(self::dump(...));
                 self::dump($var, $label);
 
                 return;
             }
 
             // register noop handler for non-admins (if not in debug mode)
-            VarDumper::setHandler(static function () {
+            BaseVarDumper::setHandler(static function () {
                 // noop
             });
         });