Release 1.16.0 (#265)

* Use smaller docker image for composer binary * Add GitHub icon to navbar * Change navbar icon GitHub link to ArmaForces organization * Revert icon name * Add Spearhead DLC icon (#263) * Update Symfony to the latest LTS version (#264) * Update Symfony to the latest LTS version * Remove unused dependencies * Apply CS Fixer fixes --------- Co-authored-by: 3Mydlo3 <[email protected]> Co-authored-by: Jakub Skowroński <[email protected]>
ArmaForces · Jul 25, 2023 · 78c5f9b · 78c5f9b
1 parent 0dabc6d
commit 78c5f9b
Show file tree

Hide file tree

Showing 22 changed files with 1,979 additions and 2,387 deletions.
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -64,7 +64,7 @@ RUN set -eux; \
     apk del .build-deps \
 ;
 
-COPY --from=composer /usr/bin/composer /usr/bin/composer
+COPY --from=composer/composer:2-bin /composer /usr/bin/composer
 RUN ln -s $PHP_INI_DIR/php.ini-production $PHP_INI_DIR/php.ini
 COPY .docker/php/conf.d/armaforces-web.ini $PHP_INI_DIR/conf.d/armaforces-web.ini
 

diff --git a/.env b/.env
@@ -37,16 +37,16 @@ APP_ENV=dev
 APP_SECRET=3c0e1589d36f2c28609e4ec5af60f545
 ###< symfony/framework-bundle ###
 
-###> symfony/mailer ###
-# MAILER_DSN=smtp://localhost
-###< symfony/mailer ###
-
 ###> doctrine/doctrine-bundle ###
 # Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
 # IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
 DATABASE_URL=mysql://root@mysql:3306/af_website?serverVersion=5.7
 ###< doctrine/doctrine-bundle ###
 
+###> symfony/mailer ###
+# MAILER_DSN=smtp://localhost
+###< symfony/mailer ###
+
 ###> nelmio/cors-bundle ###
 CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
 ###< nelmio/cors-bundle ###
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -64,6 +64,7 @@
             ],
             'sort_algorithm' => 'none',
         ],
+        'phpdoc_separation' => false
     ])
     ->setFinder($finder)
 ;
diff --git a/composer.json b/composer.json
@@ -6,27 +6,27 @@
     "require": {
         "php": ">=8.0",
         "ext-ctype": "*",
-        "ext-iconv": "*",
         "ext-dom": "*",
-        "api-platform/core": "^2.6",
+        "ext-iconv": "*",
+        "api-platform/core": "^2.7",
         "composer/package-versions-deprecated": "1.11.99.4",
         "doctrine/annotations": "^1.0",
-        "doctrine/doctrine-bundle": "^2.5",
+        "doctrine/doctrine-bundle": "^2.10",
         "doctrine/doctrine-fixtures-bundle": "^3.4",
         "doctrine/doctrine-migrations-bundle": "^3.2",
-        "doctrine/orm": "^2.10",
+        "doctrine/orm": "^2.15",
         "elao/enum": "^1.7",
         "erusev/parsedown": "^1.7",
         "friendsofsymfony/jsrouting-bundle": "^2.5",
         "knpuniversity/oauth2-client-bundle": "^2.7",
         "league/csv": "^9.6",
         "nelmio/cors-bundle": "^2.1",
         "phpdocumentor/reflection-docblock": "^5.3",
+        "phpstan/phpdoc-parser": "^1.23",
         "ramsey/uuid-doctrine": "^1.6",
         "restcord/restcord": "^0.5.0",
         "sensio/framework-extra-bundle": "^6.1",
         "spatie/calendar-links": "^1.2",
-        "phpstan/phpdoc-parser": "^1.2",
         "symfony/asset": "5.4.*",
         "symfony/console": "5.4.*",
         "symfony/dotenv": "5.4.*",
@@ -38,8 +38,7 @@
         "symfony/intl": "5.4.*",
         "symfony/mailer": "5.4.*",
         "symfony/mime": "5.4.*",
-        "symfony/monolog-bundle": "^3.1",
-        "symfony/notifier": "5.4.*",
+        "symfony/monolog-bundle": "^3.0",
         "symfony/process": "5.4.*",
         "symfony/property-access": "5.4.*",
         "symfony/property-info": "5.4.*",
@@ -62,26 +61,27 @@
         "wohali/oauth2-discord-new": "^1.0"
     },
     "require-dev": {
+        "phpunit/phpunit": "^9.5",
+        "symfony/browser-kit": "5.4.*",
+        "symfony/css-selector": "5.4.*",
+        "symfony/debug-bundle": "5.4.*",
+        "symfony/maker-bundle": "^1.0",
+        "symfony/phpunit-bridge": "^6.3",
+        "symfony/stopwatch": "5.4.*",
+        "symfony/web-profiler-bundle": "5.4.*",
         "dama/doctrine-test-bundle": "^6.5",
         "friendsofphp/php-cs-fixer": "^3.0",
         "phpstan/phpstan": "^1.3",
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpstan/phpstan-doctrine": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-symfony": "^1.0",
-        "phpunit/phpunit": "^9.5",
-        "roave/security-advisories": "dev-latest",
-        "symfony/browser-kit": "5.4.*",
-        "symfony/css-selector": "5.4.*",
-        "symfony/debug-bundle": "5.4.*",
-        "symfony/maker-bundle": "^1.0",
-        "symfony/phpunit-bridge": "^6.0",
-        "symfony/stopwatch": "5.4.*",
-        "symfony/web-profiler-bundle": "5.4.*"
+        "roave/security-advisories": "dev-latest"
     },
     "config": {
         "allow-plugins": {
             "composer/package-versions-deprecated": true,
+            "php-http/discovery": true,
             "symfony/flex": true,
             "symfony/runtime": true
         },