NEXT-33734 - Fix codestyle of PHP scripts and delete obsolete one

Author: mitelg

.gitlab/bin/split-coverage-report.php

@@ -36,10 +36,10 @@ return static function (array &$context) {
     $_SERVER['DATABASE_URL'] = 'mysql://_placeholder.test';
 
     $kernel = KernelFactory::create(
-        environment: $env,
-        debug: $debug,
-        classLoader: $classLoader,
-        pluginLoader: new ComposerPluginLoader($classLoader, null),
+        $env,
+        $debug,
+        $classLoader,
+        new ComposerPluginLoader($classLoader, null),
     );
 
     $application = new Application($kernel);

bin/ci

@@ -6,11 +6,6 @@ use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\Process\Process;
 
-if (\PHP_VERSION_ID < 70400) {
-    echo 'Your cli is running PHP version ' . \PHP_VERSION . ' but Shopware 6 requires at least PHP 7.4.0' . \PHP_EOL;
-    exit(1);
-}
-
 set_time_limit(0);
 
 $classLoader = require __DIR__ . '/../vendor/autoload.php';
@@ -20,12 +15,16 @@ if (!class_exists(Application::class) || !class_exists(Dotenv::class)) {
 }
 
 $input = new ArgvInput();
-if (null !== $env = $input->getParameterOption(['--env', '-e'], null, true)) {
-    putenv('APP_ENV=' . $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = $env);
+if ($env = $input->getParameterOption(['--env', '-e'], null, true) !== null) {
+    $_ENV['APP_ENV'] = $env;
+    $_SERVER['APP_ENV'] = $env;
+    putenv('APP_ENV=' . $env);
 }
 
 if ($input->hasParameterOption('--no-debug', true)) {
-    putenv('APP_DEBUG=' . $_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = '0');
+    $_ENV['APP_DEBUG'] = '0';
+    $_SERVER['APP_DEBUG'] = '0';
+    putenv('APP_DEBUG=0');
 }
 
 $projectRoot = dirname(__DIR__);
@@ -41,10 +40,10 @@ $cmd = escapeshellcmd($cmd);
 $args = array_map('escapeshellarg', $args);
 
 $command = $cmd . ' ' . implode(' ', $args);
-$process = Symfony\Component\Process\Process::fromShellCommandline($command);
+$process = Process::fromShellCommandline($command);
 $process->setTimeout(null);
 
-$isTty = (function () {
+$isTty = (static function () {
     $fd = defined('STDOUT') ? \STDOUT : fopen('php://stdout', 'wb');
 
     if (function_exists('stream_isatty')) {
@@ -57,13 +56,13 @@ $isTty = (function () {
 
     $stat = @fstat($fd);
 
-    return $stat ? 0020000 === ($stat['mode'] & 0170000) : false;
+    return $stat && ($stat['mode'] & 0170000) === 0020000;
 })();
 
 $process->setTty($isTty);
 $process->run(function ($type, $buffer): void {
     if ($type === Process::ERR) {
-        fwrite(\STDERR, "$buffer");
+        fwrite(\STDERR, (string) $buffer);
     } else {
         echo $buffer;
     }

bin/exec-with-env

@@ -4,6 +4,7 @@
 use Shopware\Core\Framework\Adapter\Kernel\KernelFactory;
 use Shopware\Core\Framework\Plugin\KernelPluginLoader\DbalKernelPluginLoader;
 use Shopware\Core\Framework\Plugin\KernelPluginLoader\StaticKernelPluginLoader;
+use Shopware\Core\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
 
@@ -39,14 +40,14 @@ return static function (array &$context) {
     }
 
     if (trim($context['DATABASE_URL'] ?? '') !== '' && !isset($context['INSTALL'])) {
-        $pluginLoader = new DbalKernelPluginLoader($classLoader, null, \Shopware\Core\Kernel::getConnection());
+        $pluginLoader = new DbalKernelPluginLoader($classLoader, null, Kernel::getConnection());
     }
 
     $kernel = KernelFactory::create(
-        environment: $env,
-        debug: $debug,
-        classLoader: $classLoader,
-        pluginLoader: $pluginLoader
+        $env,
+         $debug,
+        $classLoader,
+        $pluginLoader
     );
 
     $application = new Application($kernel);

bin/shopware

@@ -23,4 +23,5 @@
 if (InstalledVersions::isInstalled('symfony/web-profiler-bundle')) {
     $bundles[Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class] = ['dev' => true, 'test' => true, 'phpstan_dev' => true];
 }
+
 return $bundles;

config/bundles.php

@@ -1,9 +1,9 @@
 <?php declare(strict_types=1);
 
 use Shopware\Core\DevOps\Environment\EnvironmentHelper;
+use Shopware\Core\Framework\Adapter\Kernel\KernelFactory;
 use Shopware\Core\Framework\Plugin\KernelPluginLoader\ComposerPluginLoader;
 use Shopware\Core\Installer\InstallerKernel;
-use Shopware\Core\Framework\Adapter\Kernel\KernelFactory;
 
 $_SERVER['SCRIPT_FILENAME'] = __FILE__;
 
@@ -15,15 +15,14 @@
 
 $_SERVER['APP_RUNTIME_OPTIONS']['prod_envs'] = ['prod', 'e2e'];
 
-
 return function (array $context) {
     $classLoader = require __DIR__ . '/../vendor/autoload.php';
 
     if (!file_exists(dirname(__DIR__) . '/install.lock')) {
         $baseURL = str_replace(basename(__FILE__), '', $_SERVER['SCRIPT_NAME']);
         $baseURL = rtrim($baseURL, '/');
 
-        if (strpos($_SERVER['REQUEST_URI'], '/installer') === false) {
+        if (!str_contains($_SERVER['REQUEST_URI'], '/installer')) {
             header('Location: ' . $baseURL . '/installer');
             exit;
         }
@@ -56,9 +55,9 @@
     }
 
     return KernelFactory::create(
-        environment: $appEnv,
-        debug: $debug,
-        classLoader: $classLoader,
-        pluginLoader: $pluginLoader
+        $appEnv,
+        $debug,
+        $classLoader,
+        $pluginLoader
     );
 };