From d77f090e33e720cd7068ce7ce4d2e5bea6122e8f Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 10 Apr 2022 17:54:25 +0200 Subject: [PATCH] update composer --- .github/workflows/main.yml | 8 ++++---- composer.json | 2 +- composer.lock | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5dda3a945..caeca1d3c 100644 --- 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 @@ -135,7 +135,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 @@ -177,7 +177,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 @@ -216,7 +216,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 9391f7681..94d0ce0dc 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 26687fc78..23fcc8ba8 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", @@ -107,7 +107,7 @@ "psr/log": "^1 || ^2 || ^3" }, "require-dev": { - "phpstan/phpstan": "^0.12.55", + "phpstan/phpstan": ">=1.5.4", "symfony/phpunit-bridge": "^4.2 || ^5" }, "type": "library", @@ -175,7 +175,7 @@ "require-dev": { "doctrine/cache": "^1.11 || ^2.0", "doctrine/coding-standard": "^6.0 || ^8.1", - "phpstan/phpstan": "^0.12.20", + "phpstan/phpstan": ">=1.5.4", "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", "symfony/cache": "^4.4 || ^5.2" }, @@ -246,7 +246,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" }, @@ -312,7 +312,7 @@ }, "require-dev": { "doctrine/coding-standard": "^6.0", - "phpstan/phpstan": "^0.11.8", + "phpstan/phpstan": ">=1.5.4", "phpunit/phpunit": "^8.2" }, "type": "library", @@ -2026,8 +2026,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", @@ -4835,7 +4835,7 @@ "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "phpstan/phpstan": "<0.12.20", + "phpstan/phpstan": ">=1.5.4", "vimeo/psalm": "<4.6.1 || 4.6.2" }, "require-dev": {