diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 7c34d2d23..983c4bd85 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -8,18 +8,19 @@ on: jobs: php: - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest continue-on-error: ${{ matrix.experimental }} strategy: fail-fast: false matrix: php-version: ['7.4', '8.0', '8.1'] - os: [ubuntu-latest] - extensions: ['ast, grpc', 'ast, grpc, protobuf-3.21.5'] experimental: [false] + include: + - php-version: 8.2 + experimental: true steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -27,14 +28,14 @@ jobs: php-version: ${{ matrix.php-version }} coverage: xdebug tools: php-cs-fixer - extensions: ${{ matrix.extensions }} + extensions: "ast, grpc, protobuf" - name: Validate composer.json run: composer validate - name: Cache Composer packages id: composer-cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: vendor key: ${{ runner.os }}-${{ matrix.php-version }}-php-${{ hashFiles('**/composer.json') }} @@ -46,6 +47,7 @@ jobs: run: composer install --prefer-dist --no-progress --no-suggest - name: Check Style + continue-on-error: ${{ matrix.experimental }} run: vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --dry-run --stop-on-violation --using-cache=no -vvv - name: Check Dependencies diff --git a/.github/workflows/publish-otel-php-base-docker-image.yml b/.github/workflows/publish-otel-php-base-docker-image.yml index 2bedcef7f..19eb59a42 100644 --- a/.github/workflows/publish-otel-php-base-docker-image.yml +++ b/.github/workflows/publish-otel-php-base-docker-image.yml @@ -8,7 +8,7 @@ jobs: name: OpenTelemetry PHP base docker image creation strategy: matrix: - php-version: ['7.4', '8.0', '8.1'] + php-version: ['7.4', '8.0', '8.1', '8.2'] runs-on: ubuntu-latest permissions: packages: write diff --git a/composer.json b/composer.json index 6d9a4bc5d..bc40e9f9c 100644 --- a/composer.json +++ b/composer.json @@ -104,7 +104,7 @@ "psalm/plugin-mockery": "^0.9", "psalm/plugin-phpunit": "^0.18", "psalm/psalm": "^4.0", - "qossmic/deptrac-shim": "^0.24", + "qossmic/deptrac-shim": "^0 || ^1", "rector/rector": "^0.13.7", "symfony/http-client": "^5.2" }, diff --git a/docker-compose.yaml b/docker-compose.yaml index 189940d16..aed94adf7 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -9,6 +9,7 @@ services: XDEBUG_MODE: ${XDEBUG_MODE:-off} XDEBUG_CONFIG: ${XDEBUG_CONFIG:-''} PHP_IDE_CONFIG: ${PHP_IDE_CONFIG:-''} + #PHP_CS_FIXER_IGNORE_ENV: "true" zipkin: image: openzipkin/zipkin-slim ports: