Merge pull request #133 from mringler/phpunit10

Upgrade to phpunit 10

Author: mringler

.github/workflows/ci.yml

@@ -95,7 +95,7 @@ jobs:
               shell: bash
               run: |
                 if [[ ${{ matrix.php-version }} == '8.1' && ${{ matrix.symfony-version }} == '6-max' ]]; then
-                  export CODECOVERAGE=1 && vendor/bin/phpunit -c tests/${{ matrix.db-type }}.phpunit.xml --verbose --coverage-clover=tests/coverage.xml
+                  export CODECOVERAGE=1 && vendor/bin/phpunit -c tests/${{ matrix.db-type }}.phpunit.xml --coverage-clover=tests/coverage.xml
                 else
                   vendor/bin/phpunit -c tests/${{ matrix.db-type }}.phpunit.xml
                 fi

composer.json

@@ -40,7 +40,7 @@
     "require-dev": {
         "monolog/monolog": "^1.3 || ^2.3 || ^3.0",
         "phpstan/phpstan": "^2.0",
-        "phpunit/phpunit": "^9.5.0",
+        "phpunit/phpunit": "^10.0",
         "spryker/code-sniffer": "^0.17.2",
         "psalm/phar": "^6",
         "mikey179/vfsstream": "^1.6",
@@ -72,7 +72,7 @@
         "psalm-update-baseline": "vendor/bin/psalm.phar --update-baseline",
         "psalm-set-baseline": "vendor/bin/psalm.phar --set-baseline=psalm-baseline.xml",
         "psalm-update-report": "vendor/bin/psalm.phar --report=psalm-report.xml",
-        "test": "phpunit --colors=always",
+        "test": "phpunit --colors=always --display-phpunit-deprecations",
         "test:agnostic": "@test -c tests/agnostic.phpunit.xml",
         "test:mysql": "@test -c tests/mysql.phpunit.xml",
         "test:sqlite": "@test -c tests/sqlite.phpunit.xml",

phpunit.xml.dist

@@ -8,35 +8,32 @@
     bootstrap="tests/bootstrap.php"
     xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
 >
-
-    <testsuites>
-        <testsuite name="propel2">
-            <directory>tests/Propel/Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <groups>
-        <exclude>
-            <group>pgsql</group>
-            <group>mysql</group>
-        </exclude>
-    </groups>
-
-    <php>
-        <env name="DB" value="mysql"/> <!-- mysql, sqlite, pgsql -->
-        <env name="DB_USER" value=""/>
-        <env name="DB_PW" value=""/>
-    </php>
-
-    <logging />
-
-    <coverage>
-        <include>
-            <directory>src/Propel/</directory>
-        </include>
-        <report>
-            <php outputFile="tests/clover.cov" />
-        </report>
-    </coverage>
-
+  <testsuites>
+    <testsuite name="propel2">
+      <directory>tests/Propel/Tests/</directory>
+    </testsuite>
+  </testsuites>
+  <groups>
+    <exclude>
+      <group>pgsql</group>
+      <group>mysql</group>
+    </exclude>
+  </groups>
+  <php>
+    <!-- DB is one of mysql, sqlite, pgsql -->
+    <env name="DB" value="mysql"/>
+    <env name="DB_USER" value=""/>
+    <env name="DB_PW" value=""/>
+  </php>
+  <logging/>
+  <coverage>
+    <report>
+      <php outputFile="tests/clover.cov"/>
+    </report>
+  </coverage>
+  <source>
+    <include>
+      <directory>src/Propel/</directory>
+    </include>
+  </source>
 </phpunit>

src/Propel/Common/Config/ConfigurationManager.php

@@ -26,7 +26,9 @@
 use function getcwd;
 use function implode;
 use function in_array;
+use function is_array;
 use function is_dir;
+use function is_int;
 use function is_string;
 use function ksort;
 use function str_ends_with;
@@ -74,9 +76,8 @@ public function __construct(?string $path = null, ?array $extraConf = [])
                 throw new RuntimeException('Cannot get the current working directory');
             }
         }
-        if ($extraConf === null) {
-            $extraConf = [];
-        }
+        $extraConf = static::deflateConfigurationArray($extraConf ?? []);
+
         $this->config = $this->loadConfig($path, $extraConf);
         $this->process();
     }
@@ -407,7 +408,7 @@ private function cleanupConnections(): void
     }
 
     /**
-     * @param array<string, mixed> $maybeKeyValues
+     * @param array<mixed> $maybeKeyValues
      * @param string $separator
      *
      * @throws \RuntimeException
@@ -422,6 +423,14 @@ public static function deflateConfigurationArray(array $maybeKeyValues, string $
         $deflatedConfigs = [];
         $wrapArray = fn (array $config, string $key) => [$key => $config];
         foreach ($maybeKeyValues as $maybePath => $payload) {
+            if (is_array($payload)) {
+                $payload = static::deflateConfigurationArray($payload, $separator);
+            }
+            if (is_int($maybePath)) {
+                $deflatedConfigs[] = [$maybePath => $payload];
+
+                continue;
+            }
             $sections = explode($separator, $maybePath);
             $lastKey = array_pop($sections);
             $reversedSections = array_reverse($sections);

src/Propel/Generator/Model/Column.php

@@ -8,6 +8,7 @@
 use LogicException;
 use Propel\Common\Util\SetColumnConverter;
 use Propel\Generator\Exception\EngineException;
+use Propel\Generator\Exception\LogicException as ExceptionLogicException;
 use Propel\Generator\Platform\PlatformInterface;
 use function addcslashes;
 use function count;
@@ -228,17 +229,20 @@ class Column extends MappingModel
      * @param string $name The column's name
      * @param string|null $type The column's type
      * @param string|int|null $size The column's size
+     *
+     * @throws \LogicException
      */
     public function __construct(string $name, ?string $type = null, $size = null)
     {
         $this->setName($name);
 
         if ($type !== null) {
             $this->setType($type);
-        }
-
-        if ($size !== null) {
-            $this->setSize((int)$size);
+            if ($size !== null) {
+                $this->setSize((int)$size);
+            }
+        } elseif ($size !== null) {
+            throw new ExceptionLogicException('Cannot set column size without type');
         }
     }
 

src/Propel/Generator/Util/VfsTrait.php

@@ -18,16 +18,14 @@ trait VfsTrait
     /**
      * @var \org\bovigo\vfs\vfsStreamDirectory
      */
-    private $root;
+    private vfsStreamDirectory|null $root = null;
 
     /**
      * @return \org\bovigo\vfs\vfsStreamDirectory
      */
     public function getRoot(): vfsStreamDirectory
     {
-        if ($this->root === null) {
-            $this->root = vfsStream::setup();
-        }
+        $this->root ??= vfsStream::setup();
 
         return $this->root;
     }

tests/Propel/Tests/Common/Config/ConfigurationManagerTest.php

@@ -9,6 +9,7 @@
 namespace Propel\Tests\Common\Config;
 
 use org\bovigo\vfs\vfsStream;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Propel\Common\Config\ConfigurationManager;
 use Propel\Common\Config\Exception\InvalidArgumentException;
 use Propel\Tests\TestCase;
@@ -460,10 +461,9 @@ classname: Propel\Runtime\Connection\DebugPDO
     }
 
     /**
-     * @dataProvider providerForInvalidConnections
-     *
      * @return void
      */
+    #[DataProvider('providerForInvalidConnections')]
     public function testRuntimeOrGeneratorConnectionIsNotInConfiguredConnectionsThrowsException($yamlConf, $section)
     {
         $this->expectException(InvalidConfigurationException::class);
@@ -473,10 +473,9 @@ public function testRuntimeOrGeneratorConnectionIsNotInConfiguredConnectionsThro
     }
 
     /**
-     * @dataProvider providerForInvalidDefaultConnection
-     *
      * @return void
      */
+    #[DataProvider('providerForInvalidDefaultConnection')]
     public function testRuntimeOrGeneratorDefaultConnectionIsNotInConfiguredConnectionsThrowsException($yamlConf, $section)
     {
         $this->expectException(InvalidConfigurationException::class);
@@ -864,7 +863,7 @@ classname: Propel\Runtime\Connection\DebugPDO
   /**
    * @return array<array>
    */
-  public function deflateConfigurationDataProvider(): array
+  public static function deflateConfigurationDataProvider(): array
   {
     return [
       [['foo' => 42], ['foo' => 42]],
@@ -874,12 +873,12 @@ public function deflateConfigurationDataProvider(): array
   }
 
   /**
-   * @dataProvider deflateConfigurationDataProvider
-   *
    * @param array $flattenedConfig
    * @param array $expectedArray
+   *
    * @return void
    */
+  #[DataProvider('deflateConfigurationDataProvider')]
   public function testDeflateConfiguration(array $flattenedConfig, array $expectedArray)
   {
     $actualArray = ConfigurationManager::deflateConfigurationArray($flattenedConfig);

tests/Propel/Tests/Common/Config/DataProviderTrait.php

@@ -16,7 +16,7 @@ trait DataProviderTrait
     /**
      * @return string[][]
      */
-    public function providerForInvalidConnections()
+    public static function providerForInvalidConnections()
     {
         return [
             ["
@@ -113,7 +113,7 @@ classname: Propel\Runtime\Connection\DebugPDO
     /**
      * @return string[][]
      */
-    public function providerForInvalidDefaultConnection()
+    public static function providerForInvalidDefaultConnection()
     {
         return [
             ["
@@ -176,7 +176,7 @@ classname: Propel\Runtime\Connection\DebugPDO
     /**
      * @return array
      */
-    public function providerForXmlToArrayConverter()
+    public static function providerForXmlToArrayConverter()
     {
         $moviesXml = <<<EOF
 <?xml version='1.0' standalone='yes'?>
@@ -329,7 +329,7 @@ public function providerForXmlToArrayConverter()
     /**
      * @return array
      */
-    public function providerForXmlToArrayConverterXmlInclusions()
+    public static function providerForXmlToArrayConverterXmlInclusions()
     {
         $xmlOne = <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>

tests/Propel/Tests/Common/Config/Loader/FileLoaderTest.php

@@ -8,6 +8,7 @@
 
 namespace Propel\Tests\Common\Config\Loader;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Propel\Common\Config\Exception\InvalidArgumentException;
 use Propel\Common\Config\Exception\RuntimeException;
 use Propel\Common\Config\Loader\FileLoader as BaseFileLoader;
@@ -26,7 +27,7 @@ public function setUp(): void
         $this->loader = new TestableFileLoader();
     }
 
-    public function resolveParamsProvider()
+    public static function resolveParamsProvider()
     {
         return [
             [
@@ -164,10 +165,9 @@ public function testResolveParams()
     }
 
     /**
-     * @dataProvider resolveParamsProvider
-     *
      * @return void
      */
+    #[DataProvider('resolveParamsProvider')]
     public function testResolveValues($conf, $expected, $message)
     {
         $this->assertEquals($expected, $this->loader->resolveParams($conf), $message);

tests/Propel/Tests/Common/Config/XmlToArrayConverterTest.php

@@ -21,10 +21,9 @@ class XmlToArrayConverterTest extends TestCase
     use DataProviderTrait;
 
     /**
-     * @dataProvider providerForXmlToArrayConverter
-     *
      * @return void
      */
+    #[\PHPUnit\Framework\Attributes\DataProvider('providerForXmlToArrayConverter')]
     public function testConvertFromString(string $xml, $expected)
     {
         $actual = XmlToArrayConverter::convert($xml);
@@ -33,10 +32,9 @@ public function testConvertFromString(string $xml, $expected)
     }
 
     /**
-     * @dataProvider providerForXmlToArrayConverter
-     *
      * @return void
      */
+    #[\PHPUnit\Framework\Attributes\DataProvider('providerForXmlToArrayConverter')]
     public function testConvertFromFile($xml, $expected)
     {
         $file = $this->newFile('testconvert.xml', $xml);
@@ -46,10 +44,9 @@ public function testConvertFromFile($xml, $expected)
     }
 
     /**
-     * @dataProvider providerForXmlToArrayConverterXmlInclusions
-     *
      * @return void
      */
+    #[\PHPUnit\Framework\Attributes\DataProvider('providerForXmlToArrayConverterXmlInclusions')]
     public function testConvertFromFileWithXmlInclusion($xmlLoad, $xmlInclude, $expected)
     {
         $this->newFile('testconvert.xml', $xmlLoad);