Composer 2 (#26)

* Composer 2 now can be used without any limitations

* hirak/prestissimo installation removed on CI

* Try to fix unit tests

* Changelog updated

Author: tarampampam

.github/workflows/tests.yml

@@ -40,7 +40,6 @@ jobs: # Docs: <https://help.github.com/en/articles/workflow-syntax-for-github-ac
         with:
           php-version: ${{ matrix.php }}
           extensions: mbstring, pdo, pdo_sqlite, sqlite3 # definition is required for php 7.4
-          tools: composer:v1 # TODO update composer up to v2
 
       - name: Get Composer Cache Directory # Docs: <https://github.com/actions/cache/blob/master/examples.md#php---composer>
         id: composer-cache
@@ -53,16 +52,13 @@ jobs: # Docs: <https://help.github.com/en/articles/workflow-syntax-for-github-ac
           key: ${{ runner.os }}-composer-${{ matrix.setup }}-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
 
-      - name: Install Composer 'hirak/prestissimo' package
-        run: composer global require hirak/prestissimo --update-no-dev --no-progress --ansi
-
       - name: Install lowest Composer dependencies
         if: matrix.setup == 'lowest'
-        run: composer update --prefer-dist --no-interaction --no-suggest --prefer-lowest --ansi
+        run: composer update --prefer-dist --no-interaction --prefer-lowest --ansi
 
       - name: Install basic Composer dependencies
         if: matrix.setup == 'basic'
-        run: composer update --prefer-dist --no-interaction --no-suggest --ansi
+        run: composer update --prefer-dist --no-interaction --ansi
 
       - name: Show most important packages versions
         run: composer info | grep -e laravel -e spiral -e phpunit/phpunit -e phpstan/phpstan
@@ -94,7 +90,6 @@ jobs: # Docs: <https://help.github.com/en/articles/workflow-syntax-for-github-ac
         with:
           php-version: 7.4
           extensions: mbstring
-          tools: composer:v1 # TODO update composer up to v2
 
       - name: Get Composer Cache Directory
         id: composer-cache
@@ -107,11 +102,8 @@ jobs: # Docs: <https://help.github.com/en/articles/workflow-syntax-for-github-ac
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
 
-      - name: Install Composer 'hirak/prestissimo' package
-        run: composer global require hirak/prestissimo --update-no-dev --ansi
-
       - name: Install Composer dependencies
-        run: composer update --prefer-dist --no-interaction --no-suggest --ansi
+        run: composer update --prefer-dist --no-interaction --ansi
 
       - name: Execute check
         run: composer cs-check

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver].
 
+## UNRELEASED
+
+### Changed
+
+- Composer `2.x` is supported now
+
 ## v3.6.0
 
 ### Changed

Dockerfile

@@ -1,19 +1,16 @@
 FROM php:7.3.5-alpine
 
-ENV \
-    COMPOSER_ALLOW_SUPERUSER="1" \
-    COMPOSER_HOME="/tmp/composer"
+ENV COMPOSER_HOME="/tmp/composer"
 
-COPY --from=composer:1.10.10 /usr/bin/composer /usr/bin/composer
+COPY --from=composer:2.0.7 /usr/bin/composer /usr/bin/composer
 
 RUN set -x \
     && apk add --no-cache binutils git \
     && apk add --no-cache --virtual .build-deps autoconf pkgconf make g++ gcc 1>/dev/null \
     # install xdebug (for testing with code coverage), but do not enable it
     && pecl install xdebug-2.9.6 1>/dev/null \
     && apk del .build-deps \
-    && mkdir /src ${COMPOSER_HOME} \
-    && composer global require 'hirak/prestissimo' --no-interaction --no-suggest --prefer-dist \
+    && mkdir -p /src ${COMPOSER_HOME}/cache/{repo,files} \
     && ln -s /usr/bin/composer /usr/bin/c \
     && chmod -R 777 ${COMPOSER_HOME} \
     && composer --version \

Makefile

@@ -17,13 +17,13 @@ build: ## Build docker images, required for current package environment
 	docker-compose build
 
 latest: clean ## Install latest php dependencies
-	docker-compose run $(RUN_APP_ARGS) app composer update -n --ansi --no-suggest --prefer-dist --prefer-stable
+	docker-compose run $(RUN_APP_ARGS) app composer update -n --ansi --prefer-dist --prefer-stable
 
 install: clean ## Install regular php dependencies
-	docker-compose run $(RUN_APP_ARGS) app composer update -n --prefer-dist --no-interaction --no-suggest
+	docker-compose run $(RUN_APP_ARGS) app composer update -n --prefer-dist --no-interaction
 
 lowest: clean ## Install lowest php dependencies
-	docker-compose run $(RUN_APP_ARGS) app composer update -n --ansi --no-suggest --prefer-dist --prefer-lowest
+	docker-compose run $(RUN_APP_ARGS) app composer update -n --ansi --prefer-dist --prefer-lowest
 
 test: ## Execute php tests and linters
 	docker-compose run $(RUN_APP_ARGS) app composer test

tests/WorkerTest.php

@@ -475,7 +475,7 @@ private function getAfterBootstrapClosure(): callable
      */
     private function getOnceRequestGenerationClosure(
         string $method = 'GET',
-        string $uri = '/',
+        string $uri = 'http://unit-test/',
         array $server_params = []
     ): callable {
         return function () use ($method, $uri, $server_params): ?ServerRequestInterface {