From 4071c63595eb49b57b718aee46ffc3bae6f85955 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jan 2022 17:23:44 +0000 Subject: [PATCH 1/2] composer(deps-dev): bump ergebnis/composer-normalize Bumps [ergebnis/composer-normalize](https://github.com/ergebnis/composer-normalize) from 2.15.0 to 2.19.0. - [Release notes](https://github.com/ergebnis/composer-normalize/releases) - [Changelog](https://github.com/ergebnis/composer-normalize/blob/main/CHANGELOG.md) - [Commits](https://github.com/ergebnis/composer-normalize/compare/2.15.0...2.19.0) --- updated-dependencies: - dependency-name: ergebnis/composer-normalize dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- composer.lock | 34 ++++++++++++++-------------------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/composer.json b/composer.json index f971d7b..886cd8b 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "fakerphp/faker": "^1.17.0" }, "require-dev": { - "ergebnis/composer-normalize": "^2.15.0", + "ergebnis/composer-normalize": "^2.19.0", "ergebnis/license": "^1.1.0", "ergebnis/php-cs-fixer-config": "^2.14.0", "ergebnis/phpstan-rules": "~0.15.3", diff --git a/composer.lock b/composer.lock index 924800d..493a36c 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": "9068ebdc3f45f6e5a7abd04bcf1955a8", + "content-hash": "fdbb9fd54b1e0dd0a9efba7f5f141ad3", "packages": [ { "name": "ergebnis/classy", @@ -904,41 +904,35 @@ }, { "name": "ergebnis/composer-normalize", - "version": "2.15.0", + "version": "2.19.0", "source": { "type": "git", "url": "https://github.com/ergebnis/composer-normalize.git", - "reference": "d469a15b916441959446d52a0f5d3fc9f7720317" + "reference": "ff00fd4dc084928b684b217041a87f7bd0eeddc5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/composer-normalize/zipball/d469a15b916441959446d52a0f5d3fc9f7720317", - "reference": "d469a15b916441959446d52a0f5d3fc9f7720317", + "url": "https://api.github.com/repos/ergebnis/composer-normalize/zipball/ff00fd4dc084928b684b217041a87f7bd0eeddc5", + "reference": "ff00fd4dc084928b684b217041a87f7bd0eeddc5", "shasum": "" }, "require": { - "composer-plugin-api": "^1.1.0 || ^2.0.0", + "composer-plugin-api": "^2.0.0", "ergebnis/json-normalizer": "^1.0.3", "ergebnis/json-printer": "^3.1.1", - "justinrainbow/json-schema": "^5.2.10", + "justinrainbow/json-schema": "^5.2.11", "localheinz/diff": "^1.1.1", "php": "^7.2 || ^8.0" }, "require-dev": { - "composer/composer": "^1.10.22 || ^2.0.13", + "composer/composer": "^2.2.1", "ergebnis/license": "^1.1.0", "ergebnis/php-cs-fixer-config": "^2.14.0", - "ergebnis/phpstan-rules": "~0.15.3", - "ergebnis/test-util": "^1.5.0", - "phpstan/extension-installer": "^1.1.0", - "phpstan/phpstan": "~0.12.89", - "phpstan/phpstan-deprecation-rules": "~0.12.6", - "phpstan/phpstan-phpunit": "~0.12.19", - "phpstan/phpstan-strict-rules": "~0.12.9", - "phpunit/phpunit": "^8.5.16", - "psalm/plugin-phpunit": "~0.16.0", - "symfony/filesystem": "^5.3.0", - "vimeo/psalm": "^4.7.3" + "fakerphp/faker": "^1.17.0", + "phpunit/phpunit": "^8.5.22", + "psalm/plugin-phpunit": "~0.16.1", + "symfony/filesystem": "^5.4.0", + "vimeo/psalm": "^4.16.1" }, "type": "composer-plugin", "extra": { @@ -981,7 +975,7 @@ "type": "github" } ], - "time": "2021-06-15T08:06:45+00:00" + "time": "2021-12-28T10:38:12+00:00" }, { "name": "ergebnis/json-normalizer", From cac6ea1c0c82f4620ff55731019d2e09c724a667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Mon, 3 Jan 2022 18:26:10 +0100 Subject: [PATCH 2/2] Fix: Run 'make coding-standards' --- composer.json | 34 +++++++++++++++++----------------- composer.lock | 5 +---- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/composer.json b/composer.json index 886cd8b..cf92d10 100644 --- a/composer.json +++ b/composer.json @@ -1,21 +1,25 @@ { "name": "ergebnis/test-util", - "type": "library", "description": "Provides a helper trait and generic data providers for tests.", + "license": "MIT", + "type": "library", "keywords": [ "assertion", "faker", "phpunit", "test" ], - "homepage": "https://github.com/ergebnis/test-util", - "license": "MIT", "authors": [ { "name": "Andreas Möller", "email": "am@localheinz.com" } ], + "homepage": "https://github.com/ergebnis/test-util", + "support": { + "issues": "https://github.com/ergebnis/test-util/issues", + "source": "https://github.com/ergebnis/test-util" + }, "require": { "php": "^7.2 || ^8.0", "ergebnis/classy": "^1.2.0", @@ -36,6 +40,16 @@ "psalm/plugin-phpunit": "~0.16.1", "vimeo/psalm": "^4.17.0" }, + "autoload": { + "psr-4": { + "Ergebnis\\Test\\Util\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "Ergebnis\\Test\\Util\\Test\\": "test/" + } + }, "config": { "allow-plugins": { "composer/package-versions-deprecated": true, @@ -53,19 +67,5 @@ "indent-size": 2, "indent-style": "space" } - }, - "autoload": { - "psr-4": { - "Ergebnis\\Test\\Util\\": "src/" - } - }, - "autoload-dev": { - "psr-4": { - "Ergebnis\\Test\\Util\\Test\\": "test/" - } - }, - "support": { - "issues": "https://github.com/ergebnis/test-util/issues", - "source": "https://github.com/ergebnis/test-util" } } diff --git a/composer.lock b/composer.lock index 493a36c..8af212f 100644 --- a/composer.lock +++ b/composer.lock @@ -1790,9 +1790,6 @@ "require": { "php": "^7.1 || ^8.0" }, - "replace": { - "myclabs/deep-copy": "self.version" - }, "require-dev": { "doctrine/collections": "^1.0", "doctrine/common": "^2.6", @@ -5972,5 +5969,5 @@ "platform-overrides": { "php": "7.2.33" }, - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.2.0" }