chore: cs-style fixing and minor fixes

KnpLabs · Sep 26, 2022 · f2ea53d · f2ea53d
1 parent f07eda5
commit f2ea53d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
-FROM composer:2.4.1 as composer
+FROM composer:2.1.9 as composer
 
 ##################################
 
-FROM php:8.0.13-fpm-alpine3.13
+FROM php:8.1-fpm-alpine
 
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 
@@ -11,9 +11,9 @@ RUN mkdir -p /usr/src/app \
     && adduser -S -h /home/docker -u ${USER_ID:-1000} -G docker docker \
     && chown -R docker /home/docker /usr/src/app \
     && apk add --no-cache --virtual=.build-deps \
-        autoconf==2.69-r3 \
-        g++==10.2.1_pre1-r3 \
-        make==4.3-r0 \
+        autoconf \
+        g++ \
+        make \
     && docker-php-ext-install -j"$(nproc)" pdo_mysql \
     && pecl install apcu-5.1.19 \
     && docker-php-ext-enable apcu \

diff --git a/config/doctrine/orm/Species.orm.xml b/config/doctrine/orm/Species.orm.xml
@@ -14,11 +14,10 @@
         <field name="habitats" column="habitats" type="simple_array" nullable="false" unique="false" />
         <field name="feeding" column="feeding" type="string" length="255" nullable="false" unique="false" />
 
-        <one-to-many 
+        <one-to-many
             field="dinosaurs"
             target-entity="App\Entity\Dinosaur"
             mapped-by="species" />
     </entity>
 
 </doctrine-mapping>
-
diff --git a/src/Controller/AuthenticationController.php b/src/Controller/AuthenticationController.php
@@ -46,6 +46,6 @@ public function login(AuthenticationUtils $authenticationUtils): Response
             'controller_name' => 'AuthenticationController',
             'last_username' => $lastUsername,
             'error' => $error
-        ]); 
+        ]);
     }
 }
diff --git a/src/Entity/User.php b/src/Entity/User.php
@@ -26,7 +26,7 @@ public function getId(): int
 
     public function getUserIdentifier(): string 
     { 
-        return $this->email;        
+        return $this->email;
     }
 
     public function getRoles(): array 

diff --git a/templates/base.html.twig b/templates/base.html.twig
@@ -26,7 +26,7 @@
           <ul class="navbar-nav me-auto mb-2 mb-lg-0">
             {% if app.user is not null %}
               <li class="nav-item">
-                <a 
+                <a
                   class="nav-link{% if app.request.get('_route') == 'app_list_dinosaurs' %} active{% endif %}"
                   aria-current="page"
                   href="{{ path('app_list_dinosaurs') }}"
@@ -91,15 +91,17 @@
               </li>
             {% endif %}
           </ul>
+
             {% if searchForm is defined %}
               {{ form_start(searchForm, { 'attr': {'class': 'd-flex'}}) }}
                 {{ form_widget(searchForm.q) }}
                 {{ form_widget(searchForm.submit) }}
               {{ form_end(searchForm) }}
             {% endif %}
+
             {% if app.user is not null %}
               <span class="navbar-text ms-2">
-                {{app.user.userIdentifier}}
+                {{ app.user.userIdentifier }}
               </span>
             {% endif %}
         </div>