fix: ci error

mon-petit-placement · Apr 18, 2024 · 798a323 · 798a323
1 parent 8b9f85c
commit 798a323
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ name: CI
 on: [push, pull_request]
 
 jobs:
-  build:
+  test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -21,7 +21,7 @@ jobs:
             db: mysql
             vars: '-e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ROOT_PASSWORD=travis'
             db_port: 3306
-            health: '--health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=10s --health-retries=10'
+            health: '--health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3'
           - db_image_name: percona
             db_image_version: 8
             db: mysql
@@ -30,16 +30,16 @@ jobs:
             health: '--health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=10s --health-retries=10'
           - db_image_name: postgres
             db_image_version: 15
-            db: mysql
+            db: pgsql
             vars: '-e POSTGRES_DB=doctrine_extensions_tests -e POSTGRES_USER=travis -e POSTGRES_PASSWORD=travis'
             health: '--health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5'
             db_port: 5432
 
     services:
       database:
-        image: ${{ matrix.db_image }}
+        image: ${{ matrix.db_image_name }}:${{ matrix.db_image_version }}
         ports:
-          - ${{ matrix.db_port }}:{{ matrix.db_port }}
+          - ${{ matrix.db_port }}:${{ matrix.db_port }}
         options: >-
           ${{ matrix.vars }}
           ${{ matrix.health }}

diff --git a/src/Oro/ORM/Query/AST/FunctionFactory.php b/src/Oro/ORM/Query/AST/FunctionFactory.php
@@ -16,8 +16,11 @@ class FunctionFactory
      *
      * @throws QueryException
      */
-    public static function create(AbstractPlatform $platform, string $functionName, array $parameters): PlatformFunctionNode
-    {
+    public static function create(
+        AbstractPlatform $platform,
+        string $functionName,
+        array $parameters
+    ): PlatformFunctionNode {
         if ($platform instanceof PostgreSQLPlatform) {
             $platformName = 'postgresql';
         } elseif ($platform instanceof MySQLPlatform) {

diff --git a/tests/config/mysql.phpunit.xml b/tests/config/mysql.phpunit.xml
@@ -2,11 +2,11 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="false" stopOnFailure="false" bootstrap="../bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <php>
     <var name="db_type" value="pdo_mysql"/>
-    <var name="db_host" value="database"/>
+    <var name="db_host" value="127.0.0.1"/>
     <var name="db_username" value="travis"/>
     <var name="db_password" value="travis"/>
     <var name="db_name" value="doctrine_extensions_tests"/>
-    <var name="db_port" value="33060"/>
+    <var name="db_port" value="3306"/>
   </php>
   <testsuites>
     <testsuite name="Oro Doctrine Extensions Test Suite">

diff --git a/tests/config/pgsql.phpunit.xml b/tests/config/pgsql.phpunit.xml
@@ -2,11 +2,11 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="false" stopOnFailure="false" bootstrap="../bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <php>
     <var name="db_type" value="pdo_pgsql"/>
-    <var name="db_host" value="database"/>
+    <var name="db_host" value="localhost"/>
     <var name="db_username" value="travis"/>
     <var name="db_password" value="travis"/>
     <var name="db_name" value="doctrine_extensions_tests"/>
-    <var name="db_port" value="54320"/>
+    <var name="db_port" value="5432"/>
   </php>
   <testsuites>
     <testsuite name="Oro Doctrine Extensions Test Suite">