Merge pull request #1751 from AgID/develop

Consolidation in master
AgID · Jun 9, 2023 · a46ea59 · a46ea59
2 parents c6e8611 + d97eb16
commit a46ea59
Show file tree

Hide file tree

Showing 37 changed files with 4,723 additions and 976 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -29,8 +29,7 @@ commands:
       - run:
           name: Run php-cs-fixer (future mode)
           command: |
-            PHP_CS_FIXER_FUTURE_MODE=1
-            bin/php-cs-fixer fix --diff --dry-run --verbose
+            PHP_CS_FIXER_FUTURE_MODE=1 bin/php-cs-fixer fix --diff --dry-run --verbose
 
   yaml-validation:
     description: Ensure yaml configuration files are valid

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -21,6 +21,15 @@
  */
 class Handler extends ExceptionHandler
 {
+    /**
+     * A list of the exception types that are not reported.
+     *
+     * @var array
+     */
+    protected $dontReport = [
+        SPIDLoginAnomalyException::class,
+    ];
+
     /**
      * Report or log an exception.
      *

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -587,7 +587,7 @@ protected function storeMethod(StoreUserRequest $request, PublicAdministration $
             $redirectUrl = $this->getRoleAwareUrl('users.index', [], $publicAdministration);
         }
 
-        // If existingUser is filled the user is already in the database
+        // If existingUser is filled, the user is already in the database
         if (isset($validatedData['existingUser']) && isset($validatedData['existingUser']->email)) {
             $user = $validatedData['existingUser'];
             $userInCurrentPublicAdministration = $user->publicAdministrationsWithSuspended->where('id', $publicAdministration->id)->isNotEmpty();
@@ -598,7 +598,7 @@ protected function storeMethod(StoreUserRequest $request, PublicAdministration $
                     'error_description' => 'User already exists in the current public administration',
                     'title' => __("Non è possibile inoltrare l'invito"),
                     'message' => __("L'utente fa già parte di questa pubblica amministrazione."),
-                    'redirectUri' => $redirectUrl ?? null,
+                    'redirectUrl' => $redirectUrl ?? null,
                 ];
             }
 

diff --git a/build.xml b/build.xml
@@ -363,7 +363,7 @@
                 <exec command="docker-compose up -d --build nginx mariadb redis ipa-redisearch elasticsearch php-fpm matomo" dir="containers" passthru="true" checkreturn="true"/>
             </then>
             <else>
-                <exec command="docker-compose up -d --build nginx mariadb redis ipa-redisearch mailhog php-fpm matomo queue-worker elasticsearch spid-testenv" dir="containers" passthru="true" checkreturn="true"/>
+                <exec command="docker-compose up -d --build nginx mariadb redis ipa-redisearch mailhog php-fpm matomo matomo-logs queue-worker elasticsearch spid-testenv" dir="containers" passthru="true" checkreturn="true"/>
                 <if>
                     <or>
                         <equals arg1="${REDIS_INDEXES_USE_SENTINELS}" arg2="true"/>
@@ -576,7 +576,7 @@
             <available file="containers" type="dir" property="ignored"/>
             <then>
                 <echo msg="Starting Docker containers..."/>
-                <exec command="docker-compose up -d nginx mariadb redis ipa-redisearch mailhog php-fpm queue-worker elasticsearch spid-testenv" dir="containers" passthru="true" checkreturn="true"/>
+                <exec command="docker-compose up -d nginx mariadb redis ipa-redisearch mailhog php-fpm matomo-logs queue-worker elasticsearch spid-testenv" dir="containers" passthru="true" checkreturn="true"/>
                 <echo msg="Web Analytics Italia up and running!"/>
             </then>
         </if>

diff --git a/composer.json b/composer.json
@@ -50,7 +50,7 @@
         "laravel/ui": "^2.0",
         "league/commonmark": "^1.4",
         "predis/predis": "^1.1",
-        "silber/bouncer": "v1.0.0",
+        "silber/bouncer": "v1.0.1",
         "spatie/laravel-webhook-client": "^2.3",
         "symfony/yaml": "^4.0",
         "yajra/laravel-datatables-fractal": "^1.0",