From ee71f46da669f75919f0e31dc84e2636d58f4b33 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 10 Apr 2022 17:54:24 +0200 Subject: [PATCH] update composer --- .github/workflows/main.yml | 8 ++++---- composer.json | 2 +- composer.lock | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bdf3062..2bf2da5 100755 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -84,7 +84,7 @@ jobs: with: fetch-depth: 1 ref: develop - repository: Karaka/Build + repository: Karaka-Management/Build path: Build - name: Checkout Resource Repository uses: actions/checkout@master @@ -151,7 +151,7 @@ jobs: with: fetch-depth: 1 ref: develop - repository: Karaka/Build + repository: Karaka-Management/Build path: Build - name: Setup PHP, with composer and extensions uses: shivammathur/setup-php@master @@ -192,7 +192,7 @@ jobs: with: fetch-depth: 1 ref: develop - repository: Karaka/Build + repository: Karaka-Management/Build path: Build - name: Setup PHP, with composer and extensions uses: shivammathur/setup-php@master @@ -239,7 +239,7 @@ jobs: with: fetch-depth: 1 ref: develop - repository: Karaka/Build + repository: Karaka-Management/Build path: Build - name: Setup PHP, with composer and extensions uses: shivammathur/setup-php@master diff --git a/composer.json b/composer.json index 10044a1..ac4e7bd 100755 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ ], "require-dev": { "phpunit/phpunit": ">=9.4", - "friendsofphp/php-cs-fixer": ">=3.2", + "friendsofphp/php-cs-fixer": ">=3.8", "squizlabs/php_codesniffer": ">=3.6", "phpmd/phpmd": ">=2.9", "phpstan/phpstan": ">=1.5.4", diff --git a/composer.lock b/composer.lock index 580688a..79cfe60 100755 --- a/composer.lock +++ b/composer.lock @@ -25,7 +25,7 @@ "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^0.12.54", + "phpstan/phpstan": ">=1.5.4", "symfony/phpunit-bridge": "^4.2 || ^5" }, "type": "library", @@ -173,7 +173,7 @@ "require-dev": { "doctrine/cache": "1.*", "doctrine/coding-standard": "^6.0 || ^8.1", - "phpstan/phpstan": "^0.12.20", + "phpstan/phpstan": ">=1.5.4", "phpunit/phpunit": "^7.5 || ^9.1.5" }, "type": "library", @@ -248,7 +248,7 @@ "ext-pdo": "*", "ext-phar": "*", "phpbench/phpbench": "^0.13 || 1.0.0-alpha2", - "phpstan/phpstan": "^0.12", + "phpstan/phpstan": ">=1.5.4", "phpstan/phpstan-phpunit": "^0.12", "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, @@ -314,7 +314,7 @@ }, "require-dev": { "doctrine/coding-standard": "^6.0", - "phpstan/phpstan": "^0.11.8", + "phpstan/phpstan": ">=1.5.4", "phpunit/phpunit": "^8.2" }, "type": "library", @@ -1993,8 +1993,8 @@ "php": "^7.1 || ^8.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "~2.16.1", - "phpstan/phpstan": "^0.12", + "friendsofphp/php-cs-fixer": ">=3.8", + "phpstan/phpstan": ">=1.5.4", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.0" }, "type": "library", @@ -4731,7 +4731,7 @@ "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "phpstan/phpstan": "<0.12.20", + "phpstan/phpstan": ">=1.5.4", "vimeo/psalm": "<3.9.1" }, "require-dev": {