fix: various deprecations and bump deps (api-platform#2660)

* chore: bump deps * fix: various deprecations and bump deps
Yadu1223 · Mar 7, 2024 · ed93510 · ed93510
1 parent 1257943
commit ed93510
Show file tree

Hide file tree

Showing 16 changed files with 347 additions and 323 deletions.
diff --git a/api/.env b/api/.env
@@ -30,7 +30,7 @@ APP_SECRET=!ChangeMe!
 # DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
 # DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=8.0.32&charset=utf8mb4"
 # DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
-DATABASE_URL="postgresql://app:!ChangeMe!@database:5432/app?serverVersion=15&charset=utf8"
+DATABASE_URL="postgresql://app:!ChangeMe!@database:5432/app?serverVersion=16&charset=utf8"
 ###< doctrine/doctrine-bundle ###
 
 ###> nelmio/cors-bundle ###

diff --git a/api/composer.lock b/api/composer.lock
diff --git a/api/config/packages/api_platform.yaml b/api/config/packages/api_platform.yaml
@@ -2,7 +2,8 @@ api_platform:
     title: Hello API Platform
     version: 1.0.0
     # Mercure integration, remove if unwanted
-    mercure: ~
+    mercure:
+        include_type: true
     formats:
         jsonld: ['application/ld+json']
     docs_formats:

diff --git a/api/config/packages/doctrine.yaml b/api/config/packages/doctrine.yaml
@@ -4,9 +4,10 @@ doctrine:
 
         # IMPORTANT: You MUST configure your server version,
         # either here or in the DATABASE_URL env var (see .env file)
-        #server_version: '15'
+        #server_version: '16'
 
         profiling_collect_backtrace: '%kernel.debug%'
+        use_savepoints: true
     orm:
         auto_generate_proxy_classes: true
         enable_lazy_ghost_objects: true

diff --git a/api/config/packages/monolog.yaml b/api/config/packages/monolog.yaml
@@ -59,3 +59,4 @@ when@prod:
                 type: stream
                 channels: [deprecation]
                 path: php://stderr
+                formatter: monolog.formatter.json
diff --git a/api/config/packages/twig.yaml b/api/config/packages/twig.yaml
@@ -1,5 +1,5 @@
 twig:
-    default_path: '%kernel.project_dir%/templates'
+    file_name_pattern: '*.twig'
 
 when@test:
     twig:

diff --git a/api/config/routes/annotations.yaml b/api/config/routes/annotations.yaml
diff --git a/api/frankenphp/conf.d/app.ini b/api/frankenphp/conf.d/app.ini
@@ -1,4 +1,3 @@
-variables_order = EGPCS
 expose_php = 0
 date.timezone = UTC
 apc.enable_cli = 1

diff --git a/api/migrations/Version20210930074739.php → api/migrations/Version20240307125735.php b/api/migrations/Version20210930074739.php → api/migrations/Version20240307125735.php
@@ -10,7 +10,7 @@
 /**
  * Auto-generated Migration: Please modify to your needs!
  */
-final class Version20210930074739 extends AbstractMigration
+final class Version20240307125735 extends AbstractMigration
 {
     public function getDescription(): string
     {

diff --git a/api/src/Entity/Greeting.php b/api/src/Entity/Greeting.php
@@ -18,7 +18,7 @@ class Greeting
      */
     #[ORM\Id]
     #[ORM\Column(type: 'integer')]
-    #[ORM\GeneratedValue]
+    #[ORM\GeneratedValue(strategy: 'SEQUENCE')]
     private ?int $id = null;
 
     /**

diff --git a/api/symfony.lock b/api/symfony.lock
@@ -46,7 +46,7 @@
             "repo": "github.com/symfony/recipes",
             "branch": "main",
             "version": "2.10",
-            "ref": "0b4a11ee7e60b36227502ed26874edd7e8b66353"
+            "ref": "c170ded8fc587d6bd670550c43dafcf093762245"
         },
         "files": [
             "config/packages/doctrine.yaml",
@@ -333,12 +333,12 @@
         "version": "v6.0.1"
     },
     "symfony/monolog-bundle": {
-        "version": "3.8",
+        "version": "3.10",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
             "version": "3.7",
-            "ref": "213676c4ec929f046dfde5ea8e97625b81bc0578"
+            "ref": "aff23899c4440dd995907613c1dd709b6f59503f"
         },
         "files": [
             "config/packages/monolog.yaml"
@@ -356,7 +356,7 @@
             "repo": "github.com/symfony/recipes",
             "branch": "main",
             "version": "6.3",
-            "ref": "1f5830c331065b6e4c9d5fa2105e322d29fcd573"
+            "ref": "a411a0480041243d97382cac7984f7dce7813c08"
         },
         "files": [
             ".env.test",
@@ -437,12 +437,12 @@
         "version": "v6.0.2"
     },
     "symfony/twig-bundle": {
-        "version": "6.3",
+        "version": "6.4",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
-            "version": "6.3",
-            "ref": "b7772eb20e92f3fb4d4fe756e7505b4ba2ca1a2c"
+            "version": "6.4",
+            "ref": "cab5fd2a13a45c266d45a7d9337e28dee6272877"
         },
         "files": [
             "config/packages/twig.yaml",

diff --git a/api/templates/base.html.twig b/api/templates/base.html.twig
@@ -3,7 +3,7 @@
     <head>
         <meta charset="UTF-8">
         <title>{% block title %}Welcome!{% endblock %}</title>
-        <link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 128 128%22><text y=%221.2em%22 font-size=%2296%22>⚫️</text></svg>">
+        <link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 128 128%22><text y=%221.2em%22 font-size=%2296%22>⚫️</text><text y=%221.3em%22 x=%220.2em%22 font-size=%2276%22 fill=%22%23fff%22>sf</text></svg>">
         {% block stylesheets %}
         {% endblock %}
 

diff --git a/api/tests/bootstrap.php b/api/tests/bootstrap.php
@@ -4,9 +4,7 @@
 
 require dirname(__DIR__).'/vendor/autoload.php';
 
-if (file_exists(dirname(__DIR__).'/config/bootstrap.php')) {
-    require dirname(__DIR__).'/config/bootstrap.php';
-} elseif (method_exists(Dotenv::class, 'bootEnv')) {
+if (method_exists(Dotenv::class, 'bootEnv')) {
     (new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
 }
 

diff --git a/pwa/package.json b/pwa/package.json
@@ -9,12 +9,12 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@api-platform/admin": "^3.4.5",
-    "@fontsource/poppins": "^5.0.8",
+    "@api-platform/admin": "^3.4.6",
+    "@fontsource/poppins": "^5.0.12",
     "@tailwindcss/forms": "^0.5.7",
     "formik": "^2.4.5",
     "isomorphic-unfetch": "^4.0.2",
-    "next": "^14.1.0",
+    "next": "^14.1.3",
     "postcss": "^8.4.35",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -23,14 +23,14 @@
   "devDependencies": {
     "@babel/core": "^7.24.0",
     "@popperjs/core": "^2.11.8",
-    "@types/node": "^20.11.23",
-    "@types/react": "^18.2.61",
-    "@types/react-dom": "^18.2.19",
-    "autoprefixer": "^10.4.17",
+    "@types/node": "^20.11.25",
+    "@types/react": "^18.2.64",
+    "@types/react-dom": "^18.2.21",
+    "autoprefixer": "^10.4.18",
     "eslint": "^8.57.0",
-    "eslint-config-next": "^14.1.0",
+    "eslint-config-next": "^14.1.3",
     "tailwindcss": "^3.4.1",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.2"
   },
   "peerDependencies": {
     "@babel/core": "^7.19.0",