Merge remote-tracking branch 'origin/1.x' into 102-settings

# Conflicts:
#	src/OpenApi/Config/Tags.php

.github/workflows/codeception.yaml

@@ -21,10 +21,7 @@ env:
 
 jobs:
     codeception-tests:
-        uses: pimcore/workflows-collection-public/.github/workflows/reusable-codeception-tests-8-2-only.yaml@main
+        uses: pimcore/workflows-collection-public/.github/workflows/reusable-codeception-tests-8-2-only-public.yaml@main
         with:
             APP_ENV: test
-            PIMCORE_TEST: 1
-        secrets:
-            COMPOSER_PIMCORE_REPO_PACKAGIST_TOKEN: ${{ secrets.COMPOSER_PIMCORE_REPO_PACKAGIST_TOKEN }}
-            SSH_PRIVATE_KEY_PIMCORE_DEPLOYMENTS_USER: ${{ secrets.SSH_PRIVATE_KEY_PIMCORE_DEPLOYMENTS_USER }}
+            PIMCORE_TEST: 1

.github/workflows/sonar.yaml

@@ -0,0 +1,20 @@
+name: Build
+on:
+  push:
+    branches:
+      - 1.x
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  sonarcloud:
+    name: SonarCloud
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/static-analysis.yaml

@@ -19,7 +19,4 @@ on:
 
 jobs:
   static-analysis:
-    uses: pimcore/workflows-collection-public/.github/workflows/reusable-static-analysis-8-2-only.yaml@main
-    secrets:
-      COMPOSER_PIMCORE_REPO_PACKAGIST_TOKEN: ${{ secrets.COMPOSER_PIMCORE_REPO_PACKAGIST_TOKEN }}
-      SSH_PRIVATE_KEY_PIMCORE_DEPLOYMENTS_USER: ${{ secrets.SSH_PRIVATE_KEY_PIMCORE_DEPLOYMENTS_USER }}
+    uses: pimcore/workflows-collection-public/.github/workflows/reusable-static-analysis-8-2-only-public.yaml@main

config/dependencies.yaml

@@ -0,0 +1,21 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+
+  # controllers are imported separately to make sure they're public
+  # and have a tag that allows actions to type-hint services
+  Pimcore\Bundle\StudioBackendBundle\Dependency\Controller\:
+    resource: '../src/Dependency/Controller'
+    public: true
+    tags: [ 'controller.service_arguments' ]
+
+  Pimcore\Bundle\StudioBackendBundle\Dependency\Repository\DependencyRepositoryInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Dependency\Repository\DependencyRepository
+
+  Pimcore\Bundle\StudioBackendBundle\Dependency\Service\DependencyServiceInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Dependency\Service\DependencyService
+
+  Pimcore\Bundle\StudioBackendBundle\Dependency\Hydrator\DependencyHydratorInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Dependency\Hydrator\DependencyHydrator

config/notes.yaml

@@ -0,0 +1,28 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+
+  # controllers are imported separately to make sure they're public
+  # and have a tag that allows actions to type-hint services
+  Pimcore\Bundle\StudioBackendBundle\Note\Controller\:
+    resource: '../src/Note/Controller'
+    public: true
+    tags: [ 'controller.service_arguments' ]
+
+  # Hydrators
+  Pimcore\Bundle\StudioBackendBundle\Note\Hydrator\NoteHydratorInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Note\Hydrator\NoteHydrator
+
+  Pimcore\Bundle\StudioBackendBundle\Note\Extractor\NoteDataExtractorInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Note\Extractor\NoteDataExtractor
+
+  Pimcore\Bundle\StudioBackendBundle\Note\Repository\NoteRepositoryInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Note\Repository\NoteRepository
+
+  Pimcore\Bundle\StudioBackendBundle\Note\Service\NoteServiceInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Note\Service\NoteService
+
+  Pimcore\Bundle\StudioBackendBundle\Note\Service\FilterServiceInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Note\Service\FilterService

config/properties.yaml

@@ -0,0 +1,23 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+
+  # controllers are imported separately to make sure they're public
+  # and have a tag that allows actions to type-hint services
+  Pimcore\Bundle\StudioBackendBundle\Property\Controller\:
+    resource: '../src/Property/Controller'
+    public: true
+    tags: [ 'controller.service_arguments' ]
+
+
+  Pimcore\Bundle\StudioBackendBundle\Property\Repository\PropertyRepositoryInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Property\Repository\PropertyRepository
+
+  Pimcore\Bundle\StudioBackendBundle\Property\Service\PropertyServiceInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Property\Service\PropertyService
+
+  Pimcore\Bundle\StudioBackendBundle\Property\Hydrator\PropertyHydratorInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Property\Hydrator\PropertyHydrator
+

config/versions.yaml

@@ -11,8 +11,8 @@ services:
     public: true
     tags: [ 'controller.service_arguments' ]
 
-  Pimcore\Bundle\StudioBackendBundle\Version\RepositoryInterface:
-    class: Pimcore\Bundle\StudioBackendBundle\Version\Repository
+  Pimcore\Bundle\StudioBackendBundle\Version\Repository\VersionRepositoryInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Version\Repository\VersionRepository
 
   Pimcore\Bundle\StudioBackendBundle\Version\Hydrator\VersionHydratorInterface:
     class: Pimcore\Bundle\StudioBackendBundle\Version\Hydrator\VersionHydrator
@@ -38,15 +38,15 @@ services:
     class: Pimcore\Bundle\StudioBackendBundle\Version\Publisher\DocumentVersionPublisher
 
   # Services
-  Pimcore\Bundle\StudioBackendBundle\Version\Hydrator\VersionHydratorServiceInterface:
-    class: Pimcore\Bundle\StudioBackendBundle\Version\Hydrator\VersionHydratorService
+  Pimcore\Bundle\StudioBackendBundle\Version\Service\VersionServiceInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Version\Service\VersionService
     arguments:
-      $versionHydratorLocator: '@listing.version_hydrator.service_locator'
+      $versionPublisherLocator: '@version.element_publisher.service_locator'
 
-  Pimcore\Bundle\StudioBackendBundle\Version\Publisher\VersionPublisherServiceInterface:
-    class: Pimcore\Bundle\StudioBackendBundle\Version\Publisher\VersionPublisherService
+  Pimcore\Bundle\StudioBackendBundle\Version\Service\VersionDetailServiceInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Version\Service\VersionDetailService
     arguments:
-      $versionPublisherLocator: '@version.element_publisher.service_locator'
+      $versionHydratorLocator: '@listing.version_hydrator.service_locator'
 
   #Service Locator
   listing.version_hydrator.service_locator: