Update deps, migrate to symfony 7.1 (#1482)

composer · Nov 7, 2024 · dc561cf · dc561cf
1 parent 5ce8077
commit dc561cf
Show file tree

Hide file tree

Showing 7 changed files with 1,224 additions and 1,110 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml
@@ -19,7 +19,7 @@ doctrine:
                 alias: App
         controller_resolver:
             enabled: false
-            auto_mapping: true
+            auto_mapping: false
 
 when@test:
     doctrine:

diff --git a/config/services.yaml b/config/services.yaml
@@ -119,4 +119,5 @@ services:
     Symfony\Component\HttpFoundation\Session\Storage\Handler\RedisSessionHandler:
         arguments: ['@snc_redis.cache', {prefix: 'sess:', ttl: 3600}]
 
-    Symfony\Component\HttpClient\NoPrivateNetworkHttpClient: ~
+    Symfony\Component\HttpClient\NoPrivateNetworkHttpClient:
+        autoconfigure: false
diff --git a/src/Controller/WebController.php b/src/Controller/WebController.php
@@ -67,9 +67,9 @@ public function searchApi(Request $req, Algolia $algolia): JsonResponse
 
         try {
             $query = new Query(
-                $req->query->has('q') ? $req->query->get('q') : $req->query->get('query', ''),
+                $req->query->has('q') ? $req->query->getString('q') : $req->query->getString('query'),
                 (array) ($req->query->all()['tags'] ?? []),
-                $req->query->get('type', ''),
+                $req->query->getString('type', ''),
                 $req->query->getInt('per_page', 15),
                 $req->query->getInt('page', 1)
             );

diff --git a/src/Logger/LogIdProcessor.php b/src/Logger/LogIdProcessor.php
@@ -27,7 +27,7 @@ public function reset(): void
         $this->jobId = null;
     }
 
-    public function __invoke(LogRecord $record)
+    public function __invoke(LogRecord $record): LogRecord
     {
         if ($this->jobId !== null) {
             $record->extra['job_id'] = $this->jobId;

diff --git a/templates/package/stats_base.html.twig b/templates/package/stats_base.html.twig
@@ -10,13 +10,11 @@
     <div class="row">
         <div class="col-xs-12 package">
             <div class="package-header">
-                {% apply spaceless %}
                 <h2 class="title">
                     <a href="{{ path("view_package", {name: package.name}) }}">{{ package.name }}</a> statistics
-                    <small class="header-menu-item {% if app.request.attributes.get('_route') == 'view_package_stats' %}active{% endif %}"><a href="{{ path('view_package_stats', {name: package.name}) }}">Package Installs</a></small>
+                    <small class="header-menu-item {% if app.request.attributes.get('_route') == 'view_package_stats' %}active{% endif %}"><a href="{{ path('view_package_stats', {name: package.name}) }}">Package Installs</a></small>{#--#}
                     <small class="header-menu-item {% if app.request.attributes.get('_route') == 'view_package_php_stats' %}active{% endif %}"><a href="{{ path('view_package_php_stats', {name: package.name}) }}">PHP Versions</a></small>
                 </h2>
-                {% endapply %}
             </div>
         </div>
     </div>

diff --git a/templates/web/stats_base.html.twig b/templates/web/stats_base.html.twig
@@ -7,12 +7,10 @@
 {% block content %}
     {% set packageCount = 0 %}
 
-    {% apply spaceless %}
     <h2 class="title">
         {{ 'statistics.title'|trans }}
-        <small class="header-menu-item {% if app.request.attributes.get('_route') == 'stats' %}active{% endif %}"><a href="{{ path('stats') }}">Package Installs</a></small>
-        <small class="header-menu-item {% if app.request.attributes.get('_route') == 'php_stats' and type|default(false) == 'php' %}active{% endif %}"><a href="{{ path('php_stats') }}">PHP Versions</a></small>
+        <small class="header-menu-item {% if app.request.attributes.get('_route') == 'stats' %}active{% endif %}"><a href="{{ path('stats') }}">Package Installs</a></small>{#--#}
+        <small class="header-menu-item {% if app.request.attributes.get('_route') == 'php_stats' and type|default(false) == 'php' %}active{% endif %}"><a href="{{ path('php_stats') }}">PHP Versions</a></small>{#--#}
         {# <small class="header-menu-item {% if app.request.attributes.get('_route') == 'php_stats' and type|default(false) == 'phpplatform' %}active{% endif %}"><a href="{{ path('php_stats', {platform: 1}) }}">Platform PHP Versions</a></small> #}
     </h2>
-    {% endapply %}
 {% endblock %}