Merge remote-tracking branch 'ibexa/main' into temp_1.3_to_main

.github/pull_request_template.md

@@ -2,7 +2,7 @@
 | ---------------------------------------- | ------------------
 | **JIRA issue**                          | [IBX-XXXX](https://issues.ibexa.co/browse/IBX-XXXX)
 | **Type**                                   | feature/bug/improvement
-| **Target Ibexa version** | `v3.3`
+| **Target Ibexa version** | `v4.0`
 | **BC breaks**                          | yes/no
 
 <!-- Replace this comment with Pull Request description -->
@@ -11,6 +11,6 @@
 - [ ] Provided PR description.
 - [ ] Tested the solution manually.
 - [ ] Provided automated test coverage.
-- [ ] Checked that target branch is set correctly (master for features, the oldest supported for bugs).
+- [ ] Checked that target branch is set correctly (main for features, the oldest supported for bugs).
 - [ ] Ran PHP CS Fixer for new PHP code (use `$ composer fix-cs`).
-- [ ] Asked for a review (ping `@ezsystems/engineering-team`).
+- [ ] Asked for a review (ping `@ibexa/engineering`).

.github/workflows/ci.yaml

@@ -3,7 +3,7 @@ name: CI
 on:
     push:
         branches:
-            - master
+            - main
             - '[0-9]+.[0-9]+'
     pull_request: ~
 
@@ -42,7 +42,6 @@ jobs:
             fail-fast: false
             matrix:
                 php:
-                    - '7.3'
                     - '7.4'
                     - '8.0'
                     - '8.1'
@@ -98,7 +97,6 @@ jobs:
             fail-fast: false
             matrix:
                 php:
-                    - '7.3'
                     - '7.4'
                     - '8.0'
                     - '8.1'

.gitignore

@@ -1,4 +1,3 @@
-config.php
 doc/apidoc/
 docblox.xml
 composer.phar

.php-cs-fixer.php

@@ -11,31 +11,8 @@
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->in([
-                __DIR__ . '/eZ',
                 __DIR__ . '/src',
                 __DIR__ . '/tests',
             ])
-            ->exclude(
-                [
-                    'Bundle/EzPublishCoreBundle/Tests/DependencyInjection/Fixtures',
-                    'Publish/API/Repository/Tests/FieldType/_fixtures',
-                    'Publish/API/Repository/Tests/_fixtures',
-                    'Publish/Core/FieldType/Tests/Url/Gateway/_fixtures',
-                    'Publish/Core/IO/Tests/_fixtures',
-                    'Publish/Core/MVC/Symfony/Templating/Tests/Twig/Extension/_fixtures',
-                    'Publish/Core/Persistence/Legacy/Tests/Content/Location/Gateway/_fixtures',
-                    'Publish/Core/Persistence/Legacy/Tests/Content/Type/Gateway/_fixtures',
-                    'Publish/Core/Persistence/Legacy/Tests/Content/Type/_fixtures',
-                    'Publish/Core/Persistence/Legacy/Tests/Content/UrlAlias/Gateway/_fixtures',
-                    'Publish/Core/Persistence/Legacy/Tests/Content/UrlAlias/_fixtures',
-                    'Publish/Core/Persistence/Legacy/Tests/Content/UrlWildcard/Gateway/_fixtures',
-                    'Publish/Core/Persistence/Legacy/Tests/Content/_fixtures',
-                    'Publish/Core/Persistence/Legacy/Tests/_fixtures',
-                    'Publish/Core/Persistence/Tests/TransformationProcessor/_fixtures',
-                    'Publish/Core/Repository/Tests/Service/Integration/Legacy/_fixtures',
-                    'Publish/Core/Search/Legacy/Tests/_fixtures',
-                    'Publish/SPI/Tests/FieldType/_fixtures',
-                ]
-            )
             ->files()->name('*.php')
     );

.travis.yml

@@ -24,10 +24,10 @@ matrix:
   include:
 # 7.3
     - name: 'Solr 7.7.3 integration tests (using shared cores) with Redis cache pool'
-      php: 7.3
+      php: 7.4
       env: SOLR_VERSION="7.7.3" TEST_CONFIG="phpunit-integration-legacy-solr.xml" CUSTOM_CACHE_POOL="singleredis" CORES_SETUP="shared" SOLR_CONFIG="vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/schema.xml vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/custom-fields-types.xml vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/language-fieldtypes.xml" JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64/jre/"
     - name: 'MySQL integration tests'
-      php: 7.3
+      php: 7.4
       env: TEST_CONFIG="phpunit-integration-legacy.xml" DB="mysql" DATABASE="mysql://root@localhost/testdb"
 
 # test only master, stable branches and pull requests

Readme.md

@@ -10,15 +10,14 @@ Ibexa Kernel also aims to provide additional features for the MVC layer (Symfony
 ## Current Organization
 
 MVC layer:
-- [eZ/Bundle](eZ/Bundle) - the bundles that are important to expose the functionality of the Backend and MVC layer to Symfony.
-- [eZ/Publish/Core/MVC](eZ/Publish/Core/MVC) - the parts that make up the different components extending Symfony.
-- [eZ/Publish/Core/Pagination](eZ/Publish/Core/Pagination) - a component extending PagerFanta for pagination of eZ Platform search queries.
+- [src/bundle](src/bundle) - the bundles that are important to expose the functionality of the Backend and MVC layer to Symfony.
+- [src/lib/MVC](src/lib/MVC) - the parts that make up the different components extending Symfony.
+- [src/lib/Pagination](src/lib/Pagination) - a component extending PagerFanta for pagination of Ibexa search queries.
 
 Backend:
-- [eZ/Publish/API](eZ/Publish/API) - the definition of stable interfaces for the PHP *Public* API, mainly Content *Repository API*.
-- [eZ/Publish/SPI/Persistence](eZ/Publish/SPI/Persistence) - a layer which is not frozen yet, meaning it might change in between releases. Those are persistence interfaces for Storage Engine.
-- [eZ/Publish/SPI](eZ/Publish/SPI) - (anything other than Persistence) is frozen and has a Backward Compatibility promise of Service Provider Interface, meaning no breaking changes both from consumption and implementation POV.
-- [eZ/Publish/Core](eZ/Publish/Core) - implementations of both APIs and SPIs; the naming aims to map to name of the interface they implement. For example, `Core\Persistence\Legacy` being implementation of `SPI\Persistence`.
+- [src/contracts](src/contracts) - the definition of stable interfaces for the PHP *Public* API, mainly Content *Repository API*.
+- [src/contracts/Persistence](src/contracts/Persistence) - a layer which is not frozen yet, meaning it might change in between releases. Those are persistence interfaces for Storage Engine.
+- [src/lib](src/lib) - implementations of API Contracts; the naming aims to map to name of the interface they implement. For example, `Ibexa\Core\Persistence\Legacy` being implementation of `Ibexa\Contracts\Core\Persistence`.
 
 ## Testing Locally
 
@@ -34,15 +33,15 @@ For Contributing to this Bundle, you should make sure to run both unit and integ
 
     ```bash
     # Note: Change the line below to the ssh format of your fork to create topic branches to propose as pull requests
-    git clone https://github.com/ezsystems/ezplatform-kernel.git
-    cd ezplatform-kernel
+    git clone https://github.com/ibexa/core.git
+    cd core
     composer install
     ```
 2. Run unit tests:
 
     At this point you should be able to run unit tests:
     ```bash
-    php -d memory_limit=-1 vendor/bin/phpunit
+    composer unit
     ```
 
 3. Run integration tests:
@@ -51,10 +50,10 @@ For Contributing to this Bundle, you should make sure to run both unit and integ
     # If you want to test against mysql or postgres instead of sqlite, define one of these with reference to an empty test db:
     # export DATABASE="mysql://root@localhost/$DB_NAME"
     # export DATABASE="pgsql://postgres@localhost/$DB_NAME"
-    php -d memory_limit=-1 vendor/bin/phpunit -c phpunit-integration-legacy.xml
+    composer integration
     ```
 
-    To run integration tests against Solr, see [Solr Search Engine Bundle for Ibexa DXP](https://github.com/ezsystems/ezplatform-solr-search-engine).
+    To run integration tests against Solr, see [Solr Search Engine Bundle for Ibexa DXP](https://github.com/ibexa/solr-search-engine).
 
 ## COPYRIGHT
 

appveyor.yml

@@ -40,7 +40,6 @@ install:
 
 test_script:
     - cd c:\projects\ezplatform-kernel
-    - copy /Y config.php-DEVELOPMENT config.php
     - SET X=0
     - vendor/bin/phpunit --colors=never -c phpunit.xml || SET X=!errorlevel!
     - vendor/bin/phpunit --colors=never -c phpunit-integration-legacy.xml || SET X=!errorlevel!

bin/.travis/prepare_unittest.sh

@@ -41,7 +41,7 @@ composer config -g github-oauth.github.com "d0285ed5c8644f30547572ead2ed897431c1
 if [ "$TEST_CONFIG" = "phpunit-integration-legacy-solr.xml" ] ; then
     # Install openJDK8 as default v11 is too new for SOLR
     sudo apt-get install openjdk-8-jdk
-    solr_require_cmd='composer require --no-update ezsystems/ezplatform-solr-search-engine:^3.2@dev'
+    solr_require_cmd='composer require --no-update ezsystems/ezplatform-solr-search-engine:^4.0@dev'
     echo "> ${solr_require_cmd}"
     ${solr_require_cmd}
 fi

bootstrap.php

@@ -1,33 +1,12 @@
 <?php
 
 /**
- * File containing the bootstrapping of eZ Publish API for unit test use.
- *
- * Setups class loading.
- *
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
-
 use Symfony\Bridge\PhpUnit\ClockMock;
 use Symfony\Component\HttpFoundation\Request;
 
-// Get global config.php settings
-
-if (!file_exists(__DIR__ . '/config.php')) {
-    if (!symlink(__DIR__ . '/config.php-DEVELOPMENT', __DIR__ . '/config.php')) {
-        throw new \RuntimeException('Could not symlink config.php-DEVELOPMENT to config.php. Copy config.php-DEVELOPMENT to config.php and customize it to your needs.');
-    }
-}
-
-if (!($settings = include(__DIR__ . '/config.php'))) {
-    throw new \RuntimeException('Could not read config.php. Copy config.php-DEVELOPMENT to config.php and customize it to your needs.');
-}
-
-// Class alias used for BC
-// Enables old code which still extends non namespaced TestCase to work
-class_alias('PHPUnit\Framework\TestCase', 'PHPUnit_Framework_TestCase');
-
 // Register ClockMock for Request class before any tests are run
 // https://github.com/symfony/symfony/issues/28259
 ClockMock::register(Request::class);

composer.json

@@ -1,13 +1,13 @@
 {
-    "name": "ezsystems/ezplatform-kernel",
-    "description": "Kernel used by ezsystems/ezplatform and derivatives. Provides the Content Repository, its APIs, and the application's Symfony framework integration.",
-    "homepage": "https://ezplatform.com",
-    "license": "GPL-2.0-only",
+    "name": "ibexa/core",
+    "description": "Ibexa DXP and Open Source core. Provides the Content Repository, its APIs, and the application's Symfony framework integration.",
+    "homepage": "https://ibexa.co",
+    "license": "(GPL-2.0-only or proprietary)",
     "suggest": {
         "php-64bit": "For support of more than 30 languages, a 64bit php installation on all involved prod/dev machines is required"
     },
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "ext-ctype": "*",
         "ext-fileinfo": "*",
         "ext-intl": "*",
@@ -36,7 +36,7 @@
         "symfony/expression-language": "^5.3.0",
         "symfony/validator": "^5.3.0",
         "symfony/var-dumper": "^5.3.0",
-        "ezsystems/doctrine-dbal-schema": "^1.0@dev",
+        "ibexa/doctrine-schema": "^4.0@dev",
         "symfony-cmf/routing": "^2.3",
         "guzzlehttp/guzzle": "^6.5",
         "php-http/guzzle6-adapter": "^2.0",
@@ -62,44 +62,58 @@
         "behat/behat": "^3.6.1",
         "jenner/simple_fork": "^1.2",
         "friends-of-behat/mink-extension": "^2.4",
-        "ibexa/ci-scripts": "^0.1@dev",
-        "ezsystems/ezplatform-code-style": "^2.0",
+        "ibexa/ci-scripts": "^0.2@dev",
+        "ibexa/code-style": "^1.0",
         "phpunit/phpunit": "^8.2",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1",
         "symfony/phpunit-bridge": "^5.1",
         "symfony/proxy-manager-bridge": "^5.3",
         "phpstan/phpstan": "^1.2"
     },
     "conflict": {
+        "friendsofphp/php-cs-fixer": "3.5.0",
         "symfony/dependency-injection": "5.3.7",
         "symfony/security-core": "5.3.0",
         "doctrine/dbal": "2.7.0",
         "ezsystems/ezpublish-legacy": "*",
         "phpunit/phpunit": "8.4.0"
     },
     "replace": {
-        "ezsystems/ezpublish-kernel": "*"
+        "ezsystems/ezplatform-kernel": "*"
     },
     "autoload": {
         "psr-4": {
-            "EzSystems\\PlatformInstallerBundle\\": "eZ/Bundle/PlatformInstallerBundle/src",
-            "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\\RepositoryInstaller\\": "src/bundle/RepositoryInstaller",
             "Ibexa\\Bundle\\LegacySearchEngine\\": "src/bundle/LegacySearchEngine",
             "Ibexa\\Contracts\\Core\\": "src/contracts",
-            "Ibexa\\Core\\": "src/lib"
+            "Ibexa\\Core\\": "src/lib",
+            "Ibexa\\Tests\\Core\\": "tests/lib",
+            "Ibexa\\Tests\\Integration\\Core\\": "tests/integration/Core",
+            "Ibexa\\Tests\\Bundle\\Core\\": "tests/bundle/Core",
+            "eZ\\Publish\\API\\Repository\\Tests\\": "src/contracts/Test/Repository",
+            "eZ\\Publish\\SPI\\Tests\\": "src/contracts/Test",
+            "eZ\\Publish\\API\\": "src/contracts",
+            "eZ\\Publish\\SPI\\": "src/contracts",
+            "eZ\\Publish\\Core\\": "src/lib",
+            "eZ\\Bundle\\EzPublishCoreBundle\\": "src/bundle/Core",
+            "eZ\\Bundle\\EzPublishDebugBundle\\": "src/bundle/Debug",
+            "eZ\\Bundle\\EzPublishIOBundle\\": "src/bundle/IO",
+            "eZ\\Bundle\\EzPublishLegacySearchEngineBundle\\": "src/bundle/LegacySearchEngine",
+            "eZ\\Bundle\\EzPublishCoreBundle\\Tests\\": "tests/bundle/Core",
+            "eZ\\Publish\\Core\\MVC\\Symfony\\Templating\\Tests\\": "tests/lib/MVC/Symfony/Templating",
+            "eZ\\Publish\\Core\\Persistence\\Legacy\\Tests\\": "tests/lib/Persistence/Legacy",
+            "EzSystems\\PlatformInstallerBundle\\": "src/bundle/RepositoryInstaller"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "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\\RepositoryInstaller\\": "tests/bundle/RepositoryInstaller",
             "Ibexa\\Tests\\Bundle\\LegacySearchEngine\\": "tests/bundle/LegacySearchEngine",
             "Ibexa\\Tests\\Integration\\Core\\": "tests/integration/Core",
             "Ibexa\\Tests\\Integration\\Debug\\": "tests/integration/Debug",
@@ -114,7 +128,7 @@
     },
     "scripts": {
         "check-cs": "@fix-cs --dry-run",
-        "fix-cs": "php-cs-fixer fix -v --show-progress=dots",
+        "fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots",
         "unit": "phpunit -c phpunit.xml",
         "phpstan": "phpstan analyse",
         "integration": [
@@ -133,7 +147,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.3.x-dev"
+            "dev-main": "4.0.x-dev"
         },
         "thanks": {
             "name": "ezsystems/ezplatform",