Skip to content

Commit

Permalink
Merge pull request #252 from Roave/feature/dependency-upgrades
Browse files Browse the repository at this point in the history
Upgrade dependencies, replace `beberlei/assert` with `webmozart/assert`, upgrade CS ruleset
  • Loading branch information
Ocramius authored Jun 22, 2020
2 parents b2dc52c + e4399dd commit 8a3d4a3
Show file tree
Hide file tree
Showing 200 changed files with 1,346 additions and 1,846 deletions.
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: php

php:
- 7.3
- 7.4

before_script:
Expand Down Expand Up @@ -31,9 +30,6 @@ jobs:
- stage: Static Analysis (src) with Psalm
script: vendor/bin/psalm

- stage: Static analysis (src) with phpstan
script: vendor/bin/phpstan analyse

- stage: Test
script: vendor/bin/phpunit

Expand Down
7 changes: 4 additions & 3 deletions bin/roave-backward-compatibility-check.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@
use Symfony\Component\Console\Application;
use Symfony\Component\Console\Input\ArgvInput;
use Symfony\Component\Console\Output\ConsoleOutput;

use function file_exists;

(static function () : void {
(static function () : void {
(static function (): void {
(static function (): void {
$autoloaderLocations = [
__DIR__ . '/../vendor/autoload.php', // Installed by cloning the project and running `composer install`
__DIR__ . '/../../../autoload.php', // Installed via `composer require`
Expand Down Expand Up @@ -66,7 +67,7 @@
new GetVersionCollectionFromGitRepository(),
new PickLastMinorVersionFromCollection(),
new LocateDependenciesViaComposer(
static function (string $installationPath) use ($composerIo) : Installer {
static function (string $installationPath) use ($composerIo): Installer {
return Installer::create(
$composerIo,
(new Factory())->createComposer(
Expand Down
24 changes: 10 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
"name": "roave/backward-compatibility-check",
"description": "Tool to compare two revisions of a public API to check for BC breaks",
"require": {
"php": "^7.3",
"php": "^7.4.7",
"ext-json": "*",
"beberlei/assert": "^3.2.7",
"composer/composer": "^1.10.7",
"nikolaposa/version": "^4.0.0",
"ocramius/package-versions": "^1.5.1",
"roave/better-reflection": "^4.3.0",
"symfony/console": "^4.4.10",
"symfony/process": "^5.1.0",
"thecodingmachine/safe": "^1.1"
"ocramius/package-versions": "^1.8.0",
"roave/better-reflection": "^4.6.1",
"symfony/console": "^5.1.2",
"symfony/process": "^5.1.2",
"thecodingmachine/safe": "^1.1.1",
"webmozart/assert": "^1.9.0"
},
"license": "MIT",
"authors": [
Expand All @@ -25,16 +25,12 @@
}
],
"require-dev": {
"doctrine/coding-standard": "^7.0.2",
"doctrine/coding-standard": "^8.0.0",
"infection/infection": "^0.16.3",
"phpstan/phpstan": "^0.11.19",
"phpstan/phpstan-beberlei-assert": "^0.11.2",
"phpstan/phpstan-phpunit": "^0.11.2",
"phpunit/phpunit": "^9.2.5",
"roave/security-advisories": "dev-master",
"squizlabs/php_codesniffer": "^3.5.4",
"thecodingmachine/phpstan-safe-rule": "^1.0",
"vimeo/psalm": "^3.11.5"
"squizlabs/php_codesniffer": "^3.5.5",
"vimeo/psalm": "^3.11.6"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 8a3d4a3

Please sign in to comment.