From f435075361885b417368dff22ededa7553f80a16 Mon Sep 17 00:00:00 2001 From: Aydin Hassan Date: Fri, 17 May 2024 08:52:43 +0200 Subject: [PATCH] Update branch --- composer.json | 2 +- composer.lock | 33 ++++++++++++++++++++------------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 3b2d862..7c702d9 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ ], "require": { "php": "^8.0", - "php-school/php-workshop": "dev-05-09-remove_temporary_solution_mapper" + "php-school/php-workshop": "dev-master" }, "require-dev": { "phpunit/phpunit": "^9", diff --git a/composer.lock b/composer.lock index 5405d1b..052a41b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7bd3b34dc505a0982f14fe5cf1e61f63", + "content-hash": "861a3809372ea7552bbd417ed292aff9", "packages": [ { "name": "beberlei/assert", @@ -1126,16 +1126,16 @@ }, { "name": "php-school/php-workshop", - "version": "dev-05-09-remove_temporary_solution_mapper", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/php-school/php-workshop.git", - "reference": "30483511ef91935c41dadc588edb5d6b548041c5" + "reference": "ce202fb47f81c344c18b5ce7006a474ed7862702" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-school/php-workshop/zipball/30483511ef91935c41dadc588edb5d6b548041c5", - "reference": "30483511ef91935c41dadc588edb5d6b548041c5", + "url": "https://api.github.com/repos/php-school/php-workshop/zipball/ce202fb47f81c344c18b5ce7006a474ed7862702", + "reference": "ce202fb47f81c344c18b5ce7006a474ed7862702", "shasum": "" }, "require": { @@ -1158,14 +1158,21 @@ "symfony/process": "^4.0 | ^5.0 | ^6.0" }, "require-dev": { + "bamarni/composer-bin-plugin": "^1.8", "composer/composer": "^2.0", "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^1.8", "phpunit/phpunit": "^8.5", - "squizlabs/php_codesniffer": "^3.7", "yoast/phpunit-polyfills": "^0.2.0" }, + "default-branch": true, "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + } + }, "autoload": { "files": [ "src/Event/functions.php", @@ -1203,9 +1210,9 @@ ], "support": { "issues": "https://github.com/php-school/php-workshop/issues", - "source": "https://github.com/php-school/php-workshop/tree/05-09-remove_temporary_solution_mapper" + "source": "https://github.com/php-school/php-workshop/tree/master" }, - "time": "2024-05-11T08:45:34+00:00" + "time": "2024-05-17T19:12:46+00:00" }, { "name": "php-school/terminal", @@ -2168,16 +2175,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.67", + "version": "1.11.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493" + "reference": "e524358f930e41a2b4cca1320e3b04fc26b39e0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/16ddbe776f10da6a95ebd25de7c1dbed397dc493", - "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e524358f930e41a2b4cca1320e3b04fc26b39e0b", + "reference": "e524358f930e41a2b4cca1320e3b04fc26b39e0b", "shasum": "" }, "require": { @@ -2222,7 +2229,7 @@ "type": "github" } ], - "time": "2024-04-16T07:22:02+00:00" + "time": "2024-05-15T08:00:59+00:00" }, { "name": "phpunit/php-code-coverage",