From 6eedf75e1e7c94b2402c61e77cd0b26327863e0f Mon Sep 17 00:00:00 2001 From: Sebastian Mendel Date: Wed, 5 Feb 2020 17:20:43 +0100 Subject: [PATCH] update to PHP 7.4 --- Dockerfile | 10 +---- composer.json | 2 +- composer.lock | 105 ++++++++++++++++++++++++++++++++++++++------------ 3 files changed, 82 insertions(+), 35 deletions(-) diff --git a/Dockerfile b/Dockerfile index eb87e5cec..1d9f3c045 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,9 @@ -FROM php:7.3-fpm AS runtime +FROM php:7.4-fpm AS runtime RUN set -ex \ && apt-get update -y \ && apt-get upgrade -y \ && apt-get install -y libzip4 libzip-dev libpng-tools libpng16-16 libpng-dev libxml2-dev zlib1g-dev libldap2-dev \ - && curl -sS -o /tmp/icu.tar.gz -L http://download.icu-project.org/files/icu4c/62.1/icu4c-62_1-src.tgz \ - && tar -zxf /tmp/icu.tar.gz -C /tmp \ - && cd /tmp/icu/source \ - && ./configure --prefix=/usr/local \ - && make \ - && make install \ - && rm -rf /tmp/icu* \ - && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-install opcache pdo_mysql ldap zip xml gd intl \ # clean up && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \ diff --git a/composer.json b/composer.json index b9dc4affe..cca24d215 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "config": { "bin-dir": "bin", "platform": { - "php": "7.3" + "php": "7.4" }, "sort-packages": true }, diff --git a/composer.lock b/composer.lock index 1e164e7d9..62d33f518 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": "4acf7dde71391a63becd37d0704374bc", + "content-hash": "e9f9627a088b014f048d30169279345d", "packages": [ { "name": "doctrine/annotations", @@ -2519,40 +2519,47 @@ }, { "name": "ocramius/proxy-manager", - "version": "2.2.3", + "version": "2.6.1", "source": { "type": "git", "url": "https://github.com/Ocramius/ProxyManager.git", - "reference": "4d154742e31c35137d5374c998e8f86b54db2e2f" + "reference": "dec37bfb3c3594440ee4fa263494189344787d22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/4d154742e31c35137d5374c998e8f86b54db2e2f", - "reference": "4d154742e31c35137d5374c998e8f86b54db2e2f", + "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/dec37bfb3c3594440ee4fa263494189344787d22", + "reference": "dec37bfb3c3594440ee4fa263494189344787d22", "shasum": "" }, "require": { - "ocramius/package-versions": "^1.1.3", - "php": "^7.2.0", - "zendframework/zend-code": "^3.3.0" + "laminas/laminas-code": "^3.4.1", + "ocramius/package-versions": "^1.5.1", + "php": "7.4.*", + "webimpress/safe-writer": "^2.0" + }, + "conflict": { + "doctrine/annotations": "<1.6.1", + "laminas/laminas-stdlib": "<3.2.1", + "zendframework/zend-stdlib": "<3.2.1" }, "require-dev": { - "couscous/couscous": "^1.6.1", + "doctrine/coding-standard": "^6.0.0", "ext-phar": "*", - "humbug/humbug": "1.0.0-RC.0@RC", - "nikic/php-parser": "^3.1.1", - "padraic/phpunit-accelerator": "dev-master@DEV", - "phpbench/phpbench": "^0.12.2", - "phpstan/phpstan": "dev-master#856eb10a81c1d27c701a83f167dc870fd8f4236a as 0.9.999", - "phpstan/phpstan-phpunit": "dev-master#5629c0a1f4a9c417cb1077cf6693ad9753895761", - "phpunit/phpunit": "^6.4.3", - "squizlabs/php_codesniffer": "^2.9.1" + "infection/infection": "^0.15.0", + "mikey179/vfsstream": "^1.6.8", + "nikic/php-parser": "^4.3.0", + "phpbench/phpbench": "^0.16.10", + "phpunit/phpunit": "^8.5.1", + "slevomat/coding-standard": "^5.0.4", + "squizlabs/php_codesniffer": "^3.5.3", + "symfony/console": "^4.4.2", + "vimeo/psalm": "3.7.0" }, "suggest": { - "ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects", - "zendframework/zend-json": "To have the JsonRpc adapter (Remote Object feature)", - "zendframework/zend-soap": "To have the Soap adapter (Remote Object feature)", - "zendframework/zend-xmlrpc": "To have the XmlRpc adapter (Remote Object feature)" + "laminas/laminas-json": "To have the JsonRpc adapter (Remote Object feature)", + "laminas/laminas-soap": "To have the Soap adapter (Remote Object feature)", + "laminas/laminas-xmlrpc": "To have the XmlRpc adapter (Remote Object feature)", + "ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects" }, "type": "library", "extra": { @@ -2561,8 +2568,8 @@ } }, "autoload": { - "psr-0": { - "ProxyManager\\": "src" + "psr-4": { + "ProxyManager\\": "src/ProxyManager" } }, "notification-url": "https://packagist.org/downloads/", @@ -2585,7 +2592,7 @@ "proxy pattern", "service proxies" ], - "time": "2019-08-10T08:37:15+00:00" + "time": "2020-01-27T09:25:51+00:00" }, { "name": "paragonie/random_compat", @@ -4732,6 +4739,54 @@ ], "time": "2019-11-11T16:49:32+00:00" }, + { + "name": "webimpress/safe-writer", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/webimpress/safe-writer.git", + "reference": "d03bea3b98abe1d4c8b24cbebf524361ffaafee4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webimpress/safe-writer/zipball/d03bea3b98abe1d4c8b24cbebf524361ffaafee4", + "reference": "d03bea3b98abe1d4c8b24cbebf524361ffaafee4", + "shasum": "" + }, + "require": { + "php": "^7.2" + }, + "require-dev": { + "phpunit/phpunit": "^8.4.3", + "webimpress/coding-standard": "dev-develop" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev", + "dev-develop": "2.1.x-dev", + "dev-release-1.0": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Webimpress\\SafeWriter\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "description": "Tool to write files safely, to avoid race conditions", + "keywords": [ + "concurrent write", + "file writer", + "race condition", + "safe writer", + "webimpress" + ], + "time": "2019-11-27T19:40:53+00:00" + }, { "name": "zendframework/zend-ldap", "version": "2.10.1", @@ -6226,6 +6281,6 @@ }, "platform-dev": [], "platform-overrides": { - "php": "7.3" + "php": "7.4" } }