Compatibility with Symfony 6.0

.github/workflows/ci.yml

@@ -11,16 +11,34 @@ jobs:
       fail-fast: false
       matrix:
         php:
-          - '7.4'
           - '8.0'
           - '8.1'
           - '8.2'
-        composer:
-          - ''
-          - '--prefer-lowest'
+          - '8.3'
+          - '8.4'
+        symfony_version:
+          - '5.4.*'
+          - '6.0.*'
+          - '6.1.*'
+          - '6.2.*'
+          - '6.3.*'
+          - '6.4.*'
+        exclude:
+          # symfony 6.1+ requires PHP 8.1+
+          - php: '8.0'
+            symfony_version: '6.1.*'
+          - php: '8.0'
+            symfony_version: '6.2.*'
+          - php: '8.0'
+            symfony_version: '6.3.*'
+          - php: '8.0'
+            symfony_version: '6.4.*'
+#        deps:
+#          - 'highest'
+#          - 'lowest'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Use PHP
         uses: shivammathur/setup-php@v2
@@ -38,22 +56,27 @@ jobs:
 
       - name: cache dependencies
         id: angular-dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-${{ matrix.php }}-${{ matrix.composer }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ matrix.php }}-${{ matrix.composer }}-composer-
 
+      - name: Set Symfony minor version
+        run: |
+          sed -i 's|\("symfony/.*"\): ".*"|\1: "${{ matrix.symfony_version }}"|' composer.json
+        working-directory: ./
+
       - name: Validate composer.json and composer.lock
         run: composer validate
         working-directory: ./
 
       - name: Install dependencies
-        env:
-          COMPOSER_FLAGS: ${{ matrix.composer }}
-        run: composer update ${COMPOSER_FLAGS} --prefer-source
-        working-directory: ./
+        uses: ramsey/composer-install@v3
+        with:
+#          dependency-versions: '${{ matrix.deps }}'
+          working-directory: ./
 
       - name: Run Tests
         run: composer run-script ci-test

.github/workflows/qodana.yml

@@ -0,0 +1,59 @@
+name: Qodana
+on:
+  push:
+
+jobs:
+  qodana:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php:
+          - '8.1'
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Use PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: sqlite3, zip
+          coverage: xdebug
+          tools: composer:v2
+
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-dir)"
+        working-directory: ./
+
+      - name: cache dependencies
+        id: cache-dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-${{ matrix.php }}-${{ matrix.composer }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.php }}-${{ matrix.composer }}-composer-
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate
+        working-directory: ./
+
+      - name: Install dependencies
+        env:
+          COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
+          COMPOSER_FLAGS: ${{ matrix.composer }}
+        run: composer update ${COMPOSER_FLAGS} --prefer-source
+        working-directory: ./
+
+      - name: 'Qodana Scan'
+        uses: JetBrains/qodana-action@v2024.1
+        with:
+          args: --baseline,qodana.sarif.json
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}

.gitignore

@@ -3,3 +3,5 @@ Model/*/om
 vendor
 composer.lock
 composer.phar
+
+.phpunit.result.cache

Command/AbstractCommand.php

@@ -33,53 +33,49 @@
      * Additional Phing args to add in specialized commands.
      * @var array
      */
-    protected $additionalPhingArgs = array();
+    protected $additionalPhingArgs = [];
 
     /**
      * Temporary XML schemas used on command execution.
      * @var array
      */
-    protected $tempSchemas = array();
+    protected $tempSchemas = [];
 
     /**
      * @var string
      */
     protected $cacheDir = null;
 
     /**
      * The Phing output.
      * @string
      */
     protected $buffer = null;
 
     /**
      * @var Symfony\Component\HttpKernel\Bundle\BundleInterface
      */
     protected $bundle = null;
 
     /**
      * @var Boolean
      */
     private $alreadyWroteConnection = false;
 
     /**
      *
      * @var InputInterface
      */
     protected $input;
 
     /**
      *
      * @var OutputInterface
      */
     protected $output;
 
-    private ContainerInterface $container;
-
-    public function __construct(ContainerInterface $container, $name = null)
+    public function __construct(private ContainerInterface $container, $name = null)
     {
-        $this->container = $container;
-
         parent::__construct($name);
     }
 
@@ -88,15 +84,15 @@
         return $this->container;
     }
 
     /**
      * Return the package for a given bundle.
      *
      * @param Bundle $bundle
      * @param string $baseDirectory The base directory to exclude from prefix.
      *
      * @return string
      */
     protected function getPackage(Bundle $bundle, $namespace = '', $baseDirectory = '')
     {
         $path  = explode(DIRECTORY_SEPARATOR, realpath($bundle->getPath()));
         $bundle_namespace = explode('\\', $bundle->getNamespace());
@@ -138,7 +134,7 @@
     /**
      * {@inheritdoc}
      */
     protected function initialize(InputInterface $input, OutputInterface $output)
     {
         parent::initialize($input, $output);
 
@@ -153,7 +149,7 @@
 
         if ($input->hasArgument('bundle') && $input->getArgument('bundle')) {
             $bundleName = $input->getArgument('bundle');
-            if (0 === strpos($bundleName, '@')) {
+            if (str_starts_with($bundleName, '@')) {
                 $bundleName = substr($bundleName, 1);
             }
 
@@ -161,13 +157,13 @@
         }
     }
 
     /**
      * Call a Phing task.
      *
      * @param string $taskName   A Propel task name.
      * @param array  $properties An array of properties to pass to Phing.
      */
-    protected function callPhing($taskName, $properties = array())
+    protected function callPhing($taskName, $properties = [])
     {
         $kernel = $this->getApplication()->getKernel();
 
@@ -197,7 +193,7 @@
 
         // Add any arbitrary arguments last
         foreach ($this->additionalPhingArgs as $arg) {
-            if (in_array($arg, array('verbose', 'debug'))) {
+            if (in_array($arg, ['verbose', 'debug'])) {
                 $bufferPhingOutput = false;
             }
 
@@ -207,8 +203,8 @@
         $args[] = $taskName;
 
         // Enable output buffering
         Phing::setOutputStream(new \OutputStream(fopen('php://output', 'w')));
         Phing::setErrorStream(new \OutputStream(fopen('php://output', 'w')));
         Phing::startup();
         Phing::setProperty('phing.home', getenv('PHING_HOME'));
 
@@ -229,7 +225,7 @@
                 strstr($this->buffer, 'failed for the following reason:')) {
                 $returnStatus = false;
             }
-        } catch (\Exception $e) {
+        } catch (\Exception) {
             $returnStatus = false;
         }
 
@@ -251,10 +247,10 @@
 
         $base = ltrim(realpath($kernel->getProjectDir()), DIRECTORY_SEPARATOR);
 
         /** @var array<string, array{?BundleInterface, \SplFileInfo}> $finalSchemas */
         $finalSchemas = $this->getFinalSchemas($kernel, $this->bundle);
         foreach ($finalSchemas as $schema) {
-            list($bundle, $finalSchema) = $schema;
+            [$bundle, $finalSchema] = $schema;
 
             if ($bundle) {
                 $file = $cacheDir.DIRECTORY_SEPARATOR.'bundle-'.$bundle->getName().'-'.$finalSchema->getBaseName();
@@ -267,7 +263,7 @@
             // the package needs to be set absolute
             // besides, the automated namespace to package conversion has
             // not taken place yet so it needs to be done manually
             $database = simplexml_load_file($file);
 
             if (isset($database['package'])) {
                 // Do not use the prefix!
@@ -280,7 +276,7 @@
                     $database['package'] = $this->getPackageFromApp((string)$database['namespace']);
                 }
             } else {
                 throw new \RuntimeException(
                     sprintf(
                         '%s : Please define a `package` attribute or a `namespace` attribute for schema `%s`',
                         $bundle ? $bundle->getName() : 'App',
@@ -320,13 +316,13 @@
         }
     }
 
     /**
      * Return a list of final schema files that will be processed.
      *
      * @param \Symfony\Component\HttpKernel\KernelInterface $kernel
      *
      * @return array
      */
     protected function getFinalSchemas(KernelInterface $kernel, BundleInterface $bundle = null)
     {
         if (null !== $bundle) {
@@ -337,10 +333,10 @@
     }
 
     /**
      * @param  \SplFileInfo $file
      * @return string
      */
     protected function getRelativeFileName(\SplFileInfo $file)
     {
         return substr(str_replace(realpath($this->getContainer()->getParameter('kernel.project_dir')), '', $file), 1);
     }
@@ -351,7 +347,7 @@
      * @param KernelInterface $kernel The application kernel.
      * @param string          $file   Should be 'build.properties'.
      */
     protected function createBuildPropertiesFile(KernelInterface $kernel, $file)
     {
         $filesystem = new Filesystem();
         $buildPropertiesFile = $kernel->getProjectDir().'/app/config/propel.ini';
@@ -368,12 +364,12 @@
      *
      * @param string $file Should be 'buildtime-conf.xml'.
      */
     protected function createBuildTimeFile($file)
     {
         $container = $this->getContainer();
 
         if (!$container->has('propel.configuration')) {
             throw new \InvalidArgumentException('Could not find Propel configuration.');
         }
 
         $xml = strtr(<<<EOT
@@ -383,7 +379,7 @@
     <datasources default="%default_connection%">
 
 EOT
-        , array('%default_connection%' => $container->getParameter('propel.dbal.default_connection')));
+        , ['%default_connection%' => $container->getParameter('propel.dbal.default_connection')]);
 
         $propelConfiguration = $container->get('propel.configuration');
         foreach ($propelConfiguration['datasources'] as $name => $datasource) {
@@ -403,14 +399,14 @@
       </datasource>
 
 EOT
-            , array(
+            , [
                 '%name%'     => $name,
                 '%adapter%'  => $datasource['adapter'],
                 '%classname%'=> $datasource['connection']['classname'],
                 '%dsn%'      => $datasource['connection']['dsn'],
                 '%username%' => $datasource['connection']['user'],
-                '%password%' => isset($datasource['connection']['password']) ? $datasource['connection']['password'] : '',
-            ));
+                '%password%' => $datasource['connection']['password'] ?? '',
+            ]);
         }
 
         $xml .= <<<EOT
@@ -422,24 +418,24 @@
         file_put_contents($file, $xml);
     }
 
     /**
      * Returns an array of properties as key/value pairs from an input file.
      *
      * @param  string $file A file properties.
      * @return array  An array of properties as key/value pairs.
      */
     protected function getProperties($file)
     {
-        $properties = array();
+        $properties = [];
 
         if (false === $lines = @file($file)) {
             throw new \Exception(sprintf('Unable to parse contents of "%s".', $file));
         }
 
         foreach ($lines as $line) {
             $line = trim($line);
 
-            if ('' == $line || in_array($line[0], array('#', ';'))) {
+            if ('' == $line || in_array($line[0], ['#', ';'])) {
                 continue;
             }
 
@@ -487,11 +483,11 @@
     }
 
     /**
      * @return \Symfony\Component\Config\FileLocatorInterface
      */
     protected function getFileLocator()
     {
         return $this->getContainer()->get('propel.file_locator');
     }
 
     /**
@@ -515,7 +511,7 @@
      * @throw \InvalidArgumentException If the connection does not exist.
      * @return array
      */
     protected function getConnection(InputInterface $input, OutputInterface $output)
     {
         $propelConfiguration = $this->getContainer()->get('propel.configuration');
         $name = $input->getOption('connection') ?: $this->getContainer()->getParameter('propel.dbal.default_connection');
@@ -523,7 +519,7 @@
         if (isset($propelConfiguration['datasources'][$name])) {
             $defaultConfig = $propelConfiguration['datasources'][$name];
         } else {
             throw new \InvalidArgumentException(sprintf('Connection named %s doesn\'t exist', $name));
         }
 
         if (false === $this->alreadyWroteConnection) {
@@ -538,7 +534,7 @@
             $defaultConfig['connection']['password'] = null;
         }
 
-        return array($name, $defaultConfig);
+        return [$name, $defaultConfig];
     }
 
     /**
@@ -547,27 +543,23 @@
      * @param  string $dsn A DSN
      * @return string The database name extracted from the given DSN
      */
     protected function parseDbName($dsn)
     {
         preg_match('#dbname=([a-zA-Z0-9\_]+)#', $dsn, $matches);
 
-        if (isset($matches[1])) {
-            return $matches[1];
-        }
-
         // e.g. SQLite
-        return null;
+        return $matches[1] ?? null;
     }
 
     /**
      * Check the PropelConfiguration object.
      */
     protected function checkConfiguration()
     {
         $parameters = $this->getContainer()->get('propel.configuration')->getParameters();
 
         if (!isset($parameters['datasources']) || 0 === count($parameters['datasources'])) {
             throw new \RuntimeException('Propel should be configured (no database configuration found).');
         }
     }
 
@@ -577,10 +569,10 @@
      * @param OutputInterface $output   The output object.
      * @param string          $taskname A task name
      */
     protected function writeSummary(OutputInterface $output, $taskname)
     {
         foreach (explode("\n", $this->buffer) as $line) {
-            if (false !== strpos($line, '[' . $taskname . ']')) {
+            if (str_contains($line, '[' . $taskname . ']')) {
                 $arr  = preg_split('#\[' . $taskname . '\] #', $line);
                 $info = $arr[1];
 
@@ -601,13 +593,13 @@
      * @param string          $text   A text message.
      * @param string          $style  A style to apply on the section.
      */
     protected function writeSection(OutputInterface $output, $text, $style = 'bg=blue;fg=white')
     {
-        $output->writeln(array(
+        $output->writeln([
             '',
             $this->getHelperSet()->get('formatter')->formatBlock($text, $style, true),
             '',
-        ));
+        ]);
     }
 
     /**
@@ -617,22 +609,22 @@
      * @param string          $taskName A task name.
      * @param Boolean         $more     Whether to add a 'more details' message or not.
      */
     protected function writeTaskError($output, $taskName, $more = true)
     {
         $moreText = $more ? ' To get more details, run the command with the "--verbose" option.' : '';
 
-        return $this->writeSection($output, array(
+        return $this->writeSection($output, [
             '[Propel] Error',
             '',
             'An error has occured during the "' . $taskName . '" task process.' . $moreText
-        ), 'fg=white;bg=red');
+        ], 'fg=white;bg=red');
     }
 
     /**
      * @param OutputInterface $output   The output.
      * @param string          $filename The filename.
      */
     protected function writeNewFile(OutputInterface $output, $filename)
     {
         $output->writeln('>>  <info>File+</info>    ' . $filename);
     }
@@ -641,7 +633,7 @@
      * @param OutputInterface $output    The output.
      * @param string          $directory The directory.
      */
     protected function writeNewDirectory(OutputInterface $output, $directory)
     {
         $output->writeln('>>  <info>Dir+</info>     ' . $directory);
     }
@@ -653,17 +645,17 @@
      * @param string          $question A given question.
      * @param string          $default  A default response.
      */
     protected function askConfirmation(OutputInterface $output, $question, $default = null)
     {
         return $this->getHelper('question')->ask($this->input, $output, new ConfirmationQuestion($question, $default));
     }
 
     /**
      * @param  \SplFileInfo    $schema
      * @param  BundleInterface $bundle
      * @return string
      */
     protected function transformToLogicalName(\SplFileInfo $schema, BundleInterface $bundle)
     {
         $schemaPath = str_replace(
             $bundle->getPath(). DIRECTORY_SEPARATOR . 'Resources' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR,
@@ -678,12 +670,12 @@
      * Compiles arguments/properties for the Phing process.
      * @return array
      */
     private function getPhingArguments(KernelInterface $kernel, $workingDirectory, $properties)
     {
-        $args = array();
+        $args = [];
 
         // Default properties
-        $properties = array_merge(array(
+        $properties = array_merge([
             'propel.database'           => 'mysql',
             'project.dir'               => $workingDirectory,
             'propel.output.dir'         => $kernel->getProjectDir().'/app/propel',
@@ -696,7 +688,7 @@
             'propel.addClassLevelComment'       => false,
             'propel.defaultTimeStampFormat'     => '',
             'propel.builder.pluralizer.class'   => 'builder.util.StandardEnglishPluralizer',
-        ), $properties);
+        ], $properties);
 
         // Adding user defined properties from the configuration
         $properties = array_merge(