From f6ed76a45fdc007f86bf5becfe256ae2a52dc7a1 Mon Sep 17 00:00:00 2001
From: Matthias Schuhmayer <38959016+mattamon@users.noreply.github.com>
Date: Wed, 22 May 2024 07:55:17 +0200
Subject: [PATCH] [Feature] Add note resolver (#35)

* Add note resolver

* Add new line

* Update CS-Fixer

* Apply php-cs-fixer changes

---------

Co-authored-by: mattamon <mattamon@users.noreply.github.com>
---
 .github/workflows/php-cs-fixer.yaml          | 27 +++++++++-----------
 src/Models/Element/NoteResolver.php          | 27 ++++++++++++++++++++
 src/Models/Element/NoteResolverInterface.php | 24 +++++++++++++++++
 src/Proxy/Service/ProxyService.php           |  1 -
 4 files changed, 63 insertions(+), 16 deletions(-)
 create mode 100644 src/Models/Element/NoteResolver.php
 create mode 100644 src/Models/Element/NoteResolverInterface.php

diff --git a/.github/workflows/php-cs-fixer.yaml b/.github/workflows/php-cs-fixer.yaml
index 2e4bc56..0b2a79f 100644
--- a/.github/workflows/php-cs-fixer.yaml
+++ b/.github/workflows/php-cs-fixer.yaml
@@ -1,27 +1,24 @@
 name: "PHP-CS-Fixer"
 
 on:
+    pull_request:
+        branches:
+            - "*"
     push:
         branches:
             - "[0-9]+.[0-9]+"
             - "[0-9]+.x"
+            - "*_actions"
+            - "feature-*"
 
 permissions:
     contents: read
 
 jobs:
-    php-cs-fixer:
-        permissions:
-            contents: write  # for stefanzweifel/git-auto-commit-action to push code in repo
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-              with:
-                  ref: ${{ github.head_ref }}
-
-            - name: PHP-CS-Fixer
-              uses: docker://oskarstark/php-cs-fixer-ga:latest
-
-            - uses: stefanzweifel/git-auto-commit-action@v4
-              with:
-                  commit_message: Apply php-cs-fixer changes
\ No newline at end of file
+    php-style:
+        uses: pimcore/workflows-collection-public/.github/workflows/reusable-php-style.yaml@main
+        secrets:
+            PHP_CS_FIXER_GITHUB_TOKEN: ${{ secrets.PHP_CS_FIXER_GITHUB_TOKEN }}
+        with:
+            head_ref: ${{ github.ref }}
+            config_file: .php-cs-fixer.dist.php
\ No newline at end of file
diff --git a/src/Models/Element/NoteResolver.php b/src/Models/Element/NoteResolver.php
new file mode 100644
index 0000000..9c79be4
--- /dev/null
+++ b/src/Models/Element/NoteResolver.php
@@ -0,0 +1,27 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StaticResolverBundle\Models\Element;
+
+use Pimcore\Model\Element\Note;
+
+final class NoteResolver implements NoteResolverInterface
+{
+    public function getById(int $id): ?Note
+    {
+        return Note::getById($id);
+    }
+}
diff --git a/src/Models/Element/NoteResolverInterface.php b/src/Models/Element/NoteResolverInterface.php
new file mode 100644
index 0000000..875d2ee
--- /dev/null
+++ b/src/Models/Element/NoteResolverInterface.php
@@ -0,0 +1,24 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StaticResolverBundle\Models\Element;
+
+use Pimcore\Model\Element\Note;
+
+interface NoteResolverInterface
+{
+    public function getById(int $id): ?Note;
+}
diff --git a/src/Proxy/Service/ProxyService.php b/src/Proxy/Service/ProxyService.php
index 4893e61..0c89013 100644
--- a/src/Proxy/Service/ProxyService.php
+++ b/src/Proxy/Service/ProxyService.php
@@ -37,7 +37,6 @@ public function getProxyObject(string $className, string $method, array $args =
         } catch (Throwable $exception) {
             throw new InvalidServiceException($exception->getMessage());
         }
-
     }
 
     public function getStrictProxyObject(