diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml index e840f1c..d2ae9e4 100644 --- a/.github/workflows/codeception.yml +++ b/.github/workflows/codeception.yml @@ -29,7 +29,7 @@ jobs: include: - { php-version: 8.1, database: "mariadb:10.11", pimcore_version: "", dependencies: highest, experimental: false, require_admin_bundle: true } - { php-version: 8.2, database: "mariadb:10.11", pimcore_version: "", dependencies: highest, experimental: false, require_admin_bundle: true } - - { php-version: 8.3, database: "mariadb:10.11", pimcore_version: "11.x-dev as 11.9.99", dependencies: highest, experimental: true, require_admin_bundle: true } + - { php-version: 8.3, database: "mariadb:10.11", pimcore_version: "11.x-dev", dependencies: highest, experimental: true, require_admin_bundle: true } services: mariadb: image: "${{ matrix.database }}" diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index e86e9d5..c645ed1 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -22,7 +22,7 @@ jobs: include: - { php-version: "8.1", dependencies: "highest", pimcore_version: "", phpstan_args: "", experimental: false, require_admin_bundle: true } - { php-version: "8.2", dependencies: "highest", pimcore_version: "", phpstan_args: "", experimental: false, require_admin_bundle: true } - - { php-version: "8.3", dependencies: "highest", pimcore_version: "11.x-dev as 11.9.99", phpstan_args: "", experimental: true, require_admin_bundle: true } + - { php-version: "8.3", dependencies: "highest", pimcore_version: "11.x-dev", phpstan_args: "", experimental: true, require_admin_bundle: true } steps: - name: "Checkout code" uses: "actions/checkout@v2" diff --git a/README.md b/README.md index e0960c1..5fb7f90 100644 --- a/README.md +++ b/README.md @@ -24,3 +24,4 @@ This bundle provides an editor for Pimcore to manage custom views and perspectiv ## Documentation Overview - [Installation & Configuration](./doc/01_Installation.md) - [Customize Menu Entry List](./doc/02_Customize_Menu_Entry_List.md) +- [Upgrade Notes](./doc/03_Upgrade.md) diff --git a/composer.json b/composer.json index 3e0a3f6..805d999 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "minimum-stability": "dev", "require": { "pimcore/compatibility-bridge-v10": "^1.0", - "pimcore/admin-ui-classic-bundle": "^1.6", + "pimcore/admin-ui-classic-bundle": "^1.0", "pimcore/pimcore": "^11.2", "symfony/http-foundation": "^6.3" }, @@ -26,9 +26,6 @@ "codeception/phpunit-wrapper": "^9", "codeception/module-asserts": "^2" }, - "suggest": { - "pimcore/admin-ui-classic-bundle": "Required for Pimcore 11" - }, "autoload": { "psr-4": { "Pimcore\\Bundle\\PerspectiveEditorBundle\\": "src/" diff --git a/doc/01_Installation.md b/doc/01_Installation.md index f2ec6f5..bb93454 100644 --- a/doc/01_Installation.md +++ b/doc/01_Installation.md @@ -1,49 +1,11 @@ # Installation ## Bundle Installation -### For Pimcore >= 10.5 & \<= 10.6 -To install Pimcore Perspective Editor for Pimcore 10.5 or higher, follow the three steps below: - -1. Install the required dependencies: -```bash -composer require pimcore/perspective-editor -``` - -2. Make sure the bundle is enabled in the `config/bundles.php` file. The following lines should be added: - -```php -use Pimcore\Bundle\PerspectiveEditorBundle\PimcorePerspectiveEditorBundle; -// ... - -return [ - // ... - PimcorePerspectiveEditorBundle::class => ['all' => true], - // ... -]; -``` - -3. Install the bundle: - -```bash -bin/console pimcore:bundle:install PimcorePerspectiveEditorBundle -``` - -### For Pimcore 11 - You need to follow the steps mentioned above and additionally run the following command: ```bash composer require pimcore/admin-ui-classic-bundle ``` -### For Older Versions -To install the Perspective Editor bundle for older versions of Pimcore, please run the following commands instead: - -```bash -composer require pimcore/perspective-editor -bin/console pimcore:bundle:enable PimcorePerspectiveEditorBundle -bin/console pimcore:bundle:install PimcorePerspectiveEditorBundle -``` - Installation routine just adds an additional permission to `users_permission_definitions` table. Also, make sure, that `customviews.php` and `perspectives.php` files are writeable for php. @@ -53,7 +15,6 @@ They can be located at Pimcore default locations for config files: If they don't exist, they are created at `PIMCORE_CONFIGURATION_DIRECTORY`. - ## Configuration To make the bundle work, just make sure, users have the necessary permissions. diff --git a/src/Resources/public/js/pimcore/perspective/events.js b/src/Resources/public/js/pimcore/perspective/events.js index e37e2d2..3ffb18d 100644 --- a/src/Resources/public/js/pimcore/perspective/events.js +++ b/src/Resources/public/js/pimcore/perspective/events.js @@ -38,16 +38,4 @@ pimcore.events.postCreatePerspectiveEditorElementTreeTypeStore = "pimcore.perspe /** * fired after ElementTreeIcons Array was initialized */ -pimcore.events.addPerspectiveEditorElementTreeIcon = 'pimcore.perspectiveEditor.elementTreeIcon.add'; - - - - -//TODO: delete once support for Pimcore 10.6 is dropped -if(typeof addEventListenerCompatibilityForPlugins === "function") { - let eventMappings = []; - eventMappings["onPerspectiveEditorLoadPermissions"] = pimcore.events.onPerspectiveEditorLoadPermissions; - eventMappings["onPerspectiveEditorLoadStructureForPermissions"] = pimcore.events.onPerspectiveEditorLoadStructureForPermissions; - addEventListenerCompatibilityForPlugins(eventMappings); - console.warn("Deprecation: addEventListenerCompatibilityForPlugins will be not supported in Pimcore 11."); -} +pimcore.events.addPerspectiveEditorElementTreeIcon = 'pimcore.perspectiveEditor.elementTreeIcon.add'; \ No newline at end of file