Skip to content

Commit

Permalink
Merge pull request #24 from Kalipso0505/allow-console-7
Browse files Browse the repository at this point in the history
  • Loading branch information
spaceemotion authored May 31, 2024
2 parents 2e7843c + 6a3245f commit f721848
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 17 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
USER_ID=1000
GROUP_ID=1000
GITHUB_PERSONAL_ACCESS_TOKEN=
22 changes: 13 additions & 9 deletions .github/workflows/phpcstd.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: phpcstd

on: [push]
on:
push:
pull_request:

env:
extensions: ast
Expand All @@ -11,10 +13,10 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php: [8.1]
php: [8.1, 8.2, 8.3]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup cache environment
id: extcache
Expand All @@ -25,7 +27,7 @@ jobs:
key: ${{ env.key }}

- name: Cache extensions
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ steps.extcache.outputs.dir }}
key: ${{ steps.extcache.outputs.key }}
Expand All @@ -45,7 +47,7 @@ jobs:
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
Expand All @@ -68,7 +70,9 @@ jobs:
php: [
7.4,
8.0,
8.1
8.1,
8.2,
8.3,
]
tool: [
composer-normalize,
Expand All @@ -84,7 +88,7 @@ jobs:
]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup cache environment
id: extcache
Expand All @@ -95,7 +99,7 @@ jobs:
key: ${{ env.key }}

- name: Cache extensions
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ steps.extcache.outputs.dir }}
key: ${{ steps.extcache.outputs.key }}
Expand All @@ -115,7 +119,7 @@ jobs:
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"ext-SimpleXML": "*",
"ext-json": "*",
"composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0",
"symfony/console": "^3 || ^4 || ^5.2 || ^6",
"symfony/process": "^4.1 || ^5.2 || ^6"
"symfony/console": "^3 || ^4 || ^5.2 || ^6 || ^7",
"symfony/process": "^4.1 || ^5.2 || ^6 || ^7"
},
"require-dev": {
"brainmaestro/composer-git-hooks": "^2.8",
Expand All @@ -35,13 +35,13 @@
"phpstan/phpstan": "^1",
"phpstan/phpstan-deprecation-rules": "^1.1",
"phpstan/phpstan-strict-rules": "^1.5",
"phpunit/phpunit": "^9.5",
"phpunit/phpunit": "^9.5 || ^10 || ^11",
"psalm/plugin-phpunit": "^0.15.0",
"qossmic/deptrac-shim": "^0.19.0",
"qossmic/deptrac-shim": "^0.19.0 || ^1",
"rector/rector": "^0.12",
"squizlabs/php_codesniffer": "^3.5",
"symplify/easy-coding-standard": "^10",
"vimeo/psalm": "^4.3"
"vimeo/psalm": "^4.3 || ^5"
},
"suggest": {
"ergebnis/composer-normalize": "Normalizes composer.json files",
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.9'

services:
php:
build:
Expand Down
2 changes: 1 addition & 1 deletion src/main.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

require_once __DIR__ . '/init.php';

$command = new RunCommand();
$command = new RunCommand('phpcstd');
$command->addTool(new ComposerNormalize());
$command->addTool(new PhpParallelLint());
$command->addTool(new Deptrac());
Expand Down

0 comments on commit f721848

Please sign in to comment.