Merge remote-tracking branch 'upstream/main' into ci/markdown

box-project · Nov 22, 2023 · c569230 · c569230
2 parents 870243e + b17f5ee
commit c569230
Show file tree

Hide file tree

Showing 67 changed files with 967 additions and 869 deletions.
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-cli-alpine
+FROM php:8.2-cli-alpine
 
 COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
 RUN install-php-extensions zlib phar sodium tokenizer filter

diff --git a/.docker/build b/.docker/build
@@ -8,10 +8,10 @@ if [[ "$(docker images -q ghcr.io/box-project/box_php725 2> /dev/null)" == "" ]]
     docker build --platform=linux/amd64 --tag=ghcr.io/box-project/box_php725 --file "${SCRIPT_DIR}/php725" .
 fi
 
-if [[ "$(docker images -q ghcr.io/box-project/box_php81 2> /dev/null)" == "" ]]; then
-    docker build --platform=linux/amd64 --tag=ghcr.io/box-project/box_php81 --file "${SCRIPT_DIR}/php81" .
+if [[ "$(docker images -q ghcr.io/box-project/box_php82 2> /dev/null)" == "" ]]; then
+    docker build --platform=linux/amd64 --tag=ghcr.io/box-project/box_php82 --file "${SCRIPT_DIR}/php82" .
 fi
 
-if [[ "$(docker images -q ghcr.io/box-project/box_php81_xdebug 2> /dev/null)" == "" ]]; then
-    docker build --platform=linux/amd64 --tag=ghcr.io/box-project/box_php81_xdebug --file "${SCRIPT_DIR}/php81_xdebug" .
+if [[ "$(docker images -q ghcr.io/box-project/box_php82_xdebug 2> /dev/null)" == "" ]]; then
+    docker build --platform=linux/amd64 --tag=ghcr.io/box-project/box_php82_xdebug --file "${SCRIPT_DIR}/php82_xdebug" .
 fi
diff --git a/.docker/php81 → .docker/php82 b/.docker/php81 → .docker/php82
@@ -1,4 +1,4 @@
-FROM php:8.1-cli
+FROM php:8.2-cli
 
 RUN echo '' | \
     apt-get -y update; \

diff --git a/.docker/php81_build_phar → .docker/php82_build_phar b/.docker/php81_build_phar → .docker/php82_build_phar
@@ -1,4 +1,4 @@
-FROM php:8.1-cli-alpine as build-stage
+FROM php:8.2-cli-alpine as build-stage
 
 RUN apk add --update make git
 
@@ -10,7 +10,7 @@ ADD . /opt/box-project/box
 RUN cd /opt/box-project/box && \
     make compile
 
-FROM php:8.1-cli-alpine
+FROM php:8.2-cli-alpine
 
 COPY --from=build-stage /opt/box-project/box/bin/box.phar /usr/bin/box
 

diff --git a/.docker/php81_xdebug → .docker/php82_xdebug b/.docker/php81_xdebug → .docker/php82_xdebug
@@ -1,4 +1,4 @@
-FROM php:8.1-cli
+FROM php:8.2-cli
 
 RUN echo '' | \
     apt-get -y update; \

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,7 +1,16 @@
 version: 2
 updates:
     -   package-ecosystem: "composer"
-        directory: "/"
+        directory: "."
+        schedule:
+            interval: "weekly"
+        groups:
+            dependencies:
+                patterns:
+                    - "*"
+
+    -   package-ecosystem: "composer"
+        directory: "requirement-checker"
         schedule:
             interval: "weekly"
         groups:
@@ -13,3 +22,7 @@ updates:
         directory: ".github/workflows"
         schedule:
             interval: "weekly"
+        groups:
+            dependencies:
+                patterns:
+                    - "*"
diff --git a/.github/workflows/auto-review.yaml b/.github/workflows/auto-review.yaml
@@ -27,7 +27,7 @@ jobs:
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: '8.1'
+                    php-version: '8.2'
                     tools: composer
                     coverage: none
 
@@ -57,7 +57,7 @@ jobs:
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: '8.1'
+                    php-version: '8.2'
                     tools: composer
                     coverage: none
 
@@ -73,7 +73,7 @@ jobs:
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: '8.1'
+                    php-version: '8.2'
                     tools: composer
                     coverage: none
 
@@ -95,7 +95,7 @@ jobs:
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: '8.1'
+                    php-version: '8.2'
                     tools: composer
                     coverage: none
 

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -35,21 +35,21 @@ jobs:
                     - name: PHP 7.2.5
                       docker-file: .docker/php725
                       image-tag: ghcr.io/box-project/box_php725
-                    - name: PHP 8.1
-                      docker-file: .docker/php81
-                      image-tag: ghcr.io/box-project/box_php81
-                    - name: PHP 8.1 (Xdebug)
-                      docker-file: .docker/php81_xdebug
-                      image-tag: ghcr.io/box-project/box_php81_xdebug
+                    - name: PHP 8.2
+                      docker-file: .docker/php82
+                      image-tag: ghcr.io/box-project/box_php82
+                    - name: PHP 8.2 (Xdebug)
+                      docker-file: .docker/php82_xdebug
+                      image-tag: ghcr.io/box-project/box_php82_xdebug
         steps:
             -   name: Checkout
                 uses: actions/checkout@v4
 
             -   name: Set up QEMU
-                uses: docker/setup-qemu-action@v2
+                uses: docker/setup-qemu-action@v3
 
             -   name: Set up Docker Buildx
-                uses: docker/setup-buildx-action@v2
+                uses: docker/setup-buildx-action@v3
 
             -   name: Login to GitHub Container Registry
                 uses: docker/login-action@v3

diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
@@ -67,7 +67,7 @@ jobs:
                     - e2e_dockerfile_no_extension
                     - e2e_custom_composer_bin
                     - e2e_reproducible_build
-                php: [ '8.1', '8.2', '8.3' ]
+                php: [ '8.2', '8.3' ]
                 tools:
                     - 'composer:2.2'
                     - 'composer:2.3'
@@ -141,7 +141,7 @@ jobs:
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: '8.1'
+                    php-version: '8.2'
                     ini-values: phar.readonly=0, display_errors=On, error_reporting=-1
                     tools: composer
                     coverage: pcov
@@ -181,8 +181,8 @@ jobs:
 
             -   name: Pull the docker image
                 run: |
-                    docker pull ghcr.io/box-project/box_php81
-                    docker pull ghcr.io/box-project/box_php81_xdebug
+                    docker pull ghcr.io/box-project/box_php82
+                    docker pull ghcr.io/box-project/box_php82_xdebug
 
             -   run: make ${{ matrix.e2e }}
 

diff --git a/.github/workflows/gh-pages.yaml b/.github/workflows/gh-pages.yaml
@@ -69,7 +69,7 @@ jobs:
                 uses: actions/checkout@v4
 
             -   name: Setup Python
-                uses: actions/setup-python@v3
+                uses: actions/setup-python@v4
                 with:
                     python-version: '3.8'
 

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -33,7 +33,7 @@ jobs:
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: '8.1'
+                    php-version: '8.2'
                     ini-values: phar.readonly=0
                     tools: composer
                     coverage: none
@@ -56,7 +56,7 @@ jobs:
 
             -   name: Import GPG key
                 if: github.event_name == 'release'
-                uses: crazy-max/ghaction-import-gpg@v5
+                uses: crazy-max/ghaction-import-gpg@v6
                 with:
                     gpg_private_key: ${{ secrets.GPG_KEY_41539BBD4020945DB378F98B2DF45277AEF09A2F }}
                     passphrase: ${{ secrets.GPG_KEY_41539BBD4020945DB378F98B2DF45277AEF09A2F_PASSPHRASE }}
@@ -86,6 +86,8 @@ jobs:
         needs:
             - build-phar
         if: github.event_name == 'release'
+        permissions:
+            contents: write
         steps:
             -   uses: actions/download-artifact@v3
                 with:
@@ -127,6 +129,11 @@ jobs:
             -   name: Checkout
                 uses: actions/checkout@v4
 
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: '8.2'
+
             -   uses: actions/download-artifact@v3
                 with:
                     name: box-phar
@@ -141,10 +148,10 @@ jobs:
                     ./bin/box.phar --ansi --version
 
             -   name: Set up QEMU
-                uses: docker/setup-qemu-action@v2
+                uses: docker/setup-qemu-action@v3
 
             -   name: Set up Docker Buildx
-                uses: docker/setup-buildx-action@v2
+                uses: docker/setup-buildx-action@v3
 
             -   name: Login to Docker Container Registry
                 if: github.event_name == 'release'

diff --git a/.github/workflows/requirement-checker.yaml b/.github/workflows/requirement-checker.yaml
@@ -30,7 +30,7 @@ jobs:
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: '8.1'
+                    php-version: '8.2'
                     tools: composer
                     coverage: none
 
@@ -69,7 +69,7 @@ jobs:
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: '8.1'
+                    php-version: '8.2'
                     tools: composer
                     coverage: none
 
@@ -93,19 +93,16 @@ jobs:
                 # The lowest dependency is tested via an e2e test rather than by executing the tests like so.
                 # The reason being using tools such as PHPUnit for a version as low as the lowest supported version
                 # is a serious strain for close to no benefits: the e2e test is simpler.
-                php: [ '8.1' ]
+                php: [ '8.2' ]
                 dependency: [ locked ]
-                composer-options: [ null ]
+                composer-options: [ '' ]
                 include:
-                    -   php: '8.1'
+                    -   php: '8.2'
                         dependency: lowest
-                        composer-options: ~
-                    -   php: '8.1'
-                        dependency: highest
-                        composer-options: ~
+                        composer-options: ''
                     -   php: '8.2'
                         dependency: highest
-                        composer-options: ~
+                        composer-options: ''
                     -   php: '8.3'
                         dependency: highest
                         composer-options: --ignore-platform-req=php+
@@ -192,29 +189,29 @@ jobs:
                     -   command: _test_e2e_pass_no_config_min_composer_php
                         docker-image: ghcr.io/box-project/box_php725
                     -   command: _test_e2e_pass_no_config_min_box_php
-                        docker-image: ghcr.io/box-project/box_php81
+                        docker-image: ghcr.io/box-project/box_php82
                     -   command: _test_e2e_pass_complete_min_composer_php
                         docker-image: ghcr.io/box-project/box_php725
                     -   command: _test_e2e_pass_complete_min_box_php
-                        docker-image: ghcr.io/box-project/box_php81
+                        docker-image: ghcr.io/box-project/box_php82
                     -   command: _test_e2e_fail_complete_min_composer_php
                         docker-image: ghcr.io/box-project/box_php725
                     -   command: _test_e2e_fail_complete_min_box_php
-                        docker-image: ghcr.io/box-project/box_php81
+                        docker-image: ghcr.io/box-project/box_php82
                     -   command: _test_e2e_skip_min_composer_php
                         docker-image: ghcr.io/box-project/box_php725
                     -   command: _test_e2e_pass_complete_requirement_checker_not_disabled
                         docker-image: ghcr.io/box-project/box_php725
                     -   command: _test_e2e_fail_conflict
-                        docker-image: ghcr.io/box-project/box_php81
+                        docker-image: ghcr.io/box-project/box_php82
         steps:
             -   name: Checkout
                 uses: actions/checkout@v4
 
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: '8.1'
+                    php-version: '8.2'
                     tools: composer
                     coverage: none
 
@@ -282,6 +279,8 @@ jobs:
         name: Update the RequirementChecker
         if: ${{ github.repository == 'box-project/box' && github.ref_name == 'main' }}
         runs-on: ubuntu-latest
+        permissions:
+            pull-requests: write
         steps:
             -   name: Checkout
                 uses: actions/checkout@v4
@@ -293,7 +292,7 @@ jobs:
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: '8.1'
+                    php-version: '8.2'
                     tools: composer
                     coverage: none
 

diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
@@ -26,18 +26,15 @@ jobs:
             fail-fast: false
             matrix:
                 php:
-                    -   version: '8.1'
+                    -   version: '8.2'
                         dependency: locked
-                        composer-options: ~
-                    -   version: '8.1'
+                        composer-options: ''
+                    -   version: '8.2'
                         dependency: lowest
-                        composer-options: ~
-                    -   version: '8.1'
-                        dependency: highest
-                        composer-options: ~
+                        composer-options: ''
                     -   version: '8.2'
                         dependency: highest
-                        composer-options: ~
+                        composer-options: ''
                     -   version: '8.3'
                         dependency: highest
                         composer-options: --ignore-platform-req=php+
@@ -52,7 +49,7 @@ jobs:
                 include:
                     -   label: '; bz2 disabled'
                         php:
-                            version: '8.1'
+                            version: '8.2'
                             dependency: locked
                             composer-options: ''
                         tools: composer
@@ -94,7 +91,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [ '8.1' ]
+                php: [ '8.2' ]
         if: github.event_name == 'pull_request' || github.event_name == 'push'
         steps:
             -   name: Checkout

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -32,7 +32,7 @@
     ],
 ];
 
-$config = new FidryConfig('', 81_000);
+$config = new FidryConfig('', 82_000);
 $config->addRules($overriddenRules);
 $config->setCacheFile(__DIR__.'/dist/.php-cs-fixer.cache');
 $config->setFinder($finder);

diff --git a/Makefile.e2e b/Makefile.e2e
@@ -5,8 +5,8 @@ MAKEFLAGS += --no-builtin-rules
 DOCKER_RUN = docker run --interactive --platform=linux/amd64 --rm --workdir=/opt/box
 DOCKER_RUN_NO_PULL = docker run --interactive --platform=linux/amd64 --rm --pull=never
 # Matches the minimum PHP version supported by Box.
-DOCKER_MIN_BOX_VERSION_IMAGE_TAG = ghcr.io/box-project/box_php81
-DOCKER_MIN_BOX_XDEBUG_PHP_VERSION_IMAGE_TAG = ghcr.io/box-project/box_php81_xdebug
+DOCKER_MIN_BOX_VERSION_IMAGE_TAG = ghcr.io/box-project/box_php82
+DOCKER_MIN_BOX_XDEBUG_PHP_VERSION_IMAGE_TAG = ghcr.io/box-project/box_php82_xdebug
 
 E2E_SCOPER_EXPOSE_SYMBOLS_DIR = fixtures/build/dir011
 E2E_SCOPER_EXPOSE_SYMBOLS_OUTPUT_DIR = dist/dir011

diff --git a/bin/box b/bin/box
@@ -16,7 +16,7 @@ declare(strict_types=1);
 namespace KevinGH\Box;
 
 use Fidry\Console\Application\ApplicationRunner;
-use Fidry\Console\Input\IO;
+use Fidry\Console\IO;
 use KevinGH\Box\Console\Application;
 use KevinGH\Box\Console\OutputFormatterConfigurator;
 use RuntimeException;