Merge branch '7.5' into 1.3

# Conflicts: # composer.json
ezsystems · Jul 21, 2021 · 3922c71 · 3922c71
2 parents 4f1d28e + abd3b8a
commit 3922c71
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 3 deletions.
diff --git a/.php_cs b/.php_cs
@@ -3,7 +3,11 @@
 return EzSystems\EzPlatformCodeStyle\PhpCsFixer\EzPlatformInternalConfigFactory::build()
     ->setFinder(
         PhpCsFixer\Finder::create()
-            ->in([__DIR__ . '/eZ'])
+            ->in([
+                __DIR__ . '/eZ',
+                __DIR__ . '/src',
+                __DIR__ . '/tests',
+            ])
             ->exclude(
                 [
                     'Bundle/EzPublishCoreBundle/Tests/DependencyInjection/Fixtures',

diff --git a/composer.json b/composer.json
@@ -81,12 +81,30 @@
     "autoload": {
         "psr-4": {
             "EzSystems\\PlatformInstallerBundle\\": "eZ/Bundle/PlatformInstallerBundle/src",
-            "eZ\\": "eZ"
+            "eZ\\": "eZ",
+            "Ibexa\\Bundle\\Core\\": "src/bundle/Core",
+            "Ibexa\\Bundle\\Debug\\": "src/bundle/Debug",
+            "Ibexa\\Bundle\\IO\\": "src/bundle/IO",
+            "Ibexa\\Bundle\\Installer\\": "src/bundle/Installer",
+            "Ibexa\\Bundle\\LegacySearchEngine\\": "src/bundle/LegacySearchEngine",
+            "Ibexa\\Contracts\\Core\\": "src/contracts",
+            "Ibexa\\Core\\": "src/lib"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "EzSystems\\PlatformInstallerBundleTests\\": "eZ/Bundle/PlatformInstallerBundle/tests"
+            "EzSystems\\PlatformInstallerBundleTests\\": "eZ/Bundle/PlatformInstallerBundle/tests",
+            "Ibexa\\Tests\\Bundle\\Core\\": "tests/bundle/Core",
+            "Ibexa\\Tests\\Bundle\\Debug\\": "tests/bundle/Debug",
+            "Ibexa\\Tests\\Bundle\\IO\\": "tests/bundle/IO",
+            "Ibexa\\Tests\\Bundle\\Installer\\": "tests/bundle/Installer",
+            "Ibexa\\Tests\\Bundle\\LegacySearchEngine\\": "tests/bundle/LegacySearchEngine",
+            "Ibexa\\Tests\\Integration\\Core\\": "tests/integration/Core",
+            "Ibexa\\Tests\\Integration\\Debug\\": "tests/integration/Debug",
+            "Ibexa\\Tests\\Integration\\IO\\": "tests/integration/IO",
+            "Ibexa\\Tests\\Integration\\Installer\\": "tests/integration/Installer",
+            "Ibexa\\Tests\\Integration\\LegacySearchEngine\\": "tests/integration/LegacySearchEngine",
+            "Ibexa\\Tests\\Core\\": "tests/lib"
         }
     },
     "config": {

diff --git a/src/bundle/Core/.gitkeep b/src/bundle/Core/.gitkeep
diff --git a/src/bundle/Debug/.gitkeep b/src/bundle/Debug/.gitkeep
diff --git a/src/bundle/IO/.gitkeep b/src/bundle/IO/.gitkeep
diff --git a/src/bundle/Installer/.gitkeep b/src/bundle/Installer/.gitkeep
diff --git a/src/bundle/LegacySearchEngine/.gitkeep b/src/bundle/LegacySearchEngine/.gitkeep
diff --git a/src/contracts/.gitkeep b/src/contracts/.gitkeep
diff --git a/src/lib/.gitkeep b/src/lib/.gitkeep
diff --git a/tests/bundle/Core/.gitkeep b/tests/bundle/Core/.gitkeep
diff --git a/tests/bundle/Debug/.gitkeep b/tests/bundle/Debug/.gitkeep
diff --git a/tests/bundle/IO/.gitkeep b/tests/bundle/IO/.gitkeep
diff --git a/tests/bundle/Installer/.gitkeep b/tests/bundle/Installer/.gitkeep
diff --git a/tests/bundle/LegacySearchEngine/.gitkeep b/tests/bundle/LegacySearchEngine/.gitkeep
diff --git a/tests/integration/Core/.gitkeep b/tests/integration/Core/.gitkeep
diff --git a/tests/integration/Debug/.gitkeep b/tests/integration/Debug/.gitkeep
diff --git a/tests/integration/IO/.gitkeep b/tests/integration/IO/.gitkeep
diff --git a/tests/integration/Installer/.gitkeep b/tests/integration/Installer/.gitkeep
diff --git a/tests/integration/LegacySearchEngine/.gitkeep b/tests/integration/LegacySearchEngine/.gitkeep
diff --git a/tests/lib/.gitkeep b/tests/lib/.gitkeep