Merge pull request #114: Add fields autocompletion for ORM::make

Author: roxblnfk

.github/workflows/main.yml

@@ -7,10 +7,13 @@ jobs:
     name: Test PHP ${{ matrix.php-version }} with Code Coverage
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: false
       matrix:
         php-version: ['8.1', '8.2', '8.3', '8.4']
     steps:
+      - name: Install ODBC driver.
+        run: |
+          sudo curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
+          sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup DB services
@@ -24,24 +27,13 @@ jobs:
           php-version: ${{ matrix.php-version }}
           coverage: pcov
           tools: pecl
-          extensions: mbstring, pdo, pdo_sqlite, pdo_pgsql, pdo_sqlsrv-5.11, pdo_mysql
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - name: Restore Composer Cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
+          extensions: mbstring, pdo, pdo_sqlite, pdo_pgsql, pdo_sqlsrv, pdo_mysql
 
-      - name: Install dependencies with composer
-        if: matrix.php-version != '8.4'
-        run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+      - name: Validate composer.json and composer.lock
+        run: composer validate --ansi --strict
 
-      - name: Install dependencies with composer php 8.4
-        if: matrix.php-version == '8.4'
-        run: composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+      - name: Install dependencies with composer
+        uses: ramsey/composer-install@v3
 
       - name: Execute Tests
         run: |

composer.json

@@ -47,7 +47,7 @@
     "require-dev": {
         "doctrine/annotations": "^1.14.3 || ^2.0.1",
         "phpunit/phpunit": "^10.1",
-        "vimeo/psalm": "^5.26",
+        "vimeo/psalm": "^5.26 || ^6.0",
         "spiral/code-style": "^2.2",
         "spiral/dumper": "^3.3"
     },

psalm-baseline.xml

@@ -121,9 +121,6 @@
     </InvalidClassConstantType>
   </file>
   <file src="src/Annotation/Relation/Relation.php">
-    <MixedInferredReturnType>
-      <code><![CDATA[non-empty-string]]></code>
-    </MixedInferredReturnType>
     <MixedReturnStatement>
       <code><![CDATA[static::TYPE]]></code>
     </MixedReturnStatement>

psalm.xml

@@ -14,6 +14,10 @@
         </ignoreFiles>
     </projectFiles>
     <issueHandlers>
+        <PossiblyUnusedMethod errorLevel="suppress"/>
+        <ClassMustBeFinal errorLevel="suppress"/>
+        <UnusedClass errorLevel="suppress"/>
+        <MissingOverrideAttribute errorLevel="suppress"/>
         <MissingClassConstType errorLevel="suppress"/>
         <UndefinedAttributeClass>
             <errorLevel type="suppress">

resources/orm.meta-storm.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<meta-storm xmlns="meta-storm">
+    <definitions>
+        <!-- ORM Interface -->
+        <classMethod class="\Cycle\ORM\Service\EntityFactoryInterface" method="make" argument="1" targetInArray="key" targetValue="false">
+            <properties xpath="$argument[0]">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
+        </classMethod>
+    </definitions>
+</meta-storm>

src/Annotation/GeneratedValue.php

@@ -8,6 +8,12 @@
 use Spiral\Attributes\NamedArgumentConstructor;
 
 /**
+ * Specifies that the field value is generated by the database or ORM.
+ *
+ * - before insert: the field is generated before the entity is inserted into the database on PHP side (e.g., UUIDs).
+ * - on insert: the field is generated by the database on insert (e.g., auto-increment).
+ * - before update: the field is generated before the entity is updated in the database on PHP side (e.g., `onUpdate`).
+ *
  * @Annotation
  * @NamedArgumentConstructor
  * @Target({"PROPERTY"})

tests/bootstrap.php

@@ -40,6 +40,7 @@
             database: 'tempdb',
             host: '127.0.0.1',
             port: 11433,
+            trustServerCertificate: true,
             user: 'SA',
             password: 'YourStrong!Passw0rd',
         ),