replace component installer (#4558)

* replace component installer with oomphinc/composer-installers-extender remove RequireJs config generator (ping @Kaik) remove forced use of composer 1 and allow composer 2 in travis build and github actions * do not use symfony 3-era deprecation detector
zikula · Dec 7, 2020 · 9a056a0 · 9a056a0
1 parent f7e23c4
commit 9a056a0
Show file tree

Hide file tree

Showing 7 changed files with 583 additions and 493 deletions.
diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml
@@ -22,30 +22,17 @@ jobs:
         key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
         restore-keys: ${{ runner.os }}-composer-
 
-    # use composer 1
-    # TODO get rid of this
     - name: Install dependencies
       run: |
-        wget https://getcomposer.org/composer-1.phar
-        chmod +x composer-1.phar
-        ./composer-1.phar install
-
-    #- name: Install dependencies
-      #run: |
-        #composer install
+        composer install
 
     - name: Update dependencies
       #run: |
       #  php -dmemory_limit=10G /usr/bin/composer update
       run: |
-        ./composer-1.phar config --global github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
-        ./composer-1.phar update
-        ./composer-1.phar config --global --auth --unset github-oauth.github.com
-        rm ./composer-1.phar
-      #run: |
-        #composer config --global github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
-        #composer update
-        #composer config --global --auth --unset github-oauth.github.com
+        composer config --global github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
+        composer update
+        composer config --global --auth --unset github-oauth.github.com
 
     # see https://github.com/peter-evans/create-pull-request
     - name: Commit changes and create/update pull request

diff --git a/.travis.yml b/.travis.yml
@@ -29,10 +29,6 @@ before_install:
     # Set the COMPOSER_ROOT_VERSION to the right version according to the branch being built
     - if [ "$TRAVIS_BRANCH" = "master" ]; then export COMPOSER_ROOT_VERSION=dev-master; else export COMPOSER_ROOT_VERSION=dev-"$TRAVIS_BRANCH"; fi;
 
-    # downgrade to composer 1
-    # TODO get rid of this
-    - composer self-update --rollback
-
     - composer validate --no-check-all --strict
     - composer install -o --no-scripts
     - composer run-script post-autoload-dump
@@ -141,11 +137,11 @@ install:
 
 script:
   # execute Symfony deprecation detector
-  - git clone https://github.com/sensiolabs-de/deprecation-detector.git
-  - cd deprecation-detector
-  - composer install
-  - cd ..
-  - ./deprecation-detector/bin/deprecation-detector check src vendor
+#  - git clone https://github.com/sensiolabs-de/deprecation-detector.git
+#  - cd deprecation-detector
+#  - composer install
+#  - cd ..
+#  - ./deprecation-detector/bin/deprecation-detector check src vendor
 
 after_success:
   # dump vendors into doc

diff --git a/CHANGELOG-3.1.md b/CHANGELOG-3.1.md
@@ -3,15 +3,18 @@
 ## 3.1.0 (unreleased)
 
 - BC Breaks:
-  - [CoreBundle] Removed `Zikula\Bundle\CoreBundle\DynamicConfigDumper`.
   - [config] Removed `config/dynamic/*.yaml` files (use standard package config files).
   - [config] Removed `config/services_custom.yaml` (use `services.yaml`).
   - [config] `zikula_asset_manager.combine` now defaults to `false` (#4419).
+  - [CoreBundle] Removed `Zikula\Bundle\CoreBundle\DynamicConfigDumper`.
+  - [ThemeModule] Removed Require.js config (#4558).
 
 - Fixes:
+  - [composer] Correct Composer 2 compatibilty.
   - [CoreBundle] Added clearing of OPCache (if in use) to standard clearcache operation (#4507).
   - [ThemeModule] Asset combination now defaults to `false` on installation (#4419).
-  - [ThemeModule] Corrected missing configurable value for `trimwhitespace` option ().
+  - [ThemeModule] Corrected missing configurable value for `trimwhitespace` option (#4531).
+  - [ThemeModule] Replaced `robloach/component-installer` with `oomphinc/composer-installers-extender` (#4558).
 
 - Features:
   - [config] Added standard Symfony bundle configurations for the following bundles (#4433):

diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
         "composer/installers": "1.*",
         "composer/semver": "1.*",
 
-        "robloach/component-installer": "*",
+        "oomphinc/composer-installers-extender": "2.*",
         "components/jquery": "3.*",
         "components/jqueryui": "1.*",
         "components/bootstrap": "4.*",
@@ -131,10 +131,8 @@
         "zikula-scripts": [
             "composer dump-autoload",
             "bin/console cache:clear --env prod",
-            "bin/console cache:clear",
             "bin/console assets:install --relative public",
-            "Zikula\\ExtensionsModule\\Composer\\ManuallyInstallAssets::install",
-            "Zikula\\ExtensionsModule\\Composer\\RequireJsConfigGenerator::regenerateRequireJs"
+            "Zikula\\ExtensionsModule\\Composer\\ManuallyInstallAssets::install"
         ],
         "post-install-cmd": [
             "@zikula-scripts"
@@ -154,14 +152,15 @@
             "php": "7.2.5"
         },
         "bin-dir": "bin",
-        "sort-packages": true,
-        "component-dir": "public"
+        "sort-packages": true
     },
     "extra": {
         "tests-dir": "tests",
         "symfony-assets-install": "relative",
+        "installer-types": ["component"],
         "installer-paths": {
-            "src/extensions/{$vendor}/{$name}": ["type:zikula-module", "type:zikula-theme"]
+            "src/extensions/{$vendor}/{$name}": ["type:zikula-module", "type:zikula-theme"],
+            "public/{$name}/": ["type:component"]
         }
     }
 }