Dariusz Ruminski 3 лет назад
Родитель
Сommit
c619e16bdb

+ 3 - 6
.github/workflows/ci.yml

@@ -11,23 +11,20 @@ jobs:
       matrix:
         include:
           - operating-system: 'ubuntu-20.04'
-            php-version: '7.2'
+            php-version: '7.4'
             job-description: 'with lowest deps'
             composer-flags: '--prefer-stable --prefer-lowest' # should be checked on lowest supported PHP version
 
           - operating-system: 'ubuntu-20.04'
-            php-version: '7.2'
+            php-version: '7.4'
             job-description: 'with Sf ^4'
             execute-flex-with-symfony-version: '^4' # Explicit check for Sf 4.x compatibility
 
           - operating-system: 'ubuntu-20.04'
-            php-version: '7.3'
+            php-version: '7.4'
             job-description: 'with Sf ^5'
             execute-flex-with-symfony-version: '^5' # Explicit check for Sf 5.x compatibility
 
-          - operating-system: 'ubuntu-20.04'
-            php-version: '7.4'
-
           - operating-system: 'ubuntu-20.04'
             php-version: '8.0'
             job-description: 'with Sf ^6'

+ 2 - 2
.php-cs-fixer.php-lowest.php

@@ -12,8 +12,8 @@ declare(strict_types=1);
  * with this source code in the file LICENSE.
  */
 
-if (PHP_VERSION_ID < 70205 || PHP_VERSION_ID >= 70300) {
-    fwrite(STDERR, "PHP CS Fixer's config for PHP-LOWEST can be executed only on lowest supported PHP version - ~7.2.5.\n");
+if (PHP_VERSION_ID < 70400 || PHP_VERSION_ID >= 70500) {
+    fwrite(STDERR, "PHP CS Fixer's config for PHP-LOWEST can be executed only on lowest supported PHP version - ~7.4.0.\n");
     fwrite(STDERR, "Running it on higher PHP version would falsy expect more changes, eg `mixed` type on PHP 8.\n");
 
     exit(1);

+ 1 - 1
composer.json

@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^7.2.5 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "ext-json": "*",
         "ext-tokenizer": "*",
         "composer/semver": "^3.2",

+ 1 - 1
dev-tools/build.sh

@@ -2,7 +2,7 @@
 set -eu
 
 # ensure that deps will work on lowest supported PHP version
-composer config platform.php 2> /dev/null || composer config platform.php 7.2.5
+composer config platform.php 2> /dev/null || composer config platform.php 7.4
 
 # install package deps without dev-deps / remove already installed dev-deps
 # box can ignore dev-deps, but dev-deps, when installed, may lower version of prod-deps

+ 1 - 1
doc/installation.rst

@@ -5,7 +5,7 @@ Installation
 Requirements
 ------------
 
-PHP needs to be a minimum version of PHP 7.2.5.
+PHP needs to be a minimum version of PHP 7.4.
 
 Installation
 ------------

+ 1 - 5
docker-compose.override.yaml.dist

@@ -1,7 +1,7 @@
 version: '3.8'
 
 services:
-  php-7.2: &php
+  php-7.4: &php
     build:
       args:
         DOCKER_USER_ID: 1000 # replace with your user id (most likely 1000)
@@ -11,10 +11,6 @@ services:
       # Required for Docker Linux until natively supported.
       # See https://github.com/docker/for-linux/issues/264
       host.docker.internal: 172.17.0.1
-  php-7.3:
-    <<: *php
-  php-7.4:
-    <<: *php
   php-8.0:
     <<: *php
   php-8.1:

+ 2 - 8
docker-compose.yaml

@@ -1,20 +1,14 @@
 version: '3.8'
 
 services:
-  php-7.2: &php
-    build: docker/php-7.2
+  php-7.4: &php
+    build: docker/php-7.4
     working_dir: /app
     volumes:
       - .:/app
     environment:
       PHP_IDE_CONFIG: serverName=php-cs-fixer
       PHP_CS_FIXER_ALLOW_XDEBUG: 1
-  php-7.3:
-    <<: *php
-    build: docker/php-7.3
-  php-7.4:
-    <<: *php
-    build: docker/php-7.4
   php-8.0:
     <<: *php
     build: docker/php-8.0

+ 0 - 26
docker/php-7.2/Dockerfile

@@ -1,26 +0,0 @@
-FROM php:7.2-cli-alpine3.12
-
-ARG DOCKER_USER_ID
-ARG DOCKER_GROUP_ID
-
-RUN if ! getent group "${DOCKER_GROUP_ID}" > /dev/null; \
-    then addgroup -S -g "${DOCKER_GROUP_ID}" devs; \
-  fi \
-  && if ! getent passwd "${DOCKER_USER_ID}" > /dev/null; \
-    then adduser -S -u "${DOCKER_USER_ID}" -G "$(getent group "${DOCKER_GROUP_ID}" | awk -F: '{printf $1}')" dev; \
-  fi \
-  # php extensions
-  && curl --location --output /usr/local/bin/install-php-extensions https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions \
-  && chmod +x /usr/local/bin/install-php-extensions \
-  && sync \
-  && install-php-extensions \
-    xdebug-3.1.2 \
-  # composer
-  && curl --output composer-setup.php https://getcomposer.org/installer \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer \
-  && rm composer-setup.php \
-  # xdebug command
-  && curl --location --output /usr/local/bin/xdebug https://github.com/julienfalque/xdebug/releases/download/v2.0.0/xdebug \
-  && chmod +x /usr/local/bin/xdebug
-
-COPY xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini

+ 0 - 4
docker/php-7.2/xdebug.ini

@@ -1,4 +0,0 @@
-;zend_extension=xdebug.so
-xdebug.client_host=host.docker.internal
-xdebug.mode=debug
-xdebug.start_with_request=yes

+ 0 - 26
docker/php-7.3/Dockerfile

@@ -1,26 +0,0 @@
-FROM php:7.3-cli-alpine3.15
-
-ARG DOCKER_USER_ID
-ARG DOCKER_GROUP_ID
-
-RUN if ! getent group "${DOCKER_GROUP_ID}" > /dev/null; \
-    then addgroup -S -g "${DOCKER_GROUP_ID}" devs; \
-  fi \
-  && if ! getent passwd "${DOCKER_USER_ID}" > /dev/null; \
-    then adduser -S -u "${DOCKER_USER_ID}" -G "$(getent group "${DOCKER_GROUP_ID}" | awk -F: '{printf $1}')" dev; \
-  fi \
-  # php extensions
-  && curl --location --output /usr/local/bin/install-php-extensions https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions \
-  && chmod +x /usr/local/bin/install-php-extensions \
-  && sync \
-  && install-php-extensions \
-    xdebug-3.1.2 \
-  # composer
-  && curl --output composer-setup.php https://getcomposer.org/installer \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer \
-  && rm composer-setup.php \
-  # xdebug command
-  && curl --location --output /usr/local/bin/xdebug https://github.com/julienfalque/xdebug/releases/download/v2.0.0/xdebug \
-  && chmod +x /usr/local/bin/xdebug
-
-COPY xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini

Некоторые файлы не были показаны из-за большого количества измененных файлов