afup#1437 containers docker PHP 7.4 (afup#1438)

afup#1437 containers docker PHP 7.4
stakovicz · Jan 5, 2025 · a59136b · a59136b
1 parent d17fcd1
commit a59136b
Show file tree

Hide file tree

Showing 37 changed files with 1,637 additions and 6,106 deletions.
diff --git a/.env.dist b/.env.dist
@@ -66,8 +66,8 @@ PAYBOX_IDENTIFIANT=110647233
 BLOG_API_KEY=123456
 
 SMTP_HOST="localhost"
-SMTP_PORT="1025"
-SMTP_TLS="0"
+SMTP_PORT=1025
+SMTP_TLS=0
 SMTP_USERNAME=""
 SMTP_PASSWORD=""
 MAILER_FORCE_RECIPIENTS=""

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,25 +1,20 @@
 name: CI
 
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 jobs:
 
   unit:
     name: "Unit tests"
     runs-on: ubuntu-22.04
 
-    strategy:
-      fail-fast: false
-      matrix:
-        php: ["7.0"]
-
     steps:
       - uses: actions/checkout@v4
 
       - name: Setup PHP with tools
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '${{ matrix.php }}'
+          php-version: '7.4'
 
       - name: Get Composer Cache Directory
         id: composer-cache
@@ -49,7 +44,7 @@ jobs:
       - name: Setup PHP with tools
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.0'
+          php-version: '7.4'
 
       - name: Get Composer Cache Directory
         id: composer-cache

diff --git a/.php_cs → .php-cs-fixer.php b/.php_cs → .php-cs-fixer.php
@@ -1,11 +1,11 @@
 <?php
 
-$finder = PhpCsFixer\Finder::create()
+$finder = (new PhpCsFixer\Finder())
     ->name('*.php')
     ->in(__DIR__ . "/sources/AppBundle")
 ;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
         '@PSR2' => true,

diff --git a/Makefile b/Makefile
@@ -131,7 +131,7 @@ node_modules:
 
 composer.phar:
     # You may replace the commit hash by whatever the last commit hash is on https://github.com/composer/getcomposer.org/commits/main
-	wget https://raw.githubusercontent.com/composer/getcomposer.org/46c42b8248e157b4f77acf5150dacba6aeb60901/web/installer -O - -q | php -- --2.2
+	curl https://raw.githubusercontent.com/composer/getcomposer.org/46c42b8248e157b4f77acf5150dacba6aeb60901/web/installer | php -- --2.2
 
 init-db:
 	make reset-db

diff --git a/bin/doctrine-dbal b/bin/doctrine-dbal
@@ -108,10 +108,12 @@ if (PHP_VERSION_ID < 80000) {
         }
     }
 
-    if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) {
-        include("phpvfscomposer://" . __DIR__ . '/..'.'/vendor/doctrine/dbal/bin/doctrine-dbal');
-        exit(0);
+    if (
+        (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true))
+        || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper'))
+    ) {
+        return include("phpvfscomposer://" . __DIR__ . '/..'.'/vendor/doctrine/dbal/bin/doctrine-dbal');
     }
 }
 
-include __DIR__ . '/..'.'/vendor/doctrine/dbal/bin/doctrine-dbal';
+return include __DIR__ . '/..'.'/vendor/doctrine/dbal/bin/doctrine-dbal';
diff --git a/compose.override.yml-dist b/compose.override.yml-dist
@@ -1,4 +1,3 @@
-version: "2.2"
 services:
   db:
     ports:

diff --git a/compose.yml b/compose.yml
@@ -70,6 +70,7 @@ services:
       args:
         uid: ${CURRENT_UID:-1001}
         gid: "1001"
+        ENABLE_XDEBUG: ${ENABLE_XDEBUG:-false}
     env_file:
       .env
     user: localUser

diff --git a/composer.json b/composer.json
@@ -3,6 +3,7 @@
   "description": "Main repository for afup website",
   "type": "project",
   "require": {
+    "php": "7.4.* | 8.2.*",
     "ext-curl": "*",
     "ext-dom": "*",
     "ext-gd": "*",
@@ -12,7 +13,7 @@
     "algolia/algoliasearch-client-php": "^1.12",
     "beberlei/assert": "^2.9",
     "captioning/captioning": "^2.6",
-    "ccmbenchmark/ting_bundle": "^3.0",
+    "ccmbenchmark/ting_bundle": "3.4.1",
     "cocur/slugify": "^2.3",
     "doctrine/dbal": "^2.5",
     "ekino/newrelic-bundle": "^1.4",
@@ -24,7 +25,7 @@
     "j7mbo/twitter-api-php": "^1.0",
     "jms/serializer-bundle": "^1.1",
     "knpuniversity/oauth2-client-bundle": "^1.4",
-    "league/iso3166": "^2.1",
+    "league/iso3166": "^4.0",
     "league/oauth2-github": "^0.2.1",
     "nojimage/twitter-text-php": "1.1.*",
     "pacely/mailchimp-apiv3": "^1.0",
@@ -90,12 +91,12 @@
   ],
   "minimum-stability": "stable",
   "require-dev": {
-    "atoum/atoum": "^2.8",
+    "atoum/atoum": "^4.0",
     "atoum/stubs": "^2.5",
-    "friendsofphp/php-cs-fixer": "~2",
     "behat/behat": "^3.7",
     "behat/mink-extension": "^2.3",
     "behat/mink-goutte-driver": "^1.2",
+    "friendsofphp/php-cs-fixer": "~2",
     "smalot/pdfparser": "^0.19.0"
   },
   "repositories": [