Skip to content

Commit

Permalink
Upgraded dependencies, running on composer:^2 and php:^8
Browse files Browse the repository at this point in the history
Signed-off-by: Marco Pivetta <[email protected]>
  • Loading branch information
Ocramius committed Jan 21, 2021
1 parent f49a97e commit 841dcd9
Show file tree
Hide file tree
Showing 6 changed files with 979 additions and 506 deletions.
16 changes: 8 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM composer:1 AS composer
FROM composer:2 AS composer

FROM ubuntu:20.04

Expand All @@ -23,13 +23,13 @@ RUN apt update \
gnupg \
libzip-dev \
zip \
php7.4-cli \
php7.4-curl \
php7.4-json \
php7.4-mbstring \
php7.4-readline \
php7.4-xml \
php7.4-zip \
php8.0-cli \
php8.0-curl \
php8.0-json \
php8.0-mbstring \
php8.0-readline \
php8.0-xml \
php8.0-zip \
&& apt clean

ADD composer.json /app/composer.json
Expand Down
3 changes: 2 additions & 1 deletion bin/console.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

namespace Laminas\AutomaticReleases\WebApplication;

use DateTimeZone;
use ErrorException;
use Http\Discovery\HttpClientDiscovery;
use Http\Discovery\Psr17FactoryDiscovery;
Expand Down Expand Up @@ -88,7 +89,7 @@ static function (int $errorCode, string $message = '', string $file = '', int $l
$httpClient
));
$createReleaseText = new MergeMultipleReleaseNotes([
new CreateReleaseTextViaKeepAChangelog($changelogExists, new SystemClock()),
new CreateReleaseTextViaKeepAChangelog($changelogExists, new SystemClock(new DateTimeZone('UTC'))),
$createCommitText,
]);
$createRelease = new CreateReleaseThroughApiCall(
Expand Down
30 changes: 15 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@
}
},
"require": {
"php": "^7.4.7",
"php": "^8.0.0",
"composer/package-versions-deprecated": "^1.10.99",
"jwage/changelog-generator": "^1.2.1",
"laminas/laminas-diactoros": "^2.5.0",
"lcobucci/clock": "^1.3",
"monolog/monolog": "^2.1",
"phly/keep-a-changelog": "^2.9",
"php-http/curl-client": "^2.1.0",
"lcobucci/clock": "^2.0.0",
"monolog/monolog": "^2.2.0",
"phly/keep-a-changelog": "^2.10.1",
"php-http/curl-client": "^2.2.0",
"php-http/discovery": "^1.13.0",
"php-http/httplug": "^2.1.0",
"php-http/httplug": "^2.2.0",
"psr/http-client": "^1.0.1",
"psr/http-message": "^1.0.1",
"psr/log": "^1.1",
"symfony/console": "^4.4.10 || ^5.1.2",
"symfony/process": "^5.1.3",
"thecodingmachine/safe": "^v1.1.2",
"psr/log": "^1.1.3",
"symfony/console": "^4.4.18 || ^5.2.1",
"symfony/process": "^5.2.1",
"thecodingmachine/safe": "^1.3.3",
"webmozart/assert": "^1.9.1"
},
"autoload-dev": {
Expand All @@ -33,12 +33,12 @@
}
},
"require-dev": {
"doctrine/coding-standard": "^8.1.0",
"infection/infection": "^0.17.5",
"phpunit/phpunit": "^9.2.5",
"psalm/plugin-phpunit": "^0.12.2",
"doctrine/coding-standard": "^8.2.0",
"infection/infection": "^0.20.2",
"phpunit/phpunit": "^9.5.0",
"psalm/plugin-phpunit": "^0.15.0",
"squizlabs/php_codesniffer": "^3.5.8",
"vimeo/psalm": "^3.18.2"
"vimeo/psalm": "^4.3.2"
},
"config": {
"sort-packages": true
Expand Down
Loading

0 comments on commit 841dcd9

Please sign in to comment.